Skip to contentSkip to conversation

Patch review

PATCH In review Steve Sakoman 2 participants 18 messages Jun 19, 2022 – Jan 25, 2023 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

cover Patch review

Please review this set of patches for kirkstone and have comments back by end of day Tuesday.

Passed a-full on autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/3799

The following changes since commit 0f7a8359ba370c7f5d5153453ed699e9566f5b1d:

rootfs.py: close kernel_abi_ver_file (2022-06-10 05:13:53 -1000)

are available in the Git repository at:

git://git.openembedded.org/openembedded-core-contrib stable/kirkstone-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/kirkstone-nut

Jack Mitchell (1):
meson.bbclass: add cython binary to cross/native toolchain config

Jose Quaresma (2):
archiver: use bb.note instead of echo
archiver: don't use machine variables in shared recipes

Kai Kang (1):
xxhash: fix build with gcc 12

Mingli Yu (1):
oescripts: change compare logic in OEListPackageconfigTests

Pavel Zhukov (1):
systemd: update 0008-add-missing-FTW_-macros-for-musl.patch

Rasmus Villemoes (1):
e2fsprogs: add alternatives handling of lsattr as well

Richard Purdie (5):
vim: Upgrade 8.2.5034 -> 8.2.5083
uboot-sign: Fix potential index error issues selftest/multiconfig: Test that multiconfigs in separate layers works
gcc-source: Fix incorrect task dependencies from ${B}
liberror-perl: Update sstate/equiv versions to clean cache

Xiaobing Luo (1):
devtool: Fix _copy_file() TypeError

Yi Zhao (2):
popt: fix override syntax in RDEPENDS
git: fix override syntax in RDEPENDS

 meta-selftest/conf/multiconfig/muslmc.conf          |  2 ++
 meta/classes/archiver.bbclass                       | 11 ++++++++---
 meta/classes/meson.bbclass                          |  2 ++
 meta/classes/uboot-sign.bbclass                     |  2 ++
 meta/lib/oeqa/selftest/cases/multiconfig.py         | 13 +++++++++++++
 meta/lib/oeqa/selftest/cases/oescripts.py           |  3 ++-
 .../0008-add-missing-FTW_-macros-for-musl.patch     |  8 ++++----
 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb |  5 ++++-
 meta/recipes-devtools/gcc/gcc-common.inc            |  2 +-
 meta/recipes-devtools/gcc/gcc-source.inc            |  1 +
 meta/recipes-devtools/git/git_2.35.3.bb             |  2 +-
 meta/recipes-devtools/perl/liberror-perl_0.17029.bb |  4 ++++
 meta/recipes-support/popt/popt_1.18.bb              |  2 +-
 meta/recipes-support/vim/vim.inc                    |  4 ++--
 meta/recipes-support/xxhash/xxhash_0.8.1.bb         |  2 ++
 scripts/lib/devtool/standard.py                     |  2 +-
 16 files changed, 50 insertions(+), 15 deletions(-)
 create mode 100644 meta-selftest/conf/multiconfig/muslmc.conf
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/15 vim: Upgrade 8.2.5034 -> 8.2.5083

From: Richard Purdie <[email protected]>

Includes fixes for CVE-2022-1927, CVE-2022-1942.

(cherry picked from commit 1e740b5c2227c0040621ae63436d06db4873670f)
---
 meta/recipes-support/vim/vim.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/vim/vim.inc +2 -2
index b22e8016ab..06707dbe11 100644
@@ -21,8 +21,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
            file://racefix.patch \
            "
 
-PV .= ".5034"
-SRCREV = "5a6ec10cc80ab02eeff644ab19b82312630ea855"
+PV .= ".5083"
+SRCREV = "db77c49401145d76441fbb3d22a1d7d987681c13"
 
 # Remove when 8.3 is out
 UPSTREAM_VERSION_UNKNOWN = "1"
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/15 uboot-sign: Fix potential index error issues

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Someone reported that if some other shell function has left i or j set, the concat_dtb_helper function could fail. Add a small tweak to avoid this.

