summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/acpica/acpica_20240322.bb (renamed from meta/recipes-extended/acpica/acpica_20230628.bb)11
-rw-r--r--meta/recipes-extended/at/at_3.2.5.bb8
-rw-r--r--meta/recipes-extended/bash/bash.inc13
-rw-r--r--meta/recipes-extended/bash/bash/build-tests.patch2
-rw-r--r--meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch34
-rw-r--r--meta/recipes-extended/bash/bash_5.2.21.bb1
-rw-r--r--meta/recipes-extended/bc/bc_1.07.1.bb2
-rw-r--r--meta/recipes-extended/bzip2/bzip2_1.0.8.bb24
-rw-r--r--meta/recipes-extended/cpio/cpio_2.15.bb3
-rw-r--r--meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch2
-rw-r--r--meta/recipes-extended/cronie/cronie_1.7.2.bb (renamed from meta/recipes-extended/cronie/cronie_1.7.1.bb)8
-rw-r--r--meta/recipes-extended/cups/cups.inc4
-rw-r--r--meta/recipes-extended/cups/cups_2.4.8.bb (renamed from meta/recipes-extended/cups/cups_2.4.7.bb)2
-rw-r--r--meta/recipes-extended/ed/ed_1.20.2.bb (renamed from meta/recipes-extended/ed/ed_1.20.1.bb)2
-rw-r--r--meta/recipes-extended/findutils/findutils.inc1
-rw-r--r--meta/recipes-extended/findutils/findutils/autoconf-2.73.patch24
-rw-r--r--meta/recipes-extended/findutils/findutils/run-ptest28
-rw-r--r--meta/recipes-extended/findutils/findutils_4.10.0.bb (renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb)6
-rw-r--r--meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch38
-rw-r--r--meta/recipes-extended/gawk/gawk_5.3.0.bb1
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch11
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch99
-rw-r--r--meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb (renamed from meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb)3
-rw-r--r--meta/recipes-extended/go-examples/go-helloworld_0.1.bb4
-rw-r--r--meta/recipes-extended/gzip/gzip.inc1
-rw-r--r--meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch44
-rw-r--r--meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch31
-rw-r--r--meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch49
-rw-r--r--meta/recipes-extended/iptables/iptables_1.8.10.bb14
-rw-r--r--meta/recipes-extended/iputils/iputils_20240117.bb13
-rw-r--r--meta/recipes-extended/libarchive/libarchive/configurehack.patch20
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.7.4.bb (renamed from meta/recipes-extended/libarchive/libarchive_3.7.2.bb)2
-rw-r--r--meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch5
-rw-r--r--meta/recipes-extended/libsolv/libsolv_0.7.29.bb (renamed from meta/recipes-extended/libsolv/libsolv_0.7.28.bb)2
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.76.bb (renamed from meta/recipes-extended/lighttpd/lighttpd_1.4.74.bb)8
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch9
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch34
-rw-r--r--meta/recipes-extended/ltp/ltp_20240524.bb (renamed from meta/recipes-extended/ltp/ltp_20240129.bb)4
-rw-r--r--meta/recipes-extended/lzip/lzip_1.24.1.bb (renamed from meta/recipes-extended/lzip/lzip_1.24.bb)2
-rw-r--r--meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch9
-rw-r--r--meta/recipes-extended/man-db/man-db_2.12.1.bb (renamed from meta/recipes-extended/man-db/man-db_2.12.0.bb)4
-rw-r--r--meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch31
-rw-r--r--meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch33
-rw-r--r--meta/recipes-extended/man-pages/man-pages_6.8.bb (renamed from meta/recipes-extended/man-pages/man-pages_6.06.bb)7
-rw-r--r--meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch148
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch52
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Fix-parsing-of-r-in-monitor-manager-mode.patch74
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch7
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch9
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch53
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch36
-rw-r--r--meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch7
-rw-r--r--meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch56
-rw-r--r--meta/recipes-extended/mdadm/files/0001-mdadm-Fix-optional-write-behind-parameter.patch45
-rw-r--r--meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch9
-rw-r--r--meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch43
-rw-r--r--meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch6
-rw-r--r--meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch106
-rw-r--r--meta/recipes-extended/mdadm/files/0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch41
-rw-r--r--meta/recipes-extended/mdadm/files/0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch39
-rw-r--r--meta/recipes-extended/mdadm/files/0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch33
-rw-r--r--meta/recipes-extended/mdadm/files/0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch41
-rw-r--r--meta/recipes-extended/mdadm/files/0001-tests-add-.broken-files-for-04update-uuid-and-07reve.patch39
-rw-r--r--meta/recipes-extended/mdadm/files/0001-tests-fix-raid0-tests-for-0.90-metadata.patch102
-rw-r--r--meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch24
-rw-r--r--meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch27
-rw-r--r--meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch56
-rw-r--r--meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch91
-rw-r--r--meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch42
-rw-r--r--meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch128
-rw-r--r--meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch454
-rw-r--r--meta/recipes-extended/mdadm/files/debian-no-Werror.patch11
-rw-r--r--meta/recipes-extended/mdadm/files/include_sysmacros.patch14
-rw-r--r--meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch7
-rw-r--r--meta/recipes-extended/mdadm/mdadm_4.3.bb (renamed from meta/recipes-extended/mdadm/mdadm_4.2.bb)28
-rw-r--r--meta/recipes-extended/msmtp/msmtp_1.8.26.bb (renamed from meta/recipes-extended/msmtp/msmtp_1.8.25.bb)2
-rw-r--r--meta/recipes-extended/net-tools/net-tools_2.10.bb4
-rw-r--r--meta/recipes-extended/pam/libpam/0001-examples-Replace-use-of-termio.h-with-termios.h.patch39
-rw-r--r--meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch42
-rw-r--r--meta/recipes-extended/pam/libpam/libpam-xtests.patch22
-rw-r--r--meta/recipes-extended/pam/libpam_1.6.1.bb (renamed from meta/recipes-extended/pam/libpam_1.5.3.bb)10
-rw-r--r--meta/recipes-extended/procps/procps/pidfd.patch42
-rw-r--r--meta/recipes-extended/procps/procps_4.0.4.bb3
-rw-r--r--meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch6
-rw-r--r--meta/recipes-extended/psmisc/psmisc_23.7.bb (renamed from meta/recipes-extended/psmisc/psmisc_23.6.bb)2
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb4
-rw-r--r--meta/recipes-extended/screen/screen_4.9.1.bb2
-rw-r--r--meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch39
-rw-r--r--meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch9
-rw-r--r--meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch79
-rw-r--r--meta/recipes-extended/shadow/shadow-securetty_4.6.bb5
-rw-r--r--meta/recipes-extended/shadow/shadow-sysroot_4.6.bb3
-rw-r--r--meta/recipes-extended/shadow/shadow.inc25
-rw-r--r--meta/recipes-extended/shadow/shadow_4.15.1.bb (renamed from meta/recipes-extended/shadow/shadow_4.14.2.bb)0
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng_0.17.08.bb (renamed from meta/recipes-extended/stress-ng/stress-ng_0.17.05.bb)2
-rw-r--r--meta/recipes-extended/sudo/sudo_1.9.15p5.bb2
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb2
-rw-r--r--meta/recipes-extended/sysstat/sysstat_12.7.5.bb4
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb4
-rw-r--r--meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb3
-rw-r--r--meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch (renamed from meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch)13
-rw-r--r--meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch (renamed from meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch)16
-rw-r--r--meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch (renamed from meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch)12
-rw-r--r--meta/recipes-extended/texinfo/texinfo/link-zip.patch23
-rw-r--r--meta/recipes-extended/texinfo/texinfo_7.1.bb (renamed from meta/recipes-extended/texinfo/texinfo_7.0.3.bb)10
-rw-r--r--meta/recipes-extended/timezone/tzdata.bb3
-rw-r--r--meta/recipes-extended/watchdog/watchdog-config.bb7
-rw-r--r--meta/recipes-extended/watchdog/watchdog_5.16.bb4
-rw-r--r--meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch9
-rw-r--r--meta/recipes-extended/wget/wget_1.24.5.bb (renamed from meta/recipes-extended/wget/wget_1.21.4.bb)2
-rw-r--r--meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb6
-rw-r--r--meta/recipes-extended/zip/zip-3.0/0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch45
-rw-r--r--meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch35
-rw-r--r--meta/recipes-extended/zip/zip_3.0.bb2
-rw-r--r--meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch39
-rw-r--r--meta/recipes-extended/zstd/zstd_1.5.6.bb (renamed from meta/recipes-extended/zstd/zstd_1.5.5.bb)5
116 files changed, 679 insertions, 2388 deletions
diff --git a/meta/recipes-extended/acpica/acpica_20230628.bb b/meta/recipes-extended/acpica/acpica_20240322.bb
index 8974bdc1f1..90e3599d32 100644
--- a/meta/recipes-extended/acpica/acpica_20230628.bb
+++ b/meta/recipes-extended/acpica/acpica_20240322.bb
@@ -10,19 +10,16 @@ HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/topic-technology/o
10SECTION = "console/tools" 10SECTION = "console/tools"
11 11
12LICENSE = "Intel | BSD-3-Clause | GPL-2.0-only" 12LICENSE = "Intel | BSD-3-Clause | GPL-2.0-only"
13LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=79a69059b499bccc70a484459549758f" 13LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=05eb845b15a27440410f456adc2ed082"
14 14
15COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" 15COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
16 16
17DEPENDS = "m4-native flex-native bison-native" 17DEPENDS = "m4-native flex-native bison-native"
18 18
19SRC_URI = "https://downloadmirror.intel.com/783534/acpica-unix-${PV}.tar.gz" 19SRC_URI = "git://github.com/acpica/acpica;protocol=https;branch=master"
20SRC_URI[sha256sum] = "86876a745e3d224dcfd222ed3de465b47559e85811df2db9820ef09a9dff5cce" 20SRCREV = "170fc3076a86777077637f10b05c32ac21ac13aa"
21 21
22UPSTREAM_CHECK_URI = "https://www.intel.com/content/www/us/en/download/776303/acpi-component-architecture-downloads-unix-format-source-code-and-build-environment-with-an-intel-license.html" 22S = "${WORKDIR}/git"
23UPSTREAM_VERSION_UNKNOWN = "1"
24
25S = "${WORKDIR}/acpica-unix-${PV}"
26 23
27inherit update-alternatives 24inherit update-alternatives
28 25
diff --git a/meta/recipes-extended/at/at_3.2.5.bb b/meta/recipes-extended/at/at_3.2.5.bb
index c0c876a644..112d1c4adc 100644
--- a/meta/recipes-extended/at/at_3.2.5.bb
+++ b/meta/recipes-extended/at/at_3.2.5.bb
@@ -55,22 +55,22 @@ SYSTEMD_SERVICE:${PN} = "atd.service"
55do_patch[postfuncs] += "copy_posix_files" 55do_patch[postfuncs] += "copy_posix_files"
56 56
57copy_posix_files() { 57copy_posix_files() {
58 cp -f ${WORKDIR}/posixtm.[ch] ${S} 58 cp -f ${UNPACKDIR}/posixtm.[ch] ${S}
59} 59}
60 60
61do_install () { 61do_install () {
62 oe_runmake -e "IROOT=${D}" install 62 oe_runmake -e "IROOT=${D}" install
63 63
64 install -d ${D}${sysconfdir}/init.d 64 install -d ${D}${sysconfdir}/init.d
65 install -m 0755 ${WORKDIR}/atd.init ${D}${sysconfdir}/init.d/atd 65 install -m 0755 ${UNPACKDIR}/atd.init ${D}${sysconfdir}/init.d/atd
66 66
67 # install systemd unit files 67 # install systemd unit files
68 install -d ${D}${systemd_system_unitdir} 68 install -d ${D}${systemd_system_unitdir}
69 install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_system_unitdir} 69 install -m 0644 ${UNPACKDIR}/atd.service ${D}${systemd_system_unitdir}
70 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service 70 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/atd.service
71 71
72 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then 72 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
73 install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd 73 install -D -m 0644 ${S}/pam.conf ${D}${sysconfdir}/pam.d/atd
74 fi 74 fi
75 rm -f ${D}${datadir}/at/batch-job 75 rm -f ${D}${datadir}/at/batch-job
76} 76}
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 7832ad052b..66058feff3 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -74,7 +74,8 @@ do_install:append () {
74 mv ${D}${bindir}/bash ${D}${base_bindir} 74 mv ${D}${bindir}/bash ${D}${base_bindir}
75 fi 75 fi
76} 76}
77do_install:append:class-target () { 77
78fix_absolute_paths () {
78 # Clean buildhost references in bashbug 79 # Clean buildhost references in bashbug
79 sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ 80 sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \
80 -e "s,-I${WORKDIR}/\S* ,,g" \ 81 -e "s,-I${WORKDIR}/\S* ,,g" \
@@ -93,13 +94,21 @@ do_install:append:class-target () {
93 ${D}${libdir}/bash/Makefile.inc 94 ${D}${libdir}/bash/Makefile.inc
94} 95}
95 96
97do_install:append:class-target () {
98 fix_absolute_paths
99}
100
101do_install:append:class-nativesdk () {
102 fix_absolute_paths
103}
104
96do_install_ptest () { 105do_install_ptest () {
97 make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test 106 make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test
98 cp ${B}/Makefile ${D}${PTEST_PATH} 107 cp ${B}/Makefile ${D}${PTEST_PATH}
99 cp ${B}/config.h ${D}${PTEST_PATH} 108 cp ${B}/config.h ${D}${PTEST_PATH}
100 cp ${B}/version.h ${D}${PTEST_PATH} 109 cp ${B}/version.h ${D}${PTEST_PATH}
101 cp ${S}/y.tab.[ch] ${D}${PTEST_PATH} 110 cp ${S}/y.tab.[ch] ${D}${PTEST_PATH}
102 install -D ${WORKDIR}/run-bash-ptests ${D}${PTEST_PATH}/run-bash-ptests 111 install -D ${UNPACKDIR}/run-bash-ptests ${D}${PTEST_PATH}/run-bash-ptests
103 sed -i -e 's/^Makefile/_Makefile/' -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \ 112 sed -i -e 's/^Makefile/_Makefile/' -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \
104 -e 's|${DEBUG_PREFIX_MAP}||g' \ 113 -e 's|${DEBUG_PREFIX_MAP}||g' \
105 -e 's|${BUILD_LDFLAGS}||g' \ 114 -e 's|${BUILD_LDFLAGS}||g' \
diff --git a/meta/recipes-extended/bash/bash/build-tests.patch b/meta/recipes-extended/bash/bash/build-tests.patch
index ea38bace9b..c1b9b8261f 100644
--- a/meta/recipes-extended/bash/bash/build-tests.patch
+++ b/meta/recipes-extended/bash/bash/build-tests.patch
@@ -4,7 +4,7 @@ Date: Wed, 19 Dec 2012 17:18:31 +0100
4Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking 4Subject: [PATCH] Add 'ptest' target to Makefile, to run tests without checking
5 dependencies. 5 dependencies.
6 6
7Upstream-Status: Pending 7Upstream-Status: Inappropriate [ptest specific]
8Signed-off-by: Anders Roxell <anders.roxell@enea.com> 8Signed-off-by: Anders Roxell <anders.roxell@enea.com>
9 9
10Rebase to 5.0 10Rebase to 5.0
diff --git a/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch b/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch
new file mode 100644
index 0000000000..60f1852316
--- /dev/null
+++ b/meta/recipes-extended/bash/bash/fix-filesubst-errexit.patch
@@ -0,0 +1,34 @@
1From 59ddfda14e3c9aa6286bb4c4c0748f7c1324a65a Mon Sep 17 00:00:00 2001
2From: Chet Ramey <chet.ramey@case.edu>
3Date: Fri, 7 Apr 2023 00:28:46 -0700
4Subject: [PATCH] $(<nosuchfile) is no longer a fatal error with errexit
5 enabled
6
7This is a trimmed-down version of a commit in the bash 'devel' branch
8[1] that contains this fix as well as other unrelated ones.
9
10[1] https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=ec9447ce9392a0f93d96789c3741285fede8a150
11
12Upstream-Status: Backport
13
14Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
15---
16 builtins/evalstring.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/builtins/evalstring.c b/builtins/evalstring.c
20index df3dd68e2a7e..6612081cd646 100644
21--- a/builtins/evalstring.c
22+++ b/builtins/evalstring.c
23@@ -753,7 +753,7 @@ open_redir_file (r, fnp)
24 fd = open(fn, O_RDONLY);
25 if (fd < 0)
26 {
27- file_error (fn);
28+ internal_error ("%s: %s", fn, strerror (errno));
29 free (fn);
30 if (fnp)
31 *fnp = 0;
32--
332.40.0
34
diff --git a/meta/recipes-extended/bash/bash_5.2.21.bb b/meta/recipes-extended/bash/bash_5.2.21.bb
index 46d921bbe6..532adf4c1a 100644
--- a/meta/recipes-extended/bash/bash_5.2.21.bb
+++ b/meta/recipes-extended/bash/bash_5.2.21.bb
@@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
13 file://fix-run-builtins.patch \ 13 file://fix-run-builtins.patch \
14 file://use_aclocal.patch \ 14 file://use_aclocal.patch \
15 file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \ 15 file://0001-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch \
16 file://fix-filesubst-errexit.patch \
16 " 17 "
17 18
18SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8" 19SRC_URI[tarball.sha256sum] = "c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8"
diff --git a/meta/recipes-extended/bc/bc_1.07.1.bb b/meta/recipes-extended/bc/bc_1.07.1.bb
index 819da6cda6..74387c50ab 100644
--- a/meta/recipes-extended/bc/bc_1.07.1.bb
+++ b/meta/recipes-extended/bc/bc_1.07.1.bb
@@ -27,7 +27,7 @@ PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
27PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" 27PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
28 28
29do_compile:prepend() { 29do_compile:prepend() {
30 cp -f ${WORKDIR}/libmath.h ${B}/bc/libmath.h 30 cp -f ${UNPACKDIR}/libmath.h ${B}/bc/libmath.h
31} 31}
32 32
33do_install_ptest() { 33do_install_ptest() {
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
index 4e3a06f240..7d7ab3856b 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.8.bb
@@ -14,11 +14,11 @@ LICENSE:libbz2 = "bzip2-1.0.6"
14LICENSE:${PN}-ptest = "bzip2-1.0.6 & GPL-3.0-or-later & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib" 14LICENSE:${PN}-ptest = "bzip2-1.0.6 & GPL-3.0-or-later & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib"
15 15
16LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e32f19b32df4664 \ 16LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e32f19b32df4664 \
17 file://${WORKDIR}/git/commons-compress/LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327 \ 17 file://${UNPACKDIR}/git/commons-compress/LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327 \
18 file://${WORKDIR}/git/dotnetzip/License.txt;md5=9cb56871eed4e748c3bc7e8ff352a54f \ 18 file://${UNPACKDIR}/git/dotnetzip/License.txt;md5=9cb56871eed4e748c3bc7e8ff352a54f \
19 file://${WORKDIR}/git/dotnetzip/License.zlib.txt;md5=cc421ccd22eeb2e5db6b79e6de0a029f \ 19 file://${UNPACKDIR}/git/dotnetzip/License.zlib.txt;md5=cc421ccd22eeb2e5db6b79e6de0a029f \
20 file://${WORKDIR}/git/go/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \ 20 file://${UNPACKDIR}/git/go/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
21 file://${WORKDIR}/git/lbzip2/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 21 file://${UNPACKDIR}/git/lbzip2/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
22" 22"
23 23
24SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \ 24SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \
@@ -52,13 +52,13 @@ do_configure:prepend () {
52 52
53do_install_ptest () { 53do_install_ptest () {
54 install -d ${D}${PTEST_PATH}/bzip2-tests 54 install -d ${D}${PTEST_PATH}/bzip2-tests
55 cp -r ${WORKDIR}/git/commons-compress ${D}${PTEST_PATH}/bzip2-tests/commons-compress 55 cp -r ${UNPACKDIR}/git/commons-compress ${D}${PTEST_PATH}/bzip2-tests/commons-compress
56 cp -r ${WORKDIR}/git/dotnetzip ${D}${PTEST_PATH}/bzip2-tests/dotnetzip 56 cp -r ${UNPACKDIR}/git/dotnetzip ${D}${PTEST_PATH}/bzip2-tests/dotnetzip
57 cp -r ${WORKDIR}/git/go ${D}${PTEST_PATH}/bzip2-tests/go 57 cp -r ${UNPACKDIR}/git/go ${D}${PTEST_PATH}/bzip2-tests/go
58 cp -r ${WORKDIR}/git/lbzip2 ${D}${PTEST_PATH}/bzip2-tests/lbzip2 58 cp -r ${UNPACKDIR}/git/lbzip2 ${D}${PTEST_PATH}/bzip2-tests/lbzip2
59 cp -r ${WORKDIR}/git/pyflate ${D}${PTEST_PATH}/bzip2-tests/pyflate 59 cp -r ${UNPACKDIR}/git/pyflate ${D}${PTEST_PATH}/bzip2-tests/pyflate
60 cp ${WORKDIR}/git/README ${D}${PTEST_PATH}/bzip2-tests/ 60 cp ${UNPACKDIR}/git/README ${D}${PTEST_PATH}/bzip2-tests/
61 cp ${WORKDIR}/git/run-tests.sh ${D}${PTEST_PATH}/bzip2-tests/ 61 cp ${UNPACKDIR}/git/run-tests.sh ${D}${PTEST_PATH}/bzip2-tests/
62 sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile 62 sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile
63} 63}
64 64
diff --git a/meta/recipes-extended/cpio/cpio_2.15.bb b/meta/recipes-extended/cpio/cpio_2.15.bb
index 52070f59a2..bfaf5c31c3 100644
--- a/meta/recipes-extended/cpio/cpio_2.15.bb
+++ b/meta/recipes-extended/cpio/cpio_2.15.bb
@@ -16,6 +16,7 @@ SRC_URI[sha256sum] = "efa50ef983137eefc0a02fdb51509d624b5e3295c980aa127ceee41834
16inherit autotools gettext texinfo ptest 16inherit autotools gettext texinfo ptest
17 17
18CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS" 18CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS"
19CVE_STATUS[CVE-2023-7216] = "disputed: intended behaviour, see https://lists.gnu.org/archive/html/bug-cpio/2024-03/msg00000.html"
19 20
20EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" 21EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}"
21 22
@@ -50,7 +51,7 @@ do_install_ptest() {
50 install --mode=755 ${B}/tests/atlocal ${D}${PTEST_PATH}/tests/ 51 install --mode=755 ${B}/tests/atlocal ${D}${PTEST_PATH}/tests/
51 install --mode=755 ${B}/tests/genfile ${D}${PTEST_PATH}/tests/ 52 install --mode=755 ${B}/tests/genfile ${D}${PTEST_PATH}/tests/
52 install --mode=755 ${S}/tests/testsuite ${D}${PTEST_PATH}/tests/ 53 install --mode=755 ${S}/tests/testsuite ${D}${PTEST_PATH}/tests/
53 install --mode=755 ${WORKDIR}/test.sh ${D}${PTEST_PATH}/test.sh 54 install --mode=755 ${UNPACKDIR}/test.sh ${D}${PTEST_PATH}/test.sh
54 sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/test.sh 55 sed -i "s#@PTEST_PATH@#${PTEST_PATH}#g" ${D}${PTEST_PATH}/test.sh
55} 56}
56 57
diff --git a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
index 20572b55c4..35229ae890 100644
--- a/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
+++ b/meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
@@ -303,7 +303,7 @@ index 9396e1d..d0bb181 100644
303+ PWDICT tmp_pwp; 303+ PWDICT tmp_pwp;
304+ 304+
305+ memcpy(&tmp_pwp, pwp, sizeof(PWDICT)); 305+ memcpy(&tmp_pwp, pwp, sizeof(PWDICT));
306+ HwmsHostToBigEndian(tmp_pwp.hwms, sizeof(tmp_pwp.hwms), en_is32); 306+ HwmsHostToBigEndian((char *)tmp_pwp.hwms, sizeof(tmp_pwp.hwms), en_is32);
307+ fwrite(tmp_pwp.hwms, 1, sizeof(tmp_pwp.hwms), pwp->wfp); 307+ fwrite(tmp_pwp.hwms, 1, sizeof(tmp_pwp.hwms), pwp->wfp);
308 } 308 }
309 } 309 }
diff --git a/meta/recipes-extended/cronie/cronie_1.7.1.bb b/meta/recipes-extended/cronie/cronie_1.7.2.bb
index 854b68163c..e4711fa31c 100644
--- a/meta/recipes-extended/cronie/cronie_1.7.1.bb
+++ b/meta/recipes-extended/cronie/cronie_1.7.2.bb
@@ -25,7 +25,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/cronie-${PV}/cronie-${PV}.tar.gz \
25PAM_SRC_URI = "file://crond_pam_config.patch" 25PAM_SRC_URI = "file://crond_pam_config.patch"
26PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" 26PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
27 27
28SRC_URI[sha256sum] = "78033100c24413f0c40f93e6138774d6a4f55bc31050567b90db45a2f9f1b954" 28SRC_URI[sha256sum] = "f1da374a15ba7605cf378347f96bc8b678d3d7c0765269c8242cfe5b0789c571"
29 29
30inherit autotools update-rc.d useradd systemd github-releases 30inherit autotools update-rc.d useradd systemd github-releases
31UPSTREAM_CHECK_REGEX = "releases/tag/cronie-(?P<pver>\d+(\.\d+)+)" 31UPSTREAM_CHECK_REGEX = "releases/tag/cronie-(?P<pver>\d+(\.\d+)+)"
@@ -49,18 +49,18 @@ do_install:append () {
49 install -d ${D}${sysconfdir}/sysconfig/ 49 install -d ${D}${sysconfdir}/sysconfig/
50 install -d ${D}${sysconfdir}/init.d/ 50 install -d ${D}${sysconfdir}/init.d/
51 install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond 51 install -m 0644 ${S}/crond.sysconfig ${D}${sysconfdir}/sysconfig/crond
52 install -m 0755 ${WORKDIR}/crond.init ${D}${sysconfdir}/init.d/crond 52 install -m 0755 ${UNPACKDIR}/crond.init ${D}${sysconfdir}/init.d/crond
53 53
54 # install systemd unit files 54 # install systemd unit files
55 install -d ${D}${systemd_system_unitdir} 55 install -d ${D}${systemd_system_unitdir}
56 install -m 0644 ${WORKDIR}/crond.service ${D}${systemd_system_unitdir} 56 install -m 0644 ${UNPACKDIR}/crond.service ${D}${systemd_system_unitdir}
57 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ 57 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
58 -e 's,@SBINDIR@,${sbindir},g' \ 58 -e 's,@SBINDIR@,${sbindir},g' \
59 ${D}${systemd_system_unitdir}/crond.service 59 ${D}${systemd_system_unitdir}/crond.service
60 60
61 # below are necessary for a complete cron environment 61 # below are necessary for a complete cron environment
62 install -d ${D}${localstatedir}/spool/cron 62 install -d ${D}${localstatedir}/spool/cron
63 install -m 0755 ${WORKDIR}/crontab ${D}${sysconfdir}/ 63 install -m 0755 ${UNPACKDIR}/crontab ${D}${sysconfdir}/
64 mkdir -p ${D}${sysconfdir}/cron.d 64 mkdir -p ${D}${sysconfdir}/cron.d
65 mkdir -p ${D}${sysconfdir}/cron.hourly 65 mkdir -p ${D}${sysconfdir}/cron.hourly
66 mkdir -p ${D}${sysconfdir}/cron.daily 66 mkdir -p ${D}${sysconfdir}/cron.daily
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index b70ba3ae58..9688efafae 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -84,11 +84,11 @@ do_install () {
84 rm -rf ${D}${sysconfdir}/init.d/ 84 rm -rf ${D}${sysconfdir}/init.d/
85 rm -rf ${D}${sysconfdir}/rc* 85 rm -rf ${D}${sysconfdir}/rc*
86 install -d ${D}${sysconfdir}/tmpfiles.d 86 install -d ${D}${sysconfdir}/tmpfiles.d
87 install -m 0644 ${WORKDIR}/cups-volatiles.conf \ 87 install -m 0644 ${UNPACKDIR}/cups-volatiles.conf \
88 ${D}${sysconfdir}/tmpfiles.d/cups.conf 88 ${D}${sysconfdir}/tmpfiles.d/cups.conf
89 else 89 else
90 install -d ${D}${sysconfdir}/default/volatiles 90 install -d ${D}${sysconfdir}/default/volatiles
91 install -m 0644 ${WORKDIR}/volatiles.99_cups \ 91 install -m 0644 ${UNPACKDIR}/volatiles.99_cups \
92 ${D}${sysconfdir}/default/volatiles/99_cups 92 ${D}${sysconfdir}/default/volatiles/99_cups
93 fi 93 fi
94} 94}
diff --git a/meta/recipes-extended/cups/cups_2.4.7.bb b/meta/recipes-extended/cups/cups_2.4.8.bb
index f4b0282e4c..c0cddf7e99 100644
--- a/meta/recipes-extended/cups/cups_2.4.7.bb
+++ b/meta/recipes-extended/cups/cups_2.4.8.bb
@@ -2,4 +2,4 @@ require cups.inc
2 2
3LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" 3LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
4 4
5SRC_URI[sha256sum] = "dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c" 5SRC_URI[sha256sum] = "75c326b4ba73975efcc9a25078c4b04cdb4ee333caaad0d0823dbd522c6479a0"
diff --git a/meta/recipes-extended/ed/ed_1.20.1.bb b/meta/recipes-extended/ed/ed_1.20.2.bb
index 9ae53002c3..2b78b080ba 100644
--- a/meta/recipes-extended/ed/ed_1.20.1.bb
+++ b/meta/recipes-extended/ed/ed_1.20.2.bb
@@ -19,7 +19,7 @@ bindir = "${base_bindir}"
19SRC_URI = "${GNU_MIRROR}/ed/${BP}.tar.lz" 19SRC_URI = "${GNU_MIRROR}/ed/${BP}.tar.lz"
20UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/" 20UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/"
21 21
22SRC_URI[sha256sum] = "b1a463b297a141f9876c4b1fcd01477f645cded92168090e9a35db2af4babbca" 22SRC_URI[sha256sum] = "65fec7318f48c2ca17f334ac0f4703defe62037bb13cc23920de077b5fa24523"
23 23
24EXTRA_OEMAKE = "-e MAKEFLAGS=" 24EXTRA_OEMAKE = "-e MAKEFLAGS="
25 25
diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc
index 03cf2a8d72..ddcc05750b 100644
--- a/meta/recipes-extended/findutils/findutils.inc
+++ b/meta/recipes-extended/findutils/findutils.inc
@@ -7,7 +7,6 @@ BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils"
7SECTION = "console/utils" 7SECTION = "console/utils"
8 8
9SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \ 9SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \
10 file://autoconf-2.73.patch \
11 file://run-ptest \ 10 file://run-ptest \
12 " 11 "
13 12
diff --git a/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch b/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch
deleted file mode 100644
index 63728b5f91..0000000000
--- a/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
2than the full code:
3
4https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
5
6Just tweak the exiting code to work with 2.73. The next findutils upgrade should
7update to new gnulib
8
9Upstream-Status: Inappropriate
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12Index: findutils-4.9.0/gl/m4/largefile.m4
13===================================================================
14--- findutils-4.9.0.orig/gl/m4/largefile.m4
15+++ findutils-4.9.0/gl/m4/largefile.m4
16@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
17 # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
18 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
19 # or configures them incorrectly in some cases.
20-m4_version_prereq([2.70], [], [
21+m4_version_prereq([2.73], [], [
22
23 # _AC_SYS_LARGEFILE_TEST_INCLUDES
24 # -------------------------------
diff --git a/meta/recipes-extended/findutils/findutils/run-ptest b/meta/recipes-extended/findutils/findutils/run-ptest
index ec71583c51..3dec117067 100644
--- a/meta/recipes-extended/findutils/findutils/run-ptest
+++ b/meta/recipes-extended/findutils/findutils/run-ptest
@@ -10,34 +10,6 @@ export built_programs="find xargs locate updatedb"
10# this gets substituted by sed during build 10# this gets substituted by sed during build
11export VERSION="__run_ptest_version__" 11export VERSION="__run_ptest_version__"
12 12
13# define missing functions for tests/init.sh
14fu_path_prepend_ () {
15 path_prepend_ $@
16}
17
18print_ver_ () {
19 :
20}
21
22skip_if_root_ () {
23 [ $(id -u) = 0 ] && exit 77;
24}
25
26require_root_ () {
27 [ $(id -u) = 0 ] || exit 77;
28}
29
30expensive_ () {
31 :
32}
33
34export -f fu_path_prepend_
35export -f print_ver_
36export -f skip_if_root_
37export -f require_root_
38export -f expensive_
39
40
41for f in tests/*/*.sh; do 13for f in tests/*/*.sh; do
42 bash $f ; 14 bash $f ;
43 case $? in 15 case $? in
diff --git a/meta/recipes-extended/findutils/findutils_4.9.0.bb b/meta/recipes-extended/findutils/findutils_4.10.0.bb
index 074817df27..57f77de16f 100644
--- a/meta/recipes-extended/findutils/findutils_4.9.0.bb
+++ b/meta/recipes-extended/findutils/findutils_4.10.0.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
6 6
7DEPENDS = "bison-native" 7DEPENDS = "bison-native"
8 8
9SRC_URI[sha256sum] = "a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe" 9SRC_URI[sha256sum] = "1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5"
10 10
11PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" 11PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
12# http://savannah.gnu.org/bugs/?27299 12# http://savannah.gnu.org/bugs/?27299
@@ -15,13 +15,13 @@ CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes"
15EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" 15EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
16 16
17# need od from coreutils for -t option 17# need od from coreutils for -t option
18RDEPENDS:${PN}-ptest += "bash sed grep coreutils" 18RDEPENDS:${PN}-ptest += "bash sed grep coreutils coreutils-getlimits"
19 19
20do_install_ptest:class-target() { 20do_install_ptest:class-target() {
21 mkdir -p ${D}${PTEST_PATH}/tests/ 21 mkdir -p ${D}${PTEST_PATH}/tests/
22 cp ${S}/init.cfg ${D}${PTEST_PATH}
22 cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ 23 cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/
23 24
24 # substitute value in run-ptest with actual version 25 # substitute value in run-ptest with actual version
25 sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest 26 sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest
26
27} 27}
diff --git a/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch b/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch
new file mode 100644
index 0000000000..6fffd1f373
--- /dev/null
+++ b/meta/recipes-extended/gawk/gawk/0001-m4-readline-add-missing-includes.patch
@@ -0,0 +1,38 @@
1From 4f4e84f139e2a8682f1374a592f2636c43ad857b Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Tue, 21 May 2024 15:10:11 +0000
4Subject: [PATCH] m4/readline: add missing includes
5
6The cross-specific code fragment only includes stdio.h, where the native
7fragment also includes fcntl.h and unistd.h. This is important because
8GCC 14.1 has made the implicit definitions an error:
9
10conftest.c: In function 'main':
11conftest.c:144:9: error: implicit declaration of function 'close'; did you mean 'pclose'? [-Wimplicit-function-declaration]
12conftest.c:146:14: error: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration]
13
14Add the missing includes so that the check doesn't always fail due to
15these errors.
16
17Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gawk.git/commit/?id=c1613c310d71b87f509458e0259ecd10eda2b140]
18Signed-off-by: Ross Burton <ross.burton@arm.com>
19---
20 m4/readline.m4 | 2 ++
21 1 file changed, 2 insertions(+)
22
23diff --git a/m4/readline.m4 b/m4/readline.m4
24index 38f96326..efd52d4e 100644
25--- a/m4/readline.m4
26+++ b/m4/readline.m4
27@@ -66,6 +66,8 @@ dnl action if false:
28 dnl action if cross compiling:
29 [AC_LINK_IFELSE(
30 [AC_LANG_PROGRAM([[#include <stdio.h>
31+#include <fcntl.h>
32+#include <unistd.h>
33 #include <readline/readline.h>
34 #include <readline/history.h>]], dnl includes
35 dnl function body
36--
372.34.1
38
diff --git a/meta/recipes-extended/gawk/gawk_5.3.0.bb b/meta/recipes-extended/gawk/gawk_5.3.0.bb
index d7a0fc616d..e94cf19db4 100644
--- a/meta/recipes-extended/gawk/gawk_5.3.0.bb
+++ b/meta/recipes-extended/gawk/gawk_5.3.0.bb
@@ -16,6 +16,7 @@ PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
16PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" 16PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr"
17 17
18SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ 18SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \
19 file://0001-m4-readline-add-missing-includes.patch \
19 file://run-ptest \ 20 file://run-ptest \
20 " 21 "
21 22
diff --git a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
index 15c7eb5a77..67f14bd368 100644
--- a/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
+++ b/meta/recipes-extended/ghostscript/ghostscript/avoid-host-contamination.patch
@@ -1,7 +1,7 @@
1From 0ccbaa134093bf6afc79f2d20d061bca5a8754ed Mon Sep 17 00:00:00 2001 1From b36713c8f1ba0e5755b78845a433354a63663b1a Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Kai Kang <kai.kang@windriver.com>
3Date: Thu, 29 Mar 2018 16:02:05 +0800 3Date: Thu, 29 Mar 2018 16:02:05 +0800
4Subject: [PATCH 04/10] avoid host contamination 4Subject: [PATCH] avoid host contamination
5 5
6Remove hardcode path refer to host to avoid host contamination. 6Remove hardcode path refer to host to avoid host contamination.
7 7
@@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/devices/devs.mak b/devices/devs.mak 17diff --git a/devices/devs.mak b/devices/devs.mak
18index 846aa50..9570182 100644 18index 186f704..88ab8c9 100644
19--- a/devices/devs.mak 19--- a/devices/devs.mak
20+++ b/devices/devs.mak 20+++ b/devices/devs.mak
21@@ -393,7 +393,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\ 21@@ -397,7 +397,7 @@ $(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\
22 ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT 22 ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
23 23
24 $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS) 24 $(DEVOBJ)X11.so : $(x11alt_) $(x11_) $(DEVS_MAK) $(MAKEDIRS)
@@ -27,6 +27,3 @@ index 846aa50..9570182 100644
27 27
28 ###### --------------- Memory-buffered printer devices --------------- ###### 28 ###### --------------- Memory-buffered printer devices --------------- ######
29 29
30--
311.8.3.1
32
diff --git a/meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch b/meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch
deleted file mode 100644
index 7873396045..0000000000
--- a/meta/recipes-extended/ghostscript/ghostscript/configure.ac-add-option-to-explicitly-disable-neon.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1From fd37229a17822c5ad21a369f670b8a6f6cc6b95b Mon Sep 17 00:00:00 2001
2From: Benjamin Bara <benjamin.bara@skidata.com>
3Date: Mon, 4 Sep 2023 12:16:39 +0200
4Subject: [PATCH] configure.ac: add option to explicitly disable neon
5
6Uncomment an already existing possibility to explicitly disable neon and
7use it on both implemented neon checks.
8
9Upstream-Status: Submitted [https://bugs.ghostscript.com/show_bug.cgi?id=707097]
10
11Signed-off-by: Benjamin Bara <benjamin.bara@skidata.com>
12---
13 configure.ac | 52 +++++++++++++++++++++++++++++-----------------------
14 1 file changed, 29 insertions(+), 23 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 09d881dd1..62718e15e 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -749,6 +749,33 @@ SUBCONFIG_OPTS="--build=$build --host=$host"
21 # SUBCONFIG_OPTS="$SUBCONFIG_OPTS --host=$host_alias"
22 #fi
23
24+dnl --------------------------------------------------
25+dnl Check for NEON support
26+dnl --------------------------------------------------
27+save_cflags=$CFLAGS
28+AC_MSG_CHECKING([neon support])
29+CFLAGS="$save_cflags $OPT_CFLAGS -mfpu=neon -mcpu=cortex-a53"
30+HAVE_NEON=""
31+AC_LINK_IFELSE(
32+ [AC_LANG_PROGRAM([#include "arm_neon.h"], [
33+ int32x4_t round = vdupq_n_s32(10);
34+ return(0);
35+ ])],
36+ [HAVE_NEON="-DHAVE_NEON"], [HAVE_NEON=""])
37+
38+AC_ARG_ENABLE([neon], AS_HELP_STRING([--disable-neon],
39+ [Do not use neon instrinsics]), [
40+ if test "x$enable_neon" = xno; then
41+ HAVE_NEON=""
42+ fi])
43+
44+if test "x$HAVE_NEON" != x; then
45+ AC_MSG_RESULT(yes)
46+else
47+ AC_MSG_RESULT(no)
48+fi
49+CFLAGS=$save_cflags
50+
51 dnl --------------------------------------------------
52 dnl Check for libraries
53 dnl --------------------------------------------------
54@@ -971,11 +998,12 @@ if test x$with_tesseract != xno; then
55 [TESS_NEON="-mfpu=neon -mcpu=cortex-a53 -D__ARM_NEON__"],
56 [TESS_NEON=""])
57
58- if test "x$TESS_NEON" != x; then
59+ if test "x$TESS_NEON" != x && test "x$enable_neon" != xno; then
60 AC_MSG_RESULT(yes)
61 TESS_CXXFLAGS="$TESS_CXXFLAGS -DHAVE_NEON"
62 else
63 AC_MSG_RESULT(no)
64+ TESS_NEON=""
65 fi
66
67 CXXFLAGS="$save_cxxflags"
68@@ -2387,28 +2415,6 @@ if test x$WITH_CAL != x0; then
69 AC_MSG_RESULT(no)
70 fi
71
72- AC_MSG_CHECKING([neon support])
73- CFLAGS="$save_cflags $OPT_CFLAGS -mfpu=neon -mcpu=cortex-a53"
74- HAVE_NEON=""
75- AC_LINK_IFELSE(
76- [AC_LANG_PROGRAM([#include "arm_neon.h"], [
77- int32x4_t round = vdupq_n_s32(10);
78- return(0);
79- ])],
80- [HAVE_NEON="-DHAVE_NEON"], [HAVE_NEON=""])
81-
82- #AC_ARG_ENABLE([neon], AS_HELP_STRING([--disable-neon],
83- # [Do not use neon instrinsics]), [
84- # if test "x$enable_neon" = xno; then
85- # HAVE_NEON=""
86- # fi])
87-
88- if test "x$HAVE_NEON" != x; then
89- AC_MSG_RESULT(yes)
90- else
91- AC_MSG_RESULT(no)
92- fi
93-
94 #AC_SUBST(HAVE_SSE4_2)
95 #AC_SUBST(HAVE_NEON)
96 CFLAGS=$save_cflags
97--
982.34.1
99
diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb b/meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb
index 3dff16eec2..0504f5244f 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_10.02.1.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb
@@ -25,10 +25,9 @@ def gs_verdir(v):
25SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \ 25SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${@gs_verdir("${PV}")}/${BPN}-${PV}.tar.gz \
26 file://ghostscript-9.16-Werror-return-type.patch \ 26 file://ghostscript-9.16-Werror-return-type.patch \
27 file://avoid-host-contamination.patch \ 27 file://avoid-host-contamination.patch \
28 file://configure.ac-add-option-to-explicitly-disable-neon.patch \
29 " 28 "
30 29
31SRC_URI[sha256sum] = "e429e4f5b01615a4f0f93a4128e8a1a4d932dff983b1774174c79c0630717ad9" 30SRC_URI[sha256sum] = "31cd01682ad23a801cc3bbc222a55f07c4ea3e068bdfb447792d54db21a2e8ad"
32 31
33PACKAGECONFIG ??= "" 32PACKAGECONFIG ??= ""
34PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" 33PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3"
diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
index 98cd4d8103..575ee81b50 100644
--- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
+++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb
@@ -5,8 +5,8 @@ HOMEPAGE = "https://golang.org/"
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" 6LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
7 7
8SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https" 8SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}"
9SRCREV = "d9923f6970e9ba7e0d23aa9448ead71ea57235ae" 9SRCREV = "32022caedd6a177a7717aa8680cbe179e1045935"
10UPSTREAM_CHECK_COMMITS = "1" 10UPSTREAM_CHECK_COMMITS = "1"
11 11
12GO_IMPORT = "golang.org/x/example" 12GO_IMPORT = "golang.org/x/example"
diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index b32584033b..62b3e2f4f9 100644
--- a/meta/recipes-extended/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
@@ -8,6 +8,7 @@ inherit autotools texinfo
8export DEFS="NO_ASM" 8export DEFS="NO_ASM"
9 9
10EXTRA_OEMAKE:class-target = "GREP=${base_bindir}/grep" 10EXTRA_OEMAKE:class-target = "GREP=${base_bindir}/grep"
11EXTRA_OEMAKE:append:class-nativesdk = " GREP=grep"
11EXTRA_OECONF:append:libc-musl = " gl_cv_func_fflush_stdin=yes " 12EXTRA_OECONF:append:libc-musl = " gl_cv_func_fflush_stdin=yes "
12 13
13do_install:append () { 14do_install:append () {
diff --git a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
index 8824bf2af7..0fe2261511 100644
--- a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
+++ b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
@@ -1,22 +1,24 @@
1From 0096c854d5015918ed154dccb3ad472fd06c1010 Mon Sep 17 00:00:00 2001 1From 653db8b938166db7833135f615b90c38a3f27a30 Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com> 2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Tue, 21 Feb 2017 11:16:31 +0200 3Date: Thu, 25 Apr 2024 10:51:02 +0200
4Subject: [PATCH] configure: Add option to enable/disable libnfnetlink 4Subject: [PATCH] configure: Add option to enable/disable libnfnetlink
5 5
6This changes the configure behaviour from autodetecting 6Default behavior (autodetecting) does not change, but specifying
7for libnfnetlink to having an option to disable it explicitly 7either option would explicitly disable or enable libnfnetlink support,
8 8and if the library is not found in the latter case, ./configure will error
9Upstream-Status: Pending 9out.
10 10
11Upstream-Status: Backport [https://git.netfilter.org/iptables/commit/?id=653db8b938166db7833135f615b90c38a3f27a30]
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Maxin B. John <maxin.john@intel.com> 13Signed-off-by: Maxin B. John <maxin.john@intel.com>
13 14Signed-off-by: Alexander Kanavin <alex@linutronix.de>
15Signed-off-by: Phil Sutter <phil@nwl.cc>
14--- 16---
15 configure.ac | 10 +++++++--- 17 configure.ac | 13 +++++++++++--
16 1 file changed, 7 insertions(+), 3 deletions(-) 18 1 file changed, 11 insertions(+), 2 deletions(-)
17 19
18diff --git a/configure.ac b/configure.ac 20diff --git a/configure.ac b/configure.ac
19index d99fa3b..d607772 100644 21index d99fa3b9..2293702b 100644
20--- a/configure.ac 22--- a/configure.ac
21+++ b/configure.ac 23+++ b/configure.ac
22@@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], 24@@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH],
@@ -25,21 +27,27 @@ index d99fa3b..d607772 100644
25 [enable_nftables="$enableval"], [enable_nftables="yes"]) 27 [enable_nftables="$enableval"], [enable_nftables="yes"])
26+AC_ARG_ENABLE([libnfnetlink], 28+AC_ARG_ENABLE([libnfnetlink],
27+ AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]), 29+ AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]),
28+ [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"]) 30+ [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="auto"])
29 AC_ARG_ENABLE([connlabel], 31 AC_ARG_ENABLE([connlabel],
30 AS_HELP_STRING([--disable-connlabel], 32 AS_HELP_STRING([--disable-connlabel],
31 [Do not build libnetfilter_conntrack]), 33 [Do not build libnetfilter_conntrack]),
32@@ -113,9 +116,10 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"]) 34@@ -113,8 +116,14 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"])
33 AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"]) 35 AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"])
34 AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"]) 36 AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"])
35 37
36-PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], 38-PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
37- [nfnetlink=1], [nfnetlink=0]) 39- [nfnetlink=1], [nfnetlink=0])
38-AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) 40+# If specified explicitly on the command line, error out when library was not found
39+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ 41+# Otherwise, disable and continue
40+ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0]) 42+AS_IF([test "x$enable_libnfnetlink" = "xyes"],
41+ ]) 43+ [PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
42+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) 44+ [nfnetlink=1])],
45+ [test "x$enable_libnfnetlink" = "xauto"],
46+ [PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
47+ [nfnetlink=1], [nfnetlink=0])])
48 AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
43 49
44 if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then 50 if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then
45 PKG_CHECK_MODULES([libpcap], [libpcap], [], [ 51--
522.39.2
53
diff --git a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch b/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
deleted file mode 100644
index a190c7e8ae..0000000000
--- a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 17 May 2022 10:56:59 +0200
4Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include
5
6This resolves the build error under musl:
7
8| ../../../../../../../workspace/sources/iptables/iptables/xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'?
9| 83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
10| | ^~~~~~~~~
11| | uint16_t
12
13Upstream-Status: Submitted [via email to phil@nwl.cc]
14Signed-off-by: Alexander Kanavin <alex@linutronix.de>
15
16---
17 iptables/xshared.h | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/iptables/xshared.h b/iptables/xshared.h
21index a200e0d..f543dbf 100644
22--- a/iptables/xshared.h
23+++ b/iptables/xshared.h
24@@ -6,6 +6,7 @@
25 #include <stdint.h>
26 #include <netinet/in.h>
27 #include <net/if.h>
28+#include <sys/types.h>
29 #include <linux/netfilter_arp/arp_tables.h>
30 #include <linux/netfilter_ipv4/ip_tables.h>
31 #include <linux/netfilter_ipv6/ip6_tables.h>
diff --git a/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch b/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch
deleted file mode 100644
index 5a022ebc8c..0000000000
--- a/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 6832501bbb90a3dab977a4625d0391804c0e795c Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Tue, 21 Feb 2017 11:49:07 +0200
4Subject: [PATCH] configure.ac:
5 only-check-conntrack-when-libnfnetlink-enabled.patch
6
7Package libnetfilter-conntrack depends on package libnfnetlink. iptables
8checks package libnetfilter-conntrack whatever its package config
9libnfnetlink is enabled or not. When libnfnetlink is disabled but
10package libnetfilter-conntrack exists, it fails randomly with:
11
12In file included from
13.../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0:
14
15.../tmp/sysroots/qemumips/usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:14:42:
16fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory
17
18compilation terminated.
19GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed
20Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it.
21
22Upstream-Status: Pending
23
24Signed-off-by: Kai Kang <kai.kang@windriver.com>
25Signed-off-by: Maxin B. John <maxin.john@intel.com>
26
27---
28 configure.ac | 6 ++++--
29 1 file changed, 4 insertions(+), 2 deletions(-)
30
31diff --git a/configure.ac b/configure.ac
32index d607772..25a8e75 100644
33--- a/configure.ac
34+++ b/configure.ac
35@@ -159,10 +159,12 @@ if test "$nftables" != 1; then
36 fi
37
38 if test "x$enable_connlabel" = "xyes"; then
39- PKG_CHECK_MODULES([libnetfilter_conntrack],
40+ nfconntrack=0
41+ AS_IF([test "x$enable_libnfnetlink" = "xyes"], [
42+ PKG_CHECK_MODULES([libnetfilter_conntrack],
43 [libnetfilter_conntrack >= 1.0.6],
44 [nfconntrack=1], [nfconntrack=0])
45-
46+ ])
47 if test "$nfconntrack" -ne 1; then
48 blacklist_modules="$blacklist_modules connlabel";
49 echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built";
diff --git a/meta/recipes-extended/iptables/iptables_1.8.10.bb b/meta/recipes-extended/iptables/iptables_1.8.10.bb
index cd2f3bce0b..86f1335ac8 100644
--- a/meta/recipes-extended/iptables/iptables_1.8.10.bb
+++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb
@@ -14,8 +14,6 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \
14 file://ip6tables.service \ 14 file://ip6tables.service \
15 file://ip6tables.rules \ 15 file://ip6tables.rules \
16 file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ 16 file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
17 file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \
18 file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \
19 " 17 "
20SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c" 18SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c"
21 19
@@ -34,7 +32,7 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
34PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 32PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
35 33
36# libnfnetlink recipe is in meta-networking layer 34# libnfnetlink recipe is in meta-networking layer
37PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink,--disable-libnfnetlink,libnfnetlink libnetfilter-conntrack" 35PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink --enable-connlabel,--disable-libnfnetlink --disable-connlabel,libnfnetlink libnetfilter-conntrack"
38 36
39# libnftnl recipe is in meta-networking layer(previously known as libnftables) 37# libnftnl recipe is in meta-networking layer(previously known as libnftables)
40PACKAGECONFIG[libnftnl] = "--enable-nftables,--disable-nftables,libnftnl" 38PACKAGECONFIG[libnftnl] = "--enable-nftables,--disable-nftables,libnftnl"
@@ -52,10 +50,10 @@ IPTABLES_RULES_DIR ?= "${sysconfdir}/${BPN}"
52 50
53do_install:append() { 51do_install:append() {
54 install -d ${D}${IPTABLES_RULES_DIR} 52 install -d ${D}${IPTABLES_RULES_DIR}
55 install -m 0644 ${WORKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR} 53 install -m 0644 ${UNPACKDIR}/iptables.rules ${D}${IPTABLES_RULES_DIR}
56 54
57 install -d ${D}${systemd_system_unitdir} 55 install -d ${D}${systemd_system_unitdir}
58 install -m 0644 ${WORKDIR}/iptables.service ${D}${systemd_system_unitdir} 56 install -m 0644 ${UNPACKDIR}/iptables.service ${D}${systemd_system_unitdir}
59 57
60 sed -i \ 58 sed -i \
61 -e 's,@SBINDIR@,${sbindir},g' \ 59 -e 's,@SBINDIR@,${sbindir},g' \
@@ -63,8 +61,8 @@ do_install:append() {
63 ${D}${systemd_system_unitdir}/iptables.service 61 ${D}${systemd_system_unitdir}/iptables.service
64 62
65 if ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'true', 'false', d)} ; then 63 if ${@bb.utils.contains('PACKAGECONFIG', 'ipv6', 'true', 'false', d)} ; then
66 install -m 0644 ${WORKDIR}/ip6tables.rules ${D}${IPTABLES_RULES_DIR} 64 install -m 0644 ${UNPACKDIR}/ip6tables.rules ${D}${IPTABLES_RULES_DIR}
67 install -m 0644 ${WORKDIR}/ip6tables.service ${D}${systemd_system_unitdir} 65 install -m 0644 ${UNPACKDIR}/ip6tables.service ${D}${systemd_system_unitdir}
68 66
69 sed -i \ 67 sed -i \
70 -e 's,@SBINDIR@,${sbindir},g' \ 68 -e 's,@SBINDIR@,${sbindir},g' \
@@ -75,6 +73,8 @@ do_install:append() {
75 # if libnftnl is included, make the iptables symlink point to the nft-based binary by default 73 # if libnftnl is included, make the iptables symlink point to the nft-based binary by default
76 if ${@bb.utils.contains('PACKAGECONFIG', 'libnftnl', 'true', 'false', d)} ; then 74 if ${@bb.utils.contains('PACKAGECONFIG', 'libnftnl', 'true', 'false', d)} ; then
77 ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables 75 ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables
76 ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables-save
77 ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables-restore
78 fi 78 fi
79} 79}
80 80
diff --git a/meta/recipes-extended/iputils/iputils_20240117.bb b/meta/recipes-extended/iputils/iputils_20240117.bb
index 5a5e15528e..3880689742 100644
--- a/meta/recipes-extended/iputils/iputils_20240117.bb
+++ b/meta/recipes-extended/iputils/iputils_20240117.bb
@@ -35,7 +35,11 @@ ALTERNATIVE_PRIORITY = "100"
35ALTERNATIVE:${PN}-ping = "ping" 35ALTERNATIVE:${PN}-ping = "ping"
36ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" 36ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
37 37
38SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff" 38ALTERNATIVE:${PN}-ping6 = "ping6"
39ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6"
40
41SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff \
42 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ping6', '', d)}"
39PACKAGES += "${SPLITPKGS}" 43PACKAGES += "${SPLITPKGS}"
40 44
41ALLOW_EMPTY:${PN} = "1" 45ALLOW_EMPTY:${PN} = "1"
@@ -43,6 +47,13 @@ RDEPENDS:${PN} += "${SPLITPKGS}"
43 47
44FILES:${PN} = "" 48FILES:${PN} = ""
45FILES:${PN}-ping = "${base_bindir}/ping.${BPN}" 49FILES:${PN}-ping = "${base_bindir}/ping.${BPN}"
50FILES:${PN}-ping6 = "${base_bindir}/ping6.${BPN}"
46FILES:${PN}-arping = "${base_bindir}/arping" 51FILES:${PN}-arping = "${base_bindir}/arping"
47FILES:${PN}-tracepath = "${base_bindir}/tracepath" 52FILES:${PN}-tracepath = "${base_bindir}/tracepath"
48FILES:${PN}-clockdiff = "${base_bindir}/clockdiff" 53FILES:${PN}-clockdiff = "${base_bindir}/clockdiff"
54
55do_install:append() {
56 if ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'true', 'false', d)}; then
57 ln -sf ping ${D}/${base_bindir}/ping6
58 fi
59}
diff --git a/meta/recipes-extended/libarchive/libarchive/configurehack.patch b/meta/recipes-extended/libarchive/libarchive/configurehack.patch
index f3989d99eb..45fddd9147 100644
--- a/meta/recipes-extended/libarchive/libarchive/configurehack.patch
+++ b/meta/recipes-extended/libarchive/libarchive/configurehack.patch
@@ -2,12 +2,15 @@ To work with autoconf 2.73, tweak the macro ordering in configure.in.
2 2
3Upstream-Status: Pending 3Upstream-Status: Pending
4Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 4Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5---
6 configure.ac | 26 +++++++++++++-------------
7 1 file changed, 13 insertions(+), 13 deletions(-)
5 8
6Index: libarchive-3.6.2/configure.ac 9diff --git a/configure.ac b/configure.ac
7=================================================================== 10index 503bb75..e3101da 100644
8--- libarchive-3.6.2.orig/configure.ac 11--- a/configure.ac
9+++ libarchive-3.6.2/configure.ac 12+++ b/configure.ac
10@@ -357,6 +357,19 @@ if test "x$with_bz2lib" != "xno"; then 13@@ -414,6 +414,19 @@ if test "x$with_bz2lib" != "xno"; then
11 esac 14 esac
12 fi 15 fi
13 16
@@ -27,9 +30,9 @@ Index: libarchive-3.6.2/configure.ac
27 AC_ARG_WITH([libb2], 30 AC_ARG_WITH([libb2],
28 AS_HELP_STRING([--without-libb2], [Don't build support for BLAKE2 through libb2])) 31 AS_HELP_STRING([--without-libb2], [Don't build support for BLAKE2 through libb2]))
29 32
30@@ -558,19 +571,6 @@ LDFLAGS=$save_LDFLAGS 33@@ -678,19 +691,6 @@ fi
31 34
32 AC_SUBST(GC_SECTIONS) 35 AC_SUBST(DEAD_CODE_REMOVAL)
33 36
34-# Checks for typedefs, structures, and compiler characteristics. 37-# Checks for typedefs, structures, and compiler characteristics.
35-AC_C_CONST 38-AC_C_CONST
@@ -47,3 +50,6 @@ Index: libarchive-3.6.2/configure.ac
47 # Check for tm_gmtoff in struct tm 50 # Check for tm_gmtoff in struct tm
48 AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,, 51 AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,
49 [ 52 [
53--
542.34.1
55
diff --git a/meta/recipes-extended/libarchive/libarchive_3.7.2.bb b/meta/recipes-extended/libarchive/libarchive_3.7.4.bb
index 91f521fa4d..da85764116 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.7.2.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.7.4.bb
@@ -33,7 +33,7 @@ SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz"
33SRC_URI += "file://configurehack.patch" 33SRC_URI += "file://configurehack.patch"
34UPSTREAM_CHECK_URI = "http://libarchive.org/" 34UPSTREAM_CHECK_URI = "http://libarchive.org/"
35 35
36SRC_URI[sha256sum] = "df404eb7222cf30b4f8f93828677890a2986b66ff8bf39dac32a804e96ddf104" 36SRC_URI[sha256sum] = "7875d49596286055b52439ed42f044bd8ad426aa4cc5aabd96bfe7abb971d5e8"
37 37
38CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe" 38CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe"
39 39
diff --git a/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch
index 6f0dea2e9c..da93a12ed5 100644
--- a/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch
+++ b/meta/recipes-extended/libsolv/libsolv/0001-utils-Conside-musl-when-wrapping-qsort_r.patch
@@ -1,4 +1,4 @@
1From 06321f1a2aa89b8e028946e793344657eaad0165 Mon Sep 17 00:00:00 2001 1From e1db3c41fa84391b7ab299f7351f58b413ed2994 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 28 Oct 2021 22:28:45 -0700 3Date: Thu, 28 Oct 2021 22:28:45 -0700
4Subject: [PATCH] utils: Conside musl when wrapping qsort_r 4Subject: [PATCH] utils: Conside musl when wrapping qsort_r
@@ -29,6 +29,3 @@ index 72426e09..8f29bc5a 100644
29 29
30 void 30 void
31 solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard) 31 solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard)
32--
332.33.1
34
diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.28.bb b/meta/recipes-extended/libsolv/libsolv_0.7.29.bb
index 201059323a..ff0bd2d174 100644
--- a/meta/recipes-extended/libsolv/libsolv_0.7.28.bb
+++ b/meta/recipes-extended/libsolv/libsolv_0.7.29.bb
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/openSUSE/libsolv.git;branch=master;protocol=https \
12 file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \ 12 file://0001-utils-Conside-musl-when-wrapping-qsort_r.patch \
13" 13"
14 14
15SRCREV = "c8dbb3a77c86600ce09d4f80a504cf4e78a3c359" 15SRCREV = "9c2b1a84b5a7ce0dc6e74226bdeb9527d6706791"
16 16
17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
18 18
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.74.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.76.bb
index 7460d3d716..153f451ea7 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.74.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.76.bb
@@ -16,7 +16,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
16 file://lighttpd \ 16 file://lighttpd \
17 " 17 "
18 18
19SRC_URI[sha256sum] = "5c08736e83088f7e019797159f306e88ec729abe976dc98fb3bed71b9d3e53b5" 19SRC_URI[sha256sum] = "8cbf4296e373cfd0cedfe9d978760b5b05c58fdc4048b4e2bcaf0a61ac8f5011"
20 20
21DEPENDS = "virtual/crypt" 21DEPENDS = "virtual/crypt"
22 22
@@ -47,9 +47,9 @@ SYSTEMD_SERVICE:${PN} = "lighttpd.service"
47 47
48do_install:append() { 48do_install:append() {
49 install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav 49 install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav
50 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d 50 install -m 0755 ${UNPACKDIR}/lighttpd ${D}${sysconfdir}/init.d
51 install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd 51 install -m 0644 ${UNPACKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd
52 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html 52 install -m 0644 ${UNPACKDIR}/index.html.lighttpd ${D}/www/pages/index.html
53 53
54 install -d ${D}${systemd_system_unitdir} 54 install -d ${D}${systemd_system_unitdir}
55 install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_system_unitdir} 55 install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_system_unitdir}
diff --git a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
index cc98079651..5b6c780bec 100644
--- a/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
+++ b/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch
@@ -1,4 +1,4 @@
1From e87c2ad1e16cdbd62ba71b2ace3270503decaa56 Mon Sep 17 00:00:00 2001 1From 768159aa53257d247645a12518778f50b8fdf578 Mon Sep 17 00:00:00 2001
2From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com> 2From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com>
3Date: Wed, 29 Jul 2020 08:47:09 -0400 3Date: Wed, 29 Jul 2020 08:47:09 -0400
4Subject: [PATCH] Remove OOM tests from runtest/mm 4Subject: [PATCH] Remove OOM tests from runtest/mm
@@ -14,10 +14,10 @@ Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
14 1 file changed, 6 deletions(-) 14 1 file changed, 6 deletions(-)
15 15
16diff --git a/runtest/mm b/runtest/mm 16diff --git a/runtest/mm b/runtest/mm
17index d859b331c..3c2962f44 100644 17index 6a8cd0b9d..8ce3f4416 100644
18--- a/runtest/mm 18--- a/runtest/mm
19+++ b/runtest/mm 19+++ b/runtest/mm
20@@ -74,12 +74,6 @@ ksm07 ksm07 20@@ -76,12 +76,6 @@ ksm07 ksm07
21 21
22 cpuset01 cpuset01 22 cpuset01 cpuset01
23 23
@@ -30,6 +30,3 @@ index d859b331c..3c2962f44 100644
30 swapping01 swapping01 -i 5 30 swapping01 swapping01 -i 5
31 31
32 thp01 thp01 -I 120 32 thp01 thp01 -I 120
33--
342.43.0
35
diff --git a/meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch b/meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch
deleted file mode 100644
index 4a50d1ae38..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-scenario_groups-default-remove-connectors.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 14c710cae38aa96bd8d681e891b6a1d691f99988 Mon Sep 17 00:00:00 2001
2From: Xiangyu Chen <xiangyu.chen@windriver.com>
3Date: Thu, 14 Mar 2024 09:47:10 +0800
4Subject: [PATCH] scenario_groups/default: remove connectors
5
6runtest/connectors was removed in 9b642d89c, thus update scenario_groups/default.
7
8Fixes: 9b642d89c ("runtest: Merge runtest/connectors to kernel_misc")
9Closes: https://github.com/linux-test-project/ltp/pull/1144
10
11Upstream-Status: Backport from
12[https://github.com/linux-test-project/ltp/commit/14c710ca]
13
14Reviewed-by: Petr Vorel <pvorel@suse.cz>
15Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
16---
17 scenario_groups/default | 1 -
18 1 file changed, 1 deletion(-)
19
20diff --git a/scenario_groups/default b/scenario_groups/default
21index f17b2061a..ec77d8fb8 100644
22--- a/scenario_groups/default
23+++ b/scenario_groups/default
24@@ -16,7 +16,6 @@ controllers
25 filecaps
26 cap_bounds
27 fcntl-locktests
28-connectors
29 power_management_tests
30 hugetlb
31 commands
32--
332.34.1
34
diff --git a/meta/recipes-extended/ltp/ltp_20240129.bb b/meta/recipes-extended/ltp/ltp_20240524.bb
index 3e896957d1..1aafed0bf5 100644
--- a/meta/recipes-extended/ltp/ltp_20240129.bb
+++ b/meta/recipes-extended/ltp/ltp_20240524.bb
@@ -24,11 +24,10 @@ TUNE_CCARGS:remove:x86-64 = "-mfpmath=sse"
24 24
25CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" 25CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
26CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" 26CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
27SRCREV = "68737d20556d37364c95776044b1119c0912a36a" 27SRCREV = "8f21ebba42216dbb7e8d44c23b4a977d6823f7a1"
28 28
29SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ 29SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \
30 file://0001-Remove-OOM-tests-from-runtest-mm.patch \ 30 file://0001-Remove-OOM-tests-from-runtest-mm.patch \
31 file://0001-scenario_groups-default-remove-connectors.patch \
32 " 31 "
33 32
34S = "${WORKDIR}/git" 33S = "${WORKDIR}/git"
@@ -98,6 +97,7 @@ RDEPENDS:${PN} = "\
98 gdb \ 97 gdb \
99 gzip \ 98 gzip \
100 iproute2 \ 99 iproute2 \
100 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'iputils-ping6', '', d)} \
101 ldd \ 101 ldd \
102 libaio \ 102 libaio \
103 logrotate \ 103 logrotate \
diff --git a/meta/recipes-extended/lzip/lzip_1.24.bb b/meta/recipes-extended/lzip/lzip_1.24.1.bb
index 73040a6f00..6eda012734 100644
--- a/meta/recipes-extended/lzip/lzip_1.24.bb
+++ b/meta/recipes-extended/lzip/lzip_1.24.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
8 " 8 "
9 9
10SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz" 10SRC_URI = "${SAVANNAH_GNU_MIRROR}/lzip/lzip-${PV}.tar.gz"
11SRC_URI[sha256sum] = "d42659229b10e066eeb6e81eb673cdd893b672e512d26719c2d95975556ca56c" 11SRC_URI[sha256sum] = "30c9cb6a0605f479c496c376eb629a48b0a1696d167e3c1e090c5defa481b162"
12 12
13B = "${WORKDIR}/build" 13B = "${WORKDIR}/build"
14do_configure[cleandirs] = "${B}" 14do_configure[cleandirs] = "${B}"
diff --git a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch
index dc6966629c..57ecd48b1f 100644
--- a/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch
+++ b/meta/recipes-extended/man-db/files/0001-man-Move-local-variable-declaration-to-function-scop.patch
@@ -1,4 +1,4 @@
1From 126dfefb5fddf411ad0a1316209e9c1b47abfcd2 Mon Sep 17 00:00:00 2001 1From e4125223631f0d555fc327da6d8705bcc8ee5ba5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 9 Feb 2022 17:30:16 -0800 3Date: Wed, 9 Feb 2022 17:30:16 -0800
4Subject: [PATCH] man: Move local variable declaration to function scope 4Subject: [PATCH] man: Move local variable declaration to function scope
@@ -10,16 +10,15 @@ code without changing the logic, until its fixed in clang
10 10
11Upstream-Status: Inappropriate [Inappropriate: Clang bug] 11Upstream-Status: Inappropriate [Inappropriate: Clang bug]
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14--- 13---
15 src/man.c | 4 ++-- 14 src/man.c | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-) 15 1 file changed, 2 insertions(+), 2 deletions(-)
17 16
18diff --git a/src/man.c b/src/man.c 17diff --git a/src/man.c b/src/man.c
19index f16fae8..333df03 100644 18index 195d35d..6870989 100644
20--- a/src/man.c 19--- a/src/man.c
21+++ b/src/man.c 20+++ b/src/man.c
22@@ -352,7 +352,7 @@ static void init_html_pager (void) 21@@ -379,7 +379,7 @@ static void init_html_pager (void)
23 static error_t parse_opt (int key, char *arg, struct argp_state *state) 22 static error_t parse_opt (int key, char *arg, struct argp_state *state)
24 { 23 {
25 static bool apropos, whatis; /* retain values between calls */ 24 static bool apropos, whatis; /* retain values between calls */
@@ -28,7 +27,7 @@ index f16fae8..333df03 100644
28 /* Please keep these keys in the same order as in options above. */ 27 /* Please keep these keys in the same order as in options above. */
29 switch (key) { 28 switch (key) {
30 case 'C': 29 case 'C':
31@@ -384,7 +384,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) 30@@ -411,7 +411,7 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
32 case OPT_WARNINGS: 31 case OPT_WARNINGS:
33 #ifdef NROFF_WARNINGS 32 #ifdef NROFF_WARNINGS
34 { 33 {
diff --git a/meta/recipes-extended/man-db/man-db_2.12.0.bb b/meta/recipes-extended/man-db/man-db_2.12.1.bb
index 19dbb41d16..5c6797c8f1 100644
--- a/meta/recipes-extended/man-db/man-db_2.12.0.bb
+++ b/meta/recipes-extended/man-db/man-db_2.12.1.bb
@@ -11,7 +11,7 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
11 file://99_mandb \ 11 file://99_mandb \
12 file://0001-man-Move-local-variable-declaration-to-function-scop.patch \ 12 file://0001-man-Move-local-variable-declaration-to-function-scop.patch \
13 " 13 "
14SRC_URI[sha256sum] = "415a6284a22764ad22ff0f66710d853be7790dd451cd71436e3d25c74d996a95" 14SRC_URI[sha256sum] = "ddee249daeb78cf92bab794ccd069cc8b575992265ea20e239e887156e880265"
15 15
16DEPENDS = "libpipeline gdbm groff-native base-passwd" 16DEPENDS = "libpipeline gdbm groff-native base-passwd"
17RDEPENDS:${PN} += "base-passwd" 17RDEPENDS:${PN} += "base-passwd"
@@ -37,7 +37,7 @@ do_install() {
37 37
38 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 38 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
39 install -d ${D}/etc/default/volatiles 39 install -d ${D}/etc/default/volatiles
40 install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles 40 install -m 0644 ${UNPACKDIR}/99_mandb ${D}/etc/default/volatiles
41 fi 41 fi
42} 42}
43 43
diff --git a/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch b/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch
deleted file mode 100644
index a644d24328..0000000000
--- a/meta/recipes-extended/man-pages/man-pages/0001-GNUmakefile-use-env-from-PATH.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From fbf0544138af02be4d6dd3085e7ecf98ad060bb4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Wed, 13 Mar 2024 17:30:02 +0100
4Subject: [PATCH] GNUmakefile: use env from PATH
5
6This allows using env from coreutils-native (rather than host env),
7which resolves the problem of missing -S option on distributions
8with much older coreutils such as Ubuntu 18.04.
9
10Once all autobuilder distros are newer than that, this patch
11can be dropped, together with corutils-native dependency.
12
13Upstream-Status: Inappropriate [made for obsolete host distros]
14Signed-off-by: Alexander Kanavin <alex@linutronix.de>
15---
16 GNUmakefile | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/GNUmakefile b/GNUmakefile
20index 1234194..65ba327 100644
21--- a/GNUmakefile
22+++ b/GNUmakefile
23@@ -21,7 +21,7 @@
24 ########################################################################
25
26
27-SHELL := /usr/bin/env
28+SHELL := env
29 .SHELLFLAGS := -S bash -Eeuo pipefail -c
30
31
diff --git a/meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch b/meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch
deleted file mode 100644
index ec2d0600c7..0000000000
--- a/meta/recipes-extended/man-pages/man-pages/0001-man.ml-do-not-use-dev-stdin.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From f16cd8c4986b7f250e8465dfbe4bda8d366e05dd Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 4 Mar 2024 14:35:16 +0100
4Subject: [PATCH] man.ml: do not use /dev/stdin
5
6This was introduced in https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/commit/?id=30c38a8bf8ae8f4a6e71d3b8ac4abf0a40778f1e
7(presumably to build a 'sed | install' pipeline instead of previous 'install; sed' sequence),
8but it doesn't work under pseudo where /dev/stdin is absent.
9
10Upstream-Status: Inappropriate [yocto specific]
11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12---
13 share/mk/install/man.mk | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk
17index b9865b9..06880f0 100644
18--- a/share/mk/install/man.mk
19+++ b/share/mk/install/man.mk
20@@ -60,10 +60,10 @@ $(foreach s, $(MANSECTIONS), \
21
22 $(_manpages):
23 $(info INSTALL $@)
24- <$< \
25- $(SED) $(foreach s, $(MANSECTIONS), \
26+ $(INSTALL_DATA) -T $< $@
27+ $(SED) -i $(foreach s, $(MANSECTIONS), \
28 -e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \
29- | $(INSTALL_DATA) -T /dev/stdin $@
30+ $@
31 ifeq ($(LINK_PAGES),symlink)
32 if $(GREP) '^\.so ' <$@ >/dev/null; then \
33 $(GREP) '^\.so ' <$@ \
diff --git a/meta/recipes-extended/man-pages/man-pages_6.06.bb b/meta/recipes-extended/man-pages/man-pages_6.8.bb
index 0f091bbd7d..1181de1f15 100644
--- a/meta/recipes-extended/man-pages/man-pages_6.06.bb
+++ b/meta/recipes-extended/man-pages/man-pages_6.8.bb
@@ -18,17 +18,12 @@ LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \
18 file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \ 18 file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 \
19 " 19 "
20SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \ 20SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \
21 file://0001-man.ml-do-not-use-dev-stdin.patch \
22 file://0001-GNUmakefile-use-env-from-PATH.patch \
23 " 21 "
24 22
25SRC_URI[sha256sum] = "006906e7be81a71c2d347809597bcb91485fa7fa488acdaa79e681ddfa894568" 23SRC_URI[sha256sum] = "f4d5b9756b4ee52e34ca9d895095c92312ced6292395b811e11069ab007e6f06"
26 24
27inherit manpages 25inherit manpages
28 26
29# can be dropped when ubuntu 18.04 is not in use anymore
30DEPENDS += "coreutils-native"
31
32MAN_PKG = "${PN}" 27MAN_PKG = "${PN}"
33 28
34PACKAGECONFIG ??= "" 29PACKAGECONFIG ??= ""
diff --git a/meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch b/meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch
deleted file mode 100644
index cea435f83b..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch
+++ /dev/null
@@ -1,148 +0,0 @@
1From ca458f4dcc4de9403298f67543466ce4bbc8f8ae Mon Sep 17 00:00:00 2001
2From: Logan Gunthorpe <logang@deltatee.com>
3Date: Wed, 22 Jun 2022 14:25:07 -0600
4Subject: [PATCH 1/4] DDF: Cleanup validate_geometry_ddf_container()
5
6Move the function up so that the function declaration is not necessary
7and remove the unused arguments to the function.
8
9No functional changes are intended but will help with a bug fix in the
10next patch.
11
12Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
13Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
14Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
15
16Upstream-Status: Backport
17
18Reference to upstream patch:
19https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=679bd9508a30
20
21Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
22---
23 super-ddf.c | 88 ++++++++++++++++++++++++-----------------------------
24 1 file changed, 39 insertions(+), 49 deletions(-)
25
26diff --git a/super-ddf.c b/super-ddf.c
27index 3f304cd..65cf727 100644
28--- a/super-ddf.c
29+++ b/super-ddf.c
30@@ -503,13 +503,6 @@ struct ddf_super {
31 static int load_super_ddf_all(struct supertype *st, int fd,
32 void **sbp, char *devname);
33 static int get_svd_state(const struct ddf_super *, const struct vcl *);
34-static int
35-validate_geometry_ddf_container(struct supertype *st,
36- int level, int layout, int raiddisks,
37- int chunk, unsigned long long size,
38- unsigned long long data_offset,
39- char *dev, unsigned long long *freesize,
40- int verbose);
41
42 static int validate_geometry_ddf_bvd(struct supertype *st,
43 int level, int layout, int raiddisks,
44@@ -3322,6 +3315,42 @@ static int reserve_space(struct supertype *st, int raiddisks,
45 return 1;
46 }
47
48+static int
49+validate_geometry_ddf_container(struct supertype *st,
50+ int level, int raiddisks,
51+ unsigned long long data_offset,
52+ char *dev, unsigned long long *freesize,
53+ int verbose)
54+{
55+ int fd;
56+ unsigned long long ldsize;
57+
58+ if (level != LEVEL_CONTAINER)
59+ return 0;
60+ if (!dev)
61+ return 1;
62+
63+ fd = dev_open(dev, O_RDONLY|O_EXCL);
64+ if (fd < 0) {
65+ if (verbose)
66+ pr_err("ddf: Cannot open %s: %s\n",
67+ dev, strerror(errno));
68+ return 0;
69+ }
70+ if (!get_dev_size(fd, dev, &ldsize)) {
71+ close(fd);
72+ return 0;
73+ }
74+ close(fd);
75+ if (freesize) {
76+ *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS);
77+ if (*freesize == 0)
78+ return 0;
79+ }
80+
81+ return 1;
82+}
83+
84 static int validate_geometry_ddf(struct supertype *st,
85 int level, int layout, int raiddisks,
86 int *chunk, unsigned long long size,
87@@ -3347,11 +3376,9 @@ static int validate_geometry_ddf(struct supertype *st,
88 level = LEVEL_CONTAINER;
89 if (level == LEVEL_CONTAINER) {
90 /* Must be a fresh device to add to a container */
91- return validate_geometry_ddf_container(st, level, layout,
92- raiddisks, *chunk,
93- size, data_offset, dev,
94- freesize,
95- verbose);
96+ return validate_geometry_ddf_container(st, level, raiddisks,
97+ data_offset, dev,
98+ freesize, verbose);
99 }
100
101 if (!dev) {
102@@ -3449,43 +3476,6 @@ static int validate_geometry_ddf(struct supertype *st,
103 return 1;
104 }
105
106-static int
107-validate_geometry_ddf_container(struct supertype *st,
108- int level, int layout, int raiddisks,
109- int chunk, unsigned long long size,
110- unsigned long long data_offset,
111- char *dev, unsigned long long *freesize,
112- int verbose)
113-{
114- int fd;
115- unsigned long long ldsize;
116-
117- if (level != LEVEL_CONTAINER)
118- return 0;
119- if (!dev)
120- return 1;
121-
122- fd = dev_open(dev, O_RDONLY|O_EXCL);
123- if (fd < 0) {
124- if (verbose)
125- pr_err("ddf: Cannot open %s: %s\n",
126- dev, strerror(errno));
127- return 0;
128- }
129- if (!get_dev_size(fd, dev, &ldsize)) {
130- close(fd);
131- return 0;
132- }
133- close(fd);
134- if (freesize) {
135- *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS);
136- if (*freesize == 0)
137- return 0;
138- }
139-
140- return 1;
141-}
142-
143 static int validate_geometry_ddf_bvd(struct supertype *st,
144 int level, int layout, int raiddisks,
145 int *chunk, unsigned long long size,
146--
1472.39.1
148
diff --git a/meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
deleted file mode 100644
index 9e3a30be23..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 82c893bb9e01f914a6bdef1bef943af746cfc3e1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 15 Jan 2023 12:42:18 -0800
4Subject: [PATCH] Define alignof using _Alignof when using C11 or newer
5
6WG14 N2350 made very clear that it is an UB having type definitions
7within "offsetof" [1]. This patch enhances the implementation of macro
8alignof_slot to use builtin "_Alignof" to avoid undefined behavior on
9when using std=c11 or newer
10
11clang 16+ has started to flag this [2]
12
13Fixes build when using -std >= gnu11 and using clang16+
14
15Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it
16may support C11, exclude those compilers too
17
18[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm
19[2] https://reviews.llvm.org/D133574
20
21Upstream-Status: Submitted [https://lore.kernel.org/linux-raid/20230118083236.24418-1-raj.khem@gmail.com/T/#u]
22Signed-off-by: Khem Raj <raj.khem@gmail.com>
23---
24 sha1.c | 12 +++++++++++-
25 1 file changed, 11 insertions(+), 1 deletion(-)
26
27diff --git a/sha1.c b/sha1.c
28index 89b32f4..1e4ad5d 100644
29--- a/sha1.c
30+++ b/sha1.c
31@@ -229,7 +229,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx)
32 if (len >= 64)
33 {
34 #if !_STRING_ARCH_unaligned
35-# define alignof(type) offsetof (struct { char c; type x; }, x)
36+/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023
37+ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.
38+ clang versions < 8.0.0 have the same bug. */
39+# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
40+ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
41+ && !defined __clang__) \
42+ || (defined __clang__ && __clang_major__ < 8))
43+# define alignof(type) offsetof (struct { char c; type x; }, x)
44+# else
45+# define alignof(type) _Alignof(type)
46+# endif
47 # define UNALIGNED_P(p) (((size_t) p) % alignof (sha1_uint32) != 0)
48 if (UNALIGNED_P (buffer))
49 while (len > 64)
50--
512.39.0
52
diff --git a/meta/recipes-extended/mdadm/files/0001-Fix-parsing-of-r-in-monitor-manager-mode.patch b/meta/recipes-extended/mdadm/files/0001-Fix-parsing-of-r-in-monitor-manager-mode.patch
deleted file mode 100644
index 3fb46cc60a..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-Fix-parsing-of-r-in-monitor-manager-mode.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1From 969fbb35e40100f599d4a9781911251f21792698 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 27 Jan 2022 17:53:01 +0800
4Subject: [PATCH] Fix parsing of "-r" in monitor/manager mode
5
6This revert commit 546047688e1 [mdadm: fix coredump of mdadm --monitor
7-r], and fix the coredump issue of 'mdadm --monitor -r'.
8
9commit 546047688e1 make -r not work in manager mode, and testcase
1000multipath failed.
11
12Upstream-Status: Submitted [send to maintainer jsorensen@fb.com]
13
14Signed-off-by: Changqing Li <changqing.li@windriver.com>
15
16---
17 ReadMe.c | 8 +++++---
18 mdadm.c | 2 ++
19 mdadm.h | 1 +
20 3 files changed, 8 insertions(+), 3 deletions(-)
21
22diff --git a/ReadMe.c b/ReadMe.c
23index 8139976..070eea5 100644
24--- a/ReadMe.c
25+++ b/ReadMe.c
26@@ -81,11 +81,13 @@ char Version[] = "mdadm - v" VERSION " - " VERS_DATE EXTRAVERSION "\n";
27 * found, it is started.
28 */
29
30-char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:r:n:x:u:c:d:z:U:N:safRSow1tye:k";
31+char short_options[]="-ABCDEFGIQhVXYWZ:vqbc:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:";
32 char short_bitmap_options[]=
33- "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sarfRSow1tye:k:";
34+ "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sarfRSow1tye:k:";
35 char short_bitmap_auto_options[]=
36- "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:r:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:";
37+ "-ABCDEFGIQhVXYWZ:vqb:c:i:l:p:m:n:x:u:c:d:z:U:N:sa:rfRSow1tye:k:";
38+char short_increment_options[]=
39+ "-ABCDEFGIQhVXYWZ:vqbc:i:l:r:p:m:n:x:u:c:d:z:U:N:safRSow1tye:k:";
40
41 struct option long_options[] = {
42 {"manage", 0, 0, ManageOpt},
43diff --git a/mdadm.c b/mdadm.c
44index 26299b2..2a3b2ee 100644
45--- a/mdadm.c
46+++ b/mdadm.c
47@@ -227,6 +227,7 @@ int main(int argc, char *argv[])
48 shortopt = short_bitmap_auto_options;
49 break;
50 case 'F': newmode = MONITOR;
51+ shortopt = short_increment_options;
52 break;
53 case 'G': newmode = GROW;
54 shortopt = short_bitmap_options;
55@@ -268,6 +269,7 @@ int main(int argc, char *argv[])
56
57 case NoSharing:
58 newmode = MONITOR;
59+ shortopt = short_increment_options;
60 break;
61 }
62 if (mode && newmode == mode) {
63diff --git a/mdadm.h b/mdadm.h
64index ecfc137..42148dd 100644
65--- a/mdadm.h
66+++ b/mdadm.h
67@@ -421,6 +421,7 @@ enum mode {
68 extern char short_options[];
69 extern char short_bitmap_options[];
70 extern char short_bitmap_auto_options[];
71+extern char short_increment_options[];
72 extern struct option long_options[];
73 extern char Version[], Usage[], Help[], OptionHelp[],
74 *mode_help[],
diff --git a/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch b/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
index 298f276cd6..fa1f0aa520 100644
--- a/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
+++ b/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
@@ -1,4 +1,4 @@
1From a9166bf422da1001bac9cc819386bf39b7cd1b73 Mon Sep 17 00:00:00 2001 1From 76856a34a4e339e4a53b09d028f89fcc520e3127 Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com> 2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Tue, 9 Feb 2016 11:44:01 +0200 3Date: Tue, 9 Feb 2016 11:44:01 +0200
4Subject: [PATCH] Fix the path of corosync and dlm header files check 4Subject: [PATCH] Fix the path of corosync and dlm header files check
@@ -9,16 +9,15 @@ Fix it.
9Upstream-Status: Inappropriate [Yocto specific] 9Upstream-Status: Inappropriate [Yocto specific]
10 10
11Signed-off-by: Maxin B. John <maxin.john@intel.com> 11Signed-off-by: Maxin B. John <maxin.john@intel.com>
12
13--- 12---
14 Makefile | 4 ++-- 13 Makefile | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-) 14 1 file changed, 2 insertions(+), 2 deletions(-)
16 15
17diff --git a/Makefile b/Makefile 16diff --git a/Makefile b/Makefile
18index 2767ac6..46bf57b 100644 17index cbdba49..7bfd336 100644
19--- a/Makefile 18--- a/Makefile
20+++ b/Makefile 19+++ b/Makefile
21@@ -91,8 +91,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots 20@@ -109,8 +109,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots
22 SYSTEMD_DIR=/lib/systemd/system 21 SYSTEMD_DIR=/lib/systemd/system
23 LIB_DIR=/usr/libexec/mdadm 22 LIB_DIR=/usr/libexec/mdadm
24 23
diff --git a/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
index 3f76ef54d8..a4be1aa8a1 100644
--- a/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
+++ b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
@@ -1,4 +1,4 @@
1From 97e776724ab9763c5bca9816370bb1635b7a8232 Mon Sep 17 00:00:00 2001 1From 0be066d57a7dd1aead5488d0a095863608f2e559 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 25 Jan 2022 16:25:01 +0800 3Date: Tue, 25 Jan 2022 16:25:01 +0800
4Subject: [PATCH] Makefile: install mdcheck 4Subject: [PATCH] Makefile: install mdcheck
@@ -14,10 +14,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
14 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
15 15
16diff --git a/Makefile b/Makefile 16diff --git a/Makefile b/Makefile
17index 2a51d813..db40c7fd 100644 17index 1141971..f4059e2 100644
18--- a/Makefile 18--- a/Makefile
19+++ b/Makefile 19+++ b/Makefile
20@@ -303,6 +303,7 @@ install-systemd: systemd/mdmon@.service 20@@ -325,6 +325,7 @@ install-systemd: systemd/mdmon@.service
21 install-bin: mdadm mdmon 21 install-bin: mdadm mdmon
22 $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm 22 $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
23 $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon 23 $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
@@ -25,6 +25,3 @@ index 2a51d813..db40c7fd 100644
25 25
26 uninstall: 26 uninstall:
27 rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm 27 rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
28--
292.17.1
30
diff --git a/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch b/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch
deleted file mode 100644
index fb4bc165fb..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1From 02a41c3fd560fb5250186dd6b3cff6b21daa2e2b Mon Sep 17 00:00:00 2001
2From: Mingli Yu <Mingli.Yu@windriver.com>
3Date: Mon, 15 Jul 2019 14:12:24 +0800
4Subject: [PATCH] Revert "tests: wait for complete rebuild in integrity checks"
5
6This reverts commit e2a8e9dcf67a28bc722fa5ab2c49b0bc452d4d74
7as the logic "check state 'U*'" will make the test enters
8infinite loop especially in qemu env, so revert it to
9use the previous logic "check wait" which also used
10commonly by other tests such as tests/02r5grow, tests/07revert-grow
11and etc.
12
13Upstream-Status: Submitted [https://marc.info/?l=linux-raid&m=156317157314030&w=2]
14
15Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
16---
17 tests/01r5integ | 2 +-
18 tests/01raid6integ | 4 ++--
19 2 files changed, 3 insertions(+), 3 deletions(-)
20
21diff --git a/tests/01r5integ b/tests/01r5integ
22index 48676a2..ffb30ce 100644
23--- a/tests/01r5integ
24+++ b/tests/01r5integ
25@@ -27,7 +27,7 @@ do
26 exit 1
27 fi
28 mdadm $md0 -a $i
29- while ! (check state 'U*'); do check wait; sleep 0.2; done
30+ check wait
31 done
32 mdadm -S $md0
33 done
34diff --git a/tests/01raid6integ b/tests/01raid6integ
35index 12f4d81..c6fcdae 100644
36--- a/tests/01raid6integ
37+++ b/tests/01raid6integ
38@@ -47,10 +47,10 @@ do
39 exit 1
40 fi
41 mdadm $md0 -a $first
42- while ! (check state 'U*_U*'); do check wait; sleep 0.2; done
43+ check wait
44 done
45 mdadm $md0 -a $second
46- while ! (check state 'U*'); do check wait; sleep 0.2; done
47+ check wait
48 totest="$totest $second"
49 done
50 mdadm -S $md0
51--
522.7.4
53
diff --git a/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch b/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch
index 12bf6a5920..16fdefbbd1 100644
--- a/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch
+++ b/meta/recipes-extended/mdadm/files/0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch
@@ -1,4 +1,4 @@
1From 37c35f94d9d95dbd2b5f8a919f5478be51453590 Mon Sep 17 00:00:00 2001 1From c29d086714b49a6d76ccca83b4a6fa2f139bad6e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 13 Oct 2017 10:27:34 -0700 3Date: Fri, 13 Oct 2017 10:27:34 -0700
4Subject: [PATCH] Use CC to check for implicit-fallthrough warning support 4Subject: [PATCH] Use CC to check for implicit-fallthrough warning support
@@ -10,19 +10,35 @@ cross compile used for compiling mdadm is < version 7
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Upstream-Status: Pending 11Upstream-Status: Pending
12--- 12---
13 Makefile | 2 +- 13 Makefile | 6 +++---
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 3 insertions(+), 3 deletions(-)
15 15
16diff --git a/Makefile b/Makefile 16diff --git a/Makefile b/Makefile
17index 46bf57b..a075912 100644 17index 7bfd336..9ab6a65 100644
18--- a/Makefile 18--- a/Makefile
19+++ b/Makefile 19+++ b/Makefile
20@@ -53,7 +53,7 @@ ifdef WARN_UNUSED 20@@ -56,21 +56,21 @@ CWFLAGS += -Wp -O3
21 CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3
22 endif 21 endif
23 22
24-FALLTHROUGH := $(shell gcc -v --help 2>&1 | grep "implicit-fallthrough" | wc -l) 23 ifeq ($(origin FALLTHROUGH), undefined)
25+FALLTHROUGH := $(shell ${CC} -v --help 2>&1 | grep "implicit-fallthrough" | wc -l) 24- FALLTHROUGH := $(shell gcc -Q --help=warnings 2>&1 | grep "implicit-fallthrough" | wc -l)
26 ifneq "$(FALLTHROUGH)" "0" 25+ FALLTHROUGH := $(shell ${CC} -Q --help=warnings 2>&1 | grep "implicit-fallthrough" | wc -l)
27 CWFLAGS += -Wimplicit-fallthrough=0 26 ifneq "$(FALLTHROUGH)" "0"
27 CWFLAGS += -Wimplicit-fallthrough=0
28 endif
28 endif 29 endif
30
31 ifeq ($(origin FORMATOVERFLOW), undefined)
32- FORMATOVERFLOW := $(shell gcc -Q --help=warnings 2>&1 | grep "format-overflow" | wc -l)
33+ FORMATOVERFLOW := $(shell ${CC} -Q --help=warnings 2>&1 | grep "format-overflow" | wc -l)
34 ifneq "$(FORMATOVERFLOW)" "0"
35 CWFLAGS += -Wformat-overflow
36 endif
37 endif
38
39 ifeq ($(origin STRINGOPOVERFLOW), undefined)
40- STRINGOPOVERFLOW := $(shell gcc -Q --help=warnings 2>&1 | grep "stringop-overflow" | wc -l)
41+ STRINGOPOVERFLOW := $(shell ${CC} -Q --help=warnings 2>&1 | grep "stringop-overflow" | wc -l)
42 ifneq "$(STRINGOPOVERFLOW)" "0"
43 CWFLAGS += -Wstringop-overflow
44 endif
diff --git a/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch b/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch
index fa9c8cc835..3cf295106f 100644
--- a/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch
+++ b/meta/recipes-extended/mdadm/files/0001-fix-gcc-8-format-truncation-warning.patch
@@ -1,4 +1,4 @@
1From 3158d3788c2e0fb75ace2c89840bd8a977fb4cb0 Mon Sep 17 00:00:00 2001 1From 78e5bb08971a5644a56af60d51ef35e13522e811 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 14 Dec 2018 15:12:31 +0800 3Date: Fri, 14 Dec 2018 15:12:31 +0800
4Subject: [PATCH] fix gcc-8 format-truncation warning 4Subject: [PATCH] fix gcc-8 format-truncation warning
@@ -22,7 +22,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
22 1 file changed, 1 insertion(+), 1 deletion(-) 22 1 file changed, 1 insertion(+), 1 deletion(-)
23 23
24diff --git a/super0.c b/super0.c 24diff --git a/super0.c b/super0.c
25index 756cab5..12c28da 100644 25index a7c5f81..a79b6bd 100644
26--- a/super0.c 26--- a/super0.c
27+++ b/super0.c 27+++ b/super0.c
28@@ -229,7 +229,7 @@ static void examine_super0(struct supertype *st, char *homehost) 28@@ -229,7 +229,7 @@ static void examine_super0(struct supertype *st, char *homehost)
@@ -34,6 +34,3 @@ index 756cab5..12c28da 100644
34 int wonly, failfast; 34 int wonly, failfast;
35 if (d>=0) dp = &sb->disks[d]; 35 if (d>=0) dp = &sb->disks[d];
36 else dp = &sb->this_disk; 36 else dp = &sb->this_disk;
37--
382.7.4
39
diff --git a/meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch b/meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch
new file mode 100644
index 0000000000..70be43c15e
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-include-libgen.h-for-basename-API.patch
@@ -0,0 +1,56 @@
1From 7759ceda978aba38861d4846d0c1657465b72f04 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 24 Mar 2024 23:13:32 -0700
4Subject: [PATCH] include libgen.h for basename API
5
6Musl does no more provide it via string.h therefore builds with newer
7compilers e.g. clang-18 fails due to missing prototype for basename
8therefore add libgen.h to included headers list
9
10Upstream-Status: Submitted [https://lore.kernel.org/linux-raid/20240325061537.275811-1-raj.khem@gmail.com/T/#u]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 Monitor.c | 1 +
14 platform-intel.c | 1 +
15 super-intel.c | 1 +
16 3 files changed, 3 insertions(+)
17
18diff --git a/Monitor.c b/Monitor.c
19index 824a69f..e3942e1 100644
20--- a/Monitor.c
21+++ b/Monitor.c
22@@ -26,6 +26,7 @@
23 #include "udev.h"
24 #include "md_p.h"
25 #include "md_u.h"
26+#include <libgen.h>
27 #include <sys/wait.h>
28 #include <limits.h>
29 #include <syslog.h>
30diff --git a/platform-intel.c b/platform-intel.c
31index ac282bc..5d6687d 100644
32--- a/platform-intel.c
33+++ b/platform-intel.c
34@@ -19,6 +19,7 @@
35 #include "mdadm.h"
36 #include "platform-intel.h"
37 #include "probe_roms.h"
38+#include <libgen.h>
39 #include <stdio.h>
40 #include <stdlib.h>
41 #include <string.h>
42diff --git a/super-intel.c b/super-intel.c
43index dbea235..881dbda 100644
44--- a/super-intel.c
45+++ b/super-intel.c
46@@ -23,6 +23,7 @@
47 #include "dlink.h"
48 #include "sha1.h"
49 #include "platform-intel.h"
50+#include <libgen.h>
51 #include <values.h>
52 #include <scsi/sg.h>
53 #include <ctype.h>
54--
552.44.0
56
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-Fix-optional-write-behind-parameter.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-Fix-optional-write-behind-parameter.patch
deleted file mode 100644
index 186d1e76f2..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-mdadm-Fix-optional-write-behind-parameter.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 41edf6f45895193f4a523cb0a08d639c9ff9ccc9 Mon Sep 17 00:00:00 2001
2From: Logan Gunthorpe <logang@deltatee.com>
3Date: Wed, 22 Jun 2022 14:25:12 -0600
4Subject: [PATCH] mdadm: Fix optional --write-behind parameter
5
6The commit noted below changed the behaviour of --write-behind to
7require an argument. This broke the 06wrmostly test with the error:
8
9 mdadm: Invalid value for maximum outstanding write-behind writes: (null).
10 Must be between 0 and 16383.
11
12To fix this, check if optarg is NULL before parising it, as the origial
13code did.
14
15Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=41edf6f45895193f4a523cb0a08d639c9ff9ccc9]
16
17Fixes: 60815698c0ac ("Refactor parse_num and use it to parse optarg.")
18Cc: Mateusz Grzonka <mateusz.grzonka@intel.com>
19Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
20Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
21Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
22Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
23---
24 mdadm.c | 5 +++--
25 1 file changed, 3 insertions(+), 2 deletions(-)
26
27diff --git a/mdadm.c b/mdadm.c
28index d0c5e6de..56722ed9 100644
29--- a/mdadm.c
30+++ b/mdadm.c
31@@ -1201,8 +1201,9 @@ int main(int argc, char *argv[])
32 case O(BUILD, WriteBehind):
33 case O(CREATE, WriteBehind):
34 s.write_behind = DEFAULT_MAX_WRITE_BEHIND;
35- if (parse_num(&s.write_behind, optarg) != 0 ||
36- s.write_behind < 0 || s.write_behind > 16383) {
37+ if (optarg &&
38+ (parse_num(&s.write_behind, optarg) != 0 ||
39+ s.write_behind < 0 || s.write_behind > 16383)) {
40 pr_err("Invalid value for maximum outstanding write-behind writes: %s.\n\tMust be between 0 and 16383.\n",
41 optarg);
42 exit(2);
43--
442.25.1
45
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch
index e00287cab1..f224d0008d 100644
--- a/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch
+++ b/meta/recipes-extended/mdadm/files/0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch
@@ -1,4 +1,4 @@
1From 5fdc0173cb4fcf8656f0889ad364d2549795607f Mon Sep 17 00:00:00 2001 1From c27e128fdc062ec3fcdf7b48a8c5078615c538df Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 1 Jul 2019 11:34:49 +0800 3Date: Mon, 1 Jul 2019 11:34:49 +0800
4Subject: [PATCH] mdadm: add option -y for use syslog to recive event report 4Subject: [PATCH] mdadm: add option -y for use syslog to recive event report
@@ -14,15 +14,12 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service 16diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service
17index 46f7b88..3fc4687 100644 17index 9c36478..d289846 100644
18--- a/systemd/mdmonitor.service 18--- a/systemd/mdmonitor.service
19+++ b/systemd/mdmonitor.service 19+++ b/systemd/mdmonitor.service
20@@ -13,4 +13,4 @@ DefaultDependencies=no 20@@ -14,4 +14,4 @@ Documentation=man:mdadm(8)
21 Environment= MDADM_MONITOR_ARGS=--scan 21 Environment= MDADM_MONITOR_ARGS=--scan
22 EnvironmentFile=-/run/sysconfig/mdadm 22 EnvironmentFile=-/run/sysconfig/mdadm
23 ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh 23 ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh
24-ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS 24-ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS
25+ExecStart=BINDIR/mdadm --monitor -y $MDADM_MONITOR_ARGS 25+ExecStart=BINDIR/mdadm --monitor -y $MDADM_MONITOR_ARGS
26--
272.7.4
28
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
deleted file mode 100644
index 84517caade..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 1b83afa7c3121f819e72ea74883f8b6d61d6548e Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 6 Sep 2019 10:59:02 +0800
4Subject: [PATCH] mdadm: skip test 11spare-migration
5
611spare-migration is a test series to check mdadm Monitor migrates spares
7according to rules in /etc/mdadm.conf defined by POLICY lines.
8
9[snip]
10for scan in no yes; do
11 for platform in 1.2 imsm; do
12 try
13 done
14done
15[snip]
16
17"try" includes near 20 sub testcase, so there are nearly 80 subcases need to run,
18so it will take long time than ptest-runner timeout limit, skip it as workaround.
19
20Upstream-Status: Inappropriate [oe-specific]
21
22Signed-off-by: Changqing Li <changqing.li@windriver.com>
23---
24 test | 3 +++
25 1 file changed, 3 insertions(+)
26
27diff --git a/test b/test
28index 711a3c7..880dd1d 100755
29--- a/test
30+++ b/test
31@@ -272,6 +272,9 @@ main() {
32 else
33 for script in $testdir/$prefix $testdir/$prefix*[^~]
34 do
35+ if [ $script == "$testdir/11spare-migration" ];then
36+ continue
37+ fi
38 do_test $script
39 done
40 fi
41--
422.7.4
43
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch b/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch
index a1e7e59323..52daea2a49 100644
--- a/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch
+++ b/meta/recipes-extended/mdadm/files/0001-mdadm.h-Undefine-dprintf-before-redefining.patch
@@ -1,4 +1,4 @@
1From b431cb4e1ed060122fa300dc0008f74080d38f73 Mon Sep 17 00:00:00 2001 1From 4dd5c2659722b44409cee28b4cea68cdeaa1f987 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 9 May 2016 22:03:57 +0000 3Date: Mon, 9 May 2016 22:03:57 +0000
4Subject: [PATCH] mdadm.h: Undefine dprintf before redefining 4Subject: [PATCH] mdadm.h: Undefine dprintf before redefining
@@ -20,10 +20,10 @@ Upstream-Status: Pending
20 1 file changed, 2 insertions(+) 20 1 file changed, 2 insertions(+)
21 21
22diff --git a/mdadm.h b/mdadm.h 22diff --git a/mdadm.h b/mdadm.h
23index 387e681..bb943bf 100644 23index 1f28b3e..04996e2 100644
24--- a/mdadm.h 24--- a/mdadm.h
25+++ b/mdadm.h 25+++ b/mdadm.h
26@@ -1649,11 +1649,13 @@ static inline char *to_subarray(struct mdstat_ent *ent, char *container) 26@@ -1869,11 +1869,13 @@ static inline sighandler_t signal_s(int sig, sighandler_t handler)
27 } 27 }
28 28
29 #ifdef DEBUG 29 #ifdef DEBUG
diff --git a/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch b/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch
index 142ed355ef..13435ee418 100644
--- a/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch
+++ b/meta/recipes-extended/mdadm/files/0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch
@@ -1,4 +1,4 @@
1From 6b861a267a6ef6f60f6cc21e4c8e6d7cdd2451dc Mon Sep 17 00:00:00 2001 1From aa86de05cd6a75222b38e0789ac96fe00f705430 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 10 Nov 2022 12:31:22 -0800 3Date: Thu, 10 Nov 2022 12:31:22 -0800
4Subject: [PATCH] restripe.c: Use _FILE_OFFSET_BITS to enable largefile support 4Subject: [PATCH] restripe.c: Use _FILE_OFFSET_BITS to enable largefile support
@@ -10,9 +10,57 @@ the width of types
10Upstream-Status: Submitted [https://lore.kernel.org/linux-raid/20221110225546.337164-1-raj.khem@gmail.com/] 10Upstream-Status: Submitted [https://lore.kernel.org/linux-raid/20221110225546.337164-1-raj.khem@gmail.com/]
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12--- 12---
13 restripe.c | 13 ++++++++----- 13 raid6check.c | 11 +++++++----
14 1 file changed, 8 insertions(+), 5 deletions(-) 14 restripe.c | 13 ++++++++-----
15 swap_super.c | 13 +++++++------
16 3 files changed, 22 insertions(+), 15 deletions(-)
15 17
18diff --git a/raid6check.c b/raid6check.c
19index 9947776..8e7f142 100644
20--- a/raid6check.c
21+++ b/raid6check.c
22@@ -22,6 +22,9 @@
23 * Based on "restripe.c" from "mdadm" codebase
24 */
25
26+/* Enable largefile support */
27+#define _FILE_OFFSET_BITS 64
28+
29 #include "mdadm.h"
30 #include <stdint.h>
31 #include <sys/mman.h>
32@@ -284,9 +287,9 @@ int manual_repair(int chunk_size, int syndrome_disks,
33 }
34
35 int write_res1, write_res2;
36- off64_t seek_res;
37+ off_t seek_res;
38
39- seek_res = lseek64(source[fd1],
40+ seek_res = lseek(source[fd1],
41 offsets[fd1] + start * chunk_size, SEEK_SET);
42 if (seek_res < 0) {
43 fprintf(stderr, "lseek failed for failed_disk1\n");
44@@ -294,7 +297,7 @@ int manual_repair(int chunk_size, int syndrome_disks,
45 }
46 write_res1 = write(source[fd1], blocks[failed_slot1], chunk_size);
47
48- seek_res = lseek64(source[fd2],
49+ seek_res = lseek(source[fd2],
50 offsets[fd2] + start * chunk_size, SEEK_SET);
51 if (seek_res < 0) {
52 fprintf(stderr, "lseek failed for failed_disk2\n");
53@@ -379,7 +382,7 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
54 goto exitCheck;
55 }
56 for (i = 0 ; i < raid_disks ; i++) {
57- off64_t seek_res = lseek64(source[i], offsets[i] + start * chunk_size,
58+ off_t seek_res = lseek(source[i], offsets[i] + start * chunk_size,
59 SEEK_SET);
60 if (seek_res < 0) {
61 fprintf(stderr, "lseek to source %d failed\n", i);
62diff --git a/restripe.c b/restripe.c
63index a7a7229..1c03577 100644
16--- a/restripe.c 64--- a/restripe.c
17+++ b/restripe.c 65+++ b/restripe.c
18@@ -22,6 +22,9 @@ 66@@ -22,6 +22,9 @@
@@ -25,7 +73,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
25 #include "mdadm.h" 73 #include "mdadm.h"
26 #include <stdint.h> 74 #include <stdint.h>
27 75
28@@ -581,7 +584,7 @@ int save_stripes(int *source, unsigned l 76@@ -581,7 +584,7 @@ int save_stripes(int *source, unsigned long long *offsets,
29 raid_disks, level, layout); 77 raid_disks, level, layout);
30 if (dnum < 0) abort(); 78 if (dnum < 0) abort();
31 if (source[dnum] < 0 || 79 if (source[dnum] < 0 ||
@@ -34,7 +82,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
34 offsets[dnum] + offset, 0) < 0 || 82 offsets[dnum] + offset, 0) < 0 ||
35 read(source[dnum], buf+disk * chunk_size, 83 read(source[dnum], buf+disk * chunk_size,
36 chunk_size) != chunk_size) { 84 chunk_size) != chunk_size) {
37@@ -754,8 +757,8 @@ int restore_stripes(int *dest, unsigned 85@@ -754,8 +757,8 @@ int restore_stripes(int *dest, unsigned long long *offsets,
38 raid_disks, level, layout); 86 raid_disks, level, layout);
39 if (src_buf == NULL) { 87 if (src_buf == NULL) {
40 /* read from file */ 88 /* read from file */
@@ -45,7 +93,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
45 rv = -1; 93 rv = -1;
46 goto abort; 94 goto abort;
47 } 95 }
48@@ -816,7 +819,7 @@ int restore_stripes(int *dest, unsigned 96@@ -816,7 +819,7 @@ int restore_stripes(int *dest, unsigned long long *offsets,
49 } 97 }
50 for (i=0; i < raid_disks ; i++) 98 for (i=0; i < raid_disks ; i++)
51 if (dest[i] >= 0) { 99 if (dest[i] >= 0) {
@@ -54,7 +102,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
54 offsets[i]+offset, 0) < 0) { 102 offsets[i]+offset, 0) < 0) {
55 rv = -1; 103 rv = -1;
56 goto abort; 104 goto abort;
57@@ -866,7 +869,7 @@ int test_stripes(int *source, unsigned l 105@@ -866,7 +869,7 @@ int test_stripes(int *source, unsigned long long *offsets,
58 int disk; 106 int disk;
59 107
60 for (i = 0 ; i < raid_disks ; i++) { 108 for (i = 0 ; i < raid_disks ; i++) {
@@ -63,48 +111,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
63 (read(source[i], stripes[i], chunk_size) != 111 (read(source[i], stripes[i], chunk_size) !=
64 chunk_size)) { 112 chunk_size)) {
65 free(q); 113 free(q);
66--- a/raid6check.c 114diff --git a/swap_super.c b/swap_super.c
67+++ b/raid6check.c 115index b6db574..18c89e2 100644
68@@ -22,6 +22,9 @@
69 * Based on "restripe.c" from "mdadm" codebase
70 */
71
72+/* Enable largefile support */
73+#define _FILE_OFFSET_BITS 64
74+
75 #include "mdadm.h"
76 #include <stdint.h>
77 #include <signal.h>
78@@ -279,9 +282,9 @@ int manual_repair(int chunk_size, int sy
79 }
80
81 int write_res1, write_res2;
82- off64_t seek_res;
83+ off_t seek_res;
84
85- seek_res = lseek64(source[fd1],
86+ seek_res = lseek(source[fd1],
87 offsets[fd1] + start * chunk_size, SEEK_SET);
88 if (seek_res < 0) {
89 fprintf(stderr, "lseek failed for failed_disk1\n");
90@@ -289,7 +292,7 @@ int manual_repair(int chunk_size, int sy
91 }
92 write_res1 = write(source[fd1], blocks[failed_slot1], chunk_size);
93
94- seek_res = lseek64(source[fd2],
95+ seek_res = lseek(source[fd2],
96 offsets[fd2] + start * chunk_size, SEEK_SET);
97 if (seek_res < 0) {
98 fprintf(stderr, "lseek failed for failed_disk2\n");
99@@ -374,7 +377,7 @@ int check_stripes(struct mdinfo *info, i
100 goto exitCheck;
101 }
102 for (i = 0 ; i < raid_disks ; i++) {
103- off64_t seek_res = lseek64(source[i], offsets[i] + start * chunk_size,
104+ off_t seek_res = lseek(source[i], offsets[i] + start * chunk_size,
105 SEEK_SET);
106 if (seek_res < 0) {
107 fprintf(stderr, "lseek to source %d failed\n", i);
108--- a/swap_super.c 116--- a/swap_super.c
109+++ b/swap_super.c 117+++ b/swap_super.c
110@@ -1,3 +1,6 @@ 118@@ -1,3 +1,6 @@
diff --git a/meta/recipes-extended/mdadm/files/0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch b/meta/recipes-extended/mdadm/files/0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch
deleted file mode 100644
index 1c95834a7e..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 7539254342bc591717b0051734cc6c09c1b88640 Mon Sep 17 00:00:00 2001
2From: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
3Date: Wed, 22 Jun 2022 14:25:13 -0600
4Subject: [PATCH] tests/00raid0: add a test that validates raid0 with layout
5 fails for 0.9
6
7329dfc28debb disallows the creation of raid0 with layouts for 0.9
8metadata. This test confirms the new behavior.
9
10Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=7539254342bc591717b0051734cc6c09c1b88640]
11
12Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
13Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com>
14Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
15Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
16Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
17---
18 tests/00raid0 | 6 ++----
19 1 file changed, 2 insertions(+), 4 deletions(-)
20
21diff --git a/tests/00raid0 b/tests/00raid0
22index 8bc18985..e6b21cc4 100644
23--- a/tests/00raid0
24+++ b/tests/00raid0
25@@ -6,11 +6,9 @@ check raid0
26 testdev $md0 3 $mdsize2_l 512
27 mdadm -S $md0
28
29-# now with version-0.90 superblock
30+# verify raid0 with layouts fail for 0.90
31 mdadm -CR $md0 -e0.90 -l0 -n4 $dev0 $dev1 $dev2 $dev3
32-check raid0
33-testdev $md0 4 $mdsize0 512
34-mdadm -S $md0
35+check opposite_result
36
37 # now with no superblock
38 mdadm -B $md0 -l0 -n5 $dev0 $dev1 $dev2 $dev3 $dev4
39--
402.25.1
41
diff --git a/meta/recipes-extended/mdadm/files/0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch b/meta/recipes-extended/mdadm/files/0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch
deleted file mode 100644
index c621c082e8..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 39b381252c32275079344d30de18b76fda4bba26 Mon Sep 17 00:00:00 2001
2From: Logan Gunthorpe <logang@deltatee.com>
3Date: Wed, 27 Jul 2022 15:52:45 -0600
4Subject: [PATCH] tests/00readonly: Run udevadm settle before setting ro
5
6In some recent kernel versions, 00readonly fails with:
7
8 mdadm: failed to set readonly for /dev/md0: Device or resource busy
9 ERROR: array is not read-only!
10
11This was traced down to a race condition with udev holding a reference
12to the block device at the same time as trying to set it read only.
13
14To fix this, call udevadm settle before setting the array read only.
15
16Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=39b381252c32275079344d30de18b76fda4bba26]
17
18Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
19Signed-off-by: Jes Sorensen <jsorensen@fb.com>
20Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
21---
22 tests/00readonly | 1 +
23 1 file changed, 1 insertion(+)
24
25diff --git a/tests/00readonly b/tests/00readonly
26index 39202487..afe243b3 100644
27--- a/tests/00readonly
28+++ b/tests/00readonly
29@@ -12,6 +12,7 @@ do
30 $dev1 $dev2 $dev3 $dev4 --assume-clean
31 check nosync
32 check $level
33+ udevadm settle
34 mdadm -ro $md0
35 check readonly
36 state=$(cat /sys/block/md0/md/array_state)
37--
382.25.1
39
diff --git a/meta/recipes-extended/mdadm/files/0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch b/meta/recipes-extended/mdadm/files/0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch
deleted file mode 100644
index 1a7104b76d..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From a2c832465fc75202e244327b2081231dfa974617 Mon Sep 17 00:00:00 2001
2From: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
3Date: Wed, 22 Jun 2022 14:25:16 -0600
4Subject: [PATCH] tests/02lineargrow: clear the superblock at every iteration
5
6This fixes 02lineargrow test as prior metadata causes --add operation
7to misbehave.
8
9Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=a2c832465fc75202e244327b2081231dfa974617]
10
11Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
12Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com>
13Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
14Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
15Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
16---
17 tests/02lineargrow | 2 ++
18 1 file changed, 2 insertions(+)
19
20diff --git a/tests/02lineargrow b/tests/02lineargrow
21index e05c219d..595bf9f2 100644
22--- a/tests/02lineargrow
23+++ b/tests/02lineargrow
24@@ -20,4 +20,6 @@ do
25 testdev $md0 3 $sz 1
26
27 mdadm -S $md0
28+ mdadm --zero /dev/loop2
29+ mdadm --zero /dev/loop3
30 done
31--
322.25.1
33
diff --git a/meta/recipes-extended/mdadm/files/0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch b/meta/recipes-extended/mdadm/files/0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch
deleted file mode 100644
index 9098fb2540..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From de045db607b1ac4b70fc2a8878463e029c2ab1dc Mon Sep 17 00:00:00 2001
2From: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
3Date: Wed, 22 Jun 2022 14:25:15 -0600
4Subject: [PATCH] tests/04update-metadata: avoid passing chunk size to raid1
5
6'04update-metadata' test fails with error, "specifying chunk size is
7forbidden for this level" added by commit, 5b30a34aa4b5e. Hence,
8correcting the test to ignore passing chunk size to raid1.
9
10Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=de045db607b1ac4b70fc2a8878463e029c2ab1dc]
11
12Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
13Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com>
14[logang@deltatee.com: fix if/then style and dropped unrelated hunk]
15Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
16Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
17Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
18---
19 tests/04update-metadata | 6 +++++-
20 1 file changed, 5 insertions(+), 1 deletion(-)
21
22diff --git a/tests/04update-metadata b/tests/04update-metadata
23index 08c14af7..2b72a303 100644
24--- a/tests/04update-metadata
25+++ b/tests/04update-metadata
26@@ -11,7 +11,11 @@ dlist="$dev0 $dev1 $dev2 $dev3"
27 for ls in linear/4 raid1/1 raid5/3 raid6/2
28 do
29 s=${ls#*/} l=${ls%/*}
30- mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist
31+ if [[ $l == 'raid1' ]]; then
32+ mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 $dlist
33+ else
34+ mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist
35+ fi
36 testdev $md0 $s 19904 64
37 mdadm -S $md0
38 mdadm -A $md0 --update=metadata $dlist
39--
402.25.1
41
diff --git a/meta/recipes-extended/mdadm/files/0001-tests-add-.broken-files-for-04update-uuid-and-07reve.patch b/meta/recipes-extended/mdadm/files/0001-tests-add-.broken-files-for-04update-uuid-and-07reve.patch
deleted file mode 100644
index 5a6bf9e4bd..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-tests-add-.broken-files-for-04update-uuid-and-07reve.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From ee594b1a12833c06102de888248a361bc49cea09 Mon Sep 17 00:00:00 2001
2From: Ovidiu Panait <ovidiu.panait@windriver.com>
3Date: Fri, 18 Aug 2023 12:20:40 +0300
4Subject: [PATCH] tests: add .broken files for 04update-uuid and
5 07revert-inplace
6
704update-uuid and 07revert-inplace tests are unreliable and fail intermittently
8on the autobuilder. Unfortunately, the failures cannot be reproduced locally
9and the logs cannot be retrieved from the AB.
10
11Mark the testcases as BROKEN to skip them when running ptest.
12
13Upstream-Status: Inappropriate
14
15Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
16---
17 tests/04update-uuid.broken | 1 +
18 tests/07revert-inplace.broken | 1 +
19 2 files changed, 2 insertions(+)
20 create mode 100644 tests/04update-uuid.broken
21 create mode 100644 tests/07revert-inplace.broken
22
23diff --git a/tests/04update-uuid.broken b/tests/04update-uuid.broken
24new file mode 100644
25index 0000000..197b35b
26--- /dev/null
27+++ b/tests/04update-uuid.broken
28@@ -0,0 +1 @@
29+fails infrequently
30diff --git a/tests/07revert-inplace.broken b/tests/07revert-inplace.broken
31new file mode 100644
32index 0000000..197b35b
33--- /dev/null
34+++ b/tests/07revert-inplace.broken
35@@ -0,0 +1 @@
36+fails infrequently
37--
382.39.1
39
diff --git a/meta/recipes-extended/mdadm/files/0001-tests-fix-raid0-tests-for-0.90-metadata.patch b/meta/recipes-extended/mdadm/files/0001-tests-fix-raid0-tests-for-0.90-metadata.patch
deleted file mode 100644
index d2e7d8ee50..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-tests-fix-raid0-tests-for-0.90-metadata.patch
+++ /dev/null
@@ -1,102 +0,0 @@
1From 14c2161edb77d7294199e8aa7daa9f9d1d0ad5d7 Mon Sep 17 00:00:00 2001
2From: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
3Date: Wed, 22 Jun 2022 14:25:14 -0600
4Subject: [PATCH] tests: fix raid0 tests for 0.90 metadata
5
6Some of the test cases fail because raid0 creation fails with the error,
7"0.90 metadata does not support layouts for RAID0" added by commit,
8329dfc28debb. Fix some of the test cases by switching from raid0 to
9linear level for 0.9 metadata where possible.
10
11Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=14c2161edb77d7294199e8aa7daa9f9d1d0ad5d7]
12
13Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
14Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com>
15Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
16Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
17Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
18---
19 tests/00raid0 | 4 ++--
20 tests/00readonly | 4 ++++
21 tests/03r0assem | 6 +++---
22 tests/04r0update | 4 ++--
23 tests/04update-metadata | 2 +-
24 5 files changed, 12 insertions(+), 8 deletions(-)
25
26diff --git a/tests/00raid0 b/tests/00raid0
27index e6b21cc4..9b8896cb 100644
28--- a/tests/00raid0
29+++ b/tests/00raid0
30@@ -20,8 +20,8 @@ mdadm -S $md0
31 # now same again with different chunk size
32 for chunk in 4 32 256
33 do
34- mdadm -CR $md0 -e0.90 -l raid0 --chunk $chunk -n3 $dev0 $dev1 $dev2
35- check raid0
36+ mdadm -CR $md0 -e0.90 -l linear --chunk $chunk -n3 $dev0 $dev1 $dev2
37+ check linear
38 testdev $md0 3 $mdsize0 $chunk
39 mdadm -S $md0
40
41diff --git a/tests/00readonly b/tests/00readonly
42index 28b0fa13..39202487 100644
43--- a/tests/00readonly
44+++ b/tests/00readonly
45@@ -4,6 +4,10 @@ for metadata in 0.9 1.0 1.1 1.2
46 do
47 for level in linear raid0 raid1 raid4 raid5 raid6 raid10
48 do
49+ if [[ $metadata == "0.9" && $level == "raid0" ]];
50+ then
51+ continue
52+ fi
53 mdadm -CR $md0 -l $level -n 4 --metadata=$metadata \
54 $dev1 $dev2 $dev3 $dev4 --assume-clean
55 check nosync
56diff --git a/tests/03r0assem b/tests/03r0assem
57index 6744e322..44df0645 100644
58--- a/tests/03r0assem
59+++ b/tests/03r0assem
60@@ -68,9 +68,9 @@ mdadm -S $md2
61 ### Now for version 0...
62
63 mdadm --zero-superblock $dev0 $dev1 $dev2
64-mdadm -CR $md2 -l0 --metadata=0.90 -n3 $dev0 $dev1 $dev2
65-check raid0
66-tst="testdev $md2 3 $mdsize0 512"
67+mdadm -CR $md2 -llinear --metadata=0.90 -n3 $dev0 $dev1 $dev2
68+check linear
69+tst="testdev $md2 3 $mdsize0 1"
70 $tst
71
72 uuid=`mdadm -Db $md2 | sed 's/.*UUID=//'`
73diff --git a/tests/04r0update b/tests/04r0update
74index 73ee3b9f..b95efb06 100644
75--- a/tests/04r0update
76+++ b/tests/04r0update
77@@ -1,7 +1,7 @@
78
79 # create a raid0, re-assemble with a different super-minor
80-mdadm -CR -e 0.90 $md0 -l0 -n3 $dev0 $dev1 $dev2
81-testdev $md0 3 $mdsize0 512
82+mdadm -CR -e 0.90 $md0 -llinear -n3 $dev0 $dev1 $dev2
83+testdev $md0 3 $mdsize0 1
84 minor1=`mdadm -E $dev0 | sed -n -e 's/.*Preferred Minor : //p'`
85 mdadm -S /dev/md0
86
87diff --git a/tests/04update-metadata b/tests/04update-metadata
88index 232fc1ff..08c14af7 100644
89--- a/tests/04update-metadata
90+++ b/tests/04update-metadata
91@@ -8,7 +8,7 @@ set -xe
92
93 dlist="$dev0 $dev1 $dev2 $dev3"
94
95-for ls in raid0/4 linear/4 raid1/1 raid5/3 raid6/2
96+for ls in linear/4 raid1/1 raid5/3 raid6/2
97 do
98 s=${ls#*/} l=${ls%/*}
99 mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist
100--
1012.25.1
102
diff --git a/meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch b/meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch
new file mode 100644
index 0000000000..0916efafdf
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch
@@ -0,0 +1,24 @@
1From 8fa7d3cb96e8833743b635fb198675ad6c020b6e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 12 Mar 2024 10:51:51 +0100
4Subject: [PATCH] util.c: add limits.h include for NAME_MAX definition
5
6Upstream-Status: Submitted [mariusz.tkaczyk@linux.intel.com,linux-raid@vger.kernel.org]
7Signed-off-by: Alexander Kanavin <alex@linutronix.de>
8---
9 util.c | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/util.c b/util.c
13index b145447..a9cb6c4 100644
14--- a/util.c
15+++ b/util.c
16@@ -36,7 +36,7 @@
17 #include <ctype.h>
18 #include <dirent.h>
19 #include <dlfcn.h>
20-
21+#include <limits.h>
22
23 /*
24 * following taken from linux/blkpg.h because they aren't
diff --git a/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch b/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch
new file mode 100644
index 0000000000..145c65477a
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch
@@ -0,0 +1,27 @@
1From a22b2345b9773d362acd85dd4c4a6a3cda9100d4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 12 Mar 2024 10:54:08 +0100
4Subject: [PATCH] Create.c: include linux/falloc.h for FALLOC_FL_ZERO_RANGE
5 definition
6
7glibc provides this through fcntl.h but musl does not - should
8be reported and fixed there.
9
10Upstream-Status: Inappropriate [musl-specific issue]
11Signed-off-by: Alexander Kanavin <alex@linutronix.de>
12---
13 Create.c | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/Create.c b/Create.c
17index 8082f54..7071f0a 100644
18--- a/Create.c
19+++ b/Create.c
20@@ -31,6 +31,7 @@
21 #include <signal.h>
22 #include <sys/signalfd.h>
23 #include <sys/wait.h>
24+#include <linux/falloc.h>
25
26 static int round_size_and_verify(unsigned long long *size, int chunk)
27 {
diff --git a/meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch b/meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch
deleted file mode 100644
index fafe88b49c..0000000000
--- a/meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 14f110f0286d38e29ef5e51d7f72e049c2f18323 Mon Sep 17 00:00:00 2001
2From: Logan Gunthorpe <logang@deltatee.com>
3Date: Wed, 22 Jun 2022 14:25:08 -0600
4Subject: [PATCH 2/4] DDF: Fix NULL pointer dereference in
5 validate_geometry_ddf()
6
7A relatively recent patch added a call to validate_geometry() in
8Manage_add() that has level=LEVEL_CONTAINER and chunk=NULL.
9
10This causes some ddf tests to segfault which aborts the test suite.
11
12To fix this, avoid dereferencing chunk when the level is
13LEVEL_CONTAINER or LEVEL_NONE.
14
15Fixes: 1f5d54a06df0 ("Manage: Call validate_geometry when adding drive to external container")
16Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
17Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
18Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
19
20Upstream-Status: Backport
21
22Reference to upstream patch:
23https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=2b93288a5650
24
25Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
26---
27 super-ddf.c | 6 +++---
28 1 file changed, 3 insertions(+), 3 deletions(-)
29
30diff --git a/super-ddf.c b/super-ddf.c
31index 65cf727..3ef1293 100644
32--- a/super-ddf.c
33+++ b/super-ddf.c
34@@ -3369,9 +3369,6 @@ static int validate_geometry_ddf(struct supertype *st,
35 * If given BVDs, we make an SVD, changing all the GUIDs in the process.
36 */
37
38- if (*chunk == UnSet)
39- *chunk = DEFAULT_CHUNK;
40-
41 if (level == LEVEL_NONE)
42 level = LEVEL_CONTAINER;
43 if (level == LEVEL_CONTAINER) {
44@@ -3381,6 +3378,9 @@ static int validate_geometry_ddf(struct supertype *st,
45 freesize, verbose);
46 }
47
48+ if (*chunk == UnSet)
49+ *chunk = DEFAULT_CHUNK;
50+
51 if (!dev) {
52 mdu_array_info_t array = {
53 .level = level,
54--
552.39.1
56
diff --git a/meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch b/meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch
deleted file mode 100644
index a954ab027a..0000000000
--- a/meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch
+++ /dev/null
@@ -1,91 +0,0 @@
1From bd064da1469a6a07331b076a0294a8c6c3c38526 Mon Sep 17 00:00:00 2001
2From: Logan Gunthorpe <logang@deltatee.com>
3Date: Wed, 22 Jun 2022 14:25:09 -0600
4Subject: [PATCH 3/4] mdadm/Grow: Fix use after close bug by closing after fork
5
6The test 07reshape-grow fails most of the time. But it succeeds around
71 in 5 times. When it does succeed, it causes the tests to die because
8mdadm has segfaulted.
9
10The segfault was caused by mdadm attempting to repoen a file
11descriptor that was already closed. The backtrace of the segfault
12was:
13
14 #0 __strncmp_avx2 () at ../sysdeps/x86_64/multiarch/strcmp-avx2.S:101
15 #1 0x000056146e31d44b in devnm2devid (devnm=0x0) at util.c:956
16 #2 0x000056146e31dab4 in open_dev_flags (devnm=0x0, flags=0)
17 at util.c:1072
18 #3 0x000056146e31db22 in open_dev (devnm=0x0) at util.c:1079
19 #4 0x000056146e3202e8 in reopen_mddev (mdfd=4) at util.c:2244
20 #5 0x000056146e329f36 in start_array (mdfd=4,
21 mddev=0x7ffc55342450 "/dev/md0", content=0x7ffc55342860,
22 st=0x56146fc78660, ident=0x7ffc55342f70, best=0x56146fc6f5d0,
23 bestcnt=10, chosen_drive=0, devices=0x56146fc706b0, okcnt=5,
24 sparecnt=0, rebuilding_cnt=0, journalcnt=0, c=0x7ffc55342e90,
25 clean=1, avail=0x56146fc78720 "\001\001\001\001\001",
26 start_partial_ok=0, err_ok=0, was_forced=0)
27 at Assemble.c:1206
28 #6 0x000056146e32c36e in Assemble (st=0x56146fc78660,
29 mddev=0x7ffc55342450 "/dev/md0", ident=0x7ffc55342f70,
30 devlist=0x56146fc6e2d0, c=0x7ffc55342e90)
31 at Assemble.c:1914
32 #7 0x000056146e312ac9 in main (argc=11, argv=0x7ffc55343238)
33 at mdadm.c:1510
34
35The file descriptor was closed early in Grow_continue(). The noted commit
36moved the close() call to close the fd above the fork which caused the
37parent process to return with a closed fd.
38
39This meant reshape_array() and Grow_continue() would return in the parent
40with the fd forked. The fd would eventually be passed to reopen_mddev()
41which returned an unhandled NULL from fd2devnm() which would then be
42dereferenced in devnm2devid.
43
44Fix this by moving the close() call below the fork. This appears to
45fix the 07revert-grow test. While we're at it, switch to using
46close_fd() to invalidate the file descriptor.
47
48Fixes: 77b72fa82813 ("mdadm/Grow: prevent md's fd from being occupied during delayed time")
49Cc: Alex Wu <alexwu@synology.com>
50Cc: BingJing Chang <bingjingc@synology.com>
51Cc: Danny Shih <dannyshih@synology.com>
52Cc: ChangSyun Peng <allenpeng@synology.com>
53Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
54Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
55Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
56
57Upstream-Status: Backport
58
59Reference to upstream patch:
60https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=548e9b916f86
61
62Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
63---
64 Grow.c | 4 +++-
65 1 file changed, 3 insertions(+), 1 deletion(-)
66
67diff --git a/Grow.c b/Grow.c
68index 9c6fc95..a8e4e83 100644
69--- a/Grow.c
70+++ b/Grow.c
71@@ -3501,7 +3501,6 @@ started:
72 return 0;
73 }
74
75- close(fd);
76 /* Now we just need to kick off the reshape and watch, while
77 * handling backups of the data...
78 * This is all done by a forked background process.
79@@ -3522,6 +3521,9 @@ started:
80 break;
81 }
82
83+ /* Close unused file descriptor in the forked process */
84+ close_fd(&fd);
85+
86 /* If another array on the same devices is busy, the
87 * reshape will wait for them. This would mean that
88 * the first section that we suspend will stay suspended
89--
902.39.1
91
diff --git a/meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch b/meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch
deleted file mode 100644
index 72cb40f782..0000000000
--- a/meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 2296a4a441b4b8546e2eb32403930f1bb8f3ee4a Mon Sep 17 00:00:00 2001
2From: Logan Gunthorpe <logang@deltatee.com>
3Date: Wed, 22 Jun 2022 14:25:10 -0600
4Subject: [PATCH 4/4] monitor: Avoid segfault when calling NULL get_bad_blocks
5
6Not all struct superswitch implement a get_bad_blocks() function,
7yet mdmon seems to call it without checking for NULL and thus
8occasionally segfaults in the test 10ddf-geometry.
9
10Fix this by checking for NULL before calling it.
11
12Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
13Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
14Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
15
16Upstream-Status: Backport
17
18Reference to upstream patch:
19https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=9ae62977b51d
20
21Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
22---
23 monitor.c | 3 +++
24 1 file changed, 3 insertions(+)
25
26diff --git a/monitor.c b/monitor.c
27index afc3e50..8e43c0d 100644
28--- a/monitor.c
29+++ b/monitor.c
30@@ -312,6 +312,9 @@ static int check_for_cleared_bb(struct active_array *a, struct mdinfo *mdi)
31 struct md_bb *bb;
32 int i;
33
34+ if (!ss->get_bad_blocks)
35+ return -1;
36+
37 /*
38 * Get a list of bad blocks for an array, then read list of
39 * acknowledged bad blocks from kernel and compare it against metadata
40--
412.39.1
42
diff --git a/meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch b/meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch
deleted file mode 100644
index c55bfb125b..0000000000
--- a/meta/recipes-extended/mdadm/files/0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch
+++ /dev/null
@@ -1,128 +0,0 @@
1From feab1f72fcf032a4d21d0a69eb61b23a5ddb3352 Mon Sep 17 00:00:00 2001
2From: Logan Gunthorpe <logang@deltatee.com>
3Date: Wed, 22 Jun 2022 14:25:18 -0600
4Subject: [PATCH 5/6] mdadm/test: Mark and ignore broken test failures
5
6Add functionality to continue if a test marked as broken fails.
7
8To mark a test as broken, a file with the same name but with the suffix
9'.broken' should exist. The first line in the file will be printed with
10a KNOWN BROKEN message; the rest of the file can describe the how the
11test is broken.
12
13Also adds --skip-broken and --skip-always-broken to skip all the tests
14that have a .broken file or to skip all tests whose .broken file's first
15line contains the keyword always.
16
17Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
18Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
19
20Upstream-Status: Backport
21
22Reference to upstream patch:
23https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=28520bf114b3
24
25[OP: adjusted context for mdadm-4.2]
26Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
27---
28 test | 37 +++++++++++++++++++++++++++++++++++--
29 1 file changed, 35 insertions(+), 2 deletions(-)
30
31diff --git a/test b/test
32index 8f189d9..ee8fba1 100755
33--- a/test
34+++ b/test
35@@ -10,6 +10,8 @@ devlist=
36
37 savelogs=0
38 exitonerror=1
39+ctrl_c_error=0
40+skipbroken=0
41 prefix='[0-9][0-9]'
42
43 # use loop devices by default if doesn't specify --dev
44@@ -35,6 +37,7 @@ die() {
45
46 ctrl_c() {
47 exitonerror=1
48+ ctrl_c_error=1
49 }
50
51 # mdadm always adds --quiet, and we want to see any unexpected messages
52@@ -79,8 +82,21 @@ mdadm() {
53 do_test() {
54 _script=$1
55 _basename=`basename $_script`
56+ _broken=0
57+
58 if [ -f "$_script" ]
59 then
60+ if [ -f "${_script}.broken" ]; then
61+ _broken=1
62+ _broken_msg=$(head -n1 "${_script}.broken" | tr -d '\n')
63+ if [ "$skipbroken" == "all" ]; then
64+ return
65+ elif [ "$skipbroken" == "always" ] &&
66+ [[ "$_broken_msg" == *always* ]]; then
67+ return
68+ fi
69+ fi
70+
71 rm -f $targetdir/stderr
72 # this might have been reset: restore the default.
73 echo 2000 > /proc/sys/dev/raid/speed_limit_max
74@@ -97,10 +113,15 @@ do_test() {
75 else
76 save_log fail
77 _fail=1
78+ if [ "$_broken" == "1" ]; then
79+ echo " (KNOWN BROKEN TEST: $_broken_msg)"
80+ fi
81 fi
82 [ "$savelogs" == "1" ] &&
83 mv -f $targetdir/log $logdir/$_basename.log
84- [ "$_fail" == "1" -a "$exitonerror" == "1" ] && exit 1
85+ [ "$ctrl_c_error" == "1" ] && exit 1
86+ [ "$_fail" == "1" -a "$exitonerror" == "1" \
87+ -a "$_broken" == "0" ] && exit 1
88 fi
89 }
90
91@@ -117,6 +138,8 @@ do_help() {
92 --logdir=directory Directory to save all logfiles in
93 --save-logs Usually use with --logdir together
94 --keep-going | --no-error Don't stop on error, ie. run all tests
95+ --skip-broken Skip tests that are known to be broken
96+ --skip-always-broken Skip tests that are known to always fail
97 --dev=loop|lvm|ram|disk Use loop devices (default), LVM, RAM or disk
98 --disks= Provide a bunch of physical devices for test
99 --volgroup=name LVM volume group for LVM test
100@@ -211,6 +234,12 @@ parse_args() {
101 --keep-going | --no-error )
102 exitonerror=0
103 ;;
104+ --skip-broken )
105+ skipbroken=all
106+ ;;
107+ --skip-always-broken )
108+ skipbroken=always
109+ ;;
110 --disable-multipath )
111 unset MULTIPATH
112 ;;
113@@ -275,7 +304,11 @@ main() {
114 if [ $script == "$testdir/11spare-migration" ];then
115 continue
116 fi
117- do_test $script
118+ case $script in
119+ *.broken) ;;
120+ *)
121+ do_test $script
122+ esac
123 done
124 fi
125
126--
1272.39.1
128
diff --git a/meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch b/meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch
deleted file mode 100644
index 115b23bac5..0000000000
--- a/meta/recipes-extended/mdadm/files/0006-tests-Add-broken-files-for-all-broken-tests.patch
+++ /dev/null
@@ -1,454 +0,0 @@
1From fd1c26ba129b069d9f73afaefdbe53683de3814a Mon Sep 17 00:00:00 2001
2From: Logan Gunthorpe <logang@deltatee.com>
3Date: Wed, 22 Jun 2022 14:25:19 -0600
4Subject: [PATCH 6/6] tests: Add broken files for all broken tests
5
6Each broken file contains the rough frequency of brokeness as well
7as a brief explanation of what happens when it breaks. Estimates
8of failure rates are not statistically significant and can vary
9run to run.
10
11This is really just a view from my window. Tests were done on a
12small VM with the default loop devices, not real hardware. We've
13seen different kernel configurations can cause bugs to appear as well
14(ie. different block schedulers). It may also be that different race
15conditions will be seen on machines with different performance
16characteristics.
17
18These annotations were done with the kernel currently in md/md-next:
19
20 facef3b96c5b ("md: Notify sysfs sync_completed in md_reap_sync_thread()")
21
22Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
23Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
24
25Upstream-Status: Backport
26
27Reference to upstream patch:
28https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=daa86d663476
29
30Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
31---
32 tests/01r5integ.broken | 7 ++++
33 tests/01raid6integ.broken | 7 ++++
34 tests/04r5swap.broken | 7 ++++
35 tests/07autoassemble.broken | 8 ++++
36 tests/07autodetect.broken | 5 +++
37 tests/07changelevelintr.broken | 9 +++++
38 tests/07changelevels.broken | 9 +++++
39 tests/07reshape5intr.broken | 45 ++++++++++++++++++++++
40 tests/07revert-grow.broken | 31 +++++++++++++++
41 tests/07revert-shrink.broken | 9 +++++
42 tests/07testreshape5.broken | 12 ++++++
43 tests/09imsm-assemble.broken | 6 +++
44 tests/09imsm-create-fail-rebuild.broken | 5 +++
45 tests/09imsm-overlap.broken | 7 ++++
46 tests/10ddf-assemble-missing.broken | 6 +++
47 tests/10ddf-fail-create-race.broken | 7 ++++
48 tests/10ddf-fail-two-spares.broken | 5 +++
49 tests/10ddf-incremental-wrong-order.broken | 9 +++++
50 tests/14imsm-r1_2d-grow-r1_3d.broken | 5 +++
51 tests/14imsm-r1_2d-takeover-r0_2d.broken | 6 +++
52 tests/18imsm-r10_4d-takeover-r0_2d.broken | 5 +++
53 tests/18imsm-r1_2d-takeover-r0_1d.broken | 6 +++
54 tests/19raid6auto-repair.broken | 5 +++
55 tests/19raid6repair.broken | 5 +++
56 24 files changed, 226 insertions(+)
57 create mode 100644 tests/01r5integ.broken
58 create mode 100644 tests/01raid6integ.broken
59 create mode 100644 tests/04r5swap.broken
60 create mode 100644 tests/07autoassemble.broken
61 create mode 100644 tests/07autodetect.broken
62 create mode 100644 tests/07changelevelintr.broken
63 create mode 100644 tests/07changelevels.broken
64 create mode 100644 tests/07reshape5intr.broken
65 create mode 100644 tests/07revert-grow.broken
66 create mode 100644 tests/07revert-shrink.broken
67 create mode 100644 tests/07testreshape5.broken
68 create mode 100644 tests/09imsm-assemble.broken
69 create mode 100644 tests/09imsm-create-fail-rebuild.broken
70 create mode 100644 tests/09imsm-overlap.broken
71 create mode 100644 tests/10ddf-assemble-missing.broken
72 create mode 100644 tests/10ddf-fail-create-race.broken
73 create mode 100644 tests/10ddf-fail-two-spares.broken
74 create mode 100644 tests/10ddf-incremental-wrong-order.broken
75 create mode 100644 tests/14imsm-r1_2d-grow-r1_3d.broken
76 create mode 100644 tests/14imsm-r1_2d-takeover-r0_2d.broken
77 create mode 100644 tests/18imsm-r10_4d-takeover-r0_2d.broken
78 create mode 100644 tests/18imsm-r1_2d-takeover-r0_1d.broken
79 create mode 100644 tests/19raid6auto-repair.broken
80 create mode 100644 tests/19raid6repair.broken
81
82diff --git a/tests/01r5integ.broken b/tests/01r5integ.broken
83new file mode 100644
84index 0000000..2073763
85--- /dev/null
86+++ b/tests/01r5integ.broken
87@@ -0,0 +1,7 @@
88+fails rarely
89+
90+Fails about 1 in every 30 runs with a sha mismatch error:
91+
92+ c49ab26e1b01def7874af9b8a6d6d0c29fdfafe6 /dev/md0 does not match
93+ 15dc2f73262f811ada53c65e505ceec9cf025cb9 /dev/md0 with /dev/loop3
94+ missing
95diff --git a/tests/01raid6integ.broken b/tests/01raid6integ.broken
96new file mode 100644
97index 0000000..1df735f
98--- /dev/null
99+++ b/tests/01raid6integ.broken
100@@ -0,0 +1,7 @@
101+fails infrequently
102+
103+Fails about 1 in 5 with a sha mismatch:
104+
105+ 8286c2bc045ae2cfe9f8b7ae3a898fa25db6926f /dev/md0 does not match
106+ a083a0738b58caab37fd568b91b177035ded37df /dev/md0 with /dev/loop2 and
107+ /dev/loop3 missing
108diff --git a/tests/04r5swap.broken b/tests/04r5swap.broken
109new file mode 100644
110index 0000000..e38987d
111--- /dev/null
112+++ b/tests/04r5swap.broken
113@@ -0,0 +1,7 @@
114+always fails
115+
116+Fails with errors:
117+
118+ mdadm: /dev/loop0 has no superblock - assembly aborted
119+
120+ ERROR: no recovery happening
121diff --git a/tests/07autoassemble.broken b/tests/07autoassemble.broken
122new file mode 100644
123index 0000000..8be0940
124--- /dev/null
125+++ b/tests/07autoassemble.broken
126@@ -0,0 +1,8 @@
127+always fails
128+
129+Prints lots of messages, but the array doesn't assemble. Error
130+possibly related to:
131+
132+ mdadm: /dev/md/1 is busy - skipping
133+ mdadm: no recogniseable superblock on /dev/md/testing:0
134+ mdadm: /dev/md/2 is busy - skipping
135diff --git a/tests/07autodetect.broken b/tests/07autodetect.broken
136new file mode 100644
137index 0000000..294954a
138--- /dev/null
139+++ b/tests/07autodetect.broken
140@@ -0,0 +1,5 @@
141+always fails
142+
143+Fails with error:
144+
145+ ERROR: no resync happening
146diff --git a/tests/07changelevelintr.broken b/tests/07changelevelintr.broken
147new file mode 100644
148index 0000000..284b490
149--- /dev/null
150+++ b/tests/07changelevelintr.broken
151@@ -0,0 +1,9 @@
152+always fails
153+
154+Fails with errors:
155+
156+ mdadm: this change will reduce the size of the array.
157+ use --grow --array-size first to truncate array.
158+ e.g. mdadm --grow /dev/md0 --array-size 56832
159+
160+ ERROR: no reshape happening
161diff --git a/tests/07changelevels.broken b/tests/07changelevels.broken
162new file mode 100644
163index 0000000..9b930d9
164--- /dev/null
165+++ b/tests/07changelevels.broken
166@@ -0,0 +1,9 @@
167+always fails
168+
169+Fails with errors:
170+
171+ mdadm: /dev/loop0 is smaller than given size. 18976K < 19968K + metadata
172+ mdadm: /dev/loop1 is smaller than given size. 18976K < 19968K + metadata
173+ mdadm: /dev/loop2 is smaller than given size. 18976K < 19968K + metadata
174+
175+ ERROR: /dev/md0 isn't a block device.
176diff --git a/tests/07reshape5intr.broken b/tests/07reshape5intr.broken
177new file mode 100644
178index 0000000..efe52a6
179--- /dev/null
180+++ b/tests/07reshape5intr.broken
181@@ -0,0 +1,45 @@
182+always fails
183+
184+This patch, recently added to md-next causes the test to always fail:
185+
186+7e6ba434cc60 ("md: don't unregister sync_thread with reconfig_mutex
187+held")
188+
189+The new error is simply:
190+
191+ ERROR: no reshape happening
192+
193+Before the patch, the error seen is below.
194+
195+--
196+
197+fails infrequently
198+
199+Fails roughly 1 in 4 runs with errors:
200+
201+ mdadm: Merging with already-assembled /dev/md/0
202+ mdadm: cannot re-read metadata from /dev/loop6 - aborting
203+
204+ ERROR: no reshape happening
205+
206+Also have seen a random deadlock:
207+
208+ INFO: task mdadm:109702 blocked for more than 30 seconds.
209+ Not tainted 5.18.0-rc3-eid-vmlocalyes-dbg-00095-g3c2b5427979d #2040
210+ "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
211+ task:mdadm state:D stack: 0 pid:109702 ppid: 1 flags:0x00004000
212+ Call Trace:
213+ <TASK>
214+ __schedule+0x67e/0x13b0
215+ schedule+0x82/0x110
216+ mddev_suspend+0x2e1/0x330
217+ suspend_lo_store+0xbd/0x140
218+ md_attr_store+0xcb/0x130
219+ sysfs_kf_write+0x89/0xb0
220+ kernfs_fop_write_iter+0x202/0x2c0
221+ new_sync_write+0x222/0x330
222+ vfs_write+0x3bc/0x4d0
223+ ksys_write+0xd9/0x180
224+ __x64_sys_write+0x43/0x50
225+ do_syscall_64+0x3b/0x90
226+ entry_SYSCALL_64_after_hwframe+0x44/0xae
227diff --git a/tests/07revert-grow.broken b/tests/07revert-grow.broken
228new file mode 100644
229index 0000000..9b6db86
230--- /dev/null
231+++ b/tests/07revert-grow.broken
232@@ -0,0 +1,31 @@
233+always fails
234+
235+This patch, recently added to md-next causes the test to always fail:
236+
237+7e6ba434cc60 ("md: don't unregister sync_thread with reconfig_mutex held")
238+
239+The errors are:
240+
241+ mdadm: No active reshape to revert on /dev/loop0
242+ ERROR: active raid5 not found
243+
244+Before the patch, the error seen is below.
245+
246+--
247+
248+fails rarely
249+
250+Fails about 1 in every 30 runs with errors:
251+
252+ mdadm: Merging with already-assembled /dev/md/0
253+ mdadm: backup file /tmp/md-backup inaccessible: No such file or directory
254+ mdadm: failed to add /dev/loop1 to /dev/md/0: Invalid argument
255+ mdadm: failed to add /dev/loop2 to /dev/md/0: Invalid argument
256+ mdadm: failed to add /dev/loop3 to /dev/md/0: Invalid argument
257+ mdadm: failed to add /dev/loop0 to /dev/md/0: Invalid argument
258+ mdadm: /dev/md/0 assembled from 1 drive - need all 5 to start it
259+ (use --run to insist).
260+
261+ grep: /sys/block/md*/md/sync_action: No such file or directory
262+
263+ ERROR: active raid5 not found
264diff --git a/tests/07revert-shrink.broken b/tests/07revert-shrink.broken
265new file mode 100644
266index 0000000..c33c39e
267--- /dev/null
268+++ b/tests/07revert-shrink.broken
269@@ -0,0 +1,9 @@
270+always fails
271+
272+Fails with errors:
273+
274+ mdadm: this change will reduce the size of the array.
275+ use --grow --array-size first to truncate array.
276+ e.g. mdadm --grow /dev/md0 --array-size 53760
277+
278+ ERROR: active raid5 not found
279diff --git a/tests/07testreshape5.broken b/tests/07testreshape5.broken
280new file mode 100644
281index 0000000..a8ce03e
282--- /dev/null
283+++ b/tests/07testreshape5.broken
284@@ -0,0 +1,12 @@
285+always fails
286+
287+Test seems to run 'test_stripe' at $dir directory, but $dir is never
288+set. If $dir is adjusted to $PWD, the test still fails with:
289+
290+ mdadm: /dev/loop2 is not suitable for this array.
291+ mdadm: create aborted
292+ ++ return 1
293+ ++ cmp -s -n 8192 /dev/md0 /tmp/RandFile
294+ ++ echo cmp failed
295+ cmp failed
296+ ++ exit 2
297diff --git a/tests/09imsm-assemble.broken b/tests/09imsm-assemble.broken
298new file mode 100644
299index 0000000..a6d4d5c
300--- /dev/null
301+++ b/tests/09imsm-assemble.broken
302@@ -0,0 +1,6 @@
303+fails infrequently
304+
305+Fails roughly 1 in 10 runs with errors:
306+
307+ mdadm: /dev/loop2 is still in use, cannot remove.
308+ /dev/loop2 removal from /dev/md/container should have succeeded
309diff --git a/tests/09imsm-create-fail-rebuild.broken b/tests/09imsm-create-fail-rebuild.broken
310new file mode 100644
311index 0000000..40c4b29
312--- /dev/null
313+++ b/tests/09imsm-create-fail-rebuild.broken
314@@ -0,0 +1,5 @@
315+always fails
316+
317+Fails with error:
318+
319+ **Error**: Array size mismatch - expected 3072, actual 16384
320diff --git a/tests/09imsm-overlap.broken b/tests/09imsm-overlap.broken
321new file mode 100644
322index 0000000..e7ccab7
323--- /dev/null
324+++ b/tests/09imsm-overlap.broken
325@@ -0,0 +1,7 @@
326+always fails
327+
328+Fails with errors:
329+
330+ **Error**: Offset mismatch - expected 15360, actual 0
331+ **Error**: Offset mismatch - expected 15360, actual 0
332+ /dev/md/vol3 failed check
333diff --git a/tests/10ddf-assemble-missing.broken b/tests/10ddf-assemble-missing.broken
334new file mode 100644
335index 0000000..bfd8d10
336--- /dev/null
337+++ b/tests/10ddf-assemble-missing.broken
338@@ -0,0 +1,6 @@
339+always fails
340+
341+Fails with errors:
342+
343+ ERROR: /dev/md/vol0 has unexpected state on /dev/loop10
344+ ERROR: unexpected number of online disks on /dev/loop10
345diff --git a/tests/10ddf-fail-create-race.broken b/tests/10ddf-fail-create-race.broken
346new file mode 100644
347index 0000000..6c0df02
348--- /dev/null
349+++ b/tests/10ddf-fail-create-race.broken
350@@ -0,0 +1,7 @@
351+usually fails
352+
353+Fails about 9 out of 10 times with many errors:
354+
355+ mdadm: cannot open MISSING: No such file or directory
356+ ERROR: non-degraded array found
357+ ERROR: disk 0 not marked as failed in meta data
358diff --git a/tests/10ddf-fail-two-spares.broken b/tests/10ddf-fail-two-spares.broken
359new file mode 100644
360index 0000000..eeea56d
361--- /dev/null
362+++ b/tests/10ddf-fail-two-spares.broken
363@@ -0,0 +1,5 @@
364+fails infrequently
365+
366+Fails roughly 1 in 3 with error:
367+
368+ ERROR: /dev/md/vol1 should be optimal in meta data
369diff --git a/tests/10ddf-incremental-wrong-order.broken b/tests/10ddf-incremental-wrong-order.broken
370new file mode 100644
371index 0000000..a5af3ba
372--- /dev/null
373+++ b/tests/10ddf-incremental-wrong-order.broken
374@@ -0,0 +1,9 @@
375+always fails
376+
377+Fails with errors:
378+ ERROR: sha1sum of /dev/md/vol0 has changed
379+ ERROR: /dev/md/vol0 has unexpected state on /dev/loop10
380+ ERROR: unexpected number of online disks on /dev/loop10
381+ ERROR: /dev/md/vol0 has unexpected state on /dev/loop8
382+ ERROR: unexpected number of online disks on /dev/loop8
383+ ERROR: sha1sum of /dev/md/vol0 has changed
384diff --git a/tests/14imsm-r1_2d-grow-r1_3d.broken b/tests/14imsm-r1_2d-grow-r1_3d.broken
385new file mode 100644
386index 0000000..4ef1d40
387--- /dev/null
388+++ b/tests/14imsm-r1_2d-grow-r1_3d.broken
389@@ -0,0 +1,5 @@
390+always fails
391+
392+Fails with error:
393+
394+ mdadm/tests/func.sh: line 325: dvsize/chunk: division by 0 (error token is "chunk")
395diff --git a/tests/14imsm-r1_2d-takeover-r0_2d.broken b/tests/14imsm-r1_2d-takeover-r0_2d.broken
396new file mode 100644
397index 0000000..89cd4e5
398--- /dev/null
399+++ b/tests/14imsm-r1_2d-takeover-r0_2d.broken
400@@ -0,0 +1,6 @@
401+always fails
402+
403+Fails with error:
404+
405+ tests/func.sh: line 325: dvsize/chunk: division by 0 (error token
406+ is "chunk")
407diff --git a/tests/18imsm-r10_4d-takeover-r0_2d.broken b/tests/18imsm-r10_4d-takeover-r0_2d.broken
408new file mode 100644
409index 0000000..a27399f
410--- /dev/null
411+++ b/tests/18imsm-r10_4d-takeover-r0_2d.broken
412@@ -0,0 +1,5 @@
413+fails rarely
414+
415+Fails about 1 run in 100 with message:
416+
417+ ERROR: size is wrong for /dev/md/vol0: 2 * 5120 (chunk=128) = 20480, not 0
418diff --git a/tests/18imsm-r1_2d-takeover-r0_1d.broken b/tests/18imsm-r1_2d-takeover-r0_1d.broken
419new file mode 100644
420index 0000000..aa1982e
421--- /dev/null
422+++ b/tests/18imsm-r1_2d-takeover-r0_1d.broken
423@@ -0,0 +1,6 @@
424+always fails
425+
426+Fails with error:
427+
428+ tests/func.sh: line 325: dvsize/chunk: division by 0 (error token
429+ is "chunk")
430diff --git a/tests/19raid6auto-repair.broken b/tests/19raid6auto-repair.broken
431new file mode 100644
432index 0000000..e91a142
433--- /dev/null
434+++ b/tests/19raid6auto-repair.broken
435@@ -0,0 +1,5 @@
436+always fails
437+
438+Fails with:
439+
440+ "should detect errors"
441diff --git a/tests/19raid6repair.broken b/tests/19raid6repair.broken
442new file mode 100644
443index 0000000..e91a142
444--- /dev/null
445+++ b/tests/19raid6repair.broken
446@@ -0,0 +1,5 @@
447+always fails
448+
449+Fails with:
450+
451+ "should detect errors"
452--
4532.39.1
454
diff --git a/meta/recipes-extended/mdadm/files/debian-no-Werror.patch b/meta/recipes-extended/mdadm/files/debian-no-Werror.patch
index fa90647489..b758fcd0ab 100644
--- a/meta/recipes-extended/mdadm/files/debian-no-Werror.patch
+++ b/meta/recipes-extended/mdadm/files/debian-no-Werror.patch
@@ -1,4 +1,4 @@
1From adb75f0bdec97dbe4aa15cc988d349775f7995ff Mon Sep 17 00:00:00 2001 1From 319b3191f088cea7b0fb6038ab7625d5e049dcf7 Mon Sep 17 00:00:00 2001
2From: "martin f. krafft" <madduck@debian.org> 2From: "martin f. krafft" <madduck@debian.org>
3Date: Mon, 3 Jan 2022 19:14:12 +0000 3Date: Mon, 3 Jan 2022 19:14:12 +0000
4Subject: [PATCH] Remove -Werror from compiler flags 4Subject: [PATCH] Remove -Werror from compiler flags
@@ -10,21 +10,20 @@ use it to beautify the code, but remove it for out builds.
10Signed-off-by: martin f. krafft <madduck@debian.org> 10Signed-off-by: martin f. krafft <madduck@debian.org>
11 11
12Upstream-Status: Pending 12Upstream-Status: Pending
13
14--- 13---
15 Makefile | 2 +- 14 Makefile | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
17 16
18diff --git a/Makefile b/Makefile 17diff --git a/Makefile b/Makefile
19index 716c97c..40354ea 100644 18index 9ab6a65..1141971 100644
20--- a/Makefile 19--- a/Makefile
21+++ b/Makefile 20+++ b/Makefile
22@@ -50,7 +50,7 @@ ifeq ($(origin CC),default) 21@@ -50,7 +50,7 @@ ifeq ($(origin CC),default)
23 CC := $(CROSS_COMPILE)gcc 22 CC := $(CROSS_COMPILE)gcc
24 endif 23 endif
25 CXFLAGS ?= -ggdb 24 CXFLAGS ?= -ggdb
26-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter 25-CWFLAGS ?= -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds
27+CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter 26+CWFLAGS ?= -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter -Wformat -Wformat-security -Werror=format-security -fstack-protector-strong -fPIE -Warray-bounds
28 ifdef WARN_UNUSED 27 ifdef WARN_UNUSED
29 CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 28 CWFLAGS += -Wp -O3
30 endif 29 endif
diff --git a/meta/recipes-extended/mdadm/files/include_sysmacros.patch b/meta/recipes-extended/mdadm/files/include_sysmacros.patch
deleted file mode 100644
index 8a1d8342d8..0000000000
--- a/meta/recipes-extended/mdadm/files/include_sysmacros.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1include sys/sysmacros.h for major/minor macro definitions
2
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5--- a/mdadm.h
6+++ b/mdadm.h
7@@ -35,6 +35,7 @@ extern __off64_t lseek64 __P ((int __fd,
8
9 #include <sys/types.h>
10 #include <sys/stat.h>
11+#include <sys/sysmacros.h>
12 #include <stdint.h>
13 #include <stdlib.h>
14 #include <time.h>
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
index 7a2c888701..ecd1f037d0 100644
--- a/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
+++ b/meta/recipes-extended/mdadm/files/mdadm-3.3.2_x32_abi_time_t.patch
@@ -1,4 +1,4 @@
1From e37f7f6a0f1ef1b594574d11a8b90b8c861d047b Mon Sep 17 00:00:00 2001 1From ca91d9fc07943f209988411f2596e4b69828f208 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> 2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
3Date: Sun, 15 Mar 2015 09:02:14 +0000 3Date: Sun, 15 Mar 2015 09:02:14 +0000
4Subject: [PATCH] mdadm: Fix build in x32 ABI 4Subject: [PATCH] mdadm: Fix build in x32 ABI
@@ -12,16 +12,15 @@ data type in x32 ABI is long long int.
12Upstream-Status: Pending 12Upstream-Status: Pending
13 13
14Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> 14Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
15
16--- 15---
17 monitor.c | 5 ++++- 16 monitor.c | 5 ++++-
18 1 file changed, 4 insertions(+), 1 deletion(-) 17 1 file changed, 4 insertions(+), 1 deletion(-)
19 18
20diff --git a/monitor.c b/monitor.c 19diff --git a/monitor.c b/monitor.c
21index 81537ed..7c33382 100644 20index 4acec67..8dcdfd6 100644
22--- a/monitor.c 21--- a/monitor.c
23+++ b/monitor.c 22+++ b/monitor.c
24@@ -445,9 +445,12 @@ static int read_and_act(struct active_array *a, fd_set *fds) 23@@ -447,9 +447,12 @@ static int read_and_act(struct active_array *a, fd_set *fds)
25 if (FD_ISSET(mdi->bb_fd, fds)) 24 if (FD_ISSET(mdi->bb_fd, fds))
26 check_for_cleared_bb(a, mdi); 25 check_for_cleared_bb(a, mdi);
27 } 26 }
diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.3.bb
index 6f87249398..63c61b68c9 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.2.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.3.bb
@@ -17,31 +17,16 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
17 file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \ 17 file://0001-Use-CC-to-check-for-implicit-fallthrough-warning-sup.patch \
18 file://0001-fix-gcc-8-format-truncation-warning.patch \ 18 file://0001-fix-gcc-8-format-truncation-warning.patch \
19 file://debian-no-Werror.patch \ 19 file://debian-no-Werror.patch \
20 file://0001-Revert-tests-wait-for-complete-rebuild-in-integrity-.patch \
21 file://mdadm.init \ 20 file://mdadm.init \
22 file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \ 21 file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \
23 file://include_sysmacros.patch \
24 file://0001-mdadm-skip-test-11spare-migration.patch \
25 file://0001-Fix-parsing-of-r-in-monitor-manager-mode.patch \
26 file://0001-Makefile-install-mdcheck.patch \ 22 file://0001-Makefile-install-mdcheck.patch \
27 file://0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch \ 23 file://0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch \
28 file://0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch \ 24 file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \
29 file://0001-mdadm-Fix-optional-write-behind-parameter.patch \ 25 file://0001-util.c-add-limits.h-include-for-NAME_MAX-definition.patch \
30 file://0001-tests-02lineargrow-clear-the-superblock-at-every-ite.patch \ 26 file://0001-include-libgen.h-for-basename-API.patch \
31 file://0001-tests-00raid0-add-a-test-that-validates-raid0-with-l.patch \
32 file://0001-tests-fix-raid0-tests-for-0.90-metadata.patch \
33 file://0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch \
34 file://0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch \
35 file://0001-DDF-Cleanup-validate_geometry_ddf_container.patch \
36 file://0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch \
37 file://0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch \
38 file://0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch \
39 file://0005-mdadm-test-Mark-and-ignore-broken-test-failures.patch \
40 file://0006-tests-Add-broken-files-for-all-broken-tests.patch \
41 file://0001-tests-add-.broken-files-for-04update-uuid-and-07reve.patch \
42 " 27 "
43 28
44SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d" 29SRC_URI[sha256sum] = "416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f"
45 30
46inherit autotools-brokensep ptest systemd 31inherit autotools-brokensep ptest systemd
47 32
@@ -59,7 +44,7 @@ CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
59CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' 44CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
60 45
61EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ 46EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \
62 BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev"' 47 BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}"'
63 48
64DEBUG_OPTIMIZATION:append = " -Wno-error" 49DEBUG_OPTIMIZATION:append = " -Wno-error"
65 50
@@ -76,7 +61,7 @@ do_install:append() {
76 install -d ${D}/${sysconfdir}/ 61 install -d ${D}/${sysconfdir}/
77 install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf 62 install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
78 install -d ${D}/${sysconfdir}/init.d 63 install -d ${D}/${sysconfdir}/init.d
79 install -m 755 ${WORKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor 64 install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor
80} 65}
81 66
82do_install:append() { 67do_install:append() {
@@ -91,7 +76,6 @@ do_install_ptest() {
91 cp -R --no-dereference --preserve=mode,links -v ${S}/tests ${D}${PTEST_PATH}/tests 76 cp -R --no-dereference --preserve=mode,links -v ${S}/tests ${D}${PTEST_PATH}/tests
92 cp ${S}/test ${D}${PTEST_PATH} 77 cp ${S}/test ${D}${PTEST_PATH}
93 sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/mdadm-testing-dir!g' -i ${D}${PTEST_PATH}/test 78 sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/mdadm-testing-dir!g' -i ${D}${PTEST_PATH}/test
94 sed -e 's!/var/tmp!/mdadm-testing-dir!g' -i ${D}${PTEST_PATH}/tests/*
95 sed -i -e '/echo -ne "$_script... "/d' \ 79 sed -i -e '/echo -ne "$_script... "/d' \
96 -e 's/echo "succeeded"/echo -e "PASS: $_script"/g' \ 80 -e 's/echo "succeeded"/echo -e "PASS: $_script"/g' \
97 -e '/save_log fail/N; /_fail=1/i\\t\t\techo -ne "FAIL: $_script"' \ 81 -e '/save_log fail/N; /_fail=1/i\\t\t\techo -ne "FAIL: $_script"' \
diff --git a/meta/recipes-extended/msmtp/msmtp_1.8.25.bb b/meta/recipes-extended/msmtp/msmtp_1.8.26.bb
index b575fad5e1..13820fe930 100644
--- a/meta/recipes-extended/msmtp/msmtp_1.8.25.bb
+++ b/meta/recipes-extended/msmtp/msmtp_1.8.26.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
11UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" 11UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/"
12 12
13SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" 13SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz"
14SRC_URI[sha256sum] = "2dfe1dbbb397d26fe0b0b6b2e9cd2efdf9d72dd42d18e70d7f363ada2652d738" 14SRC_URI[sha256sum] = "6cfc488344cef189267e60aea481f00d4c7e2a59b53c6c659c520a4d121f66d8"
15 15
16inherit gettext autotools update-alternatives pkgconfig 16inherit gettext autotools update-alternatives pkgconfig
17 17
diff --git a/meta/recipes-extended/net-tools/net-tools_2.10.bb b/meta/recipes-extended/net-tools/net-tools_2.10.bb
index 33304297ec..7facc0cc8d 100644
--- a/meta/recipes-extended/net-tools/net-tools_2.10.bb
+++ b/meta/recipes-extended/net-tools/net-tools_2.10.bb
@@ -31,8 +31,8 @@ PACKAGECONFIG[plipconfig] = ""
31do_configure() { 31do_configure() {
32 # net-tools has its own config mechanism requiring "make config" 32 # net-tools has its own config mechanism requiring "make config"
33 # we pre-generate desired options and copy to source directory instead 33 # we pre-generate desired options and copy to source directory instead
34 cp ${WORKDIR}/net-tools-config.h ${S}/config.h 34 cp ${UNPACKDIR}/net-tools-config.h ${S}/config.h
35 cp ${WORKDIR}/net-tools-config.make ${S}/config.make 35 cp ${UNPACKDIR}/net-tools-config.make ${S}/config.make
36 36
37 if [ "${USE_NLS}" = "no" ]; then 37 if [ "${USE_NLS}" = "no" ]; then
38 sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make 38 sed -i -e 's/^I18N=1/# I18N=1/' ${S}/config.make
diff --git a/meta/recipes-extended/pam/libpam/0001-examples-Replace-use-of-termio.h-with-termios.h.patch b/meta/recipes-extended/pam/libpam/0001-examples-Replace-use-of-termio.h-with-termios.h.patch
deleted file mode 100644
index 95c437df4f..0000000000
--- a/meta/recipes-extended/pam/libpam/0001-examples-Replace-use-of-termio.h-with-termios.h.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 9b96fcfa5748934b8b6a4db4ee25a5e3165905c0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 1 Jul 2023 07:48:17 -0700
4Subject: [PATCH] examples: Replace use of termio.h with termios.h
5
6Fixes build with musl and makes it portable
7
8Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/5374f677e4cae669eb9accf2449178b602e8a40a]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 examples/tty_conv.c | 5 +++--
12 1 file changed, 3 insertions(+), 2 deletions(-)
13
14diff --git a/examples/tty_conv.c b/examples/tty_conv.c
15index 23f0684..db22500 100644
16--- a/examples/tty_conv.c
17+++ b/examples/tty_conv.c
18@@ -6,7 +6,8 @@
19 #include <string.h>
20 #include <errno.h>
21 #include <unistd.h>
22-#include <termio.h>
23+#include <termios.h>
24+#include <sys/ioctl.h>
25 #include <security/pam_appl.h>
26
27 /***************************************
28@@ -16,7 +17,7 @@
29 ***************************************/
30 static void echoOff(int fd, int off)
31 {
32- struct termio tty;
33+ struct termios tty;
34 if (ioctl(fd, TCGETA, &tty) < 0)
35 {
36 fprintf(stderr, "TCGETA failed: %s\n", strerror(errno));
37--
382.41.0
39
diff --git a/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch b/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch
deleted file mode 100644
index 124e5f1c3c..0000000000
--- a/meta/recipes-extended/pam/libpam/0001-pam_namespace-include-stdint-h.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13 Mon Sep 17 00:00:00 2001
2From: Jacob Heider <jacob@pkgx.dev>
3Date: Wed, 17 Jan 2024 11:49:26 -0500
4Subject: [PATCH] pam_namespace: include stdint.h
5
6pam_namespace.c makes use of SIZE_MAX but doesn't include stdint.h,
7resulting in the following build failures on 1.6.0:
8
9 pam_namespace.c: In function 'process_line':
10 pam_namespace.c:649:41: error: 'SIZE_MAX' undeclared (first use in this function)
11 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) {
12 | ^~~~~~~~
13 pam_namespace.c:41:1: note: 'SIZE_MAX' is defined in header '<stdint.h>'; did you forget to '#include <stdint.h>'?
14 40 | #include "argv_parse.h"
15 +++ |+#include <stdint.h>
16 41 |
17 pam_namespace.c:649:41: note: each undeclared identifier is reported only once for each function it appears in
18 649 | if (count > UINT_MAX || count > SIZE_MAX / sizeof(uid_t)) {
19 | ^~~~~~~~
20
21Fixes: v1.6.0~100 ("pam_namespace: validate amount of uids in config")
22Resolves: https://github.com/linux-pam/linux-pam/issues/733
23
24Upstream-Status: Backport [https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13]
25Signed-off-by: Khem Raj <raj.khem@gmail.com>
26---
27 modules/pam_namespace/pam_namespace.c | 2 ++
28 1 file changed, 2 insertions(+)
29
30diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c
31index f72d67189..b16731c22 100644
32--- a/modules/pam_namespace/pam_namespace.c
33+++ b/modules/pam_namespace/pam_namespace.c
34@@ -34,6 +34,8 @@
35
36 #define _ATFILE_SOURCE
37
38+#include "config.h"
39+#include <stdint.h>
40 #include "pam_cc_compat.h"
41 #include "pam_inline.h"
42 #include "pam_namespace.h"
diff --git a/meta/recipes-extended/pam/libpam/libpam-xtests.patch b/meta/recipes-extended/pam/libpam/libpam-xtests.patch
index ea145899b4..f2dafa72a5 100644
--- a/meta/recipes-extended/pam/libpam/libpam-xtests.patch
+++ b/meta/recipes-extended/pam/libpam/libpam-xtests.patch
@@ -1,13 +1,21 @@
1This patch is used to create a new sub package libpam-xtests to do more checks. 1From 060726f7e60c8ecb5bf50fd776910b290d9a0a69 Mon Sep 17 00:00:00 2001
2From: Kang Kai <kai.kang@windriver.com>
3Date: Tue, 19 Jul 2011 17:08:31 +0800
4Subject: [PATCH] This patch is used to create a new sub package libpam-xtests
5 to do more checks.
2 6
3Upstream-Status: Pending 7Upstream-Status: Pending
4 8
5Signed-off-by: Kang Kai <kai.kang@windriver.com> 9Signed-off-by: Kang Kai <kai.kang@windriver.com>
6Index: Linux-PAM-1.3.0/xtests/Makefile.am 10---
7=================================================================== 11 xtests/Makefile.am | 17 ++++++++++++++++-
8--- Linux-PAM-1.3.0.orig/xtests/Makefile.am 12 1 file changed, 16 insertions(+), 1 deletion(-)
9+++ Linux-PAM-1.3.0/xtests/Makefile.am 13
10@@ -7,7 +7,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_src 14diff --git a/xtests/Makefile.am b/xtests/Makefile.am
15index acf9746..9826c9f 100644
16--- a/xtests/Makefile.am
17+++ b/xtests/Makefile.am
18@@ -8,7 +8,7 @@ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \
11 LDADD = $(top_builddir)/libpam/libpam.la \ 19 LDADD = $(top_builddir)/libpam/libpam.la \
12 $(top_builddir)/libpam_misc/libpam_misc.la 20 $(top_builddir)/libpam_misc/libpam_misc.la
13 21
@@ -16,7 +24,7 @@ Index: Linux-PAM-1.3.0/xtests/Makefile.am
16 24
17 EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ 25 EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \
18 tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \ 26 tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \
19@@ -51,3 +51,18 @@ EXTRA_PROGRAMS = $(XTESTS) 27@@ -55,3 +55,18 @@ EXTRA_PROGRAMS = $(XTESTS)
20 28
21 xtests: $(XTESTS) run-xtests.sh 29 xtests: $(XTESTS) run-xtests.sh
22 "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS} 30 "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS}
diff --git a/meta/recipes-extended/pam/libpam_1.5.3.bb b/meta/recipes-extended/pam/libpam_1.6.1.bb
index 2a53bb4cc5..9f2106ea73 100644
--- a/meta/recipes-extended/pam/libpam_1.5.3.bb
+++ b/meta/recipes-extended/pam/libpam_1.6.1.bb
@@ -21,13 +21,11 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \
21 file://pam.d/common-session-noninteractive \ 21 file://pam.d/common-session-noninteractive \
22 file://pam.d/other \ 22 file://pam.d/other \
23 file://libpam-xtests.patch \ 23 file://libpam-xtests.patch \
24 file://0001-examples-Replace-use-of-termio.h-with-termios.h.patch \
25 file://run-ptest \ 24 file://run-ptest \
26 file://pam-volatiles.conf \ 25 file://pam-volatiles.conf \
27 file://0001-pam_namespace-include-stdint-h.patch \
28 " 26 "
29 27
30SRC_URI[sha256sum] = "7ac4b50feee004a9fa88f1dfd2d2fa738a82896763050cd773b3c54b0a818283" 28SRC_URI[sha256sum] = "f8923c740159052d719dbfc2a2f81942d68dd34fcaf61c706a02c9b80feeef8e"
31 29
32DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt" 30DEPENDS = "bison-native flex-native cracklib libxml2-native virtual/crypt"
33 31
@@ -140,16 +138,16 @@ do_install() {
140 rm -rf ${D}${sysconfdir}/init.d/ 138 rm -rf ${D}${sysconfdir}/init.d/
141 rm -rf ${D}${sysconfdir}/rc* 139 rm -rf ${D}${sysconfdir}/rc*
142 install -d ${D}${nonarch_libdir}/tmpfiles.d 140 install -d ${D}${nonarch_libdir}/tmpfiles.d
143 install -m 0644 ${WORKDIR}/pam-volatiles.conf \ 141 install -m 0644 ${UNPACKDIR}/pam-volatiles.conf \
144 ${D}${nonarch_libdir}/tmpfiles.d/pam.conf 142 ${D}${nonarch_libdir}/tmpfiles.d/pam.conf
145 else 143 else
146 install -d ${D}${sysconfdir}/default/volatiles 144 install -d ${D}${sysconfdir}/default/volatiles
147 install -m 0644 ${WORKDIR}/99_pam \ 145 install -m 0644 ${UNPACKDIR}/99_pam \
148 ${D}${sysconfdir}/default/volatiles/ 146 ${D}${sysconfdir}/default/volatiles/
149 fi 147 fi
150 148
151 install -d ${D}${sysconfdir}/pam.d/ 149 install -d ${D}${sysconfdir}/pam.d/
152 install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ 150 install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
153 151
154 # The lsb requires unix_chkpwd has setuid permission 152 # The lsb requires unix_chkpwd has setuid permission
155 chmod 4755 ${D}${sbindir}/unix_chkpwd 153 chmod 4755 ${D}${sbindir}/unix_chkpwd
diff --git a/meta/recipes-extended/procps/procps/pidfd.patch b/meta/recipes-extended/procps/procps/pidfd.patch
new file mode 100644
index 0000000000..23d1a3cd3e
--- /dev/null
+++ b/meta/recipes-extended/procps/procps/pidfd.patch
@@ -0,0 +1,42 @@
1From c8f625e085b8249cc009e8b19c3a19100217eb35 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Thu, 25 Apr 2024 13:33:15 +0000
4Subject: [PATCH] Fix pidfd_open detection
5
6This check for pidfd_open uses AC_CHECK_FUNC which just runs the specified code, but
7src/pgrep.c checks HAVE_PIDFD_OPEN which will only be defined by AC_CHECK_FUNCS.
8
9Also pidfd_open is defined in sys/pidfd.h so that needs including.
10
11Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/229]
12Signed-off-by: Ross Burton <ross.burton@arm.com>
13---
14
15diff --git a/configure.ac b/configure.ac
16index fec27e3f..024731c7 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -170,7 +170,7 @@ AC_TRY_COMPILE([#include <errno.h>],
20 AC_MSG_RESULT(yes),
21 AC_MSG_RESULT(no))
22
23-AC_CHECK_FUNC([pidfd_open], [enable_pidwait=yes], [
24+AC_CHECK_FUNCS([pidfd_open], [enable_pidwait=yes], [
25 AC_MSG_CHECKING([for __NR_pidfd_open])
26 AC_COMPILE_IFELSE([AC_LANG_SOURCE([
27 #include <sys/syscall.h>
28diff --git a/src/pgrep.c b/src/pgrep.c
29index d8e57dff..c5211aec 100644
30--- a/src/pgrep.c
31+++ b/src/pgrep.c
32@@ -44,7 +44,9 @@
33
34 #ifdef ENABLE_PIDWAIT
35 #include <sys/epoll.h>
36-#ifndef HAVE_PIDFD_OPEN
37+#ifdef HAVE_PIDFD_OPEN
38+#include <sys/pidfd.h>
39+#else
40 #include <sys/syscall.h>
41 #endif /* !HAVE_PIDFD_OPEN */
42 #endif
diff --git a/meta/recipes-extended/procps/procps_4.0.4.bb b/meta/recipes-extended/procps/procps_4.0.4.bb
index 800384f22f..b02f74bd6b 100644
--- a/meta/recipes-extended/procps/procps_4.0.4.bb
+++ b/meta/recipes-extended/procps/procps_4.0.4.bb
@@ -14,6 +14,7 @@ inherit autotools gettext pkgconfig update-alternatives
14 14
15SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ 15SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \
16 file://sysctl.conf \ 16 file://sysctl.conf \
17 file://pidfd.patch \
17 " 18 "
18SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b" 19SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b"
19 20
@@ -41,7 +42,7 @@ do_install:append () {
41 fi 42 fi
42 43
43 install -d ${D}${sysconfdir} 44 install -d ${D}${sysconfdir}
44 install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf 45 install -m 0644 ${UNPACKDIR}/sysctl.conf ${D}${sysconfdir}/sysctl.conf
45 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 46 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
46 install -d ${D}${sysconfdir}/sysctl.d 47 install -d ${D}${sysconfdir}/sysctl.d
47 ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf 48 ln -sf ../sysctl.conf ${D}${sysconfdir}/sysctl.d/99-sysctl.conf
diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
index ca13bdbd15..01335bdf40 100644
--- a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
+++ b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
@@ -1,4 +1,4 @@
1From 115fcf1daff18aa2f2e130d63704f04031878db0 Mon Sep 17 00:00:00 2001 1From 338d2d46d1c20ebadf317938af98d0532a62f8d4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 24 Mar 2016 15:46:14 +0000 3Date: Thu, 24 Mar 2016 15:46:14 +0000
4Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE 4Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE
@@ -13,7 +13,7 @@ Upstream-Status: Pending
13 1 file changed, 8 insertions(+), 5 deletions(-) 13 1 file changed, 8 insertions(+), 5 deletions(-)
14 14
15diff --git a/src/peekfd.c b/src/peekfd.c 15diff --git a/src/peekfd.c b/src/peekfd.c
16index 5aa990a..7e8e3fc 100644 16index 36dff04..2b4b1dc 100644
17--- a/src/peekfd.c 17--- a/src/peekfd.c
18+++ b/src/peekfd.c 18+++ b/src/peekfd.c
19@@ -30,8 +30,11 @@ 19@@ -30,8 +30,11 @@
@@ -28,7 +28,7 @@ index 5aa990a..7e8e3fc 100644
28 #include <getopt.h> 28 #include <getopt.h>
29 #include <ctype.h> 29 #include <ctype.h>
30 #include <dirent.h> 30 #include <dirent.h>
31@@ -266,11 +269,11 @@ int main(int argc, char **argv) 31@@ -341,11 +344,11 @@ int main(int argc, char **argv)
32 if (WIFSTOPPED(status)) { 32 if (WIFSTOPPED(status)) {
33 #ifdef PPC 33 #ifdef PPC
34 struct pt_regs regs; 34 struct pt_regs regs;
diff --git a/meta/recipes-extended/psmisc/psmisc_23.6.bb b/meta/recipes-extended/psmisc/psmisc_23.7.bb
index 2e55ad00bd..ea272cd92d 100644
--- a/meta/recipes-extended/psmisc/psmisc_23.6.bb
+++ b/meta/recipes-extended/psmisc/psmisc_23.7.bb
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
5SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \ 5SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \
6 file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ 6 file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
7 " 7 "
8SRCREV = "3098e641dc1ddb210186f53464255670b480377b" 8SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c"
9S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb
index dbd4d32e0a..e751eb631c 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.6.bb
@@ -46,9 +46,9 @@ do_install:append () {
46 install -d ${D}${sysconfdir}/init.d 46 install -d ${D}${sysconfdir}/init.d
47 sed -e 's,/etc/,${sysconfdir}/,g' \ 47 sed -e 's,/etc/,${sysconfdir}/,g' \
48 -e 's,/sbin/,${sbindir}/,g' \ 48 -e 's,/sbin/,${sbindir}/,g' \
49 ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind 49 ${UNPACKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind
50 chmod 0755 ${D}${sysconfdir}/init.d/rpcbind 50 chmod 0755 ${D}${sysconfdir}/init.d/rpcbind
51 install -m 0644 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf 51 install -m 0644 ${UNPACKDIR}/rpcbind.conf ${D}${sysconfdir}/rpcbind.conf
52} 52}
53 53
54ALTERNATIVE:${PN} = "rpcinfo" 54ALTERNATIVE:${PN} = "rpcinfo"
diff --git a/meta/recipes-extended/screen/screen_4.9.1.bb b/meta/recipes-extended/screen/screen_4.9.1.bb
index 7b040e6b57..57d1481049 100644
--- a/meta/recipes-extended/screen/screen_4.9.1.bb
+++ b/meta/recipes-extended/screen/screen_4.9.1.bb
@@ -36,7 +36,7 @@ EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-sys-screenrc=${sy
36do_install:append () { 36do_install:append () {
37 install -D -m 644 ${S}/etc/etcscreenrc ${D}/${sysconfdir}/screenrc 37 install -D -m 644 ${S}/etc/etcscreenrc ${D}/${sysconfdir}/screenrc
38 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then 38 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
39 install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen 39 install -D -m 644 ${UNPACKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen
40 fi 40 fi
41} 41}
42 42
diff --git a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch b/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch
deleted file mode 100644
index d278a4cda3..0000000000
--- a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From af4b8cb780587aa736692a3baa76b60474f19c5d Mon Sep 17 00:00:00 2001
2From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
3Date: Mon, 18 Mar 2024 12:14:21 +0100
4Subject: [PATCH] lib/copydir:copy_entry(): use temporary stat buffer
5
6There are no guarantees that fstatat() does not clobber the stat
7buffer on errors.
8
9Use a temporary buffer so that the following code sees correct
10attributes of the source entry.
11
12Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/974]
13
14Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
15---
16 lib/copydir.c | 3 ++-
17 1 file changed, 2 insertions(+), 1 deletion(-)
18
19Index: shadow-4.14.2/lib/copydir.c
20===================================================================
21--- shadow-4.14.2.orig/lib/copydir.c
22+++ shadow-4.14.2/lib/copydir.c
23@@ -415,6 +415,7 @@ static int copy_entry (const struct path
24 {
25 int err = 0;
26 struct stat sb;
27+ struct stat tmp_sb;
28 struct link_name *lp;
29 struct timespec mt[2];
30
31@@ -436,7 +437,7 @@ static int copy_entry (const struct path
32 * If the destination already exists do nothing.
33 * This is after the copy_dir above to still iterate into subdirectories.
34 */
35- if (fstatat(dst->dirfd, dst->name, &sb, AT_SYMLINK_NOFOLLOW) != -1) {
36+ if (fstatat(dst->dirfd, dst->name, &tmp_sb, AT_SYMLINK_NOFOLLOW) != -1) {
37 return 0;
38 }
39
diff --git a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
index 4a932d2dbb..cd99aad135 100644
--- a/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
+++ b/meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch
@@ -1,4 +1,4 @@
1From a773c6b240d27e23d6be41decef0edf24fcee523 Mon Sep 17 00:00:00 2001 1From f512071dd3a4c29d4bf048c5a89c4ba9160e37b1 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Thu, 17 Jul 2014 15:53:34 +0800 3Date: Thu, 17 Jul 2014 15:53:34 +0800
4Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env 4Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env
@@ -20,10 +20,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
20 1 file changed, 12 insertions(+), 4 deletions(-) 20 1 file changed, 12 insertions(+), 4 deletions(-)
21 21
22diff --git a/lib/commonio.c b/lib/commonio.c 22diff --git a/lib/commonio.c b/lib/commonio.c
23index 73fdb3a..d1231e9 100644 23index 01a26c9..82b2868 100644
24--- a/lib/commonio.c 24--- a/lib/commonio.c
25+++ b/lib/commonio.c 25+++ b/lib/commonio.c
26@@ -606,10 +606,18 @@ int commonio_open (struct commonio_db *db, int mode) 26@@ -601,10 +601,18 @@ int commonio_open (struct commonio_db *db, int mode)
27 db->cursor = NULL; 27 db->cursor = NULL;
28 db->changed = false; 28 db->changed = false;
29 29
@@ -46,6 +46,3 @@ index 73fdb3a..d1231e9 100644
46 db->fp = NULL; 46 db->fp = NULL;
47 if (fd >= 0) { 47 if (fd >= 0) {
48 #ifdef WITH_TCB 48 #ifdef WITH_TCB
49--
502.30.2
51
diff --git a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
index 3b61b75e5b..1eacb8a53f 100644
--- a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
+++ b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
@@ -1,3 +1,8 @@
1From 38882ab288fd4d2cc2e45dff222ae3412c8fe357 Mon Sep 17 00:00:00 2001
2From: Kang Kai <kai.kang@windriver.com>
3Date: Wed, 20 Jul 2011 19:18:14 +0800
4Subject: [PATCH] shadow: update pam related configure files
5
1The system-auth in the configure files is from Fedora which put all the 4 pam type rules 6The system-auth in the configure files is from Fedora which put all the 4 pam type rules
2in one file. 7in one file.
3In yocto it obey the way with Debian/Ubuntu, and the names are common-auth, common-account, 8In yocto it obey the way with Debian/Ubuntu, and the names are common-auth, common-account,
@@ -9,82 +14,102 @@ See meta/recipes-extended/pam/libpam/pam.d/common-password
9Upstream-Status: Inappropriate [oe-core specific] 14Upstream-Status: Inappropriate [oe-core specific]
10 15
11Signed-off-by: Kang Kai <kai.kang@windriver.com> 16Signed-off-by: Kang Kai <kai.kang@windriver.com>
17---
18 etc/pam.d/chage | 2 +-
19 etc/pam.d/chgpasswd | 2 +-
20 etc/pam.d/groupadd | 2 +-
21 etc/pam.d/groupdel | 2 +-
22 etc/pam.d/groupmems | 2 +-
23 etc/pam.d/groupmod | 2 +-
24 etc/pam.d/useradd | 2 +-
25 etc/pam.d/userdel | 2 +-
26 etc/pam.d/usermod | 2 +-
27 9 files changed, 9 insertions(+), 9 deletions(-)
12 28
13diff -Nur shadow-4.1.4.3/etc/pam.d.orig/chage shadow-4.1.4.3/etc/pam.d/chage 29diff --git a/etc/pam.d/chage b/etc/pam.d/chage
14--- shadow-4.1.4.3/etc/pam.d.orig/chage 2011-07-20 19:02:27.384844958 +0800 30index 8f49f5c..b1f365d 100644
15+++ shadow-4.1.4.3/etc/pam.d/chage 2011-07-20 19:03:08.964844958 +0800 31--- a/etc/pam.d/chage
32+++ b/etc/pam.d/chage
16@@ -1,4 +1,4 @@ 33@@ -1,4 +1,4 @@
17 #%PAM-1.0 34 #%PAM-1.0
18 auth sufficient pam_rootok.so 35 auth sufficient pam_rootok.so
19 account required pam_permit.so 36 account required pam_permit.so
20-password include system-auth 37-password include system-auth
21+password include common-password 38+password include common-password
22diff -Nur shadow-4.1.4.3/etc/pam.d.orig/chgpasswd shadow-4.1.4.3/etc/pam.d/chgpasswd 39diff --git a/etc/pam.d/chgpasswd b/etc/pam.d/chgpasswd
23--- shadow-4.1.4.3/etc/pam.d.orig/chgpasswd 2011-07-20 19:02:27.384844958 +0800 40index 8f49f5c..b1f365d 100644
24+++ shadow-4.1.4.3/etc/pam.d/chgpasswd 2011-07-20 19:03:26.544844958 +0800 41--- a/etc/pam.d/chgpasswd
42+++ b/etc/pam.d/chgpasswd
25@@ -1,4 +1,4 @@ 43@@ -1,4 +1,4 @@
26 #%PAM-1.0 44 #%PAM-1.0
27 auth sufficient pam_rootok.so 45 auth sufficient pam_rootok.so
28 account required pam_permit.so 46 account required pam_permit.so
29-password include system-auth 47-password include system-auth
30+password include common-password 48+password include common-password
31diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupadd shadow-4.1.4.3/etc/pam.d/groupadd 49diff --git a/etc/pam.d/groupadd b/etc/pam.d/groupadd
32--- shadow-4.1.4.3/etc/pam.d.orig/groupadd 2011-07-20 19:02:27.384844958 +0800 50index 8f49f5c..b1f365d 100644
33+++ shadow-4.1.4.3/etc/pam.d/groupadd 2011-07-20 19:04:08.124844958 +0800 51--- a/etc/pam.d/groupadd
52+++ b/etc/pam.d/groupadd
34@@ -1,4 +1,4 @@ 53@@ -1,4 +1,4 @@
35 #%PAM-1.0 54 #%PAM-1.0
36 auth sufficient pam_rootok.so 55 auth sufficient pam_rootok.so
37 account required pam_permit.so 56 account required pam_permit.so
38-password include system-auth 57-password include system-auth
39+password include common-password 58+password include common-password
40diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupdel shadow-4.1.4.3/etc/pam.d/groupdel 59diff --git a/etc/pam.d/groupdel b/etc/pam.d/groupdel
41--- shadow-4.1.4.3/etc/pam.d.orig/groupdel 2011-07-20 19:02:27.384844958 +0800 60index 8f49f5c..b1f365d 100644
42+++ shadow-4.1.4.3/etc/pam.d/groupdel 2011-07-20 19:04:26.114844958 +0800 61--- a/etc/pam.d/groupdel
62+++ b/etc/pam.d/groupdel
43@@ -1,4 +1,4 @@ 63@@ -1,4 +1,4 @@
44 #%PAM-1.0 64 #%PAM-1.0
45 auth sufficient pam_rootok.so 65 auth sufficient pam_rootok.so
46 account required pam_permit.so 66 account required pam_permit.so
47-password include system-auth 67-password include system-auth
48+password include common-password 68+password include common-password
49diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupmems shadow-4.1.4.3/etc/pam.d/groupmems 69diff --git a/etc/pam.d/groupmems b/etc/pam.d/groupmems
50--- shadow-4.1.4.3/etc/pam.d.orig/groupmems 2011-07-20 19:02:27.384844958 +0800 70index 8f49f5c..b1f365d 100644
51+++ shadow-4.1.4.3/etc/pam.d/groupmems 2011-07-20 19:04:35.074844958 +0800 71--- a/etc/pam.d/groupmems
72+++ b/etc/pam.d/groupmems
52@@ -1,4 +1,4 @@ 73@@ -1,4 +1,4 @@
53 #%PAM-1.0 74 #%PAM-1.0
54 auth sufficient pam_rootok.so 75 auth sufficient pam_rootok.so
55 account required pam_permit.so 76 account required pam_permit.so
56-password include system-auth 77-password include system-auth
57+password include common-password 78+password include common-password
58diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupmod shadow-4.1.4.3/etc/pam.d/groupmod 79diff --git a/etc/pam.d/groupmod b/etc/pam.d/groupmod
59--- shadow-4.1.4.3/etc/pam.d.orig/groupmod 2011-07-20 19:02:27.384844958 +0800 80index 8f49f5c..b1f365d 100644
60+++ shadow-4.1.4.3/etc/pam.d/groupmod 2011-07-20 19:04:44.864844958 +0800 81--- a/etc/pam.d/groupmod
82+++ b/etc/pam.d/groupmod
61@@ -1,4 +1,4 @@ 83@@ -1,4 +1,4 @@
62 #%PAM-1.0 84 #%PAM-1.0
63 auth sufficient pam_rootok.so 85 auth sufficient pam_rootok.so
64 account required pam_permit.so 86 account required pam_permit.so
65-password include system-auth 87-password include system-auth
66+password include common-password 88+password include common-password
67diff -Nur shadow-4.1.4.3/etc/pam.d.orig/useradd shadow-4.1.4.3/etc/pam.d/useradd 89diff --git a/etc/pam.d/useradd b/etc/pam.d/useradd
68--- shadow-4.1.4.3/etc/pam.d.orig/useradd 2011-07-20 19:02:27.384844958 +0800 90index 8f49f5c..b1f365d 100644
69+++ shadow-4.1.4.3/etc/pam.d/useradd 2011-07-20 19:07:26.244844958 +0800 91--- a/etc/pam.d/useradd
92+++ b/etc/pam.d/useradd
70@@ -1,4 +1,4 @@ 93@@ -1,4 +1,4 @@
71 #%PAM-1.0 94 #%PAM-1.0
72 auth sufficient pam_rootok.so 95 auth sufficient pam_rootok.so
73 account required pam_permit.so 96 account required pam_permit.so
74-password include system-auth 97-password include system-auth
75+password include common-password 98+password include common-password
76diff -Nur shadow-4.1.4.3/etc/pam.d.orig/userdel shadow-4.1.4.3/etc/pam.d/userdel 99diff --git a/etc/pam.d/userdel b/etc/pam.d/userdel
77--- shadow-4.1.4.3/etc/pam.d.orig/userdel 2011-07-20 19:02:27.384844958 +0800 100index 8f49f5c..b1f365d 100644
78+++ shadow-4.1.4.3/etc/pam.d/userdel 2011-07-20 19:07:35.734844958 +0800 101--- a/etc/pam.d/userdel
102+++ b/etc/pam.d/userdel
79@@ -1,4 +1,4 @@ 103@@ -1,4 +1,4 @@
80 #%PAM-1.0 104 #%PAM-1.0
81 auth sufficient pam_rootok.so 105 auth sufficient pam_rootok.so
82 account required pam_permit.so 106 account required pam_permit.so
83-password include system-auth 107-password include system-auth
84+password include common-password 108+password include common-password
85diff -Nur shadow-4.1.4.3/etc/pam.d.orig/usermod shadow-4.1.4.3/etc/pam.d/usermod 109diff --git a/etc/pam.d/usermod b/etc/pam.d/usermod
86--- shadow-4.1.4.3/etc/pam.d.orig/usermod 2011-07-20 19:02:27.384844958 +0800 110index 8f49f5c..b1f365d 100644
87+++ shadow-4.1.4.3/etc/pam.d/usermod 2011-07-20 19:07:42.024844958 +0800 111--- a/etc/pam.d/usermod
112+++ b/etc/pam.d/usermod
88@@ -1,4 +1,4 @@ 113@@ -1,4 +1,4 @@
89 #%PAM-1.0 114 #%PAM-1.0
90 auth sufficient pam_rootok.so 115 auth sufficient pam_rootok.so
diff --git a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb
index fe51ea1874..913c159c81 100644
--- a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb
+++ b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb
@@ -8,7 +8,8 @@ INHIBIT_DEFAULT_DEPS = "1"
8 8
9SRC_URI = "file://securetty" 9SRC_URI = "file://securetty"
10 10
11S = "${WORKDIR}" 11S = "${WORKDIR}/sources"
12UNPACKDIR = "${S}"
12 13
13# Since SERIAL_CONSOLES is likely to be set from the machine configuration 14# Since SERIAL_CONSOLES is likely to be set from the machine configuration
14PACKAGE_ARCH = "${MACHINE_ARCH}" 15PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -17,7 +18,7 @@ do_install () {
17 # Ensure we add a suitable securetty file to the package that has 18 # Ensure we add a suitable securetty file to the package that has
18 # most common embedded TTYs defined. 19 # most common embedded TTYs defined.
19 install -d ${D}${sysconfdir} 20 install -d ${D}${sysconfdir}
20 install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty 21 install -m 0400 ${S}/securetty ${D}${sysconfdir}/securetty
21 if [ ! -z "${SERIAL_CONSOLES}" ]; then 22 if [ ! -z "${SERIAL_CONSOLES}" ]; then
22 # Our SERIAL_CONSOLES contains a baud rate and sometimes extra 23 # Our SERIAL_CONSOLES contains a baud rate and sometimes extra
23 # options as well. The following pearl :) takes that and converts 24 # options as well. The following pearl :) takes that and converts
diff --git a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
index 00ab58b38c..13cfab6aab 100644
--- a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
+++ b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
@@ -13,7 +13,8 @@ DEPENDS = "base-passwd"
13# can add custom users/groups for recipes that use inherit useradd. 13# can add custom users/groups for recipes that use inherit useradd.
14SRC_URI = "file://login.defs_shadow-sysroot" 14SRC_URI = "file://login.defs_shadow-sysroot"
15 15
16S = "${WORKDIR}" 16S = "${WORKDIR}/sources"
17UNPACKDIR = "${S}"
17 18
18do_install() { 19do_install() {
19 install -d ${D}${sysconfdir} 20 install -d ${D}${sysconfdir}
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index 40e6ab0b30..3991006b43 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -12,7 +12,6 @@ DEPENDS = "virtual/crypt"
12 12
13GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" 13GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases"
14SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ 14SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \
15 file://0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch \
16 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ 15 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \
17 file://useradd \ 16 file://useradd \
18 " 17 "
@@ -25,7 +24,7 @@ SRC_URI:append:class-target = " \
25SRC_URI:append:class-native = " \ 24SRC_URI:append:class-native = " \
26 file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ 25 file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \
27 " 26 "
28SRC_URI[sha256sum] = "a305edf5d19bddbdf5e836d2d609fa8bff2d35458819de4d9f06306a1cf24342" 27SRC_URI[sha256sum] = "b34686b89b279887ffbf1f33128902ccc0fa1a998a3add44213bb12d7385b218"
29 28
30# Additional Policy files for PAM 29# Additional Policy files for PAM
31PAM_SRC_URI = "file://pam.d/chfn \ 30PAM_SRC_URI = "file://pam.d/chfn \
@@ -40,7 +39,7 @@ inherit autotools gettext github-releases pkgconfig
40 39
41export CONFIG_SHELL="/bin/sh" 40export CONFIG_SHELL="/bin/sh"
42 41
43EXTRA_OECONF += "--without-libcrack \ 42EXTRA_OECONF += " \
44 --with-group-name-max-length=24 \ 43 --with-group-name-max-length=24 \
45 --enable-subordinate-ids=yes \ 44 --enable-subordinate-ids=yes \
46 --without-sssd \ 45 --without-sssd \
@@ -111,7 +110,7 @@ do_install() {
111 sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs 110 sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs
112 111
113 install -d ${D}${sysconfdir}/default 112 install -d ${D}${sysconfdir}/default
114 install -m 0644 ${WORKDIR}/useradd ${D}${sysconfdir}/default 113 install -m 0644 ${UNPACKDIR}/useradd ${D}${sysconfdir}/default
115} 114}
116 115
117do_install:append() { 116do_install:append() {
@@ -121,11 +120,11 @@ do_install:append() {
121 install -m 0775 -d ${D}${localstatedir}/spool/mail 120 install -m 0775 -d ${D}${localstatedir}/spool/mail
122 chown root:mail ${D}${localstatedir}/spool/mail 121 chown root:mail ${D}${localstatedir}/spool/mail
123 122
124 if [ -e ${WORKDIR}/pam.d ]; then 123 if [ -e ${UNPACKDIR}/pam.d ]; then
125 install -d ${D}${sysconfdir}/pam.d/ 124 install -d ${D}${sysconfdir}/pam.d/
126 install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ 125 install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
127 # Remove defaults that are not used when supporting PAM. 126 # Remove defaults that are not used when supporting PAM.
128 sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs 127 sed -i -f ${UNPACKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs
129 fi 128 fi
130 129
131 install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} 130 install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir}
@@ -168,6 +167,14 @@ do_install:append:class-native() {
168SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/" 167SYSROOT_DIRS:append:class-native = " ${STAGING_DIR_NATIVE}/lib-shadow-deps/"
169INSANE_SKIP:${PN}:class-native = "already-stripped" 168INSANE_SKIP:${PN}:class-native = "already-stripped"
170 169
170do_install:append:class-nativesdk() {
171 oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man
172}
173
174do_install:append:class-target() {
175 oe_runmake -C ${B}/man DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install-man
176}
177
171PACKAGES =+ "${PN}-base" 178PACKAGES =+ "${PN}-base"
172FILES:${PN}-base = "\ 179FILES:${PN}-base = "\
173 ${base_bindir}/login.shadow \ 180 ${base_bindir}/login.shadow \
@@ -193,6 +200,10 @@ ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw"
193ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" 200ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr"
194ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" 201ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin"
195 202
203ALTERNATIVE:${PN}-doc = "chfn.1 chsh.1"
204ALTERNATIVE_LINK_NAME[chfn.1] = "${mandir}/man1/chfn.1"
205ALTERNATIVE_LINK_NAME[chsh.1] = "${mandir}/man1/chsh.1"
206
196ALTERNATIVE:${PN}-base = "newgrp groups login su" 207ALTERNATIVE:${PN}-base = "newgrp groups login su"
197ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" 208ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login"
198ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" 209ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su"
diff --git a/meta/recipes-extended/shadow/shadow_4.14.2.bb b/meta/recipes-extended/shadow/shadow_4.15.1.bb
index e57676c1da..e57676c1da 100644
--- a/meta/recipes-extended/shadow/shadow_4.14.2.bb
+++ b/meta/recipes-extended/shadow/shadow_4.15.1.bb
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.17.05.bb b/meta/recipes-extended/stress-ng/stress-ng_0.17.08.bb
index d4a427f89d..fffe6a1823 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.17.05.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.17.08.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7 7
8SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ 8SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \
9 " 9 "
10SRCREV = "4e68895f4fe68863b360ab4a6a57e2dfcff85d60" 10SRCREV = "b7c7a5877501679a3b0a67d877e6274a801d1e4e"
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
13DEPENDS = "coreutils-native libbsd" 13DEPENDS = "coreutils-native libbsd"
diff --git a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb b/meta/recipes-extended/sudo/sudo_1.9.15p5.bb
index 8e542015ad..2fd2ae6d05 100644
--- a/meta/recipes-extended/sudo/sudo_1.9.15p5.bb
+++ b/meta/recipes-extended/sudo/sudo_1.9.15p5.bb
@@ -30,7 +30,7 @@ EXTRA_OECONF += " \
30 30
31do_install:append () { 31do_install:append () {
32 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then 32 if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
33 install -D -m 644 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo 33 install -D -m 644 ${UNPACKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo
34 if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then 34 if ${@bb.utils.contains('PACKAGECONFIG', 'pam-wheel', 'true', 'false', d)} ; then
35 echo 'auth required pam_wheel.so use_uid' >>${D}${sysconfdir}/pam.d/sudo 35 echo 'auth required pam_wheel.so use_uid' >>${D}${sysconfdir}/pam.d/sudo
36 sed -i 's/# \(%wheel ALL=(ALL) ALL\)/\1/' ${D}${sysconfdir}/sudoers 36 sed -i 's/# \(%wheel ALL=(ALL) ALL\)/\1/' ${D}${sysconfdir}/sudoers
diff --git a/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb b/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb
index c9c9055142..e488603086 100644
--- a/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb
+++ b/meta/recipes-extended/sysklogd/sysklogd_2.5.2.bb
@@ -24,7 +24,7 @@ do_install:append () {
24 install -d ${D}${sysconfdir} 24 install -d ${D}${sysconfdir}
25 install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf 25 install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf
26 install -d ${D}${sysconfdir}/init.d 26 install -d ${D}${sysconfdir}/init.d
27 install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog 27 install -m 755 ${UNPACKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog
28} 28}
29 29
30SYSTEMD_PACKAGES = "${PN}" 30SYSTEMD_PACKAGES = "${PN}"
diff --git a/meta/recipes-extended/sysstat/sysstat_12.7.5.bb b/meta/recipes-extended/sysstat/sysstat_12.7.5.bb
index 150f4932d8..d598d5366f 100644
--- a/meta/recipes-extended/sysstat/sysstat_12.7.5.bb
+++ b/meta/recipes-extended/sysstat/sysstat_12.7.5.bb
@@ -45,7 +45,7 @@ do_install() {
45 rm -rf ${D}/var 45 rm -rf ${D}/var
46 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 46 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
47 install -d ${D}/etc/default/volatiles 47 install -d ${D}/etc/default/volatiles
48 install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles 48 install -m 0644 ${UNPACKDIR}/99_sysstat ${D}/etc/default/volatiles
49 fi 49 fi
50 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 50 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
51 install -d ${D}${nonarch_libdir}/tmpfiles.d 51 install -d ${D}${nonarch_libdir}/tmpfiles.d
@@ -56,7 +56,7 @@ do_install() {
56 # systemd unit file. Otherwise the package will install one. 56 # systemd unit file. Otherwise the package will install one.
57 if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then 57 if ${@bb.utils.contains('PACKAGECONFIG', 'cron systemd', 'false', 'true', d)}; then
58 install -d ${D}${systemd_system_unitdir} 58 install -d ${D}${systemd_system_unitdir}
59 install -m 0644 ${WORKDIR}/sysstat.service ${D}${systemd_system_unitdir} 59 install -m 0644 ${UNPACKDIR}/sysstat.service ${D}${systemd_system_unitdir}
60 sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service 60 sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}${systemd_system_unitdir}/sysstat.service
61 fi 61 fi
62 fi 62 fi
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
index bcd1d6f792..8cf927153f 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -120,8 +120,8 @@ do_install () {
120 install -m 0644 $m.8 ${D}${mandir}/man8/ || exit 1 120 install -m 0644 $m.8 ${D}${mandir}/man8/ || exit 1
121 done 121 done
122 122
123 install -m 0644 ${WORKDIR}/try-from.8 ${D}${mandir}/man8/ 123 install -m 0644 ${UNPACKDIR}/try-from.8 ${D}${mandir}/man8/
124 install -m 0644 ${WORKDIR}/safe_finger.8 ${D}${mandir}/man8/ 124 install -m 0644 ${UNPACKDIR}/safe_finger.8 ${D}${mandir}/man8/
125 125
126 install -d ${D}${includedir} 126 install -d ${D}${includedir}
127 install -m 0644 tcpd.h ${D}${includedir}/ 127 install -m 0644 tcpd.h ${D}${includedir}/
diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
index a942ac2991..51d9c92766 100644
--- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
+++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy-native.bb
@@ -8,7 +8,8 @@ PV = "1.0"
8 8
9SRC_URI = "file://template.py file://COPYING" 9SRC_URI = "file://template.py file://COPYING"
10 10
11S = "${WORKDIR}" 11S = "${WORKDIR}/sources"
12UNPACKDIR = "${S}"
12 13
13inherit native 14inherit native
14 15
diff --git a/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch b/meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch
index 3801d73883..b43a115b23 100644
--- a/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch
+++ b/meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch
@@ -1,7 +1,8 @@
1From e5d8f6d4a7652ea95c8d069ce9333494f2db868c Mon Sep 17 00:00:00 2001 1From ee9d23373b488c4a499c561d71e6b6ba7ca1bd31 Mon Sep 17 00:00:00 2001
2From: Joshua Lock <josh@linux.intel.com> 2From: Joshua Lock <josh@linux.intel.com>
3Date: Fri, 16 Sep 2011 15:35:48 -0700 3Date: Fri, 16 Sep 2011 15:35:48 -0700
4Subject: [PATCH] texinfo: several changes to build without zlib and ncurses 4Subject: [PATCH 1/3] texinfo: several changes to build without zlib and
5 ncurses
5 6
6We already DEPEND on the native texinfo being present before building so 7We already DEPEND on the native texinfo being present before building so
7there isn't any need to try and build the required native texinfo binaries 8there isn't any need to try and build the required native texinfo binaries
@@ -10,16 +11,15 @@ before cross-compiling. This simplifies the recipe somewhat!
10Upstream-Status: Inappropriate oe specific 11Upstream-Status: Inappropriate oe specific
11 12
12Signed-off-by: Joshua Lock <josh@linux.intel.com> 13Signed-off-by: Joshua Lock <josh@linux.intel.com>
13
14--- 14---
15 configure.ac | 24 +----------------------- 15 configure.ac | 24 +-----------------------
16 1 file changed, 1 insertion(+), 23 deletions(-) 16 1 file changed, 1 insertion(+), 23 deletions(-)
17 17
18diff --git a/configure.ac b/configure.ac 18diff --git a/configure.ac b/configure.ac
19index 6fcd3a0..c108df7 100644 19index 8094498..5b72fc1 100644
20--- a/configure.ac 20--- a/configure.ac
21+++ b/configure.ac 21+++ b/configure.ac
22@@ -180,29 +180,7 @@ AC_CANONICAL_BUILD 22@@ -247,29 +247,7 @@ AC_CANONICAL_BUILD
23 # $native_tools is also added to SUBDIRS in the main Makefile.am, 23 # $native_tools is also added to SUBDIRS in the main Makefile.am,
24 # so that make compiles the native tools first. 24 # so that make compiles the native tools first.
25 # 25 #
@@ -50,3 +50,6 @@ index 6fcd3a0..c108df7 100644
50 AC_SUBST(native_tools) 50 AC_SUBST(native_tools)
51 AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) 51 AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
52 52
53--
542.39.2
55
diff --git a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch
index 825887cc2e..f3b6827d58 100644
--- a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
+++ b/meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch
@@ -1,33 +1,32 @@
1From 451a9b9c3874872d575693fc7733fae02690a7d3 Mon Sep 17 00:00:00 2001 1From e02be81fa68ddc7f939abd99de4e42759a0d5d8c Mon Sep 17 00:00:00 2001
2From: Edwin Plauchu <edwin.plauchu.camacho@intel.com> 2From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
3Date: Tue, 29 Nov 2016 13:43:24 -0600 3Date: Tue, 29 Nov 2016 13:43:24 -0600
4Subject: [PATCH] dont-depend-on-help2man 4Subject: [PATCH 2/3] dont-depend-on-help2man
5 5
6Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
7 7
8Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> 8Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
9Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> 9Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
10
11--- 10---
12 doc/Makefile.am | 2 +- 11 doc/Makefile.am | 2 +-
13 man/Makefile.am | 12 ++++++------ 12 man/Makefile.am | 12 ++++++------
14 2 files changed, 7 insertions(+), 7 deletions(-) 13 2 files changed, 7 insertions(+), 7 deletions(-)
15 14
16diff --git a/doc/Makefile.am b/doc/Makefile.am 15diff --git a/doc/Makefile.am b/doc/Makefile.am
17index 407a38c..6b5ff3e 100644 16index e9e6298..f1b9895 100644
18--- a/doc/Makefile.am 17--- a/doc/Makefile.am
19+++ b/doc/Makefile.am 18+++ b/doc/Makefile.am
20@@ -55,7 +55,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \ 19@@ -63,7 +63,7 @@ refcard/txirefcard.pdf refcard/txirefcard-a4.pdf: refcard/txirefcard.tex
21 # Include our texinfo.tex, not Automake's. 20 # Include our texinfo.tex, not Automake's.
22 EXTRA_DIST = epsf.tex texinfo.tex \ 21 EXTRA_DIST = epsf.tex texinfo.tex \
23 fdl.texi \ 22 fdl.texi \
24- $(man_MANS) $(TXI_XLATE) \ 23- $(man_MANS) $(TXI_XLATE) \
25+ $(TXI_XLATE) \ 24+ $(TXI_XLATE) \
26 $(refcard_files) \ 25 $(refcard_files) \
27 gendocs.chapter/gendocs_template \
28 texinfo-tex-test.texi texinfo-tex-test.WIDOWs \ 26 texinfo-tex-test.texi texinfo-tex-test.WIDOWs \
27 texinfo-ja.tex short-sample-ja.texi \
29diff --git a/man/Makefile.am b/man/Makefile.am 28diff --git a/man/Makefile.am b/man/Makefile.am
30index d0cd72c..a19e52a 100644 29index f2c703f..61caeeb 100644
31--- a/man/Makefile.am 30--- a/man/Makefile.am
32+++ b/man/Makefile.am 31+++ b/man/Makefile.am
33@@ -11,27 +11,27 @@ 32@@ -11,27 +11,27 @@
@@ -64,3 +63,6 @@ index d0cd72c..a19e52a 100644
64 63
65 # Maintainers should be able to regenerate. 64 # Maintainers should be able to regenerate.
66 MAINTAINERCLEANFILES = $(man_MANS) 65 MAINTAINERCLEANFILES = $(man_MANS)
66--
672.39.2
68
diff --git a/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch b/meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch
index c6c9952c9e..f99f8b87d5 100644
--- a/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch
+++ b/meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch
@@ -1,21 +1,20 @@
1From 81ccd162b869c20e450073fa834b5cabbea8e3d4 Mon Sep 17 00:00:00 2001 1From 33b85a3928895b812b37dc759c6de711802db45f Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com> 2From: Saul Wold <sgw@linux.intel.com>
3Date: Mon, 29 Jul 2013 15:02:34 -0700 3Date: Mon, 29 Jul 2013 15:02:34 -0700
4Subject: [PATCH] texinfo: Update to 5.1 4Subject: [PATCH 3/3] texinfo: Update to 5.1
5 5
6Upstream-Status: Inappropriate [cross build specific] 6Upstream-Status: Inappropriate [cross build specific]
7 7
8Signed-off-by: Saul Wold <sgw@linux.intel.com> 8Signed-off-by: Saul Wold <sgw@linux.intel.com>
9
10--- 9---
11 info/Makefile.am | 2 +- 10 info/Makefile.am | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
13 12
14diff --git a/info/Makefile.am b/info/Makefile.am 13diff --git a/info/Makefile.am b/info/Makefile.am
15index 35596b1..cae1421 100644 14index f57b341..a019aa7 100644
16--- a/info/Makefile.am 15--- a/info/Makefile.am
17+++ b/info/Makefile.am 16+++ b/info/Makefile.am
18@@ -69,7 +69,7 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \ 17@@ -77,7 +77,7 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
19 # more than once. 18 # more than once.
20 funs.h: makedoc$(EXEEXT) $(cmd_sources) 19 funs.h: makedoc$(EXEEXT) $(cmd_sources)
21 rm -f $(generated_sources) 20 rm -f $(generated_sources)
@@ -24,3 +23,6 @@ index 35596b1..cae1421 100644
24 23
25 # The following hack is necessary to hint make before the automatic 24 # The following hack is necessary to hint make before the automatic
26 # dependencies are built. 25 # dependencies are built.
26--
272.39.2
28
diff --git a/meta/recipes-extended/texinfo/texinfo/link-zip.patch b/meta/recipes-extended/texinfo/texinfo/link-zip.patch
deleted file mode 100644
index 72d7067aa9..0000000000
--- a/meta/recipes-extended/texinfo/texinfo/link-zip.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From c5050ac84c8a3cc3ff8c7e558f8c2fdb57f410d9 Mon Sep 17 00:00:00 2001
2From: Joshua Lock <josh@linux.intel.com>
3Date: Mon, 29 Jul 2013 15:02:34 -0700
4Subject: [PATCH] install-info uses symbols from zlib so must link against it.
5
6Upstream-Status: Pending
7
8Signed-off-by: Joshua Lock <josh@linux.intel.com>
9
10---
11 install-info/Makefile.am | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/install-info/Makefile.am b/install-info/Makefile.am
15index 9bcff71..68247f9 100644
16--- a/install-info/Makefile.am
17+++ b/install-info/Makefile.am
18@@ -33,4 +33,4 @@ AM_CPPFLAGS = \
19 -I$(top_srcdir)/gnulib/lib \
20 -I$(top_builddir)/gnulib/lib \
21 -DLOCALEDIR=\"$(localedir)\"
22-LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD)
23+LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD) -lz
diff --git a/meta/recipes-extended/texinfo/texinfo_7.0.3.bb b/meta/recipes-extended/texinfo/texinfo_7.1.bb
index b149177b72..65d8252fb9 100644
--- a/meta/recipes-extended/texinfo/texinfo_7.0.3.bb
+++ b/meta/recipes-extended/texinfo/texinfo_7.1.bb
@@ -25,17 +25,16 @@ RDEPENDS:info += "${@compress_pkg(d)}"
25DEPENDS = "zlib ncurses texinfo-replacement-native" 25DEPENDS = "zlib ncurses texinfo-replacement-native"
26DEPENDS:class-native = "zlib-native ncurses-native" 26DEPENDS:class-native = "zlib-native ncurses-native"
27 27
28TARGET_PATCH = "file://use_host_makedoc.patch" 28TARGET_PATCH = "file://0003-texinfo-Update-to-5.1.patch"
29TARGET_PATCH:class-native = "" 29TARGET_PATCH:class-native = ""
30 30
31SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ 31SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
32 file://disable-native-tools.patch \ 32 file://0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch \
33 file://link-zip.patch \ 33 file://0002-dont-depend-on-help2man.patch \
34 file://dont-depend-on-help2man.patch \
35 ${TARGET_PATCH} \ 34 ${TARGET_PATCH} \
36 " 35 "
37 36
38SRC_URI[sha256sum] = "3cc5706fb086b895e1dc2b407aade9f95a3a233ff856273e2b659b089f117683" 37SRC_URI[sha256sum] = "dd5710b3a53ac002644677a06145748e260592a35be182dc830ebebb79c5d5a0"
39 38
40tex_texinfo = "texmf/tex/texinfo" 39tex_texinfo = "texmf/tex/texinfo"
41 40
@@ -44,6 +43,7 @@ inherit gettext autotools multilib_script
44MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any" 43MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any"
45 44
46EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" 45EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"
46CACHED_CONFIGUREVARS += "texinfo_cv_sys_iconv_converts_euc_cn=yes"
47 47
48do_configure:prepend () { 48do_configure:prepend () {
49 # autotools_do_configure updates po/Makefile.in.in, we also need 49 # autotools_do_configure updates po/Makefile.in.in, we also need
diff --git a/meta/recipes-extended/timezone/tzdata.bb b/meta/recipes-extended/timezone/tzdata.bb
index dd1960ffa7..2099b05db8 100644
--- a/meta/recipes-extended/timezone/tzdata.bb
+++ b/meta/recipes-extended/timezone/tzdata.bb
@@ -20,6 +20,7 @@ do_configure[cleandirs] = "${B}"
20B = "${WORKDIR}/build" 20B = "${WORKDIR}/build"
21 21
22do_compile() { 22do_compile() {
23 oe_runmake -C ${S} tzdata.zi
23 for zone in ${TZONES}; do 24 for zone in ${TZONES}; do
24 ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo -L /dev/null ${S}/${zone} 25 ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo -L /dev/null ${S}/${zone}
25 ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/posix -L /dev/null ${S}/${zone} 26 ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${B}/zoneinfo/posix -L /dev/null ${S}/${zone}
@@ -37,6 +38,7 @@ do_install() {
37 cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo 38 cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo
38 cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo 39 cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo
39 cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo 40 cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo
41 cp -pP "${S}/tzdata.zi" ${D}${datadir}/zoneinfo
40 42
41 # Install default timezone 43 # Install default timezone
42 if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then 44 if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then
@@ -141,6 +143,7 @@ FILES:tzdata-core += " \
141 ${sysconfdir}/timezone \ 143 ${sysconfdir}/timezone \
142 ${datadir}/zoneinfo/leapseconds \ 144 ${datadir}/zoneinfo/leapseconds \
143 ${datadir}/zoneinfo/leap-seconds.list \ 145 ${datadir}/zoneinfo/leap-seconds.list \
146 ${datadir}/zoneinfo/tzdata.zi \
144 ${datadir}/zoneinfo/Pacific/Honolulu \ 147 ${datadir}/zoneinfo/Pacific/Honolulu \
145 ${datadir}/zoneinfo/America/Anchorage \ 148 ${datadir}/zoneinfo/America/Anchorage \
146 ${datadir}/zoneinfo/America/Los_Angeles \ 149 ${datadir}/zoneinfo/America/Los_Angeles \
diff --git a/meta/recipes-extended/watchdog/watchdog-config.bb b/meta/recipes-extended/watchdog/watchdog-config.bb
index f138952128..17151ced5e 100644
--- a/meta/recipes-extended/watchdog/watchdog-config.bb
+++ b/meta/recipes-extended/watchdog/watchdog-config.bb
@@ -13,12 +13,15 @@ SRC_URI = " \
13 file://watchdog.conf \ 13 file://watchdog.conf \
14" 14"
15 15
16S = "${WORKDIR}/sources"
17UNPACKDIR = "${S}"
18
16# The default value is 60 seconds when null. 19# The default value is 60 seconds when null.
17WATCHDOG_TIMEOUT ??= "" 20WATCHDOG_TIMEOUT ??= ""
18 21
19do_install() { 22do_install() {
20 install -Dm 0644 ${WORKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog 23 install -Dm 0644 ${UNPACKDIR}/watchdog.default ${D}${sysconfdir}/default/watchdog
21 install -Dm 0644 ${WORKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf 24 install -Dm 0644 ${UNPACKDIR}/watchdog.conf ${D}${sysconfdir}/watchdog.conf
22 25
23 if [ -n "${WATCHDOG_TIMEOUT}" ]; then 26 if [ -n "${WATCHDOG_TIMEOUT}" ]; then
24 echo "watchdog-timeout = ${WATCHDOG_TIMEOUT}" >> ${D}/etc/watchdog.conf 27 echo "watchdog-timeout = ${WATCHDOG_TIMEOUT}" >> ${D}/etc/watchdog.conf
diff --git a/meta/recipes-extended/watchdog/watchdog_5.16.bb b/meta/recipes-extended/watchdog/watchdog_5.16.bb
index 5325ccafda..c88ea08ade 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.16.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.16.bb
@@ -50,8 +50,8 @@ do_install:append() {
50 install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir} 50 install -m 0644 ${S}/debian/watchdog.service ${D}${systemd_system_unitdir}
51 install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir} 51 install -m 0644 ${S}/debian/wd_keepalive.service ${D}${systemd_system_unitdir}
52 52
53 install -Dm 0755 ${WORKDIR}/watchdog.init ${D}/${sysconfdir}/init.d/watchdog 53 install -Dm 0755 ${UNPACKDIR}/watchdog.init ${D}/${sysconfdir}/init.d/watchdog
54 install -Dm 0755 ${WORKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive 54 install -Dm 0755 ${UNPACKDIR}/wd_keepalive.init ${D}${sysconfdir}/init.d/wd_keepalive
55 55
56 # watchdog.conf is provided by the watchdog-config recipe 56 # watchdog.conf is provided by the watchdog-config recipe
57 rm ${D}${sysconfdir}/watchdog.conf 57 rm ${D}${sysconfdir}/watchdog.conf
diff --git a/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch b/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
index 050fc2c7e1..5438bafdcb 100644
--- a/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
+++ b/meta/recipes-extended/wget/wget/0002-improve-reproducibility.patch
@@ -1,4 +1,4 @@
1From 7f1357529d23b356b45fbb0dd7388588162e4cb8 Mon Sep 17 00:00:00 2001 1From b86e57b68363d108fe77c6fd588a275d2696cabe Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 10 Jan 2018 14:43:20 +0800 3Date: Wed, 10 Jan 2018 14:43:20 +0800
4Subject: [PATCH] src/Makefile.am: improve reproducibility 4Subject: [PATCH] src/Makefile.am: improve reproducibility
@@ -44,10 +44,10 @@ Signed-off-by: Joe Slater <jslater@windriver.com>
44 1 file changed, 4 insertions(+) 44 1 file changed, 4 insertions(+)
45 45
46diff --git a/src/Makefile.am b/src/Makefile.am 46diff --git a/src/Makefile.am b/src/Makefile.am
47index 28c0be2..44084a3 100644 47index 18ec622..38d252d 100644
48--- a/src/Makefile.am 48--- a/src/Makefile.am
49+++ b/src/Makefile.am 49+++ b/src/Makefile.am
50@@ -87,9 +87,13 @@ version.c: $(wget_SOURCES) ../lib/libgnu.a 50@@ -108,9 +108,13 @@ version.c: $(wget_SOURCES) ../lib/libgnu.a
51 echo '#include "version.h"' >> $@ 51 echo '#include "version.h"' >> $@
52 echo 'const char *version_string = "@VERSION@";' >> $@ 52 echo 'const char *version_string = "@VERSION@";' >> $@
53 echo 'const char *compilation_string = "'$(COMPILE)'";' \ 53 echo 'const char *compilation_string = "'$(COMPILE)'";' \
@@ -61,6 +61,3 @@ index 28c0be2..44084a3 100644
61 | $(ESCAPEQUOTE) >> $@ 61 | $(ESCAPEQUOTE) >> $@
62 62
63 css.c: $(srcdir)/css.l 63 css.c: $(srcdir)/css.l
64--
651.8.3.1
66
diff --git a/meta/recipes-extended/wget/wget_1.21.4.bb b/meta/recipes-extended/wget/wget_1.24.5.bb
index 1d31b0116d..64e6ee80af 100644
--- a/meta/recipes-extended/wget/wget_1.21.4.bb
+++ b/meta/recipes-extended/wget/wget_1.24.5.bb
@@ -2,6 +2,6 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
2 file://0002-improve-reproducibility.patch \ 2 file://0002-improve-reproducibility.patch \
3 " 3 "
4 4
5SRC_URI[sha256sum] = "81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c" 5SRC_URI[sha256sum] = "fa2dc35bab5184ecbc46a9ef83def2aaaa3f4c9f3c97d4bd19dcb07d4da637de"
6 6
7require wget.inc 7require wget.inc
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb
index 72eb1ae067..897747379b 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb
@@ -37,12 +37,12 @@ CONFFILES:${PN} = "${sysconfdir}/xinetd.conf"
37do_install:append() { 37do_install:append() {
38 install -d "${D}${sysconfdir}/init.d" 38 install -d "${D}${sysconfdir}/init.d"
39 install -d "${D}${sysconfdir}/default" 39 install -d "${D}${sysconfdir}/default"
40 install -m 755 "${WORKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd" 40 install -m 755 "${UNPACKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd"
41 install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" 41 install -m 644 "${UNPACKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd"
42 42
43 # Install systemd unit files 43 # Install systemd unit files
44 install -d ${D}${systemd_system_unitdir} 44 install -d ${D}${systemd_system_unitdir}
45 install -m 0644 ${WORKDIR}/xinetd.service ${D}${systemd_system_unitdir} 45 install -m 0644 ${UNPACKDIR}/xinetd.service ${D}${systemd_system_unitdir}
46 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ 46 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
47 -e 's,@SBINDIR@,${sbindir},g' \ 47 -e 's,@SBINDIR@,${sbindir},g' \
48 ${D}${systemd_system_unitdir}/xinetd.service 48 ${D}${systemd_system_unitdir}/xinetd.service
diff --git a/meta/recipes-extended/zip/zip-3.0/0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch b/meta/recipes-extended/zip/zip-3.0/0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch
new file mode 100644
index 0000000000..0d3af37ded
--- /dev/null
+++ b/meta/recipes-extended/zip/zip-3.0/0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch
@@ -0,0 +1,45 @@
1From 9db2f8cdbbc0dfb359d3b4e5dfe48c18652ce531 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 8 May 2024 19:02:46 -0700
4Subject: [PATCH] configure: Include dirent.h for closedir/opendir APIs
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9GCC-14 is strict about function prototypes and since the
10testcase tries to compile/link opendir/closedir functions
11without including signatures, it fails to build the test
12due to missing signatures which come from dirent.h
13
14Therefore include the needed system header and make it more
15robust.
16
17Fixes
18a.c:2:21: error: implicit declaration of function ‘closedir’ [-Wimplicit-function-declaration]
19 2 | int main() { return closedir(opendir(".")); }
20 | ^~~~~~~~
21a.c:2:30: error: implicit declaration of function ‘opendir’ [-Wimplicit-function-declaration]
22 2 | int main() { return closedir(opendir(".")); }
23 | ^~~~~~~
24
25Upstream-Status: Inactive-Upstream
26Signed-off-by: Khem Raj <raj.khem@gmail.com>
27---
28 unix/configure | 1 +
29 1 file changed, 1 insertion(+)
30
31diff --git a/unix/configure b/unix/configure
32index f917086..1dd98c6 100644
33--- a/unix/configure
34+++ b/unix/configure
35@@ -591,6 +591,7 @@ $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null
36
37 echo Check for directory libraries
38 cat > conftest.c << _EOF_
39+#include <dirent.h>
40 int main() { return closedir(opendir(".")); }
41 _EOF_
42
43--
442.45.0
45
diff --git a/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch b/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch
deleted file mode 100644
index a86e03e620..0000000000
--- a/meta/recipes-extended/zip/zip-3.0/0002-unix.c-Do-not-redefine-DIR-as-FILE.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 76f5bf3546d826dcbc03acbefcf0b10b972bf136 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 10 Aug 2022 17:19:38 -0700
4Subject: [PATCH 2/2] unix.c: Do not redefine DIR as FILE
5
6DIR is already provided on Linux via
7/usr/include/dirent.h system header
8
9Upstream-Status: Inactive-Upstream
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 unix/unix.c | 2 --
13 1 file changed, 2 deletions(-)
14
15diff --git a/unix/unix.c b/unix/unix.c
16index ba87614..6e6f4d2 100644
17--- a/unix/unix.c
18+++ b/unix/unix.c
19@@ -61,13 +61,11 @@ local time_t label_utim = 0;
20 /* Local functions */
21 local char *readd OF((DIR *));
22
23-
24 #ifdef NO_DIR /* for AT&T 3B1 */
25 #include <sys/dir.h>
26 #ifndef dirent
27 # define dirent direct
28 #endif
29-typedef FILE DIR;
30 /*
31 ** Apparently originally by Rich Salz.
32 ** Cleaned up and modified by James W. Birdsall.
33--
342.37.1
35
diff --git a/meta/recipes-extended/zip/zip_3.0.bb b/meta/recipes-extended/zip/zip_3.0.bb
index 70df5ab872..ec54206335 100644
--- a/meta/recipes-extended/zip/zip_3.0.bb
+++ b/meta/recipes-extended/zip/zip_3.0.bb
@@ -17,8 +17,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.
17 file://0002-configure-support-PIC-code-build.patch \ 17 file://0002-configure-support-PIC-code-build.patch \
18 file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \ 18 file://0001-configure-Use-CFLAGS-and-LDFLAGS-when-doing-link-tes.patch \
19 file://0001-configure-Specify-correct-function-signatures-and-de.patch \ 19 file://0001-configure-Specify-correct-function-signatures-and-de.patch \
20 file://0002-unix.c-Do-not-redefine-DIR-as-FILE.patch \
21 file://0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch \ 20 file://0001-unix-configure-use-_Static_assert-to-do-correct-dete.patch \
21 file://0001-configure-Include-dirent.h-for-closedir-opendir-APIs.patch \
22 " 22 "
23UPSTREAM_VERSION_UNKNOWN = "1" 23UPSTREAM_VERSION_UNKNOWN = "1"
24 24
diff --git a/meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch b/meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch
deleted file mode 100644
index 847a641691..0000000000
--- a/meta/recipes-extended/zstd/zstd/0001-pzstd-use-directly-for-the-test-c-snippet.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 121ef5253a49065dea6a89536ca7bd3dabd40e25 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 19 Jun 2023 17:10:09 +0200
4Subject: [PATCH] pzstd: use c++14 without conditions
5
6Doing this check with a direct c++ snippet is prone to portability problems:
7
8- \043 is not portable between shells: dash expands it to #,
9bash does not;
10
11- using # directly works with make 4.3 but does not with make 4.2.
12
13Let's just use the c++ version that covers both the code and the gtest.
14
15Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/3682]
16Signed-off-by: Alexander Kanavin <alex@linutronix.de>
17
18---
19 contrib/pzstd/Makefile | 7 ++-----
20 1 file changed, 2 insertions(+), 5 deletions(-)
21
22diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile
23index e62f8e87..58fb82a1 100644
24--- a/contrib/pzstd/Makefile
25+++ b/contrib/pzstd/Makefile
26@@ -37,11 +37,8 @@ CFLAGS += -Wno-deprecated-declarations
27 PZSTD_INC = -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(PROGDIR) -I.
28 GTEST_INC = -isystem googletest/googletest/include
29
30-# If default C++ version is older than C++11, explicitly set C++11, which is the
31-# minimum required by the code.
32-ifeq ($(shell echo "\043if __cplusplus < 201103L\n\043error\n\043endif" | $(CXX) -x c++ -Werror -c - -o /dev/null 2>/dev/null && echo 1 || echo 0),0)
33-PZSTD_CXX_STD := -std=c++11
34-endif
35+# Set the minimum required by gtest
36+PZSTD_CXX_STD := -std=c++14
37
38 PZSTD_CPPFLAGS = $(PZSTD_INC)
39 PZSTD_CCXXFLAGS =
diff --git a/meta/recipes-extended/zstd/zstd_1.5.5.bb b/meta/recipes-extended/zstd/zstd_1.5.6.bb
index 2d72af50a4..0f3309d8af 100644
--- a/meta/recipes-extended/zstd/zstd_1.5.5.bb
+++ b/meta/recipes-extended/zstd/zstd_1.5.6.bb
@@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \
10 file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0 \ 10 file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0 \
11 " 11 "
12 12
13SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https \ 13SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https"
14 file://0001-pzstd-use-directly-for-the-test-c-snippet.patch"
15 14
16SRCREV = "63779c798237346c2b245c546c40b72a5a5913fe" 15SRCREV = "794ea1b0afca0f020f4e57b6732332231fb23c70"
17UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" 16UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
18 17
19CVE_PRODUCT = "zstandard" 18CVE_PRODUCT = "zstandard"