* [PATCH 0/2] linux-yocto: consolidated merge request
@ 2011-06-22 21:29 Bruce Ashfield
2011-06-22 21:29 ` [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups Bruce Ashfield
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Bruce Ashfield @ 2011-06-22 21:29 UTC (permalink / raw)
To: richard.purdie; +Cc: dvhart, openembedded-core, koen, saul.wold
Hi,
This pull request contains the first iteration of the
base configuration changes discussed on the list about
two weeks ago, and a common USB fix that was identified
during the beagleboard refresh.
94fa015 meta: add taskstats experimental feature group
4fb2ed5 meta: enable freezer support
88d619e meta: enable fuse and cuse as modules
f465827 meta: add namespaces + experimental configs
fbdd376 meta: add devtmpfs config group
b04f6d9 meta: re-enable cgroups options in the standard kernel
I've built the relevant qemu targets with the changes,
and my sanity tests have all passed here.
cc: Koen Kooi <koen@dominion.thruhere.net>
cc: Daren Hart <dvhart@linux.intel.com>
Cheers,
Bruce
The following changes since commit 46378aec555f08f133bf601be01dacf4bd0b7f05:
Bruce Ashfield (1):
linux-yocto/meta-yocto: update SRCREVs for utrace merge
are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/oe-core
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/oe-core
Bruce Ashfield (2):
linux-yocto: update meta SRCREV for new config groups
linux-yocto: update meta and yocto/standard SRCREVs
meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups 2011-06-22 21:29 [PATCH 0/2] linux-yocto: consolidated merge request Bruce Ashfield @ 2011-06-22 21:29 ` Bruce Ashfield 2011-06-27 5:23 ` Cui, Dexuan 2011-06-22 21:29 ` [PATCH 2/2] linux-yocto: update meta and yocto/standard SRCREVs Bruce Ashfield 2011-06-22 21:57 ` [PATCH 0/2] linux-yocto: consolidated merge request Richard Purdie 2 siblings, 1 reply; 11+ messages in thread From: Bruce Ashfield @ 2011-06-22 21:29 UTC (permalink / raw) To: richard.purdie; +Cc: dvhart, openembedded-core, koen, saul.wold Updating the SRCREV for the kernel repo's meta branch to capture the following commits: 94fa015 meta: add taskstats experimental feature group 4fb2ed5 meta: enable freezer support 88d619e meta: enable fuse and cuse as modules f465827 meta: add namespaces + experimental configs fbdd376 meta: add devtmpfs config group b04f6d9 meta: re-enable cgroups options in the standard kernel There's also a change to the recipe itself to trigger the taskstats optional config items by default. This is to allow the introduction of these changes gradually, since other recipes inheriting the kernel can add or ignore these options at their convenience. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb index 2ee801e..90943c2 100644 --- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb +++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb @@ -20,9 +20,9 @@ SRCREV_machine_qemuppc = "9d278962ff228ea9627a85b0d21ed717246ebf1f" SRCREV_machine_qemux86 = "57545699dff0b384bb16be74b0358059da5cce6a" SRCREV_machine_qemux86-64 = "5d36c23eecdc9663c9c3a2a511d4872d3b3fd669" SRCREV_machine = "12646d158aced2ba0122787bd56ff554e371091c" -SRCREV_meta = "8888d948e0ddbc5f37bd3dc23cc1b398ab230e2e" +SRCREV_meta = "94fa015b130e96a3b6242a8ac4ff4cca9406951f" -PR = "r18" +PR = "r19" PV = "${LINUX_VERSION}+git${SRCPV}" SRCREV_FORMAT = "meta_machine" @@ -33,6 +33,7 @@ COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # Functionality flags KERNEL_REVISION_CHECKING ?= "t" KERNEL_FEATURES="features/netfilter" +KERNEL_FEATURES_append=" features/taskstats" KERNEL_FEATURES_append_qemux86=" cfg/sound" KERNEL_FEATURES_append_qemux86-64=" cfg/sound" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups 2011-06-22 21:29 ` [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups Bruce Ashfield @ 2011-06-27 5:23 ` Cui, Dexuan 2011-06-27 5:26 ` Cui, Dexuan 2011-06-27 12:55 ` Bruce Ashfield 0 siblings, 2 replies; 11+ messages in thread From: Cui, Dexuan @ 2011-06-27 5:23 UTC (permalink / raw) To: 'bruce.ashfield@windriver.com', 'Patches and discussions about the oe-core layer', richard.purdie@linuxfoundation.org Cc: dvhart@linux.intel.com, koen@dominion.thruhere.net, Wold, Saul Hi, I got the following ERROR with the patch: Log data follows: | Unstaged changes after reset: | M arch/powerpc/boot/dts/mpc8315erdb.dts | Deleted branch meta-temp (was cf7d7e5). | WARNING: addon feature "features/taskstats" was not found | ERROR: required features were not found. aborting | ERROR: Function 'do_patch' failed Maybe we forgot to push the proper commits into the linux-yocto git repo? Thanks, -- Dexuan -----Original Message----- From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Bruce Ashfield Sent: 2011年6月23日 5:29 To: richard.purdie@linuxfoundation.org Cc: dvhart@linux.intel.com; openembedded-core@lists.openembedded.org; koen@dominion.thruhere.net; Wold, Saul Subject: [OE-core] [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups Updating the SRCREV for the kernel repo's meta branch to capture the following commits: 94fa015 meta: add taskstats experimental feature group 4fb2ed5 meta: enable freezer support 88d619e meta: enable fuse and cuse as modules f465827 meta: add namespaces + experimental configs fbdd376 meta: add devtmpfs config group b04f6d9 meta: re-enable cgroups options in the standard kernel There's also a change to the recipe itself to trigger the taskstats optional config items by default. This is to allow the introduction of these changes gradually, since other recipes inheriting the kernel can add or ignore these options at their convenience. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb index 2ee801e..90943c2 100644 --- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb +++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb @@ -20,9 +20,9 @@ SRCREV_machine_qemuppc = "9d278962ff228ea9627a85b0d21ed717246ebf1f" SRCREV_machine_qemux86 = "57545699dff0b384bb16be74b0358059da5cce6a" SRCREV_machine_qemux86-64 = "5d36c23eecdc9663c9c3a2a511d4872d3b3fd669" SRCREV_machine = "12646d158aced2ba0122787bd56ff554e371091c" -SRCREV_meta = "8888d948e0ddbc5f37bd3dc23cc1b398ab230e2e" +SRCREV_meta = "94fa015b130e96a3b6242a8ac4ff4cca9406951f" -PR = "r18" +PR = "r19" PV = "${LINUX_VERSION}+git${SRCPV}" SRCREV_FORMAT = "meta_machine" @@ -33,6 +33,7 @@ COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # Functionality flags KERNEL_REVISION_CHECKING ?= "t" KERNEL_FEATURES="features/netfilter" +KERNEL_FEATURES_append=" features/taskstats" KERNEL_FEATURES_append_qemux86=" cfg/sound" KERNEL_FEATURES_append_qemux86-64=" cfg/sound" -- 1.7.0.4 _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups 2011-06-27 5:23 ` Cui, Dexuan @ 2011-06-27 5:26 ` Cui, Dexuan 2011-06-27 12:56 ` Bruce Ashfield 2011-06-27 12:55 ` Bruce Ashfield 1 sibling, 1 reply; 11+ messages in thread From: Cui, Dexuan @ 2011-06-27 5:26 UTC (permalink / raw) To: 'bruce.ashfield@windriver.com', 'Patches and discussions about the oe-core layer', 'richard.purdie@linuxfoundation.org' Cc: 'dvhart@linux.intel.com', 'koen@dominion.thruhere.net', Wold, Saul Cui, Dexuan wrote: > Hi, I got the following ERROR with the patch: > > Log data follows: >> Unstaged changes after reset: >> M arch/powerpc/boot/dts/mpc8315erdb.dts >> Deleted branch meta-temp (was cf7d7e5). >> WARNING: addon feature "features/taskstats" was not found >> ERROR: required features were not found. aborting >> ERROR: Function 'do_patch' failed > > Maybe we forgot to push the proper commits into the linux-yocto git > repo? BTW, I'm building emenlow with today's poky master (commit a1f79a7896b) and mete-intel (commit 76d1178ba). After I reverted the line KERNEL_FEATURES_append=" features/taskstats", at least linux-yocto's do_patch can work. Thanks, -- Dexuan > > > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf > Of Bruce Ashfield Sent: 2011年6月23日 5:29 > To: richard.purdie@linuxfoundation.org > Cc: dvhart@linux.intel.com; openembedded-core@lists.openembedded.org; > koen@dominion.thruhere.net; Wold, Saul > Subject: [OE-core] [PATCH 1/2] linux-yocto: update meta SRCREV for > new config groups > > Updating the SRCREV for the kernel repo's meta branch to capture > the following commits: > > 94fa015 meta: add taskstats experimental feature group > 4fb2ed5 meta: enable freezer support > 88d619e meta: enable fuse and cuse as modules > f465827 meta: add namespaces + experimental configs > fbdd376 meta: add devtmpfs config group > b04f6d9 meta: re-enable cgroups options in the standard kernel > > There's also a change to the recipe itself to trigger the taskstats > optional config items by default. This is to allow the introduction > of these changes gradually, since other recipes inheriting the kernel > can add or ignore these options at their convenience. > > Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> > --- > meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb > b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb > index 2ee801e..90943c2 100644 > --- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb > +++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb > @@ -20,9 +20,9 @@ SRCREV_machine_qemuppc = > "9d278962ff228ea9627a85b0d21ed717246ebf1f" SRCREV_machine_qemux86 = > "57545699dff0b384bb16be74b0358059da5cce6a" SRCREV_machine_qemux86-64 > = "5d36c23eecdc9663c9c3a2a511d4872d3b3fd669" SRCREV_machine = > "12646d158aced2ba0122787bd56ff554e371091c" -SRCREV_meta = > "8888d948e0ddbc5f37bd3dc23cc1b398ab230e2e" +SRCREV_meta = > "94fa015b130e96a3b6242a8ac4ff4cca9406951f" > > -PR = "r18" > +PR = "r19" > PV = "${LINUX_VERSION}+git${SRCPV}" > SRCREV_FORMAT = "meta_machine" > > @@ -33,6 +33,7 @@ COMPATIBLE_MACHINE = > "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # Functionality flags > KERNEL_REVISION_CHECKING ?= "t" > KERNEL_FEATURES="features/netfilter" > +KERNEL_FEATURES_append=" features/taskstats" > KERNEL_FEATURES_append_qemux86=" cfg/sound" > KERNEL_FEATURES_append_qemux86-64=" cfg/sound" ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups 2011-06-27 5:26 ` Cui, Dexuan @ 2011-06-27 12:56 ` Bruce Ashfield 2011-06-27 14:34 ` Tom Zanussi 0 siblings, 1 reply; 11+ messages in thread From: Bruce Ashfield @ 2011-06-27 12:56 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Cc: dvhart@linux.intel.com, koen@dominion.thruhere.net, Wold, Saul 2011/6/27 Cui, Dexuan <dexuan.cui@intel.com>: > Cui, Dexuan wrote: >> Hi, I got the following ERROR with the patch: >> >> Log data follows: >>> Unstaged changes after reset: >>> M arch/powerpc/boot/dts/mpc8315erdb.dts >>> Deleted branch meta-temp (was cf7d7e5). >>> WARNING: addon feature "features/taskstats" was not found >>> ERROR: required features were not found. aborting >>> ERROR: Function 'do_patch' failed >> >> Maybe we forgot to push the proper commits into the linux-yocto git >> repo? > BTW, I'm building emenlow with today's poky master (commit a1f79a7896b) and mete-intel (commit 76d1178ba). > > After I reverted the line > KERNEL_FEATURES_append=" features/taskstats", > at least linux-yocto's do_patch can work. It isn't this. Can you check your local clone in git2/downloads ? Everything that is required is already on the servers, I double checked with a clean build on a clean machine, so there's nothing left to push or fix. Bruce > > Thanks, > -- Dexuan >> >> >> -----Original Message----- >> From: openembedded-core-bounces@lists.openembedded.org >> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf >> Of Bruce Ashfield Sent: 2011年6月23日 5:29 >> To: richard.purdie@linuxfoundation.org >> Cc: dvhart@linux.intel.com; openembedded-core@lists.openembedded.org; >> koen@dominion.thruhere.net; Wold, Saul >> Subject: [OE-core] [PATCH 1/2] linux-yocto: update meta SRCREV for >> new config groups >> >> Updating the SRCREV for the kernel repo's meta branch to capture >> the following commits: >> >> 94fa015 meta: add taskstats experimental feature group >> 4fb2ed5 meta: enable freezer support >> 88d619e meta: enable fuse and cuse as modules >> f465827 meta: add namespaces + experimental configs >> fbdd376 meta: add devtmpfs config group >> b04f6d9 meta: re-enable cgroups options in the standard kernel >> >> There's also a change to the recipe itself to trigger the taskstats >> optional config items by default. This is to allow the introduction >> of these changes gradually, since other recipes inheriting the kernel >> can add or ignore these options at their convenience. >> >> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> >> --- >> meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 5 +++-- >> 1 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb >> b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb >> index 2ee801e..90943c2 100644 >> --- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb >> +++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb >> @@ -20,9 +20,9 @@ SRCREV_machine_qemuppc = >> "9d278962ff228ea9627a85b0d21ed717246ebf1f" SRCREV_machine_qemux86 = >> "57545699dff0b384bb16be74b0358059da5cce6a" SRCREV_machine_qemux86-64 >> = "5d36c23eecdc9663c9c3a2a511d4872d3b3fd669" SRCREV_machine = >> "12646d158aced2ba0122787bd56ff554e371091c" -SRCREV_meta = >> "8888d948e0ddbc5f37bd3dc23cc1b398ab230e2e" +SRCREV_meta = >> "94fa015b130e96a3b6242a8ac4ff4cca9406951f" >> >> -PR = "r18" >> +PR = "r19" >> PV = "${LINUX_VERSION}+git${SRCPV}" >> SRCREV_FORMAT = "meta_machine" >> >> @@ -33,6 +33,7 @@ COMPATIBLE_MACHINE = >> "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # Functionality flags >> KERNEL_REVISION_CHECKING ?= "t" >> KERNEL_FEATURES="features/netfilter" >> +KERNEL_FEATURES_append=" features/taskstats" >> KERNEL_FEATURES_append_qemux86=" cfg/sound" >> KERNEL_FEATURES_append_qemux86-64=" cfg/sound" > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups 2011-06-27 12:56 ` Bruce Ashfield @ 2011-06-27 14:34 ` Tom Zanussi 2011-06-27 14:38 ` Bruce Ashfield 2011-06-28 4:00 ` Cui, Dexuan 0 siblings, 2 replies; 11+ messages in thread From: Tom Zanussi @ 2011-06-27 14:34 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Cc: dvhart@linux.intel.com, koen@dominion.thruhere.net, Wold, Saul On Mon, 2011-06-27 at 05:56 -0700, Bruce Ashfield wrote: > 2011/6/27 Cui, Dexuan <dexuan.cui@intel.com>: > > Cui, Dexuan wrote: > >> Hi, I got the following ERROR with the patch: > >> > >> Log data follows: > >>> Unstaged changes after reset: > >>> M arch/powerpc/boot/dts/mpc8315erdb.dts > >>> Deleted branch meta-temp (was cf7d7e5). > >>> WARNING: addon feature "features/taskstats" was not found > >>> ERROR: required features were not found. aborting > >>> ERROR: Function 'do_patch' failed > >> > >> Maybe we forgot to push the proper commits into the linux-yocto git > >> repo? > > BTW, I'm building emenlow with today's poky master (commit a1f79a7896b) and mete-intel (commit 76d1178ba). > > Just noticed that you were using emenlow so updated the meta-intel SRCREVs, maybe that was the problem? Tom > > After I reverted the line > > KERNEL_FEATURES_append=" features/taskstats", > > at least linux-yocto's do_patch can work. > > It isn't this. Can you check your local clone in git2/downloads ? Everything > that is required is already on the servers, I double checked with a clean build > on a clean machine, so there's nothing left to push or fix. > > Bruce > > > > > Thanks, > > -- Dexuan > >> > >> > >> -----Original Message----- > >> From: openembedded-core-bounces@lists.openembedded.org > >> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf > >> Of Bruce Ashfield Sent: 2011年6月23日 5:29 > >> To: richard.purdie@linuxfoundation.org > >> Cc: dvhart@linux.intel.com; openembedded-core@lists.openembedded.org; > >> koen@dominion.thruhere.net; Wold, Saul > >> Subject: [OE-core] [PATCH 1/2] linux-yocto: update meta SRCREV for > >> new config groups > >> > >> Updating the SRCREV for the kernel repo's meta branch to capture > >> the following commits: > >> > >> 94fa015 meta: add taskstats experimental feature group > >> 4fb2ed5 meta: enable freezer support > >> 88d619e meta: enable fuse and cuse as modules > >> f465827 meta: add namespaces + experimental configs > >> fbdd376 meta: add devtmpfs config group > >> b04f6d9 meta: re-enable cgroups options in the standard kernel > >> > >> There's also a change to the recipe itself to trigger the taskstats > >> optional config items by default. This is to allow the introduction > >> of these changes gradually, since other recipes inheriting the kernel > >> can add or ignore these options at their convenience. > >> > >> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> > >> --- > >> meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 5 +++-- > >> 1 files changed, 3 insertions(+), 2 deletions(-) > >> > >> diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb > >> b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb > >> index 2ee801e..90943c2 100644 > >> --- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb > >> +++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb > >> @@ -20,9 +20,9 @@ SRCREV_machine_qemuppc = > >> "9d278962ff228ea9627a85b0d21ed717246ebf1f" SRCREV_machine_qemux86 = > >> "57545699dff0b384bb16be74b0358059da5cce6a" SRCREV_machine_qemux86-64 > >> = "5d36c23eecdc9663c9c3a2a511d4872d3b3fd669" SRCREV_machine = > >> "12646d158aced2ba0122787bd56ff554e371091c" -SRCREV_meta = > >> "8888d948e0ddbc5f37bd3dc23cc1b398ab230e2e" +SRCREV_meta = > >> "94fa015b130e96a3b6242a8ac4ff4cca9406951f" > >> > >> -PR = "r18" > >> +PR = "r19" > >> PV = "${LINUX_VERSION}+git${SRCPV}" > >> SRCREV_FORMAT = "meta_machine" > >> > >> @@ -33,6 +33,7 @@ COMPATIBLE_MACHINE = > >> "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # Functionality flags > >> KERNEL_REVISION_CHECKING ?= "t" > >> KERNEL_FEATURES="features/netfilter" > >> +KERNEL_FEATURES_append=" features/taskstats" > >> KERNEL_FEATURES_append_qemux86=" cfg/sound" > >> KERNEL_FEATURES_append_qemux86-64=" cfg/sound" > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > > > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups 2011-06-27 14:34 ` Tom Zanussi @ 2011-06-27 14:38 ` Bruce Ashfield 2011-06-28 4:00 ` Cui, Dexuan 1 sibling, 0 replies; 11+ messages in thread From: Bruce Ashfield @ 2011-06-27 14:38 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Cc: dvhart@linux.intel.com, koen@dominion.thruhere.net, Wold, Saul On Mon, Jun 27, 2011 at 10:34 AM, Tom Zanussi <tom.zanussi@intel.com> wrote: > On Mon, 2011-06-27 at 05:56 -0700, Bruce Ashfield wrote: >> 2011/6/27 Cui, Dexuan <dexuan.cui@intel.com>: >> > Cui, Dexuan wrote: >> >> Hi, I got the following ERROR with the patch: >> >> >> >> Log data follows: >> >>> Unstaged changes after reset: >> >>> M arch/powerpc/boot/dts/mpc8315erdb.dts >> >>> Deleted branch meta-temp (was cf7d7e5). >> >>> WARNING: addon feature "features/taskstats" was not found >> >>> ERROR: required features were not found. aborting >> >>> ERROR: Function 'do_patch' failed >> >> >> >> Maybe we forgot to push the proper commits into the linux-yocto git >> >> repo? >> > BTW, I'm building emenlow with today's poky master (commit a1f79a7896b) and mete-intel (commit 76d1178ba). >> > > > Just noticed that you were using emenlow so updated the meta-intel > SRCREVs, maybe that was the problem? Aha! that would be the problem. Is now when we try and kick up the conversion on a way to more efficiently bubble these changes through the BSP layers ? :) Bruce > > Tom > >> > After I reverted the line >> > KERNEL_FEATURES_append=" features/taskstats", >> > at least linux-yocto's do_patch can work. >> >> It isn't this. Can you check your local clone in git2/downloads ? Everything >> that is required is already on the servers, I double checked with a clean build >> on a clean machine, so there's nothing left to push or fix. >> >> Bruce >> >> > >> > Thanks, >> > -- Dexuan >> >> >> >> >> >> -----Original Message----- >> >> From: openembedded-core-bounces@lists.openembedded.org >> >> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf >> >> Of Bruce Ashfield Sent: 2011年6月23日 5:29 >> >> To: richard.purdie@linuxfoundation.org >> >> Cc: dvhart@linux.intel.com; openembedded-core@lists.openembedded.org; >> >> koen@dominion.thruhere.net; Wold, Saul >> >> Subject: [OE-core] [PATCH 1/2] linux-yocto: update meta SRCREV for >> >> new config groups >> >> >> >> Updating the SRCREV for the kernel repo's meta branch to capture >> >> the following commits: >> >> >> >> 94fa015 meta: add taskstats experimental feature group >> >> 4fb2ed5 meta: enable freezer support >> >> 88d619e meta: enable fuse and cuse as modules >> >> f465827 meta: add namespaces + experimental configs >> >> fbdd376 meta: add devtmpfs config group >> >> b04f6d9 meta: re-enable cgroups options in the standard kernel >> >> >> >> There's also a change to the recipe itself to trigger the taskstats >> >> optional config items by default. This is to allow the introduction >> >> of these changes gradually, since other recipes inheriting the kernel >> >> can add or ignore these options at their convenience. >> >> >> >> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> >> >> --- >> >> meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 5 +++-- >> >> 1 files changed, 3 insertions(+), 2 deletions(-) >> >> >> >> diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb >> >> b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb >> >> index 2ee801e..90943c2 100644 >> >> --- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb >> >> +++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb >> >> @@ -20,9 +20,9 @@ SRCREV_machine_qemuppc = >> >> "9d278962ff228ea9627a85b0d21ed717246ebf1f" SRCREV_machine_qemux86 = >> >> "57545699dff0b384bb16be74b0358059da5cce6a" SRCREV_machine_qemux86-64 >> >> = "5d36c23eecdc9663c9c3a2a511d4872d3b3fd669" SRCREV_machine = >> >> "12646d158aced2ba0122787bd56ff554e371091c" -SRCREV_meta = >> >> "8888d948e0ddbc5f37bd3dc23cc1b398ab230e2e" +SRCREV_meta = >> >> "94fa015b130e96a3b6242a8ac4ff4cca9406951f" >> >> >> >> -PR = "r18" >> >> +PR = "r19" >> >> PV = "${LINUX_VERSION}+git${SRCPV}" >> >> SRCREV_FORMAT = "meta_machine" >> >> >> >> @@ -33,6 +33,7 @@ COMPATIBLE_MACHINE = >> >> "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # Functionality flags >> >> KERNEL_REVISION_CHECKING ?= "t" >> >> KERNEL_FEATURES="features/netfilter" >> >> +KERNEL_FEATURES_append=" features/taskstats" >> >> KERNEL_FEATURES_append_qemux86=" cfg/sound" >> >> KERNEL_FEATURES_append_qemux86-64=" cfg/sound" >> > _______________________________________________ >> > Openembedded-core mailing list >> > Openembedded-core@lists.openembedded.org >> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >> > >> >> >> > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups 2011-06-27 14:34 ` Tom Zanussi 2011-06-27 14:38 ` Bruce Ashfield @ 2011-06-28 4:00 ` Cui, Dexuan 1 sibling, 0 replies; 11+ messages in thread From: Cui, Dexuan @ 2011-06-28 4:00 UTC (permalink / raw) To: 'Patches and discussions about the oe-core layer' Cc: dvhart@linux.intel.com, koen@dominion.thruhere.net, Wold, Saul Tom Zanussi wrote: > On Mon, 2011-06-27 at 05:56 -0700, Bruce Ashfield wrote: >> 2011/6/27 Cui, Dexuan <dexuan.cui@intel.com>: >>> Cui, Dexuan wrote: >>>> Hi, I got the following ERROR with the patch: >>>> >>>> Log data follows: >>>>> Unstaged changes after reset: >>>>> M arch/powerpc/boot/dts/mpc8315erdb.dts >>>>> Deleted branch meta-temp (was cf7d7e5). >>>>> WARNING: addon feature "features/taskstats" was not found >>>>> ERROR: required features were not found. aborting >>>>> ERROR: Function 'do_patch' failed >>>> >>>> Maybe we forgot to push the proper commits into the linux-yocto git >>>> repo? >>> BTW, I'm building emenlow with today's poky master (commit >>> a1f79a7896b) and mete-intel (commit 76d1178ba). >>> > > Just noticed that you were using emenlow so updated the meta-intel > SRCREVs, maybe that was the problem? Hi Tom, Yes, that is just the problem. With the new commit "Update kernel SRCREVs" in meta-intel repo, I don't have the issue now. Thank you and Bruce a lot for the quick fixing! Thanks, -- Dexuan ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups 2011-06-27 5:23 ` Cui, Dexuan 2011-06-27 5:26 ` Cui, Dexuan @ 2011-06-27 12:55 ` Bruce Ashfield 1 sibling, 0 replies; 11+ messages in thread From: Bruce Ashfield @ 2011-06-27 12:55 UTC (permalink / raw) To: Patches and discussions about the oe-core layer Cc: dvhart@linux.intel.com, koen@dominion.thruhere.net, Wold, Saul 2011/6/27 Cui, Dexuan <dexuan.cui@intel.com>: > Hi, I got the following ERROR with the patch: > > Log data follows: > | Unstaged changes after reset: > | M arch/powerpc/boot/dts/mpc8315erdb.dts > | Deleted branch meta-temp (was cf7d7e5). > | WARNING: addon feature "features/taskstats" was not found > | ERROR: required features were not found. aborting > | ERROR: Function 'do_patch' failed > > Maybe we forgot to push the proper commits into the linux-yocto git repo? I definitely pushed them all. see here: http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37/commit/?h=meta&id=94fa015b130e96a3b6242a8ac4ff4cca9406951f It's more likely that your local clone wasn't properly updated. I'll double check the SRCREV as well, which I just did. And that's correct as well: http://git.pokylinux.org/cgit/cgit.cgi/linux-yocto-2.6.37/commit/?h=meta&id=d5d3c6480d61f83503ccef7fbcd765f7aca8b71b Bruce > > Thanks, > -- Dexuan > > > -----Original Message----- > From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Bruce Ashfield > Sent: 2011年6月23日 5:29 > To: richard.purdie@linuxfoundation.org > Cc: dvhart@linux.intel.com; openembedded-core@lists.openembedded.org; koen@dominion.thruhere.net; Wold, Saul > Subject: [OE-core] [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups > > Updating the SRCREV for the kernel repo's meta branch to capture > the following commits: > > 94fa015 meta: add taskstats experimental feature group > 4fb2ed5 meta: enable freezer support > 88d619e meta: enable fuse and cuse as modules > f465827 meta: add namespaces + experimental configs > fbdd376 meta: add devtmpfs config group > b04f6d9 meta: re-enable cgroups options in the standard kernel > > There's also a change to the recipe itself to trigger the taskstats > optional config items by default. This is to allow the introduction > of these changes gradually, since other recipes inheriting the kernel > can add or ignore these options at their convenience. > > Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> > --- > meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb > index 2ee801e..90943c2 100644 > --- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb > +++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb > @@ -20,9 +20,9 @@ SRCREV_machine_qemuppc = "9d278962ff228ea9627a85b0d21ed717246ebf1f" > SRCREV_machine_qemux86 = "57545699dff0b384bb16be74b0358059da5cce6a" > SRCREV_machine_qemux86-64 = "5d36c23eecdc9663c9c3a2a511d4872d3b3fd669" > SRCREV_machine = "12646d158aced2ba0122787bd56ff554e371091c" > -SRCREV_meta = "8888d948e0ddbc5f37bd3dc23cc1b398ab230e2e" > +SRCREV_meta = "94fa015b130e96a3b6242a8ac4ff4cca9406951f" > > -PR = "r18" > +PR = "r19" > PV = "${LINUX_VERSION}+git${SRCPV}" > SRCREV_FORMAT = "meta_machine" > > @@ -33,6 +33,7 @@ COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" > # Functionality flags > KERNEL_REVISION_CHECKING ?= "t" > KERNEL_FEATURES="features/netfilter" > +KERNEL_FEATURES_append=" features/taskstats" > KERNEL_FEATURES_append_qemux86=" cfg/sound" > KERNEL_FEATURES_append_qemux86-64=" cfg/sound" > > -- > 1.7.0.4 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/2] linux-yocto: update meta and yocto/standard SRCREVs 2011-06-22 21:29 [PATCH 0/2] linux-yocto: consolidated merge request Bruce Ashfield 2011-06-22 21:29 ` [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups Bruce Ashfield @ 2011-06-22 21:29 ` Bruce Ashfield 2011-06-22 21:57 ` [PATCH 0/2] linux-yocto: consolidated merge request Richard Purdie 2 siblings, 0 replies; 11+ messages in thread From: Bruce Ashfield @ 2011-06-22 21:29 UTC (permalink / raw) To: richard.purdie; +Cc: dvhart, openembedded-core, koen, saul.wold As part of sync'ing the in-tree beagleboard support, the following commit has been pushed to all branches, and hence the SRCREV update: bb8e31f USB: ehci: remove structure packing from ehci_def The meta SRCREV update is to capture the new and sync'd BSP configuration. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb index 90943c2..f244226 100644 --- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb +++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb @@ -14,13 +14,13 @@ KMETA = meta LINUX_VERSION ?= "2.6.37" LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" -SRCREV_machine_qemuarm = "52424d35025cfa43f0d66cf6fa982a5c289a1ba4" -SRCREV_machine_qemumips = "9083f18f40fc6a2baf76fa001bc4858e02f40378" -SRCREV_machine_qemuppc = "9d278962ff228ea9627a85b0d21ed717246ebf1f" -SRCREV_machine_qemux86 = "57545699dff0b384bb16be74b0358059da5cce6a" -SRCREV_machine_qemux86-64 = "5d36c23eecdc9663c9c3a2a511d4872d3b3fd669" -SRCREV_machine = "12646d158aced2ba0122787bd56ff554e371091c" -SRCREV_meta = "94fa015b130e96a3b6242a8ac4ff4cca9406951f" +SRCREV_machine_qemuarm = "92232beb4e72fcf8d85abe79edba0cdf53f1ce41" +SRCREV_machine_qemumips = "30cc7e06fba9126e79b4a0a3219c7d0259638f7a" +SRCREV_machine_qemuppc = "4ae67af1d0ece9944f8e640925aaf69aa5f10e34" +SRCREV_machine_qemux86 = "ea7bcd9e408ddfaf5ecd0bcc37956998add58e2d" +SRCREV_machine_qemux86-64 = "790b4cd5ff0bb8c4f4523763436efd438c692342" +SRCREV_machine = "bb8e31f2c99f5e007660d4540df246fb7ecfa746" +SRCREV_meta = "d5d3c6480d61f83503ccef7fbcd765f7aca8b71b" PR = "r19" PV = "${LINUX_VERSION}+git${SRCPV}" -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] linux-yocto: consolidated merge request 2011-06-22 21:29 [PATCH 0/2] linux-yocto: consolidated merge request Bruce Ashfield 2011-06-22 21:29 ` [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups Bruce Ashfield 2011-06-22 21:29 ` [PATCH 2/2] linux-yocto: update meta and yocto/standard SRCREVs Bruce Ashfield @ 2011-06-22 21:57 ` Richard Purdie 2 siblings, 0 replies; 11+ messages in thread From: Richard Purdie @ 2011-06-22 21:57 UTC (permalink / raw) To: Bruce Ashfield; +Cc: dvhart, openembedded-core, koen, saul.wold On Wed, 2011-06-22 at 17:29 -0400, Bruce Ashfield wrote: > Hi, > > This pull request contains the first iteration of the > base configuration changes discussed on the list about > two weeks ago, and a common USB fix that was identified > during the beagleboard refresh. > > 94fa015 meta: add taskstats experimental feature group > 4fb2ed5 meta: enable freezer support > 88d619e meta: enable fuse and cuse as modules > f465827 meta: add namespaces + experimental configs > fbdd376 meta: add devtmpfs config group > b04f6d9 meta: re-enable cgroups options in the standard kernel > > I've built the relevant qemu targets with the changes, > and my sanity tests have all passed here. > > cc: Koen Kooi <koen@dominion.thruhere.net> > cc: Daren Hart <dvhart@linux.intel.com> > > Cheers, > > Bruce > > > The following changes since commit 46378aec555f08f133bf601be01dacf4bd0b7f05: > Bruce Ashfield (1): > linux-yocto/meta-yocto: update SRCREVs for utrace merge Merged to master (as soon as my push to the repo works), thanks. Richard ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-06-28 4:04 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-06-22 21:29 [PATCH 0/2] linux-yocto: consolidated merge request Bruce Ashfield 2011-06-22 21:29 ` [PATCH 1/2] linux-yocto: update meta SRCREV for new config groups Bruce Ashfield 2011-06-27 5:23 ` Cui, Dexuan 2011-06-27 5:26 ` Cui, Dexuan 2011-06-27 12:56 ` Bruce Ashfield 2011-06-27 14:34 ` Tom Zanussi 2011-06-27 14:38 ` Bruce Ashfield 2011-06-28 4:00 ` Cui, Dexuan 2011-06-27 12:55 ` Bruce Ashfield 2011-06-22 21:29 ` [PATCH 2/2] linux-yocto: update meta and yocto/standard SRCREVs Bruce Ashfield 2011-06-22 21:57 ` [PATCH 0/2] linux-yocto: consolidated merge request Richard Purdie
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox