diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
| commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
| tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /poky/meta/recipes-core | |
| parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
| parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
| download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz | |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/meta/recipes-core')
196 files changed, 2155 insertions, 3279 deletions
diff --git a/poky/meta/recipes-core/base-files/base-files_3.0.14.bb b/poky/meta/recipes-core/base-files/base-files_3.0.14.bb index 94299431f..032827a0d 100644 --- a/poky/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/poky/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -28,7 +28,7 @@ S = "${WORKDIR}" INHIBIT_DEFAULT_DEPS = "1" -docdir_append = "/${P}" +docdir:append = "/${P}" dirs1777 = "/tmp ${localstatedir}/volatile/tmp" dirs2775 = "" dirs555 = "/sys /proc" @@ -64,7 +64,7 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ # hostnames. # # The hostname can be changed outside of this recipe by using -# hostname_pn-base-files = "my-host-name". +# hostname:pn-base-files = "my-host-name". hostname = "${MACHINE}" BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" @@ -77,7 +77,7 @@ BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" # Otherwise the directory creation will fail and we will have circular symbolic # links. # -pkg_preinst_${PN} () { +pkg_preinst:${PN} () { #!/bin/sh -e if [ x"$D" = "x" ]; then if [ -h "/var/lock" ]; then @@ -139,7 +139,7 @@ do_install () { fi } -do_install_append_libc-glibc () { +do_install:append:libc-glibc () { install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf } @@ -162,7 +162,7 @@ do_install_basefilesissue () { } do_install_basefilesissue[vardepsexclude] += "DATE" -do_install_append_linuxstdbase() { +do_install:append:linuxstdbase() { for d in ${dirs755-lsb}; do install -m 0755 -d ${D}$d done @@ -175,10 +175,10 @@ do_install_append_linuxstdbase() { SYSROOT_DIRS += "${sysconfdir}/skel" PACKAGES = "${PN}-doc ${PN} ${PN}-dev ${PN}-dbg" -FILES_${PN} = "/" -FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" +FILES:${PN} = "/" +FILES:${PN}-doc = "${docdir} ${datadir}/common-licenses" PACKAGE_ARCH = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname ${sysconfdir}/hosts'][(d.getVar('hostname') != '')]} ${sysconfdir}/shells" -CONFFILES_${PN} += "${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile" +CONFFILES:${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname ${sysconfdir}/hosts'][(d.getVar('hostname') != '')]} ${sysconfdir}/shells" +CONFFILES:${PN} += "${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile" diff --git a/poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb index 65b3cd778..2926a377c 100644 --- a/poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +++ b/poky/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb @@ -73,7 +73,7 @@ base_passwd_tweaksysroot () { chmod 0755 $dest } -python populate_packages_prepend() { +python populate_packages:prepend() { # Add in the preinst function for ${PN} # We have to do this here as prior to this, passwd/group.master # would be unavailable. We need to create these files at preinst @@ -98,17 +98,17 @@ if [ ! -e $D${sysconfdir}/group ]; then """ + group + """EOF fi """ - d.setVar(d.expand('pkg_preinst_${PN}'), preinst) + d.setVar(d.expand('pkg_preinst:${PN}'), preinst) } addtask do_package after do_populate_sysroot -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PACKAGES =+ "${PN}-update" -FILES_${PN}-update = "${sbindir}/* ${datadir}/${PN}" +FILES:${PN}-update = "${sbindir}/* ${datadir}/${PN}" -pkg_postinst_${PN}-update () { +pkg_postinst:${PN}-update () { #!/bin/sh if [ -n "$D" ]; then exit 0 diff --git a/poky/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb b/poky/meta/recipes-core/busybox/busybox-inittab_1.34.0.bb index 3804f4f7b..be8c06323 100644 --- a/poky/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb +++ b/poky/meta/recipes-core/busybox/busybox-inittab_1.34.0.bb @@ -45,14 +45,14 @@ EOF } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { # run this on host and on target if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then exit 0 fi } -pkg_postinst_ontarget_${PN} () { +pkg_postinst_ontarget:${PN} () { # run this on the target if [ -e /proc/consoles ]; then tmp="${SERIAL_CONSOLES_CHECK}" @@ -76,10 +76,10 @@ fi # Set PACKAGE_ARCH appropriately. PACKAGE_ARCH = "${MACHINE_ARCH}" -FILES_${PN} = "${sysconfdir}/inittab" -CONFFILES_${PN} = "${sysconfdir}/inittab" +FILES:${PN} = "${sysconfdir}/inittab" +CONFFILES:${PN} = "${sysconfdir}/inittab" -RCONFLICTS_${PN} = "sysvinit-inittab" +RCONFLICTS:${PN} = "sysvinit-inittab" USE_VT ?= "1" SYSVINIT_ENABLED_GETTYS ?= "1" diff --git a/poky/meta/recipes-core/busybox/busybox.inc b/poky/meta/recipes-core/busybox/busybox.inc index 47fcb5930..d85e2a3d7 100644 --- a/poky/meta/recipes-core/busybox/busybox.inc +++ b/poky/meta/recipes-core/busybox/busybox.inc @@ -23,39 +23,39 @@ EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${ PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" -FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" -FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog" -FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf ${sysconfdir}/mdev/*" -FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" -FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" -FILES_${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh" +FILES:${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" +FILES:${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog" +FILES:${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf ${sysconfdir}/mdev/*" +FILES:${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" +FILES:${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" +FILES:${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh" INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev ${PN}-hwclock" -INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" -INITSCRIPT_NAME_${PN}-hwclock = "hwclock.sh" -INITSCRIPT_NAME_${PN}-mdev = "mdev" -INITSCRIPT_PARAMS_${PN}-mdev = "start 04 S ." -INITSCRIPT_NAME_${PN}-syslog = "syslog" -INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" +INITSCRIPT_NAME:${PN}-httpd = "busybox-httpd" +INITSCRIPT_NAME:${PN}-hwclock = "hwclock.sh" +INITSCRIPT_NAME:${PN}-mdev = "mdev" +INITSCRIPT_PARAMS:${PN}-mdev = "start 04 S ." +INITSCRIPT_NAME:${PN}-syslog = "syslog" +INITSCRIPT_NAME:${PN}-udhcpd = "busybox-udhcpd" SYSTEMD_PACKAGES = "${PN}-syslog" -SYSTEMD_SERVICE_${PN}-syslog = "${@bb.utils.contains('SRC_URI', 'file://syslog.cfg', 'busybox-syslog.service', '', d)}" +SYSTEMD_SERVICE:${PN}-syslog = "${@bb.utils.contains('SRC_URI', 'file://syslog.cfg', 'busybox-syslog.service', '', d)}" -RDEPENDS_${PN}-syslog = "busybox" -CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf" -RCONFLICTS_${PN}-syslog = "rsyslog sysklogd syslog-ng" +RDEPENDS:${PN}-syslog = "busybox" +CONFFILES:${PN}-syslog = "${sysconfdir}/syslog-startup.conf" +RCONFLICTS:${PN}-syslog = "rsyslog sysklogd syslog-ng" -CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" +CONFFILES:${PN}-mdev = "${sysconfdir}/mdev.conf" -RRECOMMENDS_${PN} = "${PN}-udhcpc" +RRECOMMENDS:${PN} = "${PN}-udhcpc" -RDEPENDS_${PN} = "${@["", "busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]}" +RDEPENDS:${PN} = "${@["", "busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]}" inherit cml1 systemd update-rc.d ptest # busybox's unzip test case needs zip command, which busybox itself does not provide -RDEPENDS_${PN}-ptest = "zip" +RDEPENDS:${PN}-ptest = "zip" # internal helper def busybox_cfg(feature, tokens, cnf, rem): @@ -97,12 +97,12 @@ DO_IPv6 := "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 1, 0, d)}" python () { if "${OE_DEL}": - d.setVar('configmangle_append', "${OE_DEL}" + "\n") + d.setVar('configmangle:append', "${OE_DEL}" + "\n") if "${OE_FEATURES}": - d.setVar('configmangle_append', + d.setVar('configmangle:append', "/^### DISTRO FEATURES$/a\\\n%s\n\n" % ("\\n".join((d.expand("${OE_FEATURES}").split("\n"))))) - d.setVar('configmangle_append', + d.setVar('configmangle:append', "/^### CROSS$/a\\\n%s\n" % ("\\n".join(["CONFIG_EXTRA_CFLAGS=\"${CFLAGS} ${HOST_CC_ARCH}\"" ]) @@ -356,7 +356,7 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "50" -python do_package_prepend () { +python do_package:prepend () { # We need to load the full set of busybox provides from the /etc/busybox.links # Use this to see the update-alternatives with the right information @@ -373,9 +373,9 @@ python do_package_prepend () { if alt_name == '[': alt_name = 'lbracket' if alt_name == 'klogd' or alt_name == 'syslogd': - d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' ' + alt_name) + d.appendVar('ALTERNATIVE:%s-syslog' % (pn), ' ' + alt_name) else: - d.appendVar('ALTERNATIVE_%s' % (pn), ' ' + alt_name) + d.appendVar('ALTERNATIVE:%s' % (pn), ' ' + alt_name) d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link_name) if os.path.exists('%s%s' % (dvar, target)): d.setVarFlag('ALTERNATIVE_TARGET', alt_name, target) @@ -395,7 +395,7 @@ python do_package_prepend () { # These symlinks will later be updated by update-alternatives calls. # The update-alternatives.bbclass' postinst script runs firstly before other # postinst, but this part of code needs run firstly, so add this funtion. -python populate_packages_updatealternatives_append() { +python populate_packages_updatealternatives:append() { postinst = """ test -n 2 > /dev/null || alias test='busybox test' if test "x$D" = "x"; then @@ -422,10 +422,10 @@ if grep -q "^${base_bindir}/bash$" $D${sysconfdir}/busybox.links*; then fi """ - d.prependVar('pkg_postinst_%s' % pkg, postinst) + d.prependVar('pkg_postinst:%s' % pkg, postinst) } -pkg_postinst_${PN}_prepend () { +pkg_postinst:${PN}:prepend () { # Need path to saved utils, but they may have be removed on upgrade of busybox # Only use shell to get paths. Also capture if busybox was saved. BUSYBOX="" @@ -441,7 +441,7 @@ pkg_postinst_${PN}_prepend () { fi } -pkg_postinst_${PN}_append () { +pkg_postinst:${PN}:append () { # If busybox exists in the remove directory it is because it was the only shell left. if [ "x$D" = "x" ] ; then if [ "x$BUSYBOX" != "x" ] ; then @@ -451,7 +451,7 @@ pkg_postinst_${PN}_append () { fi } -pkg_prerm_${PN} () { +pkg_prerm:${PN} () { # This is so you can make busybox commit suicide - removing busybox with no other packages # providing its files, this will make update-alternatives work, but the update-rc.d part # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh @@ -481,7 +481,7 @@ pkg_prerm_${PN} () { fi } -pkg_postrm_${PN} () { +pkg_postrm:${PN} () { # Add path to remove dir in case we removed our only grep if [ "x$D" = "x" ] ; then for busybox_rmdir in /tmp/busyboxrm-*; do @@ -496,7 +496,7 @@ pkg_postrm_${PN} () { fi } -pkg_prerm_${PN}-syslog () { +pkg_prerm:${PN}-syslog () { # remove syslog if test "x$D" = "x"; then if test "$1" = "upgrade" -o "$1" = "remove"; then @@ -505,4 +505,4 @@ pkg_prerm_${PN}-syslog () { fi } -RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/ash', '', d)}" +RPROVIDES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/ash', '', d)}" diff --git a/poky/meta/recipes-core/busybox/busybox/0001-gen_build_files-Use-C-locale-when-calling-sed-on-glo.patch b/poky/meta/recipes-core/busybox/busybox/0001-gen_build_files-Use-C-locale-when-calling-sed-on-glo.patch deleted file mode 100644 index e0a22c5bb..000000000 --- a/poky/meta/recipes-core/busybox/busybox/0001-gen_build_files-Use-C-locale-when-calling-sed-on-glo.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bff7f16f7f41de8df67beb03722f235828ef2249 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 3 May 2021 15:48:19 -0700 -Subject: [PATCH] gen_build_files: Use C locale when calling sed on globbed files - -sort order is different based on chosen locale and also default shell -being bash or dash - -This sets the environment variable LC_ALL to the value C, which will -enforce bytewise sorting, irrespective of the shell - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - scripts/gen_build_files.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/scripts/gen_build_files.sh -+++ b/scripts/gen_build_files.sh -@@ -4,6 +4,8 @@ - # but users complain that many sed implementations - # are misinterpreting --. - -+export LC_ALL=C -+ - test $# -ge 2 || { echo "Syntax: $0 SRCTREE OBJTREE"; exit 1; } - - # cd to objtree diff --git a/poky/meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch b/poky/meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch index 25472f0bb..d4bda3c12 100644 --- a/poky/meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch +++ b/poky/meta/recipes-core/busybox/busybox/0001-testsuite-check-uudecode-before-using-it.patch @@ -18,13 +18,13 @@ diff --git a/testsuite/tar.tests b/testsuite/tar.tests index d71a349..8c88567 100755 --- a/testsuite/tar.tests +++ b/testsuite/tar.tests -@@ -336,7 +336,7 @@ SKIP= - cd .. || exit 1; rm -rf tar.tempdir 2>/dev/null +@@ -339,7 +339,7 @@ cd .. || exit 1; rm -rf tar.tempdir 2>/d + fi mkdir tar.tempdir && cd tar.tempdir || exit 1 -optional FEATURE_SEAMLESS_BZ2 FEATURE_TAR_AUTODETECT LS +optional FEATURE_SEAMLESS_BZ2 FEATURE_TAR_AUTODETECT LS UUDECODE - testing "Symlink attack: create symlink and then write through it" '\ + testing "tar Symlink attack: create symlink and then write through it" '\ exec 2>&1 uudecode -o input && tar xvf input; echo $? diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests diff --git a/poky/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch b/poky/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch index 35e981d6a..948932a3e 100644 --- a/poky/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch +++ b/poky/meta/recipes-core/busybox/busybox/busybox-udhcpc-no_deconfig.patch @@ -31,11 +31,11 @@ Signed-off-by: Andreas Oberritter <obi@opendreambox.org> networking/udhcp/dhcpc.c | 29 ++++++++++++++++------ 1 file changed, 21 insertions(+), 8 deletions(-) -Index: busybox-1.32.0/networking/udhcp/dhcpc.c +Index: busybox-1.34.0/networking/udhcp/dhcpc.c =================================================================== ---- busybox-1.32.0.orig/networking/udhcp/dhcpc.c -+++ busybox-1.32.0/networking/udhcp/dhcpc.c -@@ -48,6 +48,8 @@ struct tpacket_auxdata { +--- busybox-1.34.0.orig/networking/udhcp/dhcpc.c ++++ busybox-1.34.0/networking/udhcp/dhcpc.c +@@ -48,6 +48,8 @@ }; #endif @@ -44,47 +44,37 @@ Index: busybox-1.32.0/networking/udhcp/dhcpc.c /* "struct client_data_t client_data" is in bb_common_bufsiz1 */ -@@ -103,8 +105,10 @@ - OPT_x = 1 << 18, - OPT_f = 1 << 19, - OPT_B = 1 << 20, -+ OPT_D = 1 << 21, +@@ -100,8 +102,10 @@ + OPT_x = 1 << 16, + OPT_f = 1 << 17, + OPT_B = 1 << 18, ++ OPT_D = 1 << 19, /* The rest has variable bit positions, need to be clever */ - OPTBIT_B = 20, -+ OPTBIT_D = 21, + OPTBIT_B = 18, ++ OPTBIT_D = 19, USE_FOR_MMU( OPTBIT_b,) IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,) IF_FEATURE_UDHCP_PORT( OPTBIT_P,) -@@ -1084,7 +1088,8 @@ - client_data.state = RENEW_REQUESTED; - break; - case RENEW_REQUESTED: /* impatient are we? fine, square 1 */ -- udhcp_run_script(NULL, "deconfig"); -+ if (allow_deconfig) -+ udhcp_run_script(NULL, "deconfig"); - case REQUESTING: - case RELEASED: - change_listen_mode(LISTEN_RAW); -@@ -1120,7 +1125,8 @@ static void perform_release(uint32_t server_addr, uint32_t requested_ip) - * Users requested to be notified in all cases, even if not in one - * of the states above. - */ -- udhcp_run_script(NULL, "deconfig"); +@@ -587,7 +591,8 @@ + + static void d4_run_script_deconfig(void) + { +- d4_run_script(NULL, "deconfig"); + if (allow_deconfig) -+ udhcp_run_script(NULL, "deconfig"); ++ d4_run_script(NULL, "deconfig"); + } - change_listen_mode(LISTEN_NONE); - client_data.state = RELEASED; -@@ -1238,7 +1244,7 @@ + /*** Sending/receiving packets ***/ +@@ -1244,7 +1249,7 @@ /* Parse command line */ opt = getopt32long(argv, "^" /* O,x: list; -T,-t,-A take numeric param */ -- "CV:H:h:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB" -+ "CV:H:h:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fBD" +- "CV:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB" ++ "CV:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fBD" USE_FOR_MMU("b") IF_FEATURE_UDHCPC_ARPING("a::") IF_FEATURE_UDHCP_PORT("P:") -@@ -1349,6 +1355,10 @@ +@@ -1361,6 +1366,10 @@ logmode |= LOGMODE_SYSLOG; } @@ -95,49 +85,3 @@ Index: busybox-1.32.0/networking/udhcp/dhcpc.c /* Create pidfile */ write_pidfile(client_data.pidfile); /* Goes to stdout (unless NOMMU) and possibly syslog */ -@@ -1357,7 +1367,8 @@ - srand(monotonic_us()); - - client_data.state = INIT_SELECTING; -- udhcp_run_script(NULL, "deconfig"); -+ if (allow_deconfig) -+ udhcp_run_script(NULL, "deconfig"); - change_listen_mode(LISTEN_RAW); - packet_num = 0; - timeout = 0; -@@ -1530,7 +1541,8 @@ - } - /* Timed out, enter init state */ - bb_simple_info_msg("lease lost, entering init state"); -- udhcp_run_script(NULL, "deconfig"); -+ if (allow_deconfig) -+ udhcp_run_script(NULL, "deconfig"); - client_data.state = INIT_SELECTING; - client_data.first_secs = 0; /* make secs field count from 0 */ - /*timeout = 0; - already is */ -@@ -1722,8 +1734,10 @@ - "(got ARP reply), declining"); - send_decline(/*xid,*/ server_addr, packet.yiaddr); - -- if (client_data.state != REQUESTING) -- udhcp_run_script(NULL, "deconfig"); -+ if (client_data.state != REQUESTING) { -+ if (allow_deconfig) -+ udhcp_run_script(NULL, "deconfig"); -+ } - change_listen_mode(LISTEN_RAW); - client_data.state = INIT_SELECTING; - client_data.first_secs = 0; /* make secs field count from 0 */ -@@ -1792,8 +1806,10 @@ - /* return to init state */ - bb_info_msg("received %s", "DHCP NAK"); - udhcp_run_script(&packet, "nak"); -- if (client_data.state != REQUESTING) -- udhcp_run_script(NULL, "deconfig"); -+ if (client_data.state != REQUESTING) { -+ if (allow_deconfig) -+ udhcp_run_script(NULL, "deconfig"); -+ } - change_listen_mode(LISTEN_RAW); - sleep(3); /* avoid excessive network traffic */ - client_data.state = INIT_SELECTING; diff --git a/poky/meta/recipes-core/busybox/busybox/defconfig b/poky/meta/recipes-core/busybox/busybox/defconfig index 701d48d62..16c61a84b 100644 --- a/poky/meta/recipes-core/busybox/busybox/defconfig +++ b/poky/meta/recipes-core/busybox/busybox/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.33.0 -# Wed Mar 10 13:29:25 2021 +# Busybox version: 1.34.0 +# Wed Aug 23 09:07:25 2021 # CONFIG_HAVE_DOT_CONFIG=y @@ -207,11 +207,13 @@ CONFIG_CHOWN=y # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set CONFIG_CHROOT=y # CONFIG_CKSUM is not set +CONFIG_CRC32=y # CONFIG_COMM is not set CONFIG_CP=y # CONFIG_FEATURE_CP_LONG_OPTIONS is not set # CONFIG_FEATURE_CP_REFLINK is not set CONFIG_CUT=y +CONFIG_FEATURE_CUT_REGEX=y CONFIG_DATE=y # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set @@ -316,7 +318,6 @@ CONFIG_TEST2=y CONFIG_FEATURE_TEST_64=y # CONFIG_TIMEOUT is not set CONFIG_TOUCH=y -CONFIG_FEATURE_TOUCH_NODEREF=y CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y @@ -424,6 +425,7 @@ CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=1024 CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_COLON_EXPAND=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y # CONFIG_FEATURE_VI_REGEX_SEARCH is not set @@ -437,6 +439,7 @@ CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_UNDO=y CONFIG_FEATURE_VI_UNDO_QUEUE=y CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 +CONFIG_FEATURE_VI_VERBOSE_STATUS=y CONFIG_FEATURE_ALLOW_EXEC=y # @@ -743,6 +746,7 @@ CONFIG_FEATURE_VOLUMEID_SQUASHFS=y # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +CONFIG_ASCII=y # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set # CONFIG_BC is not set @@ -838,6 +842,7 @@ CONFIG_TS=y # CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set +# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set # # Networking Utilities @@ -976,6 +981,7 @@ CONFIG_TRACEROUTE=y CONFIG_WGET=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_FTP=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_TIMEOUT=y CONFIG_FEATURE_WGET_HTTPS=y diff --git a/poky/meta/recipes-core/busybox/busybox_1.33.1.bb b/poky/meta/recipes-core/busybox/busybox_1.34.0.bb index 4c2bc1106..51df1df05 100644 --- a/poky/meta/recipes-core/busybox/busybox_1.33.1.bb +++ b/poky/meta/recipes-core/busybox/busybox_1.34.0.bb @@ -47,9 +47,8 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ - file://0001-gen_build_files-Use-C-locale-when-calling-sed-on-glo.patch \ file://0001-mktemp-add-tmpdir-option.patch \ " -SRC_URI_append_libc-musl = " file://musl.cfg " +SRC_URI:append:libc-musl = " file://musl.cfg " -SRC_URI[tarball.sha256sum] = "12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28" +SRC_URI[tarball.sha256sum] = "ec8d1615edb045b83b81966604759c4d4ac921434ab4011da604f629c06074ce" diff --git a/poky/meta/recipes-core/coreutils/coreutils_8.32.bb b/poky/meta/recipes-core/coreutils/coreutils_8.32.bb index dd271d496..f82572ed5 100644 --- a/poky/meta/recipes-core/coreutils/coreutils_8.32.bb +++ b/poky/meta/recipes-core/coreutils/coreutils_8.32.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://src/ls.c;beginline=1;endline=15;md5=b7d80abf5b279320fb0e4b1007ed108b \ " DEPENDS = "gmp libcap" -DEPENDS_class-native = "" +DEPENDS:class-native = "" inherit autotools gettext texinfo @@ -31,21 +31,21 @@ SRC_URI[sha256sum] = "4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0b # runcon is not really a sandbox command, use `runcon ... setsid ...` to avoid this particular issue. CVE_CHECK_WHITELIST += "CVE-2016-2781" -EXTRA_OECONF_class-native = "--without-gmp" -EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}" -EXTRA_OECONF_class-nativesdk = "--enable-install-program=arch,hostname" +EXTRA_OECONF:class-native = "--without-gmp" +EXTRA_OECONF:class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}" +EXTRA_OECONF:class-nativesdk = "--enable-install-program=arch,hostname" # acl and xattr are not default features # -PACKAGECONFIG_class-target ??= "\ +PACKAGECONFIG:class-target ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)} \ " # The lib/oe/path.py requires xattr -PACKAGECONFIG_class-native ??= "xattr" +PACKAGECONFIG:class-native ??= "xattr" # oe-core builds need xattr support -PACKAGECONFIG_class-nativesdk ??= "xattr" +PACKAGECONFIG:class-nativesdk ??= "xattr" # with, without, depends, rdepends # @@ -71,16 +71,16 @@ sbindir_progs= "chroot" # coreutils-stdbuf without getting the rest of coreutils, but make # coreutils itself pull in stdbuf, so IMAGE_INSTALL += "coreutils" # always provides all coreutils -PACKAGE_BEFORE_PN_class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}" -FILES_coreutils-stdbuf = "${bindir}/stdbuf ${libdir}/coreutils/libstdbuf.so" -RDEPENDS_coreutils_class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}" +PACKAGE_BEFORE_PN:class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}" +FILES:coreutils-stdbuf = "${bindir}/stdbuf ${libdir}/coreutils/libstdbuf.so" +RDEPENDS:coreutils:class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}" # However, when the single-binary PACKAGECONFIG is used, stdbuf # functionality is built into the single coreutils binary, so there's # no point splitting /usr/bin/stdbuf to its own package. Instead, add # an RPROVIDE so that rdepending on coreutils-stdbuf will work # regardless of whether single-binary is in effect. -RPROVIDES_coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', 'coreutils-stdbuf', '', d)}" +RPROVIDES:coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', 'coreutils-stdbuf', '', d)}" # Let aclocal use the relative path for the m4 file rather than the # absolute since coreutils has a lot of m4 files, otherwise there might @@ -89,20 +89,20 @@ RPROVIDES_coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', ' acpaths = "-I ./m4" # Deal with a separate builddir failure if src doesn't exist when creating version.c/version.h -do_compile_prepend () { +do_compile:prepend () { mkdir -p ${B}/src } -do_install_class-native() { +do_install:class-native() { autotools_do_install # remove groups to fix conflict with shadow-native rm -f ${D}${STAGING_BINDIR_NATIVE}/groups # The return is a must since native doesn't need the - # do_install_append() in the below. + # do_install:append() in the below. return } -do_install_append() { +do_install:append() { for i in df mktemp nice printenv base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done install -d ${D}${base_bindir} @@ -122,8 +122,8 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" # Make hostname's priority higher than busybox but lower than net-tools ALTERNATIVE_PRIORITY[hostname] = "90" -ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base32 base64 nice printenv mktemp df" -ALTERNATIVE_${PN}-doc = "base64.1 nice.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1" +ALTERNATIVE:${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base32 base64 nice printenv mktemp df" +ALTERNATIVE:${PN}-doc = "base64.1 nice.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1" ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" @@ -166,12 +166,12 @@ BBCLASSEXTEND = "native nativesdk" inherit ptest -RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl make perl perl-modules python3-core sed shadow" +RDEPENDS:${PN}-ptest += "bash findutils gawk liberror-perl make perl perl-modules python3-core sed shadow" # -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy # may need tweaking if DEPENDS changes -RRECOMMENDS_coreutils-dev[nodeprrecs] = "1" -RRECOMMENDS_coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" +RRECOMMENDS:coreutils-dev[nodeprrecs] = "1" +RRECOMMENDS:coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" do_install_ptest () { install -d ${D}${PTEST_PATH}/tests @@ -206,7 +206,7 @@ do_install_ptest () { sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest } -FILES_${PN}-ptest += "${bindir}/getlimits" +FILES:${PN}-ptest += "${bindir}/getlimits" # These are specific to Opensuse CVE_WHITELIST += "CVE-2013-0221 CVE-2013-0222 CVE-2013-0223" diff --git a/poky/meta/recipes-core/dbus/dbus-glib_0.112.bb b/poky/meta/recipes-core/dbus/dbus-glib_0.112.bb index 003c3accc..99b0a2000 100644 --- a/poky/meta/recipes-core/dbus/dbus-glib_0.112.bb +++ b/poky/meta/recipes-core/dbus/dbus-glib_0.112.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c31c73c1d8f5d06784b2ccd22e42d641 \ SECTION = "base" DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" -DEPENDS_class-native = "glib-2.0-native dbus-native" +DEPENDS:class-native = "glib-2.0-native dbus-native" SRC_URI = "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ file://no-examples.patch \ @@ -20,20 +20,20 @@ SRC_URI[sha256sum] = "7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef71 inherit autotools pkgconfig gettext bash-completion gtk-doc #default disable regression tests, some unit test code in non testing code -#PACKAGECONFIG_pn-${PN} = "tests" enable regression tests local.conf +#PACKAGECONFIG:pn-${PN} = "tests" enable regression tests local.conf PACKAGECONFIG ??= "" PACKAGECONFIG[tests] = "--enable-tests,,," -EXTRA_OECONF_class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" +EXTRA_OECONF:class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" PACKAGES += "${PN}-tests" -FILES_${PN} = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" -FILES_${PN}-dev += "${bindir}/dbus-binding-tool" +FILES:${PN} = "${libdir}/lib*${SOLIBS}" +FILES:${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" +FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" +FILES:${PN}-dev += "${bindir}/dbus-binding-tool" -RDEPENDS_${PN}-tests += "dbus-x11" -FILES_${PN}-tests = "${datadir}/${BPN}/tests" +RDEPENDS:${PN}-tests += "dbus-x11" +FILES:${PN}-tests = "${datadir}/${BPN}/tests" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-core/dbus/dbus-test_1.12.20.bb b/poky/meta/recipes-core/dbus/dbus-test_1.12.20.bb index 755c841ba..ae7030143 100644 --- a/poky/meta/recipes-core/dbus/dbus-test_1.12.20.bb +++ b/poky/meta/recipes-core/dbus/dbus-test_1.12.20.bb @@ -10,7 +10,7 @@ SRC_URI += "file://run-ptest \ DEPENDS = "dbus glib-2.0" -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" S="${WORKDIR}/dbus-${PV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" @@ -58,7 +58,7 @@ do_install_ptest() { sed -i -e 's;@PTEST_PATH@;${PTEST_PATH};g' ${D}${PTEST_PATH}/run-ptest } -RDEPENDS_${PN}-ptest += "bash make dbus" -RDEPENDS_${PN}-ptest_remove = "${PN}" +RDEPENDS:${PN}-ptest += "bash make dbus" +RDEPENDS:${PN}-ptest:remove = "${PN}" -PRIVATE_LIBS_${PN}-ptest = "libdbus-1.so.3" +PRIVATE_LIBS:${PN}-ptest = "libdbus-1.so.3" diff --git a/poky/meta/recipes-core/dbus/dbus.inc b/poky/meta/recipes-core/dbus/dbus.inc index dcbcc0a9d..adc138bf1 100644 --- a/poky/meta/recipes-core/dbus/dbus.inc +++ b/poky/meta/recipes-core/dbus/dbus.inc @@ -8,6 +8,7 @@ SRC_URI = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch \ file://dbus-1.init \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ + file://stop_using_selinux_set_mapping.patch \ " SRC_URI[md5sum] = "dfe8a71f412e0b53be26ed4fbfdc91c4" @@ -15,20 +16,20 @@ SRC_URI[sha256sum] = "f77620140ecb4cdc67f37fb444f8a6bea70b5b6461f12f1cbe2cec60fa EXTRA_OECONF = "--disable-xml-docs \ --disable-doxygen-docs \ - --disable-libaudit \ --enable-largefile \ --with-system-socket=/run/dbus/system_bus_socket \ " -EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" -EXTRA_OECONF_append_class-native = " --disable-selinux" +EXTRA_OECONF:append:class-target = " SYSTEMCTL=${base_bindir}/systemctl" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ user-session \ " -PACKAGECONFIG_class-native = "" -PACKAGECONFIG_class-nativesdk = "" +PACKAGECONFIG:class-native = "" +PACKAGECONFIG:class-nativesdk = "" PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" PACKAGECONFIG[user-session] = "--enable-user-session --with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session" PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,," +PACKAGECONFIG[audit] = "--enable-libaudit,--disable-libaudit,audit" +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" diff --git a/poky/meta/recipes-core/dbus/dbus/stop_using_selinux_set_mapping.patch b/poky/meta/recipes-core/dbus/dbus/stop_using_selinux_set_mapping.patch new file mode 100644 index 000000000..7035098e4 --- /dev/null +++ b/poky/meta/recipes-core/dbus/dbus/stop_using_selinux_set_mapping.patch @@ -0,0 +1,148 @@ +From 6072f8b24153d844a3033108a17bcd0c1a967816 Mon Sep 17 00:00:00 2001 +From: Laurent Bigonville <bigon@bigon.be> +Date: Sat, 3 Mar 2018 11:15:23 +0100 +Subject: [PATCH] Stop using selinux_set_mapping() function + +Currently, if the "dbus" security class or the associated AV doesn't +exist, dbus-daemon fails to initialize and exits immediately. Also the +security classes or access vector cannot be reordered in the policy. +This can be a problem for people developing their own policy or trying +to access a machine where, for some reasons, there is not policy defined +at all. + +The code here copy the behaviour of the selinux_check_access() function. +We cannot use this function here as it doesn't allow us to define the +AVC entry reference. + +See the discussion at https://marc.info/?l=selinux&m=152163374332372&w=2 + +Resolves: https://gitlab.freedesktop.org/dbus/dbus/issues/198 +--- + bus/selinux.c | 75 ++++++++++++++++++++++++++++----------------------- + 1 file changed, 42 insertions(+), 33 deletions(-) + + +Upstream-Status: Backport +Signed-off-by: Nisha.Parrakat <Nisha.Parrakat@kpit.com> +diff --git a/bus/selinux.c b/bus/selinux.c + +--- a/bus/selinux.c 2021-08-11 14:45:59.048513026 +0000 ++++ b/bus/selinux.c 2021-08-11 14:57:47.144846966 +0000 +@@ -311,24 +311,6 @@ + #endif + } + +-/* +- * Private Flask definitions; the order of these constants must +- * exactly match that of the structure array below! +- */ +-/* security dbus class constants */ +-#define SECCLASS_DBUS 1 +- +-/* dbus's per access vector constants */ +-#define DBUS__ACQUIRE_SVC 1 +-#define DBUS__SEND_MSG 2 +- +-#ifdef HAVE_SELINUX +-static struct security_class_mapping dbus_map[] = { +- { "dbus", { "acquire_svc", "send_msg", NULL } }, +- { NULL } +-}; +-#endif /* HAVE_SELINUX */ +- + /** + * Establish dynamic object class and permission mapping and + * initialize the user space access vector cache (AVC) for D-Bus and set up +@@ -350,13 +332,6 @@ + + _dbus_verbose ("SELinux is enabled in this kernel.\n"); + +- if (selinux_set_mapping (dbus_map) < 0) +- { +- _dbus_warn ("Failed to set up security class mapping (selinux_set_mapping():%s).", +- strerror (errno)); +- return FALSE; +- } +- + avc_entry_ref_init (&aeref); + if (avc_init ("avc", &mem_cb, &log_cb, &thread_cb, &lock_cb) < 0) + { +@@ -421,19 +396,53 @@ + static dbus_bool_t + bus_selinux_check (BusSELinuxID *sender_sid, + BusSELinuxID *override_sid, +- security_class_t target_class, +- access_vector_t requested, ++ const char *target_class, ++ const char *requested, + DBusString *auxdata) + { ++ int saved_errno; ++ security_class_t security_class; ++ access_vector_t requested_access; ++ + if (!selinux_enabled) + return TRUE; + ++ security_class = string_to_security_class (target_class); ++ if (security_class == 0) ++ { ++ saved_errno = errno; ++ log_callback (SELINUX_ERROR, "Unknown class %s", target_class); ++ if (security_deny_unknown () == 0) ++ { ++ return TRUE; ++ } ++ ++ _dbus_verbose ("Unknown class %s\n", target_class); ++ errno = saved_errno; ++ return FALSE; ++ } ++ ++ requested_access = string_to_av_perm (security_class, requested); ++ if (requested_access == 0) ++ { ++ saved_errno = errno; ++ log_callback (SELINUX_ERROR, "Unknown permission %s for class %s", requested, target_class); ++ if (security_deny_unknown () == 0) ++ { ++ return TRUE; ++ } ++ ++ _dbus_verbose ("Unknown permission %s for class %s\n", requested, target_class); ++ errno = saved_errno; ++ return FALSE; ++ } ++ + /* Make the security check. AVC checks enforcing mode here as well. */ + if (avc_has_perm (SELINUX_SID_FROM_BUS (sender_sid), + override_sid ? + SELINUX_SID_FROM_BUS (override_sid) : + bus_sid, +- target_class, requested, &aeref, auxdata) < 0) ++ security_class, requested_access, &aeref, auxdata) < 0) + { + switch (errno) + { +@@ -500,8 +509,8 @@ + + ret = bus_selinux_check (connection_sid, + service_sid, +- SECCLASS_DBUS, +- DBUS__ACQUIRE_SVC, ++ "dbus", ++ "acquire_svc", + &auxdata); + + _dbus_string_free (&auxdata); +@@ -629,8 +638,8 @@ + + ret = bus_selinux_check (sender_sid, + recipient_sid, +- SECCLASS_DBUS, +- DBUS__SEND_MSG, ++ "dbus", ++ "send_msg", + &auxdata); + + _dbus_string_free (&auxdata); diff --git a/poky/meta/recipes-core/dbus/dbus_1.12.20.bb b/poky/meta/recipes-core/dbus/dbus_1.12.20.bb index 2f6da6751..48947209d 100644 --- a/poky/meta/recipes-core/dbus/dbus_1.12.20.bb +++ b/poky/meta/recipes-core/dbus/dbus_1.12.20.bb @@ -7,10 +7,10 @@ require dbus.inc DEPENDS = "expat virtual/libintl autoconf-archive" PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" -ALLOW_EMPTY_dbus-ptest = "1" -RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" -RDEPENDS_${PN} += "${PN}-common ${PN}-tools" -RDEPENDS_${PN}_class-native = "" +ALLOW_EMPTY:dbus-ptest = "1" +RDEPENDS:dbus-ptest:class-target = "dbus-test-ptest" +RDEPENDS:${PN} += "${PN}-common ${PN}-tools" +RDEPENDS:${PN}:class-native = "" inherit useradd update-rc.d @@ -25,22 +25,22 @@ python __anonymous() { PACKAGES =+ "${PN}-lib ${PN}-common ${PN}-tools" USERADD_PACKAGES = "dbus-common" -USERADD_PARAM_dbus-common = "--system --home ${localstatedir}/lib/dbus \ +USERADD_PARAM:dbus-common = "--system --home ${localstatedir}/lib/dbus \ --no-create-home --shell /bin/false \ --user-group messagebus" -CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" +CONFFILES:${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" -DEBIANNAME_${PN} = "dbus-1" +DEBIANNAME:${PN} = "dbus-1" OLDPKGNAME = "dbus-x11" -OLDPKGNAME_class-nativesdk = "" +OLDPKGNAME:class-nativesdk = "" # for compatibility -RPROVIDES_${PN} = "${OLDPKGNAME}" -RREPLACES_${PN} += "${OLDPKGNAME}" +RPROVIDES:${PN} = "${OLDPKGNAME}" +RREPLACES:${PN} += "${OLDPKGNAME}" -FILES_${PN} = "${bindir}/dbus-daemon* \ +FILES:${PN} = "${bindir}/dbus-daemon* \ ${bindir}/dbus-cleanup-sockets \ ${bindir}/dbus-launch \ ${bindir}/dbus-run-session \ @@ -51,7 +51,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ ${systemd_user_unitdir} \ ${nonarch_libdir}/tmpfiles.d/dbus.conf \ " -FILES_${PN}-common = "${sysconfdir}/dbus-1 \ +FILES:${PN}-common = "${sysconfdir}/dbus-1 \ ${datadir}/dbus-1/services \ ${datadir}/dbus-1/system-services \ ${datadir}/dbus-1/session.d \ @@ -64,17 +64,17 @@ FILES_${PN}-common = "${sysconfdir}/dbus-1 \ ${systemd_user_unitdir}/sockets.target.wants \ ${nonarch_libdir}/sysusers.d/dbus.conf \ " -FILES_${PN}-tools = "${bindir}/dbus-uuidgen \ +FILES:${PN}-tools = "${bindir}/dbus-uuidgen \ ${bindir}/dbus-send \ ${bindir}/dbus-monitor \ ${bindir}/dbus-update-activation-environment \ " -FILES_${PN}-lib = "${libdir}/lib*.so.*" -RRECOMMENDS_${PN}-lib = "${PN}" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" +FILES:${PN}-lib = "${libdir}/lib*.so.*" +RRECOMMENDS:${PN}-lib = "${PN}" +FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" -pkg_postinst_dbus() { +pkg_postinst:dbus() { # If both systemd and sysvinit are enabled, mask the dbus-1 init script if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then if [ -n "$D" ]; then @@ -130,7 +130,7 @@ do_install() { rm -rf ${D}${localstatedir}/run } -do_install_class-native() { +do_install:class-native() { autotools_do_install # dbus-launch has no X support so lets not install it in case the host @@ -138,7 +138,7 @@ do_install_class-native() { rm -f ${D}${bindir}/dbus-launch } -do_install_class-nativesdk() { +do_install:class-nativesdk() { autotools_do_install # dbus-launch has no X support so lets not install it in case the host @@ -150,4 +150,4 @@ do_install_class-nativesdk() { } BBCLASSEXTEND = "native nativesdk" -INSANE_SKIP_${PN}-ptest += "build-deps" +INSANE_SKIP:${PN}-ptest += "build-deps" diff --git a/poky/meta/recipes-core/dropbear/dropbear.inc b/poky/meta/recipes-core/dropbear/dropbear.inc index ed3ef3384..f2a490c47 100644 --- a/poky/meta/recipes-core/dropbear/dropbear.inc +++ b/poky/meta/recipes-core/dropbear/dropbear.inc @@ -9,8 +9,8 @@ LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" LIC_FILES_CHKSUM = "file://LICENSE;md5=25cf44512b7bc8966a48b6b1a9b7605f" DEPENDS = "zlib virtual/crypt" -RPROVIDES_${PN} = "ssh sshd" -RCONFLICTS_${PN} = "openssh-sshd openssh" +RPROVIDES:${PN} = "ssh sshd" +RCONFLICTS:${PN} = "openssh-sshd openssh" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" @@ -33,7 +33,7 @@ PAM_PLUGINS = "libpam-runtime \ pam-plugin-permit \ pam-plugin-unix \ " -RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" +RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" inherit autotools update-rc.d systemd @@ -42,7 +42,7 @@ CVE_PRODUCT = "dropbear_ssh" INITSCRIPT_NAME = "dropbear" INITSCRIPT_PARAMS = "defaults 10" -SYSTEMD_SERVICE_${PN} = "dropbear.socket" +SYSTEMD_SERVICE:${PN} = "dropbear.socket" SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" BINCOMMANDS = "dbclient ssh scp" @@ -60,7 +60,7 @@ EXTRA_OECONF += "\ EXTRA_OECONF += "--disable-harden" # musl does not implement wtmp/logwtmp APIs -EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" +EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog" do_install() { install -d ${D}${sysconfdir} \ @@ -110,11 +110,11 @@ do_install() { inherit update-alternatives ALTERNATIVE_PRIORITY = "20" -ALTERNATIVE_${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}" +ALTERNATIVE:${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}" ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti" -pkg_postrm_append_${PN} () { +pkg_postrm:${PN} () { if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then rm ${sysconfdir}/dropbear/dropbear_rsa_host_key fi @@ -123,4 +123,4 @@ pkg_postrm_append_${PN} () { fi } -FILES_${PN} += "${bindir}" +FILES:${PN} += "${bindir}" diff --git a/poky/meta/recipes-core/ell/ell_0.41.bb b/poky/meta/recipes-core/ell/ell_0.43.bb index 5fd3077bc..3d3ef8266 100644 --- a/poky/meta/recipes-core/ell/ell_0.41.bb +++ b/poky/meta/recipes-core/ell/ell_0.43.bb @@ -17,8 +17,8 @@ inherit autotools pkgconfig SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-pem.c-do-not-use-rawmemchr.patch \ " -SRC_URI[sha256sum] = "4e8dba6c53cf152dbd0fd1dc3d4c7b04abf79e20a948895f85943e586870505c" +SRC_URI[sha256sum] = "b6c75895ad64bf78f5b5c464de871048d02f9403be518084e0d64b58f508c9fc" -do_configure_prepend () { +do_configure:prepend () { mkdir -p ${S}/build-aux } diff --git a/poky/meta/recipes-core/expat/expat_2.4.1.bb b/poky/meta/recipes-core/expat/expat_2.4.1.bb index 451158a5d..555dd0d60 100644 --- a/poky/meta/recipes-core/expat/expat_2.4.1.bb +++ b/poky/meta/recipes-core/expat/expat_2.4.1.bb @@ -13,13 +13,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ SRC_URI[sha256sum] = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40" -EXTRA_OECMAKE_class-native += "-DEXPAT_BUILD_DOCS=OFF" +EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF" -RDEPENDS_${PN}-ptest += "bash" +RDEPENDS:${PN}-ptest += "bash" inherit cmake lib_package ptest -do_install_ptest_class-target() { +do_install_ptest:class-target() { install -m 755 ${B}/tests/* ${D}${PTEST_PATH} } diff --git a/poky/meta/recipes-core/gettext/gettext_0.21.bb b/poky/meta/recipes-core/gettext/gettext_0.21.bb index b86e8d838..5ada70993 100644 --- a/poky/meta/recipes-core/gettext/gettext_0.21.bb +++ b/poky/meta/recipes-core/gettext/gettext_0.21.bb @@ -9,10 +9,10 @@ LICENSE = "GPLv3+ & LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" DEPENDS = "gettext-native virtual/libiconv" -DEPENDS_class-native = "gettext-minimal-native" +DEPENDS:class-native = "gettext-minimal-native" PROVIDES = "virtual/libintl virtual/gettext" -PROVIDES_class-native = "virtual/gettext-native" -RCONFLICTS_${PN} = "proxy-libintl" +PROVIDES:class-native = "virtual/gettext-native" +RCONFLICTS:${PN} = "proxy-libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://parallel.patch \ file://use-pkgconfig.patch \ @@ -39,7 +39,7 @@ EXTRA_OECONF += "--without-lispdir \ --without-git \ --cache-file=${B}/config.cache \ " -EXTRA_OECONF_append_class-target = " \ +EXTRA_OECONF:append:class-target = " \ --with-bisonlocaledir=${datadir}/locale \ gt_cv_locale_fr_utf8=fr_FR \ gt_cv_locale_fr=fr_FR.ISO-8859-1 \ @@ -48,8 +48,8 @@ EXTRA_OECONF_append_class-target = " \ " PACKAGECONFIG ??= "croco glib libxml" -PACKAGECONFIG_class-native = "" -PACKAGECONFIG_class-nativesdk = "" +PACKAGECONFIG:class-native = "" +PACKAGECONFIG:class-nativesdk = "" PACKAGECONFIG[croco] = "--without-included-libcroco,--with-included-libcroco,libcroco" PACKAGECONFIG[glib] = "--without-included-glib,--with-included-glib,glib-2.0" @@ -62,7 +62,7 @@ PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,-- acpaths = '-I ${S}/gettext-runtime/m4 \ -I ${S}/gettext-tools/m4' -do_install_append_libc-musl () { +do_install:append:libc-musl () { rm -f ${D}${libdir}/charset.alias rm -f ${D}${includedir}/libintl.h rm -f ${D}${libdir}/libintl.la @@ -79,29 +79,29 @@ do_install_append_libc-musl () { # 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk PACKAGES =+ "libgettextlib libgettextsrc" -FILES_libgettextlib = "${libdir}/libgettextlib-*.so*" -FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*" +FILES:libgettextlib = "${libdir}/libgettextlib-*.so*" +FILES:libgettextsrc = "${libdir}/libgettextsrc-*.so*" PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc" -FILES_${PN} += "${libdir}/${BPN}/*" +FILES:${PN} += "${libdir}/${BPN}/*" # The its/Makefile.am has defined: # itsdir = $(pkgdatadir)$(PACKAGE_SUFFIX)/its # not itsdir = $(pkgdatadir), so use wildcard to match the version. -FILES_${PN} += "${datadir}/${BPN}-*/*" +FILES:${PN} += "${datadir}/${BPN}-*/*" -FILES_gettext-runtime = "${bindir}/gettext \ +FILES:gettext-runtime = "${bindir}/gettext \ ${bindir}/ngettext \ ${bindir}/envsubst \ ${bindir}/gettext.sh \ ${libdir}/libasprintf.so* \ ${libdir}/GNU.Gettext.dll \ " -FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ +FILES:gettext-runtime-dev += "${libdir}/libasprintf.a \ ${includedir}/autosprintf.h \ " -FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ +FILES:gettext-runtime-doc = "${mandir}/man1/gettext.* \ ${mandir}/man1/ngettext.* \ ${mandir}/man1/envsubst.* \ ${mandir}/man1/.* \ @@ -116,11 +116,11 @@ FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ ${infodir}/autosprintf.info \ " -do_install_append() { +do_install:append() { rm -f ${D}${libdir}/preloadable_libintl.so } -do_install_append_class-native () { +do_install:append:class-native () { rm ${D}${datadir}/aclocal/* rm ${D}${datadir}/gettext/config.rpath rm ${D}${datadir}/gettext/po/Makefile.in.in @@ -171,11 +171,12 @@ do_install_ptest() { find ${D}${PTEST_PATH}/ -name "*.o" -exec rm {} \; chmod 0755 ${D}${PTEST_PATH}/tests/lang-vala ${D}${PTEST_PATH}/tests/plural-1 ${D}${PTEST_PATH}/tests/xgettext-tcl-4 \ ${D}${PTEST_PATH}/tests/xgettext-vala-1 ${D}${PTEST_PATH}/tests/xgettext-po-2 + sed -i -e 's|${DEBUG_PREFIX_MAP}||g' ${D}${PTEST_PATH}/tests/init-env fi } -RDEPENDS_${PN}-ptest += "make xz" -RDEPENDS_${PN}-ptest_append_libc-glibc = "\ +RDEPENDS:${PN}-ptest += "make xz" +RDEPENDS:${PN}-ptest:append:libc-glibc = "\ glibc-gconv-big5 \ glibc-charmap-big5 \ glibc-gconv-cp1251 \ @@ -196,12 +197,12 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\ locale-base-fr-fr \ " -RRECOMMENDS_${PN}-ptest_append_libc-glibc = "\ +RRECOMMENDS:${PN}-ptest:append:libc-glibc = "\ locale-base-de-de.iso-8859-1 \ locale-base-fr-fr.iso-8859-1 \ " -INSANE_SKIP_${PN}-ptest += "ldflags" -INSANE_SKIP_${PN}-ptest += "rpaths" +INSANE_SKIP:${PN}-ptest += "ldflags" +INSANE_SKIP:${PN}-ptest += "rpaths" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch deleted file mode 100644 index 6ff25fc53..000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 8 Jul 2021 17:26:43 -0700 -Subject: [PATCH] correctly use 3 parameters for close_range - -libc implementation has 3 parameter e.g. -https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2180] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - glib/gspawn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/gspawn.c b/glib/gspawn.c -index 899647c2f..3073a10a4 100644 ---- a/glib/gspawn.c -+++ b/glib/gspawn.c -@@ -1520,7 +1520,7 @@ safe_closefrom (int lowfd) - * - * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, - * fall back to safe_fdwalk(). */ -- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) -+ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) - #endif /* HAVE_CLOSE_RANGE */ - (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); - #endif --- -2.32.0 diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index f34f30bb3..846c8d62b 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,4 +1,4 @@ -From e56cdb8c343dd6a6ed3b10bd54e353d633ad6158 Mon Sep 17 00:00:00 2001 +From dac2bdeea38388e069412aa27eff8f1eff0440e5 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.68.4.bb index cbce6eae6..cd789de3c 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.68.4.bb @@ -18,11 +18,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ file://time-test.patch \ - file://0001-correctly-use-3-parameters-for-close_range.patch \ " -SRC_URI_append_class-native = " file://relocate-modules.patch" +SRC_URI:append:class-native = " file://relocate-modules.patch" -SRC_URI[sha256sum] = "e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138" +SRC_URI[sha256sum] = "62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON. diff --git a/poky/meta/recipes-core/glib-2.0/glib.inc b/poky/meta/recipes-core/glib-2.0/glib.inc index 71777bc45..a34776b08 100644 --- a/poky/meta/recipes-core/glib-2.0/glib.inc +++ b/poky/meta/recipes-core/glib-2.0/glib.inc @@ -4,7 +4,7 @@ HOMEPAGE = "https://developer.gnome.org/glib/" # pcre is under BSD; # docs/reference/COPYING is with a 'public domain'-like license! -LICENSE = "LGPLv2.1+ & BSD & PD" +LICENSE = "LGPLv2.1+ & BSD-3-Clause & PD" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ file://gmodule/COPYING;md5=4fbd65380cdd255951079008b364516c \ @@ -30,7 +30,7 @@ LEAD_SONAME = "libglib-2.0.*" inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages -DEPENDS_append_class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" +DEPENDS:append:class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" GTKDOC_MESON_OPTION = "gtk_doc" @@ -45,58 +45,59 @@ PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native" # libelf is auto-detected without a configuration option PACKAGECONFIG[libelf] = ",,elfutils" PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus" +PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux" -EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=disabled" +EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false" -do_configure_prepend() { +do_configure:prepend() { sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in } -FILES_${PN} = "${libdir}/lib*${SOLIBS} \ +FILES:${PN} = "${libdir}/lib*${SOLIBS} \ ${libdir}/gio \ ${libexecdir}/*gio-querymodules \ ${datadir}/glib-2.0/schemas" -FILES_${PN}-utils += "${bindir}/glib-genmarshal \ +FILES:${PN}-utils += "${bindir}/glib-genmarshal \ ${bindir}/glib-gettextize \ ${bindir}/glib-mkenums \ ${bindir}/glib-compile-resources" -FILES_${PN}-dev += "${libdir}/glib-2.0/include \ +FILES:${PN}-dev += "${libdir}/glib-2.0/include \ ${libdir}/gio/modules/lib*${SOLIBSDEV} \ ${libdir}/gio/modules/*.la \ ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ ${datadir}/glib-2.0/schemas/gschema.dtd \ ${datadir}/glib-2.0/valgrind/glib.supp \ ${datadir}/gettext/its" -FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" -FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ +FILES:${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" +FILES:${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ ${bindir}/gdbus-codegen" -FILES_${PN}-utils = "${bindir}/*" +FILES:${PN}-utils = "${bindir}/*" SHAREDMIMEDEP = "shared-mime-info" -SHAREDMIMEDEP_class-native = "" +SHAREDMIMEDEP:class-native = "" # When cross compiling for Windows we don't want to include this -SHAREDMIMEDEP_mingw32 = "" +SHAREDMIMEDEP:mingw32 = "" -RRECOMMENDS_${PN} += "${SHAREDMIMEDEP}" +RRECOMMENDS:${PN} += "${SHAREDMIMEDEP}" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" # Valgrind runtime detection works using hand-written assembly, which # doesn't support mips16e -CPPFLAGS_append_class-target_mips16e = " -DNVALGRIND=1" +CPPFLAGS:append:class-target:mips16e = " -DNVALGRIND=1" # GLib generally requires gettext to be present so for USE_NLS to yes. For # native builds as i18n is disabled globally we have to add a gettext-native dependency. -USE_NLS_class-target = "yes" -USE_NLS_class-nativesdk = "yes" -DEPENDS_append_class-native = " gettext-native" +USE_NLS:class-target = "yes" +USE_NLS:class-nativesdk = "yes" +DEPENDS:append:class-native = " gettext-native" EXEEXT = "" -EXEEXT_mingw32 = ".exe" +EXEEXT:mingw32 = ".exe" -do_install_append () { +do_install:append () { if [ -f ${D}${bindir}/gtester-report ]; then sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python3|' fi @@ -118,7 +119,7 @@ do_install_append () { mkdir -p ${D}${libdir}/gio/modules } -do_install_append_class-target () { +do_install:append:class-target () { # Tests are only installed on targets, not native builds. Separating this out # keeps glib-2.0-native from depending on DISTRO_FEATURES if [ -f ${D}${datadir}/installed-tests/glib/gdbus-serialization.test ]; then @@ -134,18 +135,18 @@ do_install_append_class-target () { } # As we do not build python3 for windows, makes no sense to ship the script that's using it -do_install_append_mingw32() { +do_install:append:mingw32() { rm -f ${D}${bindir}/gtester-report } CODEGEN_PYTHON_RDEPENDS = "python3 python3-distutils python3-xml" -CODEGEN_PYTHON_RDEPENDS_mingw32 = "" +CODEGEN_PYTHON_RDEPENDS:mingw32 = "" -RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" +RDEPENDS:${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" -RDEPENDS_${PN}-ptest += "${PN}-utils" +RDEPENDS:${PN}-ptest += "${PN}-utils" -RDEPENDS_${PN}-ptest += "\ +RDEPENDS:${PN}-ptest += "\ coreutils \ libgcc \ dbus \ @@ -170,7 +171,7 @@ RDEPENDS_${PN}-ptest += "\ ${PN}-codegen \ " -RDEPENDS_${PN}-ptest_append_libc-glibc = "\ +RDEPENDS:${PN}-ptest:append:libc-glibc = "\ glibc-gconv-utf-16 \ glibc-charmap-utf-8 \ glibc-gconv-cp1255 \ diff --git a/poky/meta/recipes-core/glib-networking/glib-networking_2.68.1.bb b/poky/meta/recipes-core/glib-networking/glib-networking_2.68.2.bb index fac04087d..acea26e08 100644 --- a/poky/meta/recipes-core/glib-networking/glib-networking_2.68.1.bb +++ b/poky/meta/recipes-core/glib-networking/glib-networking_2.68.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" DEPENDS = "glib-2.0" -SRC_URI[archive.sha256sum] = "d05d8bd124a9f53fc2b93b18f2386d512e4f48bc5a80470a7967224f3bf53b30" +SRC_URI[archive.sha256sum] = "535ebc054ef697db56a4fffed91bc0e11c8ee1c9acb48aad28c8e1d5c3d5994f" PACKAGECONFIG ??= "openssl ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" @@ -25,14 +25,14 @@ inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome SRC_URI += "file://run-ptest" -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/gio/modules/libgio*.so \ ${datadir}/dbus-1/services/ \ ${systemd_user_unitdir} \ " -FILES_${PN}-dev += "${libdir}/gio/modules/libgio*.la" -FILES_${PN}-staticdev += "${libdir}/gio/modules/libgio*.a" +FILES:${PN}-dev += "${libdir}/gio/modules/libgio*.la" +FILES:${PN}-staticdev += "${libdir}/gio/modules/libgio*.a" -RDEPENDS_${PN}-ptest += "bash" +RDEPENDS:${PN}-ptest += "bash" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-core/glibc/cross-localedef-native_2.33.bb b/poky/meta/recipes-core/glibc/cross-localedef-native_2.34.bb index ec59c6ba1..6100f3d4c 100644 --- a/poky/meta/recipes-core/glibc/cross-localedef-native_2.33.bb +++ b/poky/meta/recipes-core/glibc/cross-localedef-native_2.34.bb @@ -25,14 +25,13 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0001-localedef-Add-hardlink-resolver-from-util-linux.patch \ file://0002-localedef-fix-ups-hardlink-to-make-it-compile.patch \ \ - file://0016-timezone-re-written-tzselect-as-posix-sh.patch \ - file://0017-Remove-bash-dependency-for-nscd-init-script.patch \ - file://0018-eglibc-Cross-building-and-testing-instructions.patch \ - file://0019-eglibc-Help-bootstrap-cross-toolchain.patch \ - file://0020-eglibc-Resolve-__fpscr_values-on-SH4.patch \ - file://0021-eglibc-Forward-port-cross-locale-generation-support.patch \ - file://0022-Define-DUMMY_LOCALE_T-if-not-defined.patch \ - file://0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ + file://0017-timezone-re-written-tzselect-as-posix-sh.patch \ + file://0018-Remove-bash-dependency-for-nscd-init-script.patch \ + file://0019-eglibc-Cross-building-and-testing-instructions.patch \ + file://0020-eglibc-Help-bootstrap-cross-toolchain.patch \ + file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \ + file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \ + file://0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ " # Makes for a rather long rev (22 characters), but... # diff --git a/poky/meta/recipes-core/glibc/glibc-common.inc b/poky/meta/recipes-core/glibc/glibc-common.inc index 41ff7e9a1..f695cd6a4 100644 --- a/poky/meta/recipes-core/glibc/glibc-common.inc +++ b/poky/meta/recipes-core/glibc/glibc-common.inc @@ -13,13 +13,13 @@ CVE_PRODUCT = "glibc" INHIBIT_DEFAULT_DEPS = "1" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv6 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" # # We will skip parsing glibc when target system C library selection is not glibc # this helps in easing out parsing for non-glibc system libraries # -COMPATIBLE_HOST_libc-musl_class-target = "null" +COMPATIBLE_HOST:libc-musl:class-target = "null" -PV = "2.33" +PV = "2.34" diff --git a/poky/meta/recipes-core/glibc/glibc-ld.inc b/poky/meta/recipes-core/glibc/glibc-ld.inc index 041ffbb9c..da8fcc430 100644 --- a/poky/meta/recipes-core/glibc/glibc-ld.inc +++ b/poky/meta/recipes-core/glibc/glibc-ld.inc @@ -16,5 +16,5 @@ def glibc_dl_info(d): EGLIBC_KNOWN_INTERPRETER_NAMES = "${@glibc_dl_info(d)['ldconfig']}" RTLDLIST = "${@glibc_dl_info(d)['lddrewrite']}" -RTLDLIST_class-nativesdk = "${base_libdir}/${@bb.utils.contains('SDK_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', 'ld-linux.so.2', d)}" +RTLDLIST:class-nativesdk = "${base_libdir}/${@bb.utils.contains('SDK_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', 'ld-linux.so.2', d)}" glibc_dl_info[vardepsexclude] = "OVERRIDES" diff --git a/poky/meta/recipes-core/glibc/glibc-locale.inc b/poky/meta/recipes-core/glibc/glibc-locale.inc index ef06389ff..b8de7d319 100644 --- a/poky/meta/recipes-core/glibc/glibc-locale.inc +++ b/poky/meta/recipes-core/glibc/glibc-locale.inc @@ -9,7 +9,7 @@ LOCALEBASEPN = "${MLPREFIX}glibc" # ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'glibc-locale/2.17-r0/package/usr/lib/gconv/IBM1166.so' 'glibc-locale/2.17-r0/package/usr/lib/gconv/.debug/IBM1166.so') # ERROR: Function failed: split_and_strip_files BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" -BINUTILSDEP_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" +BINUTILSDEP:class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" do_package[depends] += "${BINUTILSDEP}" DEPENDS += "virtual/libc" @@ -21,7 +21,7 @@ DEPENDS += "virtual/libc" # default to disabled ENABLE_BINARY_LOCALE_GENERATION ?= "0" -ENABLE_BINARY_LOCALE_GENERATION_pn-nativesdk-glibc-locale = "1" +ENABLE_BINARY_LOCALE_GENERATION:pn-nativesdk-glibc-locale = "1" #enable locale generation on these arches # BINARY_LOCALE_ARCHES is a space separated list of regular expressions @@ -40,32 +40,32 @@ PACKAGES_DYNAMIC = "^locale-base-.* \ ^${MLPREFIX}glibc-gconv$" # Create a glibc-binaries package -ALLOW_EMPTY_${BPN}-binaries = "1" +ALLOW_EMPTY:${BPN}-binaries = "1" PACKAGES += "${BPN}-binaries" -RRECOMMENDS_${BPN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-binary") != -1])}" +RRECOMMENDS:${BPN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-binary") != -1])}" # Create a glibc-charmaps package -ALLOW_EMPTY_${BPN}-charmaps = "1" +ALLOW_EMPTY:${BPN}-charmaps = "1" PACKAGES += "${BPN}-charmaps" -RRECOMMENDS_${BPN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-charmap") != -1])}" +RRECOMMENDS:${BPN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-charmap") != -1])}" # Create a glibc-gconvs package -ALLOW_EMPTY_${BPN}-gconvs = "1" +ALLOW_EMPTY:${BPN}-gconvs = "1" PACKAGES += "${BPN}-gconvs" -RRECOMMENDS_${BPN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-gconv") != -1])}" +RRECOMMENDS:${BPN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-gconv") != -1])}" # Create a glibc-localedatas package -ALLOW_EMPTY_${BPN}-localedatas = "1" +ALLOW_EMPTY:${BPN}-localedatas = "1" PACKAGES += "${BPN}-localedatas" -RRECOMMENDS_${BPN}-localedatas = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-localedata") != -1])}" +RRECOMMENDS:${BPN}-localedatas = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-localedata") != -1])}" -DESCRIPTION_localedef = "glibc: compile locale definition files" +DESCRIPTION:localedef = "glibc: compile locale definition files" # glibc-gconv is dynamically added into PACKAGES, thus -# FILES_glibc-gconv will not be automatically extended in multilib. -# Explicitly add ${MLPREFIX} for FILES_glibc-gconv. -FILES_${MLPREFIX}glibc-gconv = "${libdir}/gconv/*" -FILES_localedef = "${bindir}/localedef" +# FILES:glibc-gconv will not be automatically extended in multilib. +# Explicitly add ${MLPREFIX} for FILES:glibc-gconv. +FILES:${MLPREFIX}glibc-gconv = "${libdir}/gconv/*" +FILES:localedef = "${bindir}/localedef" LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale" diff --git a/poky/meta/recipes-core/glibc/glibc-locale_2.33.bb b/poky/meta/recipes-core/glibc/glibc-locale_2.34.bb index f7702e035..f7702e035 100644 --- a/poky/meta/recipes-core/glibc/glibc-locale_2.33.bb +++ b/poky/meta/recipes-core/glibc/glibc-locale_2.34.bb diff --git a/poky/meta/recipes-core/glibc/glibc-mtrace.inc b/poky/meta/recipes-core/glibc/glibc-mtrace.inc index ef9d60ec2..734a56656 100644 --- a/poky/meta/recipes-core/glibc/glibc-mtrace.inc +++ b/poky/meta/recipes-core/glibc/glibc-mtrace.inc @@ -2,8 +2,8 @@ require glibc-collateral.inc SUMMARY = "mtrace utility provided by glibc" DESCRIPTION = "mtrace utility provided by glibc" -RDEPENDS_${PN} = "perl" -RPROVIDES_${PN} = "libc-mtrace" +RDEPENDS:${PN} = "perl" +RPROVIDES:${PN} = "libc-mtrace" SRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale/scripts" diff --git a/poky/meta/recipes-core/glibc/glibc-mtrace_2.33.bb b/poky/meta/recipes-core/glibc/glibc-mtrace_2.34.bb index 0b69bad46..0b69bad46 100644 --- a/poky/meta/recipes-core/glibc/glibc-mtrace_2.33.bb +++ b/poky/meta/recipes-core/glibc/glibc-mtrace_2.34.bb diff --git a/poky/meta/recipes-core/glibc/glibc-package.inc b/poky/meta/recipes-core/glibc/glibc-package.inc index 92e5dbac6..e25561d9b 100644 --- a/poky/meta/recipes-core/glibc/glibc-package.inc +++ b/poky/meta/recipes-core/glibc/glibc-package.inc @@ -1,69 +1,71 @@ INHIBIT_SYSROOT_STRIP = "1" -PACKAGES = "${PN}-dbg catchsegv sln nscd ldconfig ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-src" +PACKAGES = "${PN}-dbg catchsegv sln nscd ldconfig ldd tzcode glibc-thread-db ${PN}-pic libcidn libmemusage malloc-debug libnss-db libsegfault ${PN}-pcprofile libsotruss ${PN} ${PN}-utils glibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}-src" # The ld.so in this glibc supports the GNU_HASH -RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)" -RPROVIDES_${PN}-utils = "eglibc-utils" -RPROVIDES_${PN}-mtrace = "eglibc-mtrace libc-mtrace" -RPROVIDES_${PN}-pic = "eglibc-pic" -RPROVIDES_${PN}-dev = "eglibc-dev libc6-dev virtual-libc-dev" -RPROVIDES_${PN}-staticdev = "eglibc-staticdev" -RPROVIDES_${PN}-doc = "eglibc-doc" -RPROVIDES_glibc-extra-nss = "eglibc-extra-nss" -RPROVIDES_glibc-thread-db = "eglibc-thread-db" -RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile" -RPROVIDES_${PN}-dbg = "eglibc-dbg" +RPROVIDES:${PN} = "eglibc rtld(GNU_HASH)" +RPROVIDES:${PN}-utils = "eglibc-utils" +RPROVIDES:${PN}-mtrace = "eglibc-mtrace libc-mtrace" +RPROVIDES:${PN}-pic = "eglibc-pic" +RPROVIDES:${PN}-dev = "eglibc-dev libc6-dev virtual-libc-dev" +RPROVIDES:${PN}-staticdev = "eglibc-staticdev" +RPROVIDES:${PN}-doc = "eglibc-doc" +RPROVIDES:glibc-extra-nss = "eglibc-extra-nss" +RPROVIDES:glibc-thread-db = "eglibc-thread-db" +RPROVIDES:${PN}-pcprofile = "eglibc-pcprofile" +RPROVIDES:${PN}-dbg = "eglibc-dbg" libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so" ARCH_DYNAMIC_LOADER = "" # The aarch64 ABI says the dynamic linker -must- be # /lib/ld-linux-aarch64{,_be}.so.1. With usrmerge, that may mean that # we need to install it in /usr/lib. -ARCH_DYNAMIC_LOADER_aarch64 = "ld-linux-${TARGET_ARCH}.so.1" -libc_baselibs_append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" -INSANE_SKIP_${PN}_append_aarch64 = " libdir" - -FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" -RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" -FILES_ldconfig = "${base_sbindir}/ldconfig" -FILES_ldd = "${bindir}/ldd" -FILES_libsegfault = "${base_libdir}/libSegFault*" -FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" -FILES_libmemusage = "${base_libdir}/libmemusage.so" -FILES_libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile ${localstatedir}/db/makedbs.sh" -RDEPENDS_libnss-db = "${PN}-utils" -FILES_glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" -FILES_sln = "${base_sbindir}/sln" -FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" -FILES_libsotruss = "${libdir}/audit/sotruss-lib.so" +ARCH_DYNAMIC_LOADER:aarch64 = "ld-linux-${TARGET_ARCH}.so.1" +libc_baselibs:append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" +INSANE_SKIP:${PN}:append:aarch64 = " libdir" +INSANE_SKIP:${PN}-dev += "staticdev" + +FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" +RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" +FILES:ldconfig = "${base_sbindir}/ldconfig" +FILES:ldd = "${bindir}/ldd" +FILES:libsegfault = "${base_libdir}/libSegFault*" +FILES:libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" +FILES:libmemusage = "${base_libdir}/libmemusage.so" +FILES:malloc-debug = "${base_libdir}/libc_malloc_debug.so.0" +FILES:libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile ${localstatedir}/db/makedbs.sh" +RDEPENDS:libnss-db = "${PN}-utils" +FILES:glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" +FILES:sln = "${base_sbindir}/sln" +FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" +FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" -FILES_${PN}-dev += "${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" -RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" -FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ +FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" +RDEPENDS:${PN}-dev = "linux-libc-headers-dev" +FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" +FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd" -FILES_${PN}-mtrace = "${bindir}/mtrace" -FILES_tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump" -FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" -FILES_catchsegv = "${bindir}/catchsegv" -RDEPENDS_catchsegv = "libsegfault" -FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" -FILES_glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" -RPROVIDES_${PN}-dev += "libc-dev" -RPROVIDES_${PN}-staticdev += "libc-staticdev" - -SUMMARY_sln = "The static ln" -DESCRIPTION_sln = "Similar to the 'ln' utility, but statically linked. sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional." -SUMMARY_nscd = "Name service cache daemon" -DESCRIPTION_nscd = "nscd, name service cache daemon, caches name service lookups for the passwd, group and hosts information. It can damatically improvide performance with remote, such as NIS or NIS+, name services." -SUMMARY_glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" -DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services." -SUMMARY_ldd = "print shared library dependencies" -DESCRIPTION_ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line." -SUMMARY_${PN}-utils = "Miscellaneous utilities provided by glibc" -DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, locale, gencat, ..." -DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" -DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" +FILES:${PN}-mtrace = "${bindir}/mtrace" +FILES:tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump" +FILES:${PN}-utils = "${bindir}/* ${sbindir}/*" +FILES:catchsegv = "${bindir}/catchsegv" +RDEPENDS:catchsegv = "libsegfault" +FILES:${PN}-pcprofile = "${base_libdir}/libpcprofile.so" +FILES:glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" +RPROVIDES:${PN}-dev += "libc-dev" +RPROVIDES:${PN}-staticdev += "libc-staticdev" + +SUMMARY:sln = "The static ln" +DESCRIPTION:sln = "Similar to the 'ln' utility, but statically linked. sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional." +SUMMARY:nscd = "Name service cache daemon" +DESCRIPTION:nscd = "nscd, name service cache daemon, caches name service lookups for the passwd, group and hosts information. It can damatically improvide performance with remote, such as NIS or NIS+, name services." +SUMMARY:glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" +DESCRIPTION:glibc-extra-nss = "glibc: nis, nisplus and hesiod search services." +SUMMARY:ldd = "print shared library dependencies" +DESCRIPTION:ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line." +SUMMARY:${PN}-utils = "Miscellaneous utilities provided by glibc" +DESCRIPTION:${PN}-utils = "Miscellaneous utilities including getconf, iconv, locale, gencat, ..." +DESCRIPTION:libsotruss = "Library to support sotruss which traces calls through PLTs" +DESCRIPTION:tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" inherit multilib_header @@ -118,6 +120,8 @@ do_install() { ln -s ${@oe.path.relative('${root_prefix}/lib', '${base_libdir}')}/${ARCH_DYNAMIC_LOADER} \ ${D}${root_prefix}/lib/${ARCH_DYNAMIC_LOADER} fi + lnr ${D}${base_libdir}/libpthread.so.0 ${D}${libdir}/libpthread.so + lnr ${D}${base_libdir}/librt.so.1 ${D}${libdir}/librt.so } def get_libc_fpu_setting(bb, d): @@ -125,7 +129,7 @@ def get_libc_fpu_setting(bb, d): return "--without-fp" return "" -do_install_append_class-target() { +do_install:append:class-target() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d /run/nscd 755 root root -" \ @@ -139,15 +143,15 @@ do_install_append_class-target() { fi } -do_install_append_aarch64 () { +do_install:append:aarch64 () { do_install_armmultilib } -do_install_append_arm () { +do_install:append:arm () { do_install_armmultilib } -do_install_append_armeb () { +do_install:append:armeb () { do_install_armmultilib } @@ -156,7 +160,7 @@ do_install_armmultilib () { oe_multilib_header bits/local_lim.h bits/mman.h bits/msq.h bits/pthreadtypes.h bits/pthreadtypes-arch.h bits/sem.h bits/semaphore.h bits/setjmp.h oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h - oe_multilib_header bits/struct_stat.h + oe_multilib_header bits/struct_stat.h bits/pthread_stack_min.h oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h @@ -252,26 +256,26 @@ stash_locale_package_cleanup() { stash_locale_cleanup ${PKGD} } -python populate_packages_prepend () { +python populate_packages:prepend () { if d.getVar('DEBIAN_NAMES'): pkgs = d.getVar('PACKAGES').split() bpn = d.getVar('BPN') prefix = d.getVar('MLPREFIX') or "" # Set the base package... - d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') + d.setVar('PKG:' + prefix + bpn, prefix + 'libc6') libcprefix = prefix + bpn + '-' for p in pkgs: # And all the subpackages. if p.startswith(libcprefix): renamed = p.replace(bpn, 'libc6', 1) - d.setVar('PKG_' + p, renamed) + d.setVar('PKG:' + p, renamed) # For backward compatibility with old -dbg package - d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') - d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RPROVIDES:' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RCONFLICTS:' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') + d.appendVar('RREPLACES:' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') } -pkg_postinst_nscd () { +pkg_postinst:nscd () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nscd.conf @@ -280,7 +284,7 @@ pkg_postinst_nscd () { fi fi } -CONFFILES_nscd="${sysconfdir}/nscd.conf" +CONFFILES:nscd="${sysconfdir}/nscd.conf" SYSTEMD_PACKAGES = "nscd" -SYSTEMD_SERVICE_nscd = "nscd.service" +SYSTEMD_SERVICE:nscd = "nscd.service" diff --git a/poky/meta/recipes-core/glibc/glibc-scripts.inc b/poky/meta/recipes-core/glibc/glibc-scripts.inc index 14a14e451..47216ae7d 100644 --- a/poky/meta/recipes-core/glibc/glibc-scripts.inc +++ b/poky/meta/recipes-core/glibc/glibc-scripts.inc @@ -2,7 +2,7 @@ require glibc-collateral.inc SUMMARY = "utility scripts provided by glibc" DESCRIPTION = "utility scripts provided by glibc" -RDEPENDS_${PN} = "bash glibc-mtrace" +RDEPENDS:${PN} = "bash glibc-mtrace" SRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale/scripts" @@ -17,7 +17,7 @@ do_install() { # sotruss script requires sotruss-lib.so (given by libsotruss package), # to produce trace of the library calls. -RDEPENDS_${PN} += "libsotruss" +RDEPENDS:${PN} += "libsotruss" # Don't scan for CVEs as glibc will be scanned CVE_PRODUCT = "" diff --git a/poky/meta/recipes-core/glibc/glibc-scripts_2.33.bb b/poky/meta/recipes-core/glibc/glibc-scripts_2.34.bb index 5a89bd802..5a89bd802 100644 --- a/poky/meta/recipes-core/glibc/glibc-scripts_2.33.bb +++ b/poky/meta/recipes-core/glibc/glibc-scripts_2.34.bb diff --git a/poky/meta/recipes-core/glibc/glibc-testsuite_2.33.bb b/poky/meta/recipes-core/glibc/glibc-testsuite_2.34.bb index 659d3132f..72aa33217 100644 --- a/poky/meta/recipes-core/glibc/glibc-testsuite_2.33.bb +++ b/poky/meta/recipes-core/glibc/glibc-testsuite_2.34.bb @@ -3,7 +3,7 @@ require glibc_${PV}.bb EXCLUDE_FROM_WORLD = "1" # handle PN differences -FILESEXTRAPATHS_prepend := "${THISDIR}/glibc:" +FILESEXTRAPATHS:prepend := "${THISDIR}/glibc:" # strip provides PROVIDES = "" @@ -20,7 +20,7 @@ python () { DEPENDS += "glibc-locale libgcc gcc-runtime" # remove the initial depends -DEPENDS_remove = "libgcc-initial" +DEPENDS:remove = "libgcc-initial" inherit qemu diff --git a/poky/meta/recipes-core/glibc/glibc-version.inc b/poky/meta/recipes-core/glibc/glibc-version.inc index 376ead66a..281df7ecd 100644 --- a/poky/meta/recipes-core/glibc/glibc-version.inc +++ b/poky/meta/recipes-core/glibc/glibc-version.inc @@ -1,7 +1,7 @@ -SRCBRANCH ?= "release/2.33/master" -PV = "2.33" -SRCREV_glibc ?= "3f5080aedd164c1f92a53552dd3e0b82ac6d2bd3" -SRCREV_localedef ?= "bd644c9e6f3e20c5504da1488448173c69c56c28" +SRCBRANCH ?= "release/2.34/master" +PV = "2.34" +SRCREV_glibc ?= "ae37d06c7d127817ba43850f0f898b793d42aea7" +SRCREV_localedef ?= "95c0221703ad970a52445e9eaf91c4aff35eebef" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" diff --git a/poky/meta/recipes-core/glibc/glibc.inc b/poky/meta/recipes-core/glibc/glibc.inc index 7d1430637..80a3e0b49 100644 --- a/poky/meta/recipes-core/glibc/glibc.inc +++ b/poky/meta/recipes-core/glibc/glibc.inc @@ -24,10 +24,10 @@ CACHED_CONFIGUREVARS += " \ " # ifunc doesn't appear to work on mips, casuses libbfd assertion failures -CACHED_CONFIGUREVARS_append_mipsarch = " libc_cv_ld_gnu_indirect_function=no" +CACHED_CONFIGUREVARS:append:mipsarch = " libc_cv_ld_gnu_indirect_function=no" GLIBC_EXTRA_OECONF ?= "" -GLIBC_EXTRA_OECONF_class-nativesdk = "" +GLIBC_EXTRA_OECONF:class-nativesdk = "" # glibc uses PARALLELMFLAGS variable to pass parallel build info so transfer # PARALLEL_MAKE into PARALLELMFLAGS and empty out PARALLEL_MAKE @@ -41,12 +41,12 @@ PARALLEL_MAKE = "" # ensure make uses /bin/bash EXTRA_OEMAKE += "SHELL=/bin/bash" -do_configure_prepend() { - sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in +do_configure:prepend() { + sed -e "s#/bin/bash#/bin/sh#" -i ${S}/elf/ldd.bash.in } # Enable backtrace from abort() -do_configure_append_arm () { +do_configure:append:arm () { echo "CFLAGS-abort.c = -fasynchronous-unwind-tables" >> ${B}/configparms echo "CFLAGS-raise.c = -fasynchronous-unwind-tables" >> ${B}/configparms } diff --git a/poky/meta/recipes-core/glibc/glibc/0001-CVE-2021-38604.patch b/poky/meta/recipes-core/glibc/glibc/0001-CVE-2021-38604.patch new file mode 100644 index 000000000..1e9404900 --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/0001-CVE-2021-38604.patch @@ -0,0 +1,43 @@ +From b805aebd42364fe696e417808a700fdb9800c9e8 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <npv1310@gmail.com> +Date: Mon, 9 Aug 2021 20:17:34 +0530 +Subject: [PATCH] librt: fix NULL pointer dereference (bug 28213) + +Helper thread frees copied attribute on NOTIFY_REMOVED message +received from the OS kernel. Unfortunately, it fails to check whether +copied attribute actually exists (data.attr != NULL). This worked +earlier because free() checks passed pointer before actually +attempting to release corresponding memory. But +__pthread_attr_destroy assumes pointer is not NULL. + +So passing NULL pointer to __pthread_attr_destroy will result in +segmentation fault. This scenario is possible if +notification->sigev_notify_attributes == NULL (which means default +thread attributes should be used). + +Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=b805aebd42364fe696e417808a700fdb9800c9e8] +CVE: CVE-2021-38604 + +Signed-off-by: Nikita Popov <npv1310@gmail.com> +Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> +Signed-off-by: Vinay Kumar <vinay.m.engg@gmail.com> +--- + sysdeps/unix/sysv/linux/mq_notify.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c +index 9799dcdaa4..eccae2e4c6 100644 +--- a/sysdeps/unix/sysv/linux/mq_notify.c ++++ b/sysdeps/unix/sysv/linux/mq_notify.c +@@ -131,7 +131,7 @@ helper_thread (void *arg) + to wait until it is done with it. */ + (void) __pthread_barrier_wait (¬ify_barrier); + } +- else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED) ++ else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED && data.attr != NULL) + { + /* The only state we keep is the copy of the thread attributes. */ + __pthread_attr_destroy (data.attr); +-- +2.31.1 + diff --git a/poky/meta/recipes-core/glibc/glibc/0001-fix-create-thread-failed-in-unprivileged-process-BZ-.patch b/poky/meta/recipes-core/glibc/glibc/0001-fix-create-thread-failed-in-unprivileged-process-BZ-.patch new file mode 100644 index 000000000..3283dd7ad --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/0001-fix-create-thread-failed-in-unprivileged-process-BZ-.patch @@ -0,0 +1,79 @@ +From a8bc44936202692edcd82a48c07d7cf27d6ed8ee Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sun, 29 Aug 2021 20:49:16 +0800 +Subject: [PATCH] fix create thread failed in unprivileged process [BZ #28287] + +Since commit [d8ea0d0168 Add an internal wrapper for clone, clone2 and clone3] +applied, start a unprivileged container (docker run without --privileged), +it creates a thread failed in container. + +In commit d8ea0d0168, it calls __clone3 if HAVE_CLONE3_WAPPER is defined. If +__clone3 returns -1 with ENOSYS, fall back to clone or clone2. + +As known from [1], cloneXXX fails with EPERM if CLONE_NEWCGROUP, +CLONE_NEWIPC, CLONE_NEWNET, CLONE_NEWNS, CLONE_NEWPID, or CLONE_NEWUTS +was specified by an unprivileged process (process without CAP_SYS_ADMIN) + +[1] https://man7.org/linux/man-pages/man2/clone3.2.html + +So if __clone3 returns -1 with EPERM, fall back to clone or clone2 could +fix the issue. Here are the test steps: + +1) Prepare test code +cat > conftest.c <<ENDOF + #include <pthread.h> + #include <stdio.h> + +int check_me = 0; +void* func(void* data) {check_me = 42; printf("start thread: check_me %d\n", check_me); return &check_me;} +int main() +{ + pthread_t t; + void *ret; + pthread_create (&t, 0, func, 0); + pthread_join (t, &ret); + printf("check_me %d, p %p\n", check_me, &ret); + return (check_me != 42 || ret != &check_me); +} + +ENDOF + +2) Compile +gcc -o conftest -pthread conftest.c + +3) Start a container with glibc 2.34 installed +[skip details] +docker run -it <container-image-name> bash + +4) Run conftest without this patch +$ ./conftest +check_me 0, p 0x7ffd91ccd400 + +5) Run conftest with this patch +$ ./conftest +start thread: check_me 42 +check_me 42, p 0x7ffe253c6f20 + +Upstream-Status: Submitted [libc-alpha@sourceware.org] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + sysdeps/unix/sysv/linux/clone-internal.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysdeps/unix/sysv/linux/clone-internal.c b/sysdeps/unix/sysv/linux/clone-internal.c +index 979f7880be..97101994e8 100644 +--- a/sysdeps/unix/sysv/linux/clone-internal.c ++++ b/sysdeps/unix/sysv/linux/clone-internal.c +@@ -52,7 +52,7 @@ __clone_internal (struct clone_args *cl_args, + /* Try clone3 first. */ + int saved_errno = errno; + ret = __clone3 (cl_args, sizeof (*cl_args), func, arg); +- if (ret != -1 || errno != ENOSYS) ++ if (ret != -1 || (errno != ENOSYS && errno != EPERM)) + return ret; + + /* NB: Restore errno since errno may be checked against non-zero +-- +2.30.2 + diff --git a/poky/meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch b/poky/meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch index f96da83a9..3ff485b1e 100644 --- a/poky/meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch +++ b/poky/meta/recipes-core/glibc/glibc/0001-localedef-Add-hardlink-resolver-from-util-linux.patch @@ -1,4 +1,4 @@ -From d1f1671034a222417f9a829dcaa4f0c3d4f8954d Mon Sep 17 00:00:00 2001 +From d34ba0833cd811f8869a6262044af55f9e7b59d8 Mon Sep 17 00:00:00 2001 From: Jason Wessel <jason.wessel@windriver.com> Date: Sat, 7 Dec 2019 09:59:22 -0800 Subject: [PATCH] localedef: Add hardlink resolver from util-linux diff --git a/poky/meta/recipes-core/glibc/glibc/0002-CVE-2021-38604.patch b/poky/meta/recipes-core/glibc/glibc/0002-CVE-2021-38604.patch new file mode 100644 index 000000000..9f71fecdd --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/0002-CVE-2021-38604.patch @@ -0,0 +1,150 @@ +From 4cc79c217744743077bf7a0ec5e0a4318f1e6641 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <npv1310@gmail.com> +Date: Thu, 12 Aug 2021 16:09:50 +0530 +Subject: [PATCH] librt: add test (bug 28213) + +This test implements following logic: +1) Create POSIX message queue. + Register a notification with mq_notify (using NULL attributes). + Then immediately unregister the notification with mq_notify. + Helper thread in a vulnerable version of glibc + should cause NULL pointer dereference after these steps. +2) Once again, register the same notification. + Try to send a dummy message. + Test is considered successfulif the dummy message + is successfully received by the callback function. + +Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=4cc79c217744743077bf7a0ec5e0a4318f1e6641] +CVE: CVE-2021-38604 + +Signed-off-by: Nikita Popov <npv1310@gmail.com> +Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> +Signed-off-by: Vinay Kumar <vinay.m.engg@gmail.com> +--- + rt/Makefile | 1 + + rt/tst-bz28213.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 102 insertions(+) + create mode 100644 rt/tst-bz28213.c + +diff --git a/rt/Makefile b/rt/Makefile +index 113cea03a5..910e775995 100644 +--- a/rt/Makefile ++++ b/rt/Makefile +@@ -74,6 +74,7 @@ tests := tst-shm tst-timer tst-timer2 \ + tst-aio7 tst-aio8 tst-aio9 tst-aio10 \ + tst-mqueue1 tst-mqueue2 tst-mqueue3 tst-mqueue4 \ + tst-mqueue5 tst-mqueue6 tst-mqueue7 tst-mqueue8 tst-mqueue9 \ ++ tst-bz28213 \ + tst-timer3 tst-timer4 tst-timer5 \ + tst-cpuclock2 tst-cputimer1 tst-cputimer2 tst-cputimer3 \ + tst-shm-cancel \ +diff --git a/rt/tst-bz28213.c b/rt/tst-bz28213.c +new file mode 100644 +index 0000000000..0c096b5a0a +--- /dev/null ++++ b/rt/tst-bz28213.c +@@ -0,0 +1,101 @@ ++/* Bug 28213: test for NULL pointer dereference in mq_notify. ++ Copyright (C) The GNU Toolchain Authors. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <https://www.gnu.org/licenses/>. */ ++ ++#include <errno.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <fcntl.h> ++#include <unistd.h> ++#include <mqueue.h> ++#include <signal.h> ++#include <stdlib.h> ++#include <string.h> ++#include <support/check.h> ++ ++static mqd_t m = -1; ++static const char msg[] = "hello"; ++ ++static void ++check_bz28213_cb (union sigval sv) ++{ ++ char buf[sizeof (msg)]; ++ ++ (void) sv; ++ ++ TEST_VERIFY_EXIT ((size_t) mq_receive (m, buf, sizeof (buf), NULL) ++ == sizeof (buf)); ++ TEST_VERIFY_EXIT (memcmp (buf, msg, sizeof (buf)) == 0); ++ ++ exit (0); ++} ++ ++static void ++check_bz28213 (void) ++{ ++ struct sigevent sev; ++ ++ memset (&sev, '\0', sizeof (sev)); ++ sev.sigev_notify = SIGEV_THREAD; ++ sev.sigev_notify_function = check_bz28213_cb; ++ ++ /* Step 1: Register & unregister notifier. ++ Helper thread should receive NOTIFY_REMOVED notification. ++ In a vulnerable version of glibc, NULL pointer dereference follows. */ ++ TEST_VERIFY_EXIT (mq_notify (m, &sev) == 0); ++ TEST_VERIFY_EXIT (mq_notify (m, NULL) == 0); ++ ++ /* Step 2: Once again, register notification. ++ Try to send one message. ++ Test is considered successful, if the callback does exit (0). */ ++ TEST_VERIFY_EXIT (mq_notify (m, &sev) == 0); ++ TEST_VERIFY_EXIT (mq_send (m, msg, sizeof (msg), 1) == 0); ++ ++ /* Wait... */ ++ pause (); ++} ++ ++static int ++do_test (void) ++{ ++ static const char m_name[] = "/bz28213_queue"; ++ struct mq_attr m_attr; ++ ++ memset (&m_attr, '\0', sizeof (m_attr)); ++ m_attr.mq_maxmsg = 1; ++ m_attr.mq_msgsize = sizeof (msg); ++ ++ m = mq_open (m_name, ++ O_RDWR | O_CREAT | O_EXCL, ++ 0600, ++ &m_attr); ++ ++ if (m < 0) ++ { ++ if (errno == ENOSYS) ++ FAIL_UNSUPPORTED ("POSIX message queues are not implemented\n"); ++ FAIL_EXIT1 ("Failed to create POSIX message queue: %m\n"); ++ } ++ ++ TEST_VERIFY_EXIT (mq_unlink (m_name) == 0); ++ ++ check_bz28213 (); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +-- +2.31.1 + diff --git a/poky/meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch b/poky/meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch index 3dc4582f4..2445aa56b 100644 --- a/poky/meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch +++ b/poky/meta/recipes-core/glibc/glibc/0002-localedef-fix-ups-hardlink-to-make-it-compile.patch @@ -1,4 +1,4 @@ -From 14d256e2db009f8bac9a265e8393d7ed25050df9 Mon Sep 17 00:00:00 2001 +From d7bb36a9a27e5e4c3be6378493b41286513750e9 Mon Sep 17 00:00:00 2001 From: Jason Wessel <jason.wessel@windriver.com> Date: Sat, 7 Dec 2019 10:01:37 -0800 Subject: [PATCH] localedef: fix-ups hardlink to make it compile diff --git a/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch b/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch index c4718a106..210cc1076 100644 --- a/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch +++ b/poky/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch @@ -1,4 +1,4 @@ -From 32a4b8ae046fe4bb1b19f61378d079d44deaede7 Mon Sep 17 00:00:00 2001 +From 776a53db6afba8a7ff4412aba88b0679227877f9 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:48:24 +0000 Subject: [PATCH] nativesdk-glibc: Look for host system ld.so.cache as well @@ -30,10 +30,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c -index 9e2089cfaa..ad01674027 100644 +index a08df001af..d09daf9e41 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c -@@ -2175,6 +2175,14 @@ _dl_map_object (struct link_map *loader, const char *name, +@@ -2196,6 +2196,14 @@ _dl_map_object (struct link_map *loader, const char *name, } } @@ -48,7 +48,7 @@ index 9e2089cfaa..ad01674027 100644 #ifdef USE_LDCONFIG if (fd == -1 && (__glibc_likely ((mode & __RTLD_SECURE) == 0) -@@ -2233,14 +2241,6 @@ _dl_map_object (struct link_map *loader, const char *name, +@@ -2254,14 +2262,6 @@ _dl_map_object (struct link_map *loader, const char *name, } #endif diff --git a/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch b/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch index a8e625d24..010b816e1 100644 --- a/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch +++ b/poky/meta/recipes-core/glibc/glibc/0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch @@ -1,4 +1,4 @@ -From aa8393bff257e4badfd208b88473ead175c69362 Mon Sep 17 00:00:00 2001 +From df18bae1eeee55ecb9db36d13fe67c58355682eb Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:50:00 +0000 Subject: [PATCH] nativesdk-glibc: Fix buffer overrun with a relocated SDK @@ -21,10 +21,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 12 insertions(+) diff --git a/elf/dl-load.c b/elf/dl-load.c -index ad01674027..f455207e79 100644 +index d09daf9e41..2c6270e2a7 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c -@@ -1871,7 +1871,19 @@ open_path (const char *name, size_t namelen, int mode, +@@ -1892,7 +1892,19 @@ open_path (const char *name, size_t namelen, int mode, given on the command line when rtld is run directly. */ return -1; diff --git a/poky/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch b/poky/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch index 197caae92..bf9f3e36c 100644 --- a/poky/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch +++ b/poky/meta/recipes-core/glibc/glibc/0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch @@ -1,4 +1,4 @@ -From 3ea08e491a8494ff03e598b5e0fc2d8131e75da9 Mon Sep 17 00:00:00 2001 +From 6af8ce8eceed86addbc188f773a2d36d83ee4042 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:51:38 +0000 Subject: [PATCH] nativesdk-glibc: Raise the size of arrays containing dl paths @@ -26,10 +26,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/elf/dl-cache.c b/elf/dl-cache.c -index 32f3bef5ea..71f3a82dc0 100644 +index 2b8da8650d..3d9787bda4 100644 --- a/elf/dl-cache.c +++ b/elf/dl-cache.c -@@ -359,6 +359,10 @@ search_cache (const char *string_table, uint32_t string_table_size, +@@ -355,6 +355,10 @@ search_cache (const char *string_table, uint32_t string_table_size, return best; } @@ -41,7 +41,7 @@ index 32f3bef5ea..71f3a82dc0 100644 _dl_cache_libcmp (const char *p1, const char *p2) { diff --git a/elf/dl-load.c b/elf/dl-load.c -index f455207e79..a144e24fcf 100644 +index 2c6270e2a7..23018d2f7e 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -115,8 +115,8 @@ enum { ncapstr = 1, max_capstrlen = 0 }; @@ -56,7 +56,7 @@ index f455207e79..a144e24fcf 100644 SYSTEM_DIRS_LEN }; diff --git a/elf/dl-usage.c b/elf/dl-usage.c -index 6e26818bd7..f09e8b93e5 100644 +index 5ad3a72559..88f26d3692 100644 --- a/elf/dl-usage.c +++ b/elf/dl-usage.c @@ -25,6 +25,8 @@ @@ -77,7 +77,7 @@ index 6e26818bd7..f09e8b93e5 100644 --library-path PATH use given PATH instead of content of the environment\n\ variable LD_LIBRARY_PATH\n\ --glibc-hwcaps-prepend LIST\n\ -@@ -266,7 +268,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ +@@ -267,7 +269,7 @@ setting environment variables (which would be inherited by subprocesses).\n\ \n\ This program interpreter self-identifies as: " RTLD "\n\ ", @@ -98,10 +98,10 @@ index 91966702ca..dc86c20e83 100644 +const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp"))) = RUNTIME_LINKER; diff --git a/elf/ldconfig.c b/elf/ldconfig.c -index 28ed637a29..5d38a60c5d 100644 +index 1037e8d0cf..ffdac84952 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c -@@ -176,6 +176,9 @@ static struct argp argp = +@@ -177,6 +177,9 @@ static struct argp argp = options, parse_opt, NULL, doc, NULL, more_help, NULL }; @@ -112,7 +112,7 @@ index 28ed637a29..5d38a60c5d 100644 a platform. */ static int diff --git a/elf/rtld.c b/elf/rtld.c -index 596b6ac3d9..1ccd33f668 100644 +index fbbd60b446..fce9940f80 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -185,6 +185,7 @@ dso_name_valid_for_suid (const char *p) @@ -124,11 +124,11 @@ index 596b6ac3d9..1ccd33f668 100644 static void audit_list_init (struct audit_list *list) diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c -index 682f949834..7eed87bc9d 100644 +index 62bee28769..67b60dc88c 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -36,7 +36,7 @@ - + #include <gconv_parseconfdir.h> /* This is the default path where we look for module lists. */ -static const char default_gconv_path[] = GCONV_PATH; diff --git a/poky/meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch b/poky/meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch index 172ade8d9..3a37f7af7 100644 --- a/poky/meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch +++ b/poky/meta/recipes-core/glibc/glibc/0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch @@ -1,4 +1,4 @@ -From 19e3e45eb1838ee80af13c3d27fcff446773211e Mon Sep 17 00:00:00 2001 +From b30f380cd88ae181a4a6a3a4784206ffe3ccd19b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 31 Dec 2015 14:35:35 -0800 Subject: [PATCH] nativesdk-glibc: Allow 64 bit atomics for x86 diff --git a/poky/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch b/poky/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch index 14697567c..d763178f2 100644 --- a/poky/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch +++ b/poky/meta/recipes-core/glibc/glibc/0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch @@ -1,4 +1,4 @@ -From 732d4f4954fe60718870048d0583a20a7a8a8540 Mon Sep 17 00:00:00 2001 +From 24bffe9c2645cd6542e29cb57786dc703cced07b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 3 Aug 2018 09:55:12 -0700 Subject: [PATCH] nativesdk-glibc: Make relocatable install for locales @@ -41,7 +41,7 @@ index ab09122b0c..f42cc75780 100644 else /* We really have to load some data. First see whether the name is diff --git a/locale/loadarchive.c b/locale/loadarchive.c -index 4177fc8972..40247b1e68 100644 +index 512769eaec..436619091b 100644 --- a/locale/loadarchive.c +++ b/locale/loadarchive.c @@ -42,7 +42,7 @@ @@ -67,7 +67,7 @@ index b3d4da0185..22f9dc1140 100644 /* Load the locale data for CATEGORY from the file specified by *NAME. If *NAME is "", use environment variables as specified by POSIX, and diff --git a/locale/programs/locale.c b/locale/programs/locale.c -index 575b208e82..5ec630c3a4 100644 +index ca0a95be99..6b98895203 100644 --- a/locale/programs/locale.c +++ b/locale/programs/locale.c @@ -632,6 +632,7 @@ nameentcmp (const void *a, const void *b) diff --git a/poky/meta/recipes-core/glibc/glibc/0008-nativesdk-glibc-Fall-back-to-faccessat-on-faccess2-r.patch b/poky/meta/recipes-core/glibc/glibc/0008-nativesdk-glibc-Fall-back-to-faccessat-on-faccess2-r.patch new file mode 100644 index 000000000..f4fc1d68c --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/0008-nativesdk-glibc-Fall-back-to-faccessat-on-faccess2-r.patch @@ -0,0 +1,32 @@ +From 2761400989bcbf11e10bc85f90c3a2ba1305c4ae Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 6 Mar 2021 14:48:56 -0800 +Subject: [PATCH] nativesdk-glibc: Fall back to faccessat on faccess2 returns + EPERM + +Fedora-specific workaround for systemd-nspawn + +Upstream-Status: Inappropriate [Distro Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sysdeps/unix/sysv/linux/faccessat.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/sysdeps/unix/sysv/linux/faccessat.c b/sysdeps/unix/sysv/linux/faccessat.c +index 13160d3249..ee3ddc9b79 100644 +--- a/sysdeps/unix/sysv/linux/faccessat.c ++++ b/sysdeps/unix/sysv/linux/faccessat.c +@@ -30,7 +30,11 @@ __faccessat (int fd, const char *file, int mode, int flag) + #if __ASSUME_FACCESSAT2 + return ret; + #else +- if (ret == 0 || errno != ENOSYS) ++ /* Fedora-specific workaround: ++ As a workround for a broken systemd-nspawn that returns ++ EPERM when a syscall is not allowed instead of ENOSYS ++ we must check for EPERM here and fall back to faccessat. */ ++ if (ret == 0 || !(errno == ENOSYS || errno == EPERM)) + return ret; + + if (flag & ~(AT_SYMLINK_NOFOLLOW | AT_EACCESS)) diff --git a/poky/meta/recipes-core/glibc/glibc/0008-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch b/poky/meta/recipes-core/glibc/glibc/0009-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch index 2162bf38c..01de227a0 100644 --- a/poky/meta/recipes-core/glibc/glibc/0008-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch +++ b/poky/meta/recipes-core/glibc/glibc/0009-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch @@ -1,4 +1,4 @@ -From 3d58330390a7d4f4ed32f4a9c25628af3e0dd5c1 Mon Sep 17 00:00:00 2001 +From 74923ca4b1ae0ed5a2478e7d265b37534f6815d7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:01:50 +0000 Subject: [PATCH] fsl e500/e5500/e6500/603e fsqrt implementation diff --git a/poky/meta/recipes-core/glibc/glibc/0009-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch b/poky/meta/recipes-core/glibc/glibc/0010-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch index 0c8bf94a7..5c1130cf1 100644 --- a/poky/meta/recipes-core/glibc/glibc/0009-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch +++ b/poky/meta/recipes-core/glibc/glibc/0010-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch @@ -1,4 +1,4 @@ -From 3b5fe5b1a7390cde0f07351415e3891f62d1f7e0 Mon Sep 17 00:00:00 2001 +From 5da3da7f2d276c2a6ae1b04419b28e96953803ec Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:15:07 +0000 Subject: [PATCH] ppc/sqrt: Fix undefined reference to `__sqrt_finite' diff --git a/poky/meta/recipes-core/glibc/glibc/0010-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/poky/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch index cadaa0b2e..b72e79057 100644 --- a/poky/meta/recipes-core/glibc/glibc/0010-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch +++ b/poky/meta/recipes-core/glibc/glibc/0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch @@ -1,4 +1,4 @@ -From 6b6e1dcd707017598ea3bdc2d91a761943b62218 Mon Sep 17 00:00:00 2001 +From 77f1c90d67a2f8852184fb8fd95cb0ed63065dc7 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:16:38 +0000 Subject: [PATCH] __ieee754_sqrt{,f} are now inline functions and call out diff --git a/poky/meta/recipes-core/glibc/glibc/0011-Quote-from-bug-1443-which-explains-what-the-patch-do.patch b/poky/meta/recipes-core/glibc/glibc/0012-Quote-from-bug-1443-which-explains-what-the-patch-do.patch index e4c78b5c7..07d4411c6 100644 --- a/poky/meta/recipes-core/glibc/glibc/0011-Quote-from-bug-1443-which-explains-what-the-patch-do.patch +++ b/poky/meta/recipes-core/glibc/glibc/0012-Quote-from-bug-1443-which-explains-what-the-patch-do.patch @@ -1,4 +1,4 @@ -From 297bac9429260f8df495b81d3fae8ae4c6913f5f Mon Sep 17 00:00:00 2001 +From add514edf4299d1bf540d85d0aa0bd5fe0d46b78 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:20:09 +0000 Subject: [PATCH] Quote from bug 1443 which explains what the patch does : diff --git a/poky/meta/recipes-core/glibc/glibc/0012-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/poky/meta/recipes-core/glibc/glibc/0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch index c5e8e6473..c2766ef4c 100644 --- a/poky/meta/recipes-core/glibc/glibc/0012-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch +++ b/poky/meta/recipes-core/glibc/glibc/0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch @@ -1,4 +1,4 @@ -From f389babf3c920e68b7d7391556a78ebf62a21ebe Mon Sep 17 00:00:00 2001 +From c5047b8f7d1a17324cfa02b99f07a70ebcec2cf2 Mon Sep 17 00:00:00 2001 From: Ting Liu <b28495@freescale.com> Date: Wed, 19 Dec 2012 04:39:57 -0600 Subject: [PATCH] eglibc: run libm-err-tab.pl with specific dirs in ${S} diff --git a/poky/meta/recipes-core/glibc/glibc/0013-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch b/poky/meta/recipes-core/glibc/glibc/0014-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch index 7f362cace..088b81053 100644 --- a/poky/meta/recipes-core/glibc/glibc/0013-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch +++ b/poky/meta/recipes-core/glibc/glibc/0014-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch @@ -1,4 +1,4 @@ -From 4b0d41a315e66f688fef7b0c2e2b6ce9fa16ec93 Mon Sep 17 00:00:00 2001 +From 133870f12ba36686dd8df1311fac32a4c5b28579 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:24:46 +0000 Subject: [PATCH] __ieee754_sqrt{,f} are now inline functions and call out diff --git a/poky/meta/recipes-core/glibc/glibc/0014-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch b/poky/meta/recipes-core/glibc/glibc/0015-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch index 4da0e003c..e8332a53c 100644 --- a/poky/meta/recipes-core/glibc/glibc/0014-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch +++ b/poky/meta/recipes-core/glibc/glibc/0015-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch @@ -1,4 +1,4 @@ -From c062a462fee53a30a85d693c8288b5bd8fe4ec6e Mon Sep 17 00:00:00 2001 +From b4613f814ba7ba5db95d18116172f81a83ac8f5b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:27:10 +0000 Subject: [PATCH] sysdeps/gnu/configure.ac: handle correctly diff --git a/poky/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch b/poky/meta/recipes-core/glibc/glibc/0016-yes-within-the-path-sets-wrong-config-variables.patch index 15e83f891..f7e7f1cd1 100644 --- a/poky/meta/recipes-core/glibc/glibc/0015-yes-within-the-path-sets-wrong-config-variables.patch +++ b/poky/meta/recipes-core/glibc/glibc/0016-yes-within-the-path-sets-wrong-config-variables.patch @@ -1,4 +1,4 @@ -From 0bd39d8907953f18e01742f42b24647ac7689d0a Mon Sep 17 00:00:00 2001 +From 7be3e82b66394a7b242e56c6fc609e858b8e2436 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:31:06 +0000 Subject: [PATCH] 'yes' within the path sets wrong config variables @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sysdeps/aarch64/configure b/sysdeps/aarch64/configure -index 83c3a23e44..a68c946277 100644 +index 4c1fac49f3..597314f476 100644 --- a/sysdeps/aarch64/configure +++ b/sysdeps/aarch64/configure @@ -157,12 +157,12 @@ else @@ -48,7 +48,7 @@ index 83c3a23e44..a68c946277 100644 else libc_cv_aarch64_be=no diff --git a/sysdeps/aarch64/configure.ac b/sysdeps/aarch64/configure.ac -index 66f755078a..a32b265bbe 100644 +index 3347c13fa1..4af163c0b6 100644 --- a/sysdeps/aarch64/configure.ac +++ b/sysdeps/aarch64/configure.ac @@ -17,8 +17,8 @@ AC_DEFINE(SUPPORT_STATIC_PIE) diff --git a/poky/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch b/poky/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch index 79bd70415..100d08599 100644 --- a/poky/meta/recipes-core/glibc/glibc/0016-timezone-re-written-tzselect-as-posix-sh.patch +++ b/poky/meta/recipes-core/glibc/glibc/0017-timezone-re-written-tzselect-as-posix-sh.patch @@ -1,4 +1,4 @@ -From 3feb4213628f1485000ffe1d3fd26e37a7b14336 Mon Sep 17 00:00:00 2001 +From 2731fa0c7463cd160361a8ac92f3bd7f984d953d Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:33:03 +0000 Subject: [PATCH] timezone: re-written tzselect as posix sh @@ -10,27 +10,19 @@ Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - timezone/Makefile | 2 +- - timezone/tzselect.ksh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + timezone/tzselect.ksh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/timezone/Makefile b/timezone/Makefile -index 395abfeebd..2d939edf75 100644 ---- a/timezone/Makefile -+++ b/timezone/Makefile -@@ -123,7 +123,7 @@ $(testdata)/XT%: testdata/XT% - cp $< $@ - - $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make -- sed -e 's|/bin/bash|$(BASH)|' \ -+ sed -e 's|/bin/bash|/bin/sh|' \ - -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ - -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ - -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ diff --git a/timezone/tzselect.ksh b/timezone/tzselect.ksh -index 18fce27e24..70745f9d36 100755 +index 18fce27e24..7705df83d7 100755 --- a/timezone/tzselect.ksh +++ b/timezone/tzselect.ksh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # Ask the user about the time zone, and output the resulting TZ value to stdout. + # Interact with the user via stderr and stdin. + @@ -34,7 +34,7 @@ REPORT_BUGS_TO=tz@iana.org # Specify default values for environment variables if they are unset. diff --git a/poky/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch b/poky/meta/recipes-core/glibc/glibc/0018-Remove-bash-dependency-for-nscd-init-script.patch index c32d70b59..23296da61 100644 --- a/poky/meta/recipes-core/glibc/glibc/0017-Remove-bash-dependency-for-nscd-init-script.patch +++ b/poky/meta/recipes-core/glibc/glibc/0018-Remove-bash-dependency-for-nscd-init-script.patch @@ -1,4 +1,4 @@ -From f6119b98a9caa80642d69a97edc98f57ecef5c3c Mon Sep 17 00:00:00 2001 +From 412d33bbfe42a10a9b1f62afcc73fe121a0363b0 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 31 Dec 2015 14:33:02 -0800 Subject: [PATCH] Remove bash dependency for nscd init script diff --git a/poky/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch b/poky/meta/recipes-core/glibc/glibc/0019-eglibc-Cross-building-and-testing-instructions.patch index 826e5af46..8fb9182d9 100644 --- a/poky/meta/recipes-core/glibc/glibc/0018-eglibc-Cross-building-and-testing-instructions.patch +++ b/poky/meta/recipes-core/glibc/glibc/0019-eglibc-Cross-building-and-testing-instructions.patch @@ -1,4 +1,4 @@ -From 060ba13b5ac5e90517d540f009ebdcdcf62f9685 Mon Sep 17 00:00:00 2001 +From db9674ffc6583a508da1a3cb044c3ccf3febaea1 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:42:58 +0000 Subject: [PATCH] eglibc: Cross building and testing instructions diff --git a/poky/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch b/poky/meta/recipes-core/glibc/glibc/0020-eglibc-Help-bootstrap-cross-toolchain.patch index afac2e04f..9b76cfd3b 100644 --- a/poky/meta/recipes-core/glibc/glibc/0019-eglibc-Help-bootstrap-cross-toolchain.patch +++ b/poky/meta/recipes-core/glibc/glibc/0020-eglibc-Help-bootstrap-cross-toolchain.patch @@ -1,4 +1,4 @@ -From f13c2f525e9bc82ce13e4cf486f7fe0831fc3fac Mon Sep 17 00:00:00 2001 +From 7856684f76c100155cad11b5b236fb31234b6e28 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:49:28 +0000 Subject: [PATCH] eglibc: Help bootstrap cross toolchain @@ -29,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> create mode 100644 include/stubs-bootstrap.h diff --git a/Makefile b/Makefile -index 50f99ca611..31eed15f02 100644 +index f98d5a9e67..c36d04da0f 100644 --- a/Makefile +++ b/Makefile @@ -79,9 +79,18 @@ subdir-dirs = include @@ -52,7 +52,7 @@ index 50f99ca611..31eed15f02 100644 ifeq (yes,$(build-shared)) headers += gnu/lib-names.h endif -@@ -416,6 +425,16 @@ others: $(common-objpfx)testrun.sh $(common-objpfx)debugglibc.sh +@@ -415,6 +424,16 @@ others: $(common-objpfx)testrun.sh $(common-objpfx)debugglibc.sh subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs) @@ -69,7 +69,7 @@ index 50f99ca611..31eed15f02 100644 ifndef abi-variants installed-stubs = $(inst_includedir)/gnu/stubs.h else -@@ -442,6 +461,7 @@ $(inst_includedir)/gnu/stubs.h: $(+force) +@@ -441,6 +460,7 @@ $(inst_includedir)/gnu/stubs.h: $(+force) install-others-nosubdir: $(installed-stubs) endif diff --git a/poky/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch b/poky/meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch index 9a610c670..74c8c1066 100644 --- a/poky/meta/recipes-core/glibc/glibc/0020-eglibc-Resolve-__fpscr_values-on-SH4.patch +++ b/poky/meta/recipes-core/glibc/glibc/0021-eglibc-Resolve-__fpscr_values-on-SH4.patch @@ -1,4 +1,4 @@ -From 330c4e50e28e29c31fb8d6ab39cdbb2af4d3def7 Mon Sep 17 00:00:00 2001 +From 111ab95a85314d1e70fb159a14250354cc69d899 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:55:53 +0000 Subject: [PATCH] eglibc: Resolve __fpscr_values on SH4 @@ -21,10 +21,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 12 insertions(+) diff --git a/sysdeps/unix/sysv/linux/sh/Versions b/sysdeps/unix/sysv/linux/sh/Versions -index e0938c4165..ca1d7da339 100644 +index 9c734ff755..974e33b4b1 100644 --- a/sysdeps/unix/sysv/linux/sh/Versions +++ b/sysdeps/unix/sysv/linux/sh/Versions -@@ -2,6 +2,7 @@ libc { +@@ -3,6 +3,7 @@ libc { GLIBC_2.2 { # functions used in other libraries __xstat64; __fxstat64; __lxstat64; diff --git a/poky/meta/recipes-core/glibc/glibc/0022-Define-DUMMY_LOCALE_T-if-not-defined.patch b/poky/meta/recipes-core/glibc/glibc/0022-Define-DUMMY_LOCALE_T-if-not-defined.patch deleted file mode 100644 index 33d912d35..000000000 --- a/poky/meta/recipes-core/glibc/glibc/0022-Define-DUMMY_LOCALE_T-if-not-defined.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c8df3cf4556d8d78a98675865395ce42f3b67109 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 20 Apr 2016 21:11:00 -0700 -Subject: [PATCH] Define DUMMY_LOCALE_T if not defined - -This is a hack to fix building the locale bits on an older -CentOs 5.X machine - -Upstream-Status: Inappropriate [other] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - locale/programs/config.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/locale/programs/config.h b/locale/programs/config.h -index 2edcf3696c..5350101e38 100644 ---- a/locale/programs/config.h -+++ b/locale/programs/config.h -@@ -19,6 +19,9 @@ - #ifndef _LD_CONFIG_H - #define _LD_CONFIG_H 1 - -+#ifndef DUMMY_LOCALE_T -+#define DUMMY_LOCALE_T -+#endif - /* Use the internal textdomain used for libc messages. */ - #define PACKAGE _libc_intl_domainname - #ifndef VERSION diff --git a/poky/meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch b/poky/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch index 0b2f020fd..a9ff8e92e 100644 --- a/poky/meta/recipes-core/glibc/glibc/0021-eglibc-Forward-port-cross-locale-generation-support.patch +++ b/poky/meta/recipes-core/glibc/glibc/0022-eglibc-Forward-port-cross-locale-generation-support.patch @@ -1,4 +1,4 @@ -From 557ed640b26bd208ce8d4a6fd725b124893668d7 Mon Sep 17 00:00:00 2001 +From 4e5de801a39d66b8bd93d09f5912dcbe5db4ef04 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 01:33:49 +0000 Subject: [PATCH] eglibc: Forward port cross locale generation support @@ -148,7 +148,7 @@ index 4841bfd05d..ffcba1fd79 100644 return NULL; } diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c -index 0af21e05e2..4980b0c52f 100644 +index b6406b775d..bfa4adba9c 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -349,7 +349,7 @@ new_element (struct locale_collate_t *collate, const char *mbs, size_t mbslen, @@ -160,7 +160,7 @@ index 0af21e05e2..4980b0c52f 100644 uint32_t zero = 0; /* Handle <U0000> as a single character. */ if (nwcs == 0) -@@ -1772,8 +1772,7 @@ symbol `%s' has the same encoding as"), (*eptr)->name); +@@ -1775,8 +1775,7 @@ symbol `%s' has the same encoding as"), (*eptr)->name); if ((*eptr)->nwcs == runp->nwcs) { @@ -170,7 +170,7 @@ index 0af21e05e2..4980b0c52f 100644 if (c == 0) { -@@ -2000,9 +1999,9 @@ add_to_tablewc (uint32_t ch, struct element_t *runp) +@@ -2003,9 +2002,9 @@ add_to_tablewc (uint32_t ch, struct element_t *runp) one consecutive entry. */ if (runp->wcnext != NULL && runp->nwcs == runp->wcnext->nwcs @@ -183,7 +183,7 @@ index 0af21e05e2..4980b0c52f 100644 && (runp->wcs[runp->nwcs - 1] == runp->wcnext->wcs[runp->nwcs - 1] + 1)) { -@@ -2026,9 +2025,9 @@ add_to_tablewc (uint32_t ch, struct element_t *runp) +@@ -2029,9 +2028,9 @@ add_to_tablewc (uint32_t ch, struct element_t *runp) runp = runp->wcnext; while (runp->wcnext != NULL && runp->nwcs == runp->wcnext->nwcs diff --git a/poky/meta/recipes-core/glibc/glibc/0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch b/poky/meta/recipes-core/glibc/glibc/0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch index a5a7a0cad..50c2e1473 100644 --- a/poky/meta/recipes-core/glibc/glibc/0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch +++ b/poky/meta/recipes-core/glibc/glibc/0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch @@ -1,4 +1,4 @@ -From 2ec233ce078b74030de9195096058cd502fdc395 Mon Sep 17 00:00:00 2001 +From 13bc0e53cc91e102472d532f28b3d44c30d291fc Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 3 Aug 2018 09:42:06 -0700 Subject: [PATCH] localedef --add-to-archive uses a hard-coded locale path @@ -18,7 +18,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c -index 6bb189ae37..0711c5c44e 100644 +index f38e835c52..8d8f8699b2 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -340,12 +340,24 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head) diff --git a/poky/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch b/poky/meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch index d2691e1ee..fb0a609db 100644 --- a/poky/meta/recipes-core/glibc/glibc/0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch +++ b/poky/meta/recipes-core/glibc/glibc/0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch @@ -1,4 +1,4 @@ -From f8289aa320b00f6db43213979cceab2325a7a611 Mon Sep 17 00:00:00 2001 +From 50b605dece16606dd9d1c737e579c13725eab11d Mon Sep 17 00:00:00 2001 From: Mark Hatle <mark.hatle@windriver.com> Date: Thu, 18 Aug 2016 14:07:58 -0500 Subject: [PATCH] elf/dl-deps.c: Make _dl_build_local_scope breadth first diff --git a/poky/meta/recipes-core/glibc/glibc/0025-intl-Emit-no-lines-in-bison-generated-files.patch b/poky/meta/recipes-core/glibc/glibc/0026-intl-Emit-no-lines-in-bison-generated-files.patch index 32f8fd22b..998db39b4 100644 --- a/poky/meta/recipes-core/glibc/glibc/0025-intl-Emit-no-lines-in-bison-generated-files.patch +++ b/poky/meta/recipes-core/glibc/glibc/0026-intl-Emit-no-lines-in-bison-generated-files.patch @@ -1,4 +1,4 @@ -From 3156464f9a95bf1dafd2e22d19d7bf89c520acc1 Mon Sep 17 00:00:00 2001 +From 99ab34278a6ebec134267412b4f619f43e278dea Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 3 Aug 2018 09:44:00 -0700 Subject: [PATCH] intl: Emit no lines in bison generated files diff --git a/poky/meta/recipes-core/glibc/glibc/0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch b/poky/meta/recipes-core/glibc/glibc/0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch index 782d931f2..2bfa2aaa0 100644 --- a/poky/meta/recipes-core/glibc/glibc/0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch +++ b/poky/meta/recipes-core/glibc/glibc/0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch @@ -1,4 +1,4 @@ -From 881f5b8134afd9a30049b93fc79dda7a44947a5f Mon Sep 17 00:00:00 2001 +From 3190ada9ecaec915794886a608221655c120f90c Mon Sep 17 00:00:00 2001 From: Martin Jansa <martin.jansa@gmail.com> Date: Mon, 17 Dec 2018 21:36:18 +0000 Subject: [PATCH] locale: prevent maybe-uninitialized errors with -Os [BZ diff --git a/poky/meta/recipes-core/glibc/glibc/0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch b/poky/meta/recipes-core/glibc/glibc/0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch index d273cab4a..8042caaea 100644 --- a/poky/meta/recipes-core/glibc/glibc/0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch +++ b/poky/meta/recipes-core/glibc/glibc/0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch @@ -1,4 +1,4 @@ -From b4e0a034b12b313dcb82d22341bef6a66b3e9ef9 Mon Sep 17 00:00:00 2001 +From 5d201a75918a0e181ee6206f701901fdb91baf81 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 18 Mar 2015 00:11:22 +0000 Subject: [PATCH] readlib: Add OECORE_KNOWN_INTERPRETER_NAMES to known names diff --git a/poky/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch b/poky/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch index 11a77cdf9..ece792509 100644 --- a/poky/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch +++ b/poky/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch @@ -1,4 +1,4 @@ -From 2ae3ff3ae28abb1d0d100b4722da7ff188de9a30 Mon Sep 17 00:00:00 2001 +From baba3c6021340a9070b734f931a15cea4cfe6c31 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 15 May 2020 17:05:45 -0700 Subject: [PATCH] wordsize.h: Unify the header between arm and aarch64 @@ -46,14 +46,6 @@ copy to sysdeps/arm/bits/wordsize.h index 91da566b74..34fcdef1f1 100644 --- a/sysdeps/aarch64/bits/wordsize.h +++ b/sysdeps/arm/bits/wordsize.h -@@ -1,6 +1,6 @@ - /* Determine the wordsize from the preprocessor defines. - -- Copyright (C) 2016-2021 Free Software Foundation, Inc. -+ Copyright (C) 2016-2021 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or @@ -17,12 +17,16 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ diff --git a/poky/meta/recipes-core/glibc/glibc/0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch b/poky/meta/recipes-core/glibc/glibc/0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch index 5ef1ac2ed..22df820ae 100644 --- a/poky/meta/recipes-core/glibc/glibc/0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch +++ b/poky/meta/recipes-core/glibc/glibc/0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch @@ -1,4 +1,4 @@ -From 5cc14938f05ae1354c8062f017a21f39d5fc9729 Mon Sep 17 00:00:00 2001 +From 60aa53f547911163b42a1c436d695a15c87f34ee Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 7 Aug 2020 14:31:16 -0700 Subject: [PATCH] powerpc: Do not ask compiler for finding arch diff --git a/poky/meta/recipes-core/glibc/glibc/faccessat2-perm.patch b/poky/meta/recipes-core/glibc/glibc/faccessat2-perm.patch deleted file mode 100644 index 2ee7110ca..000000000 --- a/poky/meta/recipes-core/glibc/glibc/faccessat2-perm.patch +++ /dev/null @@ -1,31 +0,0 @@ -Older seccomp-based filters used in container frameworks will block faccessat2 -calls as it's a relatively new syscall. This isn't a big problem with -glibc <2.33 but 2.33 will call faccessat2 itself, get EPERM, and thenn be confused -about what to do as EPERM isn't an expected error code. - -This manifests itself as mysterious errors, for example a kernel failing to link. - -The root cause of bad seccomp filters is mostly fixed (systemd 247, Docker 20.10.0) -but we can't expect everyone to upgrade, so add a workaound (originally from -Red Hat) to handle EPERM like ENOSYS and fallback to faccessat(). - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@arm.com> - -diff --git a/sysdeps/unix/sysv/linux/faccessat.c b/sysdeps/unix/sysv/linux/faccessat.c -index 56cb6dcc8b4d58d3..5de75032bbc93a2c 100644 ---- a/sysdeps/unix/sysv/linux/faccessat.c -+++ b/sysdeps/unix/sysv/linux/faccessat.c -@@ -34,7 +34,11 @@ faccessat (int fd, const char *file, int mode, int flag) - #if __ASSUME_FACCESSAT2 - return ret; - #else -- if (ret == 0 || errno != ENOSYS) -+ /* Fedora-specific workaround: -+ As a workround for a broken systemd-nspawn that returns -+ EPERM when a syscall is not allowed instead of ENOSYS -+ we must check for EPERM here and fall back to faccessat. */ -+ if (ret == 0 || !(errno == ENOSYS || errno == EPERM)) - return ret; - - if (flag & ~(AT_SYMLINK_NOFOLLOW | AT_EACCESS)) diff --git a/poky/meta/recipes-core/glibc/glibc/mte-backports.patch b/poky/meta/recipes-core/glibc/glibc/mte-backports.patch deleted file mode 100644 index d9604fdf4..000000000 --- a/poky/meta/recipes-core/glibc/glibc/mte-backports.patch +++ /dev/null @@ -1,1238 +0,0 @@ -Backport a number of patches from master to improve Arm MTE support. - -Upstream-Status: Backport [will be in 2.34] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From 2643466c2928a93de7b80a61f6a8f61a653862e1 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy@arm.com> -Date: Thu, 11 Mar 2021 14:09:56 +0000 -Subject: [PATCH 01/11] malloc: Fix a potential realloc issue with memory - tagging - -At an _int_free call site in realloc the wrong size was used for tag -clearing: the chunk header of the next chunk was also cleared which -in practice may work, but logically wrong. - -The tag clearing is moved before the memcpy to save a tag computation, -this avoids a chunk2mem. Another chunk2mem is removed because newmem -does not have to be recomputed. Whitespaces got fixed too. - -Reviewed-by: DJ Delorie <dj@redhat.com> ---- - malloc/malloc.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/malloc/malloc.c b/malloc/malloc.c -index 8f8f12c276..51cec67e55 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c -@@ -4851,14 +4851,14 @@ _int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize, - } - else - { -- void *oldmem = chunk2mem (oldp); -+ void *oldmem = chunk2rawmem (oldp); -+ size_t sz = CHUNK_AVAILABLE_SIZE (oldp) - CHUNK_HDR_SZ; -+ (void) TAG_REGION (oldmem, sz); - newmem = TAG_NEW_USABLE (newmem); -- memcpy (newmem, oldmem, -- CHUNK_AVAILABLE_SIZE (oldp) - CHUNK_HDR_SZ); -- (void) TAG_REGION (chunk2rawmem (oldp), oldsize); -- _int_free (av, oldp, 1); -- check_inuse_chunk (av, newp); -- return chunk2mem (newp); -+ memcpy (newmem, oldmem, sz); -+ _int_free (av, oldp, 1); -+ check_inuse_chunk (av, newp); -+ return newmem; - } - } - } --- -2.25.1 - - -From 32f3132be063e4b16a5cdb058980af354126e2f4 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy@arm.com> -Date: Thu, 28 Jan 2021 17:34:36 +0000 -Subject: [PATCH 02/11] malloc: Move MTAG_MMAP_FLAGS definition - -This is only used internally in malloc.c, the extern declaration -was wrong, __mtag_mmap_flags has internal linkage. - -Reviewed-by: DJ Delorie <dj@redhat.com> ---- - include/malloc.h | 7 ------- - malloc/malloc.c | 2 ++ - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/include/malloc.h b/include/malloc.h -index 7ae08d53d3..b77761f74d 100644 ---- a/include/malloc.h -+++ b/include/malloc.h -@@ -16,11 +16,4 @@ typedef struct malloc_state *mstate; - - # endif /* !_ISOMAC */ - --#ifdef USE_MTAG --extern int __mtag_mmap_flags; --#define MTAG_MMAP_FLAGS __mtag_mmap_flags --#else --#define MTAG_MMAP_FLAGS 0 --#endif -- - #endif -diff --git a/malloc/malloc.c b/malloc/malloc.c -index 51cec67e55..61c25d0f93 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c -@@ -463,11 +463,13 @@ static void *(*__tag_region)(void *, size_t) = __default_tag_region; - static void *(*__tag_new_usable)(void *) = __default_tag_nop; - static void *(*__tag_at)(void *) = __default_tag_nop; - -+# define MTAG_MMAP_FLAGS __mtag_mmap_flags - # define TAG_NEW_MEMSET(ptr, val, size) __tag_new_memset (ptr, val, size) - # define TAG_REGION(ptr, size) __tag_region (ptr, size) - # define TAG_NEW_USABLE(ptr) __tag_new_usable (ptr) - # define TAG_AT(ptr) __tag_at (ptr) - #else -+# define MTAG_MMAP_FLAGS 0 - # define TAG_NEW_MEMSET(ptr, val, size) memset (ptr, val, size) - # define TAG_REGION(ptr, size) (ptr) - # define TAG_NEW_USABLE(ptr) (ptr) --- -2.25.1 - - -From 4b13f77fb97f9618a7868ab767d05e0c2d7c6f6f Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy@arm.com> -Date: Thu, 4 Feb 2021 11:38:23 +0000 -Subject: [PATCH 03/11] malloc: Simplify __mtag_tag_new_usable - -The chunk cannot be a dumped one here. The only non-obvious cases -are free and realloc which may be called on a dumped area chunk, -but in both cases it can be verified that tagging is already -avoided for dumped area chunks. - -Reviewed-by: DJ Delorie <dj@redhat.com> ---- - malloc/arena.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/malloc/arena.c b/malloc/arena.c -index bf17be27d4..0777dc70c6 100644 ---- a/malloc/arena.c -+++ b/malloc/arena.c -@@ -298,11 +298,6 @@ __mtag_tag_new_usable (void *ptr) - if (ptr) - { - mchunkptr cp = mem2chunk(ptr); -- /* This likely will never happen, but we can't handle retagging -- chunks from the dumped main arena. So just return the -- existing pointer. */ -- if (DUMPED_MAIN_ARENA_CHUNK (cp)) -- return ptr; - ptr = __libc_mtag_tag_region (__libc_mtag_new_tag (ptr), - CHUNK_AVAILABLE_SIZE (cp) - CHUNK_HDR_SZ); - } --- -2.25.1 - - -From 4f05837ba6934c5b8bbc6738f8883890493f50b6 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy@arm.com> -Date: Thu, 4 Feb 2021 11:52:14 +0000 -Subject: [PATCH 04/11] malloc: Avoid taggig mmaped memory on free - -Either the memory belongs to the dumped area, in which case we don't -want to tag (the dumped area has the same tag as malloc internal data -so tagging is unnecessary, but chunks there may not have the right -alignment for the tag granule), or the memory will be unmapped -immediately (and thus tagging is not useful). - -Reviewed-by: DJ Delorie <dj@redhat.com> ---- - malloc/malloc.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/malloc/malloc.c b/malloc/malloc.c -index 61c25d0f93..ecb87350b0 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c -@@ -3284,9 +3284,6 @@ __libc_free (void *mem) - - p = mem2chunk (mem); - -- /* Mark the chunk as belonging to the library again. */ -- (void)TAG_REGION (chunk2rawmem (p), CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); -- - if (chunk_is_mmapped (p)) /* release mmapped memory. */ - { - /* See if the dynamic brk/mmap threshold needs adjusting. -@@ -3307,6 +3304,10 @@ __libc_free (void *mem) - { - MAYBE_INIT_TCACHE (); - -+ /* Mark the chunk as belonging to the library again. */ -+ (void)TAG_REGION (chunk2rawmem (p), -+ CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); -+ - ar_ptr = arena_for_chunk (p); - _int_free (ar_ptr, p, 0); - } --- -2.25.1 - - -From 673fad3798846101b77a89595cfa17f334a1c898 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy@arm.com> -Date: Tue, 16 Feb 2021 14:12:25 +0000 -Subject: [PATCH 05/11] malloc: Refactor TAG_ macros to avoid indirection - -This does not change behaviour, just removes one layer of indirection -in the internal memory tagging logic. - -Use tag_ and mtag_ prefixes instead of __tag_ and __mtag_ since these -are all symbols with internal linkage, private to malloc.c, so there -is no user namespace pollution issue. - -Reviewed-by: DJ Delorie <dj@redhat.com> ---- - malloc/arena.c | 16 +++++----- - malloc/hooks.c | 10 +++--- - malloc/malloc.c | 81 +++++++++++++++++++++++-------------------------- - 3 files changed, 51 insertions(+), 56 deletions(-) - -diff --git a/malloc/arena.c b/malloc/arena.c -index 0777dc70c6..d0778fea92 100644 ---- a/malloc/arena.c -+++ b/malloc/arena.c -@@ -332,12 +332,12 @@ ptmalloc_init (void) - if (__MTAG_SBRK_UNTAGGED) - __morecore = __failing_morecore; - -- __mtag_mmap_flags = __MTAG_MMAP_FLAGS; -- __tag_new_memset = __mtag_tag_new_memset; -- __tag_region = __libc_mtag_tag_region; -- __tag_new_usable = __mtag_tag_new_usable; -- __tag_at = __libc_mtag_address_get_tag; -- __mtag_granule_mask = ~(size_t)(__MTAG_GRANULE_SIZE - 1); -+ mtag_mmap_flags = __MTAG_MMAP_FLAGS; -+ tag_new_memset = __mtag_tag_new_memset; -+ tag_region = __libc_mtag_tag_region; -+ tag_new_usable = __mtag_tag_new_usable; -+ tag_at = __libc_mtag_address_get_tag; -+ mtag_granule_mask = ~(size_t)(__MTAG_GRANULE_SIZE - 1); - } - #endif - -@@ -557,7 +557,7 @@ new_heap (size_t size, size_t top_pad) - } - } - } -- if (__mprotect (p2, size, MTAG_MMAP_FLAGS | PROT_READ | PROT_WRITE) != 0) -+ if (__mprotect (p2, size, mtag_mmap_flags | PROT_READ | PROT_WRITE) != 0) - { - __munmap (p2, HEAP_MAX_SIZE); - return 0; -@@ -587,7 +587,7 @@ grow_heap (heap_info *h, long diff) - { - if (__mprotect ((char *) h + h->mprotect_size, - (unsigned long) new_size - h->mprotect_size, -- MTAG_MMAP_FLAGS | PROT_READ | PROT_WRITE) != 0) -+ mtag_mmap_flags | PROT_READ | PROT_WRITE) != 0) - return -2; - - h->mprotect_size = new_size; -diff --git a/malloc/hooks.c b/malloc/hooks.c -index efec05f0a8..d8e304c31c 100644 ---- a/malloc/hooks.c -+++ b/malloc/hooks.c -@@ -68,7 +68,7 @@ __malloc_check_init (void) - tags, so fetch the tag at each location before dereferencing - it. */ - #define SAFE_CHAR_OFFSET(p,offset) \ -- ((unsigned char *) TAG_AT (((unsigned char *) p) + offset)) -+ ((unsigned char *) tag_at (((unsigned char *) p) + offset)) - - /* A simple, standard set of debugging hooks. Overhead is `only' one - byte per chunk; still this will catch most cases of double frees or -@@ -249,7 +249,7 @@ malloc_check (size_t sz, const void *caller) - top_check (); - victim = _int_malloc (&main_arena, nb); - __libc_lock_unlock (main_arena.mutex); -- return mem2mem_check (TAG_NEW_USABLE (victim), sz); -+ return mem2mem_check (tag_new_usable (victim), sz); - } - - static void -@@ -280,7 +280,7 @@ free_check (void *mem, const void *caller) - else - { - /* Mark the chunk as belonging to the library again. */ -- (void)TAG_REGION (chunk2rawmem (p), CHUNK_AVAILABLE_SIZE (p) -+ (void)tag_region (chunk2rawmem (p), CHUNK_AVAILABLE_SIZE (p) - - CHUNK_HDR_SZ); - _int_free (&main_arena, p, 1); - __libc_lock_unlock (main_arena.mutex); -@@ -375,7 +375,7 @@ invert: - - __libc_lock_unlock (main_arena.mutex); - -- return mem2mem_check (TAG_NEW_USABLE (newmem), bytes); -+ return mem2mem_check (tag_new_usable (newmem), bytes); - } - - static void * -@@ -417,7 +417,7 @@ memalign_check (size_t alignment, size_t bytes, const void *caller) - top_check (); - mem = _int_memalign (&main_arena, alignment, bytes + 1); - __libc_lock_unlock (main_arena.mutex); -- return mem2mem_check (TAG_NEW_USABLE (mem), bytes); -+ return mem2mem_check (tag_new_usable (mem), bytes); - } - - #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_25) -diff --git a/malloc/malloc.c b/malloc/malloc.c -index ecb87350b0..62d00f54cc 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c -@@ -413,26 +413,26 @@ void *(*__morecore)(ptrdiff_t) = __default_morecore; - operations can continue to be used. Support macros are used to do - this: - -- void *TAG_NEW_MEMSET (void *ptr, int, val, size_t size) -+ void *tag_new_memset (void *ptr, int, val, size_t size) - - Has the same interface as memset(), but additionally allocates a - new tag, colors the memory with that tag and returns a pointer that - is correctly colored for that location. The non-tagging version - will simply call memset. - -- void *TAG_REGION (void *ptr, size_t size) -+ void *tag_region (void *ptr, size_t size) - - Color the region of memory pointed to by PTR and size SIZE with - the color of PTR. Returns the original pointer. - -- void *TAG_NEW_USABLE (void *ptr) -+ void *tag_new_usable (void *ptr) - - Allocate a new random color and use it to color the user region of - a chunk; this may include data from the subsequent chunk's header - if tagging is sufficiently fine grained. Returns PTR suitably - recolored for accessing the memory there. - -- void *TAG_AT (void *ptr) -+ void *tag_at (void *ptr) - - Read the current color of the memory at the address pointed to by - PTR (ignoring it's current color) and return PTR recolored to that -@@ -455,25 +455,20 @@ __default_tag_nop (void *ptr) - return ptr; - } - --static int __mtag_mmap_flags = 0; --static size_t __mtag_granule_mask = ~(size_t)0; -+static int mtag_mmap_flags = 0; -+static size_t mtag_granule_mask = ~(size_t)0; - --static void *(*__tag_new_memset)(void *, int, size_t) = memset; --static void *(*__tag_region)(void *, size_t) = __default_tag_region; --static void *(*__tag_new_usable)(void *) = __default_tag_nop; --static void *(*__tag_at)(void *) = __default_tag_nop; -+static void *(*tag_new_memset)(void *, int, size_t) = memset; -+static void *(*tag_region)(void *, size_t) = __default_tag_region; -+static void *(*tag_new_usable)(void *) = __default_tag_nop; -+static void *(*tag_at)(void *) = __default_tag_nop; - --# define MTAG_MMAP_FLAGS __mtag_mmap_flags --# define TAG_NEW_MEMSET(ptr, val, size) __tag_new_memset (ptr, val, size) --# define TAG_REGION(ptr, size) __tag_region (ptr, size) --# define TAG_NEW_USABLE(ptr) __tag_new_usable (ptr) --# define TAG_AT(ptr) __tag_at (ptr) - #else --# define MTAG_MMAP_FLAGS 0 --# define TAG_NEW_MEMSET(ptr, val, size) memset (ptr, val, size) --# define TAG_REGION(ptr, size) (ptr) --# define TAG_NEW_USABLE(ptr) (ptr) --# define TAG_AT(ptr) (ptr) -+# define mtag_mmap_flags 0 -+# define tag_new_memset(ptr, val, size) memset (ptr, val, size) -+# define tag_region(ptr, size) (ptr) -+# define tag_new_usable(ptr) (ptr) -+# define tag_at(ptr) (ptr) - #endif - - #include <string.h> -@@ -1305,8 +1300,8 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - /* Convert between user mem pointers and chunk pointers, updating any - memory tags on the pointer to respect the tag value at that - location. */ --#define chunk2mem(p) ((void*)TAG_AT (((char*)(p) + CHUNK_HDR_SZ))) --#define mem2chunk(mem) ((mchunkptr)TAG_AT (((char*)(mem) - CHUNK_HDR_SZ))) -+#define chunk2mem(p) ((void *)tag_at (((char*)(p) + CHUNK_HDR_SZ))) -+#define mem2chunk(mem) ((mchunkptr)tag_at (((char*)(mem) - CHUNK_HDR_SZ))) - - /* The smallest possible chunk */ - #define MIN_CHUNK_SIZE (offsetof(struct malloc_chunk, fd_nextsize)) -@@ -1337,7 +1332,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - #ifdef USE_MTAG - #define CHUNK_AVAILABLE_SIZE(p) \ - ((chunksize (p) + (chunk_is_mmapped (p) ? 0 : SIZE_SZ)) \ -- & __mtag_granule_mask) -+ & mtag_granule_mask) - #else - #define CHUNK_AVAILABLE_SIZE(p) \ - (chunksize (p) + (chunk_is_mmapped (p) ? 0 : SIZE_SZ)) -@@ -1361,7 +1356,7 @@ checked_request2size (size_t req, size_t *sz) __nonnull (1) - number. Ideally, this would be part of request2size(), but that - must be a macro that produces a compile time constant if passed - a constant literal. */ -- req = (req + ~__mtag_granule_mask) & __mtag_granule_mask; -+ req = (req + ~mtag_granule_mask) & mtag_granule_mask; - #endif - - *sz = request2size (req); -@@ -2467,7 +2462,7 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av) - if ((unsigned long) (size) > (unsigned long) (nb)) - { - mm = (char *) (MMAP (0, size, -- MTAG_MMAP_FLAGS | PROT_READ | PROT_WRITE, 0)); -+ mtag_mmap_flags | PROT_READ | PROT_WRITE, 0)); - - if (mm != MAP_FAILED) - { -@@ -2665,7 +2660,7 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av) - if ((unsigned long) (size) > (unsigned long) (nb)) - { - char *mbrk = (char *) (MMAP (0, size, -- MTAG_MMAP_FLAGS | PROT_READ | PROT_WRITE, -+ mtag_mmap_flags | PROT_READ | PROT_WRITE, - 0)); - - if (mbrk != MAP_FAILED) -@@ -3221,14 +3216,14 @@ __libc_malloc (size_t bytes) - && tcache->counts[tc_idx] > 0) - { - victim = tcache_get (tc_idx); -- return TAG_NEW_USABLE (victim); -+ return tag_new_usable (victim); - } - DIAG_POP_NEEDS_COMMENT; - #endif - - if (SINGLE_THREAD_P) - { -- victim = TAG_NEW_USABLE (_int_malloc (&main_arena, bytes)); -+ victim = tag_new_usable (_int_malloc (&main_arena, bytes)); - assert (!victim || chunk_is_mmapped (mem2chunk (victim)) || - &main_arena == arena_for_chunk (mem2chunk (victim))); - return victim; -@@ -3249,7 +3244,7 @@ __libc_malloc (size_t bytes) - if (ar_ptr != NULL) - __libc_lock_unlock (ar_ptr->mutex); - -- victim = TAG_NEW_USABLE (victim); -+ victim = tag_new_usable (victim); - - assert (!victim || chunk_is_mmapped (mem2chunk (victim)) || - ar_ptr == arena_for_chunk (mem2chunk (victim))); -@@ -3305,7 +3300,7 @@ __libc_free (void *mem) - MAYBE_INIT_TCACHE (); - - /* Mark the chunk as belonging to the library again. */ -- (void)TAG_REGION (chunk2rawmem (p), -+ (void)tag_region (chunk2rawmem (p), - CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); - - ar_ptr = arena_for_chunk (p); -@@ -3408,7 +3403,7 @@ __libc_realloc (void *oldmem, size_t bytes) - reused. There's a performance hit for both us and the - caller for doing this, so we might want to - reconsider. */ -- return TAG_NEW_USABLE (newmem); -+ return tag_new_usable (newmem); - } - #endif - /* Note the extra SIZE_SZ overhead. */ -@@ -3451,7 +3446,7 @@ __libc_realloc (void *oldmem, size_t bytes) - { - size_t sz = CHUNK_AVAILABLE_SIZE (oldp) - CHUNK_HDR_SZ; - memcpy (newp, oldmem, sz); -- (void) TAG_REGION (chunk2rawmem (oldp), sz); -+ (void) tag_region (chunk2rawmem (oldp), sz); - _int_free (ar_ptr, oldp, 0); - } - } -@@ -3509,7 +3504,7 @@ _mid_memalign (size_t alignment, size_t bytes, void *address) - p = _int_memalign (&main_arena, alignment, bytes); - assert (!p || chunk_is_mmapped (mem2chunk (p)) || - &main_arena == arena_for_chunk (mem2chunk (p))); -- return TAG_NEW_USABLE (p); -+ return tag_new_usable (p); - } - - arena_get (ar_ptr, bytes + alignment + MINSIZE); -@@ -3527,7 +3522,7 @@ _mid_memalign (size_t alignment, size_t bytes, void *address) - - assert (!p || chunk_is_mmapped (mem2chunk (p)) || - ar_ptr == arena_for_chunk (mem2chunk (p))); -- return TAG_NEW_USABLE (p); -+ return tag_new_usable (p); - } - /* For ISO C11. */ - weak_alias (__libc_memalign, aligned_alloc) -@@ -3544,7 +3539,7 @@ __libc_valloc (size_t bytes) - void *address = RETURN_ADDRESS (0); - size_t pagesize = GLRO (dl_pagesize); - p = _mid_memalign (pagesize, bytes, address); -- return TAG_NEW_USABLE (p); -+ return tag_new_usable (p); - } - - void * -@@ -3569,7 +3564,7 @@ __libc_pvalloc (size_t bytes) - rounded_bytes = rounded_bytes & -(pagesize - 1); - - p = _mid_memalign (pagesize, rounded_bytes, address); -- return TAG_NEW_USABLE (p); -+ return tag_new_usable (p); - } - - void * -@@ -3666,7 +3661,7 @@ __libc_calloc (size_t n, size_t elem_size) - regardless of MORECORE_CLEARS, so we zero the whole block while - doing so. */ - #ifdef USE_MTAG -- return TAG_NEW_MEMSET (mem, 0, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); -+ return tag_new_memset (mem, 0, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); - #else - INTERNAL_SIZE_T csz = chunksize (p); - -@@ -4821,7 +4816,7 @@ _int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize, - av->top = chunk_at_offset (oldp, nb); - set_head (av->top, (newsize - nb) | PREV_INUSE); - check_inuse_chunk (av, oldp); -- return TAG_NEW_USABLE (chunk2rawmem (oldp)); -+ return tag_new_usable (chunk2rawmem (oldp)); - } - - /* Try to expand forward into next chunk; split off remainder below */ -@@ -4856,8 +4851,8 @@ _int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize, - { - void *oldmem = chunk2rawmem (oldp); - size_t sz = CHUNK_AVAILABLE_SIZE (oldp) - CHUNK_HDR_SZ; -- (void) TAG_REGION (oldmem, sz); -- newmem = TAG_NEW_USABLE (newmem); -+ (void) tag_region (oldmem, sz); -+ newmem = tag_new_usable (newmem); - memcpy (newmem, oldmem, sz); - _int_free (av, oldp, 1); - check_inuse_chunk (av, newp); -@@ -4881,7 +4876,7 @@ _int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize, - { - remainder = chunk_at_offset (newp, nb); - /* Clear any user-space tags before writing the header. */ -- remainder = TAG_REGION (remainder, remainder_size); -+ remainder = tag_region (remainder, remainder_size); - set_head_size (newp, nb | (av != &main_arena ? NON_MAIN_ARENA : 0)); - set_head (remainder, remainder_size | PREV_INUSE | - (av != &main_arena ? NON_MAIN_ARENA : 0)); -@@ -4891,7 +4886,7 @@ _int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize, - } - - check_inuse_chunk (av, newp); -- return TAG_NEW_USABLE (chunk2rawmem (newp)); -+ return tag_new_usable (chunk2rawmem (newp)); - } - - /* -@@ -5108,7 +5103,7 @@ musable (void *mem) - /* The usable space may be reduced if memory tagging is needed, - since we cannot share the user-space data with malloc's internal - data structure. */ -- result &= __mtag_granule_mask; -+ result &= mtag_granule_mask; - #endif - return result; - } --- -2.25.1 - - -From f0ea41e819f40aacedf25431bedd95da9c5db534 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy@arm.com> -Date: Wed, 27 Jan 2021 15:45:43 +0000 -Subject: [PATCH 06/11] malloc: Use global flag instead of function pointer - dispatch for mtag - -A flag check can be faster than function pointers because of how -branch prediction and speculation works and it can also remove a layer -of indirection when there is a mismatch between the malloc internal -tag_* api and __libc_mtag_* target hooks. - -Memory tagging wrapper functions are moved to malloc.c from arena.c and -the logic now checks mmap_enabled. The definition of tag_new_usable is -moved after chunk related definitions. - -This refactoring also allows using mtag_enabled checks instead of -USE_MTAG ifdefs when memory tagging support only changes code logic -when memory tagging is enabled at runtime. Note: an "if (false)" code -block is optimized away even at -O0 by gcc. - -Reviewed-by: DJ Delorie <dj@redhat.com> ---- - malloc/arena.c | 33 +--------------------------- - malloc/malloc.c | 58 ++++++++++++++++++++++++++++++++----------------- - 2 files changed, 39 insertions(+), 52 deletions(-) - -diff --git a/malloc/arena.c b/malloc/arena.c -index d0778fea92..1e83bb66bd 100644 ---- a/malloc/arena.c -+++ b/malloc/arena.c -@@ -287,34 +287,6 @@ extern struct dl_open_hook *_dl_open_hook; - libc_hidden_proto (_dl_open_hook); - #endif - --#ifdef USE_MTAG -- --/* Generate a new (random) tag value for PTR and tag the memory it -- points to upto the end of the usable size for the chunk containing -- it. Return the newly tagged pointer. */ --static void * --__mtag_tag_new_usable (void *ptr) --{ -- if (ptr) -- { -- mchunkptr cp = mem2chunk(ptr); -- ptr = __libc_mtag_tag_region (__libc_mtag_new_tag (ptr), -- CHUNK_AVAILABLE_SIZE (cp) - CHUNK_HDR_SZ); -- } -- return ptr; --} -- --/* Generate a new (random) tag value for PTR, set the tags for the -- memory to the new tag and initialize the memory contents to VAL. -- In practice this function will only be called with VAL=0, but we -- keep this parameter to maintain the same prototype as memset. */ --static void * --__mtag_tag_new_memset (void *ptr, int val, size_t size) --{ -- return __libc_mtag_memset_with_tag (__libc_mtag_new_tag (ptr), val, size); --} --#endif -- - static void - ptmalloc_init (void) - { -@@ -332,11 +304,8 @@ ptmalloc_init (void) - if (__MTAG_SBRK_UNTAGGED) - __morecore = __failing_morecore; - -+ mtag_enabled = true; - mtag_mmap_flags = __MTAG_MMAP_FLAGS; -- tag_new_memset = __mtag_tag_new_memset; -- tag_region = __libc_mtag_tag_region; -- tag_new_usable = __mtag_tag_new_usable; -- tag_at = __libc_mtag_address_get_tag; - mtag_granule_mask = ~(size_t)(__MTAG_GRANULE_SIZE - 1); - } - #endif -diff --git a/malloc/malloc.c b/malloc/malloc.c -index 62d00f54cc..253a919ec5 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c -@@ -441,35 +441,41 @@ void *(*__morecore)(ptrdiff_t) = __default_morecore; - */ - - #ifdef USE_MTAG -+static bool mtag_enabled = false; -+static int mtag_mmap_flags = 0; -+static size_t mtag_granule_mask = ~(size_t)0; -+#else -+# define mtag_enabled false -+# define mtag_mmap_flags 0 -+#endif - --/* Default implementaions when memory tagging is supported, but disabled. */ --static void * --__default_tag_region (void *ptr, size_t size) -+static __always_inline void * -+tag_region (void *ptr, size_t size) - { -+ if (__glibc_unlikely (mtag_enabled)) -+ return __libc_mtag_tag_region (ptr, size); - return ptr; - } - --static void * --__default_tag_nop (void *ptr) -+static __always_inline void * -+tag_new_memset (void *ptr, int val, size_t size) - { -- return ptr; -+ if (__glibc_unlikely (mtag_enabled)) -+ return __libc_mtag_memset_with_tag (__libc_mtag_new_tag (ptr), val, size); -+ return memset (ptr, val, size); - } - --static int mtag_mmap_flags = 0; --static size_t mtag_granule_mask = ~(size_t)0; -- --static void *(*tag_new_memset)(void *, int, size_t) = memset; --static void *(*tag_region)(void *, size_t) = __default_tag_region; --static void *(*tag_new_usable)(void *) = __default_tag_nop; --static void *(*tag_at)(void *) = __default_tag_nop; -+/* Defined later. */ -+static void * -+tag_new_usable (void *ptr); - --#else --# define mtag_mmap_flags 0 --# define tag_new_memset(ptr, val, size) memset (ptr, val, size) --# define tag_region(ptr, size) (ptr) --# define tag_new_usable(ptr) (ptr) --# define tag_at(ptr) (ptr) --#endif -+static __always_inline void * -+tag_at (void *ptr) -+{ -+ if (__glibc_unlikely (mtag_enabled)) -+ return __libc_mtag_address_get_tag (ptr); -+ return ptr; -+} - - #include <string.h> - -@@ -1460,6 +1466,18 @@ checked_request2size (size_t req, size_t *sz) __nonnull (1) - #pragma GCC poison mchunk_size - #pragma GCC poison mchunk_prev_size - -+static __always_inline void * -+tag_new_usable (void *ptr) -+{ -+ if (__glibc_unlikely (mtag_enabled) && ptr) -+ { -+ mchunkptr cp = mem2chunk(ptr); -+ ptr = __libc_mtag_tag_region (__libc_mtag_new_tag (ptr), -+ CHUNK_AVAILABLE_SIZE (cp) - CHUNK_HDR_SZ); -+ } -+ return ptr; -+} -+ - /* - -------------------- Internal data structures -------------------- - --- -2.25.1 - - -From 8597244d5c3edbd672b285eea5f6dea833256f9d Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy@arm.com> -Date: Wed, 17 Feb 2021 10:39:37 +0000 -Subject: [PATCH 07/11] malloc: Ensure the generic mtag hooks are not used - -Use inline functions instead of macros, because macros can cause unused -variable warnings and type conversion issues. We assume these functions -may appear in the code but only in dead code paths (hidden by a runtime -check), so it's important that they can compile with correct types, but -if they are actually used that should be an error. - -Currently the hooks are only used when USE_MTAG is true which only -happens on aarch64 and then the aarch64 specific code is used not this -generic header. However followup refactoring will allow the hooks to -be used with !USE_MTAG. - -Note: the const qualifier in the comment was wrong: changing tags is a -write operation. - -Reviewed-by: DJ Delorie <dj@redhat.com> ---- - sysdeps/generic/libc-mtag.h | 41 ++++++++++++++++++++++++++++--------- - 1 file changed, 31 insertions(+), 10 deletions(-) - -diff --git a/sysdeps/generic/libc-mtag.h b/sysdeps/generic/libc-mtag.h -index 1a866cdc0c..e8fc236b6c 100644 ---- a/sysdeps/generic/libc-mtag.h -+++ b/sysdeps/generic/libc-mtag.h -@@ -31,22 +31,43 @@ - /* Extra flags to pass to mmap() to request a tagged region of memory. */ - #define __MTAG_MMAP_FLAGS 0 - -+/* Memory tagging target hooks are only called when memory tagging is -+ enabled at runtime. The generic definitions here must not be used. */ -+void __libc_mtag_link_error (void); -+ - /* Set the tags for a region of memory, which must have size and alignment -- that are multiples of __MTAG_GRANULE_SIZE. Size cannot be zero. -- void *__libc_mtag_tag_region (const void *, size_t) */ --#define __libc_mtag_tag_region(p, s) (p) -+ that are multiples of __MTAG_GRANULE_SIZE. Size cannot be zero. */ -+static inline void * -+__libc_mtag_tag_region (void *p, size_t n) -+{ -+ __libc_mtag_link_error (); -+ return p; -+} - - /* Optimized equivalent to __libc_mtag_tag_region followed by memset. */ --#define __libc_mtag_memset_with_tag memset -+static inline void * -+__libc_mtag_memset_with_tag (void *p, int c, size_t n) -+{ -+ __libc_mtag_link_error (); -+ return memset (p, c, n); -+} - - /* Convert address P to a pointer that is tagged correctly for that -- location. -- void *__libc_mtag_address_get_tag (void*) */ --#define __libc_mtag_address_get_tag(p) (p) -+ location. */ -+static inline void * -+__libc_mtag_address_get_tag (void *p) -+{ -+ __libc_mtag_link_error (); -+ return p; -+} - - /* Assign a new (random) tag to a pointer P (does not adjust the tag on -- the memory addressed). -- void *__libc_mtag_new_tag (void*) */ --#define __libc_mtag_new_tag(p) (p) -+ the memory addressed). */ -+static inline void * -+__libc_mtag_new_tag (void *p) -+{ -+ __libc_mtag_link_error (); -+ return p; -+} - - #endif /* _GENERIC_LIBC_MTAG_H */ --- -2.25.1 - - -From 3d9e16280ad881d038aedba0b6fcbd9e78b29072 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy@arm.com> -Date: Fri, 29 Jan 2021 17:07:28 +0000 -Subject: [PATCH 08/11] malloc: Only support zeroing and not arbitrary memset - with mtag - -The memset api is suboptimal and does not provide much benefit. Memory -tagging only needs a zeroing memset (and only for memory that's sized -and aligned to multiples of the tag granule), so change the internal -api and the target hooks accordingly. This is to simplify the -implementation of the target hook. - -Reviewed-by: DJ Delorie <dj@redhat.com> ---- - malloc/malloc.c | 17 ++++++++--------- - sysdeps/aarch64/Makefile | 2 +- - ...g_memset_tag.S => __mtag_tag_zero_region.S} | 18 +++++++----------- - sysdeps/aarch64/libc-mtag.h | 4 ++-- - sysdeps/generic/libc-mtag.h | 6 +++--- - 5 files changed, 21 insertions(+), 26 deletions(-) - rename sysdeps/aarch64/{__mtag_memset_tag.S => __mtag_tag_zero_region.S} (82%) - -diff --git a/malloc/malloc.c b/malloc/malloc.c -index 253a919ec5..01cf6e9325 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c -@@ -413,12 +413,11 @@ void *(*__morecore)(ptrdiff_t) = __default_morecore; - operations can continue to be used. Support macros are used to do - this: - -- void *tag_new_memset (void *ptr, int, val, size_t size) -+ void *tag_new_zero_region (void *ptr, size_t size) - -- Has the same interface as memset(), but additionally allocates a -- new tag, colors the memory with that tag and returns a pointer that -- is correctly colored for that location. The non-tagging version -- will simply call memset. -+ Allocates a new tag, colors the memory with that tag, zeros the -+ memory and returns a pointer that is correctly colored for that -+ location. The non-tagging version will simply call memset with 0. - - void *tag_region (void *ptr, size_t size) - -@@ -458,11 +457,11 @@ tag_region (void *ptr, size_t size) - } - - static __always_inline void * --tag_new_memset (void *ptr, int val, size_t size) -+tag_new_zero_region (void *ptr, size_t size) - { - if (__glibc_unlikely (mtag_enabled)) -- return __libc_mtag_memset_with_tag (__libc_mtag_new_tag (ptr), val, size); -- return memset (ptr, val, size); -+ return __libc_mtag_tag_zero_region (__libc_mtag_new_tag (ptr), size); -+ return memset (ptr, 0, size); - } - - /* Defined later. */ -@@ -3679,7 +3678,7 @@ __libc_calloc (size_t n, size_t elem_size) - regardless of MORECORE_CLEARS, so we zero the whole block while - doing so. */ - #ifdef USE_MTAG -- return tag_new_memset (mem, 0, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); -+ return tag_new_zero_region (mem, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); - #else - INTERNAL_SIZE_T csz = chunksize (p); - -diff --git a/sysdeps/aarch64/Makefile b/sysdeps/aarch64/Makefile -index d3ab37a40a..259070cfad 100644 ---- a/sysdeps/aarch64/Makefile -+++ b/sysdeps/aarch64/Makefile -@@ -41,7 +41,7 @@ endif - ifeq ($(subdir),misc) - sysdep_headers += sys/ifunc.h - sysdep_routines += __mtag_address_get_tag \ -- __mtag_memset_tag \ -+ __mtag_tag_zero_region \ - __mtag_new_tag \ - __mtag_tag_region - -diff --git a/sysdeps/aarch64/__mtag_memset_tag.S b/sysdeps/aarch64/__mtag_tag_zero_region.S -similarity index 82% -rename from sysdeps/aarch64/__mtag_memset_tag.S -rename to sysdeps/aarch64/__mtag_tag_zero_region.S -index 3c202888a4..74d398bba5 100644 ---- a/sysdeps/aarch64/__mtag_memset_tag.S -+++ b/sysdeps/aarch64/__mtag_tag_zero_region.S -@@ -20,9 +20,6 @@ - - #ifdef USE_MTAG - --/* Use the same register names and assignments as memset. */ --#include "memset-reg.h" -- - .arch armv8.5-a - .arch_extension memtag - -@@ -31,16 +28,15 @@ - /* FIXME: This is a minimal implementation. We could do much better than - this for large values of COUNT. */ - --ENTRY(__libc_mtag_memset_with_tag) -+#define dstin x0 -+#define count x1 -+#define dst x2 - -- and valw, valw, 255 -- orr valw, valw, valw, lsl 8 -- orr valw, valw, valw, lsl 16 -- orr val, val, val, lsl 32 -- mov dst, dstin -+ENTRY(__libc_mtag_tag_zero_region) - -+ mov dst, dstin - L(loop): -- stgp val, val, [dst], #16 -+ stzg dst, [dst], #16 - subs count, count, 16 - bne L(loop) - #if 0 -@@ -49,5 +45,5 @@ L(loop): - ldg dstin, [dstin] // Recover the tag created (might be untagged). - #endif - ret --END (__libc_mtag_memset_with_tag) -+END (__libc_mtag_tag_zero_region) - #endif /* USE_MTAG */ -diff --git a/sysdeps/aarch64/libc-mtag.h b/sysdeps/aarch64/libc-mtag.h -index 979cbb743e..f58402ccf9 100644 ---- a/sysdeps/aarch64/libc-mtag.h -+++ b/sysdeps/aarch64/libc-mtag.h -@@ -39,8 +39,8 @@ - void *__libc_mtag_tag_region (const void *, size_t) */ - void *__libc_mtag_tag_region (void *, size_t); - --/* Optimized equivalent to __libc_mtag_tag_region followed by memset. */ --void *__libc_mtag_memset_with_tag (void *, int, size_t); -+/* Optimized equivalent to __libc_mtag_tag_region followed by memset to 0. */ -+void *__libc_mtag_tag_zero_region (void *, size_t); - - /* Convert address P to a pointer that is tagged correctly for that - location. -diff --git a/sysdeps/generic/libc-mtag.h b/sysdeps/generic/libc-mtag.h -index e8fc236b6c..4743e873f1 100644 ---- a/sysdeps/generic/libc-mtag.h -+++ b/sysdeps/generic/libc-mtag.h -@@ -44,12 +44,12 @@ __libc_mtag_tag_region (void *p, size_t n) - return p; - } - --/* Optimized equivalent to __libc_mtag_tag_region followed by memset. */ -+/* Optimized equivalent to __libc_mtag_tag_region followed by memset to 0. */ - static inline void * --__libc_mtag_memset_with_tag (void *p, int c, size_t n) -+__libc_mtag_tag_zero_region (void *p, size_t n) - { - __libc_mtag_link_error (); -- return memset (p, c, n); -+ return memset (p, 0, n); - } - - /* Convert address P to a pointer that is tagged correctly for that --- -2.25.1 - - -From 4d596cb72342ba0734dc847653431e078a70edfc Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy@arm.com> -Date: Tue, 16 Feb 2021 17:02:44 +0000 -Subject: [PATCH 09/11] malloc: Change calloc when tagging is disabled - -When glibc is built with memory tagging support (USE_MTAG) but it is not -enabled at runtime (mtag_enabled) then unconditional memset was used -even though that can be often avoided. - -This is for performance when tagging is supported but not enabled. -The extra check should have no overhead: tag_new_zero_region already -had a runtime check which the compiler can now optimize away. - -Reviewed-by: DJ Delorie <dj@redhat.com> ---- - malloc/malloc.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/malloc/malloc.c b/malloc/malloc.c -index 01cf6e9325..0b2aff3768 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c -@@ -3591,11 +3591,9 @@ __libc_calloc (size_t n, size_t elem_size) - mchunkptr oldtop; - INTERNAL_SIZE_T sz, oldtopsize; - void *mem; --#ifndef USE_MTAG - unsigned long clearsize; - unsigned long nclears; - INTERNAL_SIZE_T *d; --#endif - ptrdiff_t bytes; - - if (__glibc_unlikely (__builtin_mul_overflow (n, elem_size, &bytes))) -@@ -3674,12 +3672,13 @@ __libc_calloc (size_t n, size_t elem_size) - return 0; - - mchunkptr p = mem2chunk (mem); -+ - /* If we are using memory tagging, then we need to set the tags - regardless of MORECORE_CLEARS, so we zero the whole block while - doing so. */ --#ifdef USE_MTAG -- return tag_new_zero_region (mem, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); --#else -+ if (__glibc_unlikely (mtag_enabled)) -+ return tag_new_zero_region (mem, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); -+ - INTERNAL_SIZE_T csz = chunksize (p); - - /* Two optional cases in which clearing not necessary */ -@@ -3733,7 +3732,6 @@ __libc_calloc (size_t n, size_t elem_size) - } - - return mem; --#endif - } - - /* --- -2.25.1 - - -From 287a35fba55a0a817db7af71ee966a37b7642bf0 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy@arm.com> -Date: Mon, 8 Feb 2021 12:39:01 +0000 -Subject: [PATCH 10/11] malloc: Use branches instead of mtag_granule_mask - -The branches may be better optimized since mtag_enabled is widely used. - -Granule size larger than a chunk header is not supported since then we -cannot have both the chunk header and user area granule aligned. To -fix that for targets with large granule, the chunk layout has to change. - -So code that attempted to handle the granule mask generally was changed. -This simplified CHUNK_AVAILABLE_SIZE and the logic in malloc_usable_size. - -Reviewed-by: DJ Delorie <dj@redhat.com> ---- - malloc/arena.c | 1 - - malloc/malloc.c | 34 ++++++++++++++-------------------- - 2 files changed, 14 insertions(+), 21 deletions(-) - -diff --git a/malloc/arena.c b/malloc/arena.c -index 1e83bb66bd..9fbbb38a15 100644 ---- a/malloc/arena.c -+++ b/malloc/arena.c -@@ -306,7 +306,6 @@ ptmalloc_init (void) - - mtag_enabled = true; - mtag_mmap_flags = __MTAG_MMAP_FLAGS; -- mtag_granule_mask = ~(size_t)(__MTAG_GRANULE_SIZE - 1); - } - #endif - -diff --git a/malloc/malloc.c b/malloc/malloc.c -index 0b2aff3768..849bd8e2c9 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c -@@ -442,7 +442,6 @@ void *(*__morecore)(ptrdiff_t) = __default_morecore; - #ifdef USE_MTAG - static bool mtag_enabled = false; - static int mtag_mmap_flags = 0; --static size_t mtag_granule_mask = ~(size_t)0; - #else - # define mtag_enabled false - # define mtag_mmap_flags 0 -@@ -1333,15 +1332,16 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - ((req) + SIZE_SZ + MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK) - - /* Available size of chunk. This is the size of the real usable data -- in the chunk, plus the chunk header. */ --#ifdef USE_MTAG --#define CHUNK_AVAILABLE_SIZE(p) \ -- ((chunksize (p) + (chunk_is_mmapped (p) ? 0 : SIZE_SZ)) \ -- & mtag_granule_mask) --#else --#define CHUNK_AVAILABLE_SIZE(p) \ -- (chunksize (p) + (chunk_is_mmapped (p) ? 0 : SIZE_SZ)) --#endif -+ in the chunk, plus the chunk header. Note: If memory tagging is -+ enabled the layout changes to accomodate the granule size, this is -+ wasteful for small allocations so not done by default. The logic -+ does not work if chunk headers are not granule aligned. */ -+_Static_assert (__MTAG_GRANULE_SIZE <= CHUNK_HDR_SZ, -+ "memory tagging is not supported with large granule."); -+#define CHUNK_AVAILABLE_SIZE(p) \ -+ (__MTAG_GRANULE_SIZE > SIZE_SZ && __glibc_unlikely (mtag_enabled) ? \ -+ chunksize (p) : \ -+ chunksize (p) + (chunk_is_mmapped (p) ? 0 : SIZE_SZ)) - - /* Check if REQ overflows when padded and aligned and if the resulting value - is less than PTRDIFF_T. Returns TRUE and the requested size or MINSIZE in -@@ -1353,7 +1353,6 @@ checked_request2size (size_t req, size_t *sz) __nonnull (1) - if (__glibc_unlikely (req > PTRDIFF_MAX)) - return false; - --#ifdef USE_MTAG - /* When using tagged memory, we cannot share the end of the user - block with the header for the next chunk, so ensure that we - allocate blocks that are rounded up to the granule size. Take -@@ -1361,8 +1360,9 @@ checked_request2size (size_t req, size_t *sz) __nonnull (1) - number. Ideally, this would be part of request2size(), but that - must be a macro that produces a compile time constant if passed - a constant literal. */ -- req = (req + ~mtag_granule_mask) & mtag_granule_mask; --#endif -+ if (__glibc_unlikely (mtag_enabled)) -+ req = (req + (__MTAG_GRANULE_SIZE - 1)) & -+ ~(size_t)(__MTAG_GRANULE_SIZE - 1); - - *sz = request2size (req); - return true; -@@ -5112,14 +5112,8 @@ musable (void *mem) - result = chunksize (p) - CHUNK_HDR_SZ; - } - else if (inuse (p)) -- result = chunksize (p) - SIZE_SZ; -+ result = CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ; - --#ifdef USE_MTAG -- /* The usable space may be reduced if memory tagging is needed, -- since we cannot share the user-space data with malloc's internal -- data structure. */ -- result &= mtag_granule_mask; --#endif - return result; - } - return 0; --- -2.25.1 - - -From 66de173bf919e601e408dc78772c6841ad6388ab Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy@arm.com> -Date: Wed, 17 Feb 2021 10:15:18 +0000 -Subject: [PATCH 11/11] malloc: Use mtag_enabled instead of USE_MTAG - -Use the runtime check where possible: it should not cause slow down in -the !USE_MTAG case since then mtag_enabled is constant false, but it -allows compiling the tagging logic so it's less likely to break or -diverge when developers only test the !USE_MTAG case. - -Reviewed-by: DJ Delorie <dj@redhat.com> ---- - malloc/hooks.c | 10 ++++------ - malloc/malloc.c | 10 ++++------ - 2 files changed, 8 insertions(+), 12 deletions(-) - -diff --git a/malloc/hooks.c b/malloc/hooks.c -index d8e304c31c..9474e199c3 100644 ---- a/malloc/hooks.c -+++ b/malloc/hooks.c -@@ -262,11 +262,10 @@ free_check (void *mem, const void *caller) - - int err = errno; - --#ifdef USE_MTAG - /* Quickly check that the freed pointer matches the tag for the memory. - This gives a useful double-free detection. */ -- *(volatile char *)mem; --#endif -+ if (__glibc_unlikely (mtag_enabled)) -+ *(volatile char *)mem; - - __libc_lock_lock (main_arena.mutex); - p = mem2chunk_check (mem, NULL); -@@ -310,11 +309,10 @@ realloc_check (void *oldmem, size_t bytes, const void *caller) - return NULL; - } - --#ifdef USE_MTAG - /* Quickly check that the freed pointer matches the tag for the memory. - This gives a useful double-free detection. */ -- *(volatile char *)oldmem; --#endif -+ if (__glibc_unlikely (mtag_enabled)) -+ *(volatile char *)oldmem; - - __libc_lock_lock (main_arena.mutex); - const mchunkptr oldp = mem2chunk_check (oldmem, &magic_p); -diff --git a/malloc/malloc.c b/malloc/malloc.c -index 849bd8e2c9..36583120ce 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c -@@ -3286,11 +3286,10 @@ __libc_free (void *mem) - if (mem == 0) /* free(0) has no effect */ - return; - --#ifdef USE_MTAG - /* Quickly check that the freed pointer matches the tag for the memory. - This gives a useful double-free detection. */ -- *(volatile char *)mem; --#endif -+ if (__glibc_unlikely (mtag_enabled)) -+ *(volatile char *)mem; - - int err = errno; - -@@ -3352,11 +3351,10 @@ __libc_realloc (void *oldmem, size_t bytes) - if (oldmem == 0) - return __libc_malloc (bytes); - --#ifdef USE_MTAG - /* Perform a quick check to ensure that the pointer's tag matches the - memory's tag. */ -- *(volatile char*) oldmem; --#endif -+ if (__glibc_unlikely (mtag_enabled)) -+ *(volatile char*) oldmem; - - /* chunk corresponding to oldmem */ - const mchunkptr oldp = mem2chunk (oldmem); --- -2.25.1 - diff --git a/poky/meta/recipes-core/glibc/glibc_2.33.bb b/poky/meta/recipes-core/glibc/glibc_2.34.bb index 925efe8cc..6dc315c34 100644 --- a/poky/meta/recipes-core/glibc/glibc_2.33.bb +++ b/poky/meta/recipes-core/glibc/glibc_2.34.bb @@ -19,13 +19,13 @@ CVE_CHECK_WHITELIST += "CVE-2019-1010025" DEPENDS += "gperf-native bison-native make-native" NATIVESDKFIXES ?= "" -NATIVESDKFIXES_class-nativesdk = "\ +NATIVESDKFIXES:class-nativesdk = "\ file://0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch \ file://0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch \ file://0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch \ file://0006-nativesdk-glibc-Allow-64-bit-atomics-for-x86.patch \ file://0007-nativesdk-glibc-Make-relocatable-install-for-locales.patch \ - file://faccessat2-perm.patch \ + file://0008-nativesdk-glibc-Fall-back-to-faccessat-on-faccess2-r.patch \ " SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ @@ -34,29 +34,30 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://makedbs.sh \ \ ${NATIVESDKFIXES} \ - file://0008-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \ - file://0009-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch \ - file://0010-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch \ - file://0011-Quote-from-bug-1443-which-explains-what-the-patch-do.patch \ - file://0012-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ - file://0013-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch \ - file://0014-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch \ - file://0015-yes-within-the-path-sets-wrong-config-variables.patch \ - file://0016-timezone-re-written-tzselect-as-posix-sh.patch \ - file://0017-Remove-bash-dependency-for-nscd-init-script.patch \ - file://0018-eglibc-Cross-building-and-testing-instructions.patch \ - file://0019-eglibc-Help-bootstrap-cross-toolchain.patch \ - file://0020-eglibc-Resolve-__fpscr_values-on-SH4.patch \ - file://0021-eglibc-Forward-port-cross-locale-generation-support.patch \ - file://0022-Define-DUMMY_LOCALE_T-if-not-defined.patch \ - file://0023-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ - file://0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \ - file://0025-intl-Emit-no-lines-in-bison-generated-files.patch \ + file://0009-fsl-e500-e5500-e6500-603e-fsqrt-implementation.patch \ + file://0010-ppc-sqrt-Fix-undefined-reference-to-__sqrt_finite.patch \ + file://0011-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch \ + file://0012-Quote-from-bug-1443-which-explains-what-the-patch-do.patch \ + file://0013-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ + file://0014-__ieee754_sqrt-f-are-now-inline-functions-and-call-o.patch \ + file://0015-sysdeps-gnu-configure.ac-handle-correctly-libc_cv_ro.patch \ + file://0016-yes-within-the-path-sets-wrong-config-variables.patch \ + file://0017-timezone-re-written-tzselect-as-posix-sh.patch \ + file://0018-Remove-bash-dependency-for-nscd-init-script.patch \ + file://0019-eglibc-Cross-building-and-testing-instructions.patch \ + file://0020-eglibc-Help-bootstrap-cross-toolchain.patch \ + file://0021-eglibc-Resolve-__fpscr_values-on-SH4.patch \ + file://0022-eglibc-Forward-port-cross-locale-generation-support.patch \ + file://0024-localedef-add-to-archive-uses-a-hard-coded-locale-pa.patch \ + file://0025-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \ + file://0026-intl-Emit-no-lines-in-bison-generated-files.patch \ file://0027-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch \ file://0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \ file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \ file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \ - file://mte-backports.patch \ + file://0001-CVE-2021-38604.patch \ + file://0002-CVE-2021-38604.patch \ + file://0001-fix-create-thread-failed-in-unprivileged-process-BZ-.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}" @@ -80,7 +81,6 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --enable-tunables \ --enable-bind-now \ --enable-stack-protector=strong \ - --enable-stackguard-randomization \ --disable-crypt \ --with-default-link \ ${@bb.utils.contains_any('SELECTED_OPTIMIZATION', '-O0 -Og', '--disable-werror', '', d)} \ @@ -89,14 +89,14 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" -EXTRA_OECONF_append_x86 = " --enable-cet" -EXTRA_OECONF_append_x86-64 = " --enable-cet" +EXTRA_OECONF:append:x86 = " --enable-cet" +EXTRA_OECONF:append:x86-64 = " --enable-cet" PACKAGECONFIG ??= "nscd memory-tagging" PACKAGECONFIG[nscd] = "--enable-nscd,--disable-nscd" PACKAGECONFIG[memory-tagging] = "--enable-memory-tagging,--disable-memory-tagging" -do_patch_append() { +do_patch:append() { bb.build.exec_func('do_fix_readlib_c', d) } diff --git a/poky/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb b/poky/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb index 0daf50aca..1d01701b8 100644 --- a/poky/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb +++ b/poky/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb @@ -51,7 +51,7 @@ do_install_ptest () { } ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "ifup ifdown" +ALTERNATIVE:${PN} = "ifup ifdown" ALTERNATIVE_LINK_NAME[ifup] = "${base_sbindir}/ifup" ALTERNATIVE_LINK_NAME[ifdown] = "${base_sbindir}/ifdown" diff --git a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 1176311ff..17e06a056 100644 --- a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -34,7 +34,7 @@ SRC_URI = "git://git.yoctoproject.org/poky \ RECIPE_NO_UPDATE_REASON = "Recipe is recursive and handled as part of the release process" BA_INCLUDE_SOURCES ??= "0" -IMAGE_CMD_ext4_append () { +IMAGE_CMD:ext4:append () { # We don't need to reserve much space for root, 0.5% is more than enough tune2fs -m 0.5 ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4 } diff --git a/poky/meta/recipes-core/images/core-image-minimal.bb b/poky/meta/recipes-core/images/core-image-minimal.bb index 19f27f839..84343adcd 100644 --- a/poky/meta/recipes-core/images/core-image-minimal.bb +++ b/poky/meta/recipes-core/images/core-image-minimal.bb @@ -9,4 +9,4 @@ LICENSE = "MIT" inherit core-image IMAGE_ROOTFS_SIZE ?= "8192" -IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "", d)}" +IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "", d)}" diff --git a/poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb index b6fc8a4d4..741da324d 100644 --- a/poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb +++ b/poky/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb @@ -29,13 +29,13 @@ do_install () { install -m 0755 ${WORKDIR}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d } -do_install_append_qemuall () { +do_install:append:qemuall () { # Disable network manager on machines that commonly do NFS booting touch ${D}${sysconfdir}/network/nm-disabled-eth0 } PACKAGE_ARCH = "${MACHINE_ARCH}" -RDEPENDS_${PN} = "netbase" -RCONFLICTS_${PN} = "netbase (< 1:5.0)" +RDEPENDS:${PN} = "netbase" +RCONFLICTS:${PN} = "netbase (< 1:5.0)" -CONFFILES_${PN} = "${sysconfdir}/network/interfaces" +CONFFILES:${PN} = "${sysconfdir}/network/interfaces" diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb index 29ec5ec2f..ab460ac79 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb +++ b/poky/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb @@ -18,4 +18,4 @@ do_install() { inherit allarch -FILES_${PN} += "/init /dev/console" +FILES:${PN} += "/init /dev/console" diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/poky/meta/recipes-core/initrdscripts/initramfs-framework/setup-live index 4c79f4128..7e92f9332 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-framework/setup-live +++ b/poky/meta/recipes-core/initrdscripts/initramfs-framework/setup-live @@ -1,4 +1,4 @@ -#/bin/sh +#!/bin/sh # Copyright (C) 2011 O.S. Systems Software LTDA. # Licensed on MIT diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index c53a0c03a..9e8c1dc3a 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/poky/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -1,8 +1,8 @@ SUMMARY = "Modular initramfs system" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" -RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" +RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_base-utils}" +RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" PR = "r4" @@ -31,7 +31,7 @@ do_install() { install -m 0755 ${WORKDIR}/rootfs ${D}/init.d/90-rootfs install -m 0755 ${WORKDIR}/finish ${D}/init.d/99-finish - # exec + # exec install -m 0755 ${WORKDIR}/exec ${D}/init.d/89-exec # mdev @@ -66,7 +66,7 @@ PACKAGES = "${PN}-base \ initramfs-module-lvm \ " -FILES_${PN}-base = "/init /init.d/99-finish /dev" +FILES:${PN}-base = "/init /init.d/99-finish /dev" # 99-finish in base depends on some other module which mounts # the rootfs, like 90-rootfs. To replace that default, use @@ -74,36 +74,36 @@ FILES_${PN}-base = "/init /init.d/99-finish /dev" # initramfs recipe and install something else, or install # something that runs earlier (for example, a 89-my-rootfs) # and mounts the rootfs. Then 90-rootfs will proceed immediately. -RRECOMMENDS_${PN}-base += "initramfs-module-rootfs" +RRECOMMENDS:${PN}-base += "initramfs-module-rootfs" -SUMMARY_initramfs-module-exec = "initramfs support for easy execution of applications" -RDEPENDS_initramfs-module-exec = "${PN}-base" -FILES_initramfs-module-exec = "/init.d/89-exec" +SUMMARY:initramfs-module-exec = "initramfs support for easy execution of applications" +RDEPENDS:initramfs-module-exec = "${PN}-base" +FILES:initramfs-module-exec = "/init.d/89-exec" -SUMMARY_initramfs-module-mdev = "initramfs support for mdev" -RDEPENDS_initramfs-module-mdev = "${PN}-base busybox-mdev" -FILES_initramfs-module-mdev = "/init.d/01-mdev" +SUMMARY:initramfs-module-mdev = "initramfs support for mdev" +RDEPENDS:initramfs-module-mdev = "${PN}-base busybox-mdev" +FILES:initramfs-module-mdev = "/init.d/01-mdev" -SUMMARY_initramfs-module-udev = "initramfs support for udev" -RDEPENDS_initramfs-module-udev = "${PN}-base udev" -FILES_initramfs-module-udev = "/init.d/01-udev" +SUMMARY:initramfs-module-udev = "initramfs support for udev" +RDEPENDS:initramfs-module-udev = "${PN}-base udev" +FILES:initramfs-module-udev = "/init.d/01-udev" -SUMMARY_initramfs-module-e2fs = "initramfs support for ext4/ext3/ext2 filesystems" -RDEPENDS_initramfs-module-e2fs = "${PN}-base" -FILES_initramfs-module-e2fs = "/init.d/10-e2fs" +SUMMARY:initramfs-module-e2fs = "initramfs support for ext4/ext3/ext2 filesystems" +RDEPENDS:initramfs-module-e2fs = "${PN}-base" +FILES:initramfs-module-e2fs = "/init.d/10-e2fs" -SUMMARY_initramfs-module-nfsrootfs = "initramfs support for locating and mounting the root partition via nfs" -RDEPENDS_initramfs-module-nfsrootfs = "${PN}-base" -FILES_initramfs-module-nfsrootfs = "/init.d/85-nfsrootfs" +SUMMARY:initramfs-module-nfsrootfs = "initramfs support for locating and mounting the root partition via nfs" +RDEPENDS:initramfs-module-nfsrootfs = "${PN}-base" +FILES:initramfs-module-nfsrootfs = "/init.d/85-nfsrootfs" -SUMMARY_initramfs-module-rootfs = "initramfs support for locating and mounting the root partition" -RDEPENDS_initramfs-module-rootfs = "${PN}-base" -FILES_initramfs-module-rootfs = "/init.d/90-rootfs" +SUMMARY:initramfs-module-rootfs = "initramfs support for locating and mounting the root partition" +RDEPENDS:initramfs-module-rootfs = "${PN}-base" +FILES:initramfs-module-rootfs = "/init.d/90-rootfs" -SUMMARY_initramfs-module-debug = "initramfs dynamic debug support" -RDEPENDS_initramfs-module-debug = "${PN}-base" -FILES_initramfs-module-debug = "/init.d/00-debug" +SUMMARY:initramfs-module-debug = "initramfs dynamic debug support" +RDEPENDS:initramfs-module-debug = "${PN}-base" +FILES:initramfs-module-debug = "/init.d/00-debug" -SUMMARY_initramfs-module-lvm = "initramfs lvm rootfs support" -RDEPENDS_initramfs-module-lvm = "${PN}-base" -FILES_initramfs-module-lvm = "/init.d/09-lvm" +SUMMARY:initramfs-module-lvm = "initramfs lvm rootfs support" +RDEPENDS:initramfs-module-lvm = "${PN}-base" +FILES:initramfs-module-lvm = "/init.d/09-lvm" diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb index 7a9a8ecae..59a530506 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb +++ b/poky/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Live image init script" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" -RDEPENDS_${PN} = "busybox-mdev" +RDEPENDS:${PN} = "busybox-mdev" SRC_URI = "file://init-live.sh" PR = "r12" @@ -15,7 +15,7 @@ do_install() { mknod -m 622 ${D}/dev/console c 5 1 } -FILES_${PN} += " /init /dev " +FILES:${PN} += " /init /dev " # Due to kernel dependency PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb index 57b30254a..8f56d7ab9 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb +++ b/poky/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Live image init script" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/kernel" -RDEPENDS_${PN} = "udev udev-extraconf" +RDEPENDS:${PN} = "udev udev-extraconf" SRC_URI = "file://init-live.sh" PR = "r12" @@ -15,7 +15,7 @@ do_install() { mknod -m 622 ${D}/dev/console c 5 1 } -FILES_${PN} += " /init /dev " +FILES:${PN} += " /init /dev " # Due to kernel dependency PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb index c03bd2d76..495eccbed 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb +++ b/poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://init-install-efi-testfs.sh" -RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools" +RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools" S = "${WORKDIR}" @@ -12,5 +12,5 @@ do_install() { } INHIBIT_DEFAULT_DEPS = "1" -FILES_${PN} = " /install-efi.sh " +FILES:${PN} = " /install-efi.sh " COMPATIBLE_HOST = "(i.86|x86_64).*-linux" diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb index cc842ae8b..ecbd567d6 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb +++ b/poky/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb @@ -5,8 +5,8 @@ SRC_URI = "file://init-install-efi.sh" PR = "r1" -RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" -RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" +RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" +RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" S = "${WORKDIR}" @@ -20,6 +20,6 @@ do_install() { #inherit allarch INHIBIT_DEFAULT_DEPS = "1" -FILES_${PN} = " /install-efi.sh " +FILES:${PN} = " /install-efi.sh " COMPATIBLE_HOST = "(i.86.*|x86_64.*|aarch64.*)-linux" diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb index 937bfd4d3..d347e323b 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb +++ b/poky/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SRC_URI = "file://init-install-testfs.sh" -RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs" +RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs" S = "${WORKDIR}" @@ -12,5 +12,5 @@ do_install() { } INHIBIT_DEFAULT_DEPS = "1" -FILES_${PN} = " /install.sh " +FILES:${PN} = " /install.sh " COMPATIBLE_HOST = "(i.86|x86_64).*-linux" diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb index 48fc0c4a7..674d49ecd 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb +++ b/poky/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb @@ -7,8 +7,8 @@ PR = "r9" S = "${WORKDIR}" -RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" -RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" +RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" +RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" do_install() { install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh @@ -20,6 +20,6 @@ do_install() { #inherit allarch INHIBIT_DEFAULT_DEPS = "1" -FILES_${PN} = " /install.sh " +FILES:${PN} = " /install.sh " COMPATIBLE_HOST = "(i.86.*|x86_64.*|aarch64.*)-linux" diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb index 523138cff..fb1948455 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb +++ b/poky/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb @@ -1,8 +1,8 @@ SUMMARY = "initramfs-framework module for EFI installation option" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" -RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" +RDEPENDS:${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" +RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" PR = "r4" @@ -15,4 +15,4 @@ do_install() { install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/init.d/install-efi.sh } -FILES_${PN} = "/init.d/install-efi.sh" +FILES:${PN} = "/init.d/install-efi.sh" diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb index 56898e824..4d48d54e9 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb +++ b/poky/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb @@ -1,13 +1,13 @@ SUMMARY = "initramfs-framework module for installation option" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" -RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" +RDEPENDS:${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" +RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" # The same restriction as grub COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)' -COMPATIBLE_HOST_armv7a = 'null' -COMPATIBLE_HOST_armv7ve = 'null' +COMPATIBLE_HOST:armv7a = 'null' +COMPATIBLE_HOST:armv7ve = 'null' PR = "r1" @@ -20,4 +20,4 @@ do_install() { install -m 0755 ${WORKDIR}/init-install.sh ${D}/init.d/install.sh } -FILES_${PN} = "/init.d/install.sh" +FILES:${PN} = "/init.d/install.sh" diff --git a/poky/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb b/poky/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb index 4d2fe9dd2..d8ce024b8 100644 --- a/poky/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb +++ b/poky/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb @@ -1,13 +1,13 @@ SUMMARY = "initramfs-framework module for live booting" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -RDEPENDS_${PN} = "initramfs-framework-base udev-extraconf" +RDEPENDS:${PN} = "initramfs-framework-base udev-extraconf" PR = "r4" inherit allarch -FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:" +FILESEXTRAPATHS:prepend := "${THISDIR}/initramfs-framework:" SRC_URI = "file://setup-live" S = "${WORKDIR}" @@ -17,4 +17,4 @@ do_install() { install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live } -FILES_${PN} = "/init.d/80-setup-live" +FILES:${PN} = "/init.d/80-setup-live" diff --git a/poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb b/poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb index 33977e66c..165f37c07 100644 --- a/poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb +++ b/poky/meta/recipes-core/initscripts/init-system-helpers_1.60.bb @@ -32,10 +32,10 @@ do_install() { PACKAGES += "${PN}-invoke-rc.d ${PN}-service" -FILES_${PN} = "" -FILES_${PN}-invoke-rc.d = "${sbindir}/invoke-rc.d" -FILES_${PN}-service = "${sbindir}/service" +FILES:${PN} = "" +FILES:${PN}-invoke-rc.d = "${sbindir}/invoke-rc.d" +FILES:${PN}-service = "${sbindir}/service" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RRECOMMENDS_${PN} += "${PN}-invoke-rc.d ${PN}-service" +RRECOMMENDS:${PN} += "${PN}-invoke-rc.d ${PN}-service" diff --git a/poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh index f21f48dd3..b56b72f83 100755 --- a/poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +++ b/poky/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh @@ -37,8 +37,8 @@ create_file() { fi EXEC=" ${EXEC} - chown ${TUSER}:${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; - chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " + chown ${TUSER}:${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\"; + chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" " test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build @@ -60,8 +60,8 @@ create_file() { mk_dir() { EXEC=" mkdir -p \"$1\"; - chown ${TUSER}:${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; - chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " + chown ${TUSER}:${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\"; + chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" " test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build if [ -e "$1" ]; then @@ -201,7 +201,7 @@ apply_cfgfile() { "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-." TSOURCE="$TLTARGET" [ "${TSOURCE}" = "none" ] && TSOURCE="" - create_file "${TNAME}" "${TSOURCE}" & + create_file "${TNAME}" "${TSOURCE}" ;; "d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-." mk_dir "${TNAME}" diff --git a/poky/meta/recipes-core/initscripts/initscripts_1.0.bb b/poky/meta/recipes-core/initscripts/initscripts_1.0.bb index 5e994f2b7..e4c481322 100644 --- a/poky/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/poky/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -39,25 +39,25 @@ SRC_URI = "file://functions \ S = "${WORKDIR}" -SRC_URI_append_arm = " file://alignment.sh" -SRC_URI_append_armeb = " file://alignment.sh" +SRC_URI:append:arm = " file://alignment.sh" +SRC_URI:append:armeb = " file://alignment.sh" KERNEL_VERSION = "" -DEPENDS_append = " update-rc.d-native" -PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" +DEPENDS:append = " update-rc.d-native" +PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" PACKAGES =+ "${PN}-functions ${PN}-sushell" -RDEPENDS_${PN} = "initd-functions \ +RDEPENDS:${PN} = "initd-functions \ ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ init-system-helpers-service \ " # Recommend pn-functions so that it will be a preferred default provider for initd-functions -RRECOMMENDS_${PN} = "${PN}-functions" -RPROVIDES_${PN}-functions = "initd-functions" -RCONFLICTS_${PN}-functions = "lsbinitscripts" -FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" -FILES_${PN}-sushell = "${base_sbindir}/sushell" +RRECOMMENDS:${PN} = "${PN}-functions" +RPROVIDES:${PN}-functions = "initd-functions" +RCONFLICTS:${PN}-functions = "lsbinitscripts" +FILES:${PN}-functions = "${sysconfdir}/init.d/functions*" +FILES:${PN}-sushell = "${base_sbindir}/sushell" HALTARGS ?= "-d -f" @@ -106,7 +106,8 @@ do_install () { install -m 0755 ${WORKDIR}/save-rtc.sh ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core if [ ${@ oe.types.boolean('${VOLATILE_LOG_DIR}') } = True ]; then - echo "l root root 0755 /var/log /var/volatile/log" >> ${D}${sysconfdir}/default/volatiles/00_core + sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \ + ${D}${sysconfdir}/default/volatiles/00_core fi install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/ @@ -169,7 +170,7 @@ MASKED_SCRIPTS = " \ sysfs \ urandom" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if type systemctl >/dev/null 2>/dev/null; then if [ -n "$D" ]; then OPTS="--root=$D" @@ -185,4 +186,4 @@ pkg_postinst_${PN} () { fi } -CONFFILES_${PN} += "${sysconfdir}/init.d/checkroot.sh" +CONFFILES:${PN} += "${sysconfdir}/init.d/checkroot.sh" diff --git a/poky/meta/recipes-core/kbd/kbd_2.4.0.bb b/poky/meta/recipes-core/kbd/kbd_2.4.0.bb index b557d691b..7cb45eff7 100644 --- a/poky/meta/recipes-core/kbd/kbd_2.4.0.bb +++ b/poky/meta/recipes-core/kbd/kbd_2.4.0.bb @@ -9,9 +9,9 @@ inherit autotools gettext pkgconfig DEPENDS += "flex-native" -RREPLACES_${PN} = "console-tools" -RPROVIDES_${PN} = "console-tools" -RCONFLICTS_${PN} = "console-tools" +RREPLACES:${PN} = "console-tools" +RPROVIDES:${PN} = "console-tools" +RCONFLICTS:${PN} = "console-tools" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ " @@ -25,12 +25,12 @@ PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" -FILES_${PN}-consolefonts = "${datadir}/consolefonts" -FILES_${PN}-consoletrans = "${datadir}/consoletrans" -FILES_${PN}-keymaps = "${datadir}/keymaps" -FILES_${PN}-unimaps = "${datadir}/unimaps" +FILES:${PN}-consolefonts = "${datadir}/consolefonts" +FILES:${PN}-consoletrans = "${datadir}/consoletrans" +FILES:${PN}-keymaps = "${datadir}/keymaps" +FILES:${PN}-unimaps = "${datadir}/unimaps" -do_install_append () { +do_install:append () { if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ] \ && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd @@ -39,7 +39,7 @@ do_install_append () { inherit update-alternatives -ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \ +ALTERNATIVE:${PN} = "chvt deallocvt fgconsole openvt showkey \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}" ALTERNATIVE_PRIORITY = "100" diff --git a/poky/meta/recipes-core/libcgroup/libcgroup/CVE-2018-14348.patch b/poky/meta/recipes-core/libcgroup/libcgroup/CVE-2018-14348.patch deleted file mode 100644 index d133703de..000000000 --- a/poky/meta/recipes-core/libcgroup/libcgroup/CVE-2018-14348.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0d88b73d189ea3440ccaab00418d6469f76fa590 Mon Sep 17 00:00:00 2001 -From: Michal Hocko <mhocko@suse.com> -Date: Wed, 18 Jul 2018 11:24:29 +0200 -Subject: [PATCH] cgrulesengd: remove umask(0) - -One of our partners has noticed that cgred daemon is creating a log file -(/var/log/cgred) with too wide permissions (0666) and that is seen as -a security bug because an untrusted user can write to otherwise -restricted area. CVE-2018-14348 has been assigned to this issue. - -CVE: CVE-2018-14348 -Upstream-Status: Backport [https://sourceforge.net/p/libcg/libcg/ci/0d88b73d189ea3440ccaab00418d6469f76fa590] - -Signed-off-by: Michal Hocko <mhocko@suse.com> -Acked-by: Balbir Singh <bsingharora@gmail.com> -Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> ---- - src/daemon/cgrulesengd.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c -index ea51f11..0d288f3 100644 ---- a/src/daemon/cgrulesengd.c -+++ b/src/daemon/cgrulesengd.c -@@ -889,9 +889,6 @@ int cgre_start_daemon(const char *logp, const int logf, - } else if (pid > 0) { - exit(EXIT_SUCCESS); - } -- -- /* Change the file mode mask. */ -- umask(0); - } else { - flog(LOG_DEBUG, "Not using daemon mode\n"); - pid = getpid(); --- -2.13.3 - diff --git a/poky/meta/recipes-core/libcgroup/libcgroup/module.patch b/poky/meta/recipes-core/libcgroup/libcgroup/module.patch new file mode 100644 index 000000000..d8ff9b147 --- /dev/null +++ b/poky/meta/recipes-core/libcgroup/libcgroup/module.patch @@ -0,0 +1,36 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From 76f0879056ce7e3f0123c277f2303954d0b6cead Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= <kloczek@github.com> +Date: Wed, 12 May 2021 20:36:02 +0000 +Subject: [PATCH 2/2] automake: build PAM module as unversioned DSO +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +PAM modules should be build as unversioned DSO. +Add -avoid-version to pam_cgroup_la_LDFLAGS + +Signed-off-by: Tomasz KÅ‚oczko <kloczek@github.com> +Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> +--- + src/pam/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am +index bd5a91d..4b0b2a9 100644 +--- a/src/pam/Makefile.am ++++ b/src/pam/Makefile.am +@@ -4,7 +4,7 @@ if WITH_PAM + + pamlib_LTLIBRARIES = pam_cgroup.la + pam_cgroup_la_SOURCES = pam_cgroup.c +-pam_cgroup_la_LDFLAGS = -module ++pam_cgroup_la_LDFLAGS = -module -avoid-version + pam_cgroup_la_LIBADD = $(top_builddir)/src/libcgroup.la -lpam + + endif +-- +2.32.0 + diff --git a/poky/meta/recipes-core/libcgroup/libcgroup/musl-decls-compat.patch b/poky/meta/recipes-core/libcgroup/libcgroup/musl-decls-compat.patch index 65f4ef9a5..531a56296 100644 --- a/poky/meta/recipes-core/libcgroup/libcgroup/musl-decls-compat.patch +++ b/poky/meta/recipes-core/libcgroup/libcgroup/musl-decls-compat.patch @@ -1,16 +1,37 @@ -commit ca780b4f7f71abeeb04a585f2a4d889caaa985fa -Author: Isaac Dunham <ibid.ag@gmail.com> -Date: Fri Sep 5 22:35:32 2014 -0700 +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> - Remove __.*DECLS nonsense +From 26f2889113789c176273bd24fcd1592a8064c346 Mon Sep 17 00:00:00 2001 +From: "Anthony G. Basile" <blueness@gentoo.org> +Date: Tue, 6 Jul 2021 07:54:47 -0600 +Subject: [PATCH 1/2] Replace __BEGIN_DECLS and __END_DECLS with extern "C". -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> +The macros __BEGIN_DECLS and __END_DECLS are a GNU-ism found in +glibc and uClibc, but not musl. We replace them by the more general +extern "C" { ... } block exposed only if we have __cplusplus. -Index: libcgroup-0.41/include/libcgroup/config.h -=================================================================== ---- libcgroup-0.41.orig/include/libcgroup/config.h -+++ libcgroup-0.41/include/libcgroup/config.h +Forward ported from a patch by Anthony G. Basile <blueness@gentoo.org>. + +Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca> +Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> +--- + include/libcgroup/config.h | 8 ++++++-- + include/libcgroup/error.h | 8 ++++++-- + include/libcgroup/groups.h | 8 ++++++-- + include/libcgroup/init.h | 8 ++++++-- + include/libcgroup/iterators.h | 8 ++++++-- + include/libcgroup/log.h | 8 ++++++-- + include/libcgroup/tasks.h | 8 ++++++-- + src/bindings/libcgroup.p | 8 -------- + src/daemon/cgrulesengd.h | 8 ++++++-- + src/libcgroup-internal.h | 8 ++++++-- + src/tools/tools-common.h | 8 ++++++-- + 11 files changed, 60 insertions(+), 28 deletions(-) + +diff --git a/include/libcgroup/config.h b/include/libcgroup/config.h +index 9aaa390..f835009 100644 +--- a/include/libcgroup/config.h ++++ b/include/libcgroup/config.h @@ -9,7 +9,9 @@ #include <features.h> #endif @@ -22,20 +43,20 @@ Index: libcgroup-0.41/include/libcgroup/config.h /** * @defgroup group_config 5. Configuration -@@ -107,6 +109,8 @@ int cgroup_config_create_template_group( +@@ -128,6 +130,8 @@ int cgroup_config_create_template_group( * @} * @} */ -__END_DECLS +#ifdef __cplusplus -+} ++} /* extern "C" */ +#endif #endif /*_LIBCGROUP_CONFIG_H*/ -Index: libcgroup-0.41/include/libcgroup/error.h -=================================================================== ---- libcgroup-0.41.orig/include/libcgroup/error.h -+++ libcgroup-0.41/include/libcgroup/error.h +diff --git a/include/libcgroup/error.h b/include/libcgroup/error.h +index 1dfdde9..14a6e16 100644 +--- a/include/libcgroup/error.h ++++ b/include/libcgroup/error.h @@ -9,7 +9,9 @@ #include <features.h> #endif @@ -53,14 +74,14 @@ Index: libcgroup-0.41/include/libcgroup/error.h */ -__END_DECLS +#ifdef __cplusplus -+} ++} /* extern "C" */ +#endif #endif /* _LIBCGROUP_INIT_H */ -Index: libcgroup-0.41/include/libcgroup/groups.h -=================================================================== ---- libcgroup-0.41.orig/include/libcgroup/groups.h -+++ libcgroup-0.41/include/libcgroup/groups.h +diff --git a/include/libcgroup/groups.h b/include/libcgroup/groups.h +index 201558f..39ec3cd 100644 +--- a/include/libcgroup/groups.h ++++ b/include/libcgroup/groups.h @@ -11,7 +11,9 @@ #include <stdbool.h> #endif @@ -72,20 +93,20 @@ Index: libcgroup-0.41/include/libcgroup/groups.h /** * Flags for cgroup_delete_cgroup_ext(). -@@ -577,6 +579,8 @@ char *cgroup_get_cgroup_name(struct cgro +@@ -587,6 +589,8 @@ char *cgroup_get_cgroup_name(struct cgroup *cgroup); */ -__END_DECLS +#ifdef __cplusplus -+} ++} /* extern "C" */ +#endif #endif /* _LIBCGROUP_GROUPS_H */ -Index: libcgroup-0.41/include/libcgroup/init.h -=================================================================== ---- libcgroup-0.41.orig/include/libcgroup/init.h -+++ libcgroup-0.41/include/libcgroup/init.h +diff --git a/include/libcgroup/init.h b/include/libcgroup/init.h +index 5150f2f..ea2dcc9 100644 +--- a/include/libcgroup/init.h ++++ b/include/libcgroup/init.h @@ -9,7 +9,9 @@ #include <features.h> #endif @@ -97,20 +118,20 @@ Index: libcgroup-0.41/include/libcgroup/init.h /** * @defgroup group_init 1. Initialization -@@ -58,6 +60,8 @@ int cgroup_get_subsys_mount_point(const +@@ -58,6 +60,8 @@ int cgroup_get_subsys_mount_point(const char *controller, char **mount_point); * @} * @} */ -__END_DECLS +#ifdef __cplusplus -+} ++} /* extern "C" */ +#endif #endif /* _LIBCGROUP_INIT_H */ -Index: libcgroup-0.41/include/libcgroup/iterators.h -=================================================================== ---- libcgroup-0.41.orig/include/libcgroup/iterators.h -+++ libcgroup-0.41/include/libcgroup/iterators.h +diff --git a/include/libcgroup/iterators.h b/include/libcgroup/iterators.h +index c6d453d..b3ba3af 100644 +--- a/include/libcgroup/iterators.h ++++ b/include/libcgroup/iterators.h @@ -11,7 +11,9 @@ #include <features.h> #endif @@ -122,20 +143,45 @@ Index: libcgroup-0.41/include/libcgroup/iterators.h /** * @defgroup group_iterators 3. Iterators -@@ -423,6 +425,8 @@ int cgroup_get_subsys_mount_point_end(vo +@@ -423,6 +425,8 @@ int cgroup_get_subsys_mount_point_end(void **handle); * @} */ -__END_DECLS +#ifdef __cplusplus -+} ++} /* extern "C" */ +#endif #endif /* _LIBCGROUP_ITERATORS_H */ -Index: libcgroup-0.41/include/libcgroup/tasks.h -=================================================================== ---- libcgroup-0.41.orig/include/libcgroup/tasks.h -+++ libcgroup-0.41/include/libcgroup/tasks.h +diff --git a/include/libcgroup/log.h b/include/libcgroup/log.h +index 0dd03b4..f693473 100644 +--- a/include/libcgroup/log.h ++++ b/include/libcgroup/log.h +@@ -11,7 +11,9 @@ + + #include <stdarg.h> + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + /** + * @defgroup group_log 7. Logging +@@ -142,6 +144,8 @@ extern int cgroup_parse_log_level_str(const char *levelstr); + * @} + * @} + */ +-__END_DECLS ++#ifdef __cplusplus ++} /* extern "C" */ ++#endif + + #endif /* _LIBCGROUP_LOG_H */ +diff --git a/include/libcgroup/tasks.h b/include/libcgroup/tasks.h +index aad438a..8553c30 100644 +--- a/include/libcgroup/tasks.h ++++ b/include/libcgroup/tasks.h @@ -12,7 +12,9 @@ #include <stdbool.h> #endif @@ -147,20 +193,20 @@ Index: libcgroup-0.41/include/libcgroup/tasks.h /** Flags for cgroup_change_cgroup_uid_gid(). */ enum cgflags { -@@ -204,6 +206,8 @@ int cgroup_register_unchanged_process(pi +@@ -204,6 +206,8 @@ int cgroup_register_unchanged_process(pid_t pid, int flags); * @} * @} */ -__END_DECLS +#ifdef __cplusplus -+} ++} /* extern "C" */ +#endif #endif /* _LIBCGROUP_TASKS_H */ -Index: libcgroup-0.41/src/daemon/cgrulesengd.h -=================================================================== ---- libcgroup-0.41.orig/src/daemon/cgrulesengd.h -+++ libcgroup-0.41/src/daemon/cgrulesengd.h +diff --git a/src/daemon/cgrulesengd.h b/src/daemon/cgrulesengd.h +index e273b4b..0b12076 100644 +--- a/src/daemon/cgrulesengd.h ++++ b/src/daemon/cgrulesengd.h @@ -17,7 +17,9 @@ #include <features.h> @@ -178,15 +224,15 @@ Index: libcgroup-0.41/src/daemon/cgrulesengd.h -__END_DECLS +#ifdef __cplusplus -+} ++} /* extern "C" */ +#endif #endif /* _CGRULESENGD_H */ -Index: libcgroup-0.41/src/libcgroup-internal.h -=================================================================== ---- libcgroup-0.41.orig/src/libcgroup-internal.h -+++ libcgroup-0.41/src/libcgroup-internal.h +diff --git a/src/libcgroup-internal.h b/src/libcgroup-internal.h +index 1dfc92b..edc5abb 100644 +--- a/src/libcgroup-internal.h ++++ b/src/libcgroup-internal.h @@ -16,7 +16,9 @@ #define __LIBCG_INTERNAL @@ -197,39 +243,42 @@ Index: libcgroup-0.41/src/libcgroup-internal.h +#endif #include "config.h" - #include <fts.h> -@@ -279,6 +281,8 @@ extern void cgroup_dictionary_iterator_e - */ - int cg_chmod_path(const char *path, mode_t mode, int owner_is_umask); + #include <dirent.h> +@@ -407,6 +409,8 @@ int cgroupv2_controller_enabled(const char * const cg_name, + + #endif /* UNIT_TEST */ -__END_DECLS +#ifdef __cplusplus -+} ++} /* extern "C" */ +#endif #endif -Index: libcgroup-0.41/include/libcgroup/log.h -=================================================================== ---- libcgroup-0.41.orig/include/libcgroup/log.h -+++ libcgroup-0.41/include/libcgroup/log.h -@@ -11,7 +11,9 @@ +diff --git a/src/tools/tools-common.h b/src/tools/tools-common.h +index 292c408..e3541b1 100644 +--- a/src/tools/tools-common.h ++++ b/src/tools/tools-common.h +@@ -18,7 +18,9 @@ - #include <stdarg.h> + #define __TOOLS_COMMON -__BEGIN_DECLS +#ifdef __cplusplus +extern "C" { +#endif + #include "config.h" + #include <libcgroup.h> + #include "../libcgroup-internal.h" +@@ -136,6 +138,8 @@ int parse_r_flag(const char * const program_name, + + #endif /* UNIT_TEST */ - /** - * @defgroup group_log 7. Logging -@@ -142,6 +144,8 @@ extern int cgroup_parse_log_level_str(co - * @} - * @} - */ -__END_DECLS +#ifdef __cplusplus -+} ++} /* extern "C" */ +#endif - #endif /* _LIBCGROUP_LOG_H */ + #endif /* TOOLS_COMMON */ +-- +2.32.0 + diff --git a/poky/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/poky/meta/recipes-core/libcgroup/libcgroup_0.41.bb deleted file mode 100644 index 92d7261b0..000000000 --- a/poky/meta/recipes-core/libcgroup/libcgroup_0.41.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Linux control group abstraction library" -HOMEPAGE = "http://libcg.sourceforge.net/" -DESCRIPTION = "libcgroup is a library that abstracts the control group file system \ -in Linux. Control groups allow you to limit, account and isolate resource usage \ -(CPU, memory, disk I/O, etc.) of groups of processes." -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -inherit autotools pkgconfig - -DEPENDS = "bison-native flex-native" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2 \ - file://CVE-2018-14348.patch" -SRC_URI_append_libc-musl = " file://musl-decls-compat.patch" - -SRC_URI[md5sum] = "3dea9d50b8a5b73ff0bf1cdcb210f63f" -SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51" - -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libcg/files/libcgroup/" - -DEPENDS_append_libc-musl = " fts " -EXTRA_OEMAKE_append_libc-musl = " LIBS=-lfts" - -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam" - -PACKAGES =+ "cgroups-pam-plugin" -FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*" -FILES_${PN}-dev += "${base_libdir}/security/*.la" - -do_install_append() { - # Moving libcgroup to base_libdir - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mkdir -p ${D}/${base_libdir}/ - mv -f ${D}${libdir}/libcgroup.so.* ${D}${base_libdir}/ - rm -f ${D}${libdir}/libcgroup.so - lnr ${D}${base_libdir}/libcgroup.so.1 ${D}${libdir}/libcgroup.so - fi - # pam modules in ${base_libdir}/security/ should be binary .so files, not symlinks. - if [ -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ]; then - mv -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ${D}${base_libdir}/security/pam_cgroup.so - rm -f ${D}${base_libdir}/security/pam_cgroup.so.* - fi -} diff --git a/poky/meta/recipes-core/libcgroup/libcgroup_2.0.bb b/poky/meta/recipes-core/libcgroup/libcgroup_2.0.bb new file mode 100644 index 000000000..a58dd88ea --- /dev/null +++ b/poky/meta/recipes-core/libcgroup/libcgroup_2.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "Linux control group abstraction library" +HOMEPAGE = "http://libcg.sourceforge.net/" +DESCRIPTION = "libcgroup is a library that abstracts the control group file system \ +in Linux. Control groups allow you to limit, account and isolate resource usage \ +(CPU, memory, disk I/O, etc.) of groups of processes." +SECTION = "libs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +inherit autotools pkgconfig + +DEPENDS = "bison-native flex-native" + +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ + file://musl-decls-compat.patch \ + file://module.patch" + +SRC_URI[sha256sum] = "11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7" +UPSTREAM_CHECK_URI = "https://github.com/libcgroup/libcgroup/releases/" + +DEPENDS:append:libc-musl = " fts " +EXTRA_OEMAKE:append:libc-musl = " LIBS=-lfts" + +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam" + +PACKAGES =+ "cgroups-pam-plugin" +FILES:cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*" +FILES:${PN}-dev += "${base_libdir}/security/*.la" +FILES:${PN}-staticdev += "${base_libdir}/security/pam_cgroup.a" + +do_install:append() { + # Until we ship the test suite, this library isn't useful + rm -f ${D}${libdir}/libcgroupfortesting.* +} diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.23.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.25.bb index ba74eb1f9..ec9f9f4fa 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.23.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.25.bb @@ -10,7 +10,7 @@ EXCLUDE_FROM_WORLD = "1" API = "--enable-obsolete-api" -do_install_append () { +do_install:append () { rm -rf ${D}${includedir} rm -rf ${D}${libdir}/pkgconfig rm -rf ${D}${datadir} diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt.inc b/poky/meta/recipes-core/libxcrypt/libxcrypt.inc index 79a2aa49d..29b941d38 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=afed27a72ae2a8075978299eebaa1f5d \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "5dcc36aeeb053654659e898fd3de7f365c1c4df5" +SRCREV = "b9116ef2245abb128a22a975d187b1272312a80c" SRCBRANCH ?= "develop" SRC_URI += "file://fix_cflags_handling.patch" PROVIDES = "virtual/crypt" -FILES_${PN} = "${libdir}/libcrypt*.so.* \ +FILES:${PN} = "${libdir}/libcrypt*.so.* \ ${libdir}/libcrypt-*.so \ ${libdir}/libowcrypt*.so.* \ ${libdir}/libowcrypt-*.so \ @@ -27,7 +27,7 @@ S = "${WORKDIR}/git" BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error" -CPPFLAGS_append_class-nativesdk = " -Wno-error" +CPPFLAGS:append:class-nativesdk = " -Wno-error" API = "--disable-obsolete-api" EXTRA_OECONF += "${API}" diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.23.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.25.bb index 79dba2f6d..79dba2f6d 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.23.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.25.bb diff --git a/poky/meta/recipes-core/libxml/libxml2_2.9.12.bb b/poky/meta/recipes-core/libxml/libxml2_2.9.12.bb index 2d1e92966..3105889c1 100644 --- a/poky/meta/recipes-core/libxml/libxml2_2.9.12.bb +++ b/poky/meta/recipes-core/libxml/libxml2_2.9.12.bb @@ -38,11 +38,11 @@ inherit autotools pkgconfig binconfig-disabled ptest inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} -RDEPENDS_${PN}-ptest += "bash make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" +RDEPENDS:${PN}-ptest += "bash make ${@bb.utils.contains('PACKAGECONFIG', 'python', 'libgcc python3-core python3-logging python3-shell python3-stringold python3-threading python3-unittest ${PN}-python', '', d)}" -RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" +RDEPENDS:${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" -RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us \ +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \ glibc-gconv-ibm1141 \ glibc-gconv-iso8859-5 \ glibc-gconv-euc-jp \ @@ -53,25 +53,25 @@ export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" # WARNING: zlib is required for RPM use EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" -EXTRA_OECONF_class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" -EXTRA_OECONF_class-nativesdk = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" -EXTRA_OECONF_linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib" +EXTRA_OECONF:class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" +EXTRA_OECONF:class-nativesdk = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" +EXTRA_OECONF:linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib" -python populate_packages_prepend () { +python populate_packages:prepend () { # autonamer would call this libxml2-2, but we don't want that if d.getVar('DEBIAN_NAMES'): - d.setVar('PKG_libxml2', '${MLPREFIX}libxml2') + d.setVar('PKG:libxml2', '${MLPREFIX}libxml2') } PACKAGE_BEFORE_PN += "${PN}-utils" PACKAGES += "${PN}-python" -FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" -FILES_${PN}-dev += "${libdir}/xml2Conf.sh" -FILES_${PN}-utils = "${bindir}/*" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" +FILES:${PN}-dev += "${libdir}/xml2Conf.sh" +FILES:${PN}-utils = "${bindir}/*" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" -do_configure_prepend () { +do_configure:prepend () { # executables take longer to package: these should not be executable find ${S}/xmlconf/ -type f -exec chmod -x {} \+ } @@ -101,7 +101,7 @@ do_install_ptest () { {} + } -do_install_append_class-native () { +do_install:append:class-native () { # Docs are not needed in the native case rm ${D}${datadir}/gtk-doc -rf } diff --git a/poky/meta/recipes-core/meta/buildtools-tarball.bb b/poky/meta/recipes-core/meta/buildtools-tarball.bb index b5dae176b..6e96cf6c3 100644 --- a/poky/meta/recipes-core/meta/buildtools-tarball.bb +++ b/poky/meta/recipes-core/meta/buildtools-tarball.bb @@ -61,7 +61,7 @@ do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}" REAL_MULTIMACH_TARGET_SYS = "none" -create_sdk_files_append () { +create_sdk_files:append () { rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* rm -f ${SDK_OUTPUT}/${SDKPATH}/version-* @@ -99,3 +99,16 @@ TOOLCHAIN_NEED_CONFIGSITE_CACHE = "" # The recipe doesn't need any default deps INHIBIT_DEFAULT_DEPS = "1" + +python do_testsdk() { + import oeqa.sdk.testsdk + testsdk = oeqa.sdk.testsdk.TestSDK() + + cases_path = os.path.join(os.path.abspath(os.path.dirname(oeqa.sdk.testsdk.__file__)), "buildtools-cases") + testsdk.context_executor_class.default_cases = cases_path + + testsdk.run(d) +} +addtask testsdk +do_testsdk[nostamp] = "1" +do_testsdk[depends] += "xz-native:do_populate_sysroot" diff --git a/poky/meta/recipes-core/meta/dummy-sdk-package.inc b/poky/meta/recipes-core/meta/dummy-sdk-package.inc index bedde2965..bd26e39ad 100644 --- a/poky/meta/recipes-core/meta/dummy-sdk-package.inc +++ b/poky/meta/recipes-core/meta/dummy-sdk-package.inc @@ -13,7 +13,7 @@ python() { d.setVar('PACKAGE_ARCH', '${DUMMYARCH}') } -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PR[vardeps] += "DUMMYPROVIDES" PR[vardeps] += "DUMMYPROVIDES_PACKAGES" @@ -22,10 +22,10 @@ DUMMYPROVIDES_PACKAGES ??= "" DUMMYPROVIDES_PACKAGES_MULTILIB = "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" DUMMYPROVIDES += "${DUMMYPROVIDES_PACKAGES_MULTILIB}" -python populate_packages_prepend() { +python populate_packages:prepend() { p = d.getVar("PN") - d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") - d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}") - d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}") + d.appendVar("RPROVIDES:%s" % p, "${DUMMYPROVIDES}") + d.appendVar("RCONFLICTS:%s" % p, "${DUMMYPROVIDES}") + d.appendVar("RREPLACES:%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}") } diff --git a/poky/meta/recipes-core/meta/meta-environment-extsdk.bb b/poky/meta/recipes-core/meta/meta-environment-extsdk.bb index 2076b56f2..706312b0d 100644 --- a/poky/meta/recipes-core/meta/meta-environment-extsdk.bb +++ b/poky/meta/recipes-core/meta/meta-environment-extsdk.bb @@ -4,7 +4,7 @@ require meta-environment.bb PN = "meta-environment-extsdk-${MACHINE}" -create_sdk_files_append() { +create_sdk_files:append() { local sysroot=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${MACHINE} local sdkpathnative=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${BUILD_ARCH} diff --git a/poky/meta/recipes-core/meta/meta-environment.bb b/poky/meta/recipes-core/meta/meta-environment.bb index da1230bea..27f010366 100644 --- a/poky/meta/recipes-core/meta/meta-environment.bb +++ b/poky/meta/recipes-core/meta/meta-environment.bb @@ -9,7 +9,7 @@ MODIFYTOS = "0" REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" inherit toolchain-scripts -TOOLCHAIN_NEED_CONFIGSITE_CACHE_append = " zlib" +TOOLCHAIN_NEED_CONFIGSITE_CACHE:append = " zlib" # Need to expand here before cross-candian changes HOST_ARCH -> SDK_ARCH TOOLCHAIN_CONFIGSITE_NOCACHE := "${TOOLCHAIN_CONFIGSITE_NOCACHE}" @@ -66,7 +66,7 @@ do_install() { PN = "meta-environment-${MACHINE}" PACKAGES = "${PN}" -FILES_${PN}= " \ +FILES:${PN}= " \ ${SDKPATH}/* \ " diff --git a/poky/meta/recipes-core/meta/meta-go-toolchain.bb b/poky/meta/recipes-core/meta/meta-go-toolchain.bb index dde385c1b..c24518efe 100644 --- a/poky/meta/recipes-core/meta/meta-go-toolchain.bb +++ b/poky/meta/recipes-core/meta/meta-go-toolchain.bb @@ -3,10 +3,10 @@ LICENSE = "MIT" inherit populate_sdk -TOOLCHAIN_HOST_TASK_append = " \ +TOOLCHAIN_HOST_TASK:append = " \ packagegroup-go-cross-canadian-${MACHINE} \ " -TOOLCHAIN_TARGET_TASK_append = " \ +TOOLCHAIN_TARGET_TASK:append = " \ ${@multilib_pkg_extend(d, 'packagegroup-go-sdk-target')} \ " diff --git a/poky/meta/recipes-core/meta/signing-keys.bb b/poky/meta/recipes-core/meta/signing-keys.bb index 5bab94aa3..03463f95f 100644 --- a/poky/meta/recipes-core/meta/signing-keys.bb +++ b/poky/meta/recipes-core/meta/signing-keys.bb @@ -14,9 +14,9 @@ SYSROOT_DIRS += "${sysconfdir}/pki" PACKAGES =+ "${PN}-ipk ${PN}-rpm ${PN}-packagefeed" -FILES_${PN}-rpm = "${sysconfdir}/pki/rpm-gpg" -FILES_${PN}-ipk = "${sysconfdir}/pki/ipk-gpg" -FILES_${PN}-packagefeed = "${sysconfdir}/pki/packagefeed-gpg" +FILES:${PN}-rpm = "${sysconfdir}/pki/rpm-gpg" +FILES:${PN}-ipk = "${sysconfdir}/pki/ipk-gpg" +FILES:${PN}-packagefeed = "${sysconfdir}/pki/packagefeed-gpg" python do_get_public_keys () { from oe.gpg_sign import get_signer diff --git a/poky/meta/recipes-core/meta/testexport-tarball.bb b/poky/meta/recipes-core/meta/testexport-tarball.bb index daedd78cb..de7663b38 100644 --- a/poky/meta/recipes-core/meta/testexport-tarball.bb +++ b/poky/meta/recipes-core/meta/testexport-tarball.bb @@ -38,7 +38,7 @@ do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}" REAL_MULTIMACH_TARGET_SYS = "none" -create_sdk_files_append () { +create_sdk_files:append () { rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* rm -f ${SDK_OUTPUT}/${SDKPATH}/version-* diff --git a/poky/meta/recipes-core/meta/wic-tools.bb b/poky/meta/recipes-core/meta/wic-tools.bb index bc6cc0d18..ba0916cb5 100644 --- a/poky/meta/recipes-core/meta/wic-tools.bb +++ b/poky/meta/recipes-core/meta/wic-tools.bb @@ -8,10 +8,10 @@ DEPENDS = "\ btrfs-tools-native squashfs-tools-native pseudo-native \ e2fsprogs-native util-linux-native tar-native\ " -DEPENDS_append_x86 = " syslinux-native syslinux grub-efi systemd-boot" -DEPENDS_append_x86-64 = " syslinux-native syslinux grub-efi systemd-boot" -DEPENDS_append_x86-x32 = " syslinux-native syslinux grub-efi" -DEPENDS_append_aarch64 = " grub-efi systemd-boot" +DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot" +DEPENDS:append:x86-64 = " syslinux-native syslinux grub-efi systemd-boot" +DEPENDS:append:x86-x32 = " syslinux-native syslinux grub-efi" +DEPENDS:append:aarch64 = " grub-efi systemd-boot" INHIBIT_DEFAULT_DEPS = "1" diff --git a/poky/meta/recipes-core/musl/bsd-headers.bb b/poky/meta/recipes-core/musl/bsd-headers.bb index c9945d45e..cf8af0da3 100644 --- a/poky/meta/recipes-core/musl/bsd-headers.bb +++ b/poky/meta/recipes-core/musl/bsd-headers.bb @@ -27,5 +27,5 @@ do_install() { # COMPATIBLE_HOST = ".*-musl.*" -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/poky/meta/recipes-core/musl/gcompat_git.bb b/poky/meta/recipes-core/musl/gcompat_git.bb index 863ba8dbf..6e5cc11d5 100644 --- a/poky/meta/recipes-core/musl/gcompat_git.bb +++ b/poky/meta/recipes-core/musl/gcompat_git.bb @@ -41,11 +41,11 @@ do_install () { fi } -FILES_${PN} += "/lib64" +FILES:${PN} += "/lib64" -INSANE_SKIP_${PN} = "libdir" +INSANE_SKIP:${PN} = "libdir" -RPROVIDES_${PN} += "musl-glibc-compat" +RPROVIDES:${PN} += "musl-glibc-compat" # # We will skip parsing for non-musl systems # diff --git a/poky/meta/recipes-core/musl/libssp-nonshared.bb b/poky/meta/recipes-core/musl/libssp-nonshared.bb index 81c87e8e8..748dacf31 100644 --- a/poky/meta/recipes-core/musl/libssp-nonshared.bb +++ b/poky/meta/recipes-core/musl/libssp-nonshared.bb @@ -30,6 +30,6 @@ do_install() { # We will skip parsing for non-musl systems # COMPATIBLE_HOST = ".*-musl.*" -RDEPENDS_${PN}-staticdev = "" -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-staticdev (= ${EXTENDPKGV})" +RDEPENDS:${PN}-staticdev = "" +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dbg = "${PN}-staticdev (= ${EXTENDPKGV})" diff --git a/poky/meta/recipes-core/musl/musl-utils.bb b/poky/meta/recipes-core/musl/musl-utils.bb index dd0ce3306..4f99d4324 100644 --- a/poky/meta/recipes-core/musl/musl-utils.bb +++ b/poky/meta/recipes-core/musl/musl-utils.bb @@ -21,7 +21,7 @@ S = "${WORKDIR}/git" PACKAGES =+ "${PN}-iconv" -FILES_${PN}-iconv = "${bindir}/iconv" +FILES:${PN}-iconv = "${bindir}/iconv" COMPATIBLE_HOST = ".*-musl.*" diff --git a/poky/meta/recipes-core/musl/musl.inc b/poky/meta/recipes-core/musl/musl.inc index 54edfc88e..66468e92f 100644 --- a/poky/meta/recipes-core/musl/musl.inc +++ b/poky/meta/recipes-core/musl/musl.inc @@ -14,16 +14,16 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68" INHIBIT_DEFAULT_DEPS = "1" FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}" -INSANE_SKIP_${PN} = "dev-so" +FILES:${PN} += "${libdir}/lib*${SOLIBSDEV}" +INSANE_SKIP:${PN} = "dev-so" # Doesn't compile in MIPS16e mode due to use of hand-written # assembly MIPS_INSTRUCTION_SET = "mips" # thumb1 is unsupported -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" # Enable out of tree build B = "${WORKDIR}/build" diff --git a/poky/meta/recipes-core/musl/musl/0001-riscv-Rename-__NR_fstatat-__NR_newfstatat.patch b/poky/meta/recipes-core/musl/musl/0001-riscv-Rename-__NR_fstatat-__NR_newfstatat.patch deleted file mode 100644 index 9d9f16cee..000000000 --- a/poky/meta/recipes-core/musl/musl/0001-riscv-Rename-__NR_fstatat-__NR_newfstatat.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 40732d03990632049d5ba63dd736269a81756b16 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 19 May 2021 00:30:05 -0700 -Subject: [PATCH] riscv: Rename __NR_fstatat __NR_newfstatat - -on riscv64 this syscall is called __NR_newfstatat -this helps the name match kernel UAPI for external -programs - -Upstream-Status: Submitted [https://www.openwall.com/lists/musl/2021/05/19/3] -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Cc: zabolcs Nagy <nsz@port70.net> ---- - arch/riscv64/bits/syscall.h.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/riscv64/bits/syscall.h.in b/arch/riscv64/bits/syscall.h.in -index f9c421d0..39c0d650 100644 ---- a/arch/riscv64/bits/syscall.h.in -+++ b/arch/riscv64/bits/syscall.h.in -@@ -76,7 +76,7 @@ - #define __NR_splice 76 - #define __NR_tee 77 - #define __NR_readlinkat 78 --#define __NR_fstatat 79 -+#define __NR_newfstatat 79 - #define __NR_fstat 80 - #define __NR_sync 81 - #define __NR_fsync 82 --- -2.31.1 - diff --git a/poky/meta/recipes-core/musl/musl_git.bb b/poky/meta/recipes-core/musl/musl_git.bb index bd9d5f1d4..06b0e060d 100644 --- a/poky/meta/recipes-core/musl/musl_git.bb +++ b/poky/meta/recipes-core/musl/musl_git.bb @@ -4,7 +4,7 @@ require musl.inc inherit linuxloader -SRCREV = "aad50fcd791e009961621ddfbe3d4c245fd689a3" +SRCREV = "3f701faace7addc75d16dea8a6cd769fa5b3f260" BASEVER = "1.2.2" @@ -15,7 +15,6 @@ PV = "${BASEVER}+git${SRCPV}" SRC_URI = "git://git.musl-libc.org/musl \ file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ - file://0001-riscv-Rename-__NR_fstatat-__NR_newfstatat.patch \ " S = "${WORKDIR}/git" @@ -42,7 +41,7 @@ LDFLAGS += "-Wl,-soname,libc.so" # disabled automatically due to the optimisation level, but append an explicit # -fomit-frame-pointer to handle cases where optimisation is set to -O0 or frame # pointers have been enabled by -fno-omit-frame-pointer earlier in CFLAGS, etc. -CFLAGS_append_arm = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" +CFLAGS:append:arm = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" CONFIGUREOPTS = " \ --prefix=${prefix} \ @@ -70,19 +69,19 @@ do_install() { lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd } -FILES_${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" -FILES_${PN}-staticdev = "${libdir}/libc.a" -FILES_${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ +FILES:${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" +FILES:${PN}-staticdev = "${libdir}/libc.a" +FILES:${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ ${libdir}/libpthread.a ${libdir}/libresolv.a \ ${libdir}/librt.a ${libdir}/libutil.a ${libdir}/libxnet.a \ " -RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" -RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" -RPROVIDES_${PN} += "ldd libsegfault rtld(GNU_HASH)" +RDEPENDS:${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" +RPROVIDES:${PN}-dev += "libc-dev virtual-libc-dev" +RPROVIDES:${PN} += "ldd libsegfault rtld(GNU_HASH)" LEAD_SONAME = "libc.so" -INSANE_SKIP_${PN}-dev = "staticdev" -INSANE_SKIP_${PN} = "libdir" +INSANE_SKIP:${PN}-dev = "staticdev" +INSANE_SKIP:${PN} = "libdir" UPSTREAM_CHECK_COMMITS = "1" diff --git a/poky/meta/recipes-core/ncurses/ncurses.inc b/poky/meta/recipes-core/ncurses/ncurses.inc index ef59bc3b0..cbb12ca27 100644 --- a/poky/meta/recipes-core/ncurses/ncurses.inc +++ b/poky/meta/recipes-core/ncurses/ncurses.inc @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" SECTION = "libs" DEPENDS = "ncurses-native" -DEPENDS_class-native = "" +DEPENDS:class-native = "" BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \ ${bindir}/ncurses6-config ${bindir}/ncursesw6-config" @@ -32,17 +32,17 @@ ENABLE_WIDEC ?= "true" BUILD_CPPFLAGS += "-D_GNU_SOURCE" # natives don't generally look in base_libdir -base_libdir_class-native = "${libdir}" +base_libdir:class-native = "${libdir}" # Display corruption occurs on 64 bit hosts without these settings # This was derrived from the upstream debian ncurses which uses # these settings for 32 and 64 bit hosts. EXCONFIG_ARGS = "" -EXCONFIG_ARGS_class-native = " \ +EXCONFIG_ARGS:class-native = " \ --disable-lp64 \ --with-chtype='long' \ --with-mmask-t='long'" -EXCONFIG_ARGS_class-nativesdk = " \ +EXCONFIG_ARGS:class-nativesdk = " \ --disable-lp64 \ --with-chtype='long' \ --with-mmask-t='long'" @@ -55,11 +55,11 @@ PACKAGES_DYNAMIC = "^${PN}-lib.*" # because the sstate had a hard coded search path. Until this is fixed # another way this is deemed good enough. EX_TERMCAP = "" -EX_TERMCAP_class-native = ":/etc/termcap:/usr/share/misc/termcap" -EX_TERMCAP_class-nativesdk = ":/etc/termcap:/usr/share/misc/termcap" +EX_TERMCAP:class-native = ":/etc/termcap:/usr/share/misc/termcap" +EX_TERMCAP:class-nativesdk = ":/etc/termcap:/usr/share/misc/termcap" EX_TERMINFO = "" -EX_TERMINFO_class-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" -EX_TERMINFO_class-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" +EX_TERMINFO:class-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" +EX_TERMINFO:class-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" EX_TERMLIB ?= "tinfo" # Helper function for do_configure to allow multiple configurations @@ -258,7 +258,7 @@ do_install() { oe_multilib_header curses.h } -python populate_packages_prepend () { +python populate_packages:prepend () { libdir = d.expand("${libdir}") base_libdir = d.expand("${base_libdir}") pnbase = d.expand("${PN}-lib%s") @@ -272,8 +272,8 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_ncurses-tools_class-target = "clear reset" -ALTERNATIVE_ncurses-terminfo_class-target = "st st-256color" +ALTERNATIVE:ncurses-tools:class-target = "clear reset" +ALTERNATIVE:ncurses-terminfo:class-target = "st st-256color" ALTERNATIVE_LINK_NAME[st] = "${datadir}/terminfo/s/st" @@ -287,7 +287,7 @@ PACKAGES += " \ ${PN}-terminfo \ " -FILES_${PN} = "\ +FILES:${PN} = "\ ${bindir}/tput \ ${bindir}/tset \ ${bindir}/ncurses5-config \ @@ -299,7 +299,7 @@ FILES_${PN} = "\ # This keeps only tput/tset in ncurses # clear/reset are in already busybox -FILES_${PN}-tools = "\ +FILES:${PN}-tools = "\ ${bindir}/tic \ ${bindir}/toe \ ${bindir}/infotocap \ @@ -312,20 +312,20 @@ FILES_${PN}-tools = "\ " # 'reset' is a symlink to 'tset' which is in the 'ncurses' package -RDEPENDS_${PN}-tools = "${PN} ${PN}-terminfo-base" +RDEPENDS:${PN}-tools = "${PN} ${PN}-terminfo-base" -FILES_${PN}-terminfo = "\ +FILES:${PN}-terminfo = "\ ${datadir}/terminfo \ " -FILES_${PN}-terminfo-base = "\ +FILES:${PN}-terminfo-base = "\ ${sysconfdir}/terminfo \ " -RSUGGESTS_${PN}-libtinfo = "${PN}-terminfo" -RRECOMMENDS_${PN}-libtinfo = "${PN}-terminfo-base" +RSUGGESTS:${PN}-libtinfo = "${PN}-terminfo" +RRECOMMENDS:${PN}-libtinfo = "${PN}-terminfo-base" # Putting terminfo into the sysroot adds around 2800 files to # each recipe specific sysroot. We can live without this, particularly # as many recipes may have native and target copies. -SYSROOT_DIRS_remove = "${datadir}" +SYSROOT_DIRS:remove = "${datadir}" diff --git a/poky/meta/recipes-core/newlib/libgloss_4.1.0.bb b/poky/meta/recipes-core/newlib/libgloss_4.1.0.bb index c9ed30d98..8c8ee9139 100644 --- a/poky/meta/recipes-core/newlib/libgloss_4.1.0.bb +++ b/poky/meta/recipes-core/newlib/libgloss_4.1.0.bb @@ -2,21 +2,21 @@ require newlib.inc DEPENDS += "newlib" -FILESEXTRAPATHS_prepend := "${THISDIR}/libgloss:" +FILESEXTRAPATHS:prepend := "${THISDIR}/libgloss:" -SRC_URI_append_powerpc = " file://fix-rs6000-crt0.patch" -SRC_URI_append_arm = " file://fix_makefile_include_arm_h.patch" +SRC_URI:append:powerpc = " file://fix-rs6000-crt0.patch" +SRC_URI:append:arm = " file://fix_makefile_include_arm_h.patch" do_configure() { ${S}/libgloss/configure ${EXTRA_OECONF} } -do_install_prepend() { +do_install:prepend() { # install doesn't create this itself, avoid install error install -d ${D}${prefix}/${TARGET_SYS}/lib } -do_install_append() { +do_install:append() { # Move libs to default directories so they can be picked up later install -d ${D}${libdir} mv -v ${D}${prefix}/${TARGET_SYS}/lib/* ${D}${libdir} @@ -26,8 +26,8 @@ do_install_append() { } # Split packages correctly -FILES_${PN} += "${libdir}/*.ld ${libdir}/*.specs" -FILES_${PN}-dev += "${libdir}/cpu-init/*" +FILES:${PN} += "${libdir}/*.ld ${libdir}/*.specs" +FILES:${PN}-dev += "${libdir}/cpu-init/*" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/poky/meta/recipes-core/newlib/newlib.inc b/poky/meta/recipes-core/newlib/newlib.inc index 0aba21fae..23cd17200 100644 --- a/poky/meta/recipes-core/newlib/newlib.inc +++ b/poky/meta/recipes-core/newlib/newlib.inc @@ -25,7 +25,7 @@ S = "${WORKDIR}/newlib-${PV}" B = "${WORKDIR}/build" ## disable stdlib -TARGET_CC_ARCH_append = " -nostdlib" +TARGET_CC_ARCH:append = " -nostdlib" EXTRA_OECONF = " \ --build=${BUILD_SYS} \ @@ -50,5 +50,5 @@ do_install() { oe_runmake install DESTDIR='${D}' } -COMPATIBLE_HOST_libc-musl_class-target = "null" -COMPATIBLE_HOST_libc-glibc_class-target = "null" +COMPATIBLE_HOST:libc-musl:class-target = "null" +COMPATIBLE_HOST:libc-glibc:class-target = "null" diff --git a/poky/meta/recipes-core/newlib/newlib_4.1.0.bb b/poky/meta/recipes-core/newlib/newlib_4.1.0.bb index 7ab5b2b94..0542c596b 100644 --- a/poky/meta/recipes-core/newlib/newlib_4.1.0.bb +++ b/poky/meta/recipes-core/newlib/newlib_4.1.0.bb @@ -7,7 +7,7 @@ do_configure() { ${S}/configure ${EXTRA_OECONF} } -do_install_append() { +do_install:append() { # Move include files and libs to default directories so they can be picked up later mv -v ${D}${prefix}/${TARGET_SYS}/lib ${D}${libdir} mv -v ${D}${prefix}/${TARGET_SYS}/include ${D}${includedir} @@ -17,4 +17,4 @@ do_install_append() { } # No rpm package is actually created but -dev depends on it, avoid dnf error -RDEPENDS_${PN}-dev_libc-newlib = "" +RDEPENDS:${PN}-dev:libc-newlib = "" diff --git a/poky/meta/recipes-core/os-release/os-release.bb b/poky/meta/recipes-core/os-release/os-release.bb index a29d67812..38ee4f993 100644 --- a/poky/meta/recipes-core/os-release/os-release.bb +++ b/poky/meta/recipes-core/os-release/os-release.bb @@ -50,4 +50,4 @@ do_install () { lnr ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/os-release } -FILES_${PN} += "${nonarch_libdir}/os-release" +FILES:${PN} += "${nonarch_libdir}/os-release" diff --git a/poky/meta/recipes-core/ovmf/ovmf-shell-image.bb b/poky/meta/recipes-core/ovmf/ovmf-shell-image.bb index fd4fb5b73..50c4517da 100644 --- a/poky/meta/recipes-core/ovmf/ovmf-shell-image.bb +++ b/poky/meta/recipes-core/ovmf/ovmf-shell-image.bb @@ -1,11 +1,11 @@ DESCRIPTION = "boot image with UEFI shell and tools" -COMPATIBLE_HOST_class-target='(i.86|x86_64).*' +COMPATIBLE_HOST:class-target='(i.86|x86_64).*' # For this image recipe, only the wic format with a # single vfat partition makes sense. Because we have no # boot loader and no rootfs partition, not additional # tools are needed for this .wks file. -IMAGE_FSTYPES_forcevariable = 'wic' +IMAGE_FSTYPES:forcevariable = 'wic' WKS_FILE = "ovmf/ovmf-shell-image.wks" WKS_FILE_DEPENDS = "" diff --git a/poky/meta/recipes-core/ovmf/ovmf_git.bb b/poky/meta/recipes-core/ovmf/ovmf_git.bb index 90dae2aed..145240e77 100644 --- a/poky/meta/recipes-core/ovmf/ovmf_git.bb +++ b/poky/meta/recipes-core/ovmf/ovmf_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "OVMF is an EDK II based project to enable UEFI support for \ Virtual Machines. OVMF contains sample UEFI firmware for QEMU and KVM" HOMEPAGE = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF" LICENSE = "BSD-2-Clause" -LICENSE_class-target = "${@bb.utils.contains('PACKAGECONFIG', 'secureboot', 'BSD & OpenSSL', 'BSD', d)}" +LICENSE:class-target = "${@bb.utils.contains('PACKAGECONFIG', 'secureboot', 'BSD & OpenSSL', 'BSD', d)}" LIC_FILES_CHKSUM = "file://OvmfPkg/License.txt;md5=06357ddc23f46577c2aeaeaf7b776d65" # Enabling Secure Boot adds a dependency on OpenSSL and implies @@ -40,7 +40,7 @@ EDK_TOOLS_DIR="edk2_basetools" BUILD_OPTIMIZATION="-pipe" # OVMF supports IA only, although it could conceivably support ARM someday. -COMPATIBLE_HOST_class-target='(i.86|x86_64).*' +COMPATIBLE_HOST:class-target='(i.86|x86_64).*' # Additional build flags for OVMF with Secure Boot. # Fedora also uses "-D SMM_REQUIRE -D EXCLUDE_SHELL_FROM_FD". @@ -52,7 +52,7 @@ export PYTHON_COMMAND = "${HOSTTOOLS_DIR}/python3" do_patch[postfuncs] += "fix_basetools_location" fix_basetools_location () { } -fix_basetools_location_class-target() { +fix_basetools_location:class-target() { # Replaces the fake path inserted by 0002-ovmf-update-path-to-native-BaseTools.patch. # Necessary for finding the actual BaseTools from ovmf-native. sed -i -e 's#BBAKE_EDK_TOOLS_PATH#${STAGING_BINDIR_NATIVE}/${EDK_TOOLS_DIR}#' ${S}/OvmfPkg/build.sh @@ -61,7 +61,7 @@ fix_basetools_location_class-target() { do_patch[postfuncs] += "fix_iasl" fix_iasl() { } -fix_iasl_class-native() { +fix_iasl:class-native() { # iasl is not installed under /usr/bin when building with OE. sed -i -e 's#/usr/bin/iasl#${STAGING_BINDIR_NATIVE}/iasl#' ${S}/BaseTools/Conf/tools_def.template } @@ -80,14 +80,14 @@ fix_toolchain() { -e '/^VFR_CPPFLAGS/a CC = ${CC}\nCXX = ${CXX}\nAS = ${AS}\nAR = ${AR}\nLD = ${LD}' \ ${S}/BaseTools/Source/C/VfrCompile/GNUmakefile } -fix_toolchain_append_class-native() { +fix_toolchain:append:class-native() { # This tools_def.template is going to be used by the target ovmf and # defines which compilers to use. For the GCC toolchain definitions, # that will be ${HOST_PREFIX}gcc. However, "make" doesn't need that # prefix. # # Injecting ENV(HOST_PREFIX) matches exporting that value as env - # variable in do_compile_class-target. + # variable in do_compile:class-target. sed -i \ -e 's#\(ENV\|DEF\)(GCC.*_PREFIX)#ENV(HOST_PREFIX)#' \ -e 's#ENV(HOST_PREFIX)make#make#' \ @@ -150,11 +150,11 @@ fixup_target_tools() { echo ${FIXED_GCCVER} } -do_compile_class-native() { +do_compile:class-native() { oe_runmake -C ${S}/BaseTools } -do_compile_class-target() { +do_compile:class-target() { export LFLAGS="${LDFLAGS}" PARALLEL_JOBS="${@oe.utils.parallel_make_argument(d, '-n %d')}" OVMF_ARCH="X64" @@ -203,12 +203,12 @@ do_compile_class-target() { fi } -do_install_class-native() { +do_install:class-native() { install -d ${D}/${bindir}/edk2_basetools cp -r ${S}/BaseTools ${D}/${bindir}/${EDK_TOOLS_DIR} } -do_install_class-target() { +do_install:class-target() { # Content for UEFI shell iso. We install the EFI shell as # bootx64/ia32.efi because then it can be started even when the # firmware itself does not contain it. @@ -225,19 +225,19 @@ do_install_class-target() { # # However, EnrollDefaultKeys.efi is only included when Secure Boot is enabled. PACKAGES =+ "ovmf-shell-efi" -FILES_ovmf-shell-efi = " \ +FILES:ovmf-shell-efi = " \ EnrollDefaultKeys.efi \ efi/ \ " DEPLOYDEP = "" -DEPLOYDEP_class-target = "qemu-system-native:do_populate_sysroot" -DEPLOYDEP_class-target += " ${@bb.utils.contains('PACKAGECONFIG', 'secureboot', 'openssl-native:do_populate_sysroot', '', d)}" +DEPLOYDEP:class-target = "qemu-system-native:do_populate_sysroot" +DEPLOYDEP:class-target += " ${@bb.utils.contains('PACKAGECONFIG', 'secureboot', 'openssl-native:do_populate_sysroot', '', d)}" do_deploy[depends] += "${DEPLOYDEP}" do_deploy() { } -do_deploy_class-target() { +do_deploy:class-target() { # For use with "runqemu ovmf". for i in \ ovmf \ diff --git a/poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index ae989011f..39e5002bb 100644 --- a/poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/poky/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb @@ -9,7 +9,9 @@ inherit packagegroup nativesdk PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" -RDEPENDS_${PN} = "\ +# autoconf pulls in nativesdk-perl but perl-module-integer is needed to +# build some recent linux kernels (5.14+) for arm +RDEPENDS:${PN} = "\ nativesdk-pkgconfig \ nativesdk-qemu \ nativesdk-qemu-helper \ @@ -27,9 +29,10 @@ RDEPENDS_${PN} = "\ nativesdk-sdk-provides-dummy \ nativesdk-bison \ nativesdk-flex \ + nativesdk-perl-module-integer \ " -RDEPENDS_${PN}_darwin = "\ +RDEPENDS:${PN}:darwin = "\ nativesdk-pkgconfig \ nativesdk-opkg \ nativesdk-libtool \ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-base.bb b/poky/meta/recipes-core/packagegroups/packagegroup-base.bb index 6d4d7e6f7..7489ef61b 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-base.bb @@ -47,7 +47,7 @@ VIRTUAL-RUNTIME_keymaps ?= "keymaps" # # packagegroup-base contain stuff needed for base system (machine related) # -RDEPENDS_packagegroup-base = "\ +RDEPENDS:packagegroup-base = "\ packagegroup-distro-base \ packagegroup-machine-base \ \ @@ -79,7 +79,7 @@ RDEPENDS_packagegroup-base = "\ " -RRECOMMENDS_packagegroup-base = "\ +RRECOMMENDS:packagegroup-base = "\ kernel-module-nls-utf8 \ kernel-module-input \ kernel-module-uinput \ @@ -88,7 +88,7 @@ RRECOMMENDS_packagegroup-base = "\ kernel-module-rtc-sysfs \ kernel-module-unix" -RDEPENDS_packagegroup-base-extended = "\ +RDEPENDS:packagegroup-base-extended = "\ packagegroup-base \ ${ADD_WIFI} \ ${ADD_BT} \ @@ -124,69 +124,69 @@ python __anonymous () { # # packages added by distribution # -SUMMARY_packagegroup-distro-base = "${DISTRO} extras" +SUMMARY:packagegroup-distro-base = "${DISTRO} extras" DEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_DEPENDS}" -RDEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RDEPENDS}" -RRECOMMENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" +RDEPENDS:packagegroup-distro-base = "${DISTRO_EXTRA_RDEPENDS}" +RRECOMMENDS:packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" # # packages added by machine config # -SUMMARY_packagegroup-machine-base = "${MACHINE} extras" -SUMMARY_packagegroup-machine-base = "Extra packages required to fully support ${MACHINE} hardware" -RDEPENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RDEPENDS}" -RRECOMMENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" +SUMMARY:packagegroup-machine-base = "${MACHINE} extras" +SUMMARY:packagegroup-machine-base = "Extra packages required to fully support ${MACHINE} hardware" +RDEPENDS:packagegroup-machine-base = "${MACHINE_EXTRA_RDEPENDS}" +RRECOMMENDS:packagegroup-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" -SUMMARY_packagegroup-base-keyboard = "Keyboard support" -RDEPENDS_packagegroup-base-keyboard = "\ +SUMMARY:packagegroup-base-keyboard = "Keyboard support" +RDEPENDS:packagegroup-base-keyboard = "\ ${VIRTUAL-RUNTIME_keymaps}" -SUMMARY_packagegroup-base-pci = "PCI bus support" -RDEPENDS_packagegroup-base-pci = "\ +SUMMARY:packagegroup-base-pci = "PCI bus support" +RDEPENDS:packagegroup-base-pci = "\ pciutils" -SUMMARY_packagegroup-base-acpi = "ACPI support" -RDEPENDS_packagegroup-base-acpi = "\ +SUMMARY:packagegroup-base-acpi = "ACPI support" +RDEPENDS:packagegroup-base-acpi = "\ acpid" -SUMMARY_packagegroup-base-apm = "APM support" -RDEPENDS_packagegroup-base-apm = "\ +SUMMARY:packagegroup-base-apm = "APM support" +RDEPENDS:packagegroup-base-apm = "\ ${VIRTUAL-RUNTIME_apm} \ apmd" -SUMMARY_packagegroup-base-ext2 = "ext2 filesystem support" -RDEPENDS_packagegroup-base-ext2 = "\ +SUMMARY:packagegroup-base-ext2 = "ext2 filesystem support" +RDEPENDS:packagegroup-base-ext2 = "\ e2fsprogs-e2fsck \ e2fsprogs-mke2fs" -RRECOMMENDS_packagegroup-base-ext2 = "\ +RRECOMMENDS:packagegroup-base-ext2 = "\ hdparm \ e2fsprogs" -SUMMARY_packagegroup-base-vfat = "FAT filesystem support" -RRECOMMENDS_packagegroup-base-vfat = "\ +SUMMARY:packagegroup-base-vfat = "FAT filesystem support" +RRECOMMENDS:packagegroup-base-vfat = "\ kernel-module-msdos \ kernel-module-vfat \ kernel-module-nls-iso8859-1 \ kernel-module-nls-cp437 \ dosfstools" -SUMMARY_packagegroup-base-alsa = "ALSA sound support" -RDEPENDS_packagegroup-base-alsa = "\ +SUMMARY:packagegroup-base-alsa = "ALSA sound support" +RDEPENDS:packagegroup-base-alsa = "\ alsa-utils-alsactl \ alsa-utils-amixer \ ${VIRTUAL-RUNTIME_alsa-state}" -RRECOMMENDS_packagegroup-base-alsa = "\ +RRECOMMENDS:packagegroup-base-alsa = "\ kernel-module-snd-mixer-oss \ kernel-module-snd-pcm-oss" -SUMMARY_packagegroup-base-pcmcia = "PC card slot support" -RDEPENDS_packagegroup-base-pcmcia = "\ +SUMMARY:packagegroup-base-pcmcia = "PC card slot support" +RDEPENDS:packagegroup-base-pcmcia = "\ pcmciautils \ " -RRECOMMENDS_packagegroup-base-pcmcia = "\ +RRECOMMENDS:packagegroup-base-pcmcia = "\ kernel-module-pcmcia \ kernel-module-airo-cs \ kernel-module-pcnet-cs \ @@ -197,12 +197,12 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" -SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" -RDEPENDS_packagegroup-base-bluetooth = "\ +SUMMARY:packagegroup-base-bluetooth = "Bluetooth support" +RDEPENDS:packagegroup-base-bluetooth = "\ bluez5 \ " -RRECOMMENDS_packagegroup-base-bluetooth = "\ +RRECOMMENDS:packagegroup-base-bluetooth = "\ kernel-module-bluetooth \ kernel-module-l2cap \ kernel-module-rfcomm \ @@ -218,19 +218,19 @@ RRECOMMENDS_packagegroup-base-bluetooth = "\ ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ " -SUMMARY_packagegroup-base-usbgadget = "USB gadget support" -RRECOMMENDS_packagegroup-base-usbgadget = "\ +SUMMARY:packagegroup-base-usbgadget = "USB gadget support" +RRECOMMENDS:packagegroup-base-usbgadget = "\ kernel-module-pxa27x_udc \ kernel-module-gadgetfs \ kernel-module-g-file-storage \ kernel-module-g-serial \ kernel-module-g-ether" -SUMMARY_packagegroup-base-usbhost = "USB host support" -RDEPENDS_packagegroup-base-usbhost = "\ +SUMMARY:packagegroup-base-usbhost = "USB host support" +RDEPENDS:packagegroup-base-usbhost = "\ usbutils " -RRECOMMENDS_packagegroup-base-usbhost = "\ +RRECOMMENDS:packagegroup-base-usbhost = "\ kernel-module-uhci-hcd \ kernel-module-ohci-hcd \ kernel-module-ehci-hcd \ @@ -244,36 +244,36 @@ RRECOMMENDS_packagegroup-base-usbhost = "\ kernel-module-usbserial \ kernel-module-usb-storage " -SUMMARY_packagegroup-base-ppp = "PPP dial-up protocol support" -RDEPENDS_packagegroup-base-ppp = "\ +SUMMARY:packagegroup-base-ppp = "PPP dial-up protocol support" +RDEPENDS:packagegroup-base-ppp = "\ ppp \ ppp-dialin" -RRECOMMENDS_packagegroup-base-ppp = "\ +RRECOMMENDS:packagegroup-base-ppp = "\ kernel-module-ppp-async \ kernel-module-ppp-deflate \ kernel-module-ppp-generic \ kernel-module-ppp-mppe \ kernel-module-slhc" -SUMMARY_packagegroup-base-ipsec = "IPSEC support" -RDEPENDS_packagegroup-base-ipsec = "\ +SUMMARY:packagegroup-base-ipsec = "IPSEC support" +RDEPENDS:packagegroup-base-ipsec = "\ " -RRECOMMENDS_packagegroup-base-ipsec = "\ +RRECOMMENDS:packagegroup-base-ipsec = "\ kernel-module-ipsec" # # packagegroup-base-wifi contain everything needed to get WiFi working # WEP/WPA connection needs to be supported out-of-box # -SUMMARY_packagegroup-base-wifi = "WiFi support" -RDEPENDS_packagegroup-base-wifi = "\ +SUMMARY:packagegroup-base-wifi = "WiFi support" +RDEPENDS:packagegroup-base-wifi = "\ iw \ wireless-regdb-static \ wpa-supplicant" -RRECOMMENDS_packagegroup-base-wifi = "\ +RRECOMMENDS:packagegroup-base-wifi = "\ ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ kernel-module-ieee80211-crypt \ kernel-module-ieee80211-crypt-ccmp \ @@ -287,59 +287,59 @@ RRECOMMENDS_packagegroup-base-wifi = "\ kernel-module-aes-generic \ kernel-module-aes" -SUMMARY_packagegroup-base-nfc = "Near Field Communication support" -RDEPENDS_packagegroup-base-nfc = "\ +SUMMARY:packagegroup-base-nfc = "Near Field Communication support" +RDEPENDS:packagegroup-base-nfc = "\ neard" -RRECOMMENDS_packagegroup-base-nfc = "\ +RRECOMMENDS:packagegroup-base-nfc = "\ kernel-module-nfc" -SUMMARY_packagegroup-base-3g = "Cellular data support" -RDEPENDS_packagegroup-base-3g = "\ +SUMMARY:packagegroup-base-3g = "Cellular data support" +RDEPENDS:packagegroup-base-3g = "\ ofono" -RRECOMMENDS_packagegroup-base-3g = "\ +RRECOMMENDS:packagegroup-base-3g = "\ kernel-module-cdc-acm \ kernel-module-cdc-wdm" -SUMMARY_packagegroup-base-smbfs = "SMB network filesystem support" -RRECOMMENDS_packagegroup-base-smbfs = "\ +SUMMARY:packagegroup-base-smbfs = "SMB network filesystem support" +RRECOMMENDS:packagegroup-base-smbfs = "\ kernel-module-cifs \ kernel-module-smbfs" -SUMMARY_packagegroup-base-cramfs = "cramfs filesystem support" -RRECOMMENDS_packagegroup-base-cramfs = "\ +SUMMARY:packagegroup-base-cramfs = "cramfs filesystem support" +RRECOMMENDS:packagegroup-base-cramfs = "\ kernel-module-cramfs" # # packagegroup-base-nfs provides ONLY client support - server is in nfs-utils package # -SUMMARY_packagegroup-base-nfs = "NFS network filesystem support" -RDEPENDS_packagegroup-base-nfs = "\ +SUMMARY:packagegroup-base-nfs = "NFS network filesystem support" +RDEPENDS:packagegroup-base-nfs = "\ rpcbind" -RRECOMMENDS_packagegroup-base-nfs = "\ +RRECOMMENDS:packagegroup-base-nfs = "\ kernel-module-nfs " -SUMMARY_packagegroup-base-zeroconf = "Zeroconf support" -RDEPENDS_packagegroup-base-zeroconf = "\ +SUMMARY:packagegroup-base-zeroconf = "Zeroconf support" +RDEPENDS:packagegroup-base-zeroconf = "\ avahi-daemon" -RDEPENDS_packagegroup-base-zeroconf_append_libc-glibc = "\ +RDEPENDS:packagegroup-base-zeroconf:append:libc-glibc = "\ libnss-mdns \ " -SUMMARY_packagegroup-base-ipv6 = "IPv6 support" -RDEPENDS_packagegroup-base-ipv6 = "\ +SUMMARY:packagegroup-base-ipv6 = "IPv6 support" +RDEPENDS:packagegroup-base-ipv6 = "\ " -RRECOMMENDS_packagegroup-base-ipv6 = "\ +RRECOMMENDS:packagegroup-base-ipv6 = "\ kernel-module-ipv6 " -SUMMARY_packagegroup-base-serial = "Serial port support" -RDEPENDS_packagegroup-base-serial = "\ +SUMMARY:packagegroup-base-serial = "Serial port support" +RDEPENDS:packagegroup-base-serial = "\ setserial \ lrzsz " -SUMMARY_packagegroup-base-phone = "Cellular telephony (voice) support" -RDEPENDS_packagegroup-base-phone = "\ +SUMMARY:packagegroup-base-phone = "Cellular telephony (voice) support" +RDEPENDS:packagegroup-base-phone = "\ ofono" diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index abbee14bd..faf7bc002 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb @@ -22,7 +22,7 @@ SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '${VIRTUAL-R ${VIRTUAL-RUNTIME_initscripts} \ " -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ base-files \ base-passwd \ ${VIRTUAL-RUNTIME_base-utils} \ @@ -36,6 +36,6 @@ RDEPENDS_${PN} = "\ ${VIRTUAL-RUNTIME_update-alternatives} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_${PN} = "\ +RRECOMMENDS:${PN} = "\ ${VIRTUAL-RUNTIME_base-utils-syslog} \ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb index 78cc65db8..32f4ac358 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb @@ -7,7 +7,7 @@ SUMMARY = "Essential build dependencies" inherit packagegroup -RDEPENDS_packagegroup-core-buildessential = "\ +RDEPENDS:packagegroup-core-buildessential = "\ autoconf \ automake \ binutils \ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb index c45463fc6..4e91aaf47 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb @@ -2,7 +2,7 @@ SUMMARY = "Remote debugging tools for Eclipse integration" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ gdbserver \ tcf-agent \ openssh-sftp-server \ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb index 20fe6fc09..35beb3fc0 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb @@ -9,11 +9,11 @@ inherit packagegroup PACKAGES = "${PN}-server ${PN}-client" -SUMMARY_${PN}-client = "NFS client" -RDEPENDS_${PN}-client = "nfs-utils-client" +SUMMARY:${PN}-client = "NFS client" +RDEPENDS:${PN}-client = "nfs-utils-client" -SUMMARY_${PN}-server = "NFS server" -RDEPENDS_${PN}-server = "\ +SUMMARY:${PN}-server = "NFS server" +RDEPENDS:${PN}-server = "\ nfs-utils \ nfs-utils-client \ " diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index 03fa5296c..d70aff22c 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb @@ -11,7 +11,7 @@ inherit packagegroup #PACKAGEFUNCS =+ 'generate_sdk_pkgs' -RDEPENDS_packagegroup-core-sdk = "\ +RDEPENDS:packagegroup-core-sdk = "\ packagegroup-core-buildessential \ coreutils \ ccache \ @@ -26,15 +26,15 @@ RDEPENDS_packagegroup-core-sdk = "\ tcl" SANITIZERS = "libasan-dev libubsan-dev" -SANITIZERS_arc = "" -SANITIZERS_microblaze = "" -SANITIZERS_mipsarch = "" -SANITIZERS_nios2 = "" -SANITIZERS_riscv64 = "" -SANITIZERS_riscv32 = "" -SANITIZERS_libc-musl = "" +SANITIZERS:arc = "" +SANITIZERS:microblaze = "" +SANITIZERS:mipsarch = "" +SANITIZERS:nios2 = "" +SANITIZERS:riscv64 = "" +SANITIZERS:riscv32 = "" +SANITIZERS:libc-musl = "" -RRECOMMENDS_packagegroup-core-sdk = "\ +RRECOMMENDS:packagegroup-core-sdk = "\ libgomp \ libgomp-dev \ ${SANITIZERS}" @@ -53,7 +53,7 @@ RRECOMMENDS_packagegroup-core-sdk = "\ # # the package depchain code # spkgdata = read_subpkgdata(pkg, d) # -# rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '') +# rdepends = explode_deps(spkgdata.get('RDEPENDS:%s' % pkg) or '') # rreclist = [] # # for depend in rdepends: @@ -63,16 +63,16 @@ RRECOMMENDS_packagegroup-core-sdk = "\ # rreclist.append('%s-dev' % name) # else: # deppkgdata = read_subpkgdata(name, d) -# rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '') +# rdepends2 = explode_deps(deppkgdata.get('RDEPENDS:%s' % name) or '') # for depend in rdepends2: # split_depend = depend.split(' (') # name = split_depend[0].strip() # if packaged('%s-dev' % name, d): # rreclist.append('%s-dev' % name) # -# oldrrec = d.getVar('RRECOMMENDS_%s' % newpkg, False) or '' -# d.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist)) -# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, d.getVar('RRECOMMENDS_%s' % newpkg, False))) +# oldrrec = d.getVar('RRECOMMENDS:%s' % newpkg, False) or '' +# d.setVar('RRECOMMENDS:%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist)) +# # bb.note('RRECOMMENDS:%s = "%s"' % (newpkg, d.getVar('RRECOMMENDS:%s' % newpkg, False))) # # # bb.note('pkgs is %s' % pkgs) # d.setVar('PACKAGES', ' '.join(pkgs)) diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb index 5ec3f6c92..4f844ad92 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb @@ -3,4 +3,4 @@ PR = "r1" inherit packagegroup -RDEPENDS_${PN} = "dropbear" +RDEPENDS:${PN} = "dropbear" diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb index 703f956ae..846df12bc 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb @@ -3,4 +3,4 @@ PR = "r1" inherit packagegroup -RDEPENDS_${PN} = "openssh" +RDEPENDS:${PN} = "openssh" diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb index 2a54f1ca3..5ebcbcec8 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "${TUNE_PKGARCH}" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ libgcc \ libgcc-dev \ libatomic \ @@ -15,7 +15,7 @@ RDEPENDS_${PN} = "\ ${LIBC_DEPENDENCIES} \ " -RRECOMMENDS_${PN}_mingw32 = "\ +RRECOMMENDS:${PN}:mingw32 = "\ libssp \ libssp-dev \ " diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb index 542a02057..c75850aa6 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb @@ -11,12 +11,12 @@ inherit packagegroup PR = "r3" MTRACE = "" -MTRACE_libc-glibc = "libc-mtrace" +MTRACE:libc-glibc = "libc-mtrace" STRACE = "strace" -STRACE_riscv32 = "" +STRACE:riscv32 = "" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ gdb \ gdbserver \ ${MTRACE} \ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 194dca76d..663a9cd57 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -12,11 +12,11 @@ inherit packagegroup PROFILE_TOOLS_X = "" # sysprof doesn't support aarch64 and nios2 -PROFILE_TOOLS_X_aarch64 = "" -PROFILE_TOOLS_X_nios2 = "" +PROFILE_TOOLS_X:aarch64 = "" +PROFILE_TOOLS_X:nios2 = "" PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" -RRECOMMENDS_${PN} = "\ +RRECOMMENDS:${PN} = "\ ${PERF} \ blktrace \ ${PROFILE_TOOLS_X} \ @@ -27,19 +27,19 @@ PROFILETOOLS = "\ powertop \ " PERF = "perf" -PERF_libc-musl = "" -PERF_libc-musl_arm = "perf" -PERF_riscv32 = "" +PERF:libc-musl = "" +PERF:libc-musl:arm = "perf" +PERF:riscv32 = "" # systemtap needs elfutils which is not fully buildable on some arches/libcs SYSTEMTAP = "systemtap" -SYSTEMTAP_libc-musl = "" -SYSTEMTAP_nios2 = "" -SYSTEMTAP_riscv64 = "" +SYSTEMTAP:libc-musl = "" +SYSTEMTAP:nios2 = "" +SYSTEMTAP:riscv64 = "" LTTNGTOOLS = "lttng-tools" -LTTNGTOOLS_arc = "" -LTTNGTOOLS_riscv32 = "" +LTTNGTOOLS:arc = "" +LTTNGTOOLS:riscv32 = "" BABELTRACE = "babeltrace" BABELTRACE2 = "babeltrace2" @@ -47,22 +47,22 @@ BABELTRACE2 = "babeltrace2" # valgrind does not work on the following configurations/architectures VALGRIND = "valgrind" -VALGRIND_libc-musl = "" -VALGRIND_mipsarch = "" -VALGRIND_nios2 = "" -VALGRIND_arc = "" -VALGRIND_armv4 = "" -VALGRIND_armv5 = "" -VALGRIND_armv6 = "" -VALGRIND_armeb = "" -VALGRIND_aarch64 = "" -VALGRIND_riscv64 = "" -VALGRIND_riscv32 = "" -VALGRIND_powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', '', 'valgrind', d)}" -VALGRIND_linux-gnux32 = "" -VALGRIND_linux-gnun32 = "" +VALGRIND:libc-musl = "" +VALGRIND:mipsarch = "" +VALGRIND:nios2 = "" +VALGRIND:arc = "" +VALGRIND:armv4 = "" +VALGRIND:armv5 = "" +VALGRIND:armv6 = "" +VALGRIND:armeb = "" +VALGRIND:aarch64 = "" +VALGRIND:riscv64 = "" +VALGRIND:riscv32 = "" +VALGRIND:powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', '', 'valgrind', d)}" +VALGRIND:linux-gnux32 = "" +VALGRIND:linux-gnun32 = "" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${PROFILETOOLS} \ ${LTTNGTOOLS} \ ${BABELTRACE} \ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index 015810cb6..94405fd8f 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -12,14 +12,14 @@ inherit packagegroup # kexec-tools doesn't work on e5500-64b, microblaze and nios2 yet KEXECTOOLS ?= "kexec" -KEXECTOOLS_e5500-64b ?= "" -KEXECTOOLS_microblaze ?= "" -KEXECTOOLS_nios2 ?= "" -KEXECTOOLS_riscv64 ?= "" -KEXECTOOLS_riscv32 ?= "" +KEXECTOOLS:e5500-64b ?= "" +KEXECTOOLS:microblaze ?= "" +KEXECTOOLS:nios2 ?= "" +KEXECTOOLS:riscv64 ?= "" +KEXECTOOLS:riscv32 ?= "" GSTEXAMPLES ?= "gst-examples" -GSTEXAMPLES_riscv64 = "" +GSTEXAMPLES:riscv64 = "" X11GLTOOLS = "\ mesa-demos \ @@ -37,7 +37,7 @@ X11TOOLS = "\ xprop \ " -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ blktool \ ${KEXECTOOLS} \ alsa-utils-amixer \ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/poky/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb index 3b430c081..49c075eb1 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb @@ -10,7 +10,7 @@ BINUTILS = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" GCC = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" GDB = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${@all_multilib_tune_values(d, 'BINUTILS')} \ ${@all_multilib_tune_values(d, 'GCC')} \ ${@all_multilib_tune_values(d, 'GDB')} \ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb b/poky/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb index 3daace1a4..d0596efe7 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb @@ -7,6 +7,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" GO = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ ${@all_multilib_tune_values(d, 'GO')} \ " diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb b/poky/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb index 9a52b0781..61629d273 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb @@ -2,7 +2,7 @@ SUMMARY = "Target packages for the Go SDK" inherit packagegroup goarch -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ go \ go-runtime \ go-runtime-dev \ diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb b/poky/meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb new file mode 100644 index 000000000..0d4f5ec9e --- /dev/null +++ b/poky/meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb @@ -0,0 +1,18 @@ +SUMMARY = "Host SDK package for Rust cross canadian toolchain" +PN = "packagegroup-rust-cross-canadian-${MACHINE}" + +inherit cross-canadian packagegroup + +PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" + +RUST="rust-cross-canadian-${TRANSLATED_TARGET_ARCH}" +CARGO="cargo-cross-canadian-${TRANSLATED_TARGET_ARCH}" +RUST_TOOLS="rust-tools-cross-canadian-${TRANSLATED_TARGET_ARCH}" + +RDEPENDS:${PN} = " \ + ${@all_multilib_tune_values(d, 'RUST')} \ + ${@all_multilib_tune_values(d, 'CARGO')} \ + rust-cross-canadian-src \ + ${@all_multilib_tune_values(d, 'RUST_TOOLS')} \ +" + diff --git a/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 9a70b189a..9523aadd1 100644 --- a/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/poky/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -24,7 +24,7 @@ PACKAGES = "\ packagegroup-self-hosted-host-tools \ " -RDEPENDS_packagegroup-self-hosted = "\ +RDEPENDS:packagegroup-self-hosted = "\ packagegroup-self-hosted-debug \ packagegroup-self-hosted-sdk \ packagegroup-self-hosted-extended \ @@ -32,7 +32,7 @@ RDEPENDS_packagegroup-self-hosted = "\ packagegroup-self-hosted-host-tools \ " -RDEPENDS_packagegroup-self-hosted-host-tools = "\ +RDEPENDS:packagegroup-self-hosted-host-tools = "\ e2fsprogs \ e2fsprogs-e2fsck \ e2fsprogs-mke2fs \ @@ -49,9 +49,9 @@ RDEPENDS_packagegroup-self-hosted-host-tools = "\ screen \ " PSEUDO = "pseudo" -PSEUDO_libc-musl = "" +PSEUDO:libc-musl = "" -RRECOMMENDS_packagegroup-self-hosted-host-tools = "\ +RRECOMMENDS:packagegroup-self-hosted-host-tools = "\ kernel-module-tun \ kernel-module-iptable-raw \ kernel-module-iptable-nat \ @@ -59,7 +59,7 @@ RRECOMMENDS_packagegroup-self-hosted-host-tools = "\ kernel-module-iptable-filter \ " -RDEPENDS_packagegroup-self-hosted-sdk = "\ +RDEPENDS:packagegroup-self-hosted-sdk = "\ autoconf \ automake \ binutils \ @@ -87,18 +87,18 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ quilt \ sed \ " -RDEPENDS_packagegroup-self-hosted-sdk_append_mingw32 = "\ +RDEPENDS:packagegroup-self-hosted-sdk:append:mingw32 = "\ libssp \ libssp-dev \ libssp-staticdev \ " # rpcsvc-proto: for rpcgen -RDEPENDS_packagegroup-self-hosted-sdk_append_libc-glibc = "\ +RDEPENDS:packagegroup-self-hosted-sdk:append:libc-glibc = "\ glibc-gconv-ibm850 \ glibc-utils \ rpcsvc-proto \ " -RDEPENDS_packagegroup-self-hosted-debug = " \ +RDEPENDS:packagegroup-self-hosted-debug = " \ gdb \ gdbserver \ rsync \ @@ -106,7 +106,7 @@ RDEPENDS_packagegroup-self-hosted-debug = " \ tcf-agent" -RDEPENDS_packagegroup-self-hosted-extended = "\ +RDEPENDS:packagegroup-self-hosted-extended = "\ bzip2 \ chrpath \ cpio \ @@ -177,7 +177,7 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ " -RDEPENDS_packagegroup-self-hosted-graphics = "\ +RDEPENDS:packagegroup-self-hosted-graphics = "\ builder \ libgl \ libgl-dev \ diff --git a/poky/meta/recipes-core/psplash/psplash_git.bb b/poky/meta/recipes-core/psplash/psplash_git.bb index 59e1e3f19..e9789c4ce 100644 --- a/poky/meta/recipes-core/psplash/psplash_git.bb +++ b/poky/meta/recipes-core/psplash/psplash_git.bb @@ -44,7 +44,7 @@ python __anonymous() { pkgs.append(outname) localpaths.append(flocal) - # Set these so that we have less work to do in do_compile and do_install_append + # Set these so that we have less work to do in do_compile and do_install:append d.setVar("SPLASH_INSTALL", " ".join(pkgs)) d.setVar("SPLASH_LOCALPATHS", " ".join(localpaths)) for p in pkgs: @@ -54,12 +54,12 @@ python __anonymous() { for p in pkgs: ep = '%s%s' % (mlprefix, p) epsplash = '%s%s' % (mlprefix, 'psplash') - d.setVar("FILES_%s" % ep, "${bindir}/%s" % p) - d.setVar("ALTERNATIVE_%s" % ep, 'psplash') + d.setVar("FILES:%s" % ep, "${bindir}/%s" % p) + d.setVar("ALTERNATIVE:%s" % ep, 'psplash') d.setVarFlag("ALTERNATIVE_TARGET_%s" % ep, 'psplash', '${bindir}/%s' % p) - d.appendVar("RDEPENDS_%s" % ep, " %s" % pn) + d.appendVar("RDEPENDS:%s" % ep, " %s" % pn) if p == "psplash-default": - d.appendVar("RRECOMMENDS_%s" % pn, " %s" % ep) + d.appendVar("RRECOMMENDS:%s" % pn, " %s" % ep) } S = "${WORKDIR}/git" @@ -98,7 +98,7 @@ python do_compile () { shutil.copyfile("psplash", outputfile) } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh @@ -122,9 +122,9 @@ do_install_append() { } SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" -SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start.service psplash-systemd.service', '', d)}" +SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start.service psplash-systemd.service', '', d)}" INITSCRIPT_NAME = "psplash.sh" INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." -FILES_${PN} += "/mnt" +FILES:${PN} += "/mnt" diff --git a/poky/meta/recipes-core/readline/readline.inc b/poky/meta/recipes-core/readline/readline.inc index 039ffdee0..7f7f5ad2e 100644 --- a/poky/meta/recipes-core/readline/readline.inc +++ b/poky/meta/recipes-core/readline/readline.inc @@ -21,13 +21,13 @@ EXTRA_AUTORECONF += "--exclude=autoheader" LEAD_SONAME = "libreadline.so" -do_configure_prepend () { +do_configure:prepend () { if [ ! -e ${S}/acinclude.m4 ]; then cat ${S}/aclocal.m4 > ${S}/acinclude.m4 fi } -do_install_append () { +do_install:append () { # Make install doesn't properly install these oe_libinstall -so -C shlib libhistory ${D}${libdir} oe_libinstall -so -C shlib libreadline ${D}${libdir} @@ -42,15 +42,15 @@ do_install_append () { BBCLASSEXTEND = "native nativesdk" -CONFFILES_${PN} += "${sysconfdir}/inputrc" +CONFFILES:${PN} += "${sysconfdir}/inputrc" inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN}-doc = "history.3" +ALTERNATIVE:${PN}-doc = "history.3" ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs # see their spec file for where this is injected. Extra versioning is harmless so we just do the same. -SRC_URI_append_class-native = " file://rl-native.map" -LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" +SRC_URI:append:class-native = " file://rl-native.map" +LDFLAGS:append:class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" diff --git a/poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb index 34bf431f4..72f8069e6 100644 --- a/poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb +++ b/poky/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb @@ -3,8 +3,8 @@ DESCRIPTION = "Tools for working with the sysfs virtual filesystem. The tool 's HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html" LICENSE = "GPLv2 & LGPLv2.1" -LICENSE_${PN} = "GPLv2" -LICENSE_libsysfs = "LGPLv2.1" +LICENSE:${PN} = "GPLv2" +LICENSE:libsysfs = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=3d06403ea54c7574a9e581c6478cc393 \ file://cmd/GPL;md5=d41d4e2e1e108554e0388ea4aecd8d27 \ file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e" @@ -26,6 +26,6 @@ S = "${WORKDIR}/sysfsutils-${PV}" inherit autotools PACKAGES =+ "libsysfs" -FILES_libsysfs = "${libdir}/lib*${SOLIBS}" +FILES:libsysfs = "${libdir}/lib*${SOLIBS}" export libdir = "${base_libdir}" diff --git a/poky/meta/recipes-core/systemd/systemd-boot_248.3.bb b/poky/meta/recipes-core/systemd/systemd-boot_249.3.bb index 249e620f4..b3d4e31e0 100644 --- a/poky/meta/recipes-core/systemd/systemd-boot_248.3.bb +++ b/poky/meta/recipes-core/systemd/systemd-boot_249.3.bb @@ -3,15 +3,15 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:" require conf/image-uefi.conf -DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native" +DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native python3-jinja2-native" inherit meson pkgconfig gettext inherit deploy -LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " +LDFLAGS:prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " do_write_config[vardeps] += "CC OBJCOPY" -do_write_config_append() { +do_write_config:append() { cat >${WORKDIR}/meson-${PN}.cross <<EOF [binaries] efi_cc = ${@meson_array('CC', d)} @@ -19,11 +19,14 @@ objcopy = ${@meson_array('OBJCOPY', d)} EOF } +# need to use ${HOST_PREFIX} here, otherwise ld.bfd could be used from HOSTTOOLS_NONFATAL +EFI_LD = "${HOST_PREFIX}ld.bfd" + EXTRA_OEMESON += "-Defi=true \ -Dgnu-efi=true \ -Defi-includedir=${STAGING_INCDIR}/efi \ -Defi-libdir=${STAGING_LIBDIR} \ - -Defi-ld=${@ d.getVar('LD').split()[0]} \ + -Defi-ld=${EFI_LD} \ -Dman=false \ --cross-file ${WORKDIR}/meson-${PN}.cross \ " @@ -41,15 +44,15 @@ python __anonymous () { d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix) } -FILES_${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}" +FILES:${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}" -RDEPENDS_${PN} += "virtual/systemd-bootconf" +RDEPENDS:${PN} += "virtual-systemd-bootconf" # Imported from the old gummiboot recipe -TUNE_CCARGS_remove = "-mfpmath=sse" +TUNE_CCARGS:remove = "-mfpmath=sse" COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*)-linux" -COMPATIBLE_HOST_x86-x32 = "null" +COMPATIBLE_HOST:x86-x32 = "null" do_compile() { ninja \ @@ -68,3 +71,4 @@ do_deploy () { } addtask deploy before do_build after do_compile + diff --git a/poky/meta/recipes-core/systemd/systemd-bootconf_1.00.bb b/poky/meta/recipes-core/systemd/systemd-bootconf_1.00.bb index d13b8c518..19637546a 100644 --- a/poky/meta/recipes-core/systemd/systemd-bootconf_1.00.bb +++ b/poky/meta/recipes-core/systemd/systemd-bootconf_1.00.bb @@ -2,7 +2,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SUMMARY = "Basic systemd-boot configuration files" -RPROVIDES_${PN} += "virtual/systemd-bootconf" +RPROVIDES:${PN} += "virtual-systemd-bootconf" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit systemd-boot-cfg @@ -12,7 +12,7 @@ S = "${WORKDIR}" LABELS = "boot" ROOT ?= "root=/dev/sda2" -APPEND_append = " ${ROOT}" +APPEND:append = " ${ROOT}" python do_configure() { bb.build.exec_func('build_efi_cfg', d) @@ -29,4 +29,4 @@ do_install() { install *.conf ${D}/boot/loader/entries/ } -FILES_${PN} = "/boot/loader/* /boot/loader/entries/*" +FILES:${PN} = "/boot/loader/* /boot/loader/entries/*" diff --git a/poky/meta/recipes-core/systemd/systemd-compat-units.bb b/poky/meta/recipes-core/systemd/systemd-compat-units.bb index 361dc1cbb..f7505f1eb 100644 --- a/poky/meta/recipes-core/systemd/systemd-compat-units.bb +++ b/poky/meta/recipes-core/systemd/systemd-compat-units.bb @@ -12,7 +12,7 @@ inherit features_check INHIBIT_DEFAULT_DEPS = "1" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" REQUIRED_DISTRO_FEATURES = "systemd" @@ -25,7 +25,7 @@ SYSTEMD_DISABLED_SYSV_SERVICES = " \ syslog.busybox \ " -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { cd $D${sysconfdir}/init.d || exit 0 @@ -46,4 +46,4 @@ pkg_postinst_${PN} () { echo } -RDEPENDS_${PN} = "systemd" +RDEPENDS:${PN} = "systemd" diff --git a/poky/meta/recipes-core/systemd/systemd-conf_1.0.bb b/poky/meta/recipes-core/systemd/systemd-conf_1.0.bb index 235923be8..61ce7939d 100644 --- a/poky/meta/recipes-core/systemd/systemd-conf_1.0.bb +++ b/poky/meta/recipes-core/systemd/systemd-conf_1.0.bb @@ -29,13 +29,13 @@ do_install() { } # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 -do_install_append_qemuall() { +do_install:append:qemuall() { install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf } PACKAGE_ARCH = "${MACHINE_ARCH}" -FILES_${PN} = "\ +FILES:${PN} = "\ ${systemd_unitdir}/journald.conf.d/ \ ${systemd_unitdir}/logind.conf.d/ \ ${systemd_unitdir}/system.conf.d/ \ diff --git a/poky/meta/recipes-core/systemd/systemd-machine-units_1.0.bb b/poky/meta/recipes-core/systemd/systemd-machine-units_1.0.bb index 02756f43d..12f27d6ae 100644 --- a/poky/meta/recipes-core/systemd/systemd-machine-units_1.0.bb +++ b/poky/meta/recipes-core/systemd/systemd-machine-units_1.0.bb @@ -8,6 +8,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" PR = "r19" inherit systemd -SYSTEMD_SERVICE_${PN} = "" +SYSTEMD_SERVICE:${PN} = "" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/poky/meta/recipes-core/systemd/systemd-serialgetty.bb b/poky/meta/recipes-core/systemd/systemd-serialgetty.bb index 34defeb3b..92d35ebcf 100644 --- a/poky/meta/recipes-core/systemd/systemd-serialgetty.bb +++ b/poky/meta/recipes-core/systemd/systemd-serialgetty.bb @@ -46,7 +46,7 @@ do_install() { } # This is a machine specific file -FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}" +FILES:${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}" PACKAGE_ARCH = "${MACHINE_ARCH}" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/poky/meta/recipes-core/systemd/systemd.inc b/poky/meta/recipes-core/systemd/systemd.inc index 0524a2500..05341724f 100644 --- a/poky/meta/recipes-core/systemd/systemd.inc +++ b/poky/meta/recipes-core/systemd/systemd.inc @@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "37c4cfde0ce613f0f00544d3f4e2e72bf93d9c76" -SRCBRANCH = "v248-stable" +SRCREV = "090378dcb1de5ca66900503210e85d63075fa70a" +SRCBRANCH = "v249-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH} \ " diff --git a/poky/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/poky/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 8dd22eeb7..d3af734e0 100644 --- a/poky/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/poky/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch @@ -1,4 +1,4 @@ -From 564830719be2017c4953589d50f21a9e856a4ecc Mon Sep 17 00:00:00 2001 +From 08cd165f5db0e68a499b80c4b1744a4206948259 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Thu, 21 Feb 2019 16:23:24 +0800 Subject: [PATCH] binfmt: Don't install dependency links at install time for @@ -25,11 +25,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> units/systemd-binfmt.service.in | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) -Index: systemd-stable/units/meson.build -=================================================================== ---- systemd-stable.orig/units/meson.build -+++ systemd-stable/units/meson.build -@@ -55,8 +55,7 @@ units = [ +diff --git a/units/meson.build b/units/meson.build +index 17e9ead9c1..e5502be620 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -59,8 +59,7 @@ units = [ ['poweroff.target', '', (with_runlevels ? 'runlevel0.target' : '')], ['printer.target', ''], @@ -39,9 +39,9 @@ Index: systemd-stable/units/meson.build ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], ['reboot.target', '', 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], -@@ -166,8 +165,7 @@ in_units = [ - ['rc-local.service', 'HAVE_SYSV_COMPAT'], +@@ -178,8 +177,7 @@ in_units = [ ['rescue.service', ''], + ['serial-getty@.service', ''], ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], - ['systemd-binfmt.service', 'ENABLE_BINFMT', - 'sysinit.target.wants/'], @@ -49,21 +49,21 @@ Index: systemd-stable/units/meson.build ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-coredump@.service', 'ENABLE_COREDUMP'], -Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount -=================================================================== ---- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount -+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount -@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ +diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount +index 172c8757ab..f65d8930c6 100644 +--- a/units/proc-sys-fs-binfmt_misc.automount ++++ b/units/proc-sys-fs-binfmt_misc.automount +@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount] Where=/proc/sys/fs/binfmt_misc + +[Install] +WantedBy=sysinit.target -Index: systemd-stable/units/systemd-binfmt.service.in -=================================================================== ---- systemd-stable.orig/units/systemd-binfmt.service.in -+++ systemd-stable/units/systemd-binfmt.service.in +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in +index fdafce7ff7..4efc05e495 100644 +--- a/units/systemd-binfmt.service.in ++++ b/units/systemd-binfmt.service.in @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no @@ -73,8 +73,8 @@ Index: systemd-stable/units/systemd-binfmt.service.in After=proc-sys-fs-binfmt_misc.mount Before=sysinit.target shutdown.target @@ -30,3 +31,6 @@ RemainAfterExit=yes - ExecStart=@rootlibexecdir@/systemd-binfmt - ExecStop=@rootlibexecdir@/systemd-binfmt --unregister + ExecStart={{ROOTLIBEXECDIR}}/systemd-binfmt + ExecStop={{ROOTLIBEXECDIR}}/systemd-binfmt --unregister TimeoutSec=90s + +[Install] diff --git a/poky/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch b/poky/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch deleted file mode 100644 index 0ba5fa254..000000000 --- a/poky/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 027ac2ad0695bb506460f9dd7e57149b71055887 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 8 Jun 2021 23:21:01 -0700 -Subject: [PATCH] test-seccomp: Check for __NR_ppoll before use - -some newer architectures like riscv32 do not have __NR_ppoll from get go - -Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/19858] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/test/test-seccomp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c -index b1f917eb54..daac0fcea8 100644 ---- a/src/test/test-seccomp.c -+++ b/src/test/test-seccomp.c -@@ -832,7 +832,7 @@ static void test_load_syscall_filter_set_raw(void) { - assert_se(s = hashmap_new(NULL)); - #if defined __NR_poll && __NR_poll >= 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0); --#else -+#elif defined __NR_ppoll - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); - #endif - -@@ -849,7 +849,8 @@ static void test_load_syscall_filter_set_raw(void) { - assert_se(s = hashmap_new(NULL)); - #if defined __NR_poll && __NR_poll >= 0 - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0); --#else -+#elif defined __NR_ppoll -+ assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); - assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0); - #endif - --- -2.32.0 - diff --git a/poky/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/poky/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch index 4cdf66e76..15fa0c454 100644 --- a/poky/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +++ b/poky/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch @@ -1,4 +1,4 @@ -From 159c53612444ec1df492bae528a5a88a275b93bf Mon Sep 17 00:00:00 2001 +From 40acdb90031cfeb7140cee5205bce24f8c91d857 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 13:41:41 +0800 Subject: [PATCH] don't use glibc-specific qsort_r @@ -14,9 +14,9 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> --- - src/basic/sort-util.h | 14 ------------ - src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++----- - src/shared/format-table.c | 36 ++++++++++++++++++++---------- + src/basic/sort-util.h | 14 -------------- + src/shared/format-table.c | 36 ++++++++++++++++++++++++------------ + src/shared/hwdb-util.c | 19 ++++++++++++++----- 3 files changed, 38 insertions(+), 31 deletions(-) diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h @@ -42,55 +42,11 @@ index 49586a4a24..d92a5ab0ed 100644 - }) - int cmp_int(const int *a, const int *b); -diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c -index fd45ff0f54..ac4b63c49b 100644 ---- a/src/libsystemd/sd-hwdb/hwdb-util.c -+++ b/src/libsystemd/sd-hwdb/hwdb-util.c -@@ -126,9 +126,13 @@ static struct trie* trie_free(struct trie *trie) { - - DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); - --static int trie_values_cmp(const struct trie_value_entry *a, const struct trie_value_entry *b, struct trie *trie) { -- return strcmp(trie->strings->buf + a->key_off, -- trie->strings->buf + b->key_off); -+static struct trie *trie_node_add_value_trie; -+static int trie_values_cmp(const void *v1, const void *v2) { -+ const struct trie_value_entry *a = v1; -+ const struct trie_value_entry *b = v2; -+ -+ return strcmp(trie_node_add_value_trie->strings->buf + a->key_off, -+ trie_node_add_value_trie->strings->buf + b->key_off); - } - - static int trie_node_add_value(struct trie *trie, struct trie_node *node, -@@ -156,7 +160,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, - .value_off = v, - }; - -- val = typesafe_bsearch_r(&search, node->values, node->values_count, trie_values_cmp, trie); -+ trie_node_add_value_trie = trie; -+ val = bsearch(&search, node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); -+ trie_node_add_value_trie = NULL; -+ - if (val) { - /* At this point we have 2 identical properties on the same match-string. - * Since we process files in order, we just replace the previous value. */ -@@ -182,7 +189,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, - .line_number = line_number, - }; - node->values_count++; -- typesafe_qsort_r(node->values, node->values_count, trie_values_cmp, trie); -+ trie_node_add_value_trie = trie; -+ qsort(node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); -+ trie_node_add_value_trie = NULL; - return 0; - } - diff --git a/src/shared/format-table.c b/src/shared/format-table.c -index dccb796b26..c3ab8ac296 100644 +index 4c4e4593d8..17b329f315 100644 --- a/src/shared/format-table.c +++ b/src/shared/format-table.c -@@ -1290,30 +1290,32 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t +@@ -1282,30 +1282,32 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t return CMP(index_a, index_b); } @@ -133,7 +89,7 @@ index dccb796b26..c3ab8ac296 100644 } /* Order identical lines by the order there were originally added in */ -@@ -1952,7 +1954,12 @@ int table_print(Table *t, FILE *f) { +@@ -1944,7 +1946,12 @@ int table_print(Table *t, FILE *f) { for (size_t i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; @@ -147,7 +103,7 @@ index dccb796b26..c3ab8ac296 100644 } if (t->display_map) -@@ -2580,7 +2587,12 @@ int table_to_json(Table *t, JsonVariant **ret) { +@@ -2572,7 +2579,12 @@ int table_to_json(Table *t, JsonVariant **ret) { for (size_t i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; @@ -161,3 +117,47 @@ index dccb796b26..c3ab8ac296 100644 } if (t->display_map) +diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c +index d7626aed95..2003fac7c3 100644 +--- a/src/shared/hwdb-util.c ++++ b/src/shared/hwdb-util.c +@@ -127,9 +127,13 @@ static struct trie* trie_free(struct trie *trie) { + + DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); + +-static int trie_values_cmp(const struct trie_value_entry *a, const struct trie_value_entry *b, struct trie *trie) { +- return strcmp(trie->strings->buf + a->key_off, +- trie->strings->buf + b->key_off); ++static struct trie *trie_node_add_value_trie; ++static int trie_values_cmp(const void *v1, const void *v2) { ++ const struct trie_value_entry *a = v1; ++ const struct trie_value_entry *b = v2; ++ ++ return strcmp(trie_node_add_value_trie->strings->buf + a->key_off, ++ trie_node_add_value_trie->strings->buf + b->key_off); + } + + static int trie_node_add_value(struct trie *trie, struct trie_node *node, +@@ -157,7 +161,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, + .value_off = v, + }; + +- val = typesafe_bsearch_r(&search, node->values, node->values_count, trie_values_cmp, trie); ++ trie_node_add_value_trie = trie; ++ val = bsearch(&search, node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); ++ trie_node_add_value_trie = NULL; ++ + if (val) { + /* At this point we have 2 identical properties on the same match-string. + * Since we process files in order, we just replace the previous value. */ +@@ -183,7 +190,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, + .line_number = line_number, + }; + node->values_count++; +- typesafe_qsort_r(node->values, node->values_count, trie_values_cmp, trie); ++ trie_node_add_value_trie = trie; ++ qsort(node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); ++ trie_node_add_value_trie = NULL; + return 0; + } + diff --git a/poky/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/poky/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch index 9b1768d9c..d0110a238 100644 --- a/poky/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch +++ b/poky/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch @@ -1,4 +1,4 @@ -From 4afb8adc83348bf75964fc10af7902e04dd62637 Mon Sep 17 00:00:00 2001 +From 2a2f95b6dc16d2ea7a8e9349c6b19cc50c34777b Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 13:55:12 +0800 Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t @@ -63,7 +63,7 @@ index 8a7f82812a..a56f12f47f 100644 #if HAVE_KMOD #include "module-util.h" diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c -index aea3241d18..75e6c56a28 100644 +index ce8d47ccc3..00845f9776 100644 --- a/src/libsystemd/sd-journal/catalog.c +++ b/src/libsystemd/sd-journal/catalog.c @@ -28,6 +28,7 @@ diff --git a/poky/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/poky/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch index dc40a2fe8..1d61367da 100644 --- a/poky/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch +++ b/poky/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch @@ -1,7 +1,7 @@ -From 6c18e5f9373da3e3b38f2c5727e2aefe07fcbbd9 Mon Sep 17 00:00:00 2001 +From b19f800e178516d4f4d344457647e4a018bd6855 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Sat, 22 May 2021 20:26:24 +0200 -Subject: [PATCH] [PATCH] add fallback parse_printf_format implementation +Subject: [PATCH] add fallback parse_printf_format implementation Upstream-Status: Inappropriate [musl specific] @@ -10,6 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com> [rebased for systemd 243] Signed-off-by: Scott Murray <scott.murray@konsulko.com> + --- meson.build | 1 + src/basic/meson.build | 5 + @@ -22,10 +23,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> create mode 100644 src/basic/parse-printf-format.h diff --git a/meson.build b/meson.build -index 27186d63a3..2abb7b3188 100644 +index 738879eb21..1aa20b8246 100644 --- a/meson.build +++ b/meson.build -@@ -675,6 +675,7 @@ endif +@@ -656,6 +656,7 @@ endif foreach header : ['crypt.h', 'linux/memfd.h', 'linux/vm_sockets.h', @@ -34,10 +35,10 @@ index 27186d63a3..2abb7b3188 100644 'valgrind/memcheck.h', 'valgrind/valgrind.h', diff --git a/src/basic/meson.build b/src/basic/meson.build -index 60ef801a25..aba2172edd 100644 +index 9b016ce5e8..a9ce21b02e 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build -@@ -341,6 +341,11 @@ endforeach +@@ -322,6 +322,11 @@ endforeach basic_sources += generated_gperf_headers @@ -430,6 +431,3 @@ index fd3fd7ef9c..e8e6ad555b 100644 #define SNDBUF_SIZE (8*1024*1024) --- -2.24.0 - diff --git a/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index 814c28f5b..0462d52d5 100644 --- a/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/poky/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch @@ -1,4 +1,4 @@ -From 6b0732ac7164914ce16e231e35980b849bdfc4c8 Mon Sep 17 00:00:00 2001 +From db6551741a3654d8e75aff93ea00fbff579f7b02 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 14:18:21 +0800 Subject: [PATCH] src/basic/missing.h: check for missing strndupa @@ -29,9 +29,9 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> src/basic/mountpoint-util.c | 1 + src/basic/parse-util.c | 1 + src/basic/path-lookup.c | 1 + + src/basic/percent-util.c | 1 + src/basic/proc-cmdline.c | 1 + src/basic/procfs-util.c | 1 + - src/basic/selinux-util.c | 1 + src/basic/time-util.c | 1 + src/boot/bless-boot.c | 1 + src/core/dbus-cgroup.c | 1 + @@ -72,16 +72,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> src/udev/udev-rules.c | 1 + 51 files changed, 62 insertions(+) +diff --git a/meson.build b/meson.build +index 1aa20b8246..aafee71eb4 100644 --- a/meson.build +++ b/meson.build -@@ -550,6 +550,7 @@ foreach ident : [ - ['execveat', '''#include <unistd.h>'''], - ['close_range', '''#include <unistd.h>'''], - ['epoll_pwait2', '''#include <sys/epoll.h>'''], -+ ['strndupa' , '''#include <string.h>'''], - ] +@@ -480,6 +480,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] + endforeach - have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') + foreach ident : [ ++ ['strndupa' , '''#include <string.h>'''], + ['memfd_create', '''#include <sys/mman.h>'''], + ['gettid', '''#include <sys/types.h> + #include <unistd.h>'''], +diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c +index 7c0970a60c..c129ff0f4f 100644 --- a/src/backlight/backlight.c +++ b/src/backlight/backlight.c @@ -19,6 +19,7 @@ @@ -92,6 +96,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static int help(void) { _cleanup_free_ char *link = NULL; +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index 1ff6160dc8..c9efd862a2 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -38,6 +38,7 @@ @@ -102,6 +108,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { _cleanup_free_ char *fs = NULL; +diff --git a/src/basic/env-util.c b/src/basic/env-util.c +index 81b1e3f10e..8fedcfd1cd 100644 --- a/src/basic/env-util.c +++ b/src/basic/env-util.c @@ -18,6 +18,7 @@ @@ -112,6 +120,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> /* We follow bash for the character set. Different shells have different rules. */ #define VALID_BASH_ENV_NAME_CHARS \ +diff --git a/src/basic/log.c b/src/basic/log.c +index fb183ea9e7..82e7bdff60 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -36,6 +36,7 @@ @@ -122,6 +132,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #define SNDBUF_SIZE (8*1024*1024) +diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h +index 8c76f93eb2..9068bfb4f0 100644 --- a/src/basic/missing_stdlib.h +++ b/src/basic/missing_stdlib.h @@ -11,3 +11,15 @@ @@ -140,6 +152,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> + (char *)memcpy(__new, __old, __len); \ + }) +#endif +diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c +index f91f8f7a08..fb31596216 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c @@ -14,6 +14,7 @@ @@ -150,9 +164,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> int mkdir_safe_internal( const char *path, +diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c +index 8c836a1b74..2eb7e5a634 100644 --- a/src/basic/mountpoint-util.c +++ b/src/basic/mountpoint-util.c -@@ -12,6 +12,7 @@ +@@ -11,6 +11,7 @@ #include "missing_stat.h" #include "missing_syscall.h" #include "mkdir.h" @@ -160,6 +176,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #include "mountpoint-util.h" #include "parse-util.h" #include "path-util.h" +diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c +index b79c885dfd..6dabda5691 100644 --- a/src/basic/parse-util.c +++ b/src/basic/parse-util.c @@ -19,6 +19,7 @@ @@ -170,6 +188,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> int parse_boolean(const char *v) { if (!v) +diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c +index 05eb17d66c..b6026aab28 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c @@ -15,6 +15,7 @@ @@ -180,6 +200,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> int xdg_user_runtime_dir(char **ret, const char *suffix) { const char *e; +diff --git a/src/basic/percent-util.c b/src/basic/percent-util.c +index 06f20fd61e..8159d721bb 100644 +--- a/src/basic/percent-util.c ++++ b/src/basic/percent-util.c +@@ -3,6 +3,7 @@ + #include "percent-util.h" + #include "string-util.h" + #include "parse-util.h" ++#include "missing_stdlib.h" + + static int parse_parts_value_whole(const char *p, const char *symbol) { + const char *pc, *n; +diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c +index 410b8a3eb5..f2c4355609 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -15,6 +15,7 @@ @@ -190,6 +224,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> int proc_cmdline(char **ret) { const char *e; +diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c +index 9234ccaf85..8c57094225 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c @@ -11,6 +11,7 @@ @@ -200,19 +236,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> int procfs_tasks_get_limit(uint64_t *ret) { _cleanup_free_ char *value = NULL; ---- a/src/basic/selinux-util.c -+++ b/src/basic/selinux-util.c -@@ -27,6 +27,7 @@ - #include "selinux-util.h" - #include "stdio-util.h" - #include "time-util.h" -+#include "missing_stdlib.h" - - #if HAVE_SELINUX - DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(context_t, context_free, NULL); +diff --git a/src/basic/time-util.c b/src/basic/time-util.c +index 5d162e8ffe..1cde8e4262 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -27,6 +27,7 @@ +@@ -26,6 +26,7 @@ #include "string-util.h" #include "strv.h" #include "time-util.h" @@ -220,6 +248,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static clockid_t map_clock_id(clockid_t c) { +diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c +index 3fc319ca27..90064c90f3 100644 --- a/src/boot/bless-boot.c +++ b/src/boot/bless-boot.c @@ -18,6 +18,7 @@ @@ -230,19 +260,23 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static char **arg_path = NULL; +diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c +index 84c3caf3a5..0fa84eaa38 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c -@@ -17,6 +17,7 @@ - #include "limits-util.h" +@@ -20,6 +20,7 @@ + #include "parse-util.h" #include "path-util.h" #include "percent-util.h" +#include "missing_stdlib.h" BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); +diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c +index 50daef6702..1cc6d91e64 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c -@@ -41,6 +41,7 @@ +@@ -42,6 +42,7 @@ #include "unit-printf.h" #include "user-util.h" #include "utf8.h" @@ -250,6 +284,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); +diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c +index ca9b399d8c..b864480a8c 100644 --- a/src/core/dbus-util.c +++ b/src/core/dbus-util.c @@ -9,6 +9,7 @@ @@ -260,9 +296,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> int bus_property_get_triggered_unit( sd_bus *bus, +diff --git a/src/core/execute.c b/src/core/execute.c +index 2a337b55a2..2a64675c5f 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -96,6 +96,7 @@ +@@ -98,6 +98,7 @@ #include "unit-serialize.h" #include "user-util.h" #include "utmp-wtmp.h" @@ -270,6 +308,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) +diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c +index a56f12f47f..6b8729ef67 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -11,6 +11,7 @@ @@ -280,6 +320,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #if HAVE_KMOD #include "module-util.h" +diff --git a/src/core/service.c b/src/core/service.c +index cb0a528f0d..740d305710 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -41,6 +41,7 @@ @@ -290,6 +332,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, +diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c +index 95c3fca661..d4a9f27b08 100644 --- a/src/coredump/coredump-vacuum.c +++ b/src/coredump/coredump-vacuum.c @@ -16,6 +16,7 @@ @@ -300,6 +344,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ +diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c +index ae1d43756a..24de98c9f3 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -24,6 +24,7 @@ @@ -310,6 +356,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" +diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c +index c8fb726d42..858a425d12 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -72,6 +72,7 @@ @@ -320,6 +368,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ +diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c +index 20f7396c74..3471311ef5 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -20,6 +20,7 @@ @@ -330,6 +380,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); +diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c +index bfd42aea7d..daefc56e3e 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -12,6 +12,7 @@ @@ -340,9 +392,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static int node_vtable_get_userdata( sd_bus *bus, +diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c +index 378774fe8b..2694c177d5 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c -@@ -28,6 +28,7 @@ +@@ -27,6 +27,7 @@ #include "string-util.h" #include "user-util.h" #include "utf8.h" @@ -350,9 +404,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #define SNDBUF_SIZE (8*1024*1024) +diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c +index a32e2f5e20..97fd3aec82 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c -@@ -41,6 +41,7 @@ +@@ -42,6 +42,7 @@ #include "string-util.h" #include "strv.h" #include "user-util.h" @@ -360,6 +416,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #define log_debug_bus_message(m) \ do { \ +diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c +index 13c08fe295..9aae83486e 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -14,6 +14,7 @@ @@ -370,6 +428,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #define MAX_SIZE (2*1024*1024) +diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c +index 5728c537bc..94885b0bf6 100644 --- a/src/libsystemd/sd-journal/sd-journal.c +++ b/src/libsystemd/sd-journal/sd-journal.c @@ -40,6 +40,7 @@ @@ -380,6 +440,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #define JOURNAL_FILES_MAX 7168 +diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c +index d2f0566dbc..3b7746557e 100644 --- a/src/locale/keymap-util.c +++ b/src/locale/keymap-util.c @@ -24,6 +24,7 @@ @@ -390,6 +452,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static bool startswith_comma(const char *s, const char *prefix) { s = startswith(s, prefix); +diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c +index f8bd17eefe..9633fbc152 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -31,6 +31,7 @@ @@ -400,6 +464,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #include "pam-util.h" #include "parse-util.h" #include "path-util.h" +diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c +index 60e074e99b..a728e3b7a1 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -13,6 +13,7 @@ @@ -410,9 +476,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> /* # .network +diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c +index 3847fe4ec4..3696b57baa 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c -@@ -16,6 +16,7 @@ +@@ -17,6 +17,7 @@ #include "strv.h" #include "user-util.h" #include "util.h" @@ -420,6 +488,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> Settings *settings_new(void) { Settings *s; +diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c +index 44715bb3e5..bc1e688b5e 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/nss-mymachines/nss-mymachines.c @@ -21,6 +21,7 @@ @@ -430,9 +500,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static void setup_logging(void) { /* We need a dummy function because log_parse_environment is a macro. */ +diff --git a/src/portable/portable.c b/src/portable/portable.c +index 4cf5fb4f0a..577dc5c8d7 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c -@@ -32,6 +32,7 @@ +@@ -34,6 +34,7 @@ #include "strv.h" #include "tmpfile-util.h" #include "user-util.h" @@ -440,6 +512,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); +diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c +index 7d13ed3905..ddc37115b8 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c @@ -41,6 +41,7 @@ @@ -450,6 +524,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static int arg_family = AF_UNSPEC; static int arg_ifindex = 0; +diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c +index feb6d3807f..eb11d29e50 100644 --- a/src/shared/bus-get-properties.c +++ b/src/shared/bus-get-properties.c @@ -4,6 +4,7 @@ @@ -460,6 +536,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> int bus_property_get_bool( sd_bus *bus, +diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c +index 6f4a71138c..4a46de2c1b 100644 --- a/src/shared/bus-unit-procs.c +++ b/src/shared/bus-unit-procs.c @@ -10,6 +10,7 @@ @@ -470,9 +548,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> struct CGroupInfo { char *cgroup_path; +diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c +index d3a5b25d18..003594e2d7 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c -@@ -45,6 +45,7 @@ +@@ -47,6 +47,7 @@ #include "unit-def.h" #include "user-util.h" #include "utf8.h" @@ -480,6 +560,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { assert(message); +diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c +index 64ca67993c..31e3d148ea 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -21,6 +21,7 @@ @@ -490,6 +572,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { sd_event *e = userdata; +diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c +index 787bb8fec9..009589a16f 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c @@ -17,6 +17,7 @@ @@ -500,9 +584,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { const char *n; +diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c +index 9e11dc09c1..f9954c1520 100644 --- a/src/shared/journal-importer.c +++ b/src/shared/journal-importer.c -@@ -14,6 +14,7 @@ +@@ -15,6 +15,7 @@ #include "parse-util.h" #include "string-util.h" #include "unaligned.h" @@ -510,6 +596,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> enum { IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ +diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c +index e63c59bd94..dd9773c009 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -41,6 +41,7 @@ @@ -520,6 +608,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ #define PRINT_LINE_THRESHOLD 3 +diff --git a/src/shared/pager.c b/src/shared/pager.c +index 4bbad7e37b..eefcdd068c 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c @@ -26,6 +26,7 @@ @@ -530,6 +620,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static pid_t pager_pid = 0; +diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c +index 5d5bf7f21d..f1002ffa6c 100644 --- a/src/shared/uid-range.c +++ b/src/shared/uid-range.c @@ -9,6 +9,7 @@ @@ -540,6 +632,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { assert(range); +diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c +index 6e3ee0d76b..7727e33d95 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -26,6 +26,7 @@ @@ -550,6 +644,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> #define BUFFER_SIZE (256 * 1024) +diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c +index c9d318b8d1..fcb8d40805 100644 --- a/src/test/test-hexdecoct.c +++ b/src/test/test-hexdecoct.c @@ -6,6 +6,7 @@ @@ -560,6 +656,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> static void test_hexchar(void) { assert_se(hexchar(0xa) == 'a'); +diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c +index 65c40de4c8..4ef9a0c6c8 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -22,6 +22,7 @@ @@ -570,9 +668,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> _printf_(2,3) static void path_prepend(char **path, const char *fmt, ...) { +diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c +index b28089be71..a7e2232299 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c -@@ -33,6 +33,7 @@ +@@ -34,6 +34,7 @@ #include "udev-util.h" #include "udev-watch.h" #include "user-util.h" @@ -580,23 +680,15 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> typedef struct Spawn { sd_device *device; +diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c +index bf997fc0ed..e3f5f1f2e2 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c -@@ -31,6 +31,7 @@ - #include "udev-rules.h" +@@ -33,6 +33,7 @@ + #include "udev-util.h" #include "user-util.h" #include "virt.h" +#include "missing_stdlib.h" #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") ---- a/src/basic/percent-util.c -+++ b/src/basic/percent-util.c -@@ -3,6 +3,7 @@ - #include "percent-util.h" - #include "string-util.h" - #include "parse-util.h" -+#include "missing_stdlib.h" - - static int parse_parts_value_whole(const char *p, const char *symbol) { - const char *pc, *n; diff --git a/poky/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/poky/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch index 54d714266..855607e6a 100644 --- a/poky/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch +++ b/poky/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch @@ -1,4 +1,4 @@ -From 2069f0b0d5ab8f869aeba635a347e0b11d362b30 Mon Sep 17 00:00:00 2001 +From d7ae3aadc70555932e03349907f8be04d03a50ee Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 26 Oct 2017 22:10:42 -0700 Subject: [PATCH] Include netinet/if_ether.h @@ -33,31 +33,77 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> --- - src/libsystemd-network/sd-dhcp6-client.c | 1 - - src/libsystemd/sd-netlink/netlink-types.c | 1 + - src/machine/machine-dbus.c | 1 + - src/network/netdev/bond.c | 1 + - src/network/netdev/bridge.c | 1 + - src/network/netdev/macsec.c | 1 + - src/network/netdev/netdev-gperf.gperf | 1 + - src/network/netdev/netdev.c | 1 + - src/network/networkd-brvlan.c | 1 + - src/network/networkd-dhcp-common.c | 4 +++- - src/network/networkd-dhcp-server.c | 4 ++-- - src/network/networkd-dhcp4.c | 2 +- - src/network/networkd-dhcp6.c | 2 +- - src/network/networkd-link.c | 2 +- - src/network/networkd-network.c | 1 + - src/network/networkd-route.c | 5 ++++- - src/network/test-network-tables.c | 1 + - src/shared/ethtool-util.c | 1 + - src/shared/ethtool-util.h | 1 + - src/udev/net/link-config.c | 1 + - src/udev/udev-builtin-net_setup_link.c | 1 + - 21 files changed, 26 insertions(+), 8 deletions(-) + src/basic/linux/in6.h | 14 +++++++------- + src/libsystemd-network/sd-dhcp6-client.c | 1 - + src/libsystemd/sd-netlink/netlink-types.c | 1 + + src/machine/machine-dbus.c | 1 + + src/network/netdev/bond.c | 1 + + src/network/netdev/bridge.c | 1 + + src/network/netdev/macsec.c | 1 + + src/network/netdev/netdev-gperf.gperf | 1 + + src/network/netdev/netdev.c | 1 + + src/network/networkd-bridge-vlan.c | 1 + + src/network/networkd-dhcp-common.c | 4 +++- + src/network/networkd-dhcp-server.c | 4 ++-- + src/network/networkd-dhcp4.c | 2 +- + src/network/networkd-dhcp6.c | 2 +- + src/network/networkd-link.c | 2 +- + src/network/networkd-network.c | 1 + + src/network/networkd-route.c | 1 + + src/network/networkd-setlink.c | 2 +- + src/network/test-network-tables.c | 1 + + src/shared/ethtool-util.c | 1 + + src/shared/ethtool-util.h | 1 + + src/udev/net/link-config.c | 1 + + src/udev/udev-builtin-net_setup_link.c | 1 + + 23 files changed, 31 insertions(+), 15 deletions(-) +diff --git a/src/basic/linux/in6.h b/src/basic/linux/in6.h +index 5ad396a57e..1dc007fe13 100644 +--- a/src/basic/linux/in6.h ++++ b/src/basic/linux/in6.h +@@ -1,10 +1,10 @@ + /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ + /* +- * Types and definitions for AF_INET6 +- * Linux INET6 implementation ++ * Types and definitions for AF_INET6 ++ * Linux INET6 implementation + * + * Authors: +- * Pedro Roque <roque@di.fc.ul.pt> ++ * Pedro Roque <roque@di.fc.ul.pt> + * + * Sources: + * IPv6 Program Interfaces for BSD Systems +@@ -19,8 +19,8 @@ + * 2 of the License, or (at your option) any later version. + */ + +-#ifndef _UAPI_LINUX_IN6_H +-#define _UAPI_LINUX_IN6_H ++#ifndef _LINUX_IN6_H ++#define _LINUX_IN6_H + + #include <linux/types.h> + #include <linux/libc-compat.h> +@@ -97,7 +97,7 @@ struct in6_flowlabel_req { + + + /* +- * Bitmask constant declarations to help applications select out the ++ * Bitmask constant declarations to help applications select out the + * flow label and priority fields. + * + * Note that this are in host byte order while the flowinfo field of +@@ -298,4 +298,4 @@ struct in6_flowlabel_req { + * ... + * MRT6_MAX + */ +-#endif /* _UAPI_LINUX_IN6_H */ ++#endif /* _LINUX_IN6_H */ diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c -index 410bfda10e..e70ed8be92 100644 +index e8c47f429a..359922c1b3 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -5,7 +5,6 @@ @@ -69,7 +115,7 @@ index 410bfda10e..e70ed8be92 100644 #include "sd-dhcp6-client.h" diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c -index ed7b9a8cd1..112c0b09e4 100644 +index beb926d40b..41de212242 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -3,6 +3,7 @@ @@ -81,7 +127,7 @@ index ed7b9a8cd1..112c0b09e4 100644 #include <linux/netlink.h> #include <linux/rtnetlink.h> diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index e7c4ed3c7c..3a1e4f9072 100644 +index 0022a980c5..fc22e51409 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -3,6 +3,7 @@ @@ -93,7 +139,7 @@ index e7c4ed3c7c..3a1e4f9072 100644 /* When we include libgen.h because we need dirname() we immediately * undefine basename() since libgen.h defines it as a macro to the POSIX diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c -index cf7ca88d6f..34ab468191 100644 +index a7a4adce45..eb111a6c48 100644 --- a/src/network/netdev/bond.c +++ b/src/network/netdev/bond.c @@ -1,5 +1,6 @@ @@ -104,7 +150,7 @@ index cf7ca88d6f..34ab468191 100644 #include "bond.h" #include "bond-util.h" diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c -index 38432f1578..79ccfe578e 100644 +index 99fb9e1c3c..ecc6ca91bf 100644 --- a/src/network/netdev/bridge.c +++ b/src/network/netdev/bridge.c @@ -1,5 +1,6 @@ @@ -126,7 +172,7 @@ index 77c5f8c4e7..04be1b4ab2 100644 #include <linux/if_ether.h> #include <linux/if_macsec.h> diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf -index 8abe044890..3c54c58928 100644 +index 9dd081425e..130e5b3d3c 100644 --- a/src/network/netdev/netdev-gperf.gperf +++ b/src/network/netdev/netdev-gperf.gperf @@ -3,6 +3,7 @@ @@ -138,7 +184,7 @@ index 8abe044890..3c54c58928 100644 #include "bareudp.h" #include "batadv.h" diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c -index b31f0fa81a..c80e1ff537 100644 +index 53534d4873..1cfda9469f 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -1,5 +1,6 @@ @@ -148,10 +194,10 @@ index b31f0fa81a..c80e1ff537 100644 #include <net/if.h> #include <netinet/in.h> #include <unistd.h> -diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c -index 2847b336c9..4d6af8c642 100644 ---- a/src/network/networkd-brvlan.c -+++ b/src/network/networkd-brvlan.c +diff --git a/src/network/networkd-bridge-vlan.c b/src/network/networkd-bridge-vlan.c +index 3153bf6984..687a26b057 100644 +--- a/src/network/networkd-bridge-vlan.c ++++ b/src/network/networkd-bridge-vlan.c @@ -4,6 +4,7 @@ ***/ @@ -161,7 +207,7 @@ index 2847b336c9..4d6af8c642 100644 #include <stdbool.h> diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c -index 00d055cf8d..65821c1d31 100644 +index 249d780887..edd2e9adf8 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -1,7 +1,8 @@ @@ -173,8 +219,8 @@ index 00d055cf8d..65821c1d31 100644 +#include <net/if.h> #include "bus-error.h" - #include "dhcp-internal.h" -@@ -11,6 +12,7 @@ + #include "dhcp-identifier.h" +@@ -13,6 +14,7 @@ #include "networkd-dhcp-common.h" #include "networkd-link.h" #include "networkd-manager.h" @@ -183,7 +229,7 @@ index 00d055cf8d..65821c1d31 100644 #include "parse-util.h" #include "socket-util.h" diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c -index 5cdf432c27..93cffb9863 100644 +index 9e2faa5675..fd8d817569 100644 --- a/src/network/networkd-dhcp-server.c +++ b/src/network/networkd-dhcp-server.c @@ -1,8 +1,8 @@ @@ -198,7 +244,7 @@ index 5cdf432c27..93cffb9863 100644 #include "sd-dhcp-server.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c -index 23dc3a45db..7ae6c2467a 100644 +index f80adcdbcf..3311e2a718 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1,9 +1,9 @@ @@ -213,7 +259,7 @@ index 23dc3a45db..7ae6c2467a 100644 #include "escape.h" #include "alloc-util.h" diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c -index aa077d6219..4f6ce22059 100644 +index 2b72b618fc..d0d4cfb384 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -3,9 +3,9 @@ @@ -228,7 +274,7 @@ index aa077d6219..4f6ce22059 100644 #include "sd-dhcp6-client.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c -index 8219d95b0d..c92230453b 100644 +index 9421ce1aa6..3e37cbcc39 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1,8 +1,8 @@ @@ -239,10 +285,10 @@ index 8219d95b0d..c92230453b 100644 #include <linux/if.h> -#include <linux/if_arp.h> #include <linux/if_link.h> - #include <unistd.h> - + #include <linux/netdevice.h> + #include <sys/socket.h> diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c -index e5ffd35b6f..871ebb32c6 100644 +index 850b4f449e..6f85d41328 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -1,5 +1,6 @@ @@ -253,23 +299,32 @@ index e5ffd35b6f..871ebb32c6 100644 #include <netinet/in.h> #include <linux/netdevice.h> diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c -index a74541a6c9..a10549b336 100644 +index 77a93beca9..3bf9ae8837 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c -@@ -1,7 +1,10 @@ +@@ -1,5 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ ++#include <netinet/in.h> #include <linux/icmpv6.h> --#include <linux/ipv6_route.h> -+/* linux/ipv6_route.h conflicts with netinet/in.h so define manually */ -+#ifndef IP6_RT_PRIO_USER -+#define IP6_RT_PRIO_USER 1024 -+#endif + #include <linux/ipv6_route.h> + #include <linux/nexthop.h> +diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c +index 10c312c480..e44fbb5c35 100644 +--- a/src/network/networkd-setlink.c ++++ b/src/network/networkd-setlink.c +@@ -1,8 +1,8 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ - #include "alloc-util.h" + #include <netinet/in.h> ++#include <net/if_arp.h> + #include <linux/if.h> +-#include <linux/if_arp.h> + + #include "missing_network.h" #include "netlink-util.h" diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c -index ce34449554..0b5dc01182 100644 +index f55e524ae9..83d5c7cef3 100644 --- a/src/network/test-network-tables.c +++ b/src/network/test-network-tables.c @@ -1,5 +1,6 @@ @@ -280,7 +335,7 @@ index ce34449554..0b5dc01182 100644 #include "dhcp6-internal.h" #include "dhcp6-protocol.h" diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c -index 654d36a83a..f4ed42d543 100644 +index f77f6943ca..0e1506e04b 100644 --- a/src/shared/ethtool-util.c +++ b/src/shared/ethtool-util.c @@ -1,5 +1,6 @@ @@ -291,7 +346,7 @@ index 654d36a83a..f4ed42d543 100644 #include <sys/ioctl.h> #include <linux/ethtool.h> diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h -index 11e2906681..a171df0737 100644 +index 7d28766624..e98a25418b 100644 --- a/src/shared/ethtool-util.h +++ b/src/shared/ethtool-util.h @@ -3,6 +3,7 @@ @@ -303,7 +358,7 @@ index 11e2906681..a171df0737 100644 #include "conf-parser.h" diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c -index 31e5d0cd67..f25f821364 100644 +index 8dfe23691b..e269856337 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -1,5 +1,6 @@ @@ -314,7 +369,7 @@ index 31e5d0cd67..f25f821364 100644 #include <netinet/ether.h> #include <unistd.h> diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c -index 87e1fb133e..13876029d0 100644 +index d40251331c..89566c05f5 100644 --- a/src/udev/udev-builtin-net_setup_link.c +++ b/src/udev/udev-builtin-net_setup_link.c @@ -1,5 +1,6 @@ diff --git a/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch index 2ff08c7fa..28846935e 100644 --- a/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +++ b/poky/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch @@ -1,4 +1,4 @@ -From bca73ff2fbff2dc311040a87a4f536f89af07ad6 Mon Sep 17 00:00:00 2001 +From e2d70a1735fc6b9d3c079814831ab0b1b2a9d1e0 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 14:56:21 +0800 Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined @@ -24,7 +24,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> 3 files changed, 38 insertions(+) diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c -index bc0278e57f..c973f82e54 100644 +index e026b29478..815e56ef68 100644 --- a/src/basic/glob-util.c +++ b/src/basic/glob-util.c @@ -12,6 +12,12 @@ @@ -64,7 +64,7 @@ index bc0278e57f..c973f82e54 100644 return -ENOENT; if (k == GLOB_NOSPACE) diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c -index df6444c433..79a692046e 100644 +index 50b4924679..09c0a20aee 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c @@ -12,6 +12,12 @@ @@ -78,9 +78,9 @@ index df6444c433..79a692046e 100644 +#endif + static void test_glob_exists(void) { - char name[] = "/tmp/test-glob_exists.XXXXXX"; - int fd = -1; -@@ -39,11 +45,13 @@ static void test_glob_no_dot(void) { + log_info("/* %s */", __func__); + +@@ -41,11 +47,13 @@ static void test_glob_no_dot(void) { const char *fn; _cleanup_globfree_ glob_t g = { @@ -94,7 +94,7 @@ index df6444c433..79a692046e 100644 }; int r; -@@ -51,11 +59,19 @@ static void test_glob_no_dot(void) { +@@ -55,11 +63,19 @@ static void test_glob_no_dot(void) { assert_se(mkdtemp(template)); fn = strjoina(template, "/*"); @@ -115,7 +115,7 @@ index df6444c433..79a692046e 100644 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 6b73d1e6d5..26b3b74275 100644 +index 7e85c50634..145c48a685 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -66,6 +66,12 @@ @@ -131,7 +131,7 @@ index 6b73d1e6d5..26b3b74275 100644 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates * them in the file system. This is intended to be used to create * properly owned directories beneath /tmp, /var/tmp, /run, which are -@@ -1947,7 +1953,9 @@ finish: +@@ -1990,7 +1996,9 @@ finish: static int glob_item(Item *i, action_t action) { _cleanup_globfree_ glob_t g = { @@ -141,7 +141,7 @@ index 6b73d1e6d5..26b3b74275 100644 }; int r = 0, k; char **fn; -@@ -1967,7 +1975,9 @@ static int glob_item(Item *i, action_t action) { +@@ -2010,7 +2018,9 @@ static int glob_item(Item *i, action_t action) { static int glob_item_recursively(Item *i, fdaction_t action) { _cleanup_globfree_ glob_t g = { diff --git a/poky/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/poky/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch index 142ca0134..1de7ccf15 100644 --- a/poky/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +++ b/poky/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch @@ -1,4 +1,4 @@ -From e0d1912f0246c97e5e7b4177691363d2d077e11d Mon Sep 17 00:00:00 2001 +From 3410d82c9d07aee3e951fc6ae0b41fc1a594e00d Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:00:06 +0800 Subject: [PATCH] add missing FTW_ macros for musl diff --git a/poky/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/poky/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch index 53f0a1ba6..4670c232a 100644 --- a/poky/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch +++ b/poky/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch @@ -1,4 +1,4 @@ -From bb41fe773881a8f1d9615d388320b9c6fc47bfe5 Mon Sep 17 00:00:00 2001 +From 1e3bc870ded807cff0d3771dd89a850d020df032 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:03:47 +0800 Subject: [PATCH] fix missing of __register_atfork for non-glibc builds @@ -12,7 +12,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 1 file changed, 7 insertions(+) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index 7d4301eadb..caa9dfe3a3 100644 +index 14259ea8df..18681838ef 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -18,6 +18,9 @@ @@ -25,7 +25,7 @@ index 7d4301eadb..caa9dfe3a3 100644 #include "alloc-util.h" #include "architecture.h" -@@ -1121,11 +1124,15 @@ void reset_cached_pid(void) { +@@ -1202,11 +1205,15 @@ void reset_cached_pid(void) { cached_pid = CACHED_PID_UNSET; } diff --git a/poky/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch b/poky/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch index 940db4c5c..e6bb37a65 100644 --- a/poky/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch +++ b/poky/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch @@ -1,4 +1,4 @@ -From dc40487e0ac26e3ca317429b9c3e8f01772de60a Mon Sep 17 00:00:00 2001 +From eeacb75025d8f537d54c35256c5730c9aab15cde Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:12:41 +0800 Subject: [PATCH] Use uintmax_t for handling rlim_t @@ -23,9 +23,9 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- src/basic/format-util.h | 8 +------- - src/basic/rlimit-util.c | 10 +++++----- + src/basic/rlimit-util.c | 12 ++++++------ src/core/execute.c | 4 ++-- - 3 files changed, 8 insertions(+), 14 deletions(-) + 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/basic/format-util.h b/src/basic/format-util.h index b7e18768e3..3195ab205d 100644 @@ -47,7 +47,7 @@ index b7e18768e3..3195ab205d 100644 #if SIZEOF_DEV_T == 8 # define DEV_FMT "%" PRIu64 diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c -index 23d108d5df..b037734ee3 100644 +index 23d108d5df..3e6fb438d7 100644 --- a/src/basic/rlimit-util.c +++ b/src/basic/rlimit-util.c @@ -43,7 +43,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) { @@ -87,10 +87,10 @@ index 23d108d5df..b037734ee3 100644 return 1; } diff --git a/src/core/execute.c b/src/core/execute.c -index f82fc294c0..4696d055a8 100644 +index 2a64675c5f..dca1e0e3b6 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -5370,9 +5370,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { +@@ -5391,9 +5391,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { for (unsigned i = 0; i < RLIM_NLIMITS; i++) if (c->rlimit[i]) { fprintf(f, "%sLimit%s: " RLIM_FMT "\n", diff --git a/poky/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/poky/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch index b1d782719..897e332f3 100644 --- a/poky/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +++ b/poky/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch @@ -1,4 +1,4 @@ -From f8be7b283309e4332eedc088774daac637afef7b Mon Sep 17 00:00:00 2001 +From fa29a572faaeb6fb9ed0bc6802d17139773e1908 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Wed, 28 Feb 2018 21:25:22 -0800 Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl diff --git a/poky/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/poky/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index 5f2178734..3bf706fc5 100644 --- a/poky/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/poky/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch @@ -1,4 +1,4 @@ -From 06915b70735caa66987af758ebdc4207757ae758 Mon Sep 17 00:00:00 2001 +From 88c8922f9e4d221402d9cb2e04b9c82e89125827 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <armccurdy@gmail.com> Date: Tue, 10 Oct 2017 14:33:30 -0700 Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() @@ -32,10 +32,10 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h -index 027037f7a7..16eb379caf 100644 +index 7f15b558ca..4263298cad 100644 --- a/src/basic/fs-util.h +++ b/src/basic/fs-util.h -@@ -44,8 +44,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); +@@ -47,8 +47,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); int fd_warn_permissions(const char *path, int fd); int stat_warn_permissions(const char *path, const struct stat *st); @@ -66,19 +66,19 @@ index 027037f7a7..16eb379caf 100644 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); int touch(const char *path); diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 1d05409086..1ed06c31ab 100644 +index 016eb7b82a..b1967f9f2f 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c -@@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -53,7 +53,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { return log_error_errno(errno, "Failed to open root file system: %m"); - for (i = 0; i < ELEMENTSOF(table); i ++) { + for (size_t i = 0; i < ELEMENTSOF(table); i++) { - if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0) + if (faccessat(fd, table[i].dir, F_OK, 0) >= 0) continue; if (table[i].target) { -@@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -61,7 +61,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { /* check if one of the targets exists */ NULSTR_FOREACH(s, table[i].target) { @@ -87,7 +87,7 @@ index 1d05409086..1ed06c31ab 100644 continue; /* check if a specific file exists at the target path */ -@@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { +@@ -72,7 +72,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { if (!p) return log_oom(); diff --git a/poky/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/poky/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch index 51b145729..74008714c 100644 --- a/poky/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/poky/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -1,4 +1,4 @@ -From 0c44af262cfa07c57db4b32de1f7610af47797f4 Mon Sep 17 00:00:00 2001 +From e07e9b998ad61b09555bc809aa15de9d2516787a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 27 May 2018 08:36:44 -0700 Subject: [PATCH] Define glibc compatible basename() for non-glibc systems @@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 5 insertions(+) diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 3a1e4f9072..ab87b9882c 100644 +index fc22e51409..1fed07b941 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -11,6 +11,11 @@ diff --git a/poky/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/poky/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 7444d4375..c5e20cbb8 100644 --- a/poky/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/poky/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch @@ -1,4 +1,4 @@ -From 0f4b60e34a806055c678eb97a7ec7e21291bcf48 Mon Sep 17 00:00:00 2001 +From 2f048d13e100158320bda248635b3c533ac9717b Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Wed, 4 Jul 2018 15:00:44 +0800 Subject: [PATCH] Do not disable buffering when writing to oom_score_adj @@ -25,10 +25,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index caa9dfe3a3..6101f43db5 100644 +index 18681838ef..0fa71ccce0 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c -@@ -1523,7 +1523,7 @@ int set_oom_score_adjust(int value) { +@@ -1606,7 +1606,7 @@ int set_oom_score_adjust(int value) { sprintf(t, "%i", value); return write_string_file("/proc/self/oom_score_adj", t, diff --git a/poky/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/poky/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index 90cc70d21..39804bd36 100644 --- a/poky/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/poky/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch @@ -1,4 +1,4 @@ -From c30ab62d18ce88187f5eb6c236e0977c9337f68d Mon Sep 17 00:00:00 2001 +From 45148529792c0cda32fdd61610c8d5a700d541fa Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Tue, 10 Jul 2018 15:40:17 +0800 Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi @@ -25,10 +25,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 2 files changed, 10 insertions(+) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index 8da2024a50..9605a9b869 100644 +index 7483b46a11..c49be29e46 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c -@@ -392,7 +392,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { +@@ -404,7 +404,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { return; errno = 0; diff --git a/poky/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/poky/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch index de7f9ecfa..365e2a36f 100644 --- a/poky/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +++ b/poky/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch @@ -1,4 +1,4 @@ -From fa86e5578256dddb296fd30128929ea7c4b792a4 Mon Sep 17 00:00:00 2001 +From 02a2772889d6cb08c9ca0561b52e7a9a80e50497 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:18:00 +0800 Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP @@ -17,7 +17,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c -index 9605a9b869..38b6cf90c3 100644 +index c49be29e46..90731bd7e7 100644 --- a/src/libsystemd/sd-bus/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c @@ -55,8 +55,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { diff --git a/poky/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch b/poky/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch index d9ef2b8a4..8a6c03f31 100644 --- a/poky/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch +++ b/poky/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch @@ -1,4 +1,4 @@ -From 11e730694706fa354a0e43c588ef66677a777d9a Mon Sep 17 00:00:00 2001 +From 47c4ac80689077b1eb86cf05b4326b1ac345aedf Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:27:54 +0800 Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition diff --git a/poky/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch b/poky/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch index 3b6085423..e75935a28 100644 --- a/poky/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/poky/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch @@ -1,4 +1,4 @@ -From 45bae28d3da6607d33d54f4b30a500f5249aadde Mon Sep 17 00:00:00 2001 +From 2cb33d8896a4ad2d3b489fed51f17d5e45dfb4fc Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 15:44:54 +0800 Subject: [PATCH] avoid redefinition of prctl_mm_map structure diff --git a/poky/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch b/poky/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch index 7d6433f31..629c10362 100644 --- a/poky/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch +++ b/poky/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch @@ -1,4 +1,4 @@ -From 6e593ff2afbe4bfe15eee2ec34e51490a38462f5 Mon Sep 17 00:00:00 2001 +From 200a2a2e4f04a7b7078dd455fafbd6774240e30b Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Fri, 7 Aug 2020 15:19:27 +0000 Subject: [PATCH] Handle missing LOCK_EX diff --git a/poky/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/poky/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch index 1faee1c05..ea6e82f46 100644 --- a/poky/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch +++ b/poky/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch @@ -1,4 +1,4 @@ -From ac579b296aa29c2f1dad9425c6d795e154ec8f7c Mon Sep 17 00:00:00 2001 +From 6445b7737a89256f35adc56701a5c47b48618ced Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Fri, 7 Aug 2020 15:20:17 +0000 Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un * @@ -24,10 +24,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index a4ac8ed2bb..0c41a48d4b 100644 +index 04685fecba..90b12bb5bd 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5125,7 +5125,7 @@ static int cant_be_in_netns(void) { +@@ -5354,7 +5354,7 @@ static int cant_be_in_netns(void) { if (fd < 0) return log_error_errno(errno, "Failed to allocate udev control socket: %m"); diff --git a/poky/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch b/poky/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch index 14c8ff73a..60c12b074 100644 --- a/poky/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch +++ b/poky/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch @@ -1,4 +1,4 @@ -From 6bc78df50adb48d24a2abfdf65b44b932cc5a571 Mon Sep 17 00:00:00 2001 +From ae71bf2b97dc9d4760defd83463c1d305f332f22 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Mon, 25 Feb 2019 16:53:06 +0800 Subject: [PATCH] test-json.c: define M_PIl diff --git a/poky/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch b/poky/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch index bd627c51e..6998bf0dd 100644 --- a/poky/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch +++ b/poky/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch @@ -1,4 +1,4 @@ -From 7cb6579572b50ef44bc0a321a4c73cce55b0c2f2 Mon Sep 17 00:00:00 2001 +From 3198690c2dbb4b457a04ef21914dc4d531540273 Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Fri, 1 Mar 2019 15:22:15 +0800 Subject: [PATCH] do not disable buffer in writing files @@ -22,7 +22,6 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> --- src/basic/cgroup-util.c | 10 +++++----- src/basic/procfs-util.c | 4 ++-- - src/basic/smack-util.c | 2 +- src/basic/sysctl-util.c | 2 +- src/basic/util.c | 2 +- src/binfmt/binfmt.c | 6 +++--- @@ -30,19 +29,20 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> src/core/smack-setup.c | 8 ++++---- src/hibernate-resume/hibernate-resume.c | 2 +- src/libsystemd/sd-device/sd-device.c | 2 +- - src/login/logind-dbus.c | 2 +- src/nspawn/nspawn-cgroup.c | 2 +- src/nspawn/nspawn.c | 6 +++--- src/shared/cgroup-setup.c | 4 ++-- + src/shared/mount-util.c | 4 ++-- + src/shared/smack-util.c | 2 +- src/sleep/sleep.c | 8 ++++---- src/vconsole/vconsole-setup.c | 2 +- - 16 files changed, 33 insertions(+), 33 deletions(-) + 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 50c1ae1b2b..5b40e92163 100644 +index c9efd862a2..b3708ea925 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c -@@ -765,7 +765,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -766,7 +766,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (isempty(sc)) { @@ -51,7 +51,7 @@ index 50c1ae1b2b..5b40e92163 100644 if (r < 0) return r; } else if (!path_equal(sc, agent)) -@@ -783,7 +783,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { +@@ -784,7 +784,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (streq(sc, "0")) { @@ -60,7 +60,7 @@ index 50c1ae1b2b..5b40e92163 100644 if (r < 0) return r; -@@ -810,7 +810,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -811,7 +811,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -69,7 +69,7 @@ index 50c1ae1b2b..5b40e92163 100644 if (r < 0) return r; -@@ -820,7 +820,7 @@ int cg_uninstall_release_agent(const char *controller) { +@@ -821,7 +821,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; @@ -78,7 +78,7 @@ index 50c1ae1b2b..5b40e92163 100644 if (r < 0) return r; -@@ -1650,7 +1650,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri +@@ -1651,7 +1651,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri if (r < 0) return r; @@ -88,7 +88,7 @@ index 50c1ae1b2b..5b40e92163 100644 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c -index 8f9eee8d36..480f8cc0b4 100644 +index 8c57094225..0cf6ec752b 100644 --- a/src/basic/procfs-util.c +++ b/src/basic/procfs-util.c @@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { @@ -107,21 +107,8 @@ index 8f9eee8d36..480f8cc0b4 100644 if (r < 0) { uint64_t threads_max; -diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c -index 3362ee3924..80c0f2a52e 100644 ---- a/src/basic/smack-util.c -+++ b/src/basic/smack-util.c -@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { - return 0; - - p = procfs_file_alloca(pid, "attr/current"); -- r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(p, label, 0); - if (r < 0) - return r; - diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c -index c96b5cd77f..d2476d9665 100644 +index 8913e6ff85..29e6ec0755 100644 --- a/src/basic/sysctl-util.c +++ b/src/basic/sysctl-util.c @@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c @@ -147,7 +134,7 @@ index 955b18bd2a..6d89c90176 100644 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); } diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c -index f6b72e0bae..e9fd4d06be 100644 +index 29530bb691..3ecf6a45a2 100644 --- a/src/binfmt/binfmt.c +++ b/src/binfmt/binfmt.c @@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { @@ -168,7 +155,7 @@ index f6b72e0bae..e9fd4d06be 100644 if (r < 0) return log_error_errno(r, "Failed to add binary format: %m"); -@@ -222,7 +222,7 @@ static int run(int argc, char *argv[]) { +@@ -223,7 +223,7 @@ static int run(int argc, char *argv[]) { } /* Flush out all rules */ @@ -178,10 +165,10 @@ index f6b72e0bae..e9fd4d06be 100644 STRV_FOREACH(f, files) { k = apply_file(*f, true); diff --git a/src/core/main.c b/src/core/main.c -index 3ee8d0a869..ec36e3e80f 100644 +index b32a19a1d8..4e1238853e 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1401,7 +1401,7 @@ static int bump_unix_max_dgram_qlen(void) { +@@ -1402,7 +1402,7 @@ static int bump_unix_max_dgram_qlen(void) { if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) return 0; @@ -190,7 +177,7 @@ index 3ee8d0a869..ec36e3e80f 100644 if (r < 0) return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); -@@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) { +@@ -1679,7 +1679,7 @@ static void initialize_core_pattern(bool skip_setup) { if (getpid_cached() != 1) return; @@ -200,10 +187,10 @@ index 3ee8d0a869..ec36e3e80f 100644 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); } diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c -index 8cc1696a4f..ab7b4ba2c3 100644 +index 79c4808473..b111ce0a11 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c -@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { +@@ -323,17 +323,17 @@ int mac_smack_setup(bool *loaded_policy) { } #ifdef SMACK_RUN_LABEL @@ -239,10 +226,10 @@ index 58e35e403e..1d0beb4008 100644 log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); return EXIT_FAILURE; diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c -index d82f01a164..b8fd63346c 100644 +index 388128bf33..695f535ff4 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c -@@ -1987,7 +1987,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, +@@ -2096,7 +2096,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, if (!value) return -ENOMEM; @@ -251,19 +238,6 @@ index d82f01a164..b8fd63346c 100644 if (r < 0) { /* On failure, clear cache entry, as we do not know how it fails. */ device_remove_cached_sysattr_value(device, sysattr); -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index 3bc424b83b..5f5eef0843 100644 ---- a/src/login/logind-dbus.c -+++ b/src/login/logind-dbus.c -@@ -1330,7 +1330,7 @@ static int trigger_device(Manager *m, sd_device *d) { - if (!t) - return -ENOMEM; - -- (void) write_string_file(t, "change", WRITE_STRING_FILE_DISABLE_BUFFER); -+ (void) write_string_file(t, "change", 0); - } - - return 0; diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c index cb01b25bc6..e92051268b 100644 --- a/src/nspawn/nspawn-cgroup.c @@ -278,10 +252,10 @@ index cb01b25bc6..e92051268b 100644 log_error_errno(r, "Failed to move process: %m"); goto finish; diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 0c41a48d4b..9c893b18e4 100644 +index 90b12bb5bd..6a1dafa094 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -2695,7 +2695,7 @@ static int reset_audit_loginuid(void) { +@@ -2751,7 +2751,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; @@ -290,19 +264,21 @@ index 0c41a48d4b..9c893b18e4 100644 if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" -@@ -3948,13 +3948,13 @@ static int setup_uid_map(pid_t pid) { +@@ -4148,7 +4148,7 @@ static int setup_uid_map( + return log_oom(); xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); - xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); -- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(uid_map, line, 0); +- r = write_string_file(uid_map, s, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(uid_map, s, 0); if (r < 0) return log_error_errno(r, "Failed to write UID map: %m"); - /* We always assign the same UID and GID ranges */ +@@ -4158,7 +4158,7 @@ static int setup_uid_map( + return log_oom(); + xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); -- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); -+ r = write_string_file(uid_map, line, 0); +- r = write_string_file(uid_map, s, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(uid_map, s, 0); if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); @@ -328,11 +304,44 @@ index f197f715c7..077f893177 100644 if (r < 0) { log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); +diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c +index 594efea989..d243b45bc4 100644 +--- a/src/shared/mount-util.c ++++ b/src/shared/mount-util.c +@@ -1019,13 +1019,13 @@ static int make_userns(uid_t uid_shift, uid_t uid_range) { + xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, uid_shift, uid_range); + + xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); +- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(uid_map, line, 0); + if (r < 0) + return log_error_errno(r, "Failed to write UID map: %m"); + + /* We always assign the same UID and GID ranges */ + xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); +- r = write_string_file(uid_map, line, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(uid_map, line, 0); + if (r < 0) + return log_error_errno(r, "Failed to write GID map: %m"); + +diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c +index 3362ee3924..80c0f2a52e 100644 +--- a/src/shared/smack-util.c ++++ b/src/shared/smack-util.c +@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { + return 0; + + p = procfs_file_alloca(pid, "attr/current"); +- r = write_string_file(p, label, WRITE_STRING_FILE_DISABLE_BUFFER); ++ r = write_string_file(p, label, 0); + if (r < 0) + return r; + diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index 262d4cea66..0523e8dc9b 100644 +index a3aeb24633..d3e68e1b94 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -48,7 +48,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca +@@ -46,7 +46,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca assert(hibernate_location->swap); xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); @@ -341,7 +350,7 @@ index 262d4cea66..0523e8dc9b 100644 if (r < 0) return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", hibernate_location->swap->device, resume_str); -@@ -75,7 +75,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca +@@ -73,7 +73,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca } xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); @@ -350,7 +359,7 @@ index 262d4cea66..0523e8dc9b 100644 if (r < 0) return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m", hibernate_location->swap->device, offset_str); -@@ -92,7 +92,7 @@ static int write_mode(char **modes) { +@@ -90,7 +90,7 @@ static int write_mode(char **modes) { STRV_FOREACH(mode, modes) { int k; @@ -359,7 +368,7 @@ index 262d4cea66..0523e8dc9b 100644 if (k >= 0) return 0; -@@ -114,7 +114,7 @@ static int write_state(FILE **f, char **states) { +@@ -112,7 +112,7 @@ static int write_state(FILE **f, char **states) { STRV_FOREACH(state, states) { int k; diff --git a/poky/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch b/poky/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch index 7d1bd6025..06702765e 100644 --- a/poky/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch +++ b/poky/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch @@ -1,4 +1,4 @@ -From d73755cc60f401f0f20f357752e45aeeeef8e83f Mon Sep 17 00:00:00 2001 +From b04518c464b526f8b9adc9ce3c08b1881db47989 Mon Sep 17 00:00:00 2001 From: Scott Murray <scott.murray@konsulko.com> Date: Fri, 13 Sep 2019 19:26:27 -0400 Subject: [PATCH] Handle __cpu_mask usage diff --git a/poky/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch b/poky/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch index 068600fa4..dc6330582 100644 --- a/poky/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch +++ b/poky/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch @@ -1,4 +1,4 @@ -From 04e94f9a15101daa8f65a9af269d26cda2a24056 Mon Sep 17 00:00:00 2001 +From 0c8935128b39864b07dfee39cfa9d35d48f056aa Mon Sep 17 00:00:00 2001 From: Alex Kiernan <alex.kiernan@gmail.com> Date: Tue, 10 Mar 2020 11:05:20 +0000 Subject: [PATCH] Handle missing gshadow @@ -14,8 +14,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> --- src/shared/user-record-nss.c | 20 ++++++++++++++++++++ src/shared/user-record-nss.h | 4 ++++ - src/shared/userdb.c | 6 ++++++ - 3 files changed, 30 insertions(+) + src/shared/userdb.c | 7 ++++++- + 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c index 88b8fc2f8f..a819d41bac 100644 @@ -139,27 +139,27 @@ index 22ab04d6ee..4e52e7a911 100644 #include <shadow.h> diff --git a/src/shared/userdb.c b/src/shared/userdb.c -index 613350bd46..5c821d28cd 100644 +index 91ac7c3832..20881ece84 100644 --- a/src/shared/userdb.c +++ b/src/shared/userdb.c -@@ -938,13 +938,16 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { +@@ -1047,13 +1047,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { if (gr) { _cleanup_free_ char *buffer = NULL; bool incomplete = false; +#if ENABLE_GSHADOW struct sgrp sgrp; +- +#endif - if (streq_ptr(gr->gr_name, "root")) iterator->synthesize_root = false; if (gr->gr_gid == GID_NOBODY) iterator->synthesize_nobody = false; +#if ENABLE_GSHADOW - if (!FLAGS_SET(iterator->flags, USERDB_AVOID_SHADOW)) { + if (!FLAGS_SET(iterator->flags, USERDB_SUPPRESS_SHADOW)) { r = nss_sgrp_for_group(gr, &sgrp, &buffer); if (r < 0) { -@@ -957,6 +960,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { +@@ -1066,6 +1068,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { } r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); diff --git a/poky/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/poky/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch index 2289404d8..ff96a720c 100644 --- a/poky/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch +++ b/poky/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch @@ -1,4 +1,4 @@ -From 366cd28f5f93ba7c861cd32a718251770d74830e Mon Sep 17 00:00:00 2001 +From f5d7fee9620cbcf52be8f8ba477890d28cadfbc8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 12 Apr 2021 23:44:53 -0700 Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 6 insertions(+) diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index 1384324804..0202d00372 100644 +index 9e3a165857..4d59b3e7b0 100644 --- a/src/basic/missing_syscall.h +++ b/src/basic/missing_syscall.h @@ -20,6 +20,12 @@ diff --git a/poky/meta/recipes-core/systemd/systemd_248.3.bb b/poky/meta/recipes-core/systemd/systemd_249.3.bb index f5022a99c..c2d4343f1 100644 --- a/poky/meta/recipes-core/systemd/systemd_248.3.bb +++ b/poky/meta/recipes-core/systemd/systemd_249.3.bb @@ -4,7 +4,7 @@ PROVIDES = "udev" PE = "1" -DEPENDS = "intltool-native gperf-native libcap util-linux" +DEPENDS = "intltool-native gperf-native libcap util-linux python3-jinja2-native" SECTION = "base/shell" @@ -14,8 +14,7 @@ inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu # that we don't build both udev and systemd in world builds. REQUIRED_DISTRO_FEATURES = "systemd" -SRC_URI += " \ - file://touchscreen.rules \ +SRC_URI += "file://touchscreen.rules \ file://00-create-volatile.conf \ ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', d)} \ @@ -26,11 +25,10 @@ SRC_URI += " \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ file://0001-test-parse-argument-Include-signal.h.patch \ - file://0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch \ " # patches needed by musl -SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}" +SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}" SRC_URI_MUSL = "\ file://0002-don-t-use-glibc-specific-qsort_r.patch \ file://0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch \ @@ -95,10 +93,10 @@ PACKAGECONFIG ??= " \ userdb \ utmp \ vconsole \ - xz \ + zstd \ " -PACKAGECONFIG_remove_libc-musl = " \ +PACKAGECONFIG:remove:libc-musl = " \ gshadow \ idn \ localed \ @@ -111,7 +109,7 @@ PACKAGECONFIG_remove_libc-musl = " \ utmp \ " -CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0 " +CFLAGS:append:libc-musl = " -D__UAPI_DEF_ETHHDR=0 " # Some of the dependencies are weak-style recommends - if not available at runtime, # systemd won't fail but the library-related feature will be skipped with a warning. @@ -134,6 +132,7 @@ PACKAGECONFIG[efi] = "-Defi=true,-Defi=false" PACKAGECONFIG[gnu-efi] = "-Dgnu-efi=true -Defi-libdir=${STAGING_LIBDIR} -Defi-includedir=${STAGING_INCDIR}/efi,-Dgnu-efi=false,gnu-efi" PACKAGECONFIG[elfutils] = "-Delfutils=true,-Delfutils=false,elfutils" PACKAGECONFIG[firstboot] = "-Dfirstboot=true,-Dfirstboot=false" +PACKAGECONFIG[repart] = "-Drepart=true,-Drepart=false" # Sign the journal for anti-tampering PACKAGECONFIG[gcrypt] = "-Dgcrypt=true,-Dgcrypt=false,libgcrypt" PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" @@ -201,6 +200,7 @@ PACKAGECONFIG[xdg-autostart] = "-Dxdg-autostart=true,-Dxdg-autostart=false" PACKAGECONFIG[xkbcommon] = "-Dxkbcommon=true,-Dxkbcommon=false,libxkbcommon" PACKAGECONFIG[xz] = "-Dxz=true,-Dxz=false,xz" PACKAGECONFIG[zlib] = "-Dzlib=true,-Dzlib=false,zlib" +PACKAGECONFIG[zstd] = "-Dzstd=true,-Dzstd=false,zstd" # Helper variables to clarify locations. This mirrors the logic in systemd's # build system. @@ -336,7 +336,7 @@ do_install() { install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh } -python populate_packages_prepend (){ +python populate_packages:prepend (){ systemdlibdir = d.getVar("rootlibdir") do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) } @@ -361,96 +361,96 @@ PACKAGE_BEFORE_PN = "\ udev-hwdb \ " -SUMMARY_${PN}-container = "Tools for containers and VMs" -DESCRIPTION_${PN}-container = "Systemd tools to spawn and manage containers and virtual machines." +SUMMARY:${PN}-container = "Tools for containers and VMs" +DESCRIPTION:${PN}-container = "Systemd tools to spawn and manage containers and virtual machines." -SUMMARY_${PN}-journal-gatewayd = "HTTP server for journal events" -DESCRIPTION_${PN}-journal-gatewayd = "systemd-journal-gatewayd serves journal events over the network. Clients must connect using HTTP. The server listens on port 19531 by default." +SUMMARY:${PN}-journal-gatewayd = "HTTP server for journal events" +DESCRIPTION:${PN}-journal-gatewayd = "systemd-journal-gatewayd serves journal events over the network. Clients must connect using HTTP. The server listens on port 19531 by default." -SUMMARY_${PN}-journal-upload = "Send journal messages over the network" -DESCRIPTION_${PN}-journal-upload = "systemd-journal-upload uploads journal entries to a specified URL." +SUMMARY:${PN}-journal-upload = "Send journal messages over the network" +DESCRIPTION:${PN}-journal-upload = "systemd-journal-upload uploads journal entries to a specified URL." -SUMMARY_${PN}-journal-remote = "Receive journal messages over the network" -DESCRIPTION_${PN}-journal-remote = "systemd-journal-remote is a command to receive serialized journal events and store them to journal files." +SUMMARY:${PN}-journal-remote = "Receive journal messages over the network" +DESCRIPTION:${PN}-journal-remote = "systemd-journal-remote is a command to receive serialized journal events and store them to journal files." SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ " -SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" +SYSTEMD_SERVICE:${PN}-binfmt = "systemd-binfmt.service" USERADD_PACKAGES = "${PN} ${PN}-extra-utils \ ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gateway', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ " -GROUPADD_PARAM_${PN} = "-r systemd-journal;" -GROUPADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /sbin/nologin systemd-network;', '', d)}" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /sbin/nologin systemd-resolve;', '', d)}" -USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /sbin/nologin systemd-timesync;', '', d)}" -USERADD_PARAM_${PN}-extra-utils = "--system -d / -M --shell /sbin/nologin systemd-bus-proxy" -USERADD_PARAM_${PN}-journal-gateway = "--system -d / -M --shell /sbin/nologin systemd-journal-gateway" -USERADD_PARAM_${PN}-journal-remote = "--system -d / -M --shell /sbin/nologin systemd-journal-remote" -USERADD_PARAM_${PN}-journal-upload = "--system -d / -M --shell /sbin/nologin systemd-journal-upload" - -FILES_${PN}-analyze = "${bindir}/systemd-analyze" - -FILES_${PN}-initramfs = "/init" -RDEPENDS_${PN}-initramfs = "${PN}" - -FILES_${PN}-gui = "${bindir}/systemadm" - -FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ +GROUPADD_PARAM:${PN} = "-r systemd-journal;" +GROUPADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}" +USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}" +USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /sbin/nologin systemd-network;', '', d)}" +USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}" +USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /sbin/nologin systemd-resolve;', '', d)}" +USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /sbin/nologin systemd-timesync;', '', d)}" +USERADD_PARAM:${PN}-extra-utils = "--system -d / -M --shell /sbin/nologin systemd-bus-proxy" +USERADD_PARAM:${PN}-journal-gateway = "--system -d / -M --shell /sbin/nologin systemd-journal-gateway" +USERADD_PARAM:${PN}-journal-remote = "--system -d / -M --shell /sbin/nologin systemd-journal-remote" +USERADD_PARAM:${PN}-journal-upload = "--system -d / -M --shell /sbin/nologin systemd-journal-upload" + +FILES:${PN}-analyze = "${bindir}/systemd-analyze" + +FILES:${PN}-initramfs = "/init" +RDEPENDS:${PN}-initramfs = "${PN}" + +FILES:${PN}-gui = "${bindir}/systemadm" + +FILES:${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ ${systemd_unitdir}/system/systemd-vconsole-setup.service \ ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service" -RDEPENDS_${PN}-kernel-install += "bash" -FILES_${PN}-kernel-install = "${bindir}/kernel-install \ +RDEPENDS:${PN}-kernel-install += "bash" +FILES:${PN}-kernel-install = "${bindir}/kernel-install \ ${sysconfdir}/kernel/ \ ${exec_prefix}/lib/kernel \ " -FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ +FILES:${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ " -FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" +FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" -FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ +FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ ${exec_prefix}/lib/binfmt.d \ ${rootlibexecdir}/systemd/systemd-binfmt \ ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \ ${systemd_unitdir}/system/systemd-binfmt.service" -RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc" +RRECOMMENDS:${PN}-binfmt = "kernel-module-binfmt-misc" -RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" +RRECOMMENDS:${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" -FILES_${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \ +FILES:${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \ ${systemd_system_unitdir}/systemd-journal-gatewayd.service \ ${systemd_system_unitdir}/systemd-journal-gatewayd.socket \ ${systemd_system_unitdir}/sockets.target.wants/systemd-journal-gatewayd.socket \ ${datadir}/systemd/gatewayd/browse.html \ " -SYSTEMD_SERVICE_${PN}-journal-gatewayd = "systemd-journal-gatewayd.socket" +SYSTEMD_SERVICE:${PN}-journal-gatewayd = "systemd-journal-gatewayd.socket" -FILES_${PN}-journal-upload = "${rootlibexecdir}/systemd/systemd-journal-upload \ +FILES:${PN}-journal-upload = "${rootlibexecdir}/systemd/systemd-journal-upload \ ${systemd_system_unitdir}/systemd-journal-upload.service \ ${sysconfdir}/systemd/journal-upload.conf \ " -SYSTEMD_SERVICE_${PN}-journal-upload = "systemd-journal-upload.service" +SYSTEMD_SERVICE:${PN}-journal-upload = "systemd-journal-upload.service" -FILES_${PN}-journal-remote = "${rootlibexecdir}/systemd/systemd-journal-remote \ +FILES:${PN}-journal-remote = "${rootlibexecdir}/systemd/systemd-journal-remote \ ${sysconfdir}/systemd/journal-remote.conf \ ${systemd_system_unitdir}/systemd-journal-remote.service \ ${systemd_system_unitdir}/systemd-journal-remote.socket \ " -SYSTEMD_SERVICE_${PN}-journal-remote = "systemd-journal-remote.socket" +SYSTEMD_SERVICE:${PN}-journal-remote = "systemd-journal-remote.socket" -FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ +FILES:${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ ${sysconfdir}/systemd/system/multi-user.target.wants/machines.target \ ${base_bindir}/machinectl \ @@ -486,7 +486,7 @@ FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c " # "machinectl import-tar" uses "tar --numeric-owner", not supported by busybox. -RRECOMMENDS_${PN}-container += "\ +RRECOMMENDS:${PN}-container += "\ ${PN}-journal-gatewayd \ ${PN}-journal-remote \ ${PN}-journal-upload \ @@ -496,7 +496,7 @@ RRECOMMENDS_${PN}-container += "\ tar \ " -FILES_${PN}-extra-utils = "\ +FILES:${PN}-extra-utils = "\ ${base_bindir}/systemd-escape \ ${base_bindir}/systemd-inhibit \ ${bindir}/systemd-detect-virt \ @@ -540,14 +540,14 @@ FILES_${PN}-extra-utils = "\ ${rootlibexecdir}/systemd/systemd-cgroups-agent \ " -FILES_${PN}-udev-rules = "\ +FILES:${PN}-udev-rules = "\ ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \ ${rootlibexecdir}/udev/rules.d/71-seat.rules \ ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \ ${rootlibexecdir}/udev/rules.d/99-systemd.rules \ " -CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \ +CONFFILES:${PN} = "${sysconfdir}/systemd/coredump.conf \ ${sysconfdir}/systemd/journald.conf \ ${sysconfdir}/systemd/logind.conf \ ${sysconfdir}/systemd/networkd.conf \ @@ -559,7 +559,7 @@ CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \ ${sysconfdir}/systemd/user.conf \ " -FILES_${PN} = " ${base_bindir}/* \ +FILES:${PN} = " ${base_bindir}/* \ ${base_sbindir}/shutdown \ ${base_sbindir}/halt \ ${base_sbindir}/poweroff \ @@ -621,13 +621,13 @@ FILES_${PN} = " ${base_bindir}/* \ ${datadir}/dbus-1/system.d/org.freedesktop.oom1.conf \ " -FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" +FILES:${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" -RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck" -RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" -RDEPENDS_${PN} += "volatile-binds" +RDEPENDS:${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck" +RDEPENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" +RDEPENDS:${PN} += "volatile-binds" -RRECOMMENDS_${PN} += "systemd-extra-utils \ +RRECOMMENDS:${PN} += "systemd-extra-utils \ udev-hwdb \ e2fsprogs-e2fsck \ kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 kernel-module-sch-fq-codel \ @@ -635,15 +635,15 @@ RRECOMMENDS_${PN} += "systemd-extra-utils \ systemd-conf \ " -INSANE_SKIP_${PN} += "dev-so libdir" -INSANE_SKIP_${PN}-dbg += "libdir" -INSANE_SKIP_${PN}-doc += " libdir" +INSANE_SKIP:${PN} += "dev-so libdir" +INSANE_SKIP:${PN}-dbg += "libdir" +INSANE_SKIP:${PN}-doc += " libdir" -RPROVIDES_udev = "hotplug" +RPROVIDES:udev = "hotplug" -RDEPENDS_udev-hwdb += "udev" +RDEPENDS:udev-hwdb += "udev" -FILES_udev += "${base_sbindir}/udevd \ +FILES:udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/systemd/network/99-default.link \ ${rootlibexecdir}/systemd/systemd-udevd \ ${rootlibexecdir}/udev/accelerometer \ @@ -687,6 +687,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \ ${rootlibexecdir}/udev/rules.d/80-drivers.rules \ ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \ + ${rootlibexecdir}/udev/rules.d/81-net-dhcp.rules \ ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \ ${rootlibexecdir}/udev/rules.d/README \ ${sysconfdir}/udev \ @@ -701,18 +702,21 @@ FILES_udev += "${base_sbindir}/udevd \ ${systemd_unitdir}/system/systemd-hwdb-update.service \ " -FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \ +FILES:udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \ " -RCONFLICTS_${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}" +RCONFLICTS:${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}" INITSCRIPT_PACKAGES = "udev" -INITSCRIPT_NAME_udev = "systemd-udevd" -INITSCRIPT_PARAMS_udev = "start 03 S ." +INITSCRIPT_NAME:udev = "systemd-udevd" +INITSCRIPT_PARAMS:udev = "start 03 S ." python __anonymous() { if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") + + if bb.utils.contains('PACKAGECONFIG', 'repart', True, False, d) and not bb.utils.contains('PACKAGECONFIG', 'openssl', True, False, d): + bb.error("PACKAGECONFIG[repart] requires PACKAGECONFIG[openssl]") } python do_warn_musl() { @@ -721,7 +725,7 @@ python do_warn_musl() { } addtask warn_musl before do_configure -ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" +ALTERNATIVE:${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd" ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf" @@ -747,20 +751,20 @@ ALTERNATIVE_TARGET[runlevel] = "${base_bindir}/systemctl" ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" ALTERNATIVE_PRIORITY[runlevel] ?= "300" -pkg_postinst_${PN}_libc-glibc () { +pkg_postinst:${PN}:libc-glibc () { sed -e '/^hosts:/s/\s*\<myhostname\>//' \ -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \ -i $D${sysconfdir}/nsswitch.conf } -pkg_prerm_${PN}_libc-glibc () { +pkg_prerm:${PN}:libc-glibc () { sed -e '/^hosts:/s/\s*\<myhostname\>//' \ -e '/^hosts:/s/\s*myhostname//' \ -i $D${sysconfdir}/nsswitch.conf } PACKAGE_WRITE_DEPS += "qemu-native" -pkg_postinst_udev-hwdb () { +pkg_postinst:udev-hwdb () { if test -n "$D"; then $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} rootlibexecdir="${rootlibexecdir}" PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}" else @@ -768,6 +772,6 @@ pkg_postinst_udev-hwdb () { fi } -pkg_prerm_udev-hwdb () { +pkg_prerm:udev-hwdb () { rm -f $D${sysconfdir}/udev/hwdb.bin } diff --git a/poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index d95d1a63f..bfcf51c35 100644 --- a/poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/poky/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb @@ -53,14 +53,14 @@ EOF fi } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { # run this on host and on target if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then exit 0 fi } -pkg_postinst_ontarget_${PN} () { +pkg_postinst_ontarget:${PN} () { # run this on the target if [ -e /proc/consoles ]; then tmp="${SERIAL_CONSOLES_CHECK}" @@ -84,10 +84,10 @@ fi # Set PACKAGE_ARCH appropriately. PACKAGE_ARCH = "${MACHINE_ARCH}" -FILES_${PN} = "${sysconfdir}/inittab ${base_bindir}/start_getty" -CONFFILES_${PN} = "${sysconfdir}/inittab" +FILES:${PN} = "${sysconfdir}/inittab ${base_bindir}/start_getty" +CONFFILES:${PN} = "${sysconfdir}/inittab" USE_VT ?= "1" SYSVINIT_ENABLED_GETTYS ?= "1" -RCONFLICTS_${PN} = "busybox-inittab" +RCONFLICTS:${PN} = "busybox-inittab" diff --git a/poky/meta/recipes-core/sysvinit/sysvinit_2.99.bb b/poky/meta/recipes-core/sysvinit/sysvinit_2.99.bb index e39f22a8b..9ba9652f9 100644 --- a/poky/meta/recipes-core/sysvinit/sysvinit_2.99.bb +++ b/poky/meta/recipes-core/sysvinit/sysvinit_2.99.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYRIGHT;endline=15;md5=a1d3b3526501d3546d530bbe6ab6cdbe \ " -RDEPENDS_${PN} = "${PN}-inittab" +RDEPENDS:${PN} = "${PN}-inittab" SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ file://install.patch \ @@ -26,14 +26,14 @@ SRC_URI[sha256sum] = "b05c3677bb698afe64c997968b00c49b2a9bd320ce963523230ee7ea41 S = "${WORKDIR}/sysvinit-${PV}" inherit update-alternatives features_check -DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" +DEPENDS:append = " update-rc.d-native base-passwd virtual/crypt" do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" PACKAGECONFIG[psplash-text-updates] = ",," REQUIRED_DISTRO_FEATURES = "sysvinit" -ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" +ALTERNATIVE:${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" ALTERNATIVE_PRIORITY = "200" @@ -49,13 +49,13 @@ ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" -ALTERNATIVE_${PN}-pidof = "pidof" +ALTERNATIVE:${PN}-pidof = "pidof" ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof" -ALTERNATIVE_${PN}-sulogin = "sulogin" +ALTERNATIVE:${PN}-sulogin = "sulogin" ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" -ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 sulogin.8 utmpdump.1" +ALTERNATIVE:${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 sulogin.8 utmpdump.1" ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" @@ -66,13 +66,13 @@ ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" -FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" -FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" -FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" +FILES:${PN} += "${base_sbindir}/* ${base_bindir}/*" +FILES:sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" +FILES:sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" -RDEPENDS_${PN} += "sysvinit-pidof initd-functions base-passwd" +RDEPENDS:${PN} += "sysvinit-pidof initd-functions base-passwd" -CFLAGS_prepend = "-D_GNU_SOURCE " +CFLAGS:prepend = "-D_GNU_SOURCE " export LCRYPT = "-lcrypt" EXTRA_OEMAKE += "'base_bindir=${base_bindir}' \ 'base_sbindir=${base_sbindir}' \ diff --git a/poky/meta/recipes-core/udev/eudev/permissions.rules b/poky/meta/recipes-core/udev/eudev/permissions.rules index 205b73329..bfdff4f8c 100644 --- a/poky/meta/recipes-core/udev/eudev/permissions.rules +++ b/poky/meta/recipes-core/udev/eudev/permissions.rules @@ -10,9 +10,9 @@ SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" SUBSYSTEM=="net", ENV{DRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" # devices needed to load the drivers providing them -KERNEL=="tun", OPTIONS+="ignore_remove" -KERNEL=="ppp", OPTIONS+="ignore_remove" -KERNEL=="loop[0-9]*", OPTIONS+="ignore_remove" +KERNEL=="tun", OPTIONS+="ignore:remove" +KERNEL=="ppp", OPTIONS+="ignore:remove" +KERNEL=="loop[0-9]*", OPTIONS+="ignore:remove" # default permissions for block devices SUBSYSTEM=="block", GROUP="disk" diff --git a/poky/meta/recipes-core/udev/eudev_3.2.10.bb b/poky/meta/recipes-core/udev/eudev_3.2.10.bb index a5d2115f8..347495cbd 100644 --- a/poky/meta/recipes-core/udev/eudev_3.2.10.bb +++ b/poky/meta/recipes-core/udev/eudev_3.2.10.bb @@ -2,7 +2,7 @@ SUMMARY = "eudev is a fork of systemd's udev" HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" DESCRIPTION = "eudev is Gentoo's fork of udev, systemd's device file manager for the Linux kernel. It manages device nodes in /dev and handles all user space actions when adding or removing devices." LICENSE = "GPLv2.0+ & LGPL-2.1+" -LICENSE_libudev = "LGPL-2.1+" +LICENSE:libudev = "LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" @@ -38,7 +38,7 @@ EXTRA_OECONF = " \ PACKAGECONFIG ??= "hwdb" PACKAGECONFIG[hwdb] = "--enable-hwdb,--disable-hwdb" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev @@ -57,7 +57,7 @@ do_install_append() { ln ${D}${bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm } -do_install_prepend_class-target () { +do_install:prepend:class-target () { # Remove references to buildmachine sed -i -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ ${B}/src/udev/keyboard-keys-from-name.h @@ -70,21 +70,21 @@ PACKAGES =+ "libudev" PACKAGES =+ "eudev-hwdb" -FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm" -FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ +FILES:${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm" +FILES:${PN}-dev = "${datadir}/pkgconfig/udev.pc \ ${includedir}/libudev.h ${libdir}/libudev.so \ ${includedir}/udev.h ${libdir}/libudev.la \ ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc" -FILES_libudev = "${base_libdir}/libudev.so.*" -FILES_eudev-hwdb = "${sysconfdir}/udev/hwdb.d" +FILES:libudev = "${base_libdir}/libudev.so.*" +FILES:eudev-hwdb = "${sysconfdir}/udev/hwdb.d" -RDEPENDS_eudev-hwdb += "eudev" +RDEPENDS:eudev-hwdb += "eudev" -RPROVIDES_${PN} = "hotplug udev" -RPROVIDES_eudev-hwdb += "udev-hwdb" +RPROVIDES:${PN} = "hotplug udev" +RPROVIDES:eudev-hwdb += "udev-hwdb" PACKAGE_WRITE_DEPS += "qemu-native" -pkg_postinst_eudev-hwdb () { +pkg_postinst:eudev-hwdb () { if test -n "$D"; then $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} else @@ -92,6 +92,6 @@ pkg_postinst_eudev-hwdb () { fi } -pkg_prerm_eudev-hwdb () { +pkg_prerm:eudev-hwdb () { rm -f $D${sysconfdir}/udev/hwdb.bin } diff --git a/poky/meta/recipes-core/udev/udev-extraconf_1.1.bb b/poky/meta/recipes-core/udev/udev-extraconf_1.1.bb index 90f933d98..2ba35b0df 100644 --- a/poky/meta/recipes-core/udev/udev-extraconf_1.1.bb +++ b/poky/meta/recipes-core/udev/udev-extraconf_1.1.bb @@ -35,11 +35,11 @@ do_install() { install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts } -FILES_${PN} = "${sysconfdir}/udev" -RDEPENDS_${PN} = "udev" -CONFFILES_${PN} = "${sysconfdir}/udev/mount.blacklist" +FILES:${PN} = "${sysconfdir}/udev" +RDEPENDS:${PN} = "udev" +CONFFILES:${PN} = "${sysconfdir}/udev/mount.blacklist" # to replace udev-extra-rules from meta-oe -RPROVIDES_${PN} = "udev-extra-rules" -RREPLACES_${PN} = "udev-extra-rules" -RCONFLICTS_${PN} = "udev-extra-rules" +RPROVIDES:${PN} = "udev-extra-rules" +RREPLACES:${PN} = "udev-extra-rules" +RCONFLICTS:${PN} = "udev-extra-rules" diff --git a/poky/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb b/poky/meta/recipes-core/util-linux/util-linux-libuuid_2.37.2.bb index 9612c491c..5d759aed9 100644 --- a/poky/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb +++ b/poky/meta/recipes-core/util-linux/util-linux-libuuid_2.37.2.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}/util-linux-${PV}" EXTRA_OECONF += "--disable-all-programs --enable-libuuid" LICENSE = "BSD-3-Clause" -do_install_append() { +do_install:append() { rm -rf ${D}${datadir} ${D}${bindir} ${D}${base_bindir} ${D}${sbindir} ${D}${base_sbindir} ${D}${exec_prefix}/sbin } diff --git a/poky/meta/recipes-core/util-linux/util-linux.inc b/poky/meta/recipes-core/util-linux/util-linux.inc index 0648366ba..1e3cd2880 100644 --- a/poky/meta/recipes-core/util-linux/util-linux.inc +++ b/poky/meta/recipes-core/util-linux/util-linux.inc @@ -7,10 +7,10 @@ disk partitioning, kernel message management, filesystem creation, and system lo SECTION = "base" LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" -LICENSE_${PN}-libblkid = "LGPLv2.1+" -LICENSE_${PN}-libfdisk = "LGPLv2.1+" -LICENSE_${PN}-libmount = "LGPLv2.1+" -LICENSE_${PN}-libsmartcols = "LGPLv2.1+" +LICENSE:${PN}-libblkid = "LGPLv2.1+" +LICENSE:${PN}-libfdisk = "LGPLv2.1+" +LICENSE:${PN}-libmount = "LGPLv2.1+" +LICENSE:${PN}-libsmartcols = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ @@ -25,7 +25,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ " -FILESEXTRAPATHS_prepend := "${THISDIR}/util-linux:" +FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:" MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ file://configure-sbindir.patch \ @@ -35,13 +35,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://8a3a74160b96498d672e3652827aa7e6d7f3a120.patch \ - file://tests-kill.patch \ - file://tests-blkdiscard.patch \ - file://tests-ul.patch \ - file://tests-eject.patch \ - file://tests-lscpu.patch \ - file://0001-login-fix-close_range-use.patch \ " -SRC_URI[sha256sum] = "bd07b7e98839e0359842110525a3032fdb8eaf3a90bedde3dd1652d32d15cce5" +SRC_URI[sha256sum] = "6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9" diff --git a/poky/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch b/poky/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch deleted file mode 100644 index 7a47597bd..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 76ae0badd3fd7c8653fa4d3c78d2dcfcec51d23d Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Wed, 14 Jul 2021 17:25:57 +0200 -Subject: [PATCH] login: fix close_range() use - -This new syscall comes with three arguments (see kernel commit -278a5fbaed89dacd04e9d052f4594ffd0e0585de). Not sure why util-linux -assume only two. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/b8d99a618baffb4fc03cda4c40e29778b6d77ad4] -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1981729 -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - include/fileutils.h | 4 ++-- - lib/fileutils.c | 2 +- - login-utils/login.c | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/fileutils.h b/include/fileutils.h -index ad54b95..f86426b 100644 ---- a/include/fileutils.h -+++ b/include/fileutils.h -@@ -82,9 +82,9 @@ static inline struct dirent *xreaddir(DIR *dp) - # if defined(SYS_close_range) - # include <sys/types.h> - # ifndef HAVE_CLOSE_RANGE --static inline int close_range(unsigned int first, unsigned int last) -+static inline int close_range(unsigned int first, unsigned int last, int flags) - { -- return syscall(SYS_close_range, first, last); -+ return syscall(SYS_close_range, first, last, flags); - } - # endif - # define HAVE_CLOSE_RANGE 1 -diff --git a/lib/fileutils.c b/lib/fileutils.c -index 846b718..a979b03 100644 ---- a/lib/fileutils.c -+++ b/lib/fileutils.c -@@ -189,7 +189,7 @@ int main(int argc, char *argv[]) - ignore_result( dup(STDIN_FILENO) ); - - # ifdef HAVE_CLOSE_RANGE -- close_range(STDERR_FILENO + 1, ~0U); -+ close_range(STDERR_FILENO + 1, ~0U, 0); - # else - ul_close_all_fds(STDERR_FILENO + 1, ~0U); - # endif -diff --git a/login-utils/login.c b/login-utils/login.c -index 7fefd05..94a042d 100644 ---- a/login-utils/login.c -+++ b/login-utils/login.c -@@ -1358,7 +1358,7 @@ static void initialize(int argc, char **argv, struct login_context *cxt) - #endif - } - #ifdef HAVE_CLOSE_RANGE -- close_range(STDERR_FILENO + 1, ~0U); -+ close_range(STDERR_FILENO + 1, ~0U, 0); - #else - ul_close_all_fds(STDERR_FILENO + 1, ~0U); - #endif --- -2.32.0 diff --git a/poky/meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch b/poky/meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch deleted file mode 100644 index a5bb00ab6..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/8a3a74160b96498d672e3652827aa7e6d7f3a120.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8a3a74160b96498d672e3652827aa7e6d7f3a120 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Tue, 15 Jun 2021 12:04:43 +0200 -Subject: [PATCH] mkswap: fix holes detection (infinite loop and/or - stack-buffer-underflow) - -Reported-by: Brian Lane <bcl@redhat.com> -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1971877 -Fix: https://github.com/karelzak/util-linux/issues/1348 -Signed-off-by: Karel Zak <kzak@redhat.com> -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - disk-utils/mkswap.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c -index 27374fd72..c45a3a317 100644 ---- a/disk-utils/mkswap.c -+++ b/disk-utils/mkswap.c -@@ -267,6 +267,8 @@ static void check_extents(struct mkswap_control *ctl) - return; - - n = fiemap->fm_mapped_extents; -+ if (n == 0) -+ break; - - for (i = 0; i < n; i++) { - struct fiemap_extent *e = &fiemap->fm_extents[i]; diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-blkdiscard.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-blkdiscard.patch deleted file mode 100644 index 34b07a4b2..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/tests-blkdiscard.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From 45fe65d934df2c938701f1c3cd3e0a6f3bdf25e6 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Tue, 29 Jun 2021 18:10:40 +0100 -Subject: [PATCH] tests/blkdiscard: check correct log file for errors - -When checking if the discard ioctl is supported, look in stderr not stdout. - -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - tests/ts/blkdiscard/offsets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/ts/blkdiscard/offsets b/tests/ts/blkdiscard/offsets -index 9dddc35e2..5e724d51b 100755 ---- a/tests/ts/blkdiscard/offsets -+++ b/tests/ts/blkdiscard/offsets -@@ -48,7 +48,7 @@ ts_log "testing offsets with full block size" - run_tscmd $TS_CMD_BLKDISCARD -v $DEVICE - if [ "$?" != "0" ]; then - # Skip the rest? For example loop backing files on NFS seem unsupported. -- grep -q "BLKDISCARD ioctl failed: Operation not supported" "$TS_OUTPUT" \ -+ grep -q "BLKDISCARD ioctl failed: Operation not supported" "$TS_ERRLOG" \ - && ts_skip "BLKDISCARD not supported" - fi - run_tscmd $TS_CMD_BLKDISCARD -v -o 1 $DEVICE --- -2.25.1 - diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-eject.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-eject.patch deleted file mode 100644 index 51e914d56..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/tests-eject.patch +++ /dev/null @@ -1,56 +0,0 @@ -Upstream-Status: Submitted [https://github.com/karelzak/util-linux/pull/1375] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From dd956268ba89fc1caf83c45c3c495f34d261e0e2 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Thu, 1 Jul 2021 20:44:31 +0100 -Subject: [PATCH] test/eject: guard asan LD_PRELOAD with use-system-commands - check - -This test tries to add asan to LD_PRELOAD because the just-built eject -will call the host /bin/umount, and apparently asan doesn't like this. - -However, if ldd isn't present, this fails as the path to asan is the -error message saying that ldd isn't present. - -As the asan workaround is only needed when executing the binaries that -have just been built and not the system binaries, only use it if the -test is on the built binaries. - -Closes #1373. - -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - tests/ts/eject/umount | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount -index a829d46c0..2be281ee3 100755 ---- a/tests/ts/eject/umount -+++ b/tests/ts/eject/umount -@@ -60,13 +60,15 @@ function deinit_device { - ts_scsi_debug_rmmod - } - --# As the eject binary execl()s an uninstrumented /bin/umount binary, we need --# to explicitly $LD_PRELOAD the ASan's runtime DSO, otherwise ASan will complain. --# Since all three utilities used by this test (eject, fdisk, mount) are just --# libtool wrappers, let's check the kill binary instead, which should have --# the needed DSO information. --ASAN_RT_PATH="$(ts_get_asan_rt_path "$TS_CMD_KILL")" --[ -n "$ASAN_RT_PATH" ] && export LD_PRELOAD="$ASAN_RT_PATH:$LD_PRELOAD" -+if [ "$TS_USE_SYSTEM_COMMANDS" != "yes" ]; then -+ # As the eject binary execl()s an uninstrumented /bin/umount binary, we need -+ # to explicitly $LD_PRELOAD the ASan's runtime DSO, otherwise ASan will complain. -+ # Since all three utilities used by this test (eject, fdisk, mount) are just -+ # libtool wrappers, let's check the kill binary instead, which should have -+ # the needed DSO information. -+ ASAN_RT_PATH="$(ts_get_asan_rt_path "$TS_CMD_KILL")" -+ [ -n "$ASAN_RT_PATH" ] && export LD_PRELOAD="$ASAN_RT_PATH:$LD_PRELOAD" -+fi - - ts_init_subtest "by-disk" - init_device --- -2.25.1 - diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-kill.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-kill.patch deleted file mode 100644 index fa49fd414..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/tests-kill.patch +++ /dev/null @@ -1,88 +0,0 @@ -Don't hardcode the use of /bin/kill, as this could be kill.procps. Instead ask -the shell what kill binary to use, which will be the symlink in -/usr/lib/util-linux/ptest/bin/. - -Upstream-Status: Backport [https://github.com/karelzak/util-linux/pull/1367] -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From e3f8a88cf688dffacb5f6033a8d24e2db40f75f6 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Tue, 29 Jun 2021 16:34:20 +0100 -Subject: [PATCH] Don't hardcode /bin - ---- - tests/ts/kill/all_processes | 2 +- - tests/ts/kill/name_to_number | 2 +- - tests/ts/kill/options | 2 +- - tests/ts/kill/print_pid | 2 +- - tests/ts/kill/queue | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tests/ts/kill/all_processes b/tests/ts/kill/all_processes -index 0b137574d..b2280777f 100755 ---- a/tests/ts/kill/all_processes -+++ b/tests/ts/kill/all_processes -@@ -22,7 +22,7 @@ ts_skip_nonroot - - # make sure we do not use shell built-in command - if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then -- TS_CMD_KILL="/bin/kill" -+ TS_CMD_KILL="$(which kill)" - fi - - ts_check_test_command "$TS_CMD_KILL" -diff --git a/tests/ts/kill/name_to_number b/tests/ts/kill/name_to_number -index 9f4881cb7..8a7f4bef0 100755 ---- a/tests/ts/kill/name_to_number -+++ b/tests/ts/kill/name_to_number -@@ -20,7 +20,7 @@ ts_init "$*" - - # make sure we do not use shell built-in command - if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then -- TS_CMD_KILL="/bin/kill" -+ TS_CMD_KILL="$(which kill)" - fi - - ts_check_test_command "$TS_CMD_KILL" -diff --git a/tests/ts/kill/options b/tests/ts/kill/options -index 2788c70a2..10653a543 100755 ---- a/tests/ts/kill/options -+++ b/tests/ts/kill/options -@@ -20,7 +20,7 @@ ts_init "$*" - - # make sure we do not use shell built-in command - if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then -- TS_CMD_KILL="/bin/kill" -+ TS_CMD_KILL="$(which kill)" - fi - - ts_check_test_command "$TS_CMD_KILL" -diff --git a/tests/ts/kill/print_pid b/tests/ts/kill/print_pid -index 6926a3714..6e2db3711 100755 ---- a/tests/ts/kill/print_pid -+++ b/tests/ts/kill/print_pid -@@ -20,7 +20,7 @@ ts_init "$*" - - # make sure we do not use shell built-in command - if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then -- TS_CMD_KILL="/bin/kill" -+ TS_CMD_KILL="$(which kill)" - fi - - ts_check_test_command "$TS_CMD_KILL" -diff --git a/tests/ts/kill/queue b/tests/ts/kill/queue -index 18f10e8c2..6c9e9efc9 100755 ---- a/tests/ts/kill/queue -+++ b/tests/ts/kill/queue -@@ -20,7 +20,7 @@ ts_init "$*" - - # make sure we do not use shell built-in command - if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then -- TS_CMD_KILL="/bin/kill" -+ TS_CMD_KILL="$(which kill)" - fi - - ts_check_test_command "$TS_CMD_KILL" --- -2.25.1 - diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-lscpu.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-lscpu.patch deleted file mode 100644 index 36a19bd5a..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/tests-lscpu.patch +++ /dev/null @@ -1,42 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From c2ca2837a27a3f1344904037ea691bfdbb288f02 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 2 Jul 2021 13:12:13 +0200 -Subject: [PATCH] lscpu: don't use DMI if executed with --sysroot - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - sys-utils/lscpu-arm.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c -index d52765f9d..c7128094c 100644 ---- a/sys-utils/lscpu-arm.c -+++ b/sys-utils/lscpu-arm.c -@@ -322,7 +322,8 @@ static void arm_decode(struct lscpu_cxt *cxt, struct lscpu_cputype *ct) - - arm_ids_decode(ct); - arm_rXpY_decode(ct); -- if (cxt->is_cluster) -+ -+ if (!cxt->noalive && cxt->is_cluster) - ct->nr_socket_on_cluster = get_number_of_physical_sockets_from_dmi(); - } - -@@ -330,8 +331,9 @@ static int is_cluster_arm(struct lscpu_cxt *cxt) - { - struct stat st; - -- if (!(strcmp(cxt->arch->name, "aarch64")) && -- (stat(_PATH_ACPI_PPTT, &st) < 0) && (cxt->ncputypes == 1)) -+ if (!cxt->noalive -+ && strcmp(cxt->arch->name, "aarch64") == 0 -+ && stat(_PATH_ACPI_PPTT, &st) < 0 && cxt->ncputypes == 1) - return 1; - else - return 0; --- -2.25.1 - diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-ul.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-ul.patch deleted file mode 100644 index 689639310..000000000 --- a/poky/meta/recipes-core/util-linux/util-linux/tests-ul.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> - -From b1c71f19ea404e74d36ca5b8fbb0484043cdaef3 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@arm.com> -Date: Wed, 30 Jun 2021 11:25:01 +0100 -Subject: [PATCH] tests: mark ul/ul as a known failure - -As with ul/basic, this test produces different output when ran under -different terminals, which isn't very useful. - -Set TS_KNOWN_FAIL so that these problems don't cause the test to fail. - -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - tests/ts/ul/ul | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tests/ts/ul/ul b/tests/ts/ul/ul -index b856e33db..c707658ac 100755 ---- a/tests/ts/ul/ul -+++ b/tests/ts/ul/ul -@@ -20,6 +20,9 @@ ts_init "$*" - - ts_check_test_command "$TS_CMD_UL" - -+# This test provides different result on some terminals and virtual machines -+TS_KNOWN_FAIL="yes" -+ - printf "a\x08ab\x5F\x08c\\n\\ttab\\f\\b\\r" | - $TS_CMD_UL -t xterm >> $TS_OUTPUT 2>> $TS_ERRLOG - --- -2.25.1 - diff --git a/poky/meta/recipes-core/util-linux/util-linux_2.37.bb b/poky/meta/recipes-core/util-linux/util-linux_2.37.2.bb index 2548b7210..935159514 100644 --- a/poky/meta/recipes-core/util-linux/util-linux_2.37.bb +++ b/poky/meta/recipes-core/util-linux/util-linux_2.37.2.bb @@ -1,7 +1,7 @@ require util-linux.inc #gtk-doc is not enabled as it requires xmlto which requires util-linux -inherit autotools gettext pkgconfig systemd update-alternatives python3-dir bash-completion ptest +inherit autotools gettext manpages pkgconfig systemd update-alternatives python3-dir bash-completion ptest DEPENDS = "libcap-ng ncurses virtual/crypt zlib util-linux-libuuid" PACKAGES =+ "${PN}-swaponoff" @@ -10,12 +10,12 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmou python util_linux_binpackages () { def pkg_hook(f, pkg, file_regex, output_pattern, modulename): pn = d.getVar('PN') - d.appendVar('RRECOMMENDS_%s' % pn, ' %s' % pkg) + d.appendVar('RRECOMMENDS:%s' % pn, ' %s' % pkg) - if d.getVar('ALTERNATIVE_' + pkg): + if d.getVar('ALTERNATIVE:' + pkg): return if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): - d.setVar('ALTERNATIVE_' + pkg, modulename) + d.setVar('ALTERNATIVE:' + pkg, modulename) bindirs = sorted(list(set(d.expand("${base_sbindir} ${base_bindir} ${sbindir} ${bindir}").split()))) for dir in bindirs: @@ -41,9 +41,9 @@ python util_linux_binpackages () { pn = d.getVar('PN') for pkg, links in extras.items(): - of = d.getVar('FILES_' + pn + '-' + pkg) + of = d.getVar('FILES:' + pn + '-' + pkg) links = of + links - d.setVar('FILES_' + pn + '-' + pkg, links) + d.setVar('FILES:' + pn + '-' + pkg, links) } # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS @@ -63,7 +63,7 @@ PACKAGES_DYNAMIC = "^${PN}-.*" CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" UTIL_LINUX_LIBDIR = "${libdir}" -UTIL_LINUX_LIBDIR_class-target = "${base_libdir}" +UTIL_LINUX_LIBDIR:class-target = "${base_libdir}" EXTRA_OECONF = "\ --enable-libuuid --enable-libblkid \ \ @@ -81,17 +81,20 @@ EXTRA_OECONF = "\ --libdir='${UTIL_LINUX_LIBDIR}' \ " -EXTRA_OECONF_append_class-target = " --enable-setpriv" -EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" -EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" -EXTRA_OECONF_append = " --disable-hwclock-gplv3" +EXTRA_OECONF:append:class-target = " --enable-setpriv" +EXTRA_OECONF:append:class-native = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF:append:class-nativesdk = " --without-cap-ng --disable-setpriv" +EXTRA_OECONF:append = " --disable-hwclock-gplv3" # enable pcre2 for native/nativesdk to match host distros # this helps to keep same expectations when using the SDK or # build host versions during development # PACKAGECONFIG ?= "pcre2" -PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh pam', '', d)}" +PACKAGECONFIG:class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh pam', '', d)}" +# inherit manpages requires this to be present, however util-linux does not have +# configuration options, and installs manpages always +PACKAGECONFIG[manpages] = "" PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," # Respect the systemd feature for uuidd PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" @@ -106,43 +109,43 @@ PACKAGECONFIG[chfn-chsh] = "--enable-chfn-chsh,--disable-chfn-chsh," EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" -ALLOW_EMPTY_${PN} = "1" -FILES_${PN} = "" -FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" -FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" -FILES_${PN}-mount = "${sysconfdir}/default/mountall" -FILES_${PN}-runuser = "${sysconfdir}/pam.d/runuser*" -FILES_${PN}-su = "${sysconfdir}/pam.d/su-l" -CONFFILES_${PN}-su = "${sysconfdir}/pam.d/su-l" -FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ +ALLOW_EMPTY:${PN} = "1" +FILES:${PN} = "" +FILES:${PN}-doc += "${datadir}/getopt/getopt-*.*" +FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" +FILES:${PN}-mount = "${sysconfdir}/default/mountall" +FILES:${PN}-runuser = "${sysconfdir}/pam.d/runuser*" +FILES:${PN}-su = "${sysconfdir}/pam.d/su-l" +CONFFILES:${PN}-su = "${sysconfdir}/pam.d/su-l" +FILES:${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" # Util-linux' blkid replaces the e2fsprogs one -RCONFLICTS_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" -RREPLACES_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" +RCONFLICTS:${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" +RREPLACES:${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" -RRECOMMENDS_${PN}_class-native = "" -RRECOMMENDS_${PN}_class-nativesdk = "" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}_class-nativesdk = "" +RRECOMMENDS:${PN}:class-native = "" +RRECOMMENDS:${PN}:class-nativesdk = "" +RDEPENDS:${PN}:class-native = "" +RDEPENDS:${PN}:class-nativesdk = "" -RDEPENDS_${PN} += " util-linux-libuuid" -RDEPENDS_${PN}-dev += " util-linux-libuuid-dev" +RDEPENDS:${PN} += " util-linux-libuuid" +RDEPENDS:${PN}-dev += " util-linux-libuuid-dev" -RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" +RPROVIDES:${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" -RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" -RDEPENDS_${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod mdadm procps sed socat which xz" -RRECOMMENDS_${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop" -RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" -ALLOW_EMPTY_${PN}-swaponoff = "1" +RDEPENDS:${PN}-bash-completion += "${PN}-lsblk" +RDEPENDS:${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod mdadm procps sed socat which xz" +RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop" +RDEPENDS:${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" +ALLOW_EMPTY:${PN}-swaponoff = "1" #SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" -SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" -SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" -SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" -SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" +SYSTEMD_SERVICE:${PN}-uuidd = "uuidd.socket uuidd.service" +SYSTEMD_AUTO_ENABLE:${PN}-uuidd = "disable" +SYSTEMD_SERVICE:${PN}-fstrim = "fstrim.timer fstrim.service" +SYSTEMD_AUTO_ENABLE:${PN}-fstrim = "disable" do_install () { # with ccache the timestamps on compiled files may @@ -181,7 +184,7 @@ do_install () { rm -f ${D}${bindir}/chkdupexe } -do_install_append_class-target () { +do_install:append:class-target () { if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then install -d ${D}${sysconfdir}/pam.d install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser @@ -194,14 +197,14 @@ do_install_append_class-target () { } # nologin causes a conflict with shadow-native # kill causes a conflict with coreutils-native (if ${bindir}==${base_bindir}) -do_install_append_class-native () { +do_install:append:class-native () { rm -f ${D}${base_sbindir}/nologin rm -f ${D}${base_bindir}/kill } # dm-verity support introduces a circular build dependency, so util-linux-libuuid is split out for target builds # Need to build libuuid for uuidgen, but then delete it and let the other recipe ship it -do_install_append () { +do_install:append () { rm -rf ${D}${includedir}/uuid ${D}${libdir}/pkgconfig/uuid.pc ${D}${libdir}/libuuid* ${D}${base_libdir}/libuuid* } @@ -222,14 +225,14 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" -ALTERNATIVE_${PN}-agetty = "getty" +ALTERNATIVE:${PN}-agetty = "getty" ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" -ALTERNATIVE_${PN}-last = "last lastb" +ALTERNATIVE:${PN}-last = "last lastb" ALTERNATIVE_LINK_NAME[last] = "${bindir}/last" ALTERNATIVE_LINK_NAME[lastb] = "${bindir}/lastb" ALTERNATIVE_LINK_NAME[logger] = "${bindir}/logger" @@ -263,6 +266,32 @@ ALTERNATIVE_LINK_NAME[utmpdump] = "${bindir}/utmpdump" ALTERNATIVE_LINK_NAME[uuidgen] = "${bindir}/uuidgen" ALTERNATIVE_LINK_NAME[wall] = "${bindir}/wall" +ALTERNATIVE:${PN}-doc = "\ +blkid.8 eject.1 findfs.8 fsck.8 kill.1 last.1 lastb.1 libblkid.3 logger.1 mesg.1 \ +mountpoint.1 nologin.8 rfkill.8 sulogin.8 utmpdump.1 uuid.3 wall.1\ +" +ALTERNATIVE:${PN}-doc += "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'su.1', '', d)}" + +ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8" +ALTERNATIVE_LINK_NAME[eject.1] = "${mandir}/man1/eject.1" +ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8" +ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" +ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1" +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" +ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" +ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3" +ALTERNATIVE_LINK_NAME[logger.1] = "${mandir}/man1/logger.1" +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1" +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1" +ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" +ALTERNATIVE_LINK_NAME[rfkill.8] = "${mandir}/man8/rfkill.8" +ALTERNATIVE_LINK_NAME[setpriv.1] = "${mandir}/man1/setpriv.1" +ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" +ALTERNATIVE_LINK_NAME[uuid.3] = "${mandir}/man3/uuid.3" +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" + BBCLASSEXTEND = "native nativesdk" PTEST_BINDIR = "1" diff --git a/poky/meta/recipes-core/volatile-binds/volatile-binds.bb b/poky/meta/recipes-core/volatile-binds/volatile-binds.bb index 3c8b18291..b693c24c4 100644 --- a/poky/meta/recipes-core/volatile-binds/volatile-binds.bb +++ b/poky/meta/recipes-core/volatile-binds/volatile-binds.bb @@ -33,9 +33,9 @@ def volatile_systemd_services(d): services.append("%s.service" % what[1:].replace("/", "-")) return " ".join(services) -SYSTEMD_SERVICE_${PN} = "${@volatile_systemd_services(d)}" +SYSTEMD_SERVICE:${PN} = "${@volatile_systemd_services(d)}" -FILES_${PN} += "${systemd_unitdir}/system/*.service ${servicedir}" +FILES:${PN} += "${systemd_unitdir}/system/*.service ${servicedir}" do_compile () { while read spec mountpoint; do @@ -68,7 +68,7 @@ do_install () { install -m 0755 mount-copybind ${D}${base_sbindir}/ install -d ${D}${systemd_unitdir}/system - for service in ${SYSTEMD_SERVICE_${PN}}; do + for service in ${SYSTEMD_SERVICE:${PN}}; do install -m 0644 $service ${D}${systemd_unitdir}/system/ done diff --git a/poky/meta/recipes-core/zlib/zlib_1.2.11.bb b/poky/meta/recipes-core/zlib/zlib_1.2.11.bb index ef9431ae4..1c06aa0ab 100644 --- a/poky/meta/recipes-core/zlib/zlib_1.2.11.bb +++ b/poky/meta/recipes-core/zlib/zlib_1.2.11.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e1 CFLAGS += "-D_REENTRANT" -RDEPENDS_${PN}-ptest += "make" +RDEPENDS:${PN}-ptest += "make" inherit ptest @@ -39,7 +39,7 @@ do_install_ptest() { # Move zlib shared libraries for target builds to $base_libdir so the library # can be used in early boot before $prefix is mounted. -do_install_append_class-target() { +do_install:append:class-target() { if [ ${base_libdir} != ${libdir} ] then mkdir -p ${D}/${base_libdir} |