[OE-core] [PATCH 2/2] staging.bbclass: Avoid looking at other multiconfigs on extend_recipe_sysroot
On extend_recipe_sysroot we only compare taskname and pn, but if we have
some dependency to a recipe from another multiconfig, these two will
still match if it is the same recipe, causing an error since the build
system believes it has already proccesed that dependency.
Check if this is a multiconfig build, if it is, make sure the current
dependency is coming from the same multiconfig as the one we are
building.
Signed-off-by: Alejandro Enedino Hernandez Samaniego
---
meta/classes/staging.bbclass | 4
1 file changed, 4 insertions(+)
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 84e13ba..2dbe65a 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -277,6 +277,10 @@ python extend_recipe_sysroot() {
for dep in taskdepdata:
data = taskdepdata[dep]
if data[1] == mytaskname and data[0] == pn:
+if mc != 'default':
+depmc = dep.split(':')[1]
+if depmc != mc:
+continue
start = dep
break
if start is None:
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [Openembedded-architecture] Dropping armv5 and armv5e tunes in 2.7
Hello Khem, Thanks for pointing this out. On Thu, Jan 3, 2019 at 5:02 PM Khem Raj wrote: > Secondly, I would also like to drop armv4t, and keep armv5te as lowest > supported tune > Fortunately I don't have any ARMv4 boards. But, just for informational purposes, I wanted to point out that I do have a couple ARM926EJ-S boards (i.MX233, LPC32xx) which are ARMv5TE which I am actively working with and maintaining. Therefore, thank you for keeping this one around. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v5 3/8] bitbake: runqueue: Track task unique hash
On Sat, Jan 5, 2019 at 1:50 AM Alejandro Hernandez wrote: > > Hey Joshua, > > This is breaking multiconfig builds with the following error (trimmed), > I believe it is not taking into account that the Key could contain > "mc:..." if it is a multiconfig build. Hmm, yes that seems likely. I'll take a look, would you mind opening a bug in Bugzilla and assigning it to me? I'm not very familiar with multiconfig, so some instructions to help reproduce would be very helpful. Does anyone know if mutliconfig is tested on the autobuilders? > > > ERROR: Running idle function > File "poky/bitbake/lib/bb/runqueue.py", line 1170, in > RunQueueData.prepare_task_hash(tid='multiconfig:x86:poky/meta/recipes-support/attr/acl_2.2.52.bb:do_fetch'): > self.runtaskentries[tid].hash = > bb.parse.siggen.get_taskhash(taskfn, taskname, procdep, self.dataCaches[mc]) > >self.runtaskentries[tid].unihash = > bb.parse.siggen.get_unihash(fn + "." + taskname) > >File "poky/bitbake/lib/bb/siggen.py", line 45, in > SignatureGeneratorOEBasicHash.get_unihash(task='poky/meta/recipes-support/attr/acl_2.2.52.bb.do_fetch'): > def get_unihash(self, task): > >return self.taskhash[task] > > KeyError: 'poky/meta/recipes-support/attr/acl_2.2.52.bb.do_fetch' > > > Cheers, > > Alejandro > > > On 12/18/2018 7:10 PM, Joshua Watt wrote: > > Requests the task unique hash from siggen and tracks it > > > > [YOCTO #13030] > > > > Signed-off-by: Joshua Watt > > --- > > bitbake/lib/bb/runqueue.py | 25 + > > 1 file changed, 17 insertions(+), 8 deletions(-) > > > > diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py > > index f2b95a9829b..27b188256dd 100644 > > --- a/bitbake/lib/bb/runqueue.py > > +++ b/bitbake/lib/bb/runqueue.py > > @@ -346,6 +346,7 @@ class RunTaskEntry(object): > > self.depends = set() > > self.revdeps = set() > > self.hash = None > > +self.unihash = None > > self.task = None > > self.weight = 1 > > > > @@ -385,6 +386,9 @@ class RunQueueData: > > def get_task_hash(self, tid): > > return self.runtaskentries[tid].hash > > > > +def get_task_unihash(self, tid): > > +return self.runtaskentries[tid].unihash > > + > > def get_user_idstring(self, tid, task_name_suffix = ""): > > return tid + task_name_suffix > > > > @@ -1150,18 +1154,21 @@ class RunQueueData: > > if len(self.runtaskentries[tid].depends - dealtwith) == 0: > > dealtwith.add(tid) > > todeal.remove(tid) > > -procdep = [] > > -for dep in self.runtaskentries[tid].depends: > > -procdep.append(fn_from_tid(dep) + "." + > > taskname_from_tid(dep)) > > -(mc, fn, taskname, taskfn) = split_tid_mcfn(tid) > > -self.runtaskentries[tid].hash = > > bb.parse.siggen.get_taskhash(taskfn, taskname, procdep, self.dataCaches[mc]) > > -task = self.runtaskentries[tid].task > > +self.prepare_task_hash(tid) > > > > bb.parse.siggen.writeout_file_checksum_cache() > > > > #self.dump_data() > > return len(self.runtaskentries) > > > > +def prepare_task_hash(self, tid): > > +procdep = [] > > +for dep in self.runtaskentries[tid].depends: > > +procdep.append(fn_from_tid(dep) + "." + taskname_from_tid(dep)) > > +(mc, fn, taskname, taskfn) = split_tid_mcfn(tid) > > +self.runtaskentries[tid].hash = > > bb.parse.siggen.get_taskhash(taskfn, taskname, procdep, self.dataCaches[mc]) > > +self.runtaskentries[tid].unihash = bb.parse.siggen.get_unihash(fn > > + "." + taskname) > > + > > def dump_data(self): > > """ > > Dump some debug information on the internal data structures > > @@ -2081,7 +2088,8 @@ class RunQueueExecuteTasks(RunQueueExecute): > > deps = self.rqdata.runtaskentries[revdep].depends > > provides = self.rqdata.dataCaches[mc].fn_provides[taskfn] > > taskhash = self.rqdata.runtaskentries[revdep].hash > > -taskdepdata[revdep] = [pn, taskname, fn, deps, provides, > > taskhash] > > +unihash = self.rqdata.runtaskentries[revdep].unihash > > +taskdepdata[revdep] = [pn, taskname, fn, deps, provides, > > taskhash, unihash] > > for revdep2 in deps: > > if revdep2 not in taskdepdata: > > additional.append(revdep2) > > @@ -2524,7 +2532,8 @@ class RunQueueExecuteScenequeue(RunQueueExecute): > > deps = getsetscenedeps(revdep) > > provides = self.rqdata.dataCaches[mc].fn_provides[taskfn] > > taskhash = self.rqdata.runtaskentries[revdep].hash > > -taskdepdata[revdep] = [pn,
[OE-core] [v2][PATCH] nettle: update to 3.4.1
Bug fix only release
Include:
CVE-2018-16868 gnutls: Bleichenbacher-like side channel leakage in
PKCS#1 1.5 verification and padding oracle verification
CVE-2018-16869 nettle: Leaky data conversion exposing a manager oracle
For full details see:
http://lists.lysator.liu.se/pipermail/nettle-bugs/2018/007369.html
[V2]
Add -std=c99 to cflags
Signed-off-by: Armin Kuster
---
.../Add-target-to-only-build-tests-not-run-them.patch| 0
.../check-header-files-of-openssl-only-if-enable_.patch | 0
.../nettle/{nettle-3.4 => nettle-3.4.1}/dlopen-test.patch| 0
meta/recipes-support/nettle/{nettle-3.4 => nettle-3.4.1}/run-ptest | 0
meta/recipes-support/nettle/{nettle_3.4.bb => nettle_3.4.1.bb} | 5 +++--
5 files changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-support/nettle/{nettle-3.4 =>
nettle-3.4.1}/Add-target-to-only-build-tests-not-run-them.patch (100%)
rename meta/recipes-support/nettle/{nettle-3.4 =>
nettle-3.4.1}/check-header-files-of-openssl-only-if-enable_.patch (100%)
rename meta/recipes-support/nettle/{nettle-3.4 =>
nettle-3.4.1}/dlopen-test.patch (100%)
rename meta/recipes-support/nettle/{nettle-3.4 => nettle-3.4.1}/run-ptest
(100%)
rename meta/recipes-support/nettle/{nettle_3.4.bb => nettle_3.4.1.bb} (90%)
diff --git
a/meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch
b/meta/recipes-support/nettle/nettle-3.4.1/Add-target-to-only-build-tests-not-run-them.patch
similarity index 100%
rename from
meta/recipes-support/nettle/nettle-3.4/Add-target-to-only-build-tests-not-run-them.patch
rename to
meta/recipes-support/nettle/nettle-3.4.1/Add-target-to-only-build-tests-not-run-them.patch
diff --git
a/meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch
b/meta/recipes-support/nettle/nettle-3.4.1/check-header-files-of-openssl-only-if-enable_.patch
similarity index 100%
rename from
meta/recipes-support/nettle/nettle-3.4/check-header-files-of-openssl-only-if-enable_.patch
rename to
meta/recipes-support/nettle/nettle-3.4.1/check-header-files-of-openssl-only-if-enable_.patch
diff --git a/meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch
b/meta/recipes-support/nettle/nettle-3.4.1/dlopen-test.patch
similarity index 100%
rename from meta/recipes-support/nettle/nettle-3.4/dlopen-test.patch
rename to meta/recipes-support/nettle/nettle-3.4.1/dlopen-test.patch
diff --git a/meta/recipes-support/nettle/nettle-3.4/run-ptest
b/meta/recipes-support/nettle/nettle-3.4.1/run-ptest
similarity index 100%
rename from meta/recipes-support/nettle/nettle-3.4/run-ptest
rename to meta/recipes-support/nettle/nettle-3.4.1/run-ptest
diff --git a/meta/recipes-support/nettle/nettle_3.4.bb
b/meta/recipes-support/nettle/nettle_3.4.1.bb
similarity index 90%
rename from meta/recipes-support/nettle/nettle_3.4.bb
rename to meta/recipes-support/nettle/nettle_3.4.1.bb
index ca8450e..dd49c30 100644
--- a/meta/recipes-support/nettle/nettle_3.4.bb
+++ b/meta/recipes-support/nettle/nettle_3.4.1.bb
@@ -20,8 +20,8 @@ SRC_URI_append_class-target = "\
file://dlopen-test.patch \
"
-SRC_URI[md5sum] = "dc0f13028264992f58e67b4e8915f53d"
-SRC_URI[sha256sum] =
"ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94"
+SRC_URI[md5sum] = "9bdebb0e2f638d3b9d91f7fc264b70c1"
+SRC_URI[sha256sum] =
"f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad"
UPSTREAM_CHECK_REGEX = "nettle-(?P\d+(\.\d+)+)\.tar"
@@ -30,6 +30,7 @@ inherit autotools ptest multilib_header
EXTRA_AUTORECONF += "--exclude=aclocal"
EXTRA_OECONF = "--disable-openssl"
+CFLAGS_append = " -std=c99"
do_compile_ptest() {
oe_runmake buildtest
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v5 3/8] bitbake: runqueue: Track task unique hash
Hey Joshua, This is breaking multiconfig builds with the following error (trimmed), I believe it is not taking into account that the Key could contain "mc:..." if it is a multiconfig build. ERROR: Running idle function File "poky/bitbake/lib/bb/runqueue.py", line 1170, in RunQueueData.prepare_task_hash(tid='multiconfig:x86:poky/meta/recipes-support/attr/acl_2.2.52.bb:do_fetch'): self.runtaskentries[tid].hash = bb.parse.siggen.get_taskhash(taskfn, taskname, procdep, self.dataCaches[mc]) > self.runtaskentries[tid].unihash = bb.parse.siggen.get_unihash(fn + "." + taskname) File "poky/bitbake/lib/bb/siggen.py", line 45, in SignatureGeneratorOEBasicHash.get_unihash(task='poky/meta/recipes-support/attr/acl_2.2.52.bb.do_fetch'): def get_unihash(self, task): > return self.taskhash[task] KeyError: 'poky/meta/recipes-support/attr/acl_2.2.52.bb.do_fetch' Cheers, Alejandro On 12/18/2018 7:10 PM, Joshua Watt wrote: Requests the task unique hash from siggen and tracks it [YOCTO #13030] Signed-off-by: Joshua Watt --- bitbake/lib/bb/runqueue.py | 25 + 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index f2b95a9829b..27b188256dd 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -346,6 +346,7 @@ class RunTaskEntry(object): self.depends = set() self.revdeps = set() self.hash = None +self.unihash = None self.task = None self.weight = 1 @@ -385,6 +386,9 @@ class RunQueueData: def get_task_hash(self, tid): return self.runtaskentries[tid].hash +def get_task_unihash(self, tid): +return self.runtaskentries[tid].unihash + def get_user_idstring(self, tid, task_name_suffix = ""): return tid + task_name_suffix @@ -1150,18 +1154,21 @@ class RunQueueData: if len(self.runtaskentries[tid].depends - dealtwith) == 0: dealtwith.add(tid) todeal.remove(tid) -procdep = [] -for dep in self.runtaskentries[tid].depends: -procdep.append(fn_from_tid(dep) + "." + taskname_from_tid(dep)) -(mc, fn, taskname, taskfn) = split_tid_mcfn(tid) -self.runtaskentries[tid].hash = bb.parse.siggen.get_taskhash(taskfn, taskname, procdep, self.dataCaches[mc]) -task = self.runtaskentries[tid].task +self.prepare_task_hash(tid) bb.parse.siggen.writeout_file_checksum_cache() #self.dump_data() return len(self.runtaskentries) +def prepare_task_hash(self, tid): +procdep = [] +for dep in self.runtaskentries[tid].depends: +procdep.append(fn_from_tid(dep) + "." + taskname_from_tid(dep)) +(mc, fn, taskname, taskfn) = split_tid_mcfn(tid) +self.runtaskentries[tid].hash = bb.parse.siggen.get_taskhash(taskfn, taskname, procdep, self.dataCaches[mc]) +self.runtaskentries[tid].unihash = bb.parse.siggen.get_unihash(fn + "." + taskname) + def dump_data(self): """ Dump some debug information on the internal data structures @@ -2081,7 +2088,8 @@ class RunQueueExecuteTasks(RunQueueExecute): deps = self.rqdata.runtaskentries[revdep].depends provides = self.rqdata.dataCaches[mc].fn_provides[taskfn] taskhash = self.rqdata.runtaskentries[revdep].hash -taskdepdata[revdep] = [pn, taskname, fn, deps, provides, taskhash] +unihash = self.rqdata.runtaskentries[revdep].unihash +taskdepdata[revdep] = [pn, taskname, fn, deps, provides, taskhash, unihash] for revdep2 in deps: if revdep2 not in taskdepdata: additional.append(revdep2) @@ -2524,7 +2532,8 @@ class RunQueueExecuteScenequeue(RunQueueExecute): deps = getsetscenedeps(revdep) provides = self.rqdata.dataCaches[mc].fn_provides[taskfn] taskhash = self.rqdata.runtaskentries[revdep].hash -taskdepdata[revdep] = [pn, taskname, fn, deps, provides, taskhash] +unihash = self.rqdata.runtaskentries[revdep].unihash +taskdepdata[revdep] = [pn, taskname, fn, deps, provides, taskhash, unihash] for revdep2 in deps: if revdep2 not in taskdepdata: additional.append(revdep2) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Official sstate premirrors and builds
Hi, On Sat, Jan 5, 2019 at 4:21 AM Jate Sujjavanich wrote: > > I setup a machine on AWS and wanted to use the sstate cache mirror at > sstate.yoctoproject.org in my site.conf. > > Bitbake does not pull the artifacts from the mirror despite the uninative C > library. I have tried checking out several tags and then pointed to the > appropriate directory on sstate mirror. For example, yocto-2.2.2 and > http://sstate.yoctoproject.org/2.2.2. > > Bitbake populates several license setscene tasks, but no native packages. > > Does anyone have this working? I remember I tried this some time ago and similarly had no luck with "official" mirrors... I guess it was after sumo release on an Ubuntu 16.04 host. I remember I used default local.conf and tried both tagged commits and release branch tips, but I always ended up with full builds with no sstate object being fetched from the mirror. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