[YOCTO #14815]

(cherry picked from commit d219c97bdf5d30be89795fbf9b66ddc367bef384)
---
 meta/classes/uboot-sign.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/uboot-sign.bbclass +2 -0
index 4ca8118eb2..31ffe1f472 100644
@@ -134,6 +134,8 @@ concat_dtb_helper() {
 
 			if [ -n "${UBOOT_CONFIG}" ]
 			then
+				i=0
+				j=0
 				for config in ${UBOOT_MACHINE}; do
 					i=$(expr $i + 1);
 					for type in ${UBOOT_CONFIG}; do
Signature · 1 line
2.25.1
#3 lore raw

PATCH 3/15 selftest/multiconfig: Test that multiconfigs in separate layers works

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

We should test that mutliconfigs from a layer work, not just build/conf. This adds such a test.

[YOCTO #13566]

(cherry picked from commit 2306261fb85d5d03145989c3af9c6897111644ae)
---
 meta-selftest/conf/multiconfig/muslmc.conf  |  2 ++
 meta/lib/oeqa/selftest/cases/multiconfig.py | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 meta-selftest/conf/multiconfig/muslmc.conf
meta-selftest/conf/multiconfig/muslmc.conf new file +2 -0
new file mode 100644
index 0000000000..043cd1ccc3
@@ -0,0 +1,2 @@
+TCLIBC = "musl"
+TMPDIR = "${TOPDIR}/tmp-mc-musl"
meta/lib/oeqa/selftest/cases/multiconfig.py +13 -0
index baae9b456f..83cbd1345d 100644
@@ -70,3 +70,16 @@ TMPDIR = "${TOPDIR}/tmp-mc-tiny"
 
         result = bitbake('mc:test:multiconfig-test-parse -c showvar')
         self.assertIn('MCTESTVAR=test2', result.output.splitlines())
+
+    def test_multiconfig_inlayer(self):
+        """
+        Test that a multiconfig from meta-selftest works.
+        """
+
+        config = """
+BBMULTICONFIG = "muslmc"
+"""
+        self.write_config(config)
+
+        # Build a core-image-minimal, only dry run needed to check config is present
+        bitbake('mc:muslmc:bash -n')
Signature · 1 line
2.25.1
#4 lore raw

PATCH 4/15 devtool: Fix _copy_file() TypeError

In reply to Steve Sakoman

From: Xiaobing Luo <[email protected]>

when devtool finish, the _copy_file() failed.
--------------------------------------------
TypeError: _copy_file() got an unexpected keyword argument 'base_outdir'
--------------------------------------------

Fixes 05f2d5d2ce00 ("devtool: finish: add dry-run option")
(cherry picked from commit a45d9dc089fb2719ca69b92870917f8c0925f632)
---
 scripts/lib/devtool/standard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/devtool/standard.py +1 -1
index 01fb5ad96f..4b50e3c63b 100644
@@ -353,7 +353,7 @@ def _move_file(src, dst, dry_run_outdir=None, base_outdir=None):
             bb.utils.mkdirhier(dst_d)
         shutil.move(src, dst)
 
-def _copy_file(src, dst, dry_run_outdir=None):
+def _copy_file(src, dst, dry_run_outdir=None, base_outdir=None):
     """Copy a file. Creates all the directory components of destination path."""
     dry_run_suffix = ' (dry-run)' if dry_run_outdir else ''
     logger.debug('Copying %s to %s%s' % (src, dst, dry_run_suffix))
Signature · 1 line
2.25.1
#7 lore raw

PATCH 5/15 meson.bbclass: add cython binary to cross/native toolchain config

In reply to Steve Sakoman

From: Jack Mitchell <[email protected]>

This allows building Cython based Python modules with the native meson support which has been present since meson version 0.59.

https://mesonbuild.com/Cython.html

(cherry picked from commit b1dcb1eb69032c30f5a8faf4d7120fc6c4ecd051)
---
 meta/classes/meson.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/meson.bbclass +2 -0
index 0bfe945811..19b54e0fdc 100644
@@ -59,6 +59,7 @@ do_write_config() {
 [binaries]
 c = ${@meson_array('CC', d)}
 cpp = ${@meson_array('CXX', d)}
+cython = 'cython3'
 ar = ${@meson_array('AR', d)}
 nm = ${@meson_array('NM', d)}
 strip = ${@meson_array('STRIP', d)}
@@ -98,6 +99,7 @@ EOF
 [binaries]
 c = ${@meson_array('BUILD_CC', d)}
 cpp = ${@meson_array('BUILD_CXX', d)}
+cython = 'cython3'
 ar = ${@meson_array('BUILD_AR', d)}
 nm = ${@meson_array('BUILD_NM', d)}
 strip = ${@meson_array('BUILD_STRIP', d)}
Signature · 1 line
2.25.1
#8 lore raw

PATCH 6/15 archiver: use bb.note instead of echo

In reply to Steve Sakoman

From: Jose Quaresma <[email protected]>

(cherry picked from commit 6420c8a6a8143f53ccad7ab2d56b2ba06db83099)
---
 meta/classes/archiver.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/archiver.bbclass +1 -1
index c19c770d11..8d026067f4 100644
@@ -579,7 +579,7 @@ python do_dumpdata () {
 
 SSTATETASKS += "do_deploy_archives"
 do_deploy_archives () {
-    echo "Deploying source archive files from ${ARCHIVER_TOPDIR} to ${DEPLOY_DIR_SRC}."
+    bbnote "Deploying source archive files from ${ARCHIVER_TOPDIR} to ${DEPLOY_DIR_SRC}."
 }
 python do_deploy_archives_setscene () {
     sstate_setscene(d)
Signature · 1 line
2.25.1
#9 lore raw

PATCH 7/15 xxhash: fix build with gcc 12

In reply to Steve Sakoman

From: Kai Kang <[email protected]>

It fails to compile xxhash when '-Og' is set in CFLAGS via such as set DEBUG_BUILD = '1' in local.conf. Check and disable inline when '-Og' exists.

(cherry picked from commit 3464c67cd34acbb1a6705369e34dee8af7e348ac)
---
 meta/recipes-support/xxhash/xxhash_0.8.1.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-support/xxhash/xxhash_0.8.1.bb +2 -0
index b3b9702598..222ba7b77c 100644
@@ -14,6 +14,8 @@ SRCREV = "35b0373c697b5f160d3db26b1cbb45a0d5ba788c"
 
 S = "${WORKDIR}/git"
 
+CFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}"
+
 do_compile () {
 	oe_runmake all
 }
Signature · 1 line
2.25.1
#10 lore raw

PATCH 8/15 oescripts: change compare logic in OEListPackageconfigTests

In reply to Steve Sakoman

From: Mingli Yu <[email protected]>

When multilib enabled and add layers/meta-openembedded/meta-oe in conf/bblayers.conf, it reports below error when run oe-selftest.

 $ oe-selftest -r  oescripts
 [snip]
 [20:36:33-0700] 2022-05-16 03:36:33,494 - oe-selftest - INFO - RESULTS - oescripts.OEListPackageconfigTests.test_packageconfig_flags_option_flags: FAILED (585.37s)
 [snip]

It is because the output of "list-packageconfig-flags.py -f" as below:

 $ ../scripts/contrib/list-packageconfig-flags.py -f
 [snip]
 qt                     lib32-pinentry  lib32-wxwidgets  nativesdk-pinentry  pinentry  pinentry-native  wxwidgets  wxwidgets-native
 secret                 lib32-pinentry  nativesdk-pinentry  pinentry  pinentry-native
 [snip]

But the check logic as below:
class OEListPackageconfigTests(OEScriptTests):
#oe-core.scripts.List_all_the_PACKAGECONFIG's_flags def check_endlines(self, results, expected_endlines):
for line in results.output.splitlines():
for el in expected_endlines:
if line.split() == el.split():
expected_endlines.remove(el) break

def test_packageconfig_flags_option_flags(self):
results = runCmd('%s/contrib/list-packageconfig-flags.py -f' % self.scripts_dir) expected_endlines = []
expected_endlines.append("PACKAGECONFIG FLAG RECIPE NAMES")
expected_endlines.append("qt nativesdk-pinentry pinentry pinentry-native")
expected_endlines.append("secret nativesdk-pinentry pinentry pinentry-native")

self.check_endlines(results, expected_endlines)

And the test will fail as line.split() doesn't equal el.split() as line.split() is ['lib32-pinentry', 'lib32-wxwidgets', 'nativesdk-pinentry', 'pinentry', 'pinentry-native', 'wxwidgets', 'wxwidgets-native'] and el.split() is ['nativesdk-pinentry', 'pinentry', 'pinentry-native'].

So change the compare logic to fix the gap.

(cherry picked from commit 239f22847bcae0cb31769adb0a42b5440173a7c5)
---
 meta/lib/oeqa/selftest/cases/oescripts.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/oescripts.py +2 -1
index cd687816c8..bd84f151cb 100644
@@ -129,7 +129,8 @@ class OEListPackageconfigTests(OEScriptTests):
     def check_endlines(self, results,  expected_endlines): 
         for line in results.output.splitlines():
             for el in expected_endlines:
-                if line.split() == el.split():
+                if line and line.split()[0] == el.split()[0] and \
+                   ' '.join(sorted(el.split())) in ' '.join(sorted(line.split())):
                     expected_endlines.remove(el)
                     break
 
Signature · 1 line
2.25.1
#11 lore raw

PATCH 9/15 e2fsprogs: add alternatives handling of lsattr as well

In reply to Steve Sakoman

From: Rasmus Villemoes <[email protected]>

Building busybox with CONFIG_LSATTR=y and installing that in the same filesystem as e2fsprogs breaks:

ERROR: ... do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget:${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.

Fix that by also alternatifying lsattr just as chattr already is.

(cherry picked from commit 96703961eeb3460e9da26503d7942cc965d1e573)
---
 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb +4 -1
index ec48f419c7..5b2d1921f0 100644
@@ -51,6 +51,7 @@ do_install () {
 	oe_multilib_header ext2fs/ext2_types.h
 	install -d ${D}${base_bindir}
 	mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs
+	mv ${D}${bindir}/lsattr ${D}${base_bindir}/lsattr.e2fsprogs
 
 	install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/
 
@@ -99,10 +100,12 @@ FILES:libe2p = "${base_libdir}/libe2p.so.*"
 FILES:libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"
 FILES:${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds"
 
-ALTERNATIVE:${PN} = "chattr"
+ALTERNATIVE:${PN} = "chattr lsattr"
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr"
 ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"
+ALTERNATIVE_LINK_NAME[lsattr] = "${base_bindir}/lsattr"
+ALTERNATIVE_TARGET[lsattr] = "${base_bindir}/lsattr.e2fsprogs"
 
 ALTERNATIVE:${PN}-doc = "fsck.8"
 ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
Signature · 1 line
2.25.1
#12 lore raw

PATCH 10/15 popt: fix override syntax in RDEPENDS

In reply to Steve Sakoman

From: Yi Zhao <[email protected]>

RDEPENDS_${PN}-ptest -> RDEPENDS:${PN}-ptest

(cherry picked from commit 37a47bfced900c2f1e239b216d8614eb290f2f0c)
---
 meta/recipes-support/popt/popt_1.18.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/popt/popt_1.18.bb +1 -1
index af8add4ad6..b465f8817d 100644
@@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24
 
 inherit autotools gettext ptest
 
-RDEPENDS_${PN}-ptest += "bash"
+RDEPENDS:${PN}-ptest += "bash"
 
 do_compile_ptest() {
     sed 's#lt-test1#test1#g' ${S}/tests/testit.sh > ${B}/tests/testit.sh
Signature · 1 line
2.25.1
#13 lore raw

PATCH 11/15 git: fix override syntax in RDEPENDS

In reply to Steve Sakoman

From: Yi Zhao <[email protected]>

RDEPENDS_${PN}-tk -> RDEPENDS:${PN}-tk

(cherry picked from commit 1ed9267a318d53a302991a8ec7259d3bb809eaaa)
---
 meta/recipes-devtools/git/git_2.35.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/git/git_2.35.3.bb +1 -1
index 68981d4fde..794045c8b7 100644
@@ -147,7 +147,7 @@ RDEPENDS:${PN}-perltools = "${PN} perl perl-module-file-path findutils"
 
 # git-tk package with gitk and git-gui
 PACKAGES =+ "${PN}-tk"
-#RDEPENDS_${PN}-tk = "${PN} tk tcl"
+#RDEPENDS:${PN}-tk = "${PN} tk tcl"
 #EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh"
 FILES:${PN}-tk = " \
     ${bindir}/gitk \
Signature · 1 line
2.25.1
#14 lore raw

PATCH 12/15 gcc-source: Fix incorrect task dependencies from ${B}

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Some tasks may reference ${B} for gcc-source which in general would not exist. It has dependencies on HOST_SYS and TARGET_SYS which are not appropriate for a shared recipe like gcc-source. This causes problems for the archiver and multiconfigs in particlar.

Set B to something else to avoid these task hash issues.

(cherry picked from commit beb2a76c591e985c6fc7ed473abd1bee27f955a2)
---
 meta/recipes-devtools/gcc/gcc-common.inc | 2 +-
 meta/recipes-devtools/gcc/gcc-source.inc | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-common.inc +1 -1
index 0f70be7dd4..2abc0e355d 100644
@@ -96,7 +96,7 @@ BINV = "${PV}"
 #S = "${WORKDIR}/gcc-${PV}"
 S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
 
-B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
+B ?= "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
 
 target_includedir ?= "${includedir}"
 target_libdir ?= "${libdir}"
meta/recipes-devtools/gcc/gcc-source.inc +1 -0
index 03bab97815..224b7778ef 100644
@@ -18,6 +18,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = ""
 PACKAGES = ""
 
+B = "${WORKDIR}/build"
 
 # This needs to be Python to avoid lots of shell variables becoming dependencies.
 python do_preconfigure () {
Signature · 1 line
2.25.1
#15 lore raw

PATCH 13/15 archiver: don't use machine variables in shared recipes

In reply to Steve Sakoman

From: Jose Quaresma <[email protected]>

When using multiconfig with the same TMP folder we can have races because the shared recipes like gcc-source run twice.

ARCHIVER_OUTDIR = ${ARCHIVER_TOPDIR}/${TARGET_SYS}/${PF}/ which includes TARGET_SYS and between the two different MACHINE values, this changes from 'arm-poky-linux-gnueabi' to 'aarch64-poky-linux'. This leads to the task running twice, once for each multiconfig.

To solve this we need to store the shared output in a common place for all machines and in this way the stamps will be the same for each machine so the gcc-source will on run once regardless of the machine used.

(cherry picked from commit 5abe497aad39a6ce8d72556fcdda1938a0f8c1bc)
---
 meta/classes/archiver.bbclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
meta/classes/archiver.bbclass +7 -2
index 8d026067f4..33070cd17f 100644
@@ -55,9 +55,10 @@ ARCHIVER_MODE[compression] ?= "xz"
 
 DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources"
 ARCHIVER_TOPDIR ?= "${WORKDIR}/archiver-sources"
-ARCHIVER_OUTDIR = "${ARCHIVER_TOPDIR}/${TARGET_SYS}/${PF}/"
+ARCHIVER_ARCH = "${TARGET_SYS}"
+ARCHIVER_OUTDIR = "${ARCHIVER_TOPDIR}/${ARCHIVER_ARCH}/${PF}/"
 ARCHIVER_RPMTOPDIR ?= "${WORKDIR}/deploy-sources-rpm"
-ARCHIVER_RPMOUTDIR = "${ARCHIVER_RPMTOPDIR}/${TARGET_SYS}/${PF}/"
+ARCHIVER_RPMOUTDIR = "${ARCHIVER_RPMTOPDIR}/${ARCHIVER_ARCH}/${PF}/"
 ARCHIVER_WORKDIR = "${WORKDIR}/archiver-work/"
 
 # When producing a combined mirror directory, allow duplicates for the case
@@ -101,6 +102,10 @@ python () {
         bb.debug(1, 'archiver: %s is excluded, covered by gcc-source' % pn)
         return
 
+    # TARGET_SYS in ARCHIVER_ARCH will break the stamp for gcc-source in multiconfig
+    if pn.startswith('gcc-source'):
+        d.setVar('ARCHIVER_ARCH', "allarch")
+
     def hasTask(task):
         return bool(d.getVarFlag(task, "task", False)) and not bool(d.getVarFlag(task, "noexec", False))
 
Signature · 1 line
2.25.1
#16 lore raw

PATCH 14/15 systemd: update 0008-add-missing-FTW_-macros-for-musl.patch

In reply to Steve Sakoman

From: Pavel Zhukov <[email protected]>

Fixes fuzz warning with insane class ihnerited introduced in 4c3f51142b Kirkstone specific, master has been updated to 251.2 and FTBFS with musl [Yocto 14838]

---
 .../systemd/0008-add-missing-FTW_-macros-for-musl.patch   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +4 -4
index 4cce9a3fe6..0c0d3d0b62 100644
@@ -21,12 +21,12 @@ Signed-off-by: Chen Qi <[email protected]>
  3 files changed, 22 insertions(+)
 
 diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
-index aeaf6ad5ec..3df1084ef2 100644
+index 6c0456349d..5140892e22 100644
 --- a/src/basic/missing_type.h
 +++ b/src/basic/missing_type.h
-@@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *);
- #define __COMPAR_FN_T
- typedef int (*__compar_fn_t)(const void *, const void *);
+@@ -14,3 +14,23 @@
+ #ifndef __GLIBC__
+ typedef int (*comparison_fn_t)(const void *, const void *);
  #endif
 +
 +#ifndef FTW_ACTIONRETVAL
Signature · 1 line
2.25.1
#17 lore raw

PATCH 15/15 liberror-perl: Update sstate/equiv versions to clean cache

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

There are cached reproducibility issues on the autobuilder due to the PRServ sstate checksum issues, flush the bad data out the system by bumping the versions.

(cherry picked from commit b12e6cfe3bb34e426c8bb74183d041948cb2ed89)
---
 meta/recipes-devtools/perl/liberror-perl_0.17029.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-devtools/perl/liberror-perl_0.17029.bb +4 -0
index 497f480347..67e5811f3c 100644
@@ -9,6 +9,10 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=8f3499d09ee74a050c0319391ff9d100"
 
+# remove at next version upgrade or when output changes
+PR = "r1"
+HASHEQUIV_HASH_VERSION .= ".1"
+
 DEPENDS += "perl"
 
 RDEPENDS:${PN} += " \
Signature · 1 line
2.25.1
#5 lore raw

Re: [OE-core][kirkstone 04/15] devtool: Fix _copy_file() TypeError

In reply to Steve Sakoman

Hi Steve,

Quoted 8 lines · Steve Sakoman via lists.openembedded.org

From: Xiaobing Luo <[email protected]>

when devtool finish, the _copy_file() failed.
--------------------------------------------
TypeError: _copy_file() got an unexpected keyword argument 'base_outdir'
--------------------------------------------

Quoted 7 lines
Fixes 05f2d5d2ce00 ("devtool: finish: add dry-run option")
(cherry picked from commit a45d9dc089fb2719ca69b92870917f8c0925f632)

Could you also apply this small fix for dunfell?
Cherry-picking 38f2a7717646 [1] should do.

Thanks
Frieder

[1]
https://git.yoctoproject.org/poky/commit?id=38f2a7717646e68953675757fd7b73c66450c979

#6 lore raw

Re: [OE-core][kirkstone 04/15] devtool: Fix _copy_file() TypeError

Quoted 14 lines · Frieder Schrempf

Hi Steve,

Quoted 10 lines · Steve Sakoman via lists.openembedded.org

From: Xiaobing Luo <[email protected]>

when devtool finish, the _copy_file() failed.
--------------------------------------------
TypeError: _copy_file() got an unexpected keyword argument 'base_outdir'
--------------------------------------------

Fixes 05f2d5d2ce00 ("devtool: finish: add dry-run option")
Quoted 7 lines
Quoted 5 lines
(cherry picked from commit a45d9dc089fb2719ca69b92870917f8c0925f632)

Could you also apply this small fix for dunfell?

Yes, I will add this to my test queue.

Thanks!

Steve