[OE-core][PATCH] bluez5: add dbus to RDEPENDS
From: Bartosz Golaszewski
Unless we're using systemd, dbus is not pulled into the system
automatically. Bluez5 will not work without dbus so add it to RDEPENDS
explicitly.
Signed-off-by: Bartosz Golaszewski
---
meta/recipes-connectivity/bluez5/bluez5.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc
b/meta/recipes-connectivity/bluez5/bluez5.inc
index 79d4645ca8..b6f1c00c14 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
file://src/main.c;beginline=1;endline=24;md5=0ad83ca0dc37ab08af448777c581e7ac"
DEPENDS = "dbus glib-2.0"
+RDEPENDS:${PN} = "dbus"
PROVIDES += "bluez-hcidump"
RPROVIDES:${PN} += "bluez-hcidump"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171739):
https://lists.openembedded.org/g/openembedded-core/message/171739
Mute This Topic: https://lists.openembedded.org/mt/94334177/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-Core][PATCH v2] rust: update 1.63.0 -> 1.64.0
From: Alex Kiernan
Release notes:
https://blog.rust-lang.org/2022/09/22/Rust-1.64.0.html
Signed-off-by: Alex Kiernan
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
.../{cargo_1.63.0.bb => cargo_1.64.0.bb} | 0
...ibstd-rs_1.63.0.bb => libstd-rs_1.64.0.bb} | 0
63.0.bb => rust-cross-canadian_1.64.0.bb} | 0
...ust-llvm_1.63.0.bb => rust-llvm_1.64.0.bb} | 0
meta/recipes-devtools/rust/rust-snapshot.inc | 22 +-
meta/recipes-devtools/rust/rust-source.inc| 2 +-
.../rust/rust/crossbeam_atomic.patch | 43 ---
.../rust/rust/hardcodepaths.patch | 16 +++
.../rust/{rust_1.63.0.bb => rust_1.64.0.bb} | 0
10 files changed, 58 insertions(+), 27 deletions(-)
rename meta/recipes-devtools/cargo/{cargo_1.63.0.bb => cargo_1.64.0.bb} (100%)
rename meta/recipes-devtools/rust/{libstd-rs_1.63.0.bb => libstd-rs_1.64.0.bb}
(100%)
rename meta/recipes-devtools/rust/{rust-cross-canadian_1.63.0.bb =>
rust-cross-canadian_1.64.0.bb} (100%)
rename meta/recipes-devtools/rust/{rust-llvm_1.63.0.bb => rust-llvm_1.64.0.bb}
(100%)
rename meta/recipes-devtools/rust/{rust_1.63.0.bb => rust_1.64.0.bb} (100%)
diff --git a/meta/conf/distro/include/tcmode-default.inc
b/meta/conf/distro/include/tcmode-default.inc
index 59b226e62fcd..6bba92ac9696 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -27,7 +27,7 @@ GOVERSION ?= "1.19%"
# This can not use wildcards like 8.0.% since it is also used in mesa to denote
# llvm version being used, so always bump it with llvm recipe version bump
LLVMVERSION ?= "14.0.6"
-RUSTVERSION ?= "1.63%"
+RUSTVERSION ?= "1.64%"
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
diff --git a/meta/recipes-devtools/cargo/cargo_1.63.0.bb
b/meta/recipes-devtools/cargo/cargo_1.64.0.bb
similarity index 100%
rename from meta/recipes-devtools/cargo/cargo_1.63.0.bb
rename to meta/recipes-devtools/cargo/cargo_1.64.0.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.63.0.bb
b/meta/recipes-devtools/rust/libstd-rs_1.64.0.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.63.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.64.0.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.63.0.bb
b/meta/recipes-devtools/rust/rust-cross-canadian_1.64.0.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.63.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.64.0.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.63.0.bb
b/meta/recipes-devtools/rust/rust-llvm_1.64.0.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.63.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.64.0.bb
diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc
b/meta/recipes-devtools/rust/rust-snapshot.inc
index b9d7edd6720f..e790705aba0c 100644
--- a/meta/recipes-devtools/rust/rust-snapshot.inc
+++ b/meta/recipes-devtools/rust/rust-snapshot.inc
@@ -5,21 +5,21 @@
## The version is replicated here.
## TODO: find a way to add additional SRC_URIs based on the contents of an
## earlier SRC_URI.
-RS_VERSION = "1.62.0"
-CARGO_VERSION = "1.62.0"
+RS_VERSION = "1.63.0"
+CARGO_VERSION = "1.63.0"
# TODO: Add hashes for other architecture toolchains as well. Make a script?
-SRC_URI[rust-std-snapshot-x86_64.sha256sum] =
"addfae87b6b1b521d98a50fdc5120990888a51bb397100062e9c558267c67c77"
-SRC_URI[rustc-snapshot-x86_64.sha256sum] =
"e7f71f4ef09334ddc9ec8cbf2f958d654e36f580c95f8fec6d5c816ce256dbd6"
-SRC_URI[cargo-snapshot-x86_64.sha256sum] =
"815c63119a9cf0282ff240c6444b6f867238763ee3dea182f10837ae7dbbb1d4"
+SRC_URI[rust-std-snapshot-x86_64.sha256sum] =
"993c2c17bf76ac626bfb5b17bddce65fbdfc14f70d183f33773de0cd12df46d2"
+SRC_URI[rustc-snapshot-x86_64.sha256sum] =
"bdab9d9afa5c329c40f9ba568364815237fab8426477c12bfabad35ffc484ab5"
+SRC_URI[cargo-snapshot-x86_64.sha256sum] =
"f370d12e4c11f0c835becb738bcf00d363f29b76f8b424b4dcb005abcf15fc9a"
-SRC_URI[rust-std-snapshot-aarch64.sha256sum] =
"dd5df8a92af3e5d49a1122b9561821ebd72a9317884a37ecddae041e652a7563"
-SRC_URI[rustc-snapshot-aarch64.sha256sum] =
"0fa320a19d41dcfc592bc006f5e9eda8e3b972598a26c96ad64eedd868516df3"
-SRC_URI[cargo-snapshot-aarch64.sha256sum] =
"475038ecacca9ff586cad2082d5d950544b0d581a2a287facc7d899aae488813"
+SRC_URI[rust-std-snapshot-aarch64.sha256sum] =
"f1d93b3d48258f701687c63ef9b226c07329fb92c2c5559283258687f958e9d0"
+SRC_URI[rustc-snapshot-aarch64.sha256sum] =
"d78799bb8f4177877f97b9051c9cba1fd85173f2e9cecab9486388fc6fa66259"
+SRC_URI[cargo-snapshot-aarch64.sha256sum] =
"4313ab44dccba4faed20db4aacc16def405773d1676e79d3e65ced4b99d710d4"
-SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] =
"d6678b7c971f3adbe7f820adae669d03a314468441e2907747c76eca98e0be92"
-SRC_URI[rustc-snapshot-powerpc64le.sha256sum] =
[OE-core] [dunfell][PATCH] classes/kernel-fitimage: add ability to add additional signing options
From: Paul Eggleton
Add a UBOOT_MKIMAGE_SIGN_ARGS variable to enable passing additional
options to uboot-mkimage when it is run the second time to perform
signing.
Signed-off-by: Paul Eggleton
Signed-off-by: Richard Purdie
(cherry picked from commit 8fd7ee7414b45a1feeef7982af3583475902a677)
Signed-off-by: Massimiliano Minella
---
meta/classes/kernel-fitimage.bbclass | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/classes/kernel-fitimage.bbclass
b/meta/classes/kernel-fitimage.bbclass
index 7c0d93625b..e0dd215167 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -59,6 +59,9 @@ FIT_SIGN_ALG ?= "rsa2048"
# fitImage Padding Algo
FIT_PAD_ALG ?= "pkcs-1.5"
+# Arguments passed to mkimage for signing
+UBOOT_MKIMAGE_SIGN_ARGS ?= ""
+
#
# Emit the fitImage ITS header
#
@@ -479,7 +482,8 @@ fitimage_assemble() {
${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if
len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
-F -k "${UBOOT_SIGN_KEYDIR}" \
$add_key_to_u_boot \
- -r arch/${ARCH}/boot/${2}
+ -r arch/${ARCH}/boot/${2} \
+ ${UBOOT_MKIMAGE_SIGN_ARGS}
fi
}
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171737):
https://lists.openembedded.org/g/openembedded-core/message/171737
Mute This Topic: https://lists.openembedded.org/mt/94329357/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH v3 2/2] archiver: avoid using machine variable as it breaks multiconfig
From: Jose Quaresma
STAGING_KERNEL_DIR uses the MACHINE name so it breaks the multiconfig
and in this cases it will run the shared recipes twice, one for each
machine.
STAGING_KERNEL_DIR it's been introduced in commit 5487dee2e1
Signed-off-by: Jose Quaresma
---
meta/classes/archiver.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 0710c1ec5e..4049694d85 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -465,7 +465,7 @@ def is_work_shared(d):
pn = d.getVar('PN')
return pn.startswith('gcc-source') or \
bb.data.inherits_class('kernel', d) or \
-(bb.data.inherits_class('kernelsrc', d) and d.getVar('S') ==
d.getVar('STAGING_KERNEL_DIR'))
+(bb.data.inherits_class('kernelsrc', d) and
d.expand("${TMPDIR}/work-shared") in d.getVar('S'))
# Run do_unpack and do_patch
python do_unpack_and_patch() {
--
2.38.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171736):
https://lists.openembedded.org/g/openembedded-core/message/171736
Mute This Topic: https://lists.openembedded.org/mt/94328945/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH v3 1/2] oeqa/selftest/archiver: Add multiconfig test for shared recipes
From: Jose Quaresma
Test that the shared recipes in original mode with diff enabled works in
multiconfig,
otherwise it will not build when using the same TMP dir.
The test can be run with:
oe-selftest -r
archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch
| oe-selftest - INFO - test_archiver_multiconfig_shared_unpack_and_patch
(archiver.Archiver)
| oe-selftest - INFO - ... ok
| oe-selftest - INFO -
--
| oe-selftest - INFO - Ran 1 test in 52.948s
| oe-selftest - INFO - OK
| oe-selftest - INFO - RESULTS:
| oe-selftest - INFO - RESULTS -
archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch: PASSED
(49.98s)
| oe-selftest - INFO - SUMMARY:
| oe-selftest - INFO - oe-selftest () - Ran 1 test in 52.948s
| oe-selftest - INFO - oe-selftest - OK - All required tests passed
(successes=1, skipped=0, failures=0, errors=0)
Signed-off-by: Jose Quaresma
---
v2: replace --runonly with --cmd (-c)
update the runtime test time on the commit
show the locked_sigs file used on the assert
v3: messed up v2 patch
meta/lib/oeqa/selftest/cases/archiver.py | 32
1 file changed, 32 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/archiver.py
b/meta/lib/oeqa/selftest/cases/archiver.py
index ffdea832be..3fa59fff51 100644
--- a/meta/lib/oeqa/selftest/cases/archiver.py
+++ b/meta/lib/oeqa/selftest/cases/archiver.py
@@ -6,6 +6,7 @@
import os
import glob
+import re
from oeqa.utils.commands import bitbake, get_bb_vars
from oeqa.selftest.case import OESelftestTestCase
@@ -119,7 +120,38 @@ class Archiver(OESelftestTestCase):
excluded_present = len(glob.glob(src_path_target + '/%s-*/*' %
target_recipes[1]))
self.assertFalse(excluded_present, 'Recipe %s was not excluded.' %
target_recipes[1])
+def test_archiver_multiconfig_shared_unpack_and_patch(self):
+"""
+Test that shared recipes in original mode with diff enabled works in
multiconfig,
+otherwise it will not build when using the same TMP dir.
+"""
+
+features = 'BBMULTICONFIG = "mc1 mc2"\n'
+features += 'INHERIT += "archiver"\n'
+features += 'ARCHIVER_MODE[src] = "original"\n'
+features += 'ARCHIVER_MODE[diff] = "1"\n'
+self.write_config(features)
+# We can use any machine in multiconfig as long as they are different
+self.write_config('MACHINE = "qemuarm"\n', 'mc1')
+self.write_config('MACHINE = "qemux86"\n', 'mc2')
+
+task = 'do_unpack_and_patch'
+# Use gcc-source as it is a shared recipe (appends the pv to the pn)
+pn = 'gcc-source-%s' % get_bb_vars(['PV'], 'gcc')['PV']
+
+# Generate the tasks signatures
+bitbake('mc:mc1:%s mc:mc2:%s -c %s -S none' % (pn, pn, task))
+
+# Check the tasks signatures
+# To be machine agnostic the tasks needs to generate the same
signature for each machine
+locked_sigs_inc = "%s/locked-sigs.inc" % self.builddir
+locked_sigs = open(locked_sigs_inc).read()
+task_sigs = re.findall(r"%s:%s:.*" % (pn, task), locked_sigs)
+uniq_sigs = set(task_sigs)
+self.assertFalse(len(uniq_sigs) - 1, \
+'The task "%s" of the recipe "%s" has different signatures in "%s"
for each machine in multiconfig' \
+% (task, pn, locked_sigs_inc))
def test_archiver_srpm_mode(self):
"""
--
2.38.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171735):
https://lists.openembedded.org/g/openembedded-core/message/171735
Mute This Topic: https://lists.openembedded.org/mt/94328943/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][PATCH v2 1/2] oeqa/selftest/archiver: Add multiconfig test for shared recipes
Sorry but I messed up the patch and need to send a v3.
Jose
Jose Quaresma via lists.openembedded.org escreveu no dia sexta, 14/10/2022 à(s)
16:12:
> From: Jose Quaresma
>
> Test that the shared recipes in original mode with diff enabled works in
> multiconfig,
> otherwise it will not build when using the same TMP dir.
>
> The test can be run with:
>
> oe-selftest -r
> archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch
>
> | oe-selftest - INFO - test_archiver_multiconfig_shared_unpack_and_patch
> (archiver.Archiver)
> | oe-selftest - INFO - ... ok
> | oe-selftest - INFO -
> --
> | oe-selftest - INFO - Ran 1 test in 52.948s
> | oe-selftest - INFO - OK
> | oe-selftest - INFO - RESULTS:
> | oe-selftest - INFO - RESULTS -
> archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch: PASSED
> (49.98s)
> | oe-selftest - INFO - SUMMARY:
> | oe-selftest - INFO - oe-selftest () - Ran 1 test in 52.948s
> | oe-selftest - INFO - oe-selftest - OK - All required tests passed
> (successes=1, skipped=0, failures=0, errors=0)
>
> Signed-off-by: Jose Quaresma
> ---
>
> v2: replace --runonly with --cmd (-c)
> update the runtime test time on the commit
> show the locked_sigs file used on the assert
>
> meta/lib/oeqa/selftest/cases/archiver.py | 29
> 1 file changed, 29 insertions(+)
>
> diff --git a/meta/lib/oeqa/selftest/cases/archiver.py
> b/meta/lib/oeqa/selftest/cases/archiver.py
> index ffdea832be..1d4985dacf 100644
> --- a/meta/lib/oeqa/selftest/cases/archiver.py
> +++ b/meta/lib/oeqa/selftest/cases/archiver.py
> @@ -6,6 +6,7 @@
>
> import os
> import glob
> +import re
> from oeqa.utils.commands import bitbake, get_bb_vars
> from oeqa.selftest.case import OESelftestTestCase
>
> @@ -119,7 +120,35 @@ class Archiver(OESelftestTestCase):
> excluded_present = len(glob.glob(src_path_target + '/%s-*/*' %
> target_recipes[1]))
> self.assertFalse(excluded_present, 'Recipe %s was not excluded.'
> % target_recipes[1])
>
> +def test_archiver_multiconfig_shared_unpack_and_patch(self):
> +"""
> +Test that shared recipes in original mode with diff enabled works
> in multiconfig,
> +otherwise it will not build when using the same TMP dir.
> +"""
> +
> +features = 'BBMULTICONFIG = "mc1 mc2"\n'
> +features += 'INHERIT += "archiver"\n'
> +features += 'ARCHIVER_MODE[src] = "original"\n'
> +features += 'ARCHIVER_MODE[diff] = "1"\n'
> +self.write_config(features)
> +
> +# We can use any machine in multiconfig as long as they are
> different
> +self.write_config('MACHINE = "qemuarm"\n', 'mc1')
> +self.write_config('MACHINE = "qemux86"\n', 'mc2')
> +
> +task = 'do_unpack_and_patch'
> +# Use gcc-source as it is a shared recipe (appends the pv to the
> pn)
> +pn = 'gcc-source-%s' % get_bb_vars(['PV'], 'gcc')['PV']
> +
> +# Generate the tasks signatures
> +bitbake('mc:mc1:%s mc:mc2:%s --runonly=%s --dump-signatures=none'
> % (pn, pn, task))
>
> +# Check the tasks signatures
> +# To be machine agnostic the tasks needs to generate the same
> signature for each machine
> +locked_sigs = open("%s/locked-sigs.inc" % self.builddir).read()
> +task_sigs = re.findall(r"%s:%s:.*" % (pn, task), locked_sigs)
> +uniq_sigs = set(task_sigs)
> +self.assertFalse(len(uniq_sigs) - 1, 'The task "%s" of the recipe
> "%s" has diferent signatures for each machine in multiconfig' % (task, pn))
>
> def test_archiver_srpm_mode(self):
> """
> --
> 2.38.0
>
>
>
>
>
--
Best regards,
José Quaresma
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171734):
https://lists.openembedded.org/g/openembedded-core/message/171734
Mute This Topic: https://lists.openembedded.org/mt/94328653/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH v2 2/2] archiver: avoid using machine variable as it breaks multiconfig
From: Jose Quaresma
STAGING_KERNEL_DIR uses the MACHINE name so it breaks the multiconfig
and in this cases it will run the shared recipes twice, one for each
machine.
STAGING_KERNEL_DIR it's been introduced in commit 5487dee2e1
Signed-off-by: Jose Quaresma
---
meta/classes/archiver.bbclass| 2 +-
meta/lib/oeqa/selftest/cases/archiver.py | 9 ++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 0710c1ec5e..4049694d85 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -465,7 +465,7 @@ def is_work_shared(d):
pn = d.getVar('PN')
return pn.startswith('gcc-source') or \
bb.data.inherits_class('kernel', d) or \
-(bb.data.inherits_class('kernelsrc', d) and d.getVar('S') ==
d.getVar('STAGING_KERNEL_DIR'))
+(bb.data.inherits_class('kernelsrc', d) and
d.expand("${TMPDIR}/work-shared") in d.getVar('S'))
# Run do_unpack and do_patch
python do_unpack_and_patch() {
diff --git a/meta/lib/oeqa/selftest/cases/archiver.py
b/meta/lib/oeqa/selftest/cases/archiver.py
index 1d4985dacf..3fa59fff51 100644
--- a/meta/lib/oeqa/selftest/cases/archiver.py
+++ b/meta/lib/oeqa/selftest/cases/archiver.py
@@ -141,14 +141,17 @@ class Archiver(OESelftestTestCase):
pn = 'gcc-source-%s' % get_bb_vars(['PV'], 'gcc')['PV']
# Generate the tasks signatures
-bitbake('mc:mc1:%s mc:mc2:%s --runonly=%s --dump-signatures=none' %
(pn, pn, task))
+bitbake('mc:mc1:%s mc:mc2:%s -c %s -S none' % (pn, pn, task))
# Check the tasks signatures
# To be machine agnostic the tasks needs to generate the same
signature for each machine
-locked_sigs = open("%s/locked-sigs.inc" % self.builddir).read()
+locked_sigs_inc = "%s/locked-sigs.inc" % self.builddir
+locked_sigs = open(locked_sigs_inc).read()
task_sigs = re.findall(r"%s:%s:.*" % (pn, task), locked_sigs)
uniq_sigs = set(task_sigs)
-self.assertFalse(len(uniq_sigs) - 1, 'The task "%s" of the recipe "%s"
has diferent signatures for each machine in multiconfig' % (task, pn))
+self.assertFalse(len(uniq_sigs) - 1, \
+'The task "%s" of the recipe "%s" has different signatures in "%s"
for each machine in multiconfig' \
+% (task, pn, locked_sigs_inc))
def test_archiver_srpm_mode(self):
"""
--
2.38.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171733):
https://lists.openembedded.org/g/openembedded-core/message/171733
Mute This Topic: https://lists.openembedded.org/mt/94328656/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][PATCH v2 1/2] oeqa/selftest/archiver: Add multiconfig test for shared recipes
From: Jose Quaresma
Test that the shared recipes in original mode with diff enabled works in
multiconfig,
otherwise it will not build when using the same TMP dir.
The test can be run with:
oe-selftest -r
archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch
| oe-selftest - INFO - test_archiver_multiconfig_shared_unpack_and_patch
(archiver.Archiver)
| oe-selftest - INFO - ... ok
| oe-selftest - INFO -
--
| oe-selftest - INFO - Ran 1 test in 52.948s
| oe-selftest - INFO - OK
| oe-selftest - INFO - RESULTS:
| oe-selftest - INFO - RESULTS -
archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch: PASSED
(49.98s)
| oe-selftest - INFO - SUMMARY:
| oe-selftest - INFO - oe-selftest () - Ran 1 test in 52.948s
| oe-selftest - INFO - oe-selftest - OK - All required tests passed
(successes=1, skipped=0, failures=0, errors=0)
Signed-off-by: Jose Quaresma
---
v2: replace --runonly with --cmd (-c)
update the runtime test time on the commit
show the locked_sigs file used on the assert
meta/lib/oeqa/selftest/cases/archiver.py | 29
1 file changed, 29 insertions(+)
diff --git a/meta/lib/oeqa/selftest/cases/archiver.py
b/meta/lib/oeqa/selftest/cases/archiver.py
index ffdea832be..1d4985dacf 100644
--- a/meta/lib/oeqa/selftest/cases/archiver.py
+++ b/meta/lib/oeqa/selftest/cases/archiver.py
@@ -6,6 +6,7 @@
import os
import glob
+import re
from oeqa.utils.commands import bitbake, get_bb_vars
from oeqa.selftest.case import OESelftestTestCase
@@ -119,7 +120,35 @@ class Archiver(OESelftestTestCase):
excluded_present = len(glob.glob(src_path_target + '/%s-*/*' %
target_recipes[1]))
self.assertFalse(excluded_present, 'Recipe %s was not excluded.' %
target_recipes[1])
+def test_archiver_multiconfig_shared_unpack_and_patch(self):
+"""
+Test that shared recipes in original mode with diff enabled works in
multiconfig,
+otherwise it will not build when using the same TMP dir.
+"""
+
+features = 'BBMULTICONFIG = "mc1 mc2"\n'
+features += 'INHERIT += "archiver"\n'
+features += 'ARCHIVER_MODE[src] = "original"\n'
+features += 'ARCHIVER_MODE[diff] = "1"\n'
+self.write_config(features)
+
+# We can use any machine in multiconfig as long as they are different
+self.write_config('MACHINE = "qemuarm"\n', 'mc1')
+self.write_config('MACHINE = "qemux86"\n', 'mc2')
+
+task = 'do_unpack_and_patch'
+# Use gcc-source as it is a shared recipe (appends the pv to the pn)
+pn = 'gcc-source-%s' % get_bb_vars(['PV'], 'gcc')['PV']
+
+# Generate the tasks signatures
+bitbake('mc:mc1:%s mc:mc2:%s --runonly=%s --dump-signatures=none' %
(pn, pn, task))
+# Check the tasks signatures
+# To be machine agnostic the tasks needs to generate the same
signature for each machine
+locked_sigs = open("%s/locked-sigs.inc" % self.builddir).read()
+task_sigs = re.findall(r"%s:%s:.*" % (pn, task), locked_sigs)
+uniq_sigs = set(task_sigs)
+self.assertFalse(len(uniq_sigs) - 1, 'The task "%s" of the recipe "%s"
has diferent signatures for each machine in multiconfig' % (task, pn))
def test_archiver_srpm_mode(self):
"""
--
2.38.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171732):
https://lists.openembedded.org/g/openembedded-core/message/171732
Mute This Topic: https://lists.openembedded.org/mt/94328653/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][PATCH 1/2] oeqa/selftest/archiver: Add multiconfig test for shared recipes
Hi Alexandre,
Alexandre Belloni escreveu no dia sexta,
14/10/2022 à(s) 10:38:
> Hello Jose,
>
> This fails on the AB:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/4236/steps/15/logs/stdio
Oh damn, so it seems that parsing the locked-sigs.inc file is not a good
aproucth.
Does anyone know which is the best method to get the signature of the tasks
in selftest?
I need to investigate further.
Jose
>
> 2022-10-13 21:04:28,387 - oe-selftest - INFO -
> archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch
> (subunit.RemotedTestCase)
> 2022-10-13 21:04:28,388 - oe-selftest - INFO - ... FAIL
> 2022-10-13 21:04:28,388 - oe-selftest - INFO - 0: 15/57 149/504 (49.12s)
> (archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch)
> 2022-10-13 21:04:28,388 - oe-selftest - INFO -
> testtools.testresult.real._StringException: Traceback (most recent call
> last):
> File
> "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/selftest/cases/archiver.py",
> line 151, in test_archiver_multiconfig_shared_unpack_and_patch
> self.assertFalse(len(uniq_sigs) - 1, 'The task "%s" of the recipe "%s"
> has diferent signatures for each machine in multiconfig' % (task, pn))
> File "/usr/lib64/python3.6/unittest/case.py", line 693, in assertFalse
> raise self.failureException(msg)
> AssertionError: -1 is not false : The task "do_unpack_and_patch" of the
> recipe "gcc-source-12.2.0" has diferent signatures for each machine in
> multiconfig
>
> On 13/10/2022 19:25:29+, Jose Quaresma wrote:
> > Test that the shared recipes in original mode with diff enabled works in
> multiconfig,
> > otherwise it will not build when using the same TMP dir.
> >
> > The test can be run with:
> >
> > oe-selftest -r
> archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch
> >
> > | oe-selftest - INFO - test_archiver_multiconfig_shared_unpack_and_patch
> (archiver.Archiver)
> > | oe-selftest - INFO - ... ok
> > | oe-selftest - INFO -
> --
> > | oe-selftest - INFO - Ran 1 test in 199.710s
> > | oe-selftest - INFO - OK
> > | oe-selftest - INFO - RESULTS:
> > | oe-selftest - INFO - RESULTS -
> archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch: PASSED
> (192.24s)
> > | oe-selftest - INFO - SUMMARY:
> > | oe-selftest - INFO - oe-selftest () - Ran 1 test in 199.711s
> > | oe-selftest - INFO - oe-selftest - OK - All required tests passed
> (successes=1, skipped=0, failures=0, errors=0)
> >
> > Signed-off-by: Jose Quaresma
> > ---
> > meta/lib/oeqa/selftest/cases/archiver.py | 29
> > 1 file changed, 29 insertions(+)
> >
> > diff --git a/meta/lib/oeqa/selftest/cases/archiver.py
> b/meta/lib/oeqa/selftest/cases/archiver.py
> > index ffdea832be..1d4985dacf 100644
> > --- a/meta/lib/oeqa/selftest/cases/archiver.py
> > +++ b/meta/lib/oeqa/selftest/cases/archiver.py
> > @@ -6,6 +6,7 @@
> >
> > import os
> > import glob
> > +import re
> > from oeqa.utils.commands import bitbake, get_bb_vars
> > from oeqa.selftest.case import OESelftestTestCase
> >
> > @@ -119,7 +120,35 @@ class Archiver(OESelftestTestCase):
> > excluded_present = len(glob.glob(src_path_target + '/%s-*/*' %
> target_recipes[1]))
> > self.assertFalse(excluded_present, 'Recipe %s was not
> excluded.' % target_recipes[1])
> >
> > +def test_archiver_multiconfig_shared_unpack_and_patch(self):
> > +"""
> > +Test that shared recipes in original mode with diff enabled
> works in multiconfig,
> > +otherwise it will not build when using the same TMP dir.
> > +"""
> > +
> > +features = 'BBMULTICONFIG = "mc1 mc2"\n'
> > +features += 'INHERIT += "archiver"\n'
> > +features += 'ARCHIVER_MODE[src] = "original"\n'
> > +features += 'ARCHIVER_MODE[diff] = "1"\n'
> > +self.write_config(features)
> > +
> > +# We can use any machine in multiconfig as long as they are
> different
> > +self.write_config('MACHINE = "qemuarm"\n', 'mc1')
> > +self.write_config('MACHINE = "qemux86"\n', 'mc2')
> > +
> > +task = 'do_unpack_and_patch'
> > +# Use gcc-source as it is a shared recipe (appends the pv to
> the pn)
> > +pn = 'gcc-source-%s' % get_bb_vars(['PV'], 'gcc')['PV']
> > +
> > +# Generate the tasks signatures
> > +bitbake('mc:mc1:%s mc:mc2:%s --runonly=%s
> --dump-signatures=none' % (pn, pn, task))
> >
> > +# Check the tasks signatures
> > +# To be machine agnostic the tasks needs to generate the same
> signature for each machine
> > +locked_sigs = open("%s/locked-sigs.inc" % self.builddir).read()
> > +task_sigs = re.findall(r"%s:%s:.*" % (pn, task), locked_sigs)
> > +uniq_sigs = set(task_sigs)
> > +self.assertFalse(len(uniq_sigs) - 1, 'The task "%s" of the
> recipe "%s" has diferent signatures for each machine in
Re: [OE-core][PATCH 1/2] oeqa/selftest/archiver: Add multiconfig test for shared recipes
Hello Jose,
This fails on the AB:
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/4236/steps/15/logs/stdio
2022-10-13 21:04:28,387 - oe-selftest - INFO -
archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch
(subunit.RemotedTestCase)
2022-10-13 21:04:28,388 - oe-selftest - INFO - ... FAIL
2022-10-13 21:04:28,388 - oe-selftest - INFO - 0: 15/57 149/504 (49.12s)
(archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch)
2022-10-13 21:04:28,388 - oe-selftest - INFO -
testtools.testresult.real._StringException: Traceback (most recent call last):
File
"/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/selftest/cases/archiver.py",
line 151, in test_archiver_multiconfig_shared_unpack_and_patch
self.assertFalse(len(uniq_sigs) - 1, 'The task "%s" of the recipe "%s" has
diferent signatures for each machine in multiconfig' % (task, pn))
File "/usr/lib64/python3.6/unittest/case.py", line 693, in assertFalse
raise self.failureException(msg)
AssertionError: -1 is not false : The task "do_unpack_and_patch" of the recipe
"gcc-source-12.2.0" has diferent signatures for each machine in multiconfig
On 13/10/2022 19:25:29+, Jose Quaresma wrote:
> Test that the shared recipes in original mode with diff enabled works in
> multiconfig,
> otherwise it will not build when using the same TMP dir.
>
> The test can be run with:
>
> oe-selftest -r
> archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch
>
> | oe-selftest - INFO - test_archiver_multiconfig_shared_unpack_and_patch
> (archiver.Archiver)
> | oe-selftest - INFO - ... ok
> | oe-selftest - INFO -
> --
> | oe-selftest - INFO - Ran 1 test in 199.710s
> | oe-selftest - INFO - OK
> | oe-selftest - INFO - RESULTS:
> | oe-selftest - INFO - RESULTS -
> archiver.Archiver.test_archiver_multiconfig_shared_unpack_and_patch: PASSED
> (192.24s)
> | oe-selftest - INFO - SUMMARY:
> | oe-selftest - INFO - oe-selftest () - Ran 1 test in 199.711s
> | oe-selftest - INFO - oe-selftest - OK - All required tests passed
> (successes=1, skipped=0, failures=0, errors=0)
>
> Signed-off-by: Jose Quaresma
> ---
> meta/lib/oeqa/selftest/cases/archiver.py | 29
> 1 file changed, 29 insertions(+)
>
> diff --git a/meta/lib/oeqa/selftest/cases/archiver.py
> b/meta/lib/oeqa/selftest/cases/archiver.py
> index ffdea832be..1d4985dacf 100644
> --- a/meta/lib/oeqa/selftest/cases/archiver.py
> +++ b/meta/lib/oeqa/selftest/cases/archiver.py
> @@ -6,6 +6,7 @@
>
> import os
> import glob
> +import re
> from oeqa.utils.commands import bitbake, get_bb_vars
> from oeqa.selftest.case import OESelftestTestCase
>
> @@ -119,7 +120,35 @@ class Archiver(OESelftestTestCase):
> excluded_present = len(glob.glob(src_path_target + '/%s-*/*' %
> target_recipes[1]))
> self.assertFalse(excluded_present, 'Recipe %s was not excluded.' %
> target_recipes[1])
>
> +def test_archiver_multiconfig_shared_unpack_and_patch(self):
> +"""
> +Test that shared recipes in original mode with diff enabled works in
> multiconfig,
> +otherwise it will not build when using the same TMP dir.
> +"""
> +
> +features = 'BBMULTICONFIG = "mc1 mc2"\n'
> +features += 'INHERIT += "archiver"\n'
> +features += 'ARCHIVER_MODE[src] = "original"\n'
> +features += 'ARCHIVER_MODE[diff] = "1"\n'
> +self.write_config(features)
> +
> +# We can use any machine in multiconfig as long as they are different
> +self.write_config('MACHINE = "qemuarm"\n', 'mc1')
> +self.write_config('MACHINE = "qemux86"\n', 'mc2')
> +
> +task = 'do_unpack_and_patch'
> +# Use gcc-source as it is a shared recipe (appends the pv to the pn)
> +pn = 'gcc-source-%s' % get_bb_vars(['PV'], 'gcc')['PV']
> +
> +# Generate the tasks signatures
> +bitbake('mc:mc1:%s mc:mc2:%s --runonly=%s --dump-signatures=none' %
> (pn, pn, task))
>
> +# Check the tasks signatures
> +# To be machine agnostic the tasks needs to generate the same
> signature for each machine
> +locked_sigs = open("%s/locked-sigs.inc" % self.builddir).read()
> +task_sigs = re.findall(r"%s:%s:.*" % (pn, task), locked_sigs)
> +uniq_sigs = set(task_sigs)
> +self.assertFalse(len(uniq_sigs) - 1, 'The task "%s" of the recipe
> "%s" has diferent signatures for each machine in multiconfig' % (task, pn))
>
> def test_archiver_srpm_mode(self):
> """
> --
> 2.34.1
>
>
>
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171730):
https://lists.openembedded.org/g/openembedded-core/message/171730
Mute This Topic:
Re: [OE-core] [PATCH] buildconf: compare abspath
On Fri, 14 Oct 2022 at 09:59, Jose Quaresma wrote: >> for l in layers: >> -if l[0] == os.path.abspath(args.layerpath): >> +if os.path.abspath(l[0]) == os.path.abspath(args.layerpath): >> targetlayer = l[0] > > > Maybe can be better to have the abspath of layerpath in targetlayer > > layerpath = os.path.abspath(args.layerpath) > if os.path.abspath(l[0]) == layerpath: > targetlayer = layerpath I prefer Adrian's version. 'layerpath' is not a good name, and targetlayer does not need to be absolute. If you'd like to refactor this, doing this with a boolean variable 'has_targetlayer' would be better. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#171729): https://lists.openembedded.org/g/openembedded-core/message/171729 Mute This Topic: https://lists.openembedded.org/mt/94321973/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] buildconf: compare abspath
Hi Adrian,
Adrian Freihofer escreveu no dia sexta,
14/10/2022 à(s) 07:53:
> We have something like ${TOPDIR}/../../poky/meta in the bblayers.conf
> file. This does not work without normalizing the path for comparison.
>
> Signed-off-by: Adrian Freihofer
> ---
> meta/lib/bblayers/buildconf.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/lib/bblayers/buildconf.py
> b/meta/lib/bblayers/buildconf.py
> index e07fc534e1..ccab332adf 100644
> --- a/meta/lib/bblayers/buildconf.py
> +++ b/meta/lib/bblayers/buildconf.py
> @@ -64,7 +64,7 @@ TEMPLATECONF={} . {}/oe-init-build-env build-try-{}"""
> oecore = None
>
> for l in layers:
> -if l[0] == os.path.abspath(args.layerpath):
> +if os.path.abspath(l[0]) == os.path.abspath(args.layerpath):
> targetlayer = l[0]
>
Maybe can be better to have the abspath of layerpath in targetlayer
layerpath = os.path.abspath(args.layerpath)
if os.path.abspath(l[0]) == layerpath:
targetlayer = layerpath
Jose
if l[1] == 'meta':
> oecore = os.path.dirname(l[0])
> --
> 2.37.3
>
>
>
>
>
--
Best regards,
José Quaresma
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171728):
https://lists.openembedded.org/g/openembedded-core/message/171728
Mute This Topic: https://lists.openembedded.org/mt/94321973/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [kirkstone][PATCH] own-mirrors: add crate
Support downloading crate files from a mirror at SOURCE_MIRROR_URL.
Signed-off-by: Adrian Freihofer
---
meta/classes/own-mirrors.bbclass | 1 +
meta/classes/sanity.bbclass | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/own-mirrors.bbclass b/meta/classes/own-mirrors.bbclass
index ef972740ce..30c7ccd8e7 100644
--- a/meta/classes/own-mirrors.bbclass
+++ b/meta/classes/own-mirrors.bbclass
@@ -11,4 +11,5 @@ https?://.*/.* ${SOURCE_MIRROR_URL} \
ftp://.*/.* ${SOURCE_MIRROR_URL} \
npm://.*/?.*${SOURCE_MIRROR_URL} \
s3://.*/.* ${SOURCE_MIRROR_URL} \
+crate://.*/.* ${SOURCE_MIRROR_URL} \
"
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index a79e36b594..5c97effb96 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -859,7 +859,7 @@ def check_sanity_everybuild(status, d):
mirror_vars = ['MIRRORS', 'PREMIRRORS', 'SSTATE_MIRRORS']
protocols = ['http', 'ftp', 'file', 'https', \
'git', 'gitsm', 'hg', 'osc', 'p4', 'svn', \
- 'bzr', 'cvs', 'npm', 'sftp', 'ssh', 's3', 'az', 'ftps']
+ 'bzr', 'cvs', 'npm', 'sftp', 'ssh', 's3', 'az', 'ftps',
'crate']
for mirror_var in mirror_vars:
mirrors = (d.getVar(mirror_var) or '').replace('\\n', ' ').split()
--
2.37.3
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171727):
https://lists.openembedded.org/g/openembedded-core/message/171727
Mute This Topic: https://lists.openembedded.org/mt/94321992/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] own-mirrors: add crate
Support downloading crate files from a mirror at SOURCE_MIRROR_URL.
Signed-off-by: Adrian Freihofer
---
meta/classes-global/sanity.bbclass | 2 +-
meta/classes/own-mirrors.bbclass | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes-global/sanity.bbclass
b/meta/classes-global/sanity.bbclass
index 4a403a2590..15067e78d3 100644
--- a/meta/classes-global/sanity.bbclass
+++ b/meta/classes-global/sanity.bbclass
@@ -865,7 +865,7 @@ def check_sanity_everybuild(status, d):
mirror_vars = ['MIRRORS', 'PREMIRRORS', 'SSTATE_MIRRORS']
protocols = ['http', 'ftp', 'file', 'https', \
'git', 'gitsm', 'hg', 'osc', 'p4', 'svn', \
- 'bzr', 'cvs', 'npm', 'sftp', 'ssh', 's3', 'az', 'ftps']
+ 'bzr', 'cvs', 'npm', 'sftp', 'ssh', 's3', 'az', 'ftps',
'crate']
for mirror_var in mirror_vars:
mirrors = (d.getVar(mirror_var) or '').replace('\\n', ' ').split()
diff --git a/meta/classes/own-mirrors.bbclass b/meta/classes/own-mirrors.bbclass
index 2f24ff1830..62258e4160 100644
--- a/meta/classes/own-mirrors.bbclass
+++ b/meta/classes/own-mirrors.bbclass
@@ -17,4 +17,5 @@ https?://.*/.* ${SOURCE_MIRROR_URL} \
ftp://.*/.* ${SOURCE_MIRROR_URL} \
npm://.*/?.*${SOURCE_MIRROR_URL} \
s3://.*/.* ${SOURCE_MIRROR_URL} \
+crate://.*/.* ${SOURCE_MIRROR_URL} \
"
--
2.37.3
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171726):
https://lists.openembedded.org/g/openembedded-core/message/171726
Mute This Topic: https://lists.openembedded.org/mt/94321977/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] buildconf: compare abspath
We have something like ${TOPDIR}/../../poky/meta in the bblayers.conf
file. This does not work without normalizing the path for comparison.
Signed-off-by: Adrian Freihofer
---
meta/lib/bblayers/buildconf.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/bblayers/buildconf.py b/meta/lib/bblayers/buildconf.py
index e07fc534e1..ccab332adf 100644
--- a/meta/lib/bblayers/buildconf.py
+++ b/meta/lib/bblayers/buildconf.py
@@ -64,7 +64,7 @@ TEMPLATECONF={} . {}/oe-init-build-env build-try-{}"""
oecore = None
for l in layers:
-if l[0] == os.path.abspath(args.layerpath):
+if os.path.abspath(l[0]) == os.path.abspath(args.layerpath):
targetlayer = l[0]
if l[1] == 'meta':
oecore = os.path.dirname(l[0])
--
2.37.3
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171725):
https://lists.openembedded.org/g/openembedded-core/message/171725
Mute This Topic: https://lists.openembedded.org/mt/94321973/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v2] wic: honor the SOURCE_DATE_EPOCH in case of updated fstab
Hi,
This caused:
https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/6305/steps/13/logs/stdio
On 13/10/2022 19:40:20+0300, Sergey Zhmylev wrote:
> From: Sergei Zhmylev
>
> In case user requested to build a binary repeatable package,
> it's required to honor the SOURCE_DATE_EPOCH environment
> variable. So forcefully set mtime inside all the routines
> which modify fstab in case it is updated.
>
> Signed-off-by: Sergei Zhmylev
> ---
> scripts/lib/wic/partition.py | 5 -
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
> index e50871b8d7..cac1bab4dd 100644
> --- a/scripts/lib/wic/partition.py
> +++ b/scripts/lib/wic/partition.py
> @@ -291,6 +291,9 @@ class Partition():
> if self.updated_fstab_path and self.has_fstab and not
> self.no_fstab_update:
> debugfs_script_path = os.path.join(cr_workdir, "debugfs_script")
> with open(debugfs_script_path, "w") as f:
> +if os.getenv('SOURCE_DATE_EPOCH'):
> +fstab_time = int(os.getenv('SOURCE_DATE_EPOCH'))
> +f.write("set_current_time %s\n" % (fstab_time))
> f.write("cd etc\n")
> f.write("rm fstab\n")
> f.write("write %s fstab\n" % (self.updated_fstab_path))
> @@ -353,7 +356,7 @@ class Partition():
> exec_native_cmd(mcopy_cmd, native_sysroot)
>
> if self.updated_fstab_path and self.has_fstab and not
> self.no_fstab_update:
> -mcopy_cmd = "mcopy -i %s %s ::/etc/fstab" % (rootfs,
> self.updated_fstab_path)
> +mcopy_cmd = "mcopy -m -i %s %s ::/etc/fstab" % (rootfs,
> self.updated_fstab_path)
> exec_native_cmd(mcopy_cmd, native_sysroot)
>
> chmod_cmd = "chmod 644 %s" % rootfs
> --
> 2.37.2
>
>
>
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#171724):
https://lists.openembedded.org/g/openembedded-core/message/171724
Mute This Topic: https://lists.openembedded.org/mt/94308156/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
