Patch review
cover Patch review
Please review this set of changes for scarthgap and have comments back by end of day Monday, June 17
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/7034
The following changes since commit 3b070fc3963d04ce8c13b5b78c3b7ae95e26c435:
binutils: Fix aarch64 disassembly abort (2024-06-10 05:31:10 -0700)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/scarthgap-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/scarthgap-nut
Alexander Kanavin (9):
libtraceevent: submit meson.patch upstream
serf: mark patch as inappropriate for upstream submission
kea: remove unnecessary reproducibility patch
expect: mark patches as Inactive-Upstream
apr: submit 0001-Add-option-to-disable-timed-dependant-tests.patch
upstream
busybox: submit CVE-2022-28391 patches upstream
xinput-calibrator: mark upstream as inactive in a patch
bash: mark build-tests.patch as Inappropriate
icu: add upstream submission links for fix-install-manx.patch
Alexandre Truong (2):
oeqa/selftest/devtool: fix _test_devtool_add_git_url Revert "oeqa/selftest/devtool: fix test_devtool_add_git_style2"
Anton Almqvist (1):
devtool: modify: Catch git submodule error for go code
Felix Nilsson (1):
base-files: profile: fix error sh: 1: unknown operand
Heiko (1):
kernel.bbclass: check, if directory exists before removing empty
module directory
Julien Stephan (1):
oeqa: selftest: context: run tests serially if testtools/subunit
modules are not found
Khem Raj (1):
oeqa/postactions: Do not use -l option with df
Marc Ferland (1):
libinput: fix building with debug-gui option
Maxin B. John (1):
iproute2: drop obsolete patch
Ola x Nilsson (1):
oeqa/selftest/devtool: add test for modifying recipes using go.bbclass
Poonam Jadhav (1):
ppp: Add RSA-MD in LICENSE
Ross Burton (1):
procps: fix build with new glibc but old kernel headers
Vincent Kriek (1):
devtool: sync: Fix Execution error
Wang Mingyu (4):
cronie: upgrade 1.7.1 -> 1.7.2
lttng-ust: upgrade 2.13.7 -> 2.13.8
taglib: upgrade 2.0 -> 2.0.1
mesa: upgrade 24.0.3 -> 24.0.5
Xiangyu Chen (2):
iputils: splitting the ping6 as a package
ltp: add iputils-ping6 to RDEPENDS
Zoltan Boszormenyi (1):
cracklib: Modify patch to compile with GCC 14
meta/classes-recipe/kernel.bbclass | 2 +-
meta/lib/oeqa/selftest/cases/devtool.py | 31 ++++++++--
meta/lib/oeqa/selftest/context.py | 17 ++++-
meta/lib/oeqa/utils/postactions.py | 2 +-
...01-libc-compat.h-add-musl-workaround.patch | 39 ------------
.../iproute2/iproute2_6.7.0.bb | 4 +-
...1-kea-fix-reproducible-build-failure.patch | 62 -------------------
meta/recipes-connectivity/kea/kea_2.4.1.bb | 3 +-
meta/recipes-connectivity/ppp/ppp_2.5.0.bb | 2 +-
.../base-files/base-files/profile | 2 +-
...tr-ensure-only-printable-characters-.patch | 2 +-
...e-all-printed-strings-with-printable.patch | 2 +-
...001-Resolve-string-formatting-issues.patch | 2 +-
.../expect/expect/0001-configure.in.patch | 2 +-
...exp_main_sub.c-Use-PATH_MAX-for-path.patch | 2 +-
...ults-if-Tcl-is-built-with-stubs-and-.patch | 2 +-
.../expect/expect/0002-tcl.m4.patch | 2 +-
.../bash/bash/build-tests.patch | 2 +-
...port-dictionary-byte-order-dependent.patch | 2 +-
.../{cronie_1.7.1.bb => cronie_1.7.2.bb} | 2 +-
.../iputils/iputils_20240117.bb | 13 +++-
meta/recipes-extended/ltp/ltp_20240129.bb | 1 +
.../procps/procps/pidfd.patch | 42 +++++++++++++
meta/recipes-extended/procps/procps_4.0.4.bb | 1 +
.../{mesa-gl_24.0.3.bb => mesa-gl_24.0.5.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 2 +-
.../mesa/{mesa_24.0.3.bb => mesa_24.0.5.bb} | 0
.../wayland/libinput_1.25.0.bb | 2 +-
...ibrator_pointercal.sh-to-be-run-as-n.patch | 2 +-
.../libtraceevent/libtraceevent/meson.patch | 2 +-
...ttng-ust_2.13.7.bb => lttng-ust_2.13.8.bb} | 2 +-
...ion-to-disable-timed-dependant-tests.patch | 2 +-
.../icu/icu/fix-install-manx.patch | 4 +-
...ories.without.sandbox-install.prefix.patch | 2 +-
.../taglib/{taglib_2.0.bb => taglib_2.0.1.bb} | 2 +-
scripts/lib/devtool/standard.py | 18 +++++-
36 files changed, 142 insertions(+), 137 deletions(-)
delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
delete mode 100644 meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch
rename meta/recipes-extended/cronie/{cronie_1.7.1.bb => cronie_1.7.2.bb} (97%)
create mode 100644 meta/recipes-extended/procps/procps/pidfd.patch
rename meta/recipes-graphics/mesa/{mesa-gl_24.0.3.bb => mesa-gl_24.0.5.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_24.0.3.bb => mesa_24.0.5.bb} (100%)
rename meta/recipes-kernel/lttng/{lttng-ust_2.13.7.bb => lttng-ust_2.13.8.bb} (95%)
rename meta/recipes-support/taglib/{taglib_2.0.bb => taglib_2.0.1.bb} (95%)Signature · 1 line
2.34.1
PATCH 1/29 cronie: upgrade 1.7.1 -> 1.7.2
From: Wang Mingyu <[email protected]>
Changelog:
============
*Revert setting the return path to <>. It is not RFC compliant. *Inherit MAILFROM from the crond process environment.
---
.../cronie/{cronie_1.7.1.bb => cronie_1.7.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/cronie/{cronie_1.7.1.bb => cronie_1.7.2.bb} (97%)meta/recipes-extended/cronie/cronie_1.7.2.bb renamed from meta/recipes-extended/cronie/cronie_1.7.1.bb +1 -1
@@ -25,7 +25,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/cronie-${PV}/cronie-${PV}.tar.gz \ PAM_SRC_URI = "file://crond_pam_config.patch" PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" -SRC_URI[sha256sum] = "78033100c24413f0c40f93e6138774d6a4f55bc31050567b90db45a2f9f1b954" +SRC_URI[sha256sum] = "f1da374a15ba7605cf378347f96bc8b678d3d7c0765269c8242cfe5b0789c571" inherit autotools update-rc.d useradd systemd github-releases UPSTREAM_CHECK_REGEX = "releases/tag/cronie-(?P<pver>\d+(\.\d+)+)"
Signature · 1 line
2.34.1
PATCH 2/29 lttng-ust: upgrade 2.13.7 -> 2.13.8
In reply to Steve SakomanFrom: Wang Mingyu <[email protected]>
Changelog:
============
* Add close_range wrapper to liblttng-ust-fd.so
* ust-tracepoint-event: Add static check of sequences length type
* lttng-ust(3): Fix wrong len_type for sequence
* Fix: libc wrapper: use initial-exec for malloc_nesting TLS
---
.../lttng/{lttng-ust_2.13.7.bb => lttng-ust_2.13.8.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-kernel/lttng/{lttng-ust_2.13.7.bb => lttng-ust_2.13.8.bb} (95%)meta/recipes-kernel/lttng/lttng-ust_2.13.8.bb renamed from meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb +1 -1
@@ -34,7 +34,7 @@ SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://0001-Makefile.am-update-rpath-link.patch \ " -SRC_URI[sha256sum] = "5fb4f17c307c8c1b79c68561e89be9562d07e7425bf40e728c4d66755342a5eb" +SRC_URI[sha256sum] = "d4ef98dab9a37ad4f524ccafdfd50af4f266039b528dd5afabce78e49024d937" CVE_PRODUCT = "ust"
Signature · 1 line
2.34.1
PATCH 3/29 taglib: upgrade 2.0 -> 2.0.1
In reply to Steve SakomanFrom: Wang Mingyu <[email protected]>
Changelog:
===========
* Fix aborting when _GLIBCXX_ASSERTIONS are enabled.
* Fall back to utf8cpp header detection in the case that its CMake configuration is removed.
* Improve compatibility with the SWIG interface compiler.
* Build system fixes for testing without bindings, Emscripten and Illumos.
* C bindings: Fix setting UTF-8 encoded property values.
* Windows: Fix opening long paths.
---
meta/recipes-support/taglib/{taglib_2.0.bb => taglib_2.0.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/taglib/{taglib_2.0.bb => taglib_2.0.1.bb} (95%)meta/recipes-support/taglib/taglib_2.0.1.bb renamed from meta/recipes-support/taglib/taglib_2.0.bb +1 -1
@@ -11,7 +11,7 @@ DEPENDS = "zlib utfcpp" SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" -SRC_URI[sha256sum] = "e36ea877a6370810b97d84cf8f72b1e4ed205149ab3ac8232d44c850f38a2859" +SRC_URI[sha256sum] = "08c0a27b96aa5c4e23060fe0b6f93102ee9091a9385257b9d0ddcf467de0d925" UPSTREAM_CHECK_URI = "https://taglib.org/" UPSTREAM_CHECK_REGEX = "taglib-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.34.1
PATCH 4/29 mesa: upgrade 24.0.3 -> 24.0.5
In reply to Steve SakomanFrom: Wang Mingyu <[email protected]>
Changelog:
https://docs.mesa3d.org/relnotes/24.0.5.html
---
.../mesa/{mesa-gl_24.0.3.bb => mesa-gl_24.0.5.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 2 +-
meta/recipes-graphics/mesa/{mesa_24.0.3.bb => mesa_24.0.5.bb} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/mesa/{mesa-gl_24.0.3.bb => mesa-gl_24.0.5.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_24.0.3.bb => mesa_24.0.5.bb} (100%)meta/recipes-graphics/mesa/mesa-gl_24.0.5.bb renamed from meta/recipes-graphics/mesa/mesa-gl_24.0.3.bb +0 -0
meta/recipes-graphics/mesa/mesa.inc +1 -1
@@ -22,7 +22,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ " -SRC_URI[sha256sum] = "77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe" +SRC_URI[sha256sum] = "38cc245ca8faa3c69da6d2687f8906377001f63365348a62cc6f7fafb1e8c018" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
meta/recipes-graphics/mesa/mesa_24.0.5.bb renamed from meta/recipes-graphics/mesa/mesa_24.0.3.bb +0 -0
Signature · 1 line
2.34.1
PATCH 5/29 procps: fix build with new glibc but old kernel headers
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
If you're building procps with a newer glibc (with pidfd_open()) but older kernel headers (say 4.x, before __NR_pidfd_open) then procps will fail to build because of a typo in configure.ac.
--- .../procps/procps/pidfd.patch | 42 +++++++++++++++++++ meta/recipes-extended/procps/procps_4.0.4.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta/recipes-extended/procps/procps/pidfd.patch
meta/recipes-extended/procps/procps/pidfd.patch new file +42 -0
@@ -0,0 +1,42 @@ +From c8f625e085b8249cc009e8b19c3a19100217eb35 Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Thu, 25 Apr 2024 13:33:15 +0000 +Subject: [PATCH] Fix pidfd_open detection + +This check for pidfd_open uses AC_CHECK_FUNC which just runs the specified code, but +src/pgrep.c checks HAVE_PIDFD_OPEN which will only be defined by AC_CHECK_FUNCS. + +Also pidfd_open is defined in sys/pidfd.h so that needs including. + +Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/229] +Signed-off-by: Ross Burton <[email protected]> +--- + +diff --git a/configure.ac b/configure.ac +index fec27e3f..024731c7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -170,7 +170,7 @@ AC_TRY_COMPILE([#include <errno.h>], + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no)) + +-AC_CHECK_FUNC([pidfd_open], [enable_pidwait=yes], [ ++AC_CHECK_FUNCS([pidfd_open], [enable_pidwait=yes], [ + AC_MSG_CHECKING([for __NR_pidfd_open]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + #include <sys/syscall.h> +diff --git a/src/pgrep.c b/src/pgrep.c +index d8e57dff..c5211aec 100644 +--- a/src/pgrep.c ++++ b/src/pgrep.c +@@ -44,7 +44,9 @@ + + #ifdef ENABLE_PIDWAIT + #include <sys/epoll.h> +-#ifndef HAVE_PIDFD_OPEN ++#ifdef HAVE_PIDFD_OPEN ++#include <sys/pidfd.h> ++#else + #include <sys/syscall.h> + #endif /* !HAVE_PIDFD_OPEN */ + #endif
meta/recipes-extended/procps/procps_4.0.4.bb +1 -0
@@ -14,6 +14,7 @@ inherit autotools gettext pkgconfig update-alternatives SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ file://sysctl.conf \ + file://pidfd.patch \ " SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b"
Signature · 1 line
2.34.1
PATCH 6/29 devtool: modify: Catch git submodule error for go code
In reply to Steve SakomanFrom: Anton Almqvist <[email protected]>
One of the git submodule commands failed for source extracted for recipes using go.bbclass. The root cause is probably the path set up by go_do_unpack which makes S and gitroot not match.
This patch does not fix the root problem, but at least it is no worse than before the git submodule support.
The extracted source will still have two .git folders, one in S created by devtool and one in the go path which will contain the tru git history.
[ YOCTO #15483 ]
--- scripts/lib/devtool/standard.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
scripts/lib/devtool/standard.py +4 -1
@@ -893,7 +893,10 @@ def modify(args, config, basepath, workspace): (stdout, _) = bb.process.run('git rev-list --reverse %s..HEAD' % initial_revs["."], cwd=srctree) commits["."] = stdout.split() check_commits = True - (stdout, _) = bb.process.run('git submodule --quiet foreach --recursive \'echo `git rev-parse devtool-base` $PWD\'', cwd=srctree) + try: + (stdout, _) = bb.process.run('git submodule --quiet foreach --recursive \'echo `git rev-parse devtool-base` $PWD\'', cwd=srctree) + except bb.process.ExecutionError: + stdout = "" for line in stdout.splitlines(): (rev, submodule_path) = line.split() submodule = os.path.relpath(submodule_path, srctree)
Signature · 1 line
2.34.1
PATCH 7/29 oeqa/selftest/devtool: add test for modifying recipes using go.bbclass
In reply to Steve SakomanFrom: Ola x Nilsson <[email protected]>
go.bbclass uses a special do_unpack function that causes the git root to be different from S. Verify that it unpacks as expected.
[ YOCTO #15483 ]
--- meta/lib/oeqa/selftest/cases/devtool.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
meta/lib/oeqa/selftest/cases/devtool.py +19 -0
@@ -749,6 +749,25 @@ class DevtoolModifyTests(DevtoolBase): result = runCmd('devtool status') self.assertNotIn('mdadm', result.output) + def test_devtool_modify_go(self): + import oe.path + from tempfile import TemporaryDirectory + with TemporaryDirectory(prefix='devtoolqa') as tempdir: + self.track_for_cleanup(self.workspacedir) + self.add_command_to_tearDown('bitbake -c clean go-helloworld') + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool modify go-helloworld -x %s' % tempdir) + self.assertExists( + oe.path.join(tempdir, 'src', 'golang.org', 'x', 'example', 'go.mod'), + 'Extracted source could not be found' + ) + self.assertExists( + oe.path.join(self.workspacedir, 'conf', 'layer.conf'), + 'Workspace directory not created' + ) + matches = glob.glob(oe.path.join(self.workspacedir, 'appends', 'go-helloworld_*.bbappend')) + self.assertTrue(matches, 'bbappend not created %s' % result.output) + def test_devtool_buildclean(self): def assertFile(path, *paths): f = os.path.join(path, *paths)
Signature · 1 line
2.34.1
PATCH 8/29 base-files: profile: fix error sh: 1: unknown operand
In reply to Steve SakomanFrom: Felix Nilsson <[email protected]>
Handle errors when SHLVL isn't set.
--- meta/recipes-core/base-files/base-files/profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/base-files/base-files/profile +1 -1
@@ -58,7 +58,7 @@ resize() { fi # only do this for /dev/tty[A-z] which are typically # serial ports - if [ $FIRSTTIMESETUP -eq 1 -a $SHLVL -eq 1 ] ; then + if [ $FIRSTTIMESETUP -eq 1 -a ${SHLVL:-1} -eq 1 ] ; then case $(tty 2>/dev/null) in /dev/tty[A-z]*) resize >/dev/null;; esac
Signature · 1 line
2.34.1
PATCH 9/29 oeqa/postactions: Do not use -l option with df
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
-l option is specific to df provided by coreutils, if df applet from busybox is used then it does not work and fails like below
Fixes
df: invalid option -- 'l'
BusyBox v1.36.1 () multi-call binary.
Usage: df [-PkmhT] [-t TYPE] [FILESYSTEM]...
DEBUG: [Command returned '1' after 0.71 seconds]
DEBUG: Command: df -hl
Status: 1 Output: df: invalid option -- 'l'
it seems worth a compromise to show remote mounted filesystems if any during ptests and it works with both df implementations
--- meta/lib/oeqa/utils/postactions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/utils/postactions.py +1 -1
@@ -25,7 +25,7 @@ def create_artifacts_directory(d, tc): def get_target_disk_usage(d, tc): output_file = os.path.join(get_json_result_dir(d), "artifacts", "target_disk_usage.txt") try: - (status, output) = tc.target.run('df -hl') + (status, output) = tc.target.run('df -h') with open(output_file, 'w') as f: f.write(output) f.write("\n")
Signature · 1 line
2.34.1
PATCH 10/29 oeqa: selftest: context: run tests serially if testtools/subunit modules are not found
In reply to Steve SakomanFrom: Julien Stephan <[email protected]>
If testtools and/or subunit modules are not found we get the following backtrace (example for testtools):
NOTE: Starting bitbake server...
Traceback (most recent call last):
File "<..>/poky/scripts/oe-selftest", line 60, in
<module>
ret = main()
File "<..>/poky/scripts/oe-selftest", line 47, in main
results = args.func(logger, args)
File "<..>/poky/meta/lib/oeqa/selftest/context.py",
line 391, in run
rc = self._internal_run(logger, args)
File "<..>/poky/meta/lib/oeqa/selftest/context.py",
line 377, in _internal_run
rc = self.tc.runTests(**self.tc_kwargs['run'])
File "<..>/poky/meta/lib/oeqa/selftest/context.py", line 161, in runTests
return super(OESelftestTestContext, self).runTests(processes, skips)
File "<..>/poky/meta/lib/oeqa/core/context.py", line
91, in runTests
result = self.runner.run(self.prepareSuite(self.suites, processes))
File "<..>/poky/meta/lib/oeqa/selftest/context.py",
line 154, in prepareSuite
from oeqa.core.utils.concurrencytest import ConcurrentTestSuite
File
"<..>/poky/meta/lib/oeqa/core/utils/concurrencytest.py", line 22, in <module>
import testtools
ModuleNotFoundError: No module named 'testtools'
Fix this by adding a custom callback on -j/--num-processes parameter to check testtools and subunit modules. Fallback to serial testing if missing. This strategy is already used in sdk/context.py
--- meta/lib/oeqa/selftest/context.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
meta/lib/oeqa/selftest/context.py +16 -1
@@ -194,8 +194,23 @@ class OESelftestTestContextExecutor(OETestContextExecutor): parser.add_argument('-R', '--skip-tests', required=False, action='store', nargs='+', dest="skips", default=None, help='Skip the tests specified. Format should be <module>[.<class>[.<test_method>]]') + + def check_parallel_support(parameter): + if not parameter.isdigit(): + import argparse + raise argparse.ArgumentTypeError("argument -j/--num-processes: invalid int value: '%s' " % str(parameter)) + + processes = int(parameter) + if processes: + try: + import testtools, subunit + except ImportError: + print("Failed to import testtools or subunit, the testcases will run serially") + processes = None + return processes + parser.add_argument('-j', '--num-processes', dest='processes', action='store', - type=int, help="number of processes to execute in parallel with") + type=check_parallel_support, help="number of processes to execute in parallel with") parser.add_argument('-t', '--select-tag', dest="select_tags", action='append', default=None,
Signature · 1 line
2.34.1
PATCH 11/29 libtraceevent: submit meson.patch upstream
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch +1 -1
@@ -4,7 +4,7 @@ Fixes for the Meson build of libtraceevent: - Install the plugins as modules not static and versioned shared libraries - Add an option to disable building the documentation (needs asciidoc and xmlto) -Upstream-Status: Pending +Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/[email protected]/T/#u] Signed-off-by: Ross Burton <[email protected]> diff --git a/meson.build b/meson.build
Signature · 1 line
2.34.1
PATCH 12/29 devtool: sync: Fix Execution error
In reply to Steve SakomanFrom: Vincent Kriek <[email protected]>
When executing devtool sync on a recipe that was extract with devtool extract earlier the following error occured:
Traceback (most recent call last):
[...]
bb.process.ExecutionError: Execution of 'git fetch file:///home/vin/projects/poky/build/tmp/work/all-poky-linux/netbase/6.4/devtooltmp-figt1jmr/workdir/netbase devtool:devtool' failed with exit code 128:
fatal: refusing to fetch into branch 'refs/heads/devtool' checked out at '/home/vin/projects/poky/build/netbase-src'
Fix this by adding --update-head-ok and --force to git fetch so it will override the current head even if it is checked out and has changes. Possible existing changes in the devtool branch can be retrieved by checking out the devtool.bak branch
--- scripts/lib/devtool/standard.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
scripts/lib/devtool/standard.py +12 -1
@@ -661,7 +661,18 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works srctree_localdir = os.path.join(srctree, 'oe-local-files') if sync: - bb.process.run('git fetch file://' + srcsubdir + ' ' + devbranch + ':' + devbranch, cwd=srctree) + try: + logger.info('Backing up current %s branch as branch: %s.bak' % (devbranch, devbranch)) + bb.process.run('git branch -f ' + devbranch + '.bak', cwd=srctree) + + # Use git fetch to update the source with the current recipe + # To be able to update the currently checked out branch with + # possibly new history (no fast-forward) git needs to be told + # that's ok + logger.info('Syncing source files including patches to git branch: %s' % devbranch) + bb.process.run('git fetch --update-head-ok --force file://' + srcsubdir + ' ' + devbranch + ':' + devbranch, cwd=srctree) + except bb.process.ExecutionError as e: + raise DevtoolError("Error when syncing source files to local checkout: %s" % str(e)) # Move the oe-local-files directory to srctree. # As oe-local-files is not part of the constructed git tree,
Signature · 1 line
2.34.1
PATCH 13/29 serf: mark patch as inappropriate for upstream submission
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
What the patch does is not suitable, as upstream would surely want the issue with the code fixed, not removal of that code altogether.
I'd also note that serf is still semi-ummaintained, and the only consumer of it is subversion, which is slowly but steadily fading away in favor of git and artifact-specific solutions.
--- ...op.creating.directories.without.sandbox-install.prefix.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch +1 -1
@@ -31,7 +31,7 @@ ERROR: scons install execution failed. and the installed paths (including the paths inside libserf*.pc) look correct -Upstream-Status: Pending +Upstream-Status: Inappropriate [removes block of code rather than fixing the problem in that block] Signed-off-by: Martin Jansa <[email protected]>
Signature · 1 line
2.34.1
PATCH 14/29 kea: remove unnecessary reproducibility patch
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
Rather, adjust the sed invocation to do the correct thing directly.
--- ...1-kea-fix-reproducible-build-failure.patch | 62 ------------------- meta/recipes-connectivity/kea/kea_2.4.1.bb | 3 +- 2 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch
meta/recipes-connectivity/kea/files/0001-kea-fix-reproducible-build-failure.patch deleted +0 -62
@@ -1,62 +0,0 @@ -From f9bcfed5a1d44d9211c5f6eba403a9898c8c9057 Mon Sep 17 00:00:00 2001 -From: Sudip Mukherjee <[email protected]> -Date: Tue, 8 Aug 2023 19:03:13 +0100 -Subject: [PATCH] kea: fix reproducible build failure - -New version of Kea has started using path of build-dir instead of -src-dir which results in reproducible builds failure. -Use src-dir as is used in v2.2.0 - -Upstream-Status: Pending -https://gitlab.isc.org/isc-projects/kea/-/issues/3007 - -Upstream has confirmed the patch will not be accepted but discussions -with upstream is still going on, we might have a proper solution later. - -Signed-off-by: Sudip Mukherjee <[email protected]> ---- - src/bin/admin/kea-admin.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in -index 034a0ee..8ab11ab 100644 ---- a/src/bin/admin/kea-admin.in -+++ b/src/bin/admin/kea-admin.in -@@ -51,14 +51,14 @@ dump_qry="" - if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then - . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh" - else -- . "@abs_top_builddir@/src/bin/admin/admin-utils.sh" -+ . "@abs_top_srcdir@/src/bin/admin/admin-utils.sh" - fi - - # Find the installed kea-lfc if available. Fallback to sources otherwise. - if test -x "@sbindir@/kea-lfc"; then - kea_lfc="@sbindir@/kea-lfc" - else -- kea_lfc="@abs_top_builddir@/src/bin/lfc/kea-lfc" -+ kea_lfc="@abs_top_srcdir@/src/bin/lfc/kea-lfc" - fi - - # Prints out usage version. -@@ -355,7 +355,7 @@ mysql_upgrade() { - # Check if there are any files in it - num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) - if [ "$num_files" -eq 0 ]; then -- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql -+ upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/mysql - - # Check if the scripts directory exists at all. - if [ ! -d ${upgrade_scripts_dir} ]; then -@@ -405,7 +405,7 @@ pgsql_upgrade() { - # Check if there are any files in it - num_files=$(find "${upgrade_scripts_dir}" -name 'upgrade*.sh' -type f | wc -l) - if [ "$num_files" -eq 0 ]; then -- upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql -+ upgrade_scripts_dir=@abs_top_srcdir@/src/share/database/scripts/pgsql - - # Check if the scripts directory exists at all. - if [ ! -d ${upgrade_scripts_dir} ]; then --- -2.39.2 -
meta/recipes-connectivity/kea/kea_2.4.1.bb +1 -2
@@ -17,7 +17,6 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://fix-multilib-conflict.patch \ file://fix_pid_keactrl.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ - file://0001-kea-fix-reproducible-build-failure.patch \ " SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a"
@@ -47,7 +46,7 @@ do_configure:prepend() { # replace abs_top_builddir to avoid introducing the build path # don't expand the abs_top_builddir on the target as the abs_top_builddir is meanlingless on the target find ${S} -type f -name *.sh.in | xargs sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" - sed -i "s:@abs_top_srcdir@:@abs_top_srcdir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in + sed -i "s:@abs_top_builddir@:@abs_top_builddir_placeholder@:g" ${S}/src/bin/admin/kea-admin.in } # patch out build host paths for reproducibility
Signature · 1 line
2.34.1
PATCH 15/29 expect: mark patches as Inactive-Upstream
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
There's every indication that this is an ex-expect:
last release in 2018, stale tickets, cvs server gone.
--- .../expect/expect/0001-Resolve-string-formatting-issues.patch | 2 +- meta/recipes-devtools/expect/expect/0001-configure.in.patch | 2 +- .../expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch | 2 +- ...1-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch | 2 +- meta/recipes-devtools/expect/expect/0002-tcl.m4.patch | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-devtools/expect/expect/0001-Resolve-string-formatting-issues.patch +1 -1
@@ -3,7 +3,7 @@ From: Alexander Kanavin <[email protected]> Date: Thu, 23 Mar 2017 13:44:41 +0200 Subject: [PATCH] Resolve string formatting issues. -Upstream-Status: Inappropriate [upstream seems dead] +Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] Signed-off-by: Alexander Kanavin <[email protected]> --- exp_clib.c | 4 ++--
meta/recipes-devtools/expect/expect/0001-configure.in.patch +1 -1
@@ -1,7 +1,7 @@ Allow cross compiling. Signed-off-by: Anders Roxell <[email protected]> -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] --- diff -uNr a/configure.in b/configure.in --- a/configure.in 2012-12-14 15:31:32.623180450 +0100
meta/recipes-devtools/expect/expect/0001-exp_main_sub.c-Use-PATH_MAX-for-path.patch +1 -1
@@ -10,7 +10,7 @@ Aborted (core dumped) Use PATH_MAX to fix the problem. -Upstream-Status: Pending [Upstream seems dead] +Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] Signed-off-by: Robert Yang <[email protected]> ---
meta/recipes-devtools/expect/expect/0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch +1 -1
@@ -42,7 +42,7 @@ Example: } Author: Sergei Golovan <[email protected]> -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] This patch is backported from fedora changes for expect: http://pkgs.fedoraproject.org/cgit/rpms/expect.git/commit/ ?h=master&id=b6737eed550be93182f2ed194e836a6cbbcf4fa3
meta/recipes-devtools/expect/expect/0002-tcl.m4.patch +1 -1
@@ -1,7 +1,7 @@ Use proper -L path when cross compiling. Signed-off-by: Anders Roxell <[email protected]> -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [no activity since 2018; cvs server went read-only] --- diff -uNr a/tclconfig/tcl.m4 b/tclconfig/tcl.m4 --- a/tclconfig/tcl.m4 2012-12-14 09:16:58.789861281 +0100
Signature · 1 line
2.34.1
PATCH 16/29 apr: submit 0001-Add-option-to-disable-timed-dependant-tests.patch upstream
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- .../apr/0001-Add-option-to-disable-timed-dependant-tests.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch +1 -1
@@ -7,7 +7,7 @@ The disabled tests rely on timing to pass correctly. On a virtualized system under heavy load, these tests randomly fail because they miss a timer or other timing related issues. -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/apache/apr/pull/54] Signed-off-by: Jeremy Puhlman <[email protected]> ---
Signature · 1 line
2.34.1
PATCH 17/29 busybox: submit CVE-2022-28391 patches upstream
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- ...1-libbb-sockaddr2str-ensure-only-printable-characters-.patch | 2 +- ...2-nslookup-sanitize-all-printed-strings-with-printable.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/busybox/busybox/0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch +1 -1
@@ -5,7 +5,7 @@ Subject: [PATCH 1/2] libbb: sockaddr2str: ensure only printable characters are returned for the hostname part CVE: CVE-2022-28391 -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.busybox.net/show_bug.cgi?id=15001] Signed-off-by: Ariadne Conill <[email protected]> Signed-off-by: Steve Sakoman <[email protected]> ---
meta/recipes-core/busybox/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch +1 -1
@@ -8,7 +8,7 @@ Otherwise, terminal sequences can be injected, which enables various terminal in attacks from DNS results. CVE: CVE-2022-28391 -Upstream-Status: Pending +Upstream-Status: Submitted [https://bugs.busybox.net/show_bug.cgi?id=15001] Signed-off-by: Ariadne Conill <[email protected]> Signed-off-by: Steve Sakoman <[email protected]> ---
Signature · 1 line
2.34.1
PATCH 18/29 xinput-calibrator: mark upstream as inactive in a patch
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- .../Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xinput-calibrator/xinput-calibrator/Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch +1 -1
@@ -1,4 +1,4 @@ -Upstream-Status: Pending +Upstream-Status: Inactive-Upstream [last commits over a decade ago] From 14734a93bd3fc323325459e24b04795422e395e6 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu <[email protected]>
Signature · 1 line
2.34.1
PATCH 20/29 icu: add upstream submission links for fix-install-manx.patch
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- meta/recipes-support/icu/icu/fix-install-manx.patch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-support/icu/icu/fix-install-manx.patch +3 -1
@@ -11,7 +11,9 @@ and one process tries to chown a file that the other process has just deleted. Also install-manx should be a phony target, and for clarity use $^ instead of $? in the install command. -Upstream-Status: Pending +Upstream ticket: https://unicode-org.atlassian.net/jira/software/c/projects/ICU/issues/ICU-21172 + +Upstream-Status: Submitted [https://github.com/unicode-org/icu/pull/2966] Signed-off-by: Ross Burton <[email protected]> --- Makefile.in | 8 ++++----
Signature · 1 line
2.34.1
PATCH 21/29 ppp: Add RSA-MD in LICENSE
In reply to Steve SakomanFrom: Poonam Jadhav <[email protected]>
ppp package has "RSA Data Security" license text in Message-Digest Algorithm source file ppp-md5.c and ppp-md4.c Add RSA-MD in LICENSE field for ppp package
--- meta/recipes-connectivity/ppp/ppp_2.5.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/ppp/ppp_2.5.0.bb +1 -1
@@ -5,7 +5,7 @@ SECTION = "console/network" HOMEPAGE = "http://samba.org/ppp/" BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs" DEPENDS = "libpcap openssl virtual/crypt" -LICENSE = "BSD-3-Clause & BSD-3-Clause-Attribution & GPL-2.0-or-later & LGPL-2.0-or-later & PD" +LICENSE = "BSD-3-Clause & BSD-3-Clause-Attribution & GPL-2.0-or-later & LGPL-2.0-or-later & PD & RSA-MD" LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \ file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
Signature · 1 line
2.34.1
PATCH 22/29 iproute2: drop obsolete patch
In reply to Steve SakomanFrom: "Maxin B. John" <[email protected]>
libc-compat.h fix for musl was obsolete after 4.16.0 release of iproute2. Drop it.
--- ...01-libc-compat.h-add-musl-workaround.patch | 39 ------------------- .../iproute2/iproute2_6.7.0.bb | 4 +- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From c25f8d1f7a6203dfeb10b39f80ffd314bb84a58d Mon Sep 17 00:00:00 2001 -From: Baruch Siach <[email protected]> -Date: Thu, 22 Dec 2016 15:26:30 +0200 -Subject: [PATCH] libc-compat.h: add musl workaround - -The libc-compat.h kernel header uses glibc specific macros (__GLIBC__ and -__USE_MISC) to solve conflicts with libc provided headers. This patch makes -libc-compat.h work for musl libc as well. - -Upstream-Status: Pending - -Taken From: -https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch - -Signed-off-by: Baruch Siach <[email protected]> -Signed-off-by: Maxin B. John <[email protected]> - ---- - include/uapi/linux/libc-compat.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h -index a159991..22198fa 100644 ---- a/include/uapi/linux/libc-compat.h -+++ b/include/uapi/linux/libc-compat.h -@@ -50,10 +50,12 @@ - #define _LIBC_COMPAT_H - - /* We have included glibc headers... */ --#if defined(__GLIBC__) -+#if 1 -+#define __USE_MISC - - /* Coordinate with glibc net/if.h header. */ - #if defined(_NET_IF_H) && defined(__USE_MISC) -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 - - /* GLIBC headers included first so don't define anything - * that would already be defined. */
meta/recipes-connectivity/iproute2/iproute2_6.7.0.bb +1 -3
@@ -11,9 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ DEPENDS = "flex-native bison-native iptables libcap" -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ - file://0001-libc-compat.h-add-musl-workaround.patch \ - " +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz" SRC_URI[sha256sum] = "ff942dd9828d7d1f867f61fe72ce433078c31e5d8e4a78e20f02cb5892e8841d"
Signature · 1 line
2.34.1
PATCH 23/29 kernel.bbclass: check, if directory exists before removing empty module directory
In reply to Steve SakomanFrom: Heiko <[email protected]>
If the kernel folder does not exist, find will result in an error.
This can occur if the kernel has no modules but, for example, custom modules are created.
Add check before deleting.
--- meta/classes-recipe/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-recipe/kernel.bbclass +1 -1
@@ -463,7 +463,7 @@ kernel_do_install() { rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build" rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source" # Remove empty module directories to prevent QA issues - find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete + [ -d "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" ] && find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete else bbnote "no modules to install" fi
Signature · 1 line
2.34.1
PATCH 19/29 bash: mark build-tests.patch as Inappropriate
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
--- meta/recipes-extended/bash/bash/build-tests.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/bash/bash/build-tests.patch +1 -1
@@ -4,7 +4,7 @@ Date: Wed, 19 Dec 2012 17:18:31 +0100 Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking dependencies. -Upstream-Status: Pending +Upstream-Status: Inappropriate [ptest specific] Signed-off-by: Anders Roxell <[email protected]> Rebase to 5.0
Signature · 1 line
2.34.1
PATCH 24/29 iputils: splitting the ping6 as a package
In reply to Steve SakomanFrom: Xiangyu Chen <[email protected]>
The iputils merged the ping4 and ping6 command into the ping since the commit ebad35fe[1], currently, iputils ping support being called using "ping -6" or "ping6" symlinks.
In oe-core, there are two packages provide ipv6 ping, inetutils and iputils, the inetutils-ping6 doesn't support "-I" option to bind the interface, that cause some of scripts(e.g. LTP test[2]) which was based on iputils-ping6 fails.
If someone or a package needs iputils-ping6, they can enable it in local.conf or add it into rdepends directly.
Ref:
[1] https://github.com/iputils/iputils/commit/e3de851b809c7b72ccc654a72b6af61d
[2] https://github.com/linux-test-project/ltp/blob/master/testcases/kernel/ \
containers/netns/netns_comm.sh#L25
--- meta/recipes-extended/iputils/iputils_20240117.bb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
meta/recipes-extended/iputils/iputils_20240117.bb +12 -1
@@ -35,7 +35,11 @@ ALTERNATIVE_PRIORITY = "100" ALTERNATIVE:${PN}-ping = "ping" ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff" +ALTERNATIVE:${PN}-ping6 = "ping6" +ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" + +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ping6', '', d)}" PACKAGES += "${SPLITPKGS}" ALLOW_EMPTY:${PN} = "1"
@@ -43,6 +47,13 @@ RDEPENDS:${PN} += "${SPLITPKGS}" FILES:${PN} = "" FILES:${PN}-ping = "${base_bindir}/ping.${BPN}" +FILES:${PN}-ping6 = "${base_bindir}/ping6.${BPN}" FILES:${PN}-arping = "${base_bindir}/arping" FILES:${PN}-tracepath = "${base_bindir}/tracepath" FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" + +do_install:append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}; then + ln -sf ping ${D}/${base_bindir}/ping6 + fi +}
Signature · 1 line
2.34.1
PATCH 25/29 ltp: add iputils-ping6 to RDEPENDS
In reply to Steve SakomanFrom: Xiangyu Chen <[email protected]>
According to the LTP documents[1], it using ping6 from iputils which support "-I" option to bind the interface[2].
Ref:
[1] https://github.com/linux-test-project/ltp/commit/6f97789c
[2] https://github.com/linux-test-project/ltp/commit/64b11656
--- meta/recipes-extended/ltp/ltp_20240129.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-extended/ltp/ltp_20240129.bb +1 -0
@@ -98,6 +98,7 @@ RDEPENDS:${PN} = "\ gdb \ gzip \ iproute2 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'iputils-ping6', '', d)} \ ldd \ libaio \ logrotate \
Signature · 1 line
2.34.1
PATCH 26/29 libinput: fix building with debug-gui option
In reply to Steve SakomanFrom: Marc Ferland <[email protected]>
When building libinput with the 'gui' PACKAGECONFIG option, it fails with:
| Run-time dependency x11 found: YES 1.8.9 | Run-time dependency wayland-client found: YES 1.22.0 | Run-time dependency wayland-protocols found: YES 1.34 | Program wayland-scanner found: NO | | ../git/meson.build:578:20: ERROR: Program 'wayland-scanner' not found or not executable | | A full log can be found at /home/marc/mnt/yocto-latest/build/tmp/work/core2-64-poky-linux/libinput/1.25.0/build/meson-logs/meson-log.txt | ERROR: meson failed | WARNING: exit code 1 from a shell command.
Adding a build dependency on wayland-native fixes the issue.
--- meta/recipes-graphics/wayland/libinput_1.25.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/libinput_1.25.0.bb +1 -1
@@ -32,7 +32,7 @@ do_configure:append() { PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" -PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" +PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3 wayland-native" PACKAGECONFIG[tests] = "-Dtests=true -Dinstall-tests=true,-Dtests=false -Dinstall-tests=false,libcheck" UDEVDIR = "`pkg-config --variable=udevdir udev`"
Signature · 1 line
2.34.1
PATCH 27/29 oeqa/selftest/devtool: fix _test_devtool_add_git_url
In reply to Steve SakomanFrom: Alexandre Truong <[email protected]>
This patch is a follow-up to the bug#15466.
As a reminder, the bug was about devtool’s submodule detection checking for HEAD when a version is being passed.
As Vincent Kriek pointed out:
the --version that is being passed to devtool is only used for
setting the PV value in the recipe. To take into account the tag,
we add --srcrev to the command:
devtool add --srcrev v3.1.0 --version v3.1.0 mbedtls git://[email protected]/ARMmbed/mbedtls.git;protocol=https
Changes to _test_devtool_add_git_url have been made to take into account the srcrev. srcrev will be passed as an optional parameter because the test_devtool_add_git_style1
does not need the srcrev contrary to test_devtool_add_git_style2
Fixes [YOCTO #15466]
--- meta/lib/oeqa/selftest/cases/devtool.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
meta/lib/oeqa/selftest/cases/devtool.py +7 -3
@@ -286,10 +286,13 @@ class DevtoolTestCase(OESelftestTestCase): else: self.skipTest('No tap devices found - you must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') - def _test_devtool_add_git_url(self, git_url, version, pn, resulting_src_uri): + def _test_devtool_add_git_url(self, git_url, version, pn, resulting_src_uri, srcrev=None): self.track_for_cleanup(self.workspacedir) self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') - result = runCmd('devtool add --version %s %s %s' % (version, pn, git_url)) + command = 'devtool add --version %s %s %s' % (version, pn, git_url) + if srcrev : + command += ' --srcrev %s' %srcrev + result = runCmd(command) self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created') # Check the recipe name is correct recipefile = get_bb_var('FILE', pn)
@@ -479,11 +482,12 @@ class DevtoolAddTests(DevtoolBase): def test_devtool_add_git_style2(self): version = 'v3.1.0' + srcrev = 'v3.1.0' pn = 'mbedtls' # this will trigger reformat_git_uri with branch parameter in url git_url = "'git://[email protected]/ARMmbed/mbedtls.git;protocol=https'" resulting_src_uri = "gitsm://[email protected]/ARMmbed/mbedtls.git;protocol=https;branch=master" - self._test_devtool_add_git_url(git_url, version, pn, resulting_src_uri) + self._test_devtool_add_git_url(git_url, version, pn, resulting_src_uri, srcrev) def test_devtool_add_library(self): # Fetch source
Signature · 1 line
2.34.1
PATCH 28/29 Revert "oeqa/selftest/devtool: fix test_devtool_add_git_style2"
In reply to Steve SakomanFrom: Alexandre Truong <[email protected]>
This reverts commit ab6d3e3d645ffc343f434bf731339fa237df027a from poky repository.
The previous reverted commit was a workaround. The fix "oeqa/selftest/devtool: fix _test_devtool_add_git_url" tackle the issue. So, the workaround is not needed anymore.
--- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/devtool.py +1 -1
@@ -486,7 +486,7 @@ class DevtoolAddTests(DevtoolBase): pn = 'mbedtls' # this will trigger reformat_git_uri with branch parameter in url git_url = "'git://[email protected]/ARMmbed/mbedtls.git;protocol=https'" - resulting_src_uri = "gitsm://[email protected]/ARMmbed/mbedtls.git;protocol=https;branch=master" + resulting_src_uri = "git://[email protected]/ARMmbed/mbedtls.git;protocol=https;branch=master" self._test_devtool_add_git_url(git_url, version, pn, resulting_src_uri, srcrev) def test_devtool_add_library(self):
Signature · 1 line
2.34.1
PATCH 29/29 cracklib: Modify patch to compile with GCC 14
In reply to Steve SakomanFrom: Zoltan Boszormenyi <[email protected]>
GCC 14 implicitly turns a warning into a compiler error:
| ../../git/src/lib/packlib.c: In function ‘PWClose’:
| ../../git/src/lib/packlib.c:554:40: error: passing argument 1 of ‘HwmsHostToBigEndian’ from incompatible pointer type [-Wincompatible-pointer-types]
| 554 | HwmsHostToBigEndian(tmp_pwp.hwms, sizeof(tmp_pwp.hwms), en_is32);
| | ~~~~~~~^~~~~
| | |
| | uint32_t * {aka unsigned int *}
| ../../git/src/lib/packlib.c:142:27: note: expected ‘char *’ but argument is of type ‘uint32_t *’ {aka ‘unsigned int *’}
| 142 | HwmsHostToBigEndian(char *pHwms, int nLen,int nBitType)
| | ~~~~~~^~~~~Add the cast to (char *) to silence it.
--- ...0001-packlib.c-support-dictionary-byte-order-dependent.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch +1 -1
@@ -303,7 +303,7 @@ index 9396e1d..d0bb181 100644 + PWDICT tmp_pwp; + + memcpy(&tmp_pwp, pwp, sizeof(PWDICT)); -+ HwmsHostToBigEndian(tmp_pwp.hwms, sizeof(tmp_pwp.hwms), en_is32); ++ HwmsHostToBigEndian((char *)tmp_pwp.hwms, sizeof(tmp_pwp.hwms), en_is32); + fwrite(tmp_pwp.hwms, 1, sizeof(tmp_pwp.hwms), pwp->wfp); } }
Signature · 1 line
2.34.1