diff options
Diffstat (limited to 'meta/recipes-extended')
44 files changed, 238 insertions, 413 deletions
diff --git a/meta/recipes-extended/at/at_3.2.5.bb b/meta/recipes-extended/at/at_3.2.5.bb index 0162548d33..112d1c4adc 100644 --- a/meta/recipes-extended/at/at_3.2.5.bb +++ b/meta/recipes-extended/at/at_3.2.5.bb | |||
@@ -70,7 +70,7 @@ do_install () { | |||
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 ${UNPACKDIR}/${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 e541161c75..66058feff3 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc | |||
@@ -108,7 +108,7 @@ do_install_ptest () { | |||
108 | cp ${B}/config.h ${D}${PTEST_PATH} | 108 | cp ${B}/config.h ${D}${PTEST_PATH} |
109 | cp ${B}/version.h ${D}${PTEST_PATH} | 109 | cp ${B}/version.h ${D}${PTEST_PATH} |
110 | cp ${S}/y.tab.[ch] ${D}${PTEST_PATH} | 110 | cp ${S}/y.tab.[ch] ${D}${PTEST_PATH} |
111 | 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 |
112 | 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" \ |
113 | -e 's|${DEBUG_PREFIX_MAP}||g' \ | 113 | -e 's|${DEBUG_PREFIX_MAP}||g' \ |
114 | -e 's|${BUILD_LDFLAGS}||g' \ | 114 | -e 's|${BUILD_LDFLAGS}||g' \ |
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" | |||
14 | LICENSE:${PN}-ptest = "bzip2-1.0.6 & GPL-3.0-or-later & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib" | 14 | LICENSE:${PN}-ptest = "bzip2-1.0.6 & GPL-3.0-or-later & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib" |
15 | 15 | ||
16 | LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e32f19b32df4664 \ | 16 | LIC_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 | ||
24 | SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \ | 24 | SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \ |
@@ -52,13 +52,13 @@ do_configure:prepend () { | |||
52 | 52 | ||
53 | do_install_ptest () { | 53 | do_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 | |||
16 | inherit autotools gettext texinfo ptest | 16 | inherit autotools gettext texinfo ptest |
17 | 17 | ||
18 | CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS" | 18 | CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS" |
19 | CVE_STATUS[CVE-2023-7216] = "disputed: intended behaviour, see https://lists.gnu.org/archive/html/bug-cpio/2024-03/msg00000.html" | ||
19 | 20 | ||
20 | EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}" | 21 | EXTRA_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/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 | ||
3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 3 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
4 | 4 | ||
5 | SRC_URI[sha256sum] = "dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c" | 5 | SRC_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}" | |||
19 | SRC_URI = "${GNU_MIRROR}/ed/${BP}.tar.lz" | 19 | SRC_URI = "${GNU_MIRROR}/ed/${BP}.tar.lz" |
20 | UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/" | 20 | UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/" |
21 | 21 | ||
22 | SRC_URI[sha256sum] = "b1a463b297a141f9876c4b1fcd01477f645cded92168090e9a35db2af4babbca" | 22 | SRC_URI[sha256sum] = "65fec7318f48c2ca17f334ac0f4703defe62037bb13cc23920de077b5fa24523" |
23 | 23 | ||
24 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | 24 | EXTRA_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" | |||
7 | SECTION = "console/utils" | 7 | SECTION = "console/utils" |
8 | 8 | ||
9 | SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \ | 9 | SRC_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 @@ | |||
1 | The gnulib largefile macro needs updating to work with autoconf 2.73. Rather | ||
2 | than the full code: | ||
3 | |||
4 | https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb | ||
5 | |||
6 | Just tweak the exiting code to work with 2.73. The next findutils upgrade should | ||
7 | update to new gnulib | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
11 | |||
12 | Index: 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 |
11 | export VERSION="__run_ptest_version__" | 11 | export VERSION="__run_ptest_version__" |
12 | 12 | ||
13 | # define missing functions for tests/init.sh | ||
14 | fu_path_prepend_ () { | ||
15 | path_prepend_ $@ | ||
16 | } | ||
17 | |||
18 | print_ver_ () { | ||
19 | : | ||
20 | } | ||
21 | |||
22 | skip_if_root_ () { | ||
23 | [ $(id -u) = 0 ] && exit 77; | ||
24 | } | ||
25 | |||
26 | require_root_ () { | ||
27 | [ $(id -u) = 0 ] || exit 77; | ||
28 | } | ||
29 | |||
30 | expensive_ () { | ||
31 | : | ||
32 | } | ||
33 | |||
34 | export -f fu_path_prepend_ | ||
35 | export -f print_ver_ | ||
36 | export -f skip_if_root_ | ||
37 | export -f require_root_ | ||
38 | export -f expensive_ | ||
39 | |||
40 | |||
41 | for f in tests/*/*.sh; do | 13 | for 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 | ||
7 | DEPENDS = "bison-native" | 7 | DEPENDS = "bison-native" |
8 | 8 | ||
9 | SRC_URI[sha256sum] = "a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe" | 9 | SRC_URI[sha256sum] = "1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5" |
10 | 10 | ||
11 | PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" | 11 | PACKAGECONFIG[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" | |||
15 | EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" | 15 | EXTRA_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 |
18 | RDEPENDS:${PN}-ptest += "bash sed grep coreutils" | 18 | RDEPENDS:${PN}-ptest += "bash sed grep coreutils coreutils-getlimits" |
19 | 19 | ||
20 | do_install_ptest:class-target() { | 20 | do_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 @@ | |||
1 | From 4f4e84f139e2a8682f1374a592f2636c43ad857b Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Tue, 21 May 2024 15:10:11 +0000 | ||
4 | Subject: [PATCH] m4/readline: add missing includes | ||
5 | |||
6 | The cross-specific code fragment only includes stdio.h, where the native | ||
7 | fragment also includes fcntl.h and unistd.h. This is important because | ||
8 | GCC 14.1 has made the implicit definitions an error: | ||
9 | |||
10 | conftest.c: In function 'main': | ||
11 | conftest.c:144:9: error: implicit declaration of function 'close'; did you mean 'pclose'? [-Wimplicit-function-declaration] | ||
12 | conftest.c:146:14: error: implicit declaration of function 'open'; did you mean 'popen'? [-Wimplicit-function-declaration] | ||
13 | |||
14 | Add the missing includes so that the check doesn't always fail due to | ||
15 | these errors. | ||
16 | |||
17 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gawk.git/commit/?id=c1613c310d71b87f509458e0259ecd10eda2b140] | ||
18 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
19 | --- | ||
20 | m4/readline.m4 | 2 ++ | ||
21 | 1 file changed, 2 insertions(+) | ||
22 | |||
23 | diff --git a/m4/readline.m4 b/m4/readline.m4 | ||
24 | index 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 | -- | ||
37 | 2.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" | |||
16 | PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" | 16 | PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" |
17 | 17 | ||
18 | SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ | 18 | SRC_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_10.03.0.bb b/meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb index ff7d38676e..0504f5244f 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_10.03.0.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_10.03.1.bb | |||
@@ -27,7 +27,7 @@ SRC_URI = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downlo | |||
27 | file://avoid-host-contamination.patch \ | 27 | file://avoid-host-contamination.patch \ |
28 | " | 28 | " |
29 | 29 | ||
30 | SRC_URI[sha256sum] = "6f2bc61023469fcf7c7c2d7f1bdd75b75f2b41836aa1d5e641396246d4abbb59" | 30 | SRC_URI[sha256sum] = "31cd01682ad23a801cc3bbc222a55f07c4ea3e068bdfb447792d54db21a2e8ad" |
31 | 31 | ||
32 | PACKAGECONFIG ??= "" | 32 | PACKAGECONFIG ??= "" |
33 | PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" | 33 | PACKAGECONFIG[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 74f3520eae..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,7 +5,7 @@ HOMEPAGE = "https://golang.org/" | |||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | 6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" |
7 | 7 | ||
8 | SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https" | 8 | SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" |
9 | SRCREV = "32022caedd6a177a7717aa8680cbe179e1045935" | 9 | SRCREV = "32022caedd6a177a7717aa8680cbe179e1045935" |
10 | UPSTREAM_CHECK_COMMITS = "1" | 10 | UPSTREAM_CHECK_COMMITS = "1" |
11 | 11 | ||
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 @@ | |||
1 | From 0096c854d5015918ed154dccb3ad472fd06c1010 Mon Sep 17 00:00:00 2001 | 1 | From 653db8b938166db7833135f615b90c38a3f27a30 Mon Sep 17 00:00:00 2001 |
2 | From: "Maxin B. John" <maxin.john@intel.com> | 2 | From: "Maxin B. John" <maxin.john@intel.com> |
3 | Date: Tue, 21 Feb 2017 11:16:31 +0200 | 3 | Date: Thu, 25 Apr 2024 10:51:02 +0200 |
4 | Subject: [PATCH] configure: Add option to enable/disable libnfnetlink | 4 | Subject: [PATCH] configure: Add option to enable/disable libnfnetlink |
5 | 5 | ||
6 | This changes the configure behaviour from autodetecting | 6 | Default behavior (autodetecting) does not change, but specifying |
7 | for libnfnetlink to having an option to disable it explicitly | 7 | either option would explicitly disable or enable libnfnetlink support, |
8 | 8 | and if the library is not found in the latter case, ./configure will error | |
9 | Upstream-Status: Pending | 9 | out. |
10 | 10 | ||
11 | Upstream-Status: Backport [https://git.netfilter.org/iptables/commit/?id=653db8b938166db7833135f615b90c38a3f27a30] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | 13 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
13 | 14 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | |
15 | Signed-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 | ||
18 | diff --git a/configure.ac b/configure.ac | 20 | diff --git a/configure.ac b/configure.ac |
19 | index d99fa3b..d607772 100644 | 21 | index 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 | -- |
52 | 2.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 @@ | |||
1 | From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 17 May 2022 10:56:59 +0200 | ||
4 | Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include | ||
5 | |||
6 | This 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 | |||
13 | Upstream-Status: Submitted [via email to phil@nwl.cc] | ||
14 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
15 | |||
16 | --- | ||
17 | iptables/xshared.h | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/iptables/xshared.h b/iptables/xshared.h | ||
21 | index 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 @@ | |||
1 | From 6832501bbb90a3dab977a4625d0391804c0e795c Mon Sep 17 00:00:00 2001 | ||
2 | From: "Maxin B. John" <maxin.john@intel.com> | ||
3 | Date: Tue, 21 Feb 2017 11:49:07 +0200 | ||
4 | Subject: [PATCH] configure.ac: | ||
5 | only-check-conntrack-when-libnfnetlink-enabled.patch | ||
6 | |||
7 | Package libnetfilter-conntrack depends on package libnfnetlink. iptables | ||
8 | checks package libnetfilter-conntrack whatever its package config | ||
9 | libnfnetlink is enabled or not. When libnfnetlink is disabled but | ||
10 | package libnetfilter-conntrack exists, it fails randomly with: | ||
11 | |||
12 | In 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: | ||
16 | fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory | ||
17 | |||
18 | compilation terminated. | ||
19 | GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed | ||
20 | Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it. | ||
21 | |||
22 | Upstream-Status: Pending | ||
23 | |||
24 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
25 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
26 | |||
27 | --- | ||
28 | configure.ac | 6 ++++-- | ||
29 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
30 | |||
31 | diff --git a/configure.ac b/configure.ac | ||
32 | index 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 5a87897742..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 | " |
20 | SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c" | 18 | SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c" |
21 | 19 | ||
@@ -34,7 +32,7 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" | |||
34 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 32 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
35 | 33 | ||
36 | # libnfnetlink recipe is in meta-networking layer | 34 | # libnfnetlink recipe is in meta-networking layer |
37 | PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink,--disable-libnfnetlink,libnfnetlink libnetfilter-conntrack" | 35 | PACKAGECONFIG[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) |
40 | PACKAGECONFIG[libnftnl] = "--enable-nftables,--disable-nftables,libnftnl" | 38 | PACKAGECONFIG[libnftnl] = "--enable-nftables,--disable-nftables,libnftnl" |
@@ -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/libarchive/libarchive_3.7.3.bb b/meta/recipes-extended/libarchive/libarchive_3.7.4.bb index bea91b6e97..da85764116 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.7.3.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" | |||
33 | SRC_URI += "file://configurehack.patch" | 33 | SRC_URI += "file://configurehack.patch" |
34 | UPSTREAM_CHECK_URI = "http://libarchive.org/" | 34 | UPSTREAM_CHECK_URI = "http://libarchive.org/" |
35 | 35 | ||
36 | SRC_URI[sha256sum] = "f27a97bc22ceb996e72502df47dc19f99f9a0f09181ae909f09f3c9eb17b67e2" | 36 | SRC_URI[sha256sum] = "7875d49596286055b52439ed42f044bd8ad426aa4cc5aabd96bfe7abb971d5e8" |
37 | 37 | ||
38 | CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe" | 38 | CVE_STATUS[CVE-2023-30571] = "upstream-wontfix: upstream has documented that reported function is not thread-safe" |
39 | 39 | ||
diff --git a/meta/recipes-extended/ltp/ltp/0001-Add-__clear_cache-declaration-for-clang.patch b/meta/recipes-extended/ltp/ltp/0001-Add-__clear_cache-declaration-for-clang.patch new file mode 100644 index 0000000000..ade6a52b63 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-Add-__clear_cache-declaration-for-clang.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 2d384f268791ecd5ff0f26c8137dd4de0a1c4566 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 10 Jun 2024 22:52:56 -0700 | ||
4 | Subject: [PATCH] Add __clear_cache declaration for clang | ||
5 | |||
6 | __clear_cache was enabled on RISCV recently with 7352ba02390116f1cd6a9b583860ba28aa0a1b7a | ||
7 | however it fails to compile with clang19 on RISCV | ||
8 | With this error | ||
9 | |||
10 | hugemmap15.c:51:2: error: call to undeclared function '__clear_cache'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] | ||
11 | 51 | __clear_cache(p, p + COPY_SIZE); | ||
12 | | ^ | ||
13 | |||
14 | Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2024-June/038762.html] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | Cc: Hui Min Mina Chou <minachou@andestech.com> | ||
17 | --- | ||
18 | testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c | 1 + | ||
19 | 1 file changed, 1 insertion(+) | ||
20 | |||
21 | diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c | ||
22 | index a84ba6476..856e22ff3 100644 | ||
23 | --- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c | ||
24 | +++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap15.c | ||
25 | @@ -21,6 +21,7 @@ | ||
26 | |||
27 | #if defined(__clang__) | ||
28 | #pragma clang optimize off | ||
29 | + void __clear_cache(void *start, void *end); | ||
30 | #endif | ||
31 | |||
32 | #define _GNU_SOURCE | ||
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 @@ | |||
1 | From e87c2ad1e16cdbd62ba71b2ace3270503decaa56 Mon Sep 17 00:00:00 2001 | 1 | From 768159aa53257d247645a12518778f50b8fdf578 Mon Sep 17 00:00:00 2001 |
2 | From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com> | 2 | From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com> |
3 | Date: Wed, 29 Jul 2020 08:47:09 -0400 | 3 | Date: Wed, 29 Jul 2020 08:47:09 -0400 |
4 | Subject: [PATCH] Remove OOM tests from runtest/mm | 4 | Subject: [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 | ||
16 | diff --git a/runtest/mm b/runtest/mm | 16 | diff --git a/runtest/mm b/runtest/mm |
17 | index d859b331c..3c2962f44 100644 | 17 | index 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 | -- | ||
34 | 2.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 @@ | |||
1 | From 14c710cae38aa96bd8d681e891b6a1d691f99988 Mon Sep 17 00:00:00 2001 | ||
2 | From: Xiangyu Chen <xiangyu.chen@windriver.com> | ||
3 | Date: Thu, 14 Mar 2024 09:47:10 +0800 | ||
4 | Subject: [PATCH] scenario_groups/default: remove connectors | ||
5 | |||
6 | runtest/connectors was removed in 9b642d89c, thus update scenario_groups/default. | ||
7 | |||
8 | Fixes: 9b642d89c ("runtest: Merge runtest/connectors to kernel_misc") | ||
9 | Closes: https://github.com/linux-test-project/ltp/pull/1144 | ||
10 | |||
11 | Upstream-Status: Backport from | ||
12 | [https://github.com/linux-test-project/ltp/commit/14c710ca] | ||
13 | |||
14 | Reviewed-by: Petr Vorel <pvorel@suse.cz> | ||
15 | Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> | ||
16 | --- | ||
17 | scenario_groups/default | 1 - | ||
18 | 1 file changed, 1 deletion(-) | ||
19 | |||
20 | diff --git a/scenario_groups/default b/scenario_groups/default | ||
21 | index 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 | -- | ||
33 | 2.34.1 | ||
34 | |||
diff --git a/meta/recipes-extended/ltp/ltp_20240129.bb b/meta/recipes-extended/ltp/ltp_20240524.bb index e88e931a68..7105154712 100644 --- a/meta/recipes-extended/ltp/ltp_20240129.bb +++ b/meta/recipes-extended/ltp/ltp_20240524.bb | |||
@@ -24,11 +24,11 @@ TUNE_CCARGS:remove:x86-64 = "-mfpmath=sse" | |||
24 | 24 | ||
25 | CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" | 25 | CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" |
26 | CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" | 26 | CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" |
27 | SRCREV = "68737d20556d37364c95776044b1119c0912a36a" | 27 | SRCREV = "8f21ebba42216dbb7e8d44c23b4a977d6823f7a1" |
28 | 28 | ||
29 | SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ | 29 | SRC_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 \ | 31 | file://0001-Add-__clear_cache-declaration-for-clang.patch \ |
32 | " | 32 | " |
33 | 33 | ||
34 | S = "${WORKDIR}/git" | 34 | S = "${WORKDIR}/git" |
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 @@ | |||
1 | From fbf0544138af02be4d6dd3085e7ecf98ad060bb4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Wed, 13 Mar 2024 17:30:02 +0100 | ||
4 | Subject: [PATCH] GNUmakefile: use env from PATH | ||
5 | |||
6 | This allows using env from coreutils-native (rather than host env), | ||
7 | which resolves the problem of missing -S option on distributions | ||
8 | with much older coreutils such as Ubuntu 18.04. | ||
9 | |||
10 | Once all autobuilder distros are newer than that, this patch | ||
11 | can be dropped, together with corutils-native dependency. | ||
12 | |||
13 | Upstream-Status: Inappropriate [made for obsolete host distros] | ||
14 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
15 | --- | ||
16 | GNUmakefile | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/GNUmakefile b/GNUmakefile | ||
20 | index 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 @@ | |||
1 | From f16cd8c4986b7f250e8465dfbe4bda8d366e05dd Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 4 Mar 2024 14:35:16 +0100 | ||
4 | Subject: [PATCH] man.ml: do not use /dev/stdin | ||
5 | |||
6 | This 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), | ||
8 | but it doesn't work under pseudo where /dev/stdin is absent. | ||
9 | |||
10 | Upstream-Status: Inappropriate [yocto specific] | ||
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
12 | --- | ||
13 | share/mk/install/man.mk | 6 +++--- | ||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk | ||
17 | index 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 | " |
20 | SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \ | 20 | SRC_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 | ||
25 | SRC_URI[sha256sum] = "006906e7be81a71c2d347809597bcb91485fa7fa488acdaa79e681ddfa894568" | 23 | SRC_URI[sha256sum] = "f4d5b9756b4ee52e34ca9d895095c92312ced6292395b811e11069ab007e6f06" |
26 | 24 | ||
27 | inherit manpages | 25 | inherit manpages |
28 | 26 | ||
29 | # can be dropped when ubuntu 18.04 is not in use anymore | ||
30 | DEPENDS += "coreutils-native" | ||
31 | |||
32 | MAN_PKG = "${PN}" | 27 | MAN_PKG = "${PN}" |
33 | 28 | ||
34 | PACKAGECONFIG ??= "" | 29 | PACKAGECONFIG ??= "" |
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" | |||
11 | UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" | 11 | UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/" |
12 | 12 | ||
13 | SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" | 13 | SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz" |
14 | SRC_URI[sha256sum] = "2dfe1dbbb397d26fe0b0b6b2e9cd2efdf9d72dd42d18e70d7f363ada2652d738" | 14 | SRC_URI[sha256sum] = "6cfc488344cef189267e60aea481f00d4c7e2a59b53c6c659c520a4d121f66d8" |
15 | 15 | ||
16 | inherit gettext autotools update-alternatives pkgconfig | 16 | inherit 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] = "" | |||
31 | do_configure() { | 31 | do_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/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 @@ | |||
1 | From c8f625e085b8249cc009e8b19c3a19100217eb35 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Thu, 25 Apr 2024 13:33:15 +0000 | ||
4 | Subject: [PATCH] Fix pidfd_open detection | ||
5 | |||
6 | This check for pidfd_open uses AC_CHECK_FUNC which just runs the specified code, but | ||
7 | src/pgrep.c checks HAVE_PIDFD_OPEN which will only be defined by AC_CHECK_FUNCS. | ||
8 | |||
9 | Also pidfd_open is defined in sys/pidfd.h so that needs including. | ||
10 | |||
11 | Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/229] | ||
12 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
13 | --- | ||
14 | |||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index 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> | ||
28 | diff --git a/src/pgrep.c b/src/pgrep.c | ||
29 | index 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 789e0c2747..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 | ||
15 | SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ | 15 | SRC_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 | " |
18 | SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b" | 19 | SRCREV = "4ddcef2fd843170c8e2d59a83042978f41037a2b" |
19 | 20 | ||
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 2e5503bfd4..0000000000 --- a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From af4b8cb780587aa736692a3baa76b60474f19c5d Mon Sep 17 00:00:00 2001 | ||
2 | From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | ||
3 | Date: Mon, 18 Mar 2024 12:14:21 +0100 | ||
4 | Subject: [PATCH] lib/copydir:copy_entry(): use temporary stat buffer | ||
5 | |||
6 | There are no guarantees that fstatat() does not clobber the stat | ||
7 | buffer on errors. | ||
8 | |||
9 | Use a temporary buffer so that the following code sees correct | ||
10 | attributes of the source entry. | ||
11 | |||
12 | Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/974] | ||
13 | |||
14 | Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | ||
15 | --- | ||
16 | lib/copydir.c | 3 ++- | ||
17 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
18 | |||
19 | --- a/lib/copydir.c | ||
20 | +++ b/lib/copydir.c | ||
21 | @@ -400,6 +400,7 @@ static int copy_entry (const struct path | ||
22 | { | ||
23 | int err = 0; | ||
24 | struct stat sb; | ||
25 | + struct stat tmp_sb; | ||
26 | struct link_name *lp; | ||
27 | struct timespec mt[2]; | ||
28 | |||
29 | @@ -423,7 +424,7 @@ static int copy_entry (const struct path | ||
30 | * If the destination already exists do nothing. | ||
31 | * This is after the copy_dir above to still iterate into subdirectories. | ||
32 | */ | ||
33 | - if (fstatat(dst->dirfd, dst->name, &sb, AT_SYMLINK_NOFOLLOW) != -1) { | ||
34 | + if (fstatat(dst->dirfd, dst->name, &tmp_sb, AT_SYMLINK_NOFOLLOW) != -1) { | ||
35 | return err; | ||
36 | } | ||
37 | |||
diff --git a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb index 85c04b6af1..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 | ||
9 | SRC_URI = "file://securetty" | 9 | SRC_URI = "file://securetty" |
10 | 10 | ||
11 | S = "${WORKDIR}" | 11 | S = "${WORKDIR}/sources" |
12 | UNPACKDIR = "${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 |
14 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 15 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
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. |
14 | SRC_URI = "file://login.defs_shadow-sysroot" | 14 | SRC_URI = "file://login.defs_shadow-sysroot" |
15 | 15 | ||
16 | S = "${WORKDIR}" | 16 | S = "${WORKDIR}/sources" |
17 | UNPACKDIR = "${S}" | ||
17 | 18 | ||
18 | do_install() { | 19 | do_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 25930b64c1..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 | ||
13 | GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" | 13 | GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" |
14 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ | 14 | SRC_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 = " \ | |||
25 | SRC_URI:append:class-native = " \ | 24 | SRC_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 | " |
28 | SRC_URI[sha256sum] = "377fe0d7c1a0aa5e3514c08fdf5ddc70c9dcbb391678c2134445ed97326bcc26" | 27 | SRC_URI[sha256sum] = "b34686b89b279887ffbf1f33128902ccc0fa1a998a3add44213bb12d7385b218" |
29 | 28 | ||
30 | # Additional Policy files for PAM | 29 | # Additional Policy files for PAM |
31 | PAM_SRC_URI = "file://pam.d/chfn \ | 30 | PAM_SRC_URI = "file://pam.d/chfn \ |
diff --git a/meta/recipes-extended/shadow/shadow_4.15.0.bb b/meta/recipes-extended/shadow/shadow_4.15.1.bb index e57676c1da..e57676c1da 100644 --- a/meta/recipes-extended/shadow/shadow_4.15.0.bb +++ b/meta/recipes-extended/shadow/shadow_4.15.1.bb | |||
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb b/meta/recipes-extended/stress-ng/stress-ng_0.17.08.bb index fb88e06a7f..fffe6a1823 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.17.07.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 | ||
8 | SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ | 8 | SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ |
9 | " | 9 | " |
10 | SRCREV = "519151f460738cd62b69b84f8096cd218131e0a2" | 10 | SRCREV = "b7c7a5877501679a3b0a67d877e6274a801d1e4e" |
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | 12 | ||
13 | DEPENDS = "coreutils-native libbsd" | 13 | DEPENDS = "coreutils-native libbsd" |
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 | ||
9 | SRC_URI = "file://template.py file://COPYING" | 9 | SRC_URI = "file://template.py file://COPYING" |
10 | 10 | ||
11 | S = "${WORKDIR}" | 11 | S = "${WORKDIR}/sources" |
12 | UNPACKDIR = "${S}" | ||
12 | 13 | ||
13 | inherit native | 14 | inherit native |
14 | 15 | ||
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}" | |||
20 | B = "${WORKDIR}/build" | 20 | B = "${WORKDIR}/build" |
21 | 21 | ||
22 | do_compile() { | 22 | do_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 e826a7d4a6..17151ced5e 100644 --- a/meta/recipes-extended/watchdog/watchdog-config.bb +++ b/meta/recipes-extended/watchdog/watchdog-config.bb | |||
@@ -13,6 +13,9 @@ SRC_URI = " \ | |||
13 | file://watchdog.conf \ | 13 | file://watchdog.conf \ |
14 | " | 14 | " |
15 | 15 | ||
16 | S = "${WORKDIR}/sources" | ||
17 | UNPACKDIR = "${S}" | ||
18 | |||
16 | # The default value is 60 seconds when null. | 19 | # The default value is 60 seconds when null. |
17 | WATCHDOG_TIMEOUT ??= "" | 20 | WATCHDOG_TIMEOUT ??= "" |
18 | 21 | ||
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 @@ | |||
1 | From 9db2f8cdbbc0dfb359d3b4e5dfe48c18652ce531 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 8 May 2024 19:02:46 -0700 | ||
4 | Subject: [PATCH] configure: Include dirent.h for closedir/opendir APIs | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | GCC-14 is strict about function prototypes and since the | ||
10 | testcase tries to compile/link opendir/closedir functions | ||
11 | without including signatures, it fails to build the test | ||
12 | due to missing signatures which come from dirent.h | ||
13 | |||
14 | Therefore include the needed system header and make it more | ||
15 | robust. | ||
16 | |||
17 | Fixes | ||
18 | a.c:2:21: error: implicit declaration of function ‘closedir’ [-Wimplicit-function-declaration] | ||
19 | 2 | int main() { return closedir(opendir(".")); } | ||
20 | | ^~~~~~~~ | ||
21 | a.c:2:30: error: implicit declaration of function ‘opendir’ [-Wimplicit-function-declaration] | ||
22 | 2 | int main() { return closedir(opendir(".")); } | ||
23 | | ^~~~~~~ | ||
24 | |||
25 | Upstream-Status: Inactive-Upstream | ||
26 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
27 | --- | ||
28 | unix/configure | 1 + | ||
29 | 1 file changed, 1 insertion(+) | ||
30 | |||
31 | diff --git a/unix/configure b/unix/configure | ||
32 | index 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 | -- | ||
44 | 2.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 @@ | |||
1 | From 76f5bf3546d826dcbc03acbefcf0b10b972bf136 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 10 Aug 2022 17:19:38 -0700 | ||
4 | Subject: [PATCH 2/2] unix.c: Do not redefine DIR as FILE | ||
5 | |||
6 | DIR is already provided on Linux via | ||
7 | /usr/include/dirent.h system header | ||
8 | |||
9 | Upstream-Status: Inactive-Upstream | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | unix/unix.c | 2 -- | ||
13 | 1 file changed, 2 deletions(-) | ||
14 | |||
15 | diff --git a/unix/unix.c b/unix/unix.c | ||
16 | index 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 | -- | ||
34 | 2.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 | " |
23 | UPSTREAM_VERSION_UNKNOWN = "1" | 23 | UPSTREAM_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 @@ | |||
1 | From 121ef5253a49065dea6a89536ca7bd3dabd40e25 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 19 Jun 2023 17:10:09 +0200 | ||
4 | Subject: [PATCH] pzstd: use c++14 without conditions | ||
5 | |||
6 | Doing this check with a direct c++ snippet is prone to portability problems: | ||
7 | |||
8 | - \043 is not portable between shells: dash expands it to #, | ||
9 | bash does not; | ||
10 | |||
11 | - using # directly works with make 4.3 but does not with make 4.2. | ||
12 | |||
13 | Let's just use the c++ version that covers both the code and the gtest. | ||
14 | |||
15 | Upstream-Status: Submitted [https://github.com/facebook/zstd/pull/3682] | ||
16 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
17 | |||
18 | --- | ||
19 | contrib/pzstd/Makefile | 7 ++----- | ||
20 | 1 file changed, 2 insertions(+), 5 deletions(-) | ||
21 | |||
22 | diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile | ||
23 | index 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 | ||
13 | SRC_URI = "git://github.com/facebook/zstd.git;branch=release;protocol=https \ | 13 | SRC_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 | ||
16 | SRCREV = "63779c798237346c2b245c546c40b72a5a5913fe" | 15 | SRCREV = "794ea1b0afca0f020f4e57b6732332231fb23c70" |
17 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | 16 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" |
18 | 17 | ||
19 | CVE_PRODUCT = "zstandard" | 18 | CVE_PRODUCT = "zstandard" |