* Re: [PATCH] bitbake.conf: Exclude MACHINE from OVERRIDES variable dependency list
From: Koen Kooi @ 2011-10-10 15:53 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318261226.23801.49.camel@ted>
Op 10 okt. 2011, om 17:40 heeft Richard Purdie het volgende geschreven:
> On Mon, 2011-10-10 at 17:02 +0200, Koen Kooi wrote:
>> Op 10 okt. 2011, om 16:06 heeft Richard Purdie het volgende geschreven:
>>
>>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>>> ---
>>> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
>>> index a1420cf..11d76b8 100644
>>> --- a/meta/conf/bitbake.conf
>>> +++ b/meta/conf/bitbake.conf
>>> @@ -669,6 +669,7 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
>>> OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
>>> DISTROOVERRIDES ?= "${DISTRO}"
>>> MACHINEOVERRIDES ?= "${MACHINE}"
>>> +OVERRIDES[vardepsexclude] = "MACHINE"
>>>
>>> CPU_FEATURES ?= ""
>>> CPU_FEATURES_arm ?= "vfp"
>>
>>
>> MACHINE=omap4430-panda bitbake bash -c cleansstate
>> MACHINE=beagleboard bitbake bash
>> MACHINE=omap4430-panda bitbake bash
>>
>> It fully built bash in both case, the diffsig sleuthing I was able to do:
>>
>> koen@dominion:/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/stamps/armv7a-angstrom-linux-gnueabi$ ls | grep bash | grep sigdata | sort
>> bash-4.1-r2.do_cleansstate.sigdata.dade34525ff3d7567b7e86b24a36307b
>> bash-4.1-r2.do_fetch.sigdata.15f6bc3de53f1de78303e73688c4f340
>> bash-4.1-r2.do_unpack.sigdata.980bf1d8267fee1ac36b68c96c4f268c
>> bash-4.1-r2.do_patch.sigdata.0185f3c332733ffa162bc38244f2f0b4
>> bash-4.1-r2.do_configure.sigdata.4527bef6d2e22f73a51628c2ac5e7d4e
>> bash-4.1-r2.do_compile.sigdata.d5cb0399ec5f76911c78cfc99a05663a
>> bash-4.1-r2.do_install.sigdata.b1781f7a0718ba9922a970820d565455
>> bash-4.1-r2.do_package.sigdata.2a38d9a1a086e31e620321c1b346514f
>> bash-4.1-r2.do_package.sigdata.4c4f326e3ba2029d207aca186c9ea332
>> bash-4.1-r2.do_package_write_ipk.sigdata.191dbf64100c3b552a86c361a07e134f
>> bash-4.1-r2.do_populate_sysroot.sigdata.1643e8bfc8905ff3f269b8ca40d16d17
>> bash-4.1-r2.do_rm_work_all.sigdata.25cbc1786f8d193c1569e77497d098af
>> bash-4.1-r2.do_rm_work_all.sigdata.d019b1e392601856aa407615da0c54af
>> bash-4.1-r2.do_rm_work.sigdata.1453d491285d51b9a88a913bcc6cc72c
>> bash-4.1-r2.do_rm_work.sigdata.b8f0f9e26355b721638b66069ad83e4e
>> bash-4.1-r2.do_populate_lic.sigdata.c7c785ae2f366e5a0d8bea4e144e43d0
>>
>> koen@dominion:/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/stamps/armv7a-angstrom-linux-gnueabi$ bitbake-diffsigs bash-4.1-r2.do_package.sigdata.2a38d9a1a086e31e620321c1b346514f bash-4.1-r2.do_package.sigdata.4c4f326e3ba2029d207aca186c9ea332
>> basehash changed from da302dbd386f214d39fbd6fb01267c8d to 1b439cf1d8c12894e96e96b299a27c12
>> Variable MACHINE value changed from beagleboard to omap4430-panda
>
> So this tells us what changed but it doesn't tell us why its being
> depended upon. Could you share the output of:
>
> /OE/tentacle/build/tmp-angstrom_2010_x-eglibc/stamps/armv7a-angstrom-linux-gnueabi$ bitbake-diffsigs bash-4.1-r2.do_package.sigdata.2a38d9a1a086e31e620321c1b346514f
>
> please so we can see why bash is depending on MACHINE?
More than 2500 lines:
http://dominion.thruhere.net/koen/angstrom/diffsigs.txt
Some grepping shows:
List of dependencies for variable OVERRIDES is set(['OVERRIDE_INTERWORK', 'OVERRIDE_THUMB', 'DISTROOVERRIDES', 'TARGET_ARCH', 'BUILD_OS', 'PN', 'TARGET_OS', 'MACHINEOVERRIDES'])
List of dependencies for variable MACHINE is set([])
List of dependencies for variable MACHINEOVERRIDES is set(['MACHINE', 'SOC_FAMILY', 'FEED_ARCH'])
Variable OVERRIDES value is ${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}${@bb.utils.contains("TUNE_FEATURES", "no-thumb-interwork", ":thumb-interwork", "", d)}:libc-glibc:libc-glibc
Variable MACHINE value is omap4430-panda
Variable MACHINEOVERRIDES value is ${MACHINE}:${@bb.data.getVar('FEED_ARCH', d,1).replace('all','noarch')}:${SOC_FAMILY}
So does MACHINEOVERRIDES need to get whitelisted as well?
^ permalink raw reply
* Re: [PATCH] bitbake.conf: Exclude MACHINE from OVERRIDES variable dependency list
From: Richard Purdie @ 2011-10-10 15:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1FEC2574-7F52-460C-A837-4A66C9DF1834@dominion.thruhere.net>
On Mon, 2011-10-10 at 17:02 +0200, Koen Kooi wrote:
> Op 10 okt. 2011, om 16:06 heeft Richard Purdie het volgende geschreven:
>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> > index a1420cf..11d76b8 100644
> > --- a/meta/conf/bitbake.conf
> > +++ b/meta/conf/bitbake.conf
> > @@ -669,6 +669,7 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
> > OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
> > DISTROOVERRIDES ?= "${DISTRO}"
> > MACHINEOVERRIDES ?= "${MACHINE}"
> > +OVERRIDES[vardepsexclude] = "MACHINE"
> >
> > CPU_FEATURES ?= ""
> > CPU_FEATURES_arm ?= "vfp"
>
>
> MACHINE=omap4430-panda bitbake bash -c cleansstate
> MACHINE=beagleboard bitbake bash
> MACHINE=omap4430-panda bitbake bash
>
> It fully built bash in both case, the diffsig sleuthing I was able to do:
>
> koen@dominion:/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/stamps/armv7a-angstrom-linux-gnueabi$ ls | grep bash | grep sigdata | sort
> bash-4.1-r2.do_cleansstate.sigdata.dade34525ff3d7567b7e86b24a36307b
> bash-4.1-r2.do_fetch.sigdata.15f6bc3de53f1de78303e73688c4f340
> bash-4.1-r2.do_unpack.sigdata.980bf1d8267fee1ac36b68c96c4f268c
> bash-4.1-r2.do_patch.sigdata.0185f3c332733ffa162bc38244f2f0b4
> bash-4.1-r2.do_configure.sigdata.4527bef6d2e22f73a51628c2ac5e7d4e
> bash-4.1-r2.do_compile.sigdata.d5cb0399ec5f76911c78cfc99a05663a
> bash-4.1-r2.do_install.sigdata.b1781f7a0718ba9922a970820d565455
> bash-4.1-r2.do_package.sigdata.2a38d9a1a086e31e620321c1b346514f
> bash-4.1-r2.do_package.sigdata.4c4f326e3ba2029d207aca186c9ea332
> bash-4.1-r2.do_package_write_ipk.sigdata.191dbf64100c3b552a86c361a07e134f
> bash-4.1-r2.do_populate_sysroot.sigdata.1643e8bfc8905ff3f269b8ca40d16d17
> bash-4.1-r2.do_rm_work_all.sigdata.25cbc1786f8d193c1569e77497d098af
> bash-4.1-r2.do_rm_work_all.sigdata.d019b1e392601856aa407615da0c54af
> bash-4.1-r2.do_rm_work.sigdata.1453d491285d51b9a88a913bcc6cc72c
> bash-4.1-r2.do_rm_work.sigdata.b8f0f9e26355b721638b66069ad83e4e
> bash-4.1-r2.do_populate_lic.sigdata.c7c785ae2f366e5a0d8bea4e144e43d0
>
> koen@dominion:/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/stamps/armv7a-angstrom-linux-gnueabi$ bitbake-diffsigs bash-4.1-r2.do_package.sigdata.2a38d9a1a086e31e620321c1b346514f bash-4.1-r2.do_package.sigdata.4c4f326e3ba2029d207aca186c9ea332
> basehash changed from da302dbd386f214d39fbd6fb01267c8d to 1b439cf1d8c12894e96e96b299a27c12
> Variable MACHINE value changed from beagleboard to omap4430-panda
So this tells us what changed but it doesn't tell us why its being
depended upon. Could you share the output of:
/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/stamps/armv7a-angstrom-linux-gnueabi$ bitbake-diffsigs bash-4.1-r2.do_package.sigdata.2a38d9a1a086e31e620321c1b346514f
please so we can see why bash is depending on MACHINE?
Cheers,
Richard
^ permalink raw reply
* Re: sstate.bbclass: Ensure machine specific stamps are only wiped for the current task
From: Richard Purdie @ 2011-10-10 15:17 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <20111010144136.GD5065@jama.jama.net>
On Mon, 2011-10-10 at 16:41 +0200, Martin Jansa wrote:
> On Mon, Oct 10, 2011 at 04:37:51PM +0200, Koen Kooi wrote:
> >
> > Op 10 okt. 2011, om 16:16 heeft Richard Purdie het volgende geschreven:
> >
> > > On Mon, 2011-10-10 at 13:45 +0200, Martin Jansa wrote:
> > >> On Sun, Oct 09, 2011 at 08:11:45PM +0200, Koen Kooi wrote:
> > >>>
> > >>> Op 9 okt. 2011, om 20:10 heeft Martin Jansa het volgende geschreven:
> > >>>
> > >>>> On Sun, Oct 09, 2011 at 01:25:09PM +0200, Koen Kooi wrote:
> > >>>>>
> > >>>>> Op 6 okt. 2011, om 16:19 heeft Richard Purdie het volgende geschreven:
> > >>>>>
> > >>>>>> sstate was being a little too ethusiastic about removing stamp files and
> > >>>>>> was removing stamp files for other machines when it shouldn't have been.
> > >>>>>>
> > >>>>>> This patch teaches sstate about machine specific stamp extensions and
> > >>>>>> allows it to only remove the current task's stampfiles.
> > >>>>>
> > >>>>> Not sure if it's related to this problem or not but sstate is still not working as intented for me when switching machines, it keeps rebuilding the toolchain when switching machine. What I did this morning:
> > >>>>>
> > >>>>> 1) wipe out tmp, sstate-cache, pseudodone
> > >>>>> 2) MACHINE=beagleboard bitbake u-boot
> > >>>>> 3) cp conf/machine/beagleboard.conf conf/machine/brokensstate.conf
> > >>>>> 4) MACHINE=brokensstate bitbake u-boot
> > >>>>
> > >>>> Same here.. :/ (building 3 armv7 machines.. always "from scratch").
> > >>>
> > >>> To eliminate varables: Angstrom/shr/aurora/micro/other/all of the above?
> > >>
> > >> DISTRO=shr
> > >>
> > >> MACHINE=nokia900 bitbake shr-image -> builds from scratch, finished ok
> > >> MACHINE=palmpre bitbake shr-image -> builds from scratch, finished ok
> > >> MACHINE=palmpre2 bitbake shr-image -> builds from scratch, finished ok
> > >>
> > >> without wiping anything (same tmp, same sstate-cache, same pseudodone)
> > >>
> > >> MACHINE=palmpre bitbake shr-image -> builds from scratch, again!, finished ok
> > >> MACHINE=palmpre2 bitbake shr-image -> builds from scratch, again!, finished ok
> > >> MACHINE=nokia900 bitbake shr-image -> builds from scratch, again!, finished ok
> > >>
> > >> palmpre and palmpre2 are "the same"
> > >> $ cat meta-smartphone/meta-palm/conf/machine/palmpre.conf | grep -v ^#
> > >> require conf/machine/include/palmpre.inc
> > >>
> > >> $ cat meta-smartphone/meta-palm/conf/machine/palmpre2.conf | grep -v ^#
> > >> require conf/machine/include/palmpre.inc
> > >>
> > >> nokia900 is also armv7a-vfp-neon (that's why all packages except
> > >> MACHINE_ARCH were always reused without rebuilding in OE-classic).
> > >>
> > >> I have tried to debug sigdata files to see why and also tried to add
> > >> MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
> > >> as RP suggested, but sofar haven't found solution at least to reuse
> > >> already built sstate packages for armv7a-vfp-neon.
> > >
> > > Also as a tip for debugging this, you can do what is in the following
> > > commit (patch also inline below):
> > >
> > > http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip9&id=1261cc69b152f33b934c2448020dfa3c95f312c6
> > >
> > > which will mean bitbake -n generates stamp files for a given bitbake
> > > run. You can then quickly do:
> > >
> > > MACHINE=A bitbake -n foo
> > > MACHINE=B bitbake -n foo
> > >
> > > for example and then look for cases where two stamp sigdata files were
> > > generated. If you see them you can "bitbake-diffsigs A B" and I'll be
> > > very interested in the results of that and "bitbake-diffsigs A"...
> > >
> > > Cheers,
> > >
> > > Richard
> > >
> > > bitbake: Allow easier dry run stamp debugging
> > >
> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > ---
> > > diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
> >
> > This seems to be against poky instead of bitbake and doesn't apply against bitbake master:
> >
> > koen@dominion:/OE/tentacle/sources/bitbake$ patch -p2 < dry
> > patching file lib/bb/build.py
> > Hunk #1 succeeded at 257 (offset 2 lines).
> > Hunk #2 succeeded at 319 (offset 2 lines).
> > Hunk #3 succeeded at 360 (offset 2 lines).
> > patching file lib/bb/runqueue.py
> > Hunk #1 FAILED at 1156.
> > 1 out of 1 hunk FAILED -- saving rejects to file lib/bb/runqueue.py.rej
>
> Same problem here.. seems like diff is bigger then it was before:
> both current master
>
> OE @ ~/projects $ diff -rq poky/bitbake/ bitbake/ | grep -v pyc | grep -v pyo | grep -v .git
> Only in bitbake/: MANIFEST.in
> Only in bitbake/: TODO
> Only in bitbake/: classes
> Only in bitbake/: conf
>Only in bitbake/: setup.py
These are deliberate and don't make sense in poky.
>Only in poky/bitbake/bin: bitbake-runtask
>Files poky/bitbake/lib/bb/cooker.py and bitbake/lib/bb/cooker.py differ
These are related and I need to get this fixed, there is an open bug
about this.
> Files poky/bitbake/lib/bb/__init__.py and bitbake/lib/bb/__init__.py differ
Not showing up here for me...
> Files poky/bitbake/lib/bb/parse/parse_py/BBHandler.py and bitbake/lib/bb/parse/parse_py/BBHandler.py differ
This is whitespace only.
> Files poky/bitbake/lib/bb/pysh/pyshtables.py and bitbake/lib/bb/pysh/pyshtables.py differ
This is a generated file and in neither repository.
> Only in poky/bitbake/lib/bb: shell.py
This is a reminder that we'd like a bitbake shell to come back.
>Files poky/bitbake/lib/bb/runqueue.py and bitbake/lib/bb/runqueue.py differ
>Files poky/bitbake/lib/bb/build.py and bitbake/lib/bb/build.py differ
and these are the main "problem". Some is related to the bitbake-runtask
piece above, there were also a couple of patches I didn't like to
bitbake and didn't take into poky.
There isn't anything particularly major here, just reminders of areas
that could do with some dedicated cleanup or rethinking. Bitbake master
takes the short cut of skipping tasks during dry run without forking. My
patch assumes that the fork is made to generate the stamps. An updated
patch is below.
Cheers,
Richard
diff --git a/lib/bb/build.py b/lib/bb/build.py
index 70cc809..5ae8ba4 100644
--- a/lib/bb/build.py
+++ b/lib/bb/build.py
@@ -257,7 +257,7 @@ def _task_data(fn, task, d):
data.expandKeys(localdata)
return localdata
-def _exec_task(fn, task, d, quieterr):
+def _exec_task(fn, task, d, quieterr, dryrun=False):
"""Execute a BB 'task'
Execution of a task involves a bit more setup than executing a function,
@@ -319,10 +319,13 @@ def _exec_task(fn, task, d, quieterr):
event.fire(TaskStarted(task, localdata), localdata)
try:
for func in (prefuncs or '').split():
- exec_func(func, localdata)
- exec_func(task, localdata)
+ if not dryrun:
+ exec_func(func, localdata)
+ if not dryrun:
+ exec_func(task, localdata)
for func in (postfuncs or '').split():
- exec_func(func, localdata)
+ if not dryrun:
+ exec_func(func, localdata)
except FuncFailed as exc:
if not quieterr:
logger.error(str(exc))
@@ -357,13 +360,13 @@ def _exec_task(fn, task, d, quieterr):
return 0
-def exec_task(fn, task, d):
+def exec_task(fn, task, d, dryrun=False):
try:
quieterr = False
if d.getVarFlag(task, "quieterrors") is not None:
quieterr = True
- return _exec_task(fn, task, d, quieterr)
+ return _exec_task(fn, task, d, quieterr, dryrun)
except Exception:
from traceback import format_exc
if not quieterr:
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 9a1bad7..61aba1b 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -1156,7 +1156,7 @@ class RunQueueExecute:
logger.critical(str(exc))
os._exit(1)
try:
- ret = bb.build.exec_task(fn, taskname, the_data)
+ ret = bb.build.exec_task(fn, taskname, the_data, self.cooker.configuration.dry_run)
os._exit(ret)
except:
os._exit(1)
@@ -1329,12 +1329,6 @@ class RunQueueExecuteTasks(RunQueueExecute):
self.rqdata.get_user_idstring(task))
self.task_skip(task)
return True
- elif self.cooker.configuration.dry_run:
- self.runq_running[task] = 1
- self.runq_buildable[task] = 1
- self.stats.taskActive()
- self.task_complete(task)
- return True
taskdep = self.rqdata.dataCache.task_deps[fn]
if 'noexec' in taskdep and taskname in taskdep['noexec']:
^ permalink raw reply related
* Re: [PATCH] bitbake.conf: Exclude MACHINE from OVERRIDES variable dependency list
From: Koen Kooi @ 2011-10-10 15:02 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318255623.23801.31.camel@ted>
Op 10 okt. 2011, om 16:06 heeft Richard Purdie het volgende geschreven:
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index a1420cf..11d76b8 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -669,6 +669,7 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
> OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
> DISTROOVERRIDES ?= "${DISTRO}"
> MACHINEOVERRIDES ?= "${MACHINE}"
> +OVERRIDES[vardepsexclude] = "MACHINE"
>
> CPU_FEATURES ?= ""
> CPU_FEATURES_arm ?= "vfp"
MACHINE=omap4430-panda bitbake bash -c cleansstate
MACHINE=beagleboard bitbake bash
MACHINE=omap4430-panda bitbake bash
It fully built bash in both case, the diffsig sleuthing I was able to do:
koen@dominion:/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/stamps/armv7a-angstrom-linux-gnueabi$ ls | grep bash | grep sigdata | sort
bash-4.1-r2.do_cleansstate.sigdata.dade34525ff3d7567b7e86b24a36307b
bash-4.1-r2.do_fetch.sigdata.15f6bc3de53f1de78303e73688c4f340
bash-4.1-r2.do_unpack.sigdata.980bf1d8267fee1ac36b68c96c4f268c
bash-4.1-r2.do_patch.sigdata.0185f3c332733ffa162bc38244f2f0b4
bash-4.1-r2.do_configure.sigdata.4527bef6d2e22f73a51628c2ac5e7d4e
bash-4.1-r2.do_compile.sigdata.d5cb0399ec5f76911c78cfc99a05663a
bash-4.1-r2.do_install.sigdata.b1781f7a0718ba9922a970820d565455
bash-4.1-r2.do_package.sigdata.2a38d9a1a086e31e620321c1b346514f
bash-4.1-r2.do_package.sigdata.4c4f326e3ba2029d207aca186c9ea332
bash-4.1-r2.do_package_write_ipk.sigdata.191dbf64100c3b552a86c361a07e134f
bash-4.1-r2.do_populate_sysroot.sigdata.1643e8bfc8905ff3f269b8ca40d16d17
bash-4.1-r2.do_rm_work_all.sigdata.25cbc1786f8d193c1569e77497d098af
bash-4.1-r2.do_rm_work_all.sigdata.d019b1e392601856aa407615da0c54af
bash-4.1-r2.do_rm_work.sigdata.1453d491285d51b9a88a913bcc6cc72c
bash-4.1-r2.do_rm_work.sigdata.b8f0f9e26355b721638b66069ad83e4e
bash-4.1-r2.do_populate_lic.sigdata.c7c785ae2f366e5a0d8bea4e144e43d0
koen@dominion:/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/stamps/armv7a-angstrom-linux-gnueabi$ bitbake-diffsigs bash-4.1-r2.do_package.sigdata.2a38d9a1a086e31e620321c1b346514f bash-4.1-r2.do_package.sigdata.4c4f326e3ba2029d207aca186c9ea332
basehash changed from da302dbd386f214d39fbd6fb01267c8d to 1b439cf1d8c12894e96e96b299a27c12
Variable MACHINE value changed from beagleboard to omap4430-panda
Hash for dependent task /OE/tentacle/sources/openembedded-core/meta/recipes-devtools/libtool/libtool-cross_2.4.bb.do_package changed from 98213433ce27776be6f1aa236cbcb6d6 to 49add8f8b038b933aa29dd5d90f06c5b
Hash for dependent task virtual:native:/OE/tentacle/sources/openembedded-core/meta/recipes-devtools/autoconf/autoconf_2.68.bb.do_package changed from dd35fff900f7fd369bbb9eb360308c38 to beef6d088d6d3fff588e78a87a4a4380
Hash for dependent task virtual:native:/OE/tentacle/sources/openembedded-core/meta/recipes-core/gettext/gettext_0.18.1.1.bb.do_package changed from 30e0a0e6c69119f07c8d1a0d697a86e9 to 2087c79a461c2b312b7c988b29e7cb2d
Hash for dependent task virtual:native:/OE/tentacle/sources/openembedded-core/meta/recipes-devtools/gnu-config/gnu-config_20080123.bb.do_package changed from 017db30f24324e1d2db3ca2b664b68cc to 411dfae70ffa50f8b52a2d9a07948c91
Hash for dependent task /OE/tentacle/sources/openembedded-core/meta/recipes-core/gettext/gettext_0.18.1.1.bb.do_package changed from 035d53ae6aa5c89a0272671f28214949 to b160afaacda3f764244c16dfa4455cf0
Hash for dependent task virtual:native:/OE/tentacle/sources/openembedded-core/meta/recipes-devtools/automake/automake_1.11.1.bb.do_package changed from feb06b92c7f806cfe8fc24e1914c0047 to 45f0207af62a6142d66da0692f3d6121
Hash for dependent task /OE/tentacle/sources/meta-openembedded/meta-oe/recipes-core/eglibc/eglibc_2.12.bb.do_package changed from 04dcab1d3d0c51bdb6c415c8a2b9ff54 to c23a8d2301faed76bbb7be8883a9aa88
Hash for dependent task /OE/tentacle/sources/meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-cross_4.5.bb.do_package changed from 8666b64d68eb05e4060759f0a6a4db5e to 183f985ad016d9eecf65a117df3b5ef2
Hash for dependent task virtual:native:/OE/tentacle/sources/openembedded-core/meta/recipes-devtools/bison/bison_2.5.bb.do_package changed from b8a24af74efee0ca32c2cb8e2b8d14e3 to d3b72610abb4dba152942df5f2455665
Hash for dependent task /OE/tentacle/sources/openembedded-core/meta/recipes-devtools/libtool/libtool-native_2.4.bb.do_package changed from 03ef6e8d51de68fe2f59511a286e6039 to c3e0e363794b7f783b436ac974a1343c
Hash for dependent task /OE/tentacle/sources/meta-openembedded/meta-oe/recipes-devtools/gcc/gcc-runtime_4.5.bb.do_package changed from e377698b3e70352a515f783e416c9506 to ca985e80d151e9ccded4caff4c462fa6
Hash for dependent task /OE/tentacle/sources/openembedded-core/meta/recipes-core/ncurses/ncurses_5.9.bb.do_package changed from 7975ab7832c91d8d2d62136fa16c7c4d to 7177629405a668b2cab828455c418302
^ permalink raw reply
* Re: [PATCH 1/3] autotools: fix multi-word arguments for EXTRA_OECONF
From: Chris Larson @ 2011-10-10 14:58 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <7F3A6782-444C-4722-8791-6D75B70FEB57@dominion.thruhere.net>
On Fri, Oct 7, 2011 at 3:34 PM, Koen Kooi <koen@beagleboard.org> wrote:
>>
>> oe_runconf () {
>> - if [ -x ${S}/configure ] ; then
>> - cfgcmd="${S}/configure \
>> - ${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
>> - bbnote "Running $cfgcmd..."
>> - $cfgcmd || bbfatal "oe_runconf failed"
>> - else
>> - bbfatal "no configure script found"
>> - fi
>> + if [ -x ${S}/configure ] ; then
>> + bbnote "Running ${S}/configure ${CONFIGUREOPTS}
>> ${EXTRA_OECONF} $@"
>> + ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@" ||
>> bbfatal "oe_runconf failed"
>> + else
>> + bbfatal "no configure script found"
>> + f
>
> Was the tab->spaces conversion intentional?
Erm, nope, well spotted, thanks.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
^ permalink raw reply
* Re: sstate.bbclass: Ensure machine specific stamps are only wiped for the current task
From: Martin Jansa @ 2011-10-10 14:41 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <20848535-6A4E-47B5-9F7D-E96F00402867@dominion.thruhere.net>
[-- Attachment #1: Type: text/plain, Size: 5153 bytes --]
On Mon, Oct 10, 2011 at 04:37:51PM +0200, Koen Kooi wrote:
>
> Op 10 okt. 2011, om 16:16 heeft Richard Purdie het volgende geschreven:
>
> > On Mon, 2011-10-10 at 13:45 +0200, Martin Jansa wrote:
> >> On Sun, Oct 09, 2011 at 08:11:45PM +0200, Koen Kooi wrote:
> >>>
> >>> Op 9 okt. 2011, om 20:10 heeft Martin Jansa het volgende geschreven:
> >>>
> >>>> On Sun, Oct 09, 2011 at 01:25:09PM +0200, Koen Kooi wrote:
> >>>>>
> >>>>> Op 6 okt. 2011, om 16:19 heeft Richard Purdie het volgende geschreven:
> >>>>>
> >>>>>> sstate was being a little too ethusiastic about removing stamp files and
> >>>>>> was removing stamp files for other machines when it shouldn't have been.
> >>>>>>
> >>>>>> This patch teaches sstate about machine specific stamp extensions and
> >>>>>> allows it to only remove the current task's stampfiles.
> >>>>>
> >>>>> Not sure if it's related to this problem or not but sstate is still not working as intented for me when switching machines, it keeps rebuilding the toolchain when switching machine. What I did this morning:
> >>>>>
> >>>>> 1) wipe out tmp, sstate-cache, pseudodone
> >>>>> 2) MACHINE=beagleboard bitbake u-boot
> >>>>> 3) cp conf/machine/beagleboard.conf conf/machine/brokensstate.conf
> >>>>> 4) MACHINE=brokensstate bitbake u-boot
> >>>>
> >>>> Same here.. :/ (building 3 armv7 machines.. always "from scratch").
> >>>
> >>> To eliminate varables: Angstrom/shr/aurora/micro/other/all of the above?
> >>
> >> DISTRO=shr
> >>
> >> MACHINE=nokia900 bitbake shr-image -> builds from scratch, finished ok
> >> MACHINE=palmpre bitbake shr-image -> builds from scratch, finished ok
> >> MACHINE=palmpre2 bitbake shr-image -> builds from scratch, finished ok
> >>
> >> without wiping anything (same tmp, same sstate-cache, same pseudodone)
> >>
> >> MACHINE=palmpre bitbake shr-image -> builds from scratch, again!, finished ok
> >> MACHINE=palmpre2 bitbake shr-image -> builds from scratch, again!, finished ok
> >> MACHINE=nokia900 bitbake shr-image -> builds from scratch, again!, finished ok
> >>
> >> palmpre and palmpre2 are "the same"
> >> $ cat meta-smartphone/meta-palm/conf/machine/palmpre.conf | grep -v ^#
> >> require conf/machine/include/palmpre.inc
> >>
> >> $ cat meta-smartphone/meta-palm/conf/machine/palmpre2.conf | grep -v ^#
> >> require conf/machine/include/palmpre.inc
> >>
> >> nokia900 is also armv7a-vfp-neon (that's why all packages except
> >> MACHINE_ARCH were always reused without rebuilding in OE-classic).
> >>
> >> I have tried to debug sigdata files to see why and also tried to add
> >> MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
> >> as RP suggested, but sofar haven't found solution at least to reuse
> >> already built sstate packages for armv7a-vfp-neon.
> >
> > Also as a tip for debugging this, you can do what is in the following
> > commit (patch also inline below):
> >
> > http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip9&id=1261cc69b152f33b934c2448020dfa3c95f312c6
> >
> > which will mean bitbake -n generates stamp files for a given bitbake
> > run. You can then quickly do:
> >
> > MACHINE=A bitbake -n foo
> > MACHINE=B bitbake -n foo
> >
> > for example and then look for cases where two stamp sigdata files were
> > generated. If you see them you can "bitbake-diffsigs A B" and I'll be
> > very interested in the results of that and "bitbake-diffsigs A"...
> >
> > Cheers,
> >
> > Richard
> >
> > bitbake: Allow easier dry run stamp debugging
> >
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
>
> This seems to be against poky instead of bitbake and doesn't apply against bitbake master:
>
> koen@dominion:/OE/tentacle/sources/bitbake$ patch -p2 < dry
> patching file lib/bb/build.py
> Hunk #1 succeeded at 257 (offset 2 lines).
> Hunk #2 succeeded at 319 (offset 2 lines).
> Hunk #3 succeeded at 360 (offset 2 lines).
> patching file lib/bb/runqueue.py
> Hunk #1 FAILED at 1156.
> 1 out of 1 hunk FAILED -- saving rejects to file lib/bb/runqueue.py.rej
Same problem here.. seems like diff is bigger then it was before:
both current master
OE @ ~/projects $ diff -rq poky/bitbake/ bitbake/ | grep -v pyc | grep -v pyo | grep -v .git
Only in bitbake/: MANIFEST.in
Only in bitbake/: TODO
Only in poky/bitbake/bin: bitbake-runtask
Only in bitbake/: classes
Only in bitbake/: conf
Files poky/bitbake/lib/bb/__init__.py and bitbake/lib/bb/__init__.py differ
Files poky/bitbake/lib/bb/build.py and bitbake/lib/bb/build.py differ
Files poky/bitbake/lib/bb/cooker.py and bitbake/lib/bb/cooker.py differ
Files poky/bitbake/lib/bb/parse/parse_py/BBHandler.py and bitbake/lib/bb/parse/parse_py/BBHandler.py differ
Files poky/bitbake/lib/bb/pysh/pyshtables.py and bitbake/lib/bb/pysh/pyshtables.py differ
Files poky/bitbake/lib/bb/runqueue.py and bitbake/lib/bb/runqueue.py differ
Only in poky/bitbake/lib/bb: shell.py
Only in bitbake/: setup.py
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply
* Re: sstate.bbclass: Ensure machine specific stamps are only wiped for the current task
From: Koen Kooi @ 2011-10-10 14:37 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318256216.23801.37.camel@ted>
Op 10 okt. 2011, om 16:16 heeft Richard Purdie het volgende geschreven:
> On Mon, 2011-10-10 at 13:45 +0200, Martin Jansa wrote:
>> On Sun, Oct 09, 2011 at 08:11:45PM +0200, Koen Kooi wrote:
>>>
>>> Op 9 okt. 2011, om 20:10 heeft Martin Jansa het volgende geschreven:
>>>
>>>> On Sun, Oct 09, 2011 at 01:25:09PM +0200, Koen Kooi wrote:
>>>>>
>>>>> Op 6 okt. 2011, om 16:19 heeft Richard Purdie het volgende geschreven:
>>>>>
>>>>>> sstate was being a little too ethusiastic about removing stamp files and
>>>>>> was removing stamp files for other machines when it shouldn't have been.
>>>>>>
>>>>>> This patch teaches sstate about machine specific stamp extensions and
>>>>>> allows it to only remove the current task's stampfiles.
>>>>>
>>>>> Not sure if it's related to this problem or not but sstate is still not working as intented for me when switching machines, it keeps rebuilding the toolchain when switching machine. What I did this morning:
>>>>>
>>>>> 1) wipe out tmp, sstate-cache, pseudodone
>>>>> 2) MACHINE=beagleboard bitbake u-boot
>>>>> 3) cp conf/machine/beagleboard.conf conf/machine/brokensstate.conf
>>>>> 4) MACHINE=brokensstate bitbake u-boot
>>>>
>>>> Same here.. :/ (building 3 armv7 machines.. always "from scratch").
>>>
>>> To eliminate varables: Angstrom/shr/aurora/micro/other/all of the above?
>>
>> DISTRO=shr
>>
>> MACHINE=nokia900 bitbake shr-image -> builds from scratch, finished ok
>> MACHINE=palmpre bitbake shr-image -> builds from scratch, finished ok
>> MACHINE=palmpre2 bitbake shr-image -> builds from scratch, finished ok
>>
>> without wiping anything (same tmp, same sstate-cache, same pseudodone)
>>
>> MACHINE=palmpre bitbake shr-image -> builds from scratch, again!, finished ok
>> MACHINE=palmpre2 bitbake shr-image -> builds from scratch, again!, finished ok
>> MACHINE=nokia900 bitbake shr-image -> builds from scratch, again!, finished ok
>>
>> palmpre and palmpre2 are "the same"
>> $ cat meta-smartphone/meta-palm/conf/machine/palmpre.conf | grep -v ^#
>> require conf/machine/include/palmpre.inc
>>
>> $ cat meta-smartphone/meta-palm/conf/machine/palmpre2.conf | grep -v ^#
>> require conf/machine/include/palmpre.inc
>>
>> nokia900 is also armv7a-vfp-neon (that's why all packages except
>> MACHINE_ARCH were always reused without rebuilding in OE-classic).
>>
>> I have tried to debug sigdata files to see why and also tried to add
>> MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
>> as RP suggested, but sofar haven't found solution at least to reuse
>> already built sstate packages for armv7a-vfp-neon.
>
> Also as a tip for debugging this, you can do what is in the following
> commit (patch also inline below):
>
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip9&id=1261cc69b152f33b934c2448020dfa3c95f312c6
>
> which will mean bitbake -n generates stamp files for a given bitbake
> run. You can then quickly do:
>
> MACHINE=A bitbake -n foo
> MACHINE=B bitbake -n foo
>
> for example and then look for cases where two stamp sigdata files were
> generated. If you see them you can "bitbake-diffsigs A B" and I'll be
> very interested in the results of that and "bitbake-diffsigs A"...
>
> Cheers,
>
> Richard
>
> bitbake: Allow easier dry run stamp debugging
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
This seems to be against poky instead of bitbake and doesn't apply against bitbake master:
koen@dominion:/OE/tentacle/sources/bitbake$ patch -p2 < dry
patching file lib/bb/build.py
Hunk #1 succeeded at 257 (offset 2 lines).
Hunk #2 succeeded at 319 (offset 2 lines).
Hunk #3 succeeded at 360 (offset 2 lines).
patching file lib/bb/runqueue.py
Hunk #1 FAILED at 1156.
1 out of 1 hunk FAILED -- saving rejects to file lib/bb/runqueue.py.rej
^ permalink raw reply
* Re: sstate.bbclass: Ensure machine specific stamps are only wiped for the current task
From: Richard Purdie @ 2011-10-10 14:17 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <20111010114506.GC5065@jama.jama.net>
On Mon, 2011-10-10 at 13:45 +0200, Martin Jansa wrote:
> On Sun, Oct 09, 2011 at 08:11:45PM +0200, Koen Kooi wrote:
> >
> > Op 9 okt. 2011, om 20:10 heeft Martin Jansa het volgende geschreven:
> >
> > > On Sun, Oct 09, 2011 at 01:25:09PM +0200, Koen Kooi wrote:
> > >>
> > >> Op 6 okt. 2011, om 16:19 heeft Richard Purdie het volgende geschreven:
> > >>
> > >>> sstate was being a little too ethusiastic about removing stamp files and
> > >>> was removing stamp files for other machines when it shouldn't have been.
> > >>>
> > >>> This patch teaches sstate about machine specific stamp extensions and
> > >>> allows it to only remove the current task's stampfiles.
> > >>
> > >> Not sure if it's related to this problem or not but sstate is still not working as intented for me when switching machines, it keeps rebuilding the toolchain when switching machine. What I did this morning:
> > >>
> > >> 1) wipe out tmp, sstate-cache, pseudodone
> > >> 2) MACHINE=beagleboard bitbake u-boot
> > >> 3) cp conf/machine/beagleboard.conf conf/machine/brokensstate.conf
> > >> 4) MACHINE=brokensstate bitbake u-boot
> > >
> > > Same here.. :/ (building 3 armv7 machines.. always "from scratch").
> >
> > To eliminate varables: Angstrom/shr/aurora/micro/other/all of the above?
>
> DISTRO=shr
>
> MACHINE=nokia900 bitbake shr-image -> builds from scratch, finished ok
> MACHINE=palmpre bitbake shr-image -> builds from scratch, finished ok
> MACHINE=palmpre2 bitbake shr-image -> builds from scratch, finished ok
>
> without wiping anything (same tmp, same sstate-cache, same pseudodone)
>
> MACHINE=palmpre bitbake shr-image -> builds from scratch, again!, finished ok
> MACHINE=palmpre2 bitbake shr-image -> builds from scratch, again!, finished ok
> MACHINE=nokia900 bitbake shr-image -> builds from scratch, again!, finished ok
>
> palmpre and palmpre2 are "the same"
> $ cat meta-smartphone/meta-palm/conf/machine/palmpre.conf | grep -v ^#
> require conf/machine/include/palmpre.inc
>
> $ cat meta-smartphone/meta-palm/conf/machine/palmpre2.conf | grep -v ^#
> require conf/machine/include/palmpre.inc
>
> nokia900 is also armv7a-vfp-neon (that's why all packages except
> MACHINE_ARCH were always reused without rebuilding in OE-classic).
>
> I have tried to debug sigdata files to see why and also tried to add
> MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
> as RP suggested, but sofar haven't found solution at least to reuse
> already built sstate packages for armv7a-vfp-neon.
I've posted a patch which at least locally solves the issue with the "cp
MACHINEA MACHINEB". If there are more issues I'd be interested, see my
separate email with some debugging tips.
Cheers,
Richard
^ permalink raw reply
* Re: sstate.bbclass: Ensure machine specific stamps are only wiped for the current task
From: Richard Purdie @ 2011-10-10 14:16 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <20111010114506.GC5065@jama.jama.net>
On Mon, 2011-10-10 at 13:45 +0200, Martin Jansa wrote:
> On Sun, Oct 09, 2011 at 08:11:45PM +0200, Koen Kooi wrote:
> >
> > Op 9 okt. 2011, om 20:10 heeft Martin Jansa het volgende geschreven:
> >
> > > On Sun, Oct 09, 2011 at 01:25:09PM +0200, Koen Kooi wrote:
> > >>
> > >> Op 6 okt. 2011, om 16:19 heeft Richard Purdie het volgende geschreven:
> > >>
> > >>> sstate was being a little too ethusiastic about removing stamp files and
> > >>> was removing stamp files for other machines when it shouldn't have been.
> > >>>
> > >>> This patch teaches sstate about machine specific stamp extensions and
> > >>> allows it to only remove the current task's stampfiles.
> > >>
> > >> Not sure if it's related to this problem or not but sstate is still not working as intented for me when switching machines, it keeps rebuilding the toolchain when switching machine. What I did this morning:
> > >>
> > >> 1) wipe out tmp, sstate-cache, pseudodone
> > >> 2) MACHINE=beagleboard bitbake u-boot
> > >> 3) cp conf/machine/beagleboard.conf conf/machine/brokensstate.conf
> > >> 4) MACHINE=brokensstate bitbake u-boot
> > >
> > > Same here.. :/ (building 3 armv7 machines.. always "from scratch").
> >
> > To eliminate varables: Angstrom/shr/aurora/micro/other/all of the above?
>
> DISTRO=shr
>
> MACHINE=nokia900 bitbake shr-image -> builds from scratch, finished ok
> MACHINE=palmpre bitbake shr-image -> builds from scratch, finished ok
> MACHINE=palmpre2 bitbake shr-image -> builds from scratch, finished ok
>
> without wiping anything (same tmp, same sstate-cache, same pseudodone)
>
> MACHINE=palmpre bitbake shr-image -> builds from scratch, again!, finished ok
> MACHINE=palmpre2 bitbake shr-image -> builds from scratch, again!, finished ok
> MACHINE=nokia900 bitbake shr-image -> builds from scratch, again!, finished ok
>
> palmpre and palmpre2 are "the same"
> $ cat meta-smartphone/meta-palm/conf/machine/palmpre.conf | grep -v ^#
> require conf/machine/include/palmpre.inc
>
> $ cat meta-smartphone/meta-palm/conf/machine/palmpre2.conf | grep -v ^#
> require conf/machine/include/palmpre.inc
>
> nokia900 is also armv7a-vfp-neon (that's why all packages except
> MACHINE_ARCH were always reused without rebuilding in OE-classic).
>
> I have tried to debug sigdata files to see why and also tried to add
> MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
> as RP suggested, but sofar haven't found solution at least to reuse
> already built sstate packages for armv7a-vfp-neon.
Also as a tip for debugging this, you can do what is in the following
commit (patch also inline below):
http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip9&id=1261cc69b152f33b934c2448020dfa3c95f312c6
which will mean bitbake -n generates stamp files for a given bitbake
run. You can then quickly do:
MACHINE=A bitbake -n foo
MACHINE=B bitbake -n foo
for example and then look for cases where two stamp sigdata files were
generated. If you see them you can "bitbake-diffsigs A B" and I'll be
very interested in the results of that and "bitbake-diffsigs A"...
Cheers,
Richard
bitbake: Allow easier dry run stamp debugging
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 8937f08..efa9ffe 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -255,7 +255,7 @@ def _task_data(fn, task, d):
data.expandKeys(localdata)
return localdata
-def _exec_task(fn, task, d, quieterr):
+def _exec_task(fn, task, d, quieterr, dryrun=False):
"""Execute a BB 'task'
Execution of a task involves a bit more setup than executing a function,
@@ -317,10 +317,13 @@ def _exec_task(fn, task, d, quieterr):
event.fire(TaskStarted(task, localdata), localdata)
try:
for func in (prefuncs or '').split():
- exec_func(func, localdata)
- exec_func(task, localdata)
+ if not dryrun:
+ exec_func(func, localdata)
+ if not dryrun:
+ exec_func(task, localdata)
for func in (postfuncs or '').split():
- exec_func(func, localdata)
+ if not dryrun:
+ exec_func(func, localdata)
except FuncFailed as exc:
if not quieterr:
logger.error(str(exc))
@@ -355,13 +358,13 @@ def _exec_task(fn, task, d, quieterr):
return 0
-def exec_task(fn, task, d):
+def exec_task(fn, task, d, dryrun=False):
try:
quieterr = False
if d.getVarFlag(task, "quieterrors") is not None:
quieterr = True
- return _exec_task(fn, task, d, quieterr)
+ return _exec_task(fn, task, d, quieterr, dryrun)
except Exception:
from traceback import format_exc
if not quieterr:
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index aca06b5..e53da56 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1156,8 +1156,7 @@ class RunQueueExecute:
logger.critical(str(exc))
os._exit(1)
try:
- if not self.cooker.configuration.dry_run:
- ret = bb.build.exec_task(fn, taskname, the_data)
+ ret = bb.build.exec_task(fn, taskname, the_data, self.cooker.configuration.dry_run)
os._exit(ret)
except:
os._exit(1)
^ permalink raw reply related
* [PATCH] bitbake.conf: Exclude MACHINE from OVERRIDES variable dependency list
From: Richard Purdie @ 2011-10-10 14:06 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a1420cf..11d76b8 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -669,6 +669,7 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
DISTROOVERRIDES ?= "${DISTRO}"
MACHINEOVERRIDES ?= "${MACHINE}"
+OVERRIDES[vardepsexclude] = "MACHINE"
CPU_FEATURES ?= ""
CPU_FEATURES_arm ?= "vfp"
^ permalink raw reply related
* Re: shared-mime-info: Fix a parallel make race
From: Koen Kooi @ 2011-10-10 13:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318251309.23801.28.camel@ted>
Op 10 okt. 2011, om 14:54 heeft Richard Purdie het volgende geschreven:
>
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
> new file mode 100644
> index 0000000..9e86a71
> --- a/dev/null
> +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
> @@ -0,0 +1,32 @@
> +The Makefile used by shared-mime-info is one big race with the SUBDIRS
> +option and the dependency specifically calling make all combining to
> +create multiple make instances all of which may try and build targets
> +like update-mime-database.
> +
> +This patch removes those options meaning make can correctly identify
> +dependencies and stop itself racing itself.
> +
> +RP 10/10/2011
> +
> +Upstream-status: Pending
> +
> +Index: shared-mime-info-0.91/Makefile.am
> +===================================================================
> +--- shared-mime-info-0.91.orig/Makefile.am 2011-10-10 21:47:19.834173921 +0100
> ++++ shared-mime-info-0.91/Makefile.am 2011-10-10 21:45:57.000000000 +0100
> +@@ -1,5 +1,3 @@
> +-SUBDIRS=. po
> +-
> + INCLUDES = $(ALL_CFLAGS)
> +
> + packagesdir = $(datadir)/mime/packages
> +@@ -70,8 +68,7 @@
> +
> + all: check create-pot
> +
> +-create-pot:
> +- $(MAKE) -C po shared-mime-info.pot
> ++create-pot: po
> +
> + check: create-pot freedesktop.org.xml update-mime-database check-translations
> + if test -e $(top_builddir)/freedesktop.org.xml; then \
> diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
> index 76d2756..ac2dde1 100644
> --- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
> +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
> @@ -4,3 +4,4 @@ PR = "r0"
> SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
> SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
>
> +SRC_URI =+ "file://parallelmake.patch"
Missing PR bump
^ permalink raw reply
* Re: shared-mime-info fails to build if intltool-native is present
From: Richard Purdie @ 2011-10-10 12:55 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <3641B9F4-58D3-4AA1-B3D8-A08C57A97A11@dominion.thruhere.net>
On Sun, 2011-10-09 at 16:34 +0200, Koen Kooi wrote:
> I finally tracked down the cause of the intermittent shared-mime-info
> build failures I was seeing. No patch yet, but now you all know what's
> causing it :)
Try the patch I just sent to the list ;-)
Cheers,
Richard
^ permalink raw reply
* shared-mime-info: Fix a parallel make race
From: Richard Purdie @ 2011-10-10 12:54 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
new file mode 100644
index 0000000..9e86a71
--- a/dev/null
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
@@ -0,0 +1,32 @@
+The Makefile used by shared-mime-info is one big race with the SUBDIRS
+option and the dependency specifically calling make all combining to
+create multiple make instances all of which may try and build targets
+like update-mime-database.
+
+This patch removes those options meaning make can correctly identify
+dependencies and stop itself racing itself.
+
+RP 10/10/2011
+
+Upstream-status: Pending
+
+Index: shared-mime-info-0.91/Makefile.am
+===================================================================
+--- shared-mime-info-0.91.orig/Makefile.am 2011-10-10 21:47:19.834173921 +0100
++++ shared-mime-info-0.91/Makefile.am 2011-10-10 21:45:57.000000000 +0100
+@@ -1,5 +1,3 @@
+-SUBDIRS=. po
+-
+ INCLUDES = $(ALL_CFLAGS)
+
+ packagesdir = $(datadir)/mime/packages
+@@ -70,8 +68,7 @@
+
+ all: check create-pot
+
+-create-pot:
+- $(MAKE) -C po shared-mime-info.pot
++create-pot: po
+
+ check: create-pot freedesktop.org.xml update-mime-database check-translations
+ if test -e $(top_builddir)/freedesktop.org.xml; then \
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
index 76d2756..ac2dde1 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
@@ -4,3 +4,4 @@ PR = "r0"
SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
+SRC_URI =+ "file://parallelmake.patch"
^ permalink raw reply related
* Re: [RFC][PATCH] linux-firmware: update, merge in OE classic updates, fix packaging
From: Otavio Salvador @ 2011-10-10 12:35 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <B6E098D1-2EC4-4C23-A169-ABD07D96C980@dominion.thruhere.net>
On Mon, Oct 10, 2011 at 09:26, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Op 10 okt. 2011, om 14:22 heeft Otavio Salvador het volgende geschreven:
>> On Mon, Oct 10, 2011 at 04:27, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>> Op 10 okt. 2011, om 03:03 heeft Otavio Salvador het volgende geschreven:
>>>> On Sun, Oct 9, 2011 at 07:06, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>>>> Update: move to latest SRCREV, use non-kernel.org URI
>>>>> Merge: wl12xx symlink + packaging, install all firmwares
>>>>> Fix: * all entries in PACKAGES are in PROVIDES already
>>>>> * A package always RPROVIDES itself
>>>>> * A file can only get packaged *once* so only one rtlwifi package will get the license
>>>>
>>>> I dislike the idea of one single package with all firmwares. I prefer
>>>> to have many small packages but one meta that depends on it.
>>>
>>> I'm not going to make a patch to subpackage *all* the firmwares. If you can give me a list of the ones you use I'll make a patch to split those out.
>>
>> Leave the ones that exist now and move the rest to ${PN}-others so
>> people can test using it and split from it when need.
>
> I don't see the value of naming the unsplit firmwares something else as ${PN} at this point, OE classic doesn't have it either.
This make clear that useing the others package is a workaround and
thus people can submit patches to add a specific package and move out
to it. Using PN would make it to easy to forgot.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply
* Re: [RFC][PATCH] linux-firmware: update, merge in OE classic updates, fix packaging
From: Koen Kooi @ 2011-10-10 12:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <CAP9ODKoH9iUGTuXWsqiZ-uR85CUxZuVU5au6kFh3WN9Mrcb3zQ@mail.gmail.com>
Op 10 okt. 2011, om 14:22 heeft Otavio Salvador het volgende geschreven:
> On Mon, Oct 10, 2011 at 04:27, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> Op 10 okt. 2011, om 03:03 heeft Otavio Salvador het volgende geschreven:
>>> On Sun, Oct 9, 2011 at 07:06, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>>> Update: move to latest SRCREV, use non-kernel.org URI
>>>> Merge: wl12xx symlink + packaging, install all firmwares
>>>> Fix: * all entries in PACKAGES are in PROVIDES already
>>>> * A package always RPROVIDES itself
>>>> * A file can only get packaged *once* so only one rtlwifi package will get the license
>>>
>>> I dislike the idea of one single package with all firmwares. I prefer
>>> to have many small packages but one meta that depends on it.
>>
>> I'm not going to make a patch to subpackage *all* the firmwares. If you can give me a list of the ones you use I'll make a patch to split those out.
>
> Leave the ones that exist now and move the rest to ${PN}-others so
> people can test using it and split from it when need.
I don't see the value of naming the unsplit firmwares something else as ${PN} at this point, OE classic doesn't have it either.
^ permalink raw reply
* Re: [RFC][PATCH] linux-firmware: update, merge in OE classic updates, fix packaging
From: Otavio Salvador @ 2011-10-10 12:22 UTC (permalink / raw)
To: Koen Kooi; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <B6820E11-C598-4B0A-92E0-664DF20CB727@dominion.thruhere.net>
On Mon, Oct 10, 2011 at 04:27, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Op 10 okt. 2011, om 03:03 heeft Otavio Salvador het volgende geschreven:
>> On Sun, Oct 9, 2011 at 07:06, Koen Kooi <koen@dominion.thruhere.net> wrote:
>>> Update: move to latest SRCREV, use non-kernel.org URI
>>> Merge: wl12xx symlink + packaging, install all firmwares
>>> Fix: * all entries in PACKAGES are in PROVIDES already
>>> * A package always RPROVIDES itself
>>> * A file can only get packaged *once* so only one rtlwifi package will get the license
>>
>> I dislike the idea of one single package with all firmwares. I prefer
>> to have many small packages but one meta that depends on it.
>
> I'm not going to make a patch to subpackage *all* the firmwares. If you can give me a list of the ones you use I'll make a patch to split those out.
Leave the ones that exist now and move the rest to ${PN}-others so
people can test using it and split from it when need.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply
* Re: [PATCH 0/1] acl/attr fix for libdir = base_libdir
From: Phil Blundell @ 2011-10-10 11:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1317925433.git.sgw@linux.intel.com>
On Thu, 2011-10-06 at 11:25 -0700, Saul Wold wrote:
> Richard,
>
> This should address the above situation.
>
> Phil, please let me know if this works for you.
Yes, thanks, that seems to be working fine now.
p.
^ permalink raw reply
* Re: sstate.bbclass: Ensure machine specific stamps are only wiped for the current task
From: Martin Jansa @ 2011-10-10 11:45 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <9CD7A2A3-228F-46AE-AE56-5D73C9372E4A@dominion.thruhere.net>
[-- Attachment #1: Type: text/plain, Size: 2465 bytes --]
On Sun, Oct 09, 2011 at 08:11:45PM +0200, Koen Kooi wrote:
>
> Op 9 okt. 2011, om 20:10 heeft Martin Jansa het volgende geschreven:
>
> > On Sun, Oct 09, 2011 at 01:25:09PM +0200, Koen Kooi wrote:
> >>
> >> Op 6 okt. 2011, om 16:19 heeft Richard Purdie het volgende geschreven:
> >>
> >>> sstate was being a little too ethusiastic about removing stamp files and
> >>> was removing stamp files for other machines when it shouldn't have been.
> >>>
> >>> This patch teaches sstate about machine specific stamp extensions and
> >>> allows it to only remove the current task's stampfiles.
> >>
> >> Not sure if it's related to this problem or not but sstate is still not working as intented for me when switching machines, it keeps rebuilding the toolchain when switching machine. What I did this morning:
> >>
> >> 1) wipe out tmp, sstate-cache, pseudodone
> >> 2) MACHINE=beagleboard bitbake u-boot
> >> 3) cp conf/machine/beagleboard.conf conf/machine/brokensstate.conf
> >> 4) MACHINE=brokensstate bitbake u-boot
> >
> > Same here.. :/ (building 3 armv7 machines.. always "from scratch").
>
> To eliminate varables: Angstrom/shr/aurora/micro/other/all of the above?
DISTRO=shr
MACHINE=nokia900 bitbake shr-image -> builds from scratch, finished ok
MACHINE=palmpre bitbake shr-image -> builds from scratch, finished ok
MACHINE=palmpre2 bitbake shr-image -> builds from scratch, finished ok
without wiping anything (same tmp, same sstate-cache, same pseudodone)
MACHINE=palmpre bitbake shr-image -> builds from scratch, again!, finished ok
MACHINE=palmpre2 bitbake shr-image -> builds from scratch, again!, finished ok
MACHINE=nokia900 bitbake shr-image -> builds from scratch, again!, finished ok
palmpre and palmpre2 are "the same"
$ cat meta-smartphone/meta-palm/conf/machine/palmpre.conf | grep -v ^#
require conf/machine/include/palmpre.inc
$ cat meta-smartphone/meta-palm/conf/machine/palmpre2.conf | grep -v ^#
require conf/machine/include/palmpre.inc
nokia900 is also armv7a-vfp-neon (that's why all packages except
MACHINE_ARCH were always reused without rebuilding in OE-classic).
I have tried to debug sigdata files to see why and also tried to add
MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
as RP suggested, but sofar haven't found solution at least to reuse
already built sstate packages for armv7a-vfp-neon.
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply
* Re: [PATCH] Allow user mode NFS server to run without rpcbind / portmap
From: Jason Wessel @ 2011-10-10 11:39 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <4E927CD9.2040505@intel.com>
On 10/10/2011 12:04 AM, Saul Wold wrote:
> On 10/05/2011 11:43 AM, Jason Wessel wrote:
>>> From the 2.6.39 linux kernel and up it is possible to use
>> and nfsroot mount without the need to talk to an RPC info
>> server as long as the port numbers for mountd and nfsd
>> are known in advance.
>>
>> This patch updates the qemu startup scripts and the
>> user mode NFS server to have the ability to start
>> without the need to use rpcbind or portmap services.
>>
> Jason,
>
> I have not fully tested this yet, but if someone has rpcbind and/or
> portmap services are running, what affect will this patch have?
>
It works the same way it did before. Mountd and nfsd will register with rpcbind / portmap.
All that was done is to use a fall back to not register if the registration service is either denied or unavailable.
Jason.
^ permalink raw reply
* Re: [PATCHv3 00/31] Xorg related changes
From: Koen Kooi @ 2011-10-10 10:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1318007055.git.Martin.Jansa@gmail.com>
Op 7 okt. 2011, om 19:05 heeft Martin Jansa het volgende geschreven:
> this patchset brings meta-oe and oe-core xorg stuff together and most of
> xorg recipes will be removed from meta-oe (sending another pull request now).
>
> This step is needed to be able to separate common x11 to meta-x11 or whatever later.
>
> The following changes since commit 808b3123e359f1aebabb8af44694275e4075e031:
>
> gnutls: Disable p11-kit dependency explicitly to resolve build failures (2011-10-07 15:40:42 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib jansa/x11-v2
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v2
>
> Martin Jansa (31):
>
> xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to
> shared .inc
I have been running X images without minimal fonts for some time now, so AFAICS it can be dropped completely.
regards,
Koen
^ permalink raw reply
* Re: [PATCHv3 00/31] Xorg related changes
From: Richard Purdie @ 2011-10-10 10:29 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1318007055.git.Martin.Jansa@gmail.com>
On Fri, 2011-10-07 at 19:05 +0200, Martin Jansa wrote:
> this patchset brings meta-oe and oe-core xorg stuff together and most of
> xorg recipes will be removed from meta-oe (sending another pull request now).
>
> This step is needed to be able to separate common x11 to meta-x11 or whatever later.
>
> The following changes since commit 808b3123e359f1aebabb8af44694275e4075e031:
>
> gnutls: Disable p11-kit dependency explicitly to resolve build failures (2011-10-07 15:40:42 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib jansa/x11-v2
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v2
>
> Martin Jansa (31):
> xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
> xserver-xorg: remove old git recipe
> glx-use-tls.inc: add include file to enable glx-tls only when
> TARGET_OS isn't uclibc
> xserver-xorg-common: fix LIC_FILES_CHKSUM
> xserver-xorg-common: move SRC_URI closer together
> xserver-xorg-common: Split out some bigger modules and extensions
> from the main package
> xserver-xorg-common: improve packaging
> xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from
> xserver-xorg.inc and xserver-xorg-lite.inc to
> xserver-xorg-common.inc
> xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config
> dependency to RRECOMMENDS and add few more recipes to RRECOMMENDS
> xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to
> shared .inc
> xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have
> whole ${bindir} in FILES_ defined in shared .inc
> xserver-xorg: replace hardcoded --enable-glx-tls with
> glx-use-tls.inc, which doesn't enable it for uClibc
> xserver-xorg: move shared EXTRA_OECONF entries to shared .inc
> xserver-xorg: add new version 1.11.1
> xserver-xorg: remove old 1.10.1 version
> xserver-xorg: remove COMPATIBLE_HOST
> xserver-xorg: drop unused files
> xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use
> same directory from xserver-xf86-lite recipe
> xserver-kdrive: drop unused files (same files are in
> xserver-kdrive-1.7.99.2 directory
> xorg-driver-common.inc: use virtual/xserver instead of older
> virtual/xserver-xf86
> xorg-driver-common.inc: bump INC_PR to rebuild drivers agains new
> xserver-xorg ABI
> libx11: package xcb, merge few changes from meta-oe
> libx11: add new version 1.4.4
> libx11: remove older 1.3.4
> libx11: drop old 1.2.2 git version
> libx11-trim: move files for libx11-trim from libx11-1.3.4 to
> libx11-trim-1.3.4
> libx11-diet: move old patches used only by libx11-diet-1.3 to
> separate directory
> mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move
> uclibc.patch
> mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2
> was removed
> mesa: add new version 7.11
> mesa: drop older 7.10.2 and 7.7+git recipes
I love the xserver patches, this series is much easier to review than
the previous ones. I appreciate the work that's gone into it and I'll
likely take those.
I'll also likely take the libx11 pieces however I notice upgrades for
libx11-trim and libx11-diet are missing.
I've therefore queued both pieces on master-next for a bit more testing.
One other thing that did concern me is the removal of the git recipes. I
know why you've done it and I'll take the patches however I would like
to get back to the point that "bleeding" builds work and this isn't
going to help with that :/.
I haven't got as far as the mesa patches yet. Those aren't as easy to
follow and I've probably enough to test with the above changes right at
this moment.
Cheers,
Richard
^ permalink raw reply
* [PATCH] util-linux 2.19.1: split blkid out into its own subpackage
From: Koen Kooi @ 2011-10-10 10:10 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
Recent udev versions require blkid from u-l, not from e2fsprogs. In general all the non fsck related binaries from e2fsprogs are deprecated.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/recipes-core/util-linux/util-linux.inc | 15 ++++++++++++++-
meta/recipes-core/util-linux/util-linux_2.19.1.bb | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 8762ac6..67d81b9 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -29,7 +29,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
util-linux-swaponoff util-linux-losetup util-linux-umount \
util-linux-mount util-linux-readprofile util-linux-libblkid \
util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
- util-linux-uuidgen util-linux-lscpu util-linux-fsck"
+ util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid"
EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
--enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
@@ -56,6 +56,11 @@ FILES_util-linux-lscpu = "${bindir}/lscpu"
FILES_util-linux-fsck = "${base_sbindir}/fsck*"
+# Util-linux' blkid replaces the e2fsprogs one
+FILES_util-linux-blkid = "${base_sbindir}/blkid*"
+RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
+RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
+
RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup perl"
@@ -262,4 +267,12 @@ pkg_prerm_util-linux-fsck () {
update-alternatives --remove fsck fsck.${PN}
}
+pkg_postinst_util-linux-blkid () {
+ update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100
+}
+
+pkg_prerm_util-linux-blkid () {
+ update-alternatives --remove blkid blkid.${PN}
+}
+
BBCLASSEXTEND = "native"
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
index 39ff68c..04f4457 100644
--- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -1,5 +1,5 @@
MAJOR_VERSION = "2.19"
-PR = "r7"
+PR = "r8"
require util-linux.inc
# note that `lscpu' is under GPLv3+
--
1.6.6.1
^ permalink raw reply related
* Re: [PATCH] Allow user mode NFS server to run without rpcbind / portmap
From: Richard Purdie @ 2011-10-10 9:17 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1317840239-5290-1-git-send-email-jason.wessel@windriver.com>
On Wed, 2011-10-05 at 13:43 -0500, Jason Wessel wrote:
> From the 2.6.39 linux kernel and up it is possible to use
> and nfsroot mount without the need to talk to an RPC info
> server as long as the port numbers for mountd and nfsd
> are known in advance.
>
> This patch updates the qemu startup scripts and the
> user mode NFS server to have the ability to start
> without the need to use rpcbind or portmap services.
>
> Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
> ---
> .../023-no-rpc-register.patch | 34 ++++++++++++++++++++
> .../unfs-server/unfs-server_2.1+2.2beta47.bb | 3 +-
> scripts/runqemu-export-rootfs | 4 ++-
> scripts/runqemu-internal | 16 +++------
> 4 files changed, 44 insertions(+), 13 deletions(-)
> create mode 100644 meta/recipes-devtools/unfs-server/unfs-server-2.1+2.2beta47/023-no-rpc-register.patch
Merged to master, thanks.
Richard
^ permalink raw reply
* Re: [WIP][PATCH 7/9] gdk-pixbuf: upgrade to 2.24.6
From: Richard Purdie @ 2011-10-10 9:16 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <3fbdf6c6a16b66b7bf0f84b1bcb8dbafaea24db1.1317397204.git.Martin.Jansa@gmail.com>
On Fri, 2011-09-30 at 17:43 +0200, Martin Jansa wrote:
> * older version doesn't build with glib-2.30.0
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
I merged this (and patches 4-6), thanks.
Richard
^ permalink raw reply
* Re: [PATCH] Allow user mode NFS server to run without rpcbind / portmap
From: Richard Purdie @ 2011-10-10 9:14 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <4E927CD9.2040505@intel.com>
On Sun, 2011-10-09 at 22:04 -0700, Saul Wold wrote:
> On 10/05/2011 11:43 AM, Jason Wessel wrote:
> >> From the 2.6.39 linux kernel and up it is possible to use
> > and nfsroot mount without the need to talk to an RPC info
> > server as long as the port numbers for mountd and nfsd
> > are known in advance.
> >
> > This patch updates the qemu startup scripts and the
> > user mode NFS server to have the ability to start
> > without the need to use rpcbind or portmap services.
> >
> Jason,
>
> I have not fully tested this yet, but if someone has rpcbind and/or
> portmap services are running, what affect will this patch have?
It shouldn't have any effect, the system is just no longer requiring to
look up the port numbers through rpcbind/portmap but can use the values
directly.
Cheers,
Richard
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox