* [review-request][PATCH 0/2] remove SDKMACHINE variable
@ 2015-11-04 12:11 Ed Bartosh
2015-11-04 12:11 ` [review-request][PATCH 1/2] toasterconf: " Ed Bartosh
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Ed Bartosh @ 2015-11-04 12:11 UTC (permalink / raw)
To: toaster
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [review-request][PATCH 1/2] toasterconf: remove SDKMACHINE variable
2015-11-04 12:11 [review-request][PATCH 0/2] remove SDKMACHINE variable Ed Bartosh
@ 2015-11-04 12:11 ` Ed Bartosh
2015-11-04 15:24 ` Scott Rifenbark
2015-11-04 12:11 ` [review-request][PATCH 2/2] " Ed Bartosh
2015-11-05 15:45 ` [review-request][PATCH 0/2] " Barros Pena, Belen
2 siblings, 1 reply; 5+ messages in thread
From: Ed Bartosh @ 2015-11-04 12:11 UTC (permalink / raw)
To: toaster
This variable is not used in toaster anymore.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
meta/conf/toasterconf.json | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json
index c8e42ef..9042d9e 100644
--- a/meta/conf/toasterconf.json
+++ b/meta/conf/toasterconf.json
@@ -5,7 +5,6 @@
"IMAGE_FSTYPES": "ext3 jffs2 tar.bz2",
"IMAGE_INSTALL_append": "",
"PACKAGE_CLASSES": "package_rpm",
- "SDKMACHINE" : "x86_64"
},
"layersources": [
{
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [review-request][PATCH 2/2] toasterconf: remove SDKMACHINE variable
2015-11-04 12:11 [review-request][PATCH 0/2] remove SDKMACHINE variable Ed Bartosh
2015-11-04 12:11 ` [review-request][PATCH 1/2] toasterconf: " Ed Bartosh
@ 2015-11-04 12:11 ` Ed Bartosh
2015-11-05 15:45 ` [review-request][PATCH 0/2] " Barros Pena, Belen
2 siblings, 0 replies; 5+ messages in thread
From: Ed Bartosh @ 2015-11-04 12:11 UTC (permalink / raw)
To: toaster
This variable is not used in toaster anymore.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
meta-yocto/conf/toasterconf.json | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta-yocto/conf/toasterconf.json b/meta-yocto/conf/toasterconf.json
index 3df1703..0efb2de 100644
--- a/meta-yocto/conf/toasterconf.json
+++ b/meta-yocto/conf/toasterconf.json
@@ -5,7 +5,6 @@
"IMAGE_FSTYPES": "ext3 jffs2 tar.bz2",
"IMAGE_INSTALL_append": "",
"PACKAGE_CLASSES": "package_rpm",
- "SDKMACHINE" : "x86_64"
},
"layersources": [
{
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [review-request][PATCH 1/2] toasterconf: remove SDKMACHINE variable
2015-11-04 12:11 ` [review-request][PATCH 1/2] toasterconf: " Ed Bartosh
@ 2015-11-04 15:24 ` Scott Rifenbark
0 siblings, 0 replies; 5+ messages in thread
From: Scott Rifenbark @ 2015-11-04 15:24 UTC (permalink / raw)
To: Ed Bartosh; +Cc: toaster
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
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
On Wed, Nov 4, 2015 at 4:11 AM, Ed Bartosh <ed.bartosh@linux.intel.com>
wrote:
> This variable is not used in toaster anymore.
>
> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> ---
> meta/conf/toasterconf.json | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/meta/conf/toasterconf.json b/meta/conf/toasterconf.json
> index c8e42ef..9042d9e 100644
> --- a/meta/conf/toasterconf.json
> +++ b/meta/conf/toasterconf.json
> @@ -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
> toaster@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster
>
[-- Attachment #2: Type: text/html, Size: 1939 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [review-request][PATCH 0/2] remove SDKMACHINE variable
2015-11-04 12:11 [review-request][PATCH 0/2] remove SDKMACHINE variable Ed Bartosh
2015-11-04 12:11 ` [review-request][PATCH 1/2] toasterconf: " Ed Bartosh
2015-11-04 12:11 ` [review-request][PATCH 2/2] " Ed Bartosh
@ 2015-11-05 15:45 ` Barros Pena, Belen
2 siblings, 0 replies; 5+ messages in thread
From: Barros Pena, Belen @ 2015-11-05 15:45 UTC (permalink / raw)
To: Ed Bartosh, toaster
On 04/11/2015 12:11, "toaster-bounces@yoctoproject.org on behalf of Ed
Bartosh" <toaster-bounces@yoctoproject.org on behalf of
ed.bartosh@linux.intel.com> wrote:
>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
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
>
>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
>
>--
>_______________________________________________
>toaster mailing list
>toaster@yoctoproject.org
>https://lists.yoctoproject.org/listinfo/toaster
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-11-05 15:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-04 12:11 [review-request][PATCH 0/2] remove SDKMACHINE variable Ed Bartosh
2015-11-04 12:11 ` [review-request][PATCH 1/2] toasterconf: " Ed Bartosh
2015-11-04 15:24 ` Scott Rifenbark
2015-11-04 12:11 ` [review-request][PATCH 2/2] " Ed Bartosh
2015-11-05 15:45 ` [review-request][PATCH 0/2] " Barros Pena, Belen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.