Skip to contentSkip to conversation

remove SDKMACHINE variable

PATCH Superseded Ed Bartosh 3 participants 5 messages Nov 4, 2015 – Nov 5, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Ed Bartosh

author
#0 lore raw

cover remove SDKMACHINE variable

Hi,

This patchset contains two identical changes for toasterconf.json: removing SDKMACHINE variable. Variable is not used in toaster anymore as it's removed by this change: https://lists.yoctoproject.org/pipermail/toaster/2015-October/003234.html

The patchset logically belongs to my previous patchset: 8279: Provide a single way of starting Toaster I'm sending this in separate e-mail as below two patches should be send to different upstream projects:
openembedded-core and yocto.

Please, send them after my previous patchset is accepted.

The following changes since commit fc45deac89ef63ca1c44e763c38ced7dfd72cbe1:

build-appliance-image: Update to jethro head revision (2015-11-03 14:03:03 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ed/toaster/remove-sdkmachine
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/toaster/remove-sdkmachine

Ed Bartosh (2):
toasterconf: remove SDKMACHINE variable
toasterconf: remove SDKMACHINE variable

 meta-yocto/conf/toasterconf.json | 1 -
 meta/conf/toasterconf.json       | 1 -
 2 files changed, 2 deletions(-)

--
Regards,
Ed

author
#1 lore raw

PATCH 1/2 toasterconf: remove SDKMACHINE variable

This variable is not used in toaster anymore.

---
 meta/conf/toasterconf.json | 1 -
 1 file changed, 1 deletion(-)
meta/conf/toasterconf.json +0 -1
index c8e42ef..9042d9e 100644
@@ -5,7 +5,6 @@
         "IMAGE_FSTYPES": "ext3 jffs2 tar.bz2",
         "IMAGE_INSTALL_append": "",
         "PACKAGE_CLASSES": "package_rpm",
-        "SDKMACHINE"   : "x86_64"
     },
     "layersources": [
         {

--
2.1.4

#2 lore raw

Re: [review-request][PATCH 1/2] toasterconf: remove SDKMACHINE variable

I have removed the one instance of this variable that was in the Toaster Manual. See
http://www.yoctoproject.org/docs/2.0/toaster-manual/toaster-manual.html#json-config-area
for the published update.

Scott

Quoted 28 lines · Ed Bartosh

This variable is not used in toaster anymore.

---
 meta/conf/toasterconf.json | 1 -
 1 file changed, 1 deletion(-)
meta/conf/toasterconf.json +0 -2
index c8e42ef..9042d9e 100644
@@ -5,7 +5,6 @@
         "IMAGE_FSTYPES": "ext3 jffs2 tar.bz2",
         "IMAGE_INSTALL_append": "",
         "PACKAGE_CLASSES": "package_rpm",
-        "SDKMACHINE"   : "x86_64"
     },
     "layersources": [
         {
--

2.1.4

--
_______________________________________________
toaster mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/toaster

author
#3 lore raw

PATCH 2/2 toasterconf: remove SDKMACHINE variable

In reply to Ed Bartosh

This variable is not used in toaster anymore.

---
 meta-yocto/conf/toasterconf.json | 1 -
 1 file changed, 1 deletion(-)
meta-yocto/conf/toasterconf.json +0 -1
index 3df1703..0efb2de 100644
@@ -5,7 +5,6 @@
         "IMAGE_FSTYPES": "ext3 jffs2 tar.bz2",
         "IMAGE_INSTALL_append": "",
         "PACKAGE_CLASSES": "package_rpm",
-        "SDKMACHINE"   : "x86_64"
     },
     "layersources": [
         {
Signature · 1 line
2.1.4
#4 lore raw
In reply to Ed Bartosh
Quoted 23 lines · On 04/11/2015 12:11, "[email protected] on behalf of Ed…

Hi,

This patchset contains two identical changes for toasterconf.json:
removing
SDKMACHINE variable. Variable is not used in toaster anymore as it's removed
by this change:
https://lists.yoctoproject.org/pipermail/toaster/2015-October/003234.html

The patchset logically belongs to my previous patchset: 8279: Provide a single way of starting Toaster
I'm sending this in separate e-mail as below two patches should be send to different upstream projects:
openembedded-core and yocto.

Please, send them after my previous patchset is accepted.

The following changes since commit
fc45deac89ef63ca1c44e763c38ced7dfd72cbe1:

build-appliance-image: Update to jethro head revision (2015-11-03
14:03:03 +0000)

Quoted 6 lines

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib ed/toaster/remove-sdkmachine

http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/toaster/remove
-sdkmachine

Mmmm, it complains when importing the meta-yocto toasterconf.json file. This is the error:

Importing file: /home/yocto/master/meta-yocto/conf/toasterconf.json Failure while trying to import the toaster config file /home/yocto/master/meta-yocto/conf/toasterconf.json: Expecting property
name: line 8 column 5 (char 216)
Traceback (most recent call last):
File "/home/yocto/master/bitbake/lib/toaster/bldcontrol/management/commands/chec ksettings.py", line 110, in _verify_be LoadConfigCommand()._import_layer_config(config_file)
File "/home/yocto/master/bitbake/lib/toaster/bldcontrol/management/commands/load conf.py", line 42, in _import_layer_config
data = json.loads(open(filepath, "r").read())
File "/usr/lib/python2.7/json/__init__.py", line 338, in loads return _default_decoder.decode(s)
File "/usr/lib/python2.7/json/decoder.py", line 366, in decode obj, end = self.raw_decode(s, idx=_w(s, 0).end())
File "/usr/lib/python2.7/json/decoder.py", line 382, in raw_decode obj, end = self.scan_once(s, idx)

Cheers

Belén

Quoted 18 lines

Ed Bartosh (2):
toasterconf: remove SDKMACHINE variable
toasterconf: remove SDKMACHINE variable

meta-yocto/conf/toasterconf.json | 1 -
meta/conf/toasterconf.json | 1 -

2 files changed, 2 deletions(-)

--
Regards,
Ed

Signature · 4 lines
_______________________________________________
toaster mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/toaster