diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-core | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
106 files changed, 818 insertions, 818 deletions
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 94299431f6..032827a0d0 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb | |||
@@ -28,7 +28,7 @@ S = "${WORKDIR}" | |||
28 | 28 | ||
29 | INHIBIT_DEFAULT_DEPS = "1" | 29 | INHIBIT_DEFAULT_DEPS = "1" |
30 | 30 | ||
31 | docdir_append = "/${P}" | 31 | docdir:append = "/${P}" |
32 | dirs1777 = "/tmp ${localstatedir}/volatile/tmp" | 32 | dirs1777 = "/tmp ${localstatedir}/volatile/tmp" |
33 | dirs2775 = "" | 33 | dirs2775 = "" |
34 | dirs555 = "/sys /proc" | 34 | dirs555 = "/sys /proc" |
@@ -64,7 +64,7 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ | |||
64 | # hostnames. | 64 | # hostnames. |
65 | # | 65 | # |
66 | # The hostname can be changed outside of this recipe by using | 66 | # The hostname can be changed outside of this recipe by using |
67 | # hostname_pn-base-files = "my-host-name". | 67 | # hostname:pn-base-files = "my-host-name". |
68 | hostname = "${MACHINE}" | 68 | hostname = "${MACHINE}" |
69 | 69 | ||
70 | BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" | 70 | BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" |
@@ -77,7 +77,7 @@ BASEFILESISSUEINSTALL ?= "do_install_basefilesissue" | |||
77 | # Otherwise the directory creation will fail and we will have circular symbolic | 77 | # Otherwise the directory creation will fail and we will have circular symbolic |
78 | # links. | 78 | # links. |
79 | # | 79 | # |
80 | pkg_preinst_${PN} () { | 80 | pkg_preinst:${PN} () { |
81 | #!/bin/sh -e | 81 | #!/bin/sh -e |
82 | if [ x"$D" = "x" ]; then | 82 | if [ x"$D" = "x" ]; then |
83 | if [ -h "/var/lock" ]; then | 83 | if [ -h "/var/lock" ]; then |
@@ -139,7 +139,7 @@ do_install () { | |||
139 | fi | 139 | fi |
140 | } | 140 | } |
141 | 141 | ||
142 | do_install_append_libc-glibc () { | 142 | do_install:append:libc-glibc () { |
143 | install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf | 143 | install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf |
144 | } | 144 | } |
145 | 145 | ||
@@ -162,7 +162,7 @@ do_install_basefilesissue () { | |||
162 | } | 162 | } |
163 | do_install_basefilesissue[vardepsexclude] += "DATE" | 163 | do_install_basefilesissue[vardepsexclude] += "DATE" |
164 | 164 | ||
165 | do_install_append_linuxstdbase() { | 165 | do_install:append:linuxstdbase() { |
166 | for d in ${dirs755-lsb}; do | 166 | for d in ${dirs755-lsb}; do |
167 | install -m 0755 -d ${D}$d | 167 | install -m 0755 -d ${D}$d |
168 | done | 168 | done |
@@ -175,10 +175,10 @@ do_install_append_linuxstdbase() { | |||
175 | SYSROOT_DIRS += "${sysconfdir}/skel" | 175 | SYSROOT_DIRS += "${sysconfdir}/skel" |
176 | 176 | ||
177 | PACKAGES = "${PN}-doc ${PN} ${PN}-dev ${PN}-dbg" | 177 | PACKAGES = "${PN}-doc ${PN} ${PN}-dev ${PN}-dbg" |
178 | FILES_${PN} = "/" | 178 | FILES:${PN} = "/" |
179 | FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" | 179 | FILES:${PN}-doc = "${docdir} ${datadir}/common-licenses" |
180 | 180 | ||
181 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 181 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
182 | 182 | ||
183 | CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname ${sysconfdir}/hosts'][(d.getVar('hostname') != '')]} ${sysconfdir}/shells" | 183 | CONFFILES:${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname ${sysconfdir}/hosts'][(d.getVar('hostname') != '')]} ${sysconfdir}/shells" |
184 | CONFFILES_${PN} += "${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile" | 184 | CONFFILES:${PN} += "${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile" |
diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb index 65b3cd778d..2926a377c6 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | |||
@@ -73,7 +73,7 @@ base_passwd_tweaksysroot () { | |||
73 | chmod 0755 $dest | 73 | chmod 0755 $dest |
74 | } | 74 | } |
75 | 75 | ||
76 | python populate_packages_prepend() { | 76 | python populate_packages:prepend() { |
77 | # Add in the preinst function for ${PN} | 77 | # Add in the preinst function for ${PN} |
78 | # We have to do this here as prior to this, passwd/group.master | 78 | # We have to do this here as prior to this, passwd/group.master |
79 | # would be unavailable. We need to create these files at preinst | 79 | # would be unavailable. We need to create these files at preinst |
@@ -98,17 +98,17 @@ if [ ! -e $D${sysconfdir}/group ]; then | |||
98 | """ + group + """EOF | 98 | """ + group + """EOF |
99 | fi | 99 | fi |
100 | """ | 100 | """ |
101 | d.setVar(d.expand('pkg_preinst_${PN}'), preinst) | 101 | d.setVar(d.expand('pkg_preinst:${PN}'), preinst) |
102 | } | 102 | } |
103 | 103 | ||
104 | addtask do_package after do_populate_sysroot | 104 | addtask do_package after do_populate_sysroot |
105 | 105 | ||
106 | ALLOW_EMPTY_${PN} = "1" | 106 | ALLOW_EMPTY:${PN} = "1" |
107 | 107 | ||
108 | PACKAGES =+ "${PN}-update" | 108 | PACKAGES =+ "${PN}-update" |
109 | FILES_${PN}-update = "${sbindir}/* ${datadir}/${PN}" | 109 | FILES:${PN}-update = "${sbindir}/* ${datadir}/${PN}" |
110 | 110 | ||
111 | pkg_postinst_${PN}-update () { | 111 | pkg_postinst:${PN}-update () { |
112 | #!/bin/sh | 112 | #!/bin/sh |
113 | if [ -n "$D" ]; then | 113 | if [ -n "$D" ]; then |
114 | exit 0 | 114 | exit 0 |
diff --git a/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb b/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb index 3804f4f7b2..be8c06323c 100644 --- a/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb +++ b/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb | |||
@@ -45,14 +45,14 @@ EOF | |||
45 | 45 | ||
46 | } | 46 | } |
47 | 47 | ||
48 | pkg_postinst_${PN} () { | 48 | pkg_postinst:${PN} () { |
49 | # run this on host and on target | 49 | # run this on host and on target |
50 | if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then | 50 | if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then |
51 | exit 0 | 51 | exit 0 |
52 | fi | 52 | fi |
53 | } | 53 | } |
54 | 54 | ||
55 | pkg_postinst_ontarget_${PN} () { | 55 | pkg_postinst_ontarget:${PN} () { |
56 | # run this on the target | 56 | # run this on the target |
57 | if [ -e /proc/consoles ]; then | 57 | if [ -e /proc/consoles ]; then |
58 | tmp="${SERIAL_CONSOLES_CHECK}" | 58 | tmp="${SERIAL_CONSOLES_CHECK}" |
@@ -76,10 +76,10 @@ fi | |||
76 | # Set PACKAGE_ARCH appropriately. | 76 | # Set PACKAGE_ARCH appropriately. |
77 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 77 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
78 | 78 | ||
79 | FILES_${PN} = "${sysconfdir}/inittab" | 79 | FILES:${PN} = "${sysconfdir}/inittab" |
80 | CONFFILES_${PN} = "${sysconfdir}/inittab" | 80 | CONFFILES:${PN} = "${sysconfdir}/inittab" |
81 | 81 | ||
82 | RCONFLICTS_${PN} = "sysvinit-inittab" | 82 | RCONFLICTS:${PN} = "sysvinit-inittab" |
83 | 83 | ||
84 | USE_VT ?= "1" | 84 | USE_VT ?= "1" |
85 | SYSVINIT_ENABLED_GETTYS ?= "1" | 85 | SYSVINIT_ENABLED_GETTYS ?= "1" |
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 47fcb59302..d85e2a3d7a 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -23,39 +23,39 @@ EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${ | |||
23 | 23 | ||
24 | PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" | 24 | PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" |
25 | 25 | ||
26 | FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" | 26 | FILES:${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" |
27 | FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog" | 27 | FILES:${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog" |
28 | FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf ${sysconfdir}/mdev/*" | 28 | FILES:${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf ${sysconfdir}/mdev/*" |
29 | FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" | 29 | FILES:${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" |
30 | FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" | 30 | FILES:${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" |
31 | FILES_${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh" | 31 | FILES:${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh" |
32 | 32 | ||
33 | INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev ${PN}-hwclock" | 33 | INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev ${PN}-hwclock" |
34 | 34 | ||
35 | INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" | 35 | INITSCRIPT_NAME:${PN}-httpd = "busybox-httpd" |
36 | INITSCRIPT_NAME_${PN}-hwclock = "hwclock.sh" | 36 | INITSCRIPT_NAME:${PN}-hwclock = "hwclock.sh" |
37 | INITSCRIPT_NAME_${PN}-mdev = "mdev" | 37 | INITSCRIPT_NAME:${PN}-mdev = "mdev" |
38 | INITSCRIPT_PARAMS_${PN}-mdev = "start 04 S ." | 38 | INITSCRIPT_PARAMS:${PN}-mdev = "start 04 S ." |
39 | INITSCRIPT_NAME_${PN}-syslog = "syslog" | 39 | INITSCRIPT_NAME:${PN}-syslog = "syslog" |
40 | INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" | 40 | INITSCRIPT_NAME:${PN}-udhcpd = "busybox-udhcpd" |
41 | 41 | ||
42 | SYSTEMD_PACKAGES = "${PN}-syslog" | 42 | SYSTEMD_PACKAGES = "${PN}-syslog" |
43 | SYSTEMD_SERVICE_${PN}-syslog = "${@bb.utils.contains('SRC_URI', 'file://syslog.cfg', 'busybox-syslog.service', '', d)}" | 43 | SYSTEMD_SERVICE:${PN}-syslog = "${@bb.utils.contains('SRC_URI', 'file://syslog.cfg', 'busybox-syslog.service', '', d)}" |
44 | 44 | ||
45 | RDEPENDS_${PN}-syslog = "busybox" | 45 | RDEPENDS:${PN}-syslog = "busybox" |
46 | CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf" | 46 | CONFFILES:${PN}-syslog = "${sysconfdir}/syslog-startup.conf" |
47 | RCONFLICTS_${PN}-syslog = "rsyslog sysklogd syslog-ng" | 47 | RCONFLICTS:${PN}-syslog = "rsyslog sysklogd syslog-ng" |
48 | 48 | ||
49 | CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" | 49 | CONFFILES:${PN}-mdev = "${sysconfdir}/mdev.conf" |
50 | 50 | ||
51 | RRECOMMENDS_${PN} = "${PN}-udhcpc" | 51 | RRECOMMENDS:${PN} = "${PN}-udhcpc" |
52 | 52 | ||
53 | RDEPENDS_${PN} = "${@["", "busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]}" | 53 | RDEPENDS:${PN} = "${@["", "busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]}" |
54 | 54 | ||
55 | inherit cml1 systemd update-rc.d ptest | 55 | inherit cml1 systemd update-rc.d ptest |
56 | 56 | ||
57 | # busybox's unzip test case needs zip command, which busybox itself does not provide | 57 | # busybox's unzip test case needs zip command, which busybox itself does not provide |
58 | RDEPENDS_${PN}-ptest = "zip" | 58 | RDEPENDS:${PN}-ptest = "zip" |
59 | 59 | ||
60 | # internal helper | 60 | # internal helper |
61 | def busybox_cfg(feature, tokens, cnf, rem): | 61 | def busybox_cfg(feature, tokens, cnf, rem): |
@@ -97,12 +97,12 @@ DO_IPv6 := "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 1, 0, d)}" | |||
97 | 97 | ||
98 | python () { | 98 | python () { |
99 | if "${OE_DEL}": | 99 | if "${OE_DEL}": |
100 | d.setVar('configmangle_append', "${OE_DEL}" + "\n") | 100 | d.setVar('configmangle:append', "${OE_DEL}" + "\n") |
101 | if "${OE_FEATURES}": | 101 | if "${OE_FEATURES}": |
102 | d.setVar('configmangle_append', | 102 | d.setVar('configmangle:append', |
103 | "/^### DISTRO FEATURES$/a\\\n%s\n\n" % | 103 | "/^### DISTRO FEATURES$/a\\\n%s\n\n" % |
104 | ("\\n".join((d.expand("${OE_FEATURES}").split("\n"))))) | 104 | ("\\n".join((d.expand("${OE_FEATURES}").split("\n"))))) |
105 | d.setVar('configmangle_append', | 105 | d.setVar('configmangle:append', |
106 | "/^### CROSS$/a\\\n%s\n" % | 106 | "/^### CROSS$/a\\\n%s\n" % |
107 | ("\\n".join(["CONFIG_EXTRA_CFLAGS=\"${CFLAGS} ${HOST_CC_ARCH}\"" | 107 | ("\\n".join(["CONFIG_EXTRA_CFLAGS=\"${CFLAGS} ${HOST_CC_ARCH}\"" |
108 | ]) | 108 | ]) |
@@ -356,7 +356,7 @@ inherit update-alternatives | |||
356 | 356 | ||
357 | ALTERNATIVE_PRIORITY = "50" | 357 | ALTERNATIVE_PRIORITY = "50" |
358 | 358 | ||
359 | python do_package_prepend () { | 359 | python do_package:prepend () { |
360 | # We need to load the full set of busybox provides from the /etc/busybox.links | 360 | # We need to load the full set of busybox provides from the /etc/busybox.links |
361 | # Use this to see the update-alternatives with the right information | 361 | # Use this to see the update-alternatives with the right information |
362 | 362 | ||
@@ -373,9 +373,9 @@ python do_package_prepend () { | |||
373 | if alt_name == '[': | 373 | if alt_name == '[': |
374 | alt_name = 'lbracket' | 374 | alt_name = 'lbracket' |
375 | if alt_name == 'klogd' or alt_name == 'syslogd': | 375 | if alt_name == 'klogd' or alt_name == 'syslogd': |
376 | d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' ' + alt_name) | 376 | d.appendVar('ALTERNATIVE:%s-syslog' % (pn), ' ' + alt_name) |
377 | else: | 377 | else: |
378 | d.appendVar('ALTERNATIVE_%s' % (pn), ' ' + alt_name) | 378 | d.appendVar('ALTERNATIVE:%s' % (pn), ' ' + alt_name) |
379 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link_name) | 379 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link_name) |
380 | if os.path.exists('%s%s' % (dvar, target)): | 380 | if os.path.exists('%s%s' % (dvar, target)): |
381 | d.setVarFlag('ALTERNATIVE_TARGET', alt_name, target) | 381 | d.setVarFlag('ALTERNATIVE_TARGET', alt_name, target) |
@@ -395,7 +395,7 @@ python do_package_prepend () { | |||
395 | # These symlinks will later be updated by update-alternatives calls. | 395 | # These symlinks will later be updated by update-alternatives calls. |
396 | # The update-alternatives.bbclass' postinst script runs firstly before other | 396 | # The update-alternatives.bbclass' postinst script runs firstly before other |
397 | # postinst, but this part of code needs run firstly, so add this funtion. | 397 | # postinst, but this part of code needs run firstly, so add this funtion. |
398 | python populate_packages_updatealternatives_append() { | 398 | python populate_packages_updatealternatives:append() { |
399 | postinst = """ | 399 | postinst = """ |
400 | test -n 2 > /dev/null || alias test='busybox test' | 400 | test -n 2 > /dev/null || alias test='busybox test' |
401 | if test "x$D" = "x"; then | 401 | if test "x$D" = "x"; then |
@@ -422,10 +422,10 @@ if grep -q "^${base_bindir}/bash$" $D${sysconfdir}/busybox.links*; then | |||
422 | fi | 422 | fi |
423 | 423 | ||
424 | """ | 424 | """ |
425 | d.prependVar('pkg_postinst_%s' % pkg, postinst) | 425 | d.prependVar('pkg_postinst:%s' % pkg, postinst) |
426 | } | 426 | } |
427 | 427 | ||
428 | pkg_postinst_${PN}_prepend () { | 428 | pkg_postinst:${PN}:prepend () { |
429 | # Need path to saved utils, but they may have be removed on upgrade of busybox | 429 | # Need path to saved utils, but they may have be removed on upgrade of busybox |
430 | # Only use shell to get paths. Also capture if busybox was saved. | 430 | # Only use shell to get paths. Also capture if busybox was saved. |
431 | BUSYBOX="" | 431 | BUSYBOX="" |
@@ -441,7 +441,7 @@ pkg_postinst_${PN}_prepend () { | |||
441 | fi | 441 | fi |
442 | } | 442 | } |
443 | 443 | ||
444 | pkg_postinst_${PN}_append () { | 444 | pkg_postinst:${PN}:append () { |
445 | # If busybox exists in the remove directory it is because it was the only shell left. | 445 | # If busybox exists in the remove directory it is because it was the only shell left. |
446 | if [ "x$D" = "x" ] ; then | 446 | if [ "x$D" = "x" ] ; then |
447 | if [ "x$BUSYBOX" != "x" ] ; then | 447 | if [ "x$BUSYBOX" != "x" ] ; then |
@@ -451,7 +451,7 @@ pkg_postinst_${PN}_append () { | |||
451 | fi | 451 | fi |
452 | } | 452 | } |
453 | 453 | ||
454 | pkg_prerm_${PN} () { | 454 | pkg_prerm:${PN} () { |
455 | # This is so you can make busybox commit suicide - removing busybox with no other packages | 455 | # This is so you can make busybox commit suicide - removing busybox with no other packages |
456 | # providing its files, this will make update-alternatives work, but the update-rc.d part | 456 | # providing its files, this will make update-alternatives work, but the update-rc.d part |
457 | # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh | 457 | # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh |
@@ -481,7 +481,7 @@ pkg_prerm_${PN} () { | |||
481 | fi | 481 | fi |
482 | } | 482 | } |
483 | 483 | ||
484 | pkg_postrm_${PN} () { | 484 | pkg_postrm:${PN} () { |
485 | # Add path to remove dir in case we removed our only grep | 485 | # Add path to remove dir in case we removed our only grep |
486 | if [ "x$D" = "x" ] ; then | 486 | if [ "x$D" = "x" ] ; then |
487 | for busybox_rmdir in /tmp/busyboxrm-*; do | 487 | for busybox_rmdir in /tmp/busyboxrm-*; do |
@@ -496,7 +496,7 @@ pkg_postrm_${PN} () { | |||
496 | fi | 496 | fi |
497 | } | 497 | } |
498 | 498 | ||
499 | pkg_prerm_${PN}-syslog () { | 499 | pkg_prerm:${PN}-syslog () { |
500 | # remove syslog | 500 | # remove syslog |
501 | if test "x$D" = "x"; then | 501 | if test "x$D" = "x"; then |
502 | if test "$1" = "upgrade" -o "$1" = "remove"; then | 502 | if test "$1" = "upgrade" -o "$1" = "remove"; then |
@@ -505,4 +505,4 @@ pkg_prerm_${PN}-syslog () { | |||
505 | fi | 505 | fi |
506 | } | 506 | } |
507 | 507 | ||
508 | RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/ash', '', d)}" | 508 | RPROVIDES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/ash', '', d)}" |
diff --git a/meta/recipes-core/busybox/busybox_1.33.1.bb b/meta/recipes-core/busybox/busybox_1.33.1.bb index 4c2bc1106d..1e3e34e2a4 100644 --- a/meta/recipes-core/busybox/busybox_1.33.1.bb +++ b/meta/recipes-core/busybox/busybox_1.33.1.bb | |||
@@ -50,6 +50,6 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
50 | file://0001-gen_build_files-Use-C-locale-when-calling-sed-on-glo.patch \ | 50 | file://0001-gen_build_files-Use-C-locale-when-calling-sed-on-glo.patch \ |
51 | file://0001-mktemp-add-tmpdir-option.patch \ | 51 | file://0001-mktemp-add-tmpdir-option.patch \ |
52 | " | 52 | " |
53 | SRC_URI_append_libc-musl = " file://musl.cfg " | 53 | SRC_URI:append:libc-musl = " file://musl.cfg " |
54 | 54 | ||
55 | SRC_URI[tarball.sha256sum] = "12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28" | 55 | SRC_URI[tarball.sha256sum] = "12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28" |
diff --git a/meta/recipes-core/coreutils/coreutils_8.32.bb b/meta/recipes-core/coreutils/coreutils_8.32.bb index dd271d4968..f82572ed52 100644 --- a/meta/recipes-core/coreutils/coreutils_8.32.bb +++ b/meta/recipes-core/coreutils/coreutils_8.32.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ | |||
9 | file://src/ls.c;beginline=1;endline=15;md5=b7d80abf5b279320fb0e4b1007ed108b \ | 9 | file://src/ls.c;beginline=1;endline=15;md5=b7d80abf5b279320fb0e4b1007ed108b \ |
10 | " | 10 | " |
11 | DEPENDS = "gmp libcap" | 11 | DEPENDS = "gmp libcap" |
12 | DEPENDS_class-native = "" | 12 | DEPENDS:class-native = "" |
13 | 13 | ||
14 | inherit autotools gettext texinfo | 14 | inherit autotools gettext texinfo |
15 | 15 | ||
@@ -31,21 +31,21 @@ SRC_URI[sha256sum] = "4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0b | |||
31 | # runcon is not really a sandbox command, use `runcon ... setsid ...` to avoid this particular issue. | 31 | # runcon is not really a sandbox command, use `runcon ... setsid ...` to avoid this particular issue. |
32 | CVE_CHECK_WHITELIST += "CVE-2016-2781" | 32 | CVE_CHECK_WHITELIST += "CVE-2016-2781" |
33 | 33 | ||
34 | EXTRA_OECONF_class-native = "--without-gmp" | 34 | EXTRA_OECONF:class-native = "--without-gmp" |
35 | EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}" | 35 | EXTRA_OECONF:class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}" |
36 | EXTRA_OECONF_class-nativesdk = "--enable-install-program=arch,hostname" | 36 | EXTRA_OECONF:class-nativesdk = "--enable-install-program=arch,hostname" |
37 | 37 | ||
38 | # acl and xattr are not default features | 38 | # acl and xattr are not default features |
39 | # | 39 | # |
40 | PACKAGECONFIG_class-target ??= "\ | 40 | PACKAGECONFIG:class-target ??= "\ |
41 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)} \ | 41 | ${@bb.utils.filter('DISTRO_FEATURES', 'acl xattr', d)} \ |
42 | " | 42 | " |
43 | 43 | ||
44 | # The lib/oe/path.py requires xattr | 44 | # The lib/oe/path.py requires xattr |
45 | PACKAGECONFIG_class-native ??= "xattr" | 45 | PACKAGECONFIG:class-native ??= "xattr" |
46 | 46 | ||
47 | # oe-core builds need xattr support | 47 | # oe-core builds need xattr support |
48 | PACKAGECONFIG_class-nativesdk ??= "xattr" | 48 | PACKAGECONFIG:class-nativesdk ??= "xattr" |
49 | 49 | ||
50 | # with, without, depends, rdepends | 50 | # with, without, depends, rdepends |
51 | # | 51 | # |
@@ -71,16 +71,16 @@ sbindir_progs= "chroot" | |||
71 | # coreutils-stdbuf without getting the rest of coreutils, but make | 71 | # coreutils-stdbuf without getting the rest of coreutils, but make |
72 | # coreutils itself pull in stdbuf, so IMAGE_INSTALL += "coreutils" | 72 | # coreutils itself pull in stdbuf, so IMAGE_INSTALL += "coreutils" |
73 | # always provides all coreutils | 73 | # always provides all coreutils |
74 | PACKAGE_BEFORE_PN_class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}" | 74 | PACKAGE_BEFORE_PN:class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}" |
75 | FILES_coreutils-stdbuf = "${bindir}/stdbuf ${libdir}/coreutils/libstdbuf.so" | 75 | FILES:coreutils-stdbuf = "${bindir}/stdbuf ${libdir}/coreutils/libstdbuf.so" |
76 | RDEPENDS_coreutils_class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}" | 76 | RDEPENDS:coreutils:class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}" |
77 | 77 | ||
78 | # However, when the single-binary PACKAGECONFIG is used, stdbuf | 78 | # However, when the single-binary PACKAGECONFIG is used, stdbuf |
79 | # functionality is built into the single coreutils binary, so there's | 79 | # functionality is built into the single coreutils binary, so there's |
80 | # no point splitting /usr/bin/stdbuf to its own package. Instead, add | 80 | # no point splitting /usr/bin/stdbuf to its own package. Instead, add |
81 | # an RPROVIDE so that rdepending on coreutils-stdbuf will work | 81 | # an RPROVIDE so that rdepending on coreutils-stdbuf will work |
82 | # regardless of whether single-binary is in effect. | 82 | # regardless of whether single-binary is in effect. |
83 | RPROVIDES_coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', 'coreutils-stdbuf', '', d)}" | 83 | RPROVIDES:coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', 'coreutils-stdbuf', '', d)}" |
84 | 84 | ||
85 | # Let aclocal use the relative path for the m4 file rather than the | 85 | # Let aclocal use the relative path for the m4 file rather than the |
86 | # absolute since coreutils has a lot of m4 files, otherwise there might | 86 | # absolute since coreutils has a lot of m4 files, otherwise there might |
@@ -89,20 +89,20 @@ RPROVIDES_coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', ' | |||
89 | acpaths = "-I ./m4" | 89 | acpaths = "-I ./m4" |
90 | 90 | ||
91 | # Deal with a separate builddir failure if src doesn't exist when creating version.c/version.h | 91 | # Deal with a separate builddir failure if src doesn't exist when creating version.c/version.h |
92 | do_compile_prepend () { | 92 | do_compile:prepend () { |
93 | mkdir -p ${B}/src | 93 | mkdir -p ${B}/src |
94 | } | 94 | } |
95 | 95 | ||
96 | do_install_class-native() { | 96 | do_install:class-native() { |
97 | autotools_do_install | 97 | autotools_do_install |
98 | # remove groups to fix conflict with shadow-native | 98 | # remove groups to fix conflict with shadow-native |
99 | rm -f ${D}${STAGING_BINDIR_NATIVE}/groups | 99 | rm -f ${D}${STAGING_BINDIR_NATIVE}/groups |
100 | # The return is a must since native doesn't need the | 100 | # The return is a must since native doesn't need the |
101 | # do_install_append() in the below. | 101 | # do_install:append() in the below. |
102 | return | 102 | return |
103 | } | 103 | } |
104 | 104 | ||
105 | do_install_append() { | 105 | do_install:append() { |
106 | for i in df mktemp nice printenv base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done | 106 | for i in df mktemp nice printenv base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done |
107 | 107 | ||
108 | install -d ${D}${base_bindir} | 108 | install -d ${D}${base_bindir} |
@@ -122,8 +122,8 @@ inherit update-alternatives | |||
122 | ALTERNATIVE_PRIORITY = "100" | 122 | ALTERNATIVE_PRIORITY = "100" |
123 | # Make hostname's priority higher than busybox but lower than net-tools | 123 | # Make hostname's priority higher than busybox but lower than net-tools |
124 | ALTERNATIVE_PRIORITY[hostname] = "90" | 124 | ALTERNATIVE_PRIORITY[hostname] = "90" |
125 | ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base32 base64 nice printenv mktemp df" | 125 | ALTERNATIVE:${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base32 base64 nice printenv mktemp df" |
126 | ALTERNATIVE_${PN}-doc = "base64.1 nice.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1" | 126 | ALTERNATIVE:${PN}-doc = "base64.1 nice.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1" |
127 | 127 | ||
128 | ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" | 128 | ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" |
129 | 129 | ||
@@ -166,12 +166,12 @@ BBCLASSEXTEND = "native nativesdk" | |||
166 | 166 | ||
167 | inherit ptest | 167 | inherit ptest |
168 | 168 | ||
169 | RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl make perl perl-modules python3-core sed shadow" | 169 | RDEPENDS:${PN}-ptest += "bash findutils gawk liberror-perl make perl perl-modules python3-core sed shadow" |
170 | 170 | ||
171 | # -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy | 171 | # -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy |
172 | # may need tweaking if DEPENDS changes | 172 | # may need tweaking if DEPENDS changes |
173 | RRECOMMENDS_coreutils-dev[nodeprrecs] = "1" | 173 | RRECOMMENDS:coreutils-dev[nodeprrecs] = "1" |
174 | RRECOMMENDS_coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" | 174 | RRECOMMENDS:coreutils-dev = "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev" |
175 | 175 | ||
176 | do_install_ptest () { | 176 | do_install_ptest () { |
177 | install -d ${D}${PTEST_PATH}/tests | 177 | install -d ${D}${PTEST_PATH}/tests |
@@ -206,7 +206,7 @@ do_install_ptest () { | |||
206 | sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest | 206 | sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest |
207 | } | 207 | } |
208 | 208 | ||
209 | FILES_${PN}-ptest += "${bindir}/getlimits" | 209 | FILES:${PN}-ptest += "${bindir}/getlimits" |
210 | 210 | ||
211 | # These are specific to Opensuse | 211 | # These are specific to Opensuse |
212 | CVE_WHITELIST += "CVE-2013-0221 CVE-2013-0222 CVE-2013-0223" | 212 | CVE_WHITELIST += "CVE-2013-0221 CVE-2013-0222 CVE-2013-0223" |
diff --git a/meta/recipes-core/dbus/dbus-glib_0.112.bb b/meta/recipes-core/dbus/dbus-glib_0.112.bb index 003c3accc3..a03b2addfd 100644 --- a/meta/recipes-core/dbus/dbus-glib_0.112.bb +++ b/meta/recipes-core/dbus/dbus-glib_0.112.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c31c73c1d8f5d06784b2ccd22e42d641 \ | |||
8 | SECTION = "base" | 8 | SECTION = "base" |
9 | 9 | ||
10 | DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" | 10 | DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" |
11 | DEPENDS_class-native = "glib-2.0-native dbus-native" | 11 | DEPENDS:class-native = "glib-2.0-native dbus-native" |
12 | 12 | ||
13 | SRC_URI = "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ | 13 | SRC_URI = "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ |
14 | file://no-examples.patch \ | 14 | file://no-examples.patch \ |
@@ -24,16 +24,16 @@ inherit autotools pkgconfig gettext bash-completion gtk-doc | |||
24 | PACKAGECONFIG ??= "" | 24 | PACKAGECONFIG ??= "" |
25 | PACKAGECONFIG[tests] = "--enable-tests,,," | 25 | PACKAGECONFIG[tests] = "--enable-tests,,," |
26 | 26 | ||
27 | EXTRA_OECONF_class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" | 27 | EXTRA_OECONF:class-target = "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" |
28 | 28 | ||
29 | PACKAGES += "${PN}-tests" | 29 | PACKAGES += "${PN}-tests" |
30 | 30 | ||
31 | FILES_${PN} = "${libdir}/lib*${SOLIBS}" | 31 | FILES:${PN} = "${libdir}/lib*${SOLIBS}" |
32 | FILES_${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" | 32 | FILES:${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" |
33 | FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" | 33 | FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" |
34 | FILES_${PN}-dev += "${bindir}/dbus-binding-tool" | 34 | FILES:${PN}-dev += "${bindir}/dbus-binding-tool" |
35 | 35 | ||
36 | RDEPENDS_${PN}-tests += "dbus-x11" | 36 | RDEPENDS:${PN}-tests += "dbus-x11" |
37 | FILES_${PN}-tests = "${datadir}/${BPN}/tests" | 37 | FILES:${PN}-tests = "${datadir}/${BPN}/tests" |
38 | 38 | ||
39 | BBCLASSEXTEND = "native" | 39 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-core/dbus/dbus-test_1.12.20.bb b/meta/recipes-core/dbus/dbus-test_1.12.20.bb index 755c841bad..ae70301431 100644 --- a/meta/recipes-core/dbus/dbus-test_1.12.20.bb +++ b/meta/recipes-core/dbus/dbus-test_1.12.20.bb | |||
@@ -10,7 +10,7 @@ SRC_URI += "file://run-ptest \ | |||
10 | 10 | ||
11 | DEPENDS = "dbus glib-2.0" | 11 | DEPENDS = "dbus glib-2.0" |
12 | 12 | ||
13 | RDEPENDS_${PN}-dev = "" | 13 | RDEPENDS:${PN}-dev = "" |
14 | 14 | ||
15 | S="${WORKDIR}/dbus-${PV}" | 15 | S="${WORKDIR}/dbus-${PV}" |
16 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" | 16 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" |
@@ -58,7 +58,7 @@ do_install_ptest() { | |||
58 | sed -i -e 's;@PTEST_PATH@;${PTEST_PATH};g' ${D}${PTEST_PATH}/run-ptest | 58 | sed -i -e 's;@PTEST_PATH@;${PTEST_PATH};g' ${D}${PTEST_PATH}/run-ptest |
59 | } | 59 | } |
60 | 60 | ||
61 | RDEPENDS_${PN}-ptest += "bash make dbus" | 61 | RDEPENDS:${PN}-ptest += "bash make dbus" |
62 | RDEPENDS_${PN}-ptest_remove = "${PN}" | 62 | RDEPENDS:${PN}-ptest:remove = "${PN}" |
63 | 63 | ||
64 | PRIVATE_LIBS_${PN}-ptest = "libdbus-1.so.3" | 64 | PRIVATE_LIBS:${PN}-ptest = "libdbus-1.so.3" |
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index dcbcc0a9d6..b237476493 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc | |||
@@ -19,14 +19,14 @@ EXTRA_OECONF = "--disable-xml-docs \ | |||
19 | --enable-largefile \ | 19 | --enable-largefile \ |
20 | --with-system-socket=/run/dbus/system_bus_socket \ | 20 | --with-system-socket=/run/dbus/system_bus_socket \ |
21 | " | 21 | " |
22 | EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" | 22 | EXTRA_OECONF:append:class-target = " SYSTEMCTL=${base_bindir}/systemctl" |
23 | EXTRA_OECONF_append_class-native = " --disable-selinux" | 23 | EXTRA_OECONF:append:class-native = " --disable-selinux" |
24 | 24 | ||
25 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ | 25 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ |
26 | user-session \ | 26 | user-session \ |
27 | " | 27 | " |
28 | PACKAGECONFIG_class-native = "" | 28 | PACKAGECONFIG:class-native = "" |
29 | PACKAGECONFIG_class-nativesdk = "" | 29 | PACKAGECONFIG:class-nativesdk = "" |
30 | 30 | ||
31 | PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" | 31 | PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" |
32 | PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" | 32 | PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" |
diff --git a/meta/recipes-core/dbus/dbus_1.12.20.bb b/meta/recipes-core/dbus/dbus_1.12.20.bb index 2f6da67510..48947209d9 100644 --- a/meta/recipes-core/dbus/dbus_1.12.20.bb +++ b/meta/recipes-core/dbus/dbus_1.12.20.bb | |||
@@ -7,10 +7,10 @@ require dbus.inc | |||
7 | 7 | ||
8 | DEPENDS = "expat virtual/libintl autoconf-archive" | 8 | DEPENDS = "expat virtual/libintl autoconf-archive" |
9 | PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" | 9 | PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" |
10 | ALLOW_EMPTY_dbus-ptest = "1" | 10 | ALLOW_EMPTY:dbus-ptest = "1" |
11 | RDEPENDS_dbus-ptest_class-target = "dbus-test-ptest" | 11 | RDEPENDS:dbus-ptest:class-target = "dbus-test-ptest" |
12 | RDEPENDS_${PN} += "${PN}-common ${PN}-tools" | 12 | RDEPENDS:${PN} += "${PN}-common ${PN}-tools" |
13 | RDEPENDS_${PN}_class-native = "" | 13 | RDEPENDS:${PN}:class-native = "" |
14 | 14 | ||
15 | inherit useradd update-rc.d | 15 | inherit useradd update-rc.d |
16 | 16 | ||
@@ -25,22 +25,22 @@ python __anonymous() { | |||
25 | PACKAGES =+ "${PN}-lib ${PN}-common ${PN}-tools" | 25 | PACKAGES =+ "${PN}-lib ${PN}-common ${PN}-tools" |
26 | 26 | ||
27 | USERADD_PACKAGES = "dbus-common" | 27 | USERADD_PACKAGES = "dbus-common" |
28 | USERADD_PARAM_dbus-common = "--system --home ${localstatedir}/lib/dbus \ | 28 | USERADD_PARAM:dbus-common = "--system --home ${localstatedir}/lib/dbus \ |
29 | --no-create-home --shell /bin/false \ | 29 | --no-create-home --shell /bin/false \ |
30 | --user-group messagebus" | 30 | --user-group messagebus" |
31 | 31 | ||
32 | CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" | 32 | CONFFILES:${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" |
33 | 33 | ||
34 | DEBIANNAME_${PN} = "dbus-1" | 34 | DEBIANNAME:${PN} = "dbus-1" |
35 | 35 | ||
36 | OLDPKGNAME = "dbus-x11" | 36 | OLDPKGNAME = "dbus-x11" |
37 | OLDPKGNAME_class-nativesdk = "" | 37 | OLDPKGNAME:class-nativesdk = "" |
38 | 38 | ||
39 | # for compatibility | 39 | # for compatibility |
40 | RPROVIDES_${PN} = "${OLDPKGNAME}" | 40 | RPROVIDES:${PN} = "${OLDPKGNAME}" |
41 | RREPLACES_${PN} += "${OLDPKGNAME}" | 41 | RREPLACES:${PN} += "${OLDPKGNAME}" |
42 | 42 | ||
43 | FILES_${PN} = "${bindir}/dbus-daemon* \ | 43 | FILES:${PN} = "${bindir}/dbus-daemon* \ |
44 | ${bindir}/dbus-cleanup-sockets \ | 44 | ${bindir}/dbus-cleanup-sockets \ |
45 | ${bindir}/dbus-launch \ | 45 | ${bindir}/dbus-launch \ |
46 | ${bindir}/dbus-run-session \ | 46 | ${bindir}/dbus-run-session \ |
@@ -51,7 +51,7 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ | |||
51 | ${systemd_user_unitdir} \ | 51 | ${systemd_user_unitdir} \ |
52 | ${nonarch_libdir}/tmpfiles.d/dbus.conf \ | 52 | ${nonarch_libdir}/tmpfiles.d/dbus.conf \ |
53 | " | 53 | " |
54 | FILES_${PN}-common = "${sysconfdir}/dbus-1 \ | 54 | FILES:${PN}-common = "${sysconfdir}/dbus-1 \ |
55 | ${datadir}/dbus-1/services \ | 55 | ${datadir}/dbus-1/services \ |
56 | ${datadir}/dbus-1/system-services \ | 56 | ${datadir}/dbus-1/system-services \ |
57 | ${datadir}/dbus-1/session.d \ | 57 | ${datadir}/dbus-1/session.d \ |
@@ -64,17 +64,17 @@ FILES_${PN}-common = "${sysconfdir}/dbus-1 \ | |||
64 | ${systemd_user_unitdir}/sockets.target.wants \ | 64 | ${systemd_user_unitdir}/sockets.target.wants \ |
65 | ${nonarch_libdir}/sysusers.d/dbus.conf \ | 65 | ${nonarch_libdir}/sysusers.d/dbus.conf \ |
66 | " | 66 | " |
67 | FILES_${PN}-tools = "${bindir}/dbus-uuidgen \ | 67 | FILES:${PN}-tools = "${bindir}/dbus-uuidgen \ |
68 | ${bindir}/dbus-send \ | 68 | ${bindir}/dbus-send \ |
69 | ${bindir}/dbus-monitor \ | 69 | ${bindir}/dbus-monitor \ |
70 | ${bindir}/dbus-update-activation-environment \ | 70 | ${bindir}/dbus-update-activation-environment \ |
71 | " | 71 | " |
72 | FILES_${PN}-lib = "${libdir}/lib*.so.*" | 72 | FILES:${PN}-lib = "${libdir}/lib*.so.*" |
73 | RRECOMMENDS_${PN}-lib = "${PN}" | 73 | RRECOMMENDS:${PN}-lib = "${PN}" |
74 | FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" | 74 | FILES:${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" |
75 | 75 | ||
76 | PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" | 76 | PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" |
77 | pkg_postinst_dbus() { | 77 | pkg_postinst:dbus() { |
78 | # If both systemd and sysvinit are enabled, mask the dbus-1 init script | 78 | # If both systemd and sysvinit are enabled, mask the dbus-1 init script |
79 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then | 79 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then |
80 | if [ -n "$D" ]; then | 80 | if [ -n "$D" ]; then |
@@ -130,7 +130,7 @@ do_install() { | |||
130 | rm -rf ${D}${localstatedir}/run | 130 | rm -rf ${D}${localstatedir}/run |
131 | } | 131 | } |
132 | 132 | ||
133 | do_install_class-native() { | 133 | do_install:class-native() { |
134 | autotools_do_install | 134 | autotools_do_install |
135 | 135 | ||
136 | # dbus-launch has no X support so lets not install it in case the host | 136 | # dbus-launch has no X support so lets not install it in case the host |
@@ -138,7 +138,7 @@ do_install_class-native() { | |||
138 | rm -f ${D}${bindir}/dbus-launch | 138 | rm -f ${D}${bindir}/dbus-launch |
139 | } | 139 | } |
140 | 140 | ||
141 | do_install_class-nativesdk() { | 141 | do_install:class-nativesdk() { |
142 | autotools_do_install | 142 | autotools_do_install |
143 | 143 | ||
144 | # dbus-launch has no X support so lets not install it in case the host | 144 | # dbus-launch has no X support so lets not install it in case the host |
@@ -150,4 +150,4 @@ do_install_class-nativesdk() { | |||
150 | } | 150 | } |
151 | BBCLASSEXTEND = "native nativesdk" | 151 | BBCLASSEXTEND = "native nativesdk" |
152 | 152 | ||
153 | INSANE_SKIP_${PN}-ptest += "build-deps" | 153 | INSANE_SKIP:${PN}-ptest += "build-deps" |
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index ed3ef3384a..b5f3778abe 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc | |||
@@ -9,8 +9,8 @@ LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" | |||
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=25cf44512b7bc8966a48b6b1a9b7605f" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=25cf44512b7bc8966a48b6b1a9b7605f" |
10 | 10 | ||
11 | DEPENDS = "zlib virtual/crypt" | 11 | DEPENDS = "zlib virtual/crypt" |
12 | RPROVIDES_${PN} = "ssh sshd" | 12 | RPROVIDES:${PN} = "ssh sshd" |
13 | RCONFLICTS_${PN} = "openssh-sshd openssh" | 13 | RCONFLICTS:${PN} = "openssh-sshd openssh" |
14 | 14 | ||
15 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 15 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
16 | 16 | ||
@@ -33,7 +33,7 @@ PAM_PLUGINS = "libpam-runtime \ | |||
33 | pam-plugin-permit \ | 33 | pam-plugin-permit \ |
34 | pam-plugin-unix \ | 34 | pam-plugin-unix \ |
35 | " | 35 | " |
36 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" | 36 | RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" |
37 | 37 | ||
38 | inherit autotools update-rc.d systemd | 38 | inherit autotools update-rc.d systemd |
39 | 39 | ||
@@ -42,7 +42,7 @@ CVE_PRODUCT = "dropbear_ssh" | |||
42 | INITSCRIPT_NAME = "dropbear" | 42 | INITSCRIPT_NAME = "dropbear" |
43 | INITSCRIPT_PARAMS = "defaults 10" | 43 | INITSCRIPT_PARAMS = "defaults 10" |
44 | 44 | ||
45 | SYSTEMD_SERVICE_${PN} = "dropbear.socket" | 45 | SYSTEMD_SERVICE:${PN} = "dropbear.socket" |
46 | 46 | ||
47 | SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" | 47 | SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" |
48 | BINCOMMANDS = "dbclient ssh scp" | 48 | BINCOMMANDS = "dbclient ssh scp" |
@@ -60,7 +60,7 @@ EXTRA_OECONF += "\ | |||
60 | EXTRA_OECONF += "--disable-harden" | 60 | EXTRA_OECONF += "--disable-harden" |
61 | 61 | ||
62 | # musl does not implement wtmp/logwtmp APIs | 62 | # musl does not implement wtmp/logwtmp APIs |
63 | EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" | 63 | EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog" |
64 | 64 | ||
65 | do_install() { | 65 | do_install() { |
66 | install -d ${D}${sysconfdir} \ | 66 | install -d ${D}${sysconfdir} \ |
@@ -110,11 +110,11 @@ do_install() { | |||
110 | inherit update-alternatives | 110 | inherit update-alternatives |
111 | 111 | ||
112 | ALTERNATIVE_PRIORITY = "20" | 112 | ALTERNATIVE_PRIORITY = "20" |
113 | ALTERNATIVE_${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}" | 113 | ALTERNATIVE:${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}" |
114 | 114 | ||
115 | ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti" | 115 | ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti" |
116 | 116 | ||
117 | pkg_postrm_append_${PN} () { | 117 | pkg_postrm:append_${PN} () { |
118 | if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then | 118 | if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then |
119 | rm ${sysconfdir}/dropbear/dropbear_rsa_host_key | 119 | rm ${sysconfdir}/dropbear/dropbear_rsa_host_key |
120 | fi | 120 | fi |
@@ -123,4 +123,4 @@ pkg_postrm_append_${PN} () { | |||
123 | fi | 123 | fi |
124 | } | 124 | } |
125 | 125 | ||
126 | FILES_${PN} += "${bindir}" | 126 | FILES:${PN} += "${bindir}" |
diff --git a/meta/recipes-core/ell/ell_0.41.bb b/meta/recipes-core/ell/ell_0.41.bb index 5fd3077bc3..f6da957b51 100644 --- a/meta/recipes-core/ell/ell_0.41.bb +++ b/meta/recipes-core/ell/ell_0.41.bb | |||
@@ -19,6 +19,6 @@ SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.ta | |||
19 | " | 19 | " |
20 | SRC_URI[sha256sum] = "4e8dba6c53cf152dbd0fd1dc3d4c7b04abf79e20a948895f85943e586870505c" | 20 | SRC_URI[sha256sum] = "4e8dba6c53cf152dbd0fd1dc3d4c7b04abf79e20a948895f85943e586870505c" |
21 | 21 | ||
22 | do_configure_prepend () { | 22 | do_configure:prepend () { |
23 | mkdir -p ${S}/build-aux | 23 | mkdir -p ${S}/build-aux |
24 | } | 24 | } |
diff --git a/meta/recipes-core/expat/expat_2.4.1.bb b/meta/recipes-core/expat/expat_2.4.1.bb index 451158a5d3..555dd0d601 100644 --- a/meta/recipes-core/expat/expat_2.4.1.bb +++ b/meta/recipes-core/expat/expat_2.4.1.bb | |||
@@ -13,13 +13,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ | |||
13 | 13 | ||
14 | SRC_URI[sha256sum] = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40" | 14 | SRC_URI[sha256sum] = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40" |
15 | 15 | ||
16 | EXTRA_OECMAKE_class-native += "-DEXPAT_BUILD_DOCS=OFF" | 16 | EXTRA_OECMAKE:class-native += "-DEXPAT_BUILD_DOCS=OFF" |
17 | 17 | ||
18 | RDEPENDS_${PN}-ptest += "bash" | 18 | RDEPENDS:${PN}-ptest += "bash" |
19 | 19 | ||
20 | inherit cmake lib_package ptest | 20 | inherit cmake lib_package ptest |
21 | 21 | ||
22 | do_install_ptest_class-target() { | 22 | do_install_ptest:class-target() { |
23 | install -m 755 ${B}/tests/* ${D}${PTEST_PATH} | 23 | install -m 755 ${B}/tests/* ${D}${PTEST_PATH} |
24 | } | 24 | } |
25 | 25 | ||
diff --git a/meta/recipes-core/gettext/gettext_0.21.bb b/meta/recipes-core/gettext/gettext_0.21.bb index b86e8d8381..4247b487ab 100644 --- a/meta/recipes-core/gettext/gettext_0.21.bb +++ b/meta/recipes-core/gettext/gettext_0.21.bb | |||
@@ -9,10 +9,10 @@ LICENSE = "GPLv3+ & LGPL-2.1+" | |||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" |
10 | 10 | ||
11 | DEPENDS = "gettext-native virtual/libiconv" | 11 | DEPENDS = "gettext-native virtual/libiconv" |
12 | DEPENDS_class-native = "gettext-minimal-native" | 12 | DEPENDS:class-native = "gettext-minimal-native" |
13 | PROVIDES = "virtual/libintl virtual/gettext" | 13 | PROVIDES = "virtual/libintl virtual/gettext" |
14 | PROVIDES_class-native = "virtual/gettext-native" | 14 | PROVIDES:class-native = "virtual/gettext-native" |
15 | RCONFLICTS_${PN} = "proxy-libintl" | 15 | RCONFLICTS:${PN} = "proxy-libintl" |
16 | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ | 16 | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ |
17 | file://parallel.patch \ | 17 | file://parallel.patch \ |
18 | file://use-pkgconfig.patch \ | 18 | file://use-pkgconfig.patch \ |
@@ -39,7 +39,7 @@ EXTRA_OECONF += "--without-lispdir \ | |||
39 | --without-git \ | 39 | --without-git \ |
40 | --cache-file=${B}/config.cache \ | 40 | --cache-file=${B}/config.cache \ |
41 | " | 41 | " |
42 | EXTRA_OECONF_append_class-target = " \ | 42 | EXTRA_OECONF:append:class-target = " \ |
43 | --with-bisonlocaledir=${datadir}/locale \ | 43 | --with-bisonlocaledir=${datadir}/locale \ |
44 | gt_cv_locale_fr_utf8=fr_FR \ | 44 | gt_cv_locale_fr_utf8=fr_FR \ |
45 | gt_cv_locale_fr=fr_FR.ISO-8859-1 \ | 45 | gt_cv_locale_fr=fr_FR.ISO-8859-1 \ |
@@ -48,8 +48,8 @@ EXTRA_OECONF_append_class-target = " \ | |||
48 | " | 48 | " |
49 | 49 | ||
50 | PACKAGECONFIG ??= "croco glib libxml" | 50 | PACKAGECONFIG ??= "croco glib libxml" |
51 | PACKAGECONFIG_class-native = "" | 51 | PACKAGECONFIG:class-native = "" |
52 | PACKAGECONFIG_class-nativesdk = "" | 52 | PACKAGECONFIG:class-nativesdk = "" |
53 | 53 | ||
54 | PACKAGECONFIG[croco] = "--without-included-libcroco,--with-included-libcroco,libcroco" | 54 | PACKAGECONFIG[croco] = "--without-included-libcroco,--with-included-libcroco,libcroco" |
55 | PACKAGECONFIG[glib] = "--without-included-glib,--with-included-glib,glib-2.0" | 55 | PACKAGECONFIG[glib] = "--without-included-glib,--with-included-glib,glib-2.0" |
@@ -62,7 +62,7 @@ PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,-- | |||
62 | acpaths = '-I ${S}/gettext-runtime/m4 \ | 62 | acpaths = '-I ${S}/gettext-runtime/m4 \ |
63 | -I ${S}/gettext-tools/m4' | 63 | -I ${S}/gettext-tools/m4' |
64 | 64 | ||
65 | do_install_append_libc-musl () { | 65 | do_install:append:libc-musl () { |
66 | rm -f ${D}${libdir}/charset.alias | 66 | rm -f ${D}${libdir}/charset.alias |
67 | rm -f ${D}${includedir}/libintl.h | 67 | rm -f ${D}${includedir}/libintl.h |
68 | rm -f ${D}${libdir}/libintl.la | 68 | rm -f ${D}${libdir}/libintl.la |
@@ -79,29 +79,29 @@ do_install_append_libc-musl () { | |||
79 | # 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk | 79 | # 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk |
80 | 80 | ||
81 | PACKAGES =+ "libgettextlib libgettextsrc" | 81 | PACKAGES =+ "libgettextlib libgettextsrc" |
82 | FILES_libgettextlib = "${libdir}/libgettextlib-*.so*" | 82 | FILES:libgettextlib = "${libdir}/libgettextlib-*.so*" |
83 | FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*" | 83 | FILES:libgettextsrc = "${libdir}/libgettextsrc-*.so*" |
84 | 84 | ||
85 | PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc" | 85 | PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc" |
86 | 86 | ||
87 | FILES_${PN} += "${libdir}/${BPN}/*" | 87 | FILES:${PN} += "${libdir}/${BPN}/*" |
88 | 88 | ||
89 | # The its/Makefile.am has defined: | 89 | # The its/Makefile.am has defined: |
90 | # itsdir = $(pkgdatadir)$(PACKAGE_SUFFIX)/its | 90 | # itsdir = $(pkgdatadir)$(PACKAGE_SUFFIX)/its |
91 | # not itsdir = $(pkgdatadir), so use wildcard to match the version. | 91 | # not itsdir = $(pkgdatadir), so use wildcard to match the version. |
92 | FILES_${PN} += "${datadir}/${BPN}-*/*" | 92 | FILES:${PN} += "${datadir}/${BPN}-*/*" |
93 | 93 | ||
94 | FILES_gettext-runtime = "${bindir}/gettext \ | 94 | FILES:gettext-runtime = "${bindir}/gettext \ |
95 | ${bindir}/ngettext \ | 95 | ${bindir}/ngettext \ |
96 | ${bindir}/envsubst \ | 96 | ${bindir}/envsubst \ |
97 | ${bindir}/gettext.sh \ | 97 | ${bindir}/gettext.sh \ |
98 | ${libdir}/libasprintf.so* \ | 98 | ${libdir}/libasprintf.so* \ |
99 | ${libdir}/GNU.Gettext.dll \ | 99 | ${libdir}/GNU.Gettext.dll \ |
100 | " | 100 | " |
101 | FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ | 101 | FILES:gettext-runtime-dev += "${libdir}/libasprintf.a \ |
102 | ${includedir}/autosprintf.h \ | 102 | ${includedir}/autosprintf.h \ |
103 | " | 103 | " |
104 | FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ | 104 | FILES:gettext-runtime-doc = "${mandir}/man1/gettext.* \ |
105 | ${mandir}/man1/ngettext.* \ | 105 | ${mandir}/man1/ngettext.* \ |
106 | ${mandir}/man1/envsubst.* \ | 106 | ${mandir}/man1/envsubst.* \ |
107 | ${mandir}/man1/.* \ | 107 | ${mandir}/man1/.* \ |
@@ -116,11 +116,11 @@ FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ | |||
116 | ${infodir}/autosprintf.info \ | 116 | ${infodir}/autosprintf.info \ |
117 | " | 117 | " |
118 | 118 | ||
119 | do_install_append() { | 119 | do_install:append() { |
120 | rm -f ${D}${libdir}/preloadable_libintl.so | 120 | rm -f ${D}${libdir}/preloadable_libintl.so |
121 | } | 121 | } |
122 | 122 | ||
123 | do_install_append_class-native () { | 123 | do_install:append:class-native () { |
124 | rm ${D}${datadir}/aclocal/* | 124 | rm ${D}${datadir}/aclocal/* |
125 | rm ${D}${datadir}/gettext/config.rpath | 125 | rm ${D}${datadir}/gettext/config.rpath |
126 | rm ${D}${datadir}/gettext/po/Makefile.in.in | 126 | rm ${D}${datadir}/gettext/po/Makefile.in.in |
@@ -174,8 +174,8 @@ do_install_ptest() { | |||
174 | fi | 174 | fi |
175 | } | 175 | } |
176 | 176 | ||
177 | RDEPENDS_${PN}-ptest += "make xz" | 177 | RDEPENDS:${PN}-ptest += "make xz" |
178 | RDEPENDS_${PN}-ptest_append_libc-glibc = "\ | 178 | RDEPENDS:${PN}-ptest:append:libc-glibc = "\ |
179 | glibc-gconv-big5 \ | 179 | glibc-gconv-big5 \ |
180 | glibc-charmap-big5 \ | 180 | glibc-charmap-big5 \ |
181 | glibc-gconv-cp1251 \ | 181 | glibc-gconv-cp1251 \ |
@@ -196,12 +196,12 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\ | |||
196 | locale-base-fr-fr \ | 196 | locale-base-fr-fr \ |
197 | " | 197 | " |
198 | 198 | ||
199 | RRECOMMENDS_${PN}-ptest_append_libc-glibc = "\ | 199 | RRECOMMENDS:${PN}-ptest:append:libc-glibc = "\ |
200 | locale-base-de-de.iso-8859-1 \ | 200 | locale-base-de-de.iso-8859-1 \ |
201 | locale-base-fr-fr.iso-8859-1 \ | 201 | locale-base-fr-fr.iso-8859-1 \ |
202 | " | 202 | " |
203 | 203 | ||
204 | INSANE_SKIP_${PN}-ptest += "ldflags" | 204 | INSANE_SKIP:${PN}-ptest += "ldflags" |
205 | INSANE_SKIP_${PN}-ptest += "rpaths" | 205 | INSANE_SKIP:${PN}-ptest += "rpaths" |
206 | 206 | ||
207 | BBCLASSEXTEND = "native nativesdk" | 207 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb index cbce6eae61..c71dc81202 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
20 | file://time-test.patch \ | 20 | file://time-test.patch \ |
21 | file://0001-correctly-use-3-parameters-for-close_range.patch \ | 21 | file://0001-correctly-use-3-parameters-for-close_range.patch \ |
22 | " | 22 | " |
23 | SRC_URI_append_class-native = " file://relocate-modules.patch" | 23 | SRC_URI:append:class-native = " file://relocate-modules.patch" |
24 | 24 | ||
25 | SRC_URI[sha256sum] = "e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138" | 25 | SRC_URI[sha256sum] = "e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138" |
26 | 26 | ||
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 71777bc459..4859d28097 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -30,7 +30,7 @@ LEAD_SONAME = "libglib-2.0.*" | |||
30 | 30 | ||
31 | inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages | 31 | inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages |
32 | 32 | ||
33 | DEPENDS_append_class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" | 33 | DEPENDS:append:class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" |
34 | 34 | ||
35 | GTKDOC_MESON_OPTION = "gtk_doc" | 35 | GTKDOC_MESON_OPTION = "gtk_doc" |
36 | 36 | ||
@@ -48,55 +48,55 @@ PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus" | |||
48 | 48 | ||
49 | EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=disabled" | 49 | EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=disabled" |
50 | 50 | ||
51 | do_configure_prepend() { | 51 | do_configure:prepend() { |
52 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in | 52 | sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in |
53 | } | 53 | } |
54 | 54 | ||
55 | FILES_${PN} = "${libdir}/lib*${SOLIBS} \ | 55 | FILES:${PN} = "${libdir}/lib*${SOLIBS} \ |
56 | ${libdir}/gio \ | 56 | ${libdir}/gio \ |
57 | ${libexecdir}/*gio-querymodules \ | 57 | ${libexecdir}/*gio-querymodules \ |
58 | ${datadir}/glib-2.0/schemas" | 58 | ${datadir}/glib-2.0/schemas" |
59 | 59 | ||
60 | FILES_${PN}-utils += "${bindir}/glib-genmarshal \ | 60 | FILES:${PN}-utils += "${bindir}/glib-genmarshal \ |
61 | ${bindir}/glib-gettextize \ | 61 | ${bindir}/glib-gettextize \ |
62 | ${bindir}/glib-mkenums \ | 62 | ${bindir}/glib-mkenums \ |
63 | ${bindir}/glib-compile-resources" | 63 | ${bindir}/glib-compile-resources" |
64 | 64 | ||
65 | FILES_${PN}-dev += "${libdir}/glib-2.0/include \ | 65 | FILES:${PN}-dev += "${libdir}/glib-2.0/include \ |
66 | ${libdir}/gio/modules/lib*${SOLIBSDEV} \ | 66 | ${libdir}/gio/modules/lib*${SOLIBSDEV} \ |
67 | ${libdir}/gio/modules/*.la \ | 67 | ${libdir}/gio/modules/*.la \ |
68 | ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ | 68 | ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ |
69 | ${datadir}/glib-2.0/schemas/gschema.dtd \ | 69 | ${datadir}/glib-2.0/schemas/gschema.dtd \ |
70 | ${datadir}/glib-2.0/valgrind/glib.supp \ | 70 | ${datadir}/glib-2.0/valgrind/glib.supp \ |
71 | ${datadir}/gettext/its" | 71 | ${datadir}/gettext/its" |
72 | FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" | 72 | FILES:${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" |
73 | FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ | 73 | FILES:${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ |
74 | ${bindir}/gdbus-codegen" | 74 | ${bindir}/gdbus-codegen" |
75 | FILES_${PN}-utils = "${bindir}/*" | 75 | FILES:${PN}-utils = "${bindir}/*" |
76 | 76 | ||
77 | SHAREDMIMEDEP = "shared-mime-info" | 77 | SHAREDMIMEDEP = "shared-mime-info" |
78 | SHAREDMIMEDEP_class-native = "" | 78 | SHAREDMIMEDEP:class-native = "" |
79 | # When cross compiling for Windows we don't want to include this | 79 | # When cross compiling for Windows we don't want to include this |
80 | SHAREDMIMEDEP_mingw32 = "" | 80 | SHAREDMIMEDEP:mingw32 = "" |
81 | 81 | ||
82 | RRECOMMENDS_${PN} += "${SHAREDMIMEDEP}" | 82 | RRECOMMENDS:${PN} += "${SHAREDMIMEDEP}" |
83 | 83 | ||
84 | ARM_INSTRUCTION_SET_armv4 = "arm" | 84 | ARM_INSTRUCTION_SET:armv4 = "arm" |
85 | ARM_INSTRUCTION_SET_armv5 = "arm" | 85 | ARM_INSTRUCTION_SET:armv5 = "arm" |
86 | # Valgrind runtime detection works using hand-written assembly, which | 86 | # Valgrind runtime detection works using hand-written assembly, which |
87 | # doesn't support mips16e | 87 | # doesn't support mips16e |
88 | CPPFLAGS_append_class-target_mips16e = " -DNVALGRIND=1" | 88 | CPPFLAGS:append:class-target:mips16e = " -DNVALGRIND=1" |
89 | 89 | ||
90 | # GLib generally requires gettext to be present so for USE_NLS to yes. For | 90 | # GLib generally requires gettext to be present so for USE_NLS to yes. For |
91 | # native builds as i18n is disabled globally we have to add a gettext-native dependency. | 91 | # native builds as i18n is disabled globally we have to add a gettext-native dependency. |
92 | USE_NLS_class-target = "yes" | 92 | USE_NLS:class-target = "yes" |
93 | USE_NLS_class-nativesdk = "yes" | 93 | USE_NLS:class-nativesdk = "yes" |
94 | DEPENDS_append_class-native = " gettext-native" | 94 | DEPENDS:append:class-native = " gettext-native" |
95 | 95 | ||
96 | EXEEXT = "" | 96 | EXEEXT = "" |
97 | EXEEXT_mingw32 = ".exe" | 97 | EXEEXT:mingw32 = ".exe" |
98 | 98 | ||
99 | do_install_append () { | 99 | do_install:append () { |
100 | if [ -f ${D}${bindir}/gtester-report ]; then | 100 | if [ -f ${D}${bindir}/gtester-report ]; then |
101 | sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python3|' | 101 | sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python3|' |
102 | fi | 102 | fi |
@@ -118,7 +118,7 @@ do_install_append () { | |||
118 | mkdir -p ${D}${libdir}/gio/modules | 118 | mkdir -p ${D}${libdir}/gio/modules |
119 | } | 119 | } |
120 | 120 | ||
121 | do_install_append_class-target () { | 121 | do_install:append:class-target () { |
122 | # Tests are only installed on targets, not native builds. Separating this out | 122 | # Tests are only installed on targets, not native builds. Separating this out |
123 | # keeps glib-2.0-native from depending on DISTRO_FEATURES | 123 | # keeps glib-2.0-native from depending on DISTRO_FEATURES |
124 | if [ -f ${D}${datadir}/installed-tests/glib/gdbus-serialization.test ]; then | 124 | if [ -f ${D}${datadir}/installed-tests/glib/gdbus-serialization.test ]; then |
@@ -134,18 +134,18 @@ do_install_append_class-target () { | |||
134 | } | 134 | } |
135 | 135 | ||
136 | # As we do not build python3 for windows, makes no sense to ship the script that's using it | 136 | # As we do not build python3 for windows, makes no sense to ship the script that's using it |
137 | do_install_append_mingw32() { | 137 | do_install:append:mingw32() { |
138 | rm -f ${D}${bindir}/gtester-report | 138 | rm -f ${D}${bindir}/gtester-report |
139 | } | 139 | } |
140 | 140 | ||
141 | CODEGEN_PYTHON_RDEPENDS = "python3 python3-distutils python3-xml" | 141 | CODEGEN_PYTHON_RDEPENDS = "python3 python3-distutils python3-xml" |
142 | CODEGEN_PYTHON_RDEPENDS_mingw32 = "" | 142 | CODEGEN_PYTHON_RDEPENDS:mingw32 = "" |
143 | 143 | ||
144 | RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" | 144 | RDEPENDS:${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" |
145 | 145 | ||
146 | RDEPENDS_${PN}-ptest += "${PN}-utils" | 146 | RDEPENDS:${PN}-ptest += "${PN}-utils" |
147 | 147 | ||
148 | RDEPENDS_${PN}-ptest += "\ | 148 | RDEPENDS:${PN}-ptest += "\ |
149 | coreutils \ | 149 | coreutils \ |
150 | libgcc \ | 150 | libgcc \ |
151 | dbus \ | 151 | dbus \ |
@@ -170,7 +170,7 @@ RDEPENDS_${PN}-ptest += "\ | |||
170 | ${PN}-codegen \ | 170 | ${PN}-codegen \ |
171 | " | 171 | " |
172 | 172 | ||
173 | RDEPENDS_${PN}-ptest_append_libc-glibc = "\ | 173 | RDEPENDS:${PN}-ptest:append:libc-glibc = "\ |
174 | glibc-gconv-utf-16 \ | 174 | glibc-gconv-utf-16 \ |
175 | glibc-charmap-utf-8 \ | 175 | glibc-charmap-utf-8 \ |
176 | glibc-gconv-cp1255 \ | 176 | glibc-gconv-cp1255 \ |
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.68.1.bb b/meta/recipes-core/glib-networking/glib-networking_2.68.1.bb index fac04087d1..9a8ff38dbd 100644 --- a/meta/recipes-core/glib-networking/glib-networking_2.68.1.bb +++ b/meta/recipes-core/glib-networking/glib-networking_2.68.1.bb | |||
@@ -25,14 +25,14 @@ inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome | |||
25 | 25 | ||
26 | SRC_URI += "file://run-ptest" | 26 | SRC_URI += "file://run-ptest" |
27 | 27 | ||
28 | FILES_${PN} += "\ | 28 | FILES:${PN} += "\ |
29 | ${libdir}/gio/modules/libgio*.so \ | 29 | ${libdir}/gio/modules/libgio*.so \ |
30 | ${datadir}/dbus-1/services/ \ | 30 | ${datadir}/dbus-1/services/ \ |
31 | ${systemd_user_unitdir} \ | 31 | ${systemd_user_unitdir} \ |
32 | " | 32 | " |
33 | FILES_${PN}-dev += "${libdir}/gio/modules/libgio*.la" | 33 | FILES:${PN}-dev += "${libdir}/gio/modules/libgio*.la" |
34 | FILES_${PN}-staticdev += "${libdir}/gio/modules/libgio*.a" | 34 | FILES:${PN}-staticdev += "${libdir}/gio/modules/libgio*.a" |
35 | 35 | ||
36 | RDEPENDS_${PN}-ptest += "bash" | 36 | RDEPENDS:${PN}-ptest += "bash" |
37 | 37 | ||
38 | BBCLASSEXTEND = "native nativesdk" | 38 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-core/glibc/glibc-common.inc b/meta/recipes-core/glibc/glibc-common.inc index 41ff7e9a19..782b2605cc 100644 --- a/meta/recipes-core/glibc/glibc-common.inc +++ b/meta/recipes-core/glibc/glibc-common.inc | |||
@@ -13,13 +13,13 @@ CVE_PRODUCT = "glibc" | |||
13 | 13 | ||
14 | INHIBIT_DEFAULT_DEPS = "1" | 14 | INHIBIT_DEFAULT_DEPS = "1" |
15 | 15 | ||
16 | ARM_INSTRUCTION_SET_armv4 = "arm" | 16 | ARM_INSTRUCTION_SET:armv4 = "arm" |
17 | ARM_INSTRUCTION_SET_armv5 = "arm" | 17 | ARM_INSTRUCTION_SET:armv5 = "arm" |
18 | ARM_INSTRUCTION_SET_armv6 = "arm" | 18 | ARM_INSTRUCTION_SET:armv6 = "arm" |
19 | # | 19 | # |
20 | # We will skip parsing glibc when target system C library selection is not glibc | 20 | # We will skip parsing glibc when target system C library selection is not glibc |
21 | # this helps in easing out parsing for non-glibc system libraries | 21 | # this helps in easing out parsing for non-glibc system libraries |
22 | # | 22 | # |
23 | COMPATIBLE_HOST_libc-musl_class-target = "null" | 23 | COMPATIBLE_HOST:libc-musl:class-target = "null" |
24 | 24 | ||
25 | PV = "2.33" | 25 | PV = "2.33" |
diff --git a/meta/recipes-core/glibc/glibc-ld.inc b/meta/recipes-core/glibc/glibc-ld.inc index 041ffbb9cb..da8fcc430b 100644 --- a/meta/recipes-core/glibc/glibc-ld.inc +++ b/meta/recipes-core/glibc/glibc-ld.inc | |||
@@ -16,5 +16,5 @@ def glibc_dl_info(d): | |||
16 | 16 | ||
17 | EGLIBC_KNOWN_INTERPRETER_NAMES = "${@glibc_dl_info(d)['ldconfig']}" | 17 | EGLIBC_KNOWN_INTERPRETER_NAMES = "${@glibc_dl_info(d)['ldconfig']}" |
18 | RTLDLIST = "${@glibc_dl_info(d)['lddrewrite']}" | 18 | RTLDLIST = "${@glibc_dl_info(d)['lddrewrite']}" |
19 | RTLDLIST_class-nativesdk = "${base_libdir}/${@bb.utils.contains('SDK_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', 'ld-linux.so.2', d)}" | 19 | RTLDLIST:class-nativesdk = "${base_libdir}/${@bb.utils.contains('SDK_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', 'ld-linux.so.2', d)}" |
20 | glibc_dl_info[vardepsexclude] = "OVERRIDES" | 20 | glibc_dl_info[vardepsexclude] = "OVERRIDES" |
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index ef06389ff9..b8de7d3192 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc | |||
@@ -9,7 +9,7 @@ LOCALEBASEPN = "${MLPREFIX}glibc" | |||
9 | # 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') | 9 | # 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') |
10 | # ERROR: Function failed: split_and_strip_files | 10 | # ERROR: Function failed: split_and_strip_files |
11 | BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" | 11 | BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" |
12 | BINUTILSDEP_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" | 12 | BINUTILSDEP:class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot" |
13 | do_package[depends] += "${BINUTILSDEP}" | 13 | do_package[depends] += "${BINUTILSDEP}" |
14 | 14 | ||
15 | DEPENDS += "virtual/libc" | 15 | DEPENDS += "virtual/libc" |
@@ -21,7 +21,7 @@ DEPENDS += "virtual/libc" | |||
21 | 21 | ||
22 | # default to disabled | 22 | # default to disabled |
23 | ENABLE_BINARY_LOCALE_GENERATION ?= "0" | 23 | ENABLE_BINARY_LOCALE_GENERATION ?= "0" |
24 | ENABLE_BINARY_LOCALE_GENERATION_pn-nativesdk-glibc-locale = "1" | 24 | ENABLE_BINARY_LOCALE_GENERATION:pn-nativesdk-glibc-locale = "1" |
25 | 25 | ||
26 | #enable locale generation on these arches | 26 | #enable locale generation on these arches |
27 | # BINARY_LOCALE_ARCHES is a space separated list of regular expressions | 27 | # BINARY_LOCALE_ARCHES is a space separated list of regular expressions |
@@ -40,32 +40,32 @@ PACKAGES_DYNAMIC = "^locale-base-.* \ | |||
40 | ^${MLPREFIX}glibc-gconv$" | 40 | ^${MLPREFIX}glibc-gconv$" |
41 | 41 | ||
42 | # Create a glibc-binaries package | 42 | # Create a glibc-binaries package |
43 | ALLOW_EMPTY_${BPN}-binaries = "1" | 43 | ALLOW_EMPTY:${BPN}-binaries = "1" |
44 | PACKAGES += "${BPN}-binaries" | 44 | PACKAGES += "${BPN}-binaries" |
45 | RRECOMMENDS_${BPN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-binary") != -1])}" | 45 | RRECOMMENDS:${BPN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-binary") != -1])}" |
46 | 46 | ||
47 | # Create a glibc-charmaps package | 47 | # Create a glibc-charmaps package |
48 | ALLOW_EMPTY_${BPN}-charmaps = "1" | 48 | ALLOW_EMPTY:${BPN}-charmaps = "1" |
49 | PACKAGES += "${BPN}-charmaps" | 49 | PACKAGES += "${BPN}-charmaps" |
50 | RRECOMMENDS_${BPN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-charmap") != -1])}" | 50 | RRECOMMENDS:${BPN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-charmap") != -1])}" |
51 | 51 | ||
52 | # Create a glibc-gconvs package | 52 | # Create a glibc-gconvs package |
53 | ALLOW_EMPTY_${BPN}-gconvs = "1" | 53 | ALLOW_EMPTY:${BPN}-gconvs = "1" |
54 | PACKAGES += "${BPN}-gconvs" | 54 | PACKAGES += "${BPN}-gconvs" |
55 | RRECOMMENDS_${BPN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-gconv") != -1])}" | 55 | RRECOMMENDS:${BPN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-gconv") != -1])}" |
56 | 56 | ||
57 | # Create a glibc-localedatas package | 57 | # Create a glibc-localedatas package |
58 | ALLOW_EMPTY_${BPN}-localedatas = "1" | 58 | ALLOW_EMPTY:${BPN}-localedatas = "1" |
59 | PACKAGES += "${BPN}-localedatas" | 59 | PACKAGES += "${BPN}-localedatas" |
60 | RRECOMMENDS_${BPN}-localedatas = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-localedata") != -1])}" | 60 | RRECOMMENDS:${BPN}-localedatas = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-localedata") != -1])}" |
61 | 61 | ||
62 | DESCRIPTION_localedef = "glibc: compile locale definition files" | 62 | DESCRIPTION:localedef = "glibc: compile locale definition files" |
63 | 63 | ||
64 | # glibc-gconv is dynamically added into PACKAGES, thus | 64 | # glibc-gconv is dynamically added into PACKAGES, thus |
65 | # FILES_glibc-gconv will not be automatically extended in multilib. | 65 | # FILES:glibc-gconv will not be automatically extended in multilib. |
66 | # Explicitly add ${MLPREFIX} for FILES_glibc-gconv. | 66 | # Explicitly add ${MLPREFIX} for FILES:glibc-gconv. |
67 | FILES_${MLPREFIX}glibc-gconv = "${libdir}/gconv/*" | 67 | FILES:${MLPREFIX}glibc-gconv = "${libdir}/gconv/*" |
68 | FILES_localedef = "${bindir}/localedef" | 68 | FILES:localedef = "${bindir}/localedef" |
69 | 69 | ||
70 | LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale" | 70 | LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale" |
71 | 71 | ||
diff --git a/meta/recipes-core/glibc/glibc-mtrace.inc b/meta/recipes-core/glibc/glibc-mtrace.inc index ef9d60ec23..734a566562 100644 --- a/meta/recipes-core/glibc/glibc-mtrace.inc +++ b/meta/recipes-core/glibc/glibc-mtrace.inc | |||
@@ -2,8 +2,8 @@ require glibc-collateral.inc | |||
2 | 2 | ||
3 | SUMMARY = "mtrace utility provided by glibc" | 3 | SUMMARY = "mtrace utility provided by glibc" |
4 | DESCRIPTION = "mtrace utility provided by glibc" | 4 | DESCRIPTION = "mtrace utility provided by glibc" |
5 | RDEPENDS_${PN} = "perl" | 5 | RDEPENDS:${PN} = "perl" |
6 | RPROVIDES_${PN} = "libc-mtrace" | 6 | RPROVIDES:${PN} = "libc-mtrace" |
7 | 7 | ||
8 | SRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale/scripts" | 8 | SRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale/scripts" |
9 | 9 | ||
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 92e5dbac61..4bf5038fc0 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -3,67 +3,67 @@ INHIBIT_SYSROOT_STRIP = "1" | |||
3 | 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" | 3 | 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" |
4 | 4 | ||
5 | # The ld.so in this glibc supports the GNU_HASH | 5 | # The ld.so in this glibc supports the GNU_HASH |
6 | RPROVIDES_${PN} = "eglibc rtld(GNU_HASH)" | 6 | RPROVIDES:${PN} = "eglibc rtld(GNU_HASH)" |
7 | RPROVIDES_${PN}-utils = "eglibc-utils" | 7 | RPROVIDES:${PN}-utils = "eglibc-utils" |
8 | RPROVIDES_${PN}-mtrace = "eglibc-mtrace libc-mtrace" | 8 | RPROVIDES:${PN}-mtrace = "eglibc-mtrace libc-mtrace" |
9 | RPROVIDES_${PN}-pic = "eglibc-pic" | 9 | RPROVIDES:${PN}-pic = "eglibc-pic" |
10 | RPROVIDES_${PN}-dev = "eglibc-dev libc6-dev virtual-libc-dev" | 10 | RPROVIDES:${PN}-dev = "eglibc-dev libc6-dev virtual-libc-dev" |
11 | RPROVIDES_${PN}-staticdev = "eglibc-staticdev" | 11 | RPROVIDES:${PN}-staticdev = "eglibc-staticdev" |
12 | RPROVIDES_${PN}-doc = "eglibc-doc" | 12 | RPROVIDES:${PN}-doc = "eglibc-doc" |
13 | RPROVIDES_glibc-extra-nss = "eglibc-extra-nss" | 13 | RPROVIDES:glibc-extra-nss = "eglibc-extra-nss" |
14 | RPROVIDES_glibc-thread-db = "eglibc-thread-db" | 14 | RPROVIDES:glibc-thread-db = "eglibc-thread-db" |
15 | RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile" | 15 | RPROVIDES:${PN}-pcprofile = "eglibc-pcprofile" |
16 | RPROVIDES_${PN}-dbg = "eglibc-dbg" | 16 | RPROVIDES:${PN}-dbg = "eglibc-dbg" |
17 | 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" | 17 | 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" |
18 | ARCH_DYNAMIC_LOADER = "" | 18 | ARCH_DYNAMIC_LOADER = "" |
19 | # The aarch64 ABI says the dynamic linker -must- be | 19 | # The aarch64 ABI says the dynamic linker -must- be |
20 | # /lib/ld-linux-aarch64{,_be}.so.1. With usrmerge, that may mean that | 20 | # /lib/ld-linux-aarch64{,_be}.so.1. With usrmerge, that may mean that |
21 | # we need to install it in /usr/lib. | 21 | # we need to install it in /usr/lib. |
22 | ARCH_DYNAMIC_LOADER_aarch64 = "ld-linux-${TARGET_ARCH}.so.1" | 22 | ARCH_DYNAMIC_LOADER:aarch64 = "ld-linux-${TARGET_ARCH}.so.1" |
23 | libc_baselibs_append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" | 23 | libc_baselibs:append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}" |
24 | INSANE_SKIP_${PN}_append_aarch64 = " libdir" | 24 | INSANE_SKIP:${PN}:append:aarch64 = " libdir" |
25 | 25 | ||
26 | FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" | 26 | FILES:${PN} = "${libc_baselibs} ${libexecdir}/* ${sysconfdir}/ld.so.conf" |
27 | RRECOMMENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" | 27 | RRECOMMENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'ldconfig', '${MLPREFIX}ldconfig', '', d)}" |
28 | FILES_ldconfig = "${base_sbindir}/ldconfig" | 28 | FILES:ldconfig = "${base_sbindir}/ldconfig" |
29 | FILES_ldd = "${bindir}/ldd" | 29 | FILES:ldd = "${bindir}/ldd" |
30 | FILES_libsegfault = "${base_libdir}/libSegFault*" | 30 | FILES:libsegfault = "${base_libdir}/libSegFault*" |
31 | FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" | 31 | FILES:libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" |
32 | FILES_libmemusage = "${base_libdir}/libmemusage.so" | 32 | FILES:libmemusage = "${base_libdir}/libmemusage.so" |
33 | FILES_libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile ${localstatedir}/db/makedbs.sh" | 33 | FILES:libnss-db = "${base_libdir}/libnss_db.so.* ${base_libdir}/libnss_db-*.so ${localstatedir}/db/Makefile ${localstatedir}/db/makedbs.sh" |
34 | RDEPENDS_libnss-db = "${PN}-utils" | 34 | RDEPENDS:libnss-db = "${PN}-utils" |
35 | FILES_glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" | 35 | FILES:glibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" |
36 | FILES_sln = "${base_sbindir}/sln" | 36 | FILES:sln = "${base_sbindir}/sln" |
37 | FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" | 37 | FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" |
38 | FILES_libsotruss = "${libdir}/audit/sotruss-lib.so" | 38 | FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" |
39 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" | 39 | FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" |
40 | FILES_${PN}-dev += "${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" | 40 | FILES:${PN}-dev += "${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" |
41 | RDEPENDS_${PN}-dev = "linux-libc-headers-dev" | 41 | RDEPENDS:${PN}-dev = "linux-libc-headers-dev" |
42 | FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" | 42 | FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" |
43 | FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ | 43 | FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_unitdir}/system/nscd* ${sysconfdir}/tmpfiles.d/nscd.conf \ |
44 | ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd" | 44 | ${sysconfdir}/nscd.conf ${sysconfdir}/default/volatiles/98_nscd ${localstatedir}/db/nscd" |
45 | FILES_${PN}-mtrace = "${bindir}/mtrace" | 45 | FILES:${PN}-mtrace = "${bindir}/mtrace" |
46 | FILES_tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump" | 46 | FILES:tzcode = "${bindir}/tzselect ${sbindir}/zic ${bindir}/zdump" |
47 | FILES_${PN}-utils = "${bindir}/* ${sbindir}/*" | 47 | FILES:${PN}-utils = "${bindir}/* ${sbindir}/*" |
48 | FILES_catchsegv = "${bindir}/catchsegv" | 48 | FILES:catchsegv = "${bindir}/catchsegv" |
49 | RDEPENDS_catchsegv = "libsegfault" | 49 | RDEPENDS:catchsegv = "libsegfault" |
50 | FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so" | 50 | FILES:${PN}-pcprofile = "${base_libdir}/libpcprofile.so" |
51 | FILES_glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" | 51 | FILES:glibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so" |
52 | RPROVIDES_${PN}-dev += "libc-dev" | 52 | RPROVIDES:${PN}-dev += "libc-dev" |
53 | RPROVIDES_${PN}-staticdev += "libc-staticdev" | 53 | RPROVIDES:${PN}-staticdev += "libc-staticdev" |
54 | 54 | ||
55 | SUMMARY_sln = "The static ln" | 55 | SUMMARY:sln = "The static ln" |
56 | 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." | 56 | 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." |
57 | SUMMARY_nscd = "Name service cache daemon" | 57 | SUMMARY:nscd = "Name service cache daemon" |
58 | 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." | 58 | 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." |
59 | SUMMARY_glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" | 59 | SUMMARY:glibc-extra-nss = "hesiod, NIS and NIS+ nss libraries" |
60 | DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services." | 60 | DESCRIPTION:glibc-extra-nss = "glibc: nis, nisplus and hesiod search services." |
61 | SUMMARY_ldd = "print shared library dependencies" | 61 | SUMMARY:ldd = "print shared library dependencies" |
62 | DESCRIPTION_ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line." | 62 | DESCRIPTION:ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line." |
63 | SUMMARY_${PN}-utils = "Miscellaneous utilities provided by glibc" | 63 | SUMMARY:${PN}-utils = "Miscellaneous utilities provided by glibc" |
64 | DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconv, locale, gencat, ..." | 64 | DESCRIPTION:${PN}-utils = "Miscellaneous utilities including getconf, iconv, locale, gencat, ..." |
65 | DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs" | 65 | DESCRIPTION:libsotruss = "Library to support sotruss which traces calls through PLTs" |
66 | DESCRIPTION_tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" | 66 | DESCRIPTION:tzcode = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" |
67 | 67 | ||
68 | inherit multilib_header | 68 | inherit multilib_header |
69 | 69 | ||
@@ -125,7 +125,7 @@ def get_libc_fpu_setting(bb, d): | |||
125 | return "--without-fp" | 125 | return "--without-fp" |
126 | return "" | 126 | return "" |
127 | 127 | ||
128 | do_install_append_class-target() { | 128 | do_install:append:class-target() { |
129 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then | 129 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then |
130 | install -d ${D}${sysconfdir}/tmpfiles.d | 130 | install -d ${D}${sysconfdir}/tmpfiles.d |
131 | echo "d /run/nscd 755 root root -" \ | 131 | echo "d /run/nscd 755 root root -" \ |
@@ -139,15 +139,15 @@ do_install_append_class-target() { | |||
139 | fi | 139 | fi |
140 | 140 | ||
141 | } | 141 | } |
142 | do_install_append_aarch64 () { | 142 | do_install:append:aarch64 () { |
143 | do_install_armmultilib | 143 | do_install_armmultilib |
144 | } | 144 | } |
145 | 145 | ||
146 | do_install_append_arm () { | 146 | do_install:append:arm () { |
147 | do_install_armmultilib | 147 | do_install_armmultilib |
148 | } | 148 | } |
149 | 149 | ||
150 | do_install_append_armeb () { | 150 | do_install:append:armeb () { |
151 | do_install_armmultilib | 151 | do_install_armmultilib |
152 | } | 152 | } |
153 | 153 | ||
@@ -252,26 +252,26 @@ stash_locale_package_cleanup() { | |||
252 | stash_locale_cleanup ${PKGD} | 252 | stash_locale_cleanup ${PKGD} |
253 | } | 253 | } |
254 | 254 | ||
255 | python populate_packages_prepend () { | 255 | python populate_packages:prepend () { |
256 | if d.getVar('DEBIAN_NAMES'): | 256 | if d.getVar('DEBIAN_NAMES'): |
257 | pkgs = d.getVar('PACKAGES').split() | 257 | pkgs = d.getVar('PACKAGES').split() |
258 | bpn = d.getVar('BPN') | 258 | bpn = d.getVar('BPN') |
259 | prefix = d.getVar('MLPREFIX') or "" | 259 | prefix = d.getVar('MLPREFIX') or "" |
260 | # Set the base package... | 260 | # Set the base package... |
261 | d.setVar('PKG_' + prefix + bpn, prefix + 'libc6') | 261 | d.setVar('PKG:' + prefix + bpn, prefix + 'libc6') |
262 | libcprefix = prefix + bpn + '-' | 262 | libcprefix = prefix + bpn + '-' |
263 | for p in pkgs: | 263 | for p in pkgs: |
264 | # And all the subpackages. | 264 | # And all the subpackages. |
265 | if p.startswith(libcprefix): | 265 | if p.startswith(libcprefix): |
266 | renamed = p.replace(bpn, 'libc6', 1) | 266 | renamed = p.replace(bpn, 'libc6', 1) |
267 | d.setVar('PKG_' + p, renamed) | 267 | d.setVar('PKG:' + p, renamed) |
268 | # For backward compatibility with old -dbg package | 268 | # For backward compatibility with old -dbg package |
269 | d.appendVar('RPROVIDES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') | 269 | d.appendVar('RPROVIDES:' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') |
270 | d.appendVar('RCONFLICTS_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') | 270 | d.appendVar('RCONFLICTS:' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') |
271 | d.appendVar('RREPLACES_' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') | 271 | d.appendVar('RREPLACES:' + libcprefix + 'dbg', ' ' + prefix + 'libc-dbg') |
272 | } | 272 | } |
273 | 273 | ||
274 | pkg_postinst_nscd () { | 274 | pkg_postinst:nscd () { |
275 | if [ -z "$D" ]; then | 275 | if [ -z "$D" ]; then |
276 | if command -v systemd-tmpfiles >/dev/null; then | 276 | if command -v systemd-tmpfiles >/dev/null; then |
277 | systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nscd.conf | 277 | systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/nscd.conf |
@@ -280,7 +280,7 @@ pkg_postinst_nscd () { | |||
280 | fi | 280 | fi |
281 | fi | 281 | fi |
282 | } | 282 | } |
283 | CONFFILES_nscd="${sysconfdir}/nscd.conf" | 283 | CONFFILES:nscd="${sysconfdir}/nscd.conf" |
284 | 284 | ||
285 | SYSTEMD_PACKAGES = "nscd" | 285 | SYSTEMD_PACKAGES = "nscd" |
286 | SYSTEMD_SERVICE_nscd = "nscd.service" | 286 | SYSTEMD_SERVICE:nscd = "nscd.service" |
diff --git a/meta/recipes-core/glibc/glibc-scripts.inc b/meta/recipes-core/glibc/glibc-scripts.inc index 14a14e4512..47216ae7d7 100644 --- a/meta/recipes-core/glibc/glibc-scripts.inc +++ b/meta/recipes-core/glibc/glibc-scripts.inc | |||
@@ -2,7 +2,7 @@ require glibc-collateral.inc | |||
2 | 2 | ||
3 | SUMMARY = "utility scripts provided by glibc" | 3 | SUMMARY = "utility scripts provided by glibc" |
4 | DESCRIPTION = "utility scripts provided by glibc" | 4 | DESCRIPTION = "utility scripts provided by glibc" |
5 | RDEPENDS_${PN} = "bash glibc-mtrace" | 5 | RDEPENDS:${PN} = "bash glibc-mtrace" |
6 | 6 | ||
7 | SRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale/scripts" | 7 | SRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale/scripts" |
8 | 8 | ||
@@ -17,7 +17,7 @@ do_install() { | |||
17 | 17 | ||
18 | # sotruss script requires sotruss-lib.so (given by libsotruss package), | 18 | # sotruss script requires sotruss-lib.so (given by libsotruss package), |
19 | # to produce trace of the library calls. | 19 | # to produce trace of the library calls. |
20 | RDEPENDS_${PN} += "libsotruss" | 20 | RDEPENDS:${PN} += "libsotruss" |
21 | 21 | ||
22 | # Don't scan for CVEs as glibc will be scanned | 22 | # Don't scan for CVEs as glibc will be scanned |
23 | CVE_PRODUCT = "" | 23 | CVE_PRODUCT = "" |
diff --git a/meta/recipes-core/glibc/glibc-testsuite_2.33.bb b/meta/recipes-core/glibc/glibc-testsuite_2.33.bb index 659d3132fa..72aa332171 100644 --- a/meta/recipes-core/glibc/glibc-testsuite_2.33.bb +++ b/meta/recipes-core/glibc/glibc-testsuite_2.33.bb | |||
@@ -3,7 +3,7 @@ require glibc_${PV}.bb | |||
3 | EXCLUDE_FROM_WORLD = "1" | 3 | EXCLUDE_FROM_WORLD = "1" |
4 | 4 | ||
5 | # handle PN differences | 5 | # handle PN differences |
6 | FILESEXTRAPATHS_prepend := "${THISDIR}/glibc:" | 6 | FILESEXTRAPATHS:prepend := "${THISDIR}/glibc:" |
7 | 7 | ||
8 | # strip provides | 8 | # strip provides |
9 | PROVIDES = "" | 9 | PROVIDES = "" |
@@ -20,7 +20,7 @@ python () { | |||
20 | DEPENDS += "glibc-locale libgcc gcc-runtime" | 20 | DEPENDS += "glibc-locale libgcc gcc-runtime" |
21 | 21 | ||
22 | # remove the initial depends | 22 | # remove the initial depends |
23 | DEPENDS_remove = "libgcc-initial" | 23 | DEPENDS:remove = "libgcc-initial" |
24 | 24 | ||
25 | inherit qemu | 25 | inherit qemu |
26 | 26 | ||
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 7d14306377..04e6db99b9 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc | |||
@@ -24,10 +24,10 @@ CACHED_CONFIGUREVARS += " \ | |||
24 | " | 24 | " |
25 | 25 | ||
26 | # ifunc doesn't appear to work on mips, casuses libbfd assertion failures | 26 | # ifunc doesn't appear to work on mips, casuses libbfd assertion failures |
27 | CACHED_CONFIGUREVARS_append_mipsarch = " libc_cv_ld_gnu_indirect_function=no" | 27 | CACHED_CONFIGUREVARS:append:mipsarch = " libc_cv_ld_gnu_indirect_function=no" |
28 | 28 | ||
29 | GLIBC_EXTRA_OECONF ?= "" | 29 | GLIBC_EXTRA_OECONF ?= "" |
30 | GLIBC_EXTRA_OECONF_class-nativesdk = "" | 30 | GLIBC_EXTRA_OECONF:class-nativesdk = "" |
31 | 31 | ||
32 | # glibc uses PARALLELMFLAGS variable to pass parallel build info so transfer | 32 | # glibc uses PARALLELMFLAGS variable to pass parallel build info so transfer |
33 | # PARALLEL_MAKE into PARALLELMFLAGS and empty out PARALLEL_MAKE | 33 | # PARALLEL_MAKE into PARALLELMFLAGS and empty out PARALLEL_MAKE |
@@ -41,12 +41,12 @@ PARALLEL_MAKE = "" | |||
41 | # ensure make uses /bin/bash | 41 | # ensure make uses /bin/bash |
42 | EXTRA_OEMAKE += "SHELL=/bin/bash" | 42 | EXTRA_OEMAKE += "SHELL=/bin/bash" |
43 | 43 | ||
44 | do_configure_prepend() { | 44 | do_configure:prepend() { |
45 | sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in | 45 | sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in |
46 | } | 46 | } |
47 | 47 | ||
48 | # Enable backtrace from abort() | 48 | # Enable backtrace from abort() |
49 | do_configure_append_arm () { | 49 | do_configure:append:arm () { |
50 | echo "CFLAGS-abort.c = -fasynchronous-unwind-tables" >> ${B}/configparms | 50 | echo "CFLAGS-abort.c = -fasynchronous-unwind-tables" >> ${B}/configparms |
51 | echo "CFLAGS-raise.c = -fasynchronous-unwind-tables" >> ${B}/configparms | 51 | echo "CFLAGS-raise.c = -fasynchronous-unwind-tables" >> ${B}/configparms |
52 | } | 52 | } |
diff --git a/meta/recipes-core/glibc/glibc_2.33.bb b/meta/recipes-core/glibc/glibc_2.33.bb index e9f01a14c5..67eb3f04bb 100644 --- a/meta/recipes-core/glibc/glibc_2.33.bb +++ b/meta/recipes-core/glibc/glibc_2.33.bb | |||
@@ -19,7 +19,7 @@ CVE_CHECK_WHITELIST += "CVE-2019-1010025" | |||
19 | DEPENDS += "gperf-native bison-native make-native" | 19 | DEPENDS += "gperf-native bison-native make-native" |
20 | 20 | ||
21 | NATIVESDKFIXES ?= "" | 21 | NATIVESDKFIXES ?= "" |
22 | NATIVESDKFIXES_class-nativesdk = "\ | 22 | NATIVESDKFIXES:class-nativesdk = "\ |
23 | file://0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch \ | 23 | file://0003-nativesdk-glibc-Look-for-host-system-ld.so.cache-as-.patch \ |
24 | file://0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch \ | 24 | file://0004-nativesdk-glibc-Fix-buffer-overrun-with-a-relocated-.patch \ |
25 | file://0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch \ | 25 | file://0005-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch \ |
@@ -90,14 +90,14 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ | |||
90 | 90 | ||
91 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" | 91 | EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" |
92 | 92 | ||
93 | EXTRA_OECONF_append_x86 = " --enable-cet" | 93 | EXTRA_OECONF:append:x86 = " --enable-cet" |
94 | EXTRA_OECONF_append_x86-64 = " --enable-cet" | 94 | EXTRA_OECONF:append:x86-64 = " --enable-cet" |
95 | 95 | ||
96 | PACKAGECONFIG ??= "nscd memory-tagging" | 96 | PACKAGECONFIG ??= "nscd memory-tagging" |
97 | PACKAGECONFIG[nscd] = "--enable-nscd,--disable-nscd" | 97 | PACKAGECONFIG[nscd] = "--enable-nscd,--disable-nscd" |
98 | PACKAGECONFIG[memory-tagging] = "--enable-memory-tagging,--disable-memory-tagging" | 98 | PACKAGECONFIG[memory-tagging] = "--enable-memory-tagging,--disable-memory-tagging" |
99 | 99 | ||
100 | do_patch_append() { | 100 | do_patch:append() { |
101 | bb.build.exec_func('do_fix_readlib_c', d) | 101 | bb.build.exec_func('do_fix_readlib_c', d) |
102 | } | 102 | } |
103 | 103 | ||
diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb index 0daf50acab..1d01701b8f 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb | |||
@@ -51,7 +51,7 @@ do_install_ptest () { | |||
51 | } | 51 | } |
52 | 52 | ||
53 | ALTERNATIVE_PRIORITY = "100" | 53 | ALTERNATIVE_PRIORITY = "100" |
54 | ALTERNATIVE_${PN} = "ifup ifdown" | 54 | ALTERNATIVE:${PN} = "ifup ifdown" |
55 | 55 | ||
56 | ALTERNATIVE_LINK_NAME[ifup] = "${base_sbindir}/ifup" | 56 | ALTERNATIVE_LINK_NAME[ifup] = "${base_sbindir}/ifup" |
57 | ALTERNATIVE_LINK_NAME[ifdown] = "${base_sbindir}/ifdown" | 57 | ALTERNATIVE_LINK_NAME[ifdown] = "${base_sbindir}/ifdown" |
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 1176311ff9..17e06a0569 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb | |||
@@ -34,7 +34,7 @@ SRC_URI = "git://git.yoctoproject.org/poky \ | |||
34 | RECIPE_NO_UPDATE_REASON = "Recipe is recursive and handled as part of the release process" | 34 | RECIPE_NO_UPDATE_REASON = "Recipe is recursive and handled as part of the release process" |
35 | BA_INCLUDE_SOURCES ??= "0" | 35 | BA_INCLUDE_SOURCES ??= "0" |
36 | 36 | ||
37 | IMAGE_CMD_ext4_append () { | 37 | IMAGE_CMD:ext4:append () { |
38 | # We don't need to reserve much space for root, 0.5% is more than enough | 38 | # We don't need to reserve much space for root, 0.5% is more than enough |
39 | tune2fs -m 0.5 ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4 | 39 | tune2fs -m 0.5 ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4 |
40 | } | 40 | } |
diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb index 19f27f8395..84343adcd8 100644 --- a/meta/recipes-core/images/core-image-minimal.bb +++ b/meta/recipes-core/images/core-image-minimal.bb | |||
@@ -9,4 +9,4 @@ LICENSE = "MIT" | |||
9 | inherit core-image | 9 | inherit core-image |
10 | 10 | ||
11 | IMAGE_ROOTFS_SIZE ?= "8192" | 11 | IMAGE_ROOTFS_SIZE ?= "8192" |
12 | IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "", d)}" | 12 | IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "", d)}" |
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb index b6fc8a4d41..741da324d0 100644 --- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb +++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb | |||
@@ -29,13 +29,13 @@ do_install () { | |||
29 | install -m 0755 ${WORKDIR}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d | 29 | install -m 0755 ${WORKDIR}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d |
30 | } | 30 | } |
31 | 31 | ||
32 | do_install_append_qemuall () { | 32 | do_install:append:qemuall () { |
33 | # Disable network manager on machines that commonly do NFS booting | 33 | # Disable network manager on machines that commonly do NFS booting |
34 | touch ${D}${sysconfdir}/network/nm-disabled-eth0 | 34 | touch ${D}${sysconfdir}/network/nm-disabled-eth0 |
35 | } | 35 | } |
36 | 36 | ||
37 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 37 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
38 | RDEPENDS_${PN} = "netbase" | 38 | RDEPENDS:${PN} = "netbase" |
39 | RCONFLICTS_${PN} = "netbase (< 1:5.0)" | 39 | RCONFLICTS:${PN} = "netbase (< 1:5.0)" |
40 | 40 | ||
41 | CONFFILES_${PN} = "${sysconfdir}/network/interfaces" | 41 | CONFFILES:${PN} = "${sysconfdir}/network/interfaces" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb index 29ec5ec2ff..ab460ac797 100644 --- a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb | |||
@@ -18,4 +18,4 @@ do_install() { | |||
18 | 18 | ||
19 | inherit allarch | 19 | inherit allarch |
20 | 20 | ||
21 | FILES_${PN} += "/init /dev/console" | 21 | FILES:${PN} += "/init /dev/console" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index fe24215b46..9e8c1dc3ab 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | |||
@@ -1,8 +1,8 @@ | |||
1 | SUMMARY = "Modular initramfs system" | 1 | SUMMARY = "Modular initramfs system" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" | 4 | RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_base-utils}" |
5 | RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | 5 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" |
6 | 6 | ||
7 | PR = "r4" | 7 | PR = "r4" |
8 | 8 | ||
@@ -66,7 +66,7 @@ PACKAGES = "${PN}-base \ | |||
66 | initramfs-module-lvm \ | 66 | initramfs-module-lvm \ |
67 | " | 67 | " |
68 | 68 | ||
69 | FILES_${PN}-base = "/init /init.d/99-finish /dev" | 69 | FILES:${PN}-base = "/init /init.d/99-finish /dev" |
70 | 70 | ||
71 | # 99-finish in base depends on some other module which mounts | 71 | # 99-finish in base depends on some other module which mounts |
72 | # the rootfs, like 90-rootfs. To replace that default, use | 72 | # the rootfs, like 90-rootfs. To replace that default, use |
@@ -74,36 +74,36 @@ FILES_${PN}-base = "/init /init.d/99-finish /dev" | |||
74 | # initramfs recipe and install something else, or install | 74 | # initramfs recipe and install something else, or install |
75 | # something that runs earlier (for example, a 89-my-rootfs) | 75 | # something that runs earlier (for example, a 89-my-rootfs) |
76 | # and mounts the rootfs. Then 90-rootfs will proceed immediately. | 76 | # and mounts the rootfs. Then 90-rootfs will proceed immediately. |
77 | RRECOMMENDS_${PN}-base += "initramfs-module-rootfs" | 77 | RRECOMMENDS:${PN}-base += "initramfs-module-rootfs" |
78 | 78 | ||
79 | SUMMARY_initramfs-module-exec = "initramfs support for easy execution of applications" | 79 | SUMMARY:initramfs-module-exec = "initramfs support for easy execution of applications" |
80 | RDEPENDS_initramfs-module-exec = "${PN}-base" | 80 | RDEPENDS:initramfs-module-exec = "${PN}-base" |
81 | FILES_initramfs-module-exec = "/init.d/89-exec" | 81 | FILES:initramfs-module-exec = "/init.d/89-exec" |
82 | 82 | ||
83 | SUMMARY_initramfs-module-mdev = "initramfs support for mdev" | 83 | SUMMARY:initramfs-module-mdev = "initramfs support for mdev" |
84 | RDEPENDS_initramfs-module-mdev = "${PN}-base busybox-mdev" | 84 | RDEPENDS:initramfs-module-mdev = "${PN}-base busybox-mdev" |
85 | FILES_initramfs-module-mdev = "/init.d/01-mdev" | 85 | FILES:initramfs-module-mdev = "/init.d/01-mdev" |
86 | 86 | ||
87 | SUMMARY_initramfs-module-udev = "initramfs support for udev" | 87 | SUMMARY:initramfs-module-udev = "initramfs support for udev" |
88 | RDEPENDS_initramfs-module-udev = "${PN}-base udev" | 88 | RDEPENDS:initramfs-module-udev = "${PN}-base udev" |
89 | FILES_initramfs-module-udev = "/init.d/01-udev" | 89 | FILES:initramfs-module-udev = "/init.d/01-udev" |
90 | 90 | ||
91 | SUMMARY_initramfs-module-e2fs = "initramfs support for ext4/ext3/ext2 filesystems" | 91 | SUMMARY:initramfs-module-e2fs = "initramfs support for ext4/ext3/ext2 filesystems" |
92 | RDEPENDS_initramfs-module-e2fs = "${PN}-base" | 92 | RDEPENDS:initramfs-module-e2fs = "${PN}-base" |
93 | FILES_initramfs-module-e2fs = "/init.d/10-e2fs" | 93 | FILES:initramfs-module-e2fs = "/init.d/10-e2fs" |
94 | 94 | ||
95 | SUMMARY_initramfs-module-nfsrootfs = "initramfs support for locating and mounting the root partition via nfs" | 95 | SUMMARY:initramfs-module-nfsrootfs = "initramfs support for locating and mounting the root partition via nfs" |
96 | RDEPENDS_initramfs-module-nfsrootfs = "${PN}-base" | 96 | RDEPENDS:initramfs-module-nfsrootfs = "${PN}-base" |
97 | FILES_initramfs-module-nfsrootfs = "/init.d/85-nfsrootfs" | 97 | FILES:initramfs-module-nfsrootfs = "/init.d/85-nfsrootfs" |
98 | 98 | ||
99 | SUMMARY_initramfs-module-rootfs = "initramfs support for locating and mounting the root partition" | 99 | SUMMARY:initramfs-module-rootfs = "initramfs support for locating and mounting the root partition" |
100 | RDEPENDS_initramfs-module-rootfs = "${PN}-base" | 100 | RDEPENDS:initramfs-module-rootfs = "${PN}-base" |
101 | FILES_initramfs-module-rootfs = "/init.d/90-rootfs" | 101 | FILES:initramfs-module-rootfs = "/init.d/90-rootfs" |
102 | 102 | ||
103 | SUMMARY_initramfs-module-debug = "initramfs dynamic debug support" | 103 | SUMMARY:initramfs-module-debug = "initramfs dynamic debug support" |
104 | RDEPENDS_initramfs-module-debug = "${PN}-base" | 104 | RDEPENDS:initramfs-module-debug = "${PN}-base" |
105 | FILES_initramfs-module-debug = "/init.d/00-debug" | 105 | FILES:initramfs-module-debug = "/init.d/00-debug" |
106 | 106 | ||
107 | SUMMARY_initramfs-module-lvm = "initramfs lvm rootfs support" | 107 | SUMMARY:initramfs-module-lvm = "initramfs lvm rootfs support" |
108 | RDEPENDS_initramfs-module-lvm = "${PN}-base" | 108 | RDEPENDS:initramfs-module-lvm = "${PN}-base" |
109 | FILES_initramfs-module-lvm = "/init.d/09-lvm" | 109 | FILES:initramfs-module-lvm = "/init.d/09-lvm" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb index 7a9a8ecae2..59a530506a 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-boot-tiny_1.0.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Live image init script" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | DEPENDS = "virtual/kernel" | 4 | DEPENDS = "virtual/kernel" |
5 | RDEPENDS_${PN} = "busybox-mdev" | 5 | RDEPENDS:${PN} = "busybox-mdev" |
6 | SRC_URI = "file://init-live.sh" | 6 | SRC_URI = "file://init-live.sh" |
7 | 7 | ||
8 | PR = "r12" | 8 | PR = "r12" |
@@ -15,7 +15,7 @@ do_install() { | |||
15 | mknod -m 622 ${D}/dev/console c 5 1 | 15 | mknod -m 622 ${D}/dev/console c 5 1 |
16 | } | 16 | } |
17 | 17 | ||
18 | FILES_${PN} += " /init /dev " | 18 | FILES:${PN} += " /init /dev " |
19 | 19 | ||
20 | # Due to kernel dependency | 20 | # Due to kernel dependency |
21 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 21 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb index 57b30254a6..8f56d7ab90 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Live image init script" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | DEPENDS = "virtual/kernel" | 4 | DEPENDS = "virtual/kernel" |
5 | RDEPENDS_${PN} = "udev udev-extraconf" | 5 | RDEPENDS:${PN} = "udev udev-extraconf" |
6 | SRC_URI = "file://init-live.sh" | 6 | SRC_URI = "file://init-live.sh" |
7 | 7 | ||
8 | PR = "r12" | 8 | PR = "r12" |
@@ -15,7 +15,7 @@ do_install() { | |||
15 | mknod -m 622 ${D}/dev/console c 5 1 | 15 | mknod -m 622 ${D}/dev/console c 5 1 |
16 | } | 16 | } |
17 | 17 | ||
18 | FILES_${PN} += " /init /dev " | 18 | FILES:${PN} += " /init /dev " |
19 | 19 | ||
20 | # Due to kernel dependency | 20 | # Due to kernel dependency |
21 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 21 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb index c03bd2d765..495eccbeda 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi-testfs_1.0.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "MIT" | |||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | SRC_URI = "file://init-install-efi-testfs.sh" | 4 | SRC_URI = "file://init-install-efi-testfs.sh" |
5 | 5 | ||
6 | RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools" | 6 | RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools" |
7 | 7 | ||
8 | S = "${WORKDIR}" | 8 | S = "${WORKDIR}" |
9 | 9 | ||
@@ -12,5 +12,5 @@ do_install() { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | INHIBIT_DEFAULT_DEPS = "1" | 14 | INHIBIT_DEFAULT_DEPS = "1" |
15 | FILES_${PN} = " /install-efi.sh " | 15 | FILES:${PN} = " /install-efi.sh " |
16 | COMPATIBLE_HOST = "(i.86|x86_64).*-linux" | 16 | COMPATIBLE_HOST = "(i.86|x86_64).*-linux" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb index cc842ae8b7..ecbd567d6c 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb | |||
@@ -5,8 +5,8 @@ SRC_URI = "file://init-install-efi.sh" | |||
5 | 5 | ||
6 | PR = "r1" | 6 | PR = "r1" |
7 | 7 | ||
8 | RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" | 8 | RDEPENDS:${PN} = "parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" |
9 | RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | 9 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" |
10 | 10 | ||
11 | S = "${WORKDIR}" | 11 | S = "${WORKDIR}" |
12 | 12 | ||
@@ -20,6 +20,6 @@ do_install() { | |||
20 | #inherit allarch | 20 | #inherit allarch |
21 | INHIBIT_DEFAULT_DEPS = "1" | 21 | INHIBIT_DEFAULT_DEPS = "1" |
22 | 22 | ||
23 | FILES_${PN} = " /install-efi.sh " | 23 | FILES:${PN} = " /install-efi.sh " |
24 | 24 | ||
25 | COMPATIBLE_HOST = "(i.86.*|x86_64.*|aarch64.*)-linux" | 25 | COMPATIBLE_HOST = "(i.86.*|x86_64.*|aarch64.*)-linux" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb index 937bfd4d38..d347e323b3 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb | |||
@@ -3,7 +3,7 @@ LICENSE = "MIT" | |||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | SRC_URI = "file://init-install-testfs.sh" | 4 | SRC_URI = "file://init-install-testfs.sh" |
5 | 5 | ||
6 | RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs" | 6 | RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs" |
7 | 7 | ||
8 | S = "${WORKDIR}" | 8 | S = "${WORKDIR}" |
9 | 9 | ||
@@ -12,5 +12,5 @@ do_install() { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | INHIBIT_DEFAULT_DEPS = "1" | 14 | INHIBIT_DEFAULT_DEPS = "1" |
15 | FILES_${PN} = " /install.sh " | 15 | FILES:${PN} = " /install.sh " |
16 | COMPATIBLE_HOST = "(i.86|x86_64).*-linux" | 16 | COMPATIBLE_HOST = "(i.86|x86_64).*-linux" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb index 48fc0c4a76..674d49ecdf 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb | |||
@@ -7,8 +7,8 @@ PR = "r9" | |||
7 | 7 | ||
8 | S = "${WORKDIR}" | 8 | S = "${WORKDIR}" |
9 | 9 | ||
10 | RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" | 10 | RDEPENDS:${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" |
11 | RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | 11 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" |
12 | 12 | ||
13 | do_install() { | 13 | do_install() { |
14 | install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh | 14 | install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh |
@@ -20,6 +20,6 @@ do_install() { | |||
20 | #inherit allarch | 20 | #inherit allarch |
21 | INHIBIT_DEFAULT_DEPS = "1" | 21 | INHIBIT_DEFAULT_DEPS = "1" |
22 | 22 | ||
23 | FILES_${PN} = " /install.sh " | 23 | FILES:${PN} = " /install.sh " |
24 | 24 | ||
25 | COMPATIBLE_HOST = "(i.86.*|x86_64.*|aarch64.*)-linux" | 25 | COMPATIBLE_HOST = "(i.86.*|x86_64.*|aarch64.*)-linux" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb index 523138cff3..fb19484555 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb | |||
@@ -1,8 +1,8 @@ | |||
1 | SUMMARY = "initramfs-framework module for EFI installation option" | 1 | SUMMARY = "initramfs-framework module for EFI installation option" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" | 4 | RDEPENDS:${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" |
5 | RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | 5 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" |
6 | 6 | ||
7 | PR = "r4" | 7 | PR = "r4" |
8 | 8 | ||
@@ -15,4 +15,4 @@ do_install() { | |||
15 | install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/init.d/install-efi.sh | 15 | install -m 0755 ${WORKDIR}/init-install-efi.sh ${D}/init.d/install-efi.sh |
16 | } | 16 | } |
17 | 17 | ||
18 | FILES_${PN} = "/init.d/install-efi.sh" | 18 | FILES:${PN} = "/init.d/install-efi.sh" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb index 56898e824f..4d48d54e9e 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb | |||
@@ -1,13 +1,13 @@ | |||
1 | SUMMARY = "initramfs-framework module for installation option" | 1 | SUMMARY = "initramfs-framework module for installation option" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" | 4 | RDEPENDS:${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" |
5 | RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | 5 | RRECOMMENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" |
6 | 6 | ||
7 | # The same restriction as grub | 7 | # The same restriction as grub |
8 | COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)' | 8 | COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)' |
9 | COMPATIBLE_HOST_armv7a = 'null' | 9 | COMPATIBLE_HOST:armv7a = 'null' |
10 | COMPATIBLE_HOST_armv7ve = 'null' | 10 | COMPATIBLE_HOST:armv7ve = 'null' |
11 | 11 | ||
12 | PR = "r1" | 12 | PR = "r1" |
13 | 13 | ||
@@ -20,4 +20,4 @@ do_install() { | |||
20 | install -m 0755 ${WORKDIR}/init-install.sh ${D}/init.d/install.sh | 20 | install -m 0755 ${WORKDIR}/init-install.sh ${D}/init.d/install.sh |
21 | } | 21 | } |
22 | 22 | ||
23 | FILES_${PN} = "/init.d/install.sh" | 23 | FILES:${PN} = "/init.d/install.sh" |
diff --git a/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb index 4d2fe9dd2b..d8ce024b83 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb | |||
@@ -1,13 +1,13 @@ | |||
1 | SUMMARY = "initramfs-framework module for live booting" | 1 | SUMMARY = "initramfs-framework module for live booting" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | RDEPENDS_${PN} = "initramfs-framework-base udev-extraconf" | 4 | RDEPENDS:${PN} = "initramfs-framework-base udev-extraconf" |
5 | 5 | ||
6 | PR = "r4" | 6 | PR = "r4" |
7 | 7 | ||
8 | inherit allarch | 8 | inherit allarch |
9 | 9 | ||
10 | FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:" | 10 | FILESEXTRAPATHS:prepend := "${THISDIR}/initramfs-framework:" |
11 | SRC_URI = "file://setup-live" | 11 | SRC_URI = "file://setup-live" |
12 | 12 | ||
13 | S = "${WORKDIR}" | 13 | S = "${WORKDIR}" |
@@ -17,4 +17,4 @@ do_install() { | |||
17 | install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live | 17 | install -m 0755 ${WORKDIR}/setup-live ${D}/init.d/80-setup-live |
18 | } | 18 | } |
19 | 19 | ||
20 | FILES_${PN} = "/init.d/80-setup-live" | 20 | FILES:${PN} = "/init.d/80-setup-live" |
diff --git a/meta/recipes-core/initscripts/init-system-helpers_1.60.bb b/meta/recipes-core/initscripts/init-system-helpers_1.60.bb index 33977e66c1..165f37c070 100644 --- a/meta/recipes-core/initscripts/init-system-helpers_1.60.bb +++ b/meta/recipes-core/initscripts/init-system-helpers_1.60.bb | |||
@@ -32,10 +32,10 @@ do_install() { | |||
32 | 32 | ||
33 | PACKAGES += "${PN}-invoke-rc.d ${PN}-service" | 33 | PACKAGES += "${PN}-invoke-rc.d ${PN}-service" |
34 | 34 | ||
35 | FILES_${PN} = "" | 35 | FILES:${PN} = "" |
36 | FILES_${PN}-invoke-rc.d = "${sbindir}/invoke-rc.d" | 36 | FILES:${PN}-invoke-rc.d = "${sbindir}/invoke-rc.d" |
37 | FILES_${PN}-service = "${sbindir}/service" | 37 | FILES:${PN}-service = "${sbindir}/service" |
38 | 38 | ||
39 | ALLOW_EMPTY_${PN} = "1" | 39 | ALLOW_EMPTY:${PN} = "1" |
40 | 40 | ||
41 | RRECOMMENDS_${PN} += "${PN}-invoke-rc.d ${PN}-service" | 41 | RRECOMMENDS:${PN} += "${PN}-invoke-rc.d ${PN}-service" |
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 65f9c0ae8d..e4c4813220 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb | |||
@@ -39,25 +39,25 @@ SRC_URI = "file://functions \ | |||
39 | 39 | ||
40 | S = "${WORKDIR}" | 40 | S = "${WORKDIR}" |
41 | 41 | ||
42 | SRC_URI_append_arm = " file://alignment.sh" | 42 | SRC_URI:append:arm = " file://alignment.sh" |
43 | SRC_URI_append_armeb = " file://alignment.sh" | 43 | SRC_URI:append:armeb = " file://alignment.sh" |
44 | 44 | ||
45 | KERNEL_VERSION = "" | 45 | KERNEL_VERSION = "" |
46 | 46 | ||
47 | DEPENDS_append = " update-rc.d-native" | 47 | DEPENDS:append = " update-rc.d-native" |
48 | PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" | 48 | PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" |
49 | 49 | ||
50 | PACKAGES =+ "${PN}-functions ${PN}-sushell" | 50 | PACKAGES =+ "${PN}-functions ${PN}-sushell" |
51 | RDEPENDS_${PN} = "initd-functions \ | 51 | RDEPENDS:${PN} = "initd-functions \ |
52 | ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ | 52 | ${@bb.utils.contains('DISTRO_FEATURES','selinux','${PN}-sushell','',d)} \ |
53 | init-system-helpers-service \ | 53 | init-system-helpers-service \ |
54 | " | 54 | " |
55 | # Recommend pn-functions so that it will be a preferred default provider for initd-functions | 55 | # Recommend pn-functions so that it will be a preferred default provider for initd-functions |
56 | RRECOMMENDS_${PN} = "${PN}-functions" | 56 | RRECOMMENDS:${PN} = "${PN}-functions" |
57 | RPROVIDES_${PN}-functions = "initd-functions" | 57 | RPROVIDES:${PN}-functions = "initd-functions" |
58 | RCONFLICTS_${PN}-functions = "lsbinitscripts" | 58 | RCONFLICTS:${PN}-functions = "lsbinitscripts" |
59 | FILES_${PN}-functions = "${sysconfdir}/init.d/functions*" | 59 | FILES:${PN}-functions = "${sysconfdir}/init.d/functions*" |
60 | FILES_${PN}-sushell = "${base_sbindir}/sushell" | 60 | FILES:${PN}-sushell = "${base_sbindir}/sushell" |
61 | 61 | ||
62 | HALTARGS ?= "-d -f" | 62 | HALTARGS ?= "-d -f" |
63 | 63 | ||
@@ -170,7 +170,7 @@ MASKED_SCRIPTS = " \ | |||
170 | sysfs \ | 170 | sysfs \ |
171 | urandom" | 171 | urandom" |
172 | 172 | ||
173 | pkg_postinst_${PN} () { | 173 | pkg_postinst:${PN} () { |
174 | if type systemctl >/dev/null 2>/dev/null; then | 174 | if type systemctl >/dev/null 2>/dev/null; then |
175 | if [ -n "$D" ]; then | 175 | if [ -n "$D" ]; then |
176 | OPTS="--root=$D" | 176 | OPTS="--root=$D" |
@@ -186,4 +186,4 @@ pkg_postinst_${PN} () { | |||
186 | fi | 186 | fi |
187 | } | 187 | } |
188 | 188 | ||
189 | CONFFILES_${PN} += "${sysconfdir}/init.d/checkroot.sh" | 189 | CONFFILES:${PN} += "${sysconfdir}/init.d/checkroot.sh" |
diff --git a/meta/recipes-core/kbd/kbd_2.4.0.bb b/meta/recipes-core/kbd/kbd_2.4.0.bb index b557d691b5..7cb45eff77 100644 --- a/meta/recipes-core/kbd/kbd_2.4.0.bb +++ b/meta/recipes-core/kbd/kbd_2.4.0.bb | |||
@@ -9,9 +9,9 @@ inherit autotools gettext pkgconfig | |||
9 | 9 | ||
10 | DEPENDS += "flex-native" | 10 | DEPENDS += "flex-native" |
11 | 11 | ||
12 | RREPLACES_${PN} = "console-tools" | 12 | RREPLACES:${PN} = "console-tools" |
13 | RPROVIDES_${PN} = "console-tools" | 13 | RPROVIDES:${PN} = "console-tools" |
14 | RCONFLICTS_${PN} = "console-tools" | 14 | RCONFLICTS:${PN} = "console-tools" |
15 | 15 | ||
16 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ | 16 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ |
17 | " | 17 | " |
@@ -25,12 +25,12 @@ PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," | |||
25 | 25 | ||
26 | PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" | 26 | PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" |
27 | 27 | ||
28 | FILES_${PN}-consolefonts = "${datadir}/consolefonts" | 28 | FILES:${PN}-consolefonts = "${datadir}/consolefonts" |
29 | FILES_${PN}-consoletrans = "${datadir}/consoletrans" | 29 | FILES:${PN}-consoletrans = "${datadir}/consoletrans" |
30 | FILES_${PN}-keymaps = "${datadir}/keymaps" | 30 | FILES:${PN}-keymaps = "${datadir}/keymaps" |
31 | FILES_${PN}-unimaps = "${datadir}/unimaps" | 31 | FILES:${PN}-unimaps = "${datadir}/unimaps" |
32 | 32 | ||
33 | do_install_append () { | 33 | do_install:append () { |
34 | if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ] \ | 34 | if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ] \ |
35 | && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then | 35 | && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then |
36 | mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd | 36 | mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd |
@@ -39,7 +39,7 @@ do_install_append () { | |||
39 | 39 | ||
40 | inherit update-alternatives | 40 | inherit update-alternatives |
41 | 41 | ||
42 | ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \ | 42 | ALTERNATIVE:${PN} = "chvt deallocvt fgconsole openvt showkey \ |
43 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}" | 43 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}" |
44 | ALTERNATIVE_PRIORITY = "100" | 44 | ALTERNATIVE_PRIORITY = "100" |
45 | 45 | ||
diff --git a/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/meta/recipes-core/libcgroup/libcgroup_0.41.bb index 92d7261b0d..400f96f17f 100644 --- a/meta/recipes-core/libcgroup/libcgroup_0.41.bb +++ b/meta/recipes-core/libcgroup/libcgroup_0.41.bb | |||
@@ -13,24 +13,24 @@ DEPENDS = "bison-native flex-native" | |||
13 | 13 | ||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2 \ | 14 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2 \ |
15 | file://CVE-2018-14348.patch" | 15 | file://CVE-2018-14348.patch" |
16 | SRC_URI_append_libc-musl = " file://musl-decls-compat.patch" | 16 | SRC_URI:append:libc-musl = " file://musl-decls-compat.patch" |
17 | 17 | ||
18 | SRC_URI[md5sum] = "3dea9d50b8a5b73ff0bf1cdcb210f63f" | 18 | SRC_URI[md5sum] = "3dea9d50b8a5b73ff0bf1cdcb210f63f" |
19 | SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51" | 19 | SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51" |
20 | 20 | ||
21 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libcg/files/libcgroup/" | 21 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libcg/files/libcgroup/" |
22 | 22 | ||
23 | DEPENDS_append_libc-musl = " fts " | 23 | DEPENDS:append:libc-musl = " fts " |
24 | EXTRA_OEMAKE_append_libc-musl = " LIBS=-lfts" | 24 | EXTRA_OEMAKE:append:libc-musl = " LIBS=-lfts" |
25 | 25 | ||
26 | PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" | 26 | PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" |
27 | PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam" | 27 | PACKAGECONFIG[pam] = "--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes,--enable-pam=no,libpam" |
28 | 28 | ||
29 | PACKAGES =+ "cgroups-pam-plugin" | 29 | PACKAGES =+ "cgroups-pam-plugin" |
30 | FILES_cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*" | 30 | FILES:cgroups-pam-plugin = "${base_libdir}/security/pam_cgroup.so*" |
31 | FILES_${PN}-dev += "${base_libdir}/security/*.la" | 31 | FILES:${PN}-dev += "${base_libdir}/security/*.la" |
32 | 32 | ||
33 | do_install_append() { | 33 | do_install:append() { |
34 | # Moving libcgroup to base_libdir | 34 | # Moving libcgroup to base_libdir |
35 | if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then | 35 | if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then |
36 | mkdir -p ${D}/${base_libdir}/ | 36 | mkdir -p ${D}/${base_libdir}/ |
diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.23.bb b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.23.bb index ba74eb1f94..ec9f9f4fa3 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.23.bb +++ b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.23.bb | |||
@@ -10,7 +10,7 @@ EXCLUDE_FROM_WORLD = "1" | |||
10 | 10 | ||
11 | API = "--enable-obsolete-api" | 11 | API = "--enable-obsolete-api" |
12 | 12 | ||
13 | do_install_append () { | 13 | do_install:append () { |
14 | rm -rf ${D}${includedir} | 14 | rm -rf ${D}${includedir} |
15 | rm -rf ${D}${libdir}/pkgconfig | 15 | rm -rf ${D}${libdir}/pkgconfig |
16 | rm -rf ${D}${datadir} | 16 | rm -rf ${D}${datadir} |
diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 79a2aa49d6..d9b3a7d673 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc | |||
@@ -17,7 +17,7 @@ SRC_URI += "file://fix_cflags_handling.patch" | |||
17 | 17 | ||
18 | PROVIDES = "virtual/crypt" | 18 | PROVIDES = "virtual/crypt" |
19 | 19 | ||
20 | FILES_${PN} = "${libdir}/libcrypt*.so.* \ | 20 | FILES:${PN} = "${libdir}/libcrypt*.so.* \ |
21 | ${libdir}/libcrypt-*.so \ | 21 | ${libdir}/libcrypt-*.so \ |
22 | ${libdir}/libowcrypt*.so.* \ | 22 | ${libdir}/libowcrypt*.so.* \ |
23 | ${libdir}/libowcrypt-*.so \ | 23 | ${libdir}/libowcrypt-*.so \ |
@@ -27,7 +27,7 @@ S = "${WORKDIR}/git" | |||
27 | 27 | ||
28 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" | 28 | BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" |
29 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error" | 29 | TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error" |
30 | CPPFLAGS_append_class-nativesdk = " -Wno-error" | 30 | CPPFLAGS:append:class-nativesdk = " -Wno-error" |
31 | 31 | ||
32 | API = "--disable-obsolete-api" | 32 | API = "--disable-obsolete-api" |
33 | EXTRA_OECONF += "${API}" | 33 | EXTRA_OECONF += "${API}" |
diff --git a/meta/recipes-core/libxml/libxml2_2.9.12.bb b/meta/recipes-core/libxml/libxml2_2.9.12.bb index 2d1e92966f..3105889c16 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.12.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.12.bb | |||
@@ -38,11 +38,11 @@ inherit autotools pkgconfig binconfig-disabled ptest | |||
38 | 38 | ||
39 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} | 39 | inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} |
40 | 40 | ||
41 | 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)}" | 41 | 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)}" |
42 | 42 | ||
43 | RDEPENDS_${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" | 43 | RDEPENDS:${PN}-python += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-core', '', d)}" |
44 | 44 | ||
45 | RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us \ | 45 | RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-ebcdic-us \ |
46 | glibc-gconv-ibm1141 \ | 46 | glibc-gconv-ibm1141 \ |
47 | glibc-gconv-iso8859-5 \ | 47 | glibc-gconv-iso8859-5 \ |
48 | glibc-gconv-euc-jp \ | 48 | glibc-gconv-euc-jp \ |
@@ -53,25 +53,25 @@ export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" | |||
53 | 53 | ||
54 | # WARNING: zlib is required for RPM use | 54 | # WARNING: zlib is required for RPM use |
55 | EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" | 55 | EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" |
56 | EXTRA_OECONF_class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" | 56 | EXTRA_OECONF:class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" |
57 | EXTRA_OECONF_class-nativesdk = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" | 57 | EXTRA_OECONF:class-nativesdk = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" |
58 | EXTRA_OECONF_linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib" | 58 | EXTRA_OECONF:linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib" |
59 | 59 | ||
60 | python populate_packages_prepend () { | 60 | python populate_packages:prepend () { |
61 | # autonamer would call this libxml2-2, but we don't want that | 61 | # autonamer would call this libxml2-2, but we don't want that |
62 | if d.getVar('DEBIAN_NAMES'): | 62 | if d.getVar('DEBIAN_NAMES'): |
63 | d.setVar('PKG_libxml2', '${MLPREFIX}libxml2') | 63 | d.setVar('PKG:libxml2', '${MLPREFIX}libxml2') |
64 | } | 64 | } |
65 | 65 | ||
66 | PACKAGE_BEFORE_PN += "${PN}-utils" | 66 | PACKAGE_BEFORE_PN += "${PN}-utils" |
67 | PACKAGES += "${PN}-python" | 67 | PACKAGES += "${PN}-python" |
68 | 68 | ||
69 | FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" | 69 | FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" |
70 | FILES_${PN}-dev += "${libdir}/xml2Conf.sh" | 70 | FILES:${PN}-dev += "${libdir}/xml2Conf.sh" |
71 | FILES_${PN}-utils = "${bindir}/*" | 71 | FILES:${PN}-utils = "${bindir}/*" |
72 | FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" | 72 | FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" |
73 | 73 | ||
74 | do_configure_prepend () { | 74 | do_configure:prepend () { |
75 | # executables take longer to package: these should not be executable | 75 | # executables take longer to package: these should not be executable |
76 | find ${S}/xmlconf/ -type f -exec chmod -x {} \+ | 76 | find ${S}/xmlconf/ -type f -exec chmod -x {} \+ |
77 | } | 77 | } |
@@ -101,7 +101,7 @@ do_install_ptest () { | |||
101 | {} + | 101 | {} + |
102 | } | 102 | } |
103 | 103 | ||
104 | do_install_append_class-native () { | 104 | do_install:append:class-native () { |
105 | # Docs are not needed in the native case | 105 | # Docs are not needed in the native case |
106 | rm ${D}${datadir}/gtk-doc -rf | 106 | rm ${D}${datadir}/gtk-doc -rf |
107 | } | 107 | } |
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index b5dae176bf..9775430d4b 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb | |||
@@ -61,7 +61,7 @@ do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}" | |||
61 | 61 | ||
62 | REAL_MULTIMACH_TARGET_SYS = "none" | 62 | REAL_MULTIMACH_TARGET_SYS = "none" |
63 | 63 | ||
64 | create_sdk_files_append () { | 64 | create_sdk_files:append () { |
65 | rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* | 65 | rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* |
66 | rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* | 66 | rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* |
67 | rm -f ${SDK_OUTPUT}/${SDKPATH}/version-* | 67 | rm -f ${SDK_OUTPUT}/${SDKPATH}/version-* |
diff --git a/meta/recipes-core/meta/dummy-sdk-package.inc b/meta/recipes-core/meta/dummy-sdk-package.inc index bedde2965c..bd26e39ad3 100644 --- a/meta/recipes-core/meta/dummy-sdk-package.inc +++ b/meta/recipes-core/meta/dummy-sdk-package.inc | |||
@@ -13,7 +13,7 @@ python() { | |||
13 | d.setVar('PACKAGE_ARCH', '${DUMMYARCH}') | 13 | d.setVar('PACKAGE_ARCH', '${DUMMYARCH}') |
14 | } | 14 | } |
15 | 15 | ||
16 | ALLOW_EMPTY_${PN} = "1" | 16 | ALLOW_EMPTY:${PN} = "1" |
17 | 17 | ||
18 | PR[vardeps] += "DUMMYPROVIDES" | 18 | PR[vardeps] += "DUMMYPROVIDES" |
19 | PR[vardeps] += "DUMMYPROVIDES_PACKAGES" | 19 | PR[vardeps] += "DUMMYPROVIDES_PACKAGES" |
@@ -22,10 +22,10 @@ DUMMYPROVIDES_PACKAGES ??= "" | |||
22 | DUMMYPROVIDES_PACKAGES_MULTILIB = "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" | 22 | DUMMYPROVIDES_PACKAGES_MULTILIB = "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" |
23 | DUMMYPROVIDES += "${DUMMYPROVIDES_PACKAGES_MULTILIB}" | 23 | DUMMYPROVIDES += "${DUMMYPROVIDES_PACKAGES_MULTILIB}" |
24 | 24 | ||
25 | python populate_packages_prepend() { | 25 | python populate_packages:prepend() { |
26 | p = d.getVar("PN") | 26 | p = d.getVar("PN") |
27 | d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") | 27 | d.appendVar("RPROVIDES:%s" % p, "${DUMMYPROVIDES}") |
28 | d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}") | 28 | d.appendVar("RCONFLICTS:%s" % p, "${DUMMYPROVIDES}") |
29 | d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}") | 29 | d.appendVar("RREPLACES:%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}") |
30 | } | 30 | } |
31 | 31 | ||
diff --git a/meta/recipes-core/meta/meta-environment-extsdk.bb b/meta/recipes-core/meta/meta-environment-extsdk.bb index 2076b56f25..706312b0d6 100644 --- a/meta/recipes-core/meta/meta-environment-extsdk.bb +++ b/meta/recipes-core/meta/meta-environment-extsdk.bb | |||
@@ -4,7 +4,7 @@ require meta-environment.bb | |||
4 | 4 | ||
5 | PN = "meta-environment-extsdk-${MACHINE}" | 5 | PN = "meta-environment-extsdk-${MACHINE}" |
6 | 6 | ||
7 | create_sdk_files_append() { | 7 | create_sdk_files:append() { |
8 | local sysroot=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${MACHINE} | 8 | local sysroot=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${MACHINE} |
9 | local sdkpathnative=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${BUILD_ARCH} | 9 | local sdkpathnative=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${BUILD_ARCH} |
10 | 10 | ||
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index da1230bead..27f0103665 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb | |||
@@ -9,7 +9,7 @@ MODIFYTOS = "0" | |||
9 | REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" | 9 | REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" |
10 | 10 | ||
11 | inherit toolchain-scripts | 11 | inherit toolchain-scripts |
12 | TOOLCHAIN_NEED_CONFIGSITE_CACHE_append = " zlib" | 12 | TOOLCHAIN_NEED_CONFIGSITE_CACHE:append = " zlib" |
13 | # Need to expand here before cross-candian changes HOST_ARCH -> SDK_ARCH | 13 | # Need to expand here before cross-candian changes HOST_ARCH -> SDK_ARCH |
14 | TOOLCHAIN_CONFIGSITE_NOCACHE := "${TOOLCHAIN_CONFIGSITE_NOCACHE}" | 14 | TOOLCHAIN_CONFIGSITE_NOCACHE := "${TOOLCHAIN_CONFIGSITE_NOCACHE}" |
15 | 15 | ||
@@ -66,7 +66,7 @@ do_install() { | |||
66 | 66 | ||
67 | PN = "meta-environment-${MACHINE}" | 67 | PN = "meta-environment-${MACHINE}" |
68 | PACKAGES = "${PN}" | 68 | PACKAGES = "${PN}" |
69 | FILES_${PN}= " \ | 69 | FILES:${PN}= " \ |
70 | ${SDKPATH}/* \ | 70 | ${SDKPATH}/* \ |
71 | " | 71 | " |
72 | 72 | ||
diff --git a/meta/recipes-core/meta/meta-go-toolchain.bb b/meta/recipes-core/meta/meta-go-toolchain.bb index dde385c1b1..c24518efe3 100644 --- a/meta/recipes-core/meta/meta-go-toolchain.bb +++ b/meta/recipes-core/meta/meta-go-toolchain.bb | |||
@@ -3,10 +3,10 @@ LICENSE = "MIT" | |||
3 | 3 | ||
4 | inherit populate_sdk | 4 | inherit populate_sdk |
5 | 5 | ||
6 | TOOLCHAIN_HOST_TASK_append = " \ | 6 | TOOLCHAIN_HOST_TASK:append = " \ |
7 | packagegroup-go-cross-canadian-${MACHINE} \ | 7 | packagegroup-go-cross-canadian-${MACHINE} \ |
8 | " | 8 | " |
9 | 9 | ||
10 | TOOLCHAIN_TARGET_TASK_append = " \ | 10 | TOOLCHAIN_TARGET_TASK:append = " \ |
11 | ${@multilib_pkg_extend(d, 'packagegroup-go-sdk-target')} \ | 11 | ${@multilib_pkg_extend(d, 'packagegroup-go-sdk-target')} \ |
12 | " | 12 | " |
diff --git a/meta/recipes-core/meta/signing-keys.bb b/meta/recipes-core/meta/signing-keys.bb index 5bab94aa36..03463f95f5 100644 --- a/meta/recipes-core/meta/signing-keys.bb +++ b/meta/recipes-core/meta/signing-keys.bb | |||
@@ -14,9 +14,9 @@ SYSROOT_DIRS += "${sysconfdir}/pki" | |||
14 | 14 | ||
15 | PACKAGES =+ "${PN}-ipk ${PN}-rpm ${PN}-packagefeed" | 15 | PACKAGES =+ "${PN}-ipk ${PN}-rpm ${PN}-packagefeed" |
16 | 16 | ||
17 | FILES_${PN}-rpm = "${sysconfdir}/pki/rpm-gpg" | 17 | FILES:${PN}-rpm = "${sysconfdir}/pki/rpm-gpg" |
18 | FILES_${PN}-ipk = "${sysconfdir}/pki/ipk-gpg" | 18 | FILES:${PN}-ipk = "${sysconfdir}/pki/ipk-gpg" |
19 | FILES_${PN}-packagefeed = "${sysconfdir}/pki/packagefeed-gpg" | 19 | FILES:${PN}-packagefeed = "${sysconfdir}/pki/packagefeed-gpg" |
20 | 20 | ||
21 | python do_get_public_keys () { | 21 | python do_get_public_keys () { |
22 | from oe.gpg_sign import get_signer | 22 | from oe.gpg_sign import get_signer |
diff --git a/meta/recipes-core/meta/testexport-tarball.bb b/meta/recipes-core/meta/testexport-tarball.bb index daedd78cb4..de7663b38c 100644 --- a/meta/recipes-core/meta/testexport-tarball.bb +++ b/meta/recipes-core/meta/testexport-tarball.bb | |||
@@ -38,7 +38,7 @@ do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}" | |||
38 | 38 | ||
39 | REAL_MULTIMACH_TARGET_SYS = "none" | 39 | REAL_MULTIMACH_TARGET_SYS = "none" |
40 | 40 | ||
41 | create_sdk_files_append () { | 41 | create_sdk_files:append () { |
42 | rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* | 42 | rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* |
43 | rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* | 43 | rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* |
44 | rm -f ${SDK_OUTPUT}/${SDKPATH}/version-* | 44 | rm -f ${SDK_OUTPUT}/${SDKPATH}/version-* |
diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb index bc6cc0d183..ba0916cb56 100644 --- a/meta/recipes-core/meta/wic-tools.bb +++ b/meta/recipes-core/meta/wic-tools.bb | |||
@@ -8,10 +8,10 @@ DEPENDS = "\ | |||
8 | btrfs-tools-native squashfs-tools-native pseudo-native \ | 8 | btrfs-tools-native squashfs-tools-native pseudo-native \ |
9 | e2fsprogs-native util-linux-native tar-native\ | 9 | e2fsprogs-native util-linux-native tar-native\ |
10 | " | 10 | " |
11 | DEPENDS_append_x86 = " syslinux-native syslinux grub-efi systemd-boot" | 11 | DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot" |
12 | DEPENDS_append_x86-64 = " syslinux-native syslinux grub-efi systemd-boot" | 12 | DEPENDS:append:x86-64 = " syslinux-native syslinux grub-efi systemd-boot" |
13 | DEPENDS_append_x86-x32 = " syslinux-native syslinux grub-efi" | 13 | DEPENDS:append:x86-x32 = " syslinux-native syslinux grub-efi" |
14 | DEPENDS_append_aarch64 = " grub-efi systemd-boot" | 14 | DEPENDS:append:aarch64 = " grub-efi systemd-boot" |
15 | 15 | ||
16 | INHIBIT_DEFAULT_DEPS = "1" | 16 | INHIBIT_DEFAULT_DEPS = "1" |
17 | 17 | ||
diff --git a/meta/recipes-core/musl/bsd-headers.bb b/meta/recipes-core/musl/bsd-headers.bb index c9945d45eb..cf8af0da3c 100644 --- a/meta/recipes-core/musl/bsd-headers.bb +++ b/meta/recipes-core/musl/bsd-headers.bb | |||
@@ -27,5 +27,5 @@ do_install() { | |||
27 | # | 27 | # |
28 | 28 | ||
29 | COMPATIBLE_HOST = ".*-musl.*" | 29 | COMPATIBLE_HOST = ".*-musl.*" |
30 | RDEPENDS_${PN}-dev = "" | 30 | RDEPENDS:${PN}-dev = "" |
31 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" | 31 | RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" |
diff --git a/meta/recipes-core/musl/gcompat_git.bb b/meta/recipes-core/musl/gcompat_git.bb index 863ba8dbf0..6e5cc11d5d 100644 --- a/meta/recipes-core/musl/gcompat_git.bb +++ b/meta/recipes-core/musl/gcompat_git.bb | |||
@@ -41,11 +41,11 @@ do_install () { | |||
41 | fi | 41 | fi |
42 | } | 42 | } |
43 | 43 | ||
44 | FILES_${PN} += "/lib64" | 44 | FILES:${PN} += "/lib64" |
45 | 45 | ||
46 | INSANE_SKIP_${PN} = "libdir" | 46 | INSANE_SKIP:${PN} = "libdir" |
47 | 47 | ||
48 | RPROVIDES_${PN} += "musl-glibc-compat" | 48 | RPROVIDES:${PN} += "musl-glibc-compat" |
49 | # | 49 | # |
50 | # We will skip parsing for non-musl systems | 50 | # We will skip parsing for non-musl systems |
51 | # | 51 | # |
diff --git a/meta/recipes-core/musl/libssp-nonshared.bb b/meta/recipes-core/musl/libssp-nonshared.bb index 81c87e8e8d..748dacf312 100644 --- a/meta/recipes-core/musl/libssp-nonshared.bb +++ b/meta/recipes-core/musl/libssp-nonshared.bb | |||
@@ -30,6 +30,6 @@ do_install() { | |||
30 | # We will skip parsing for non-musl systems | 30 | # We will skip parsing for non-musl systems |
31 | # | 31 | # |
32 | COMPATIBLE_HOST = ".*-musl.*" | 32 | COMPATIBLE_HOST = ".*-musl.*" |
33 | RDEPENDS_${PN}-staticdev = "" | 33 | RDEPENDS:${PN}-staticdev = "" |
34 | RDEPENDS_${PN}-dev = "" | 34 | RDEPENDS:${PN}-dev = "" |
35 | RRECOMMENDS_${PN}-dbg = "${PN}-staticdev (= ${EXTENDPKGV})" | 35 | RRECOMMENDS:${PN}-dbg = "${PN}-staticdev (= ${EXTENDPKGV})" |
diff --git a/meta/recipes-core/musl/musl-utils.bb b/meta/recipes-core/musl/musl-utils.bb index dd0ce33061..4f99d4324f 100644 --- a/meta/recipes-core/musl/musl-utils.bb +++ b/meta/recipes-core/musl/musl-utils.bb | |||
@@ -21,7 +21,7 @@ S = "${WORKDIR}/git" | |||
21 | 21 | ||
22 | PACKAGES =+ "${PN}-iconv" | 22 | PACKAGES =+ "${PN}-iconv" |
23 | 23 | ||
24 | FILES_${PN}-iconv = "${bindir}/iconv" | 24 | FILES:${PN}-iconv = "${bindir}/iconv" |
25 | 25 | ||
26 | COMPATIBLE_HOST = ".*-musl.*" | 26 | COMPATIBLE_HOST = ".*-musl.*" |
27 | 27 | ||
diff --git a/meta/recipes-core/musl/musl.inc b/meta/recipes-core/musl/musl.inc index 54edfc88e5..66468e92ff 100644 --- a/meta/recipes-core/musl/musl.inc +++ b/meta/recipes-core/musl/musl.inc | |||
@@ -14,16 +14,16 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68" | |||
14 | INHIBIT_DEFAULT_DEPS = "1" | 14 | INHIBIT_DEFAULT_DEPS = "1" |
15 | 15 | ||
16 | FILES_SOLIBSDEV = "" | 16 | FILES_SOLIBSDEV = "" |
17 | FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}" | 17 | FILES:${PN} += "${libdir}/lib*${SOLIBSDEV}" |
18 | INSANE_SKIP_${PN} = "dev-so" | 18 | INSANE_SKIP:${PN} = "dev-so" |
19 | 19 | ||
20 | # Doesn't compile in MIPS16e mode due to use of hand-written | 20 | # Doesn't compile in MIPS16e mode due to use of hand-written |
21 | # assembly | 21 | # assembly |
22 | MIPS_INSTRUCTION_SET = "mips" | 22 | MIPS_INSTRUCTION_SET = "mips" |
23 | 23 | ||
24 | # thumb1 is unsupported | 24 | # thumb1 is unsupported |
25 | ARM_INSTRUCTION_SET_armv5 = "arm" | 25 | ARM_INSTRUCTION_SET:armv5 = "arm" |
26 | ARM_INSTRUCTION_SET_armv4 = "arm" | 26 | ARM_INSTRUCTION_SET:armv4 = "arm" |
27 | 27 | ||
28 | # Enable out of tree build | 28 | # Enable out of tree build |
29 | B = "${WORKDIR}/build" | 29 | B = "${WORKDIR}/build" |
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index bd9d5f1d4b..f9c174d9c1 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb | |||
@@ -42,7 +42,7 @@ LDFLAGS += "-Wl,-soname,libc.so" | |||
42 | # disabled automatically due to the optimisation level, but append an explicit | 42 | # disabled automatically due to the optimisation level, but append an explicit |
43 | # -fomit-frame-pointer to handle cases where optimisation is set to -O0 or frame | 43 | # -fomit-frame-pointer to handle cases where optimisation is set to -O0 or frame |
44 | # pointers have been enabled by -fno-omit-frame-pointer earlier in CFLAGS, etc. | 44 | # pointers have been enabled by -fno-omit-frame-pointer earlier in CFLAGS, etc. |
45 | CFLAGS_append_arm = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" | 45 | CFLAGS:append:arm = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" |
46 | 46 | ||
47 | CONFIGUREOPTS = " \ | 47 | CONFIGUREOPTS = " \ |
48 | --prefix=${prefix} \ | 48 | --prefix=${prefix} \ |
@@ -70,19 +70,19 @@ do_install() { | |||
70 | lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd | 70 | lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd |
71 | } | 71 | } |
72 | 72 | ||
73 | FILES_${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" | 73 | FILES:${PN} += "/lib/ld-musl-${MUSL_LDSO_ARCH}.so.1 ${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path" |
74 | FILES_${PN}-staticdev = "${libdir}/libc.a" | 74 | FILES:${PN}-staticdev = "${libdir}/libc.a" |
75 | FILES_${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ | 75 | FILES:${PN}-dev =+ "${libdir}/libcrypt.a ${libdir}/libdl.a ${libdir}/libm.a \ |
76 | ${libdir}/libpthread.a ${libdir}/libresolv.a \ | 76 | ${libdir}/libpthread.a ${libdir}/libresolv.a \ |
77 | ${libdir}/librt.a ${libdir}/libutil.a ${libdir}/libxnet.a \ | 77 | ${libdir}/librt.a ${libdir}/libutil.a ${libdir}/libxnet.a \ |
78 | " | 78 | " |
79 | 79 | ||
80 | RDEPENDS_${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" | 80 | RDEPENDS:${PN}-dev += "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" |
81 | RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev" | 81 | RPROVIDES:${PN}-dev += "libc-dev virtual-libc-dev" |
82 | RPROVIDES_${PN} += "ldd libsegfault rtld(GNU_HASH)" | 82 | RPROVIDES:${PN} += "ldd libsegfault rtld(GNU_HASH)" |
83 | 83 | ||
84 | LEAD_SONAME = "libc.so" | 84 | LEAD_SONAME = "libc.so" |
85 | INSANE_SKIP_${PN}-dev = "staticdev" | 85 | INSANE_SKIP:${PN}-dev = "staticdev" |
86 | INSANE_SKIP_${PN} = "libdir" | 86 | INSANE_SKIP:${PN} = "libdir" |
87 | 87 | ||
88 | UPSTREAM_CHECK_COMMITS = "1" | 88 | UPSTREAM_CHECK_COMMITS = "1" |
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index ef59bc3b0a..cbb12ca275 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc | |||
@@ -5,7 +5,7 @@ LICENSE = "MIT" | |||
5 | LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" | 5 | LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=5526f2f3a29edc95538b368a4771edda" |
6 | SECTION = "libs" | 6 | SECTION = "libs" |
7 | DEPENDS = "ncurses-native" | 7 | DEPENDS = "ncurses-native" |
8 | DEPENDS_class-native = "" | 8 | DEPENDS:class-native = "" |
9 | 9 | ||
10 | BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \ | 10 | BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \ |
11 | ${bindir}/ncurses6-config ${bindir}/ncursesw6-config" | 11 | ${bindir}/ncurses6-config ${bindir}/ncursesw6-config" |
@@ -32,17 +32,17 @@ ENABLE_WIDEC ?= "true" | |||
32 | BUILD_CPPFLAGS += "-D_GNU_SOURCE" | 32 | BUILD_CPPFLAGS += "-D_GNU_SOURCE" |
33 | 33 | ||
34 | # natives don't generally look in base_libdir | 34 | # natives don't generally look in base_libdir |
35 | base_libdir_class-native = "${libdir}" | 35 | base_libdir:class-native = "${libdir}" |
36 | 36 | ||
37 | # Display corruption occurs on 64 bit hosts without these settings | 37 | # Display corruption occurs on 64 bit hosts without these settings |
38 | # This was derrived from the upstream debian ncurses which uses | 38 | # This was derrived from the upstream debian ncurses which uses |
39 | # these settings for 32 and 64 bit hosts. | 39 | # these settings for 32 and 64 bit hosts. |
40 | EXCONFIG_ARGS = "" | 40 | EXCONFIG_ARGS = "" |
41 | EXCONFIG_ARGS_class-native = " \ | 41 | EXCONFIG_ARGS:class-native = " \ |
42 | --disable-lp64 \ | 42 | --disable-lp64 \ |
43 | --with-chtype='long' \ | 43 | --with-chtype='long' \ |
44 | --with-mmask-t='long'" | 44 | --with-mmask-t='long'" |
45 | EXCONFIG_ARGS_class-nativesdk = " \ | 45 | EXCONFIG_ARGS:class-nativesdk = " \ |
46 | --disable-lp64 \ | 46 | --disable-lp64 \ |
47 | --with-chtype='long' \ | 47 | --with-chtype='long' \ |
48 | --with-mmask-t='long'" | 48 | --with-mmask-t='long'" |
@@ -55,11 +55,11 @@ PACKAGES_DYNAMIC = "^${PN}-lib.*" | |||
55 | # because the sstate had a hard coded search path. Until this is fixed | 55 | # because the sstate had a hard coded search path. Until this is fixed |
56 | # another way this is deemed good enough. | 56 | # another way this is deemed good enough. |
57 | EX_TERMCAP = "" | 57 | EX_TERMCAP = "" |
58 | EX_TERMCAP_class-native = ":/etc/termcap:/usr/share/misc/termcap" | 58 | EX_TERMCAP:class-native = ":/etc/termcap:/usr/share/misc/termcap" |
59 | EX_TERMCAP_class-nativesdk = ":/etc/termcap:/usr/share/misc/termcap" | 59 | EX_TERMCAP:class-nativesdk = ":/etc/termcap:/usr/share/misc/termcap" |
60 | EX_TERMINFO = "" | 60 | EX_TERMINFO = "" |
61 | EX_TERMINFO_class-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" | 61 | EX_TERMINFO:class-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" |
62 | EX_TERMINFO_class-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" | 62 | EX_TERMINFO:class-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo" |
63 | EX_TERMLIB ?= "tinfo" | 63 | EX_TERMLIB ?= "tinfo" |
64 | 64 | ||
65 | # Helper function for do_configure to allow multiple configurations | 65 | # Helper function for do_configure to allow multiple configurations |
@@ -258,7 +258,7 @@ do_install() { | |||
258 | oe_multilib_header curses.h | 258 | oe_multilib_header curses.h |
259 | } | 259 | } |
260 | 260 | ||
261 | python populate_packages_prepend () { | 261 | python populate_packages:prepend () { |
262 | libdir = d.expand("${libdir}") | 262 | libdir = d.expand("${libdir}") |
263 | base_libdir = d.expand("${base_libdir}") | 263 | base_libdir = d.expand("${base_libdir}") |
264 | pnbase = d.expand("${PN}-lib%s") | 264 | pnbase = d.expand("${PN}-lib%s") |
@@ -272,8 +272,8 @@ inherit update-alternatives | |||
272 | 272 | ||
273 | ALTERNATIVE_PRIORITY = "100" | 273 | ALTERNATIVE_PRIORITY = "100" |
274 | 274 | ||
275 | ALTERNATIVE_ncurses-tools_class-target = "clear reset" | 275 | ALTERNATIVE:ncurses-tools:class-target = "clear reset" |
276 | ALTERNATIVE_ncurses-terminfo_class-target = "st st-256color" | 276 | ALTERNATIVE:ncurses-terminfo:class-target = "st st-256color" |
277 | 277 | ||
278 | ALTERNATIVE_LINK_NAME[st] = "${datadir}/terminfo/s/st" | 278 | ALTERNATIVE_LINK_NAME[st] = "${datadir}/terminfo/s/st" |
279 | 279 | ||
@@ -287,7 +287,7 @@ PACKAGES += " \ | |||
287 | ${PN}-terminfo \ | 287 | ${PN}-terminfo \ |
288 | " | 288 | " |
289 | 289 | ||
290 | FILES_${PN} = "\ | 290 | FILES:${PN} = "\ |
291 | ${bindir}/tput \ | 291 | ${bindir}/tput \ |
292 | ${bindir}/tset \ | 292 | ${bindir}/tset \ |
293 | ${bindir}/ncurses5-config \ | 293 | ${bindir}/ncurses5-config \ |
@@ -299,7 +299,7 @@ FILES_${PN} = "\ | |||
299 | 299 | ||
300 | # This keeps only tput/tset in ncurses | 300 | # This keeps only tput/tset in ncurses |
301 | # clear/reset are in already busybox | 301 | # clear/reset are in already busybox |
302 | FILES_${PN}-tools = "\ | 302 | FILES:${PN}-tools = "\ |
303 | ${bindir}/tic \ | 303 | ${bindir}/tic \ |
304 | ${bindir}/toe \ | 304 | ${bindir}/toe \ |
305 | ${bindir}/infotocap \ | 305 | ${bindir}/infotocap \ |
@@ -312,20 +312,20 @@ FILES_${PN}-tools = "\ | |||
312 | " | 312 | " |
313 | 313 | ||
314 | # 'reset' is a symlink to 'tset' which is in the 'ncurses' package | 314 | # 'reset' is a symlink to 'tset' which is in the 'ncurses' package |
315 | RDEPENDS_${PN}-tools = "${PN} ${PN}-terminfo-base" | 315 | RDEPENDS:${PN}-tools = "${PN} ${PN}-terminfo-base" |
316 | 316 | ||
317 | FILES_${PN}-terminfo = "\ | 317 | FILES:${PN}-terminfo = "\ |
318 | ${datadir}/terminfo \ | 318 | ${datadir}/terminfo \ |
319 | " | 319 | " |
320 | 320 | ||
321 | FILES_${PN}-terminfo-base = "\ | 321 | FILES:${PN}-terminfo-base = "\ |
322 | ${sysconfdir}/terminfo \ | 322 | ${sysconfdir}/terminfo \ |
323 | " | 323 | " |
324 | 324 | ||
325 | RSUGGESTS_${PN}-libtinfo = "${PN}-terminfo" | 325 | RSUGGESTS:${PN}-libtinfo = "${PN}-terminfo" |
326 | RRECOMMENDS_${PN}-libtinfo = "${PN}-terminfo-base" | 326 | RRECOMMENDS:${PN}-libtinfo = "${PN}-terminfo-base" |
327 | 327 | ||
328 | # Putting terminfo into the sysroot adds around 2800 files to | 328 | # Putting terminfo into the sysroot adds around 2800 files to |
329 | # each recipe specific sysroot. We can live without this, particularly | 329 | # each recipe specific sysroot. We can live without this, particularly |
330 | # as many recipes may have native and target copies. | 330 | # as many recipes may have native and target copies. |
331 | SYSROOT_DIRS_remove = "${datadir}" | 331 | SYSROOT_DIRS:remove = "${datadir}" |
diff --git a/meta/recipes-core/newlib/libgloss_4.1.0.bb b/meta/recipes-core/newlib/libgloss_4.1.0.bb index c9ed30d988..8c8ee91395 100644 --- a/meta/recipes-core/newlib/libgloss_4.1.0.bb +++ b/meta/recipes-core/newlib/libgloss_4.1.0.bb | |||
@@ -2,21 +2,21 @@ require newlib.inc | |||
2 | 2 | ||
3 | DEPENDS += "newlib" | 3 | DEPENDS += "newlib" |
4 | 4 | ||
5 | FILESEXTRAPATHS_prepend := "${THISDIR}/libgloss:" | 5 | FILESEXTRAPATHS:prepend := "${THISDIR}/libgloss:" |
6 | 6 | ||
7 | SRC_URI_append_powerpc = " file://fix-rs6000-crt0.patch" | 7 | SRC_URI:append:powerpc = " file://fix-rs6000-crt0.patch" |
8 | SRC_URI_append_arm = " file://fix_makefile_include_arm_h.patch" | 8 | SRC_URI:append:arm = " file://fix_makefile_include_arm_h.patch" |
9 | 9 | ||
10 | do_configure() { | 10 | do_configure() { |
11 | ${S}/libgloss/configure ${EXTRA_OECONF} | 11 | ${S}/libgloss/configure ${EXTRA_OECONF} |
12 | } | 12 | } |
13 | 13 | ||
14 | do_install_prepend() { | 14 | do_install:prepend() { |
15 | # install doesn't create this itself, avoid install error | 15 | # install doesn't create this itself, avoid install error |
16 | install -d ${D}${prefix}/${TARGET_SYS}/lib | 16 | install -d ${D}${prefix}/${TARGET_SYS}/lib |
17 | } | 17 | } |
18 | 18 | ||
19 | do_install_append() { | 19 | do_install:append() { |
20 | # Move libs to default directories so they can be picked up later | 20 | # Move libs to default directories so they can be picked up later |
21 | install -d ${D}${libdir} | 21 | install -d ${D}${libdir} |
22 | mv -v ${D}${prefix}/${TARGET_SYS}/lib/* ${D}${libdir} | 22 | mv -v ${D}${prefix}/${TARGET_SYS}/lib/* ${D}${libdir} |
@@ -26,8 +26,8 @@ do_install_append() { | |||
26 | } | 26 | } |
27 | 27 | ||
28 | # Split packages correctly | 28 | # Split packages correctly |
29 | FILES_${PN} += "${libdir}/*.ld ${libdir}/*.specs" | 29 | FILES:${PN} += "${libdir}/*.ld ${libdir}/*.specs" |
30 | FILES_${PN}-dev += "${libdir}/cpu-init/*" | 30 | FILES:${PN}-dev += "${libdir}/cpu-init/*" |
31 | 31 | ||
32 | INHIBIT_PACKAGE_STRIP = "1" | 32 | INHIBIT_PACKAGE_STRIP = "1" |
33 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | 33 | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" |
diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc index 0aba21fae7..23cd172008 100644 --- a/meta/recipes-core/newlib/newlib.inc +++ b/meta/recipes-core/newlib/newlib.inc | |||
@@ -25,7 +25,7 @@ S = "${WORKDIR}/newlib-${PV}" | |||
25 | B = "${WORKDIR}/build" | 25 | B = "${WORKDIR}/build" |
26 | 26 | ||
27 | ## disable stdlib | 27 | ## disable stdlib |
28 | TARGET_CC_ARCH_append = " -nostdlib" | 28 | TARGET_CC_ARCH:append = " -nostdlib" |
29 | 29 | ||
30 | EXTRA_OECONF = " \ | 30 | EXTRA_OECONF = " \ |
31 | --build=${BUILD_SYS} \ | 31 | --build=${BUILD_SYS} \ |
@@ -50,5 +50,5 @@ do_install() { | |||
50 | oe_runmake install DESTDIR='${D}' | 50 | oe_runmake install DESTDIR='${D}' |
51 | } | 51 | } |
52 | 52 | ||
53 | COMPATIBLE_HOST_libc-musl_class-target = "null" | 53 | COMPATIBLE_HOST:libc-musl:class-target = "null" |
54 | COMPATIBLE_HOST_libc-glibc_class-target = "null" | 54 | COMPATIBLE_HOST:libc-glibc:class-target = "null" |
diff --git a/meta/recipes-core/newlib/newlib_4.1.0.bb b/meta/recipes-core/newlib/newlib_4.1.0.bb index 7ab5b2b94e..0542c596ba 100644 --- a/meta/recipes-core/newlib/newlib_4.1.0.bb +++ b/meta/recipes-core/newlib/newlib_4.1.0.bb | |||
@@ -7,7 +7,7 @@ do_configure() { | |||
7 | ${S}/configure ${EXTRA_OECONF} | 7 | ${S}/configure ${EXTRA_OECONF} |
8 | } | 8 | } |
9 | 9 | ||
10 | do_install_append() { | 10 | do_install:append() { |
11 | # Move include files and libs to default directories so they can be picked up later | 11 | # Move include files and libs to default directories so they can be picked up later |
12 | mv -v ${D}${prefix}/${TARGET_SYS}/lib ${D}${libdir} | 12 | mv -v ${D}${prefix}/${TARGET_SYS}/lib ${D}${libdir} |
13 | mv -v ${D}${prefix}/${TARGET_SYS}/include ${D}${includedir} | 13 | mv -v ${D}${prefix}/${TARGET_SYS}/include ${D}${includedir} |
@@ -17,4 +17,4 @@ do_install_append() { | |||
17 | } | 17 | } |
18 | 18 | ||
19 | # No rpm package is actually created but -dev depends on it, avoid dnf error | 19 | # No rpm package is actually created but -dev depends on it, avoid dnf error |
20 | RDEPENDS_${PN}-dev_libc-newlib = "" | 20 | RDEPENDS:${PN}-dev:libc-newlib = "" |
diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb index a29d678125..38ee4f993b 100644 --- a/meta/recipes-core/os-release/os-release.bb +++ b/meta/recipes-core/os-release/os-release.bb | |||
@@ -50,4 +50,4 @@ do_install () { | |||
50 | lnr ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/os-release | 50 | lnr ${D}${nonarch_libdir}/os-release ${D}${sysconfdir}/os-release |
51 | } | 51 | } |
52 | 52 | ||
53 | FILES_${PN} += "${nonarch_libdir}/os-release" | 53 | FILES:${PN} += "${nonarch_libdir}/os-release" |
diff --git a/meta/recipes-core/ovmf/ovmf-shell-image.bb b/meta/recipes-core/ovmf/ovmf-shell-image.bb index fd4fb5b732..50c4517da3 100644 --- a/meta/recipes-core/ovmf/ovmf-shell-image.bb +++ b/meta/recipes-core/ovmf/ovmf-shell-image.bb | |||
@@ -1,11 +1,11 @@ | |||
1 | DESCRIPTION = "boot image with UEFI shell and tools" | 1 | DESCRIPTION = "boot image with UEFI shell and tools" |
2 | COMPATIBLE_HOST_class-target='(i.86|x86_64).*' | 2 | COMPATIBLE_HOST:class-target='(i.86|x86_64).*' |
3 | 3 | ||
4 | # For this image recipe, only the wic format with a | 4 | # For this image recipe, only the wic format with a |
5 | # single vfat partition makes sense. Because we have no | 5 | # single vfat partition makes sense. Because we have no |
6 | # boot loader and no rootfs partition, not additional | 6 | # boot loader and no rootfs partition, not additional |
7 | # tools are needed for this .wks file. | 7 | # tools are needed for this .wks file. |
8 | IMAGE_FSTYPES_forcevariable = 'wic' | 8 | IMAGE_FSTYPES:forcevariable = 'wic' |
9 | WKS_FILE = "ovmf/ovmf-shell-image.wks" | 9 | WKS_FILE = "ovmf/ovmf-shell-image.wks" |
10 | WKS_FILE_DEPENDS = "" | 10 | WKS_FILE_DEPENDS = "" |
11 | 11 | ||
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 90dae2aed0..145240e77e 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb | |||
@@ -3,7 +3,7 @@ DESCRIPTION = "OVMF is an EDK II based project to enable UEFI support for \ | |||
3 | Virtual Machines. OVMF contains sample UEFI firmware for QEMU and KVM" | 3 | Virtual Machines. OVMF contains sample UEFI firmware for QEMU and KVM" |
4 | HOMEPAGE = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF" | 4 | HOMEPAGE = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF" |
5 | LICENSE = "BSD-2-Clause" | 5 | LICENSE = "BSD-2-Clause" |
6 | LICENSE_class-target = "${@bb.utils.contains('PACKAGECONFIG', 'secureboot', 'BSD & OpenSSL', 'BSD', d)}" | 6 | LICENSE:class-target = "${@bb.utils.contains('PACKAGECONFIG', 'secureboot', 'BSD & OpenSSL', 'BSD', d)}" |
7 | LIC_FILES_CHKSUM = "file://OvmfPkg/License.txt;md5=06357ddc23f46577c2aeaeaf7b776d65" | 7 | LIC_FILES_CHKSUM = "file://OvmfPkg/License.txt;md5=06357ddc23f46577c2aeaeaf7b776d65" |
8 | 8 | ||
9 | # Enabling Secure Boot adds a dependency on OpenSSL and implies | 9 | # Enabling Secure Boot adds a dependency on OpenSSL and implies |
@@ -40,7 +40,7 @@ EDK_TOOLS_DIR="edk2_basetools" | |||
40 | BUILD_OPTIMIZATION="-pipe" | 40 | BUILD_OPTIMIZATION="-pipe" |
41 | 41 | ||
42 | # OVMF supports IA only, although it could conceivably support ARM someday. | 42 | # OVMF supports IA only, although it could conceivably support ARM someday. |
43 | COMPATIBLE_HOST_class-target='(i.86|x86_64).*' | 43 | COMPATIBLE_HOST:class-target='(i.86|x86_64).*' |
44 | 44 | ||
45 | # Additional build flags for OVMF with Secure Boot. | 45 | # Additional build flags for OVMF with Secure Boot. |
46 | # Fedora also uses "-D SMM_REQUIRE -D EXCLUDE_SHELL_FROM_FD". | 46 | # Fedora also uses "-D SMM_REQUIRE -D EXCLUDE_SHELL_FROM_FD". |
@@ -52,7 +52,7 @@ export PYTHON_COMMAND = "${HOSTTOOLS_DIR}/python3" | |||
52 | do_patch[postfuncs] += "fix_basetools_location" | 52 | do_patch[postfuncs] += "fix_basetools_location" |
53 | fix_basetools_location () { | 53 | fix_basetools_location () { |
54 | } | 54 | } |
55 | fix_basetools_location_class-target() { | 55 | fix_basetools_location:class-target() { |
56 | # Replaces the fake path inserted by 0002-ovmf-update-path-to-native-BaseTools.patch. | 56 | # Replaces the fake path inserted by 0002-ovmf-update-path-to-native-BaseTools.patch. |
57 | # Necessary for finding the actual BaseTools from ovmf-native. | 57 | # Necessary for finding the actual BaseTools from ovmf-native. |
58 | sed -i -e 's#BBAKE_EDK_TOOLS_PATH#${STAGING_BINDIR_NATIVE}/${EDK_TOOLS_DIR}#' ${S}/OvmfPkg/build.sh | 58 | 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() { | |||
61 | do_patch[postfuncs] += "fix_iasl" | 61 | do_patch[postfuncs] += "fix_iasl" |
62 | fix_iasl() { | 62 | fix_iasl() { |
63 | } | 63 | } |
64 | fix_iasl_class-native() { | 64 | fix_iasl:class-native() { |
65 | # iasl is not installed under /usr/bin when building with OE. | 65 | # iasl is not installed under /usr/bin when building with OE. |
66 | sed -i -e 's#/usr/bin/iasl#${STAGING_BINDIR_NATIVE}/iasl#' ${S}/BaseTools/Conf/tools_def.template | 66 | sed -i -e 's#/usr/bin/iasl#${STAGING_BINDIR_NATIVE}/iasl#' ${S}/BaseTools/Conf/tools_def.template |
67 | } | 67 | } |
@@ -80,14 +80,14 @@ fix_toolchain() { | |||
80 | -e '/^VFR_CPPFLAGS/a CC = ${CC}\nCXX = ${CXX}\nAS = ${AS}\nAR = ${AR}\nLD = ${LD}' \ | 80 | -e '/^VFR_CPPFLAGS/a CC = ${CC}\nCXX = ${CXX}\nAS = ${AS}\nAR = ${AR}\nLD = ${LD}' \ |
81 | ${S}/BaseTools/Source/C/VfrCompile/GNUmakefile | 81 | ${S}/BaseTools/Source/C/VfrCompile/GNUmakefile |
82 | } | 82 | } |
83 | fix_toolchain_append_class-native() { | 83 | fix_toolchain:append:class-native() { |
84 | # This tools_def.template is going to be used by the target ovmf and | 84 | # This tools_def.template is going to be used by the target ovmf and |
85 | # defines which compilers to use. For the GCC toolchain definitions, | 85 | # defines which compilers to use. For the GCC toolchain definitions, |
86 | # that will be ${HOST_PREFIX}gcc. However, "make" doesn't need that | 86 | # that will be ${HOST_PREFIX}gcc. However, "make" doesn't need that |
87 | # prefix. | 87 | # prefix. |
88 | # | 88 | # |
89 | # Injecting ENV(HOST_PREFIX) matches exporting that value as env | 89 | # Injecting ENV(HOST_PREFIX) matches exporting that value as env |
90 | # variable in do_compile_class-target. | 90 | # variable in do_compile:class-target. |
91 | sed -i \ | 91 | sed -i \ |
92 | -e 's#\(ENV\|DEF\)(GCC.*_PREFIX)#ENV(HOST_PREFIX)#' \ | 92 | -e 's#\(ENV\|DEF\)(GCC.*_PREFIX)#ENV(HOST_PREFIX)#' \ |
93 | -e 's#ENV(HOST_PREFIX)make#make#' \ | 93 | -e 's#ENV(HOST_PREFIX)make#make#' \ |
@@ -150,11 +150,11 @@ fixup_target_tools() { | |||
150 | echo ${FIXED_GCCVER} | 150 | echo ${FIXED_GCCVER} |
151 | } | 151 | } |
152 | 152 | ||
153 | do_compile_class-native() { | 153 | do_compile:class-native() { |
154 | oe_runmake -C ${S}/BaseTools | 154 | oe_runmake -C ${S}/BaseTools |
155 | } | 155 | } |
156 | 156 | ||
157 | do_compile_class-target() { | 157 | do_compile:class-target() { |
158 | export LFLAGS="${LDFLAGS}" | 158 | export LFLAGS="${LDFLAGS}" |
159 | PARALLEL_JOBS="${@oe.utils.parallel_make_argument(d, '-n %d')}" | 159 | PARALLEL_JOBS="${@oe.utils.parallel_make_argument(d, '-n %d')}" |
160 | OVMF_ARCH="X64" | 160 | OVMF_ARCH="X64" |
@@ -203,12 +203,12 @@ do_compile_class-target() { | |||
203 | fi | 203 | fi |
204 | } | 204 | } |
205 | 205 | ||
206 | do_install_class-native() { | 206 | do_install:class-native() { |
207 | install -d ${D}/${bindir}/edk2_basetools | 207 | install -d ${D}/${bindir}/edk2_basetools |
208 | cp -r ${S}/BaseTools ${D}/${bindir}/${EDK_TOOLS_DIR} | 208 | cp -r ${S}/BaseTools ${D}/${bindir}/${EDK_TOOLS_DIR} |
209 | } | 209 | } |
210 | 210 | ||
211 | do_install_class-target() { | 211 | do_install:class-target() { |
212 | # Content for UEFI shell iso. We install the EFI shell as | 212 | # Content for UEFI shell iso. We install the EFI shell as |
213 | # bootx64/ia32.efi because then it can be started even when the | 213 | # bootx64/ia32.efi because then it can be started even when the |
214 | # firmware itself does not contain it. | 214 | # firmware itself does not contain it. |
@@ -225,19 +225,19 @@ do_install_class-target() { | |||
225 | # | 225 | # |
226 | # However, EnrollDefaultKeys.efi is only included when Secure Boot is enabled. | 226 | # However, EnrollDefaultKeys.efi is only included when Secure Boot is enabled. |
227 | PACKAGES =+ "ovmf-shell-efi" | 227 | PACKAGES =+ "ovmf-shell-efi" |
228 | FILES_ovmf-shell-efi = " \ | 228 | FILES:ovmf-shell-efi = " \ |
229 | EnrollDefaultKeys.efi \ | 229 | EnrollDefaultKeys.efi \ |
230 | efi/ \ | 230 | efi/ \ |
231 | " | 231 | " |
232 | 232 | ||
233 | DEPLOYDEP = "" | 233 | DEPLOYDEP = "" |
234 | DEPLOYDEP_class-target = "qemu-system-native:do_populate_sysroot" | 234 | DEPLOYDEP:class-target = "qemu-system-native:do_populate_sysroot" |
235 | DEPLOYDEP_class-target += " ${@bb.utils.contains('PACKAGECONFIG', 'secureboot', 'openssl-native:do_populate_sysroot', '', d)}" | 235 | DEPLOYDEP:class-target += " ${@bb.utils.contains('PACKAGECONFIG', 'secureboot', 'openssl-native:do_populate_sysroot', '', d)}" |
236 | do_deploy[depends] += "${DEPLOYDEP}" | 236 | do_deploy[depends] += "${DEPLOYDEP}" |
237 | 237 | ||
238 | do_deploy() { | 238 | do_deploy() { |
239 | } | 239 | } |
240 | do_deploy_class-target() { | 240 | do_deploy:class-target() { |
241 | # For use with "runqemu ovmf". | 241 | # For use with "runqemu ovmf". |
242 | for i in \ | 242 | for i in \ |
243 | ovmf \ | 243 | ovmf \ |
diff --git a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb index ae989011f4..64e5883f95 100644 --- a/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | |||
@@ -9,7 +9,7 @@ inherit packagegroup nativesdk | |||
9 | 9 | ||
10 | PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" | 10 | PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" |
11 | 11 | ||
12 | RDEPENDS_${PN} = "\ | 12 | RDEPENDS:${PN} = "\ |
13 | nativesdk-pkgconfig \ | 13 | nativesdk-pkgconfig \ |
14 | nativesdk-qemu \ | 14 | nativesdk-qemu \ |
15 | nativesdk-qemu-helper \ | 15 | nativesdk-qemu-helper \ |
@@ -29,7 +29,7 @@ RDEPENDS_${PN} = "\ | |||
29 | nativesdk-flex \ | 29 | nativesdk-flex \ |
30 | " | 30 | " |
31 | 31 | ||
32 | RDEPENDS_${PN}_darwin = "\ | 32 | RDEPENDS:${PN}:darwin = "\ |
33 | nativesdk-pkgconfig \ | 33 | nativesdk-pkgconfig \ |
34 | nativesdk-opkg \ | 34 | nativesdk-opkg \ |
35 | nativesdk-libtool \ | 35 | nativesdk-libtool \ |
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 6d4d7e6f7e..7489ef61b0 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb | |||
@@ -47,7 +47,7 @@ VIRTUAL-RUNTIME_keymaps ?= "keymaps" | |||
47 | # | 47 | # |
48 | # packagegroup-base contain stuff needed for base system (machine related) | 48 | # packagegroup-base contain stuff needed for base system (machine related) |
49 | # | 49 | # |
50 | RDEPENDS_packagegroup-base = "\ | 50 | RDEPENDS:packagegroup-base = "\ |
51 | packagegroup-distro-base \ | 51 | packagegroup-distro-base \ |
52 | packagegroup-machine-base \ | 52 | packagegroup-machine-base \ |
53 | \ | 53 | \ |
@@ -79,7 +79,7 @@ RDEPENDS_packagegroup-base = "\ | |||
79 | " | 79 | " |
80 | 80 | ||
81 | 81 | ||
82 | RRECOMMENDS_packagegroup-base = "\ | 82 | RRECOMMENDS:packagegroup-base = "\ |
83 | kernel-module-nls-utf8 \ | 83 | kernel-module-nls-utf8 \ |
84 | kernel-module-input \ | 84 | kernel-module-input \ |
85 | kernel-module-uinput \ | 85 | kernel-module-uinput \ |
@@ -88,7 +88,7 @@ RRECOMMENDS_packagegroup-base = "\ | |||
88 | kernel-module-rtc-sysfs \ | 88 | kernel-module-rtc-sysfs \ |
89 | kernel-module-unix" | 89 | kernel-module-unix" |
90 | 90 | ||
91 | RDEPENDS_packagegroup-base-extended = "\ | 91 | RDEPENDS:packagegroup-base-extended = "\ |
92 | packagegroup-base \ | 92 | packagegroup-base \ |
93 | ${ADD_WIFI} \ | 93 | ${ADD_WIFI} \ |
94 | ${ADD_BT} \ | 94 | ${ADD_BT} \ |
@@ -124,69 +124,69 @@ python __anonymous () { | |||
124 | # | 124 | # |
125 | # packages added by distribution | 125 | # packages added by distribution |
126 | # | 126 | # |
127 | SUMMARY_packagegroup-distro-base = "${DISTRO} extras" | 127 | SUMMARY:packagegroup-distro-base = "${DISTRO} extras" |
128 | DEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_DEPENDS}" | 128 | DEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_DEPENDS}" |
129 | RDEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RDEPENDS}" | 129 | RDEPENDS:packagegroup-distro-base = "${DISTRO_EXTRA_RDEPENDS}" |
130 | RRECOMMENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" | 130 | RRECOMMENDS:packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" |
131 | 131 | ||
132 | # | 132 | # |
133 | # packages added by machine config | 133 | # packages added by machine config |
134 | # | 134 | # |
135 | SUMMARY_packagegroup-machine-base = "${MACHINE} extras" | 135 | SUMMARY:packagegroup-machine-base = "${MACHINE} extras" |
136 | SUMMARY_packagegroup-machine-base = "Extra packages required to fully support ${MACHINE} hardware" | 136 | SUMMARY:packagegroup-machine-base = "Extra packages required to fully support ${MACHINE} hardware" |
137 | RDEPENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RDEPENDS}" | 137 | RDEPENDS:packagegroup-machine-base = "${MACHINE_EXTRA_RDEPENDS}" |
138 | RRECOMMENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" | 138 | RRECOMMENDS:packagegroup-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" |
139 | 139 | ||
140 | SUMMARY_packagegroup-base-keyboard = "Keyboard support" | 140 | SUMMARY:packagegroup-base-keyboard = "Keyboard support" |
141 | RDEPENDS_packagegroup-base-keyboard = "\ | 141 | RDEPENDS:packagegroup-base-keyboard = "\ |
142 | ${VIRTUAL-RUNTIME_keymaps}" | 142 | ${VIRTUAL-RUNTIME_keymaps}" |
143 | 143 | ||
144 | SUMMARY_packagegroup-base-pci = "PCI bus support" | 144 | SUMMARY:packagegroup-base-pci = "PCI bus support" |
145 | RDEPENDS_packagegroup-base-pci = "\ | 145 | RDEPENDS:packagegroup-base-pci = "\ |
146 | pciutils" | 146 | pciutils" |
147 | 147 | ||
148 | SUMMARY_packagegroup-base-acpi = "ACPI support" | 148 | SUMMARY:packagegroup-base-acpi = "ACPI support" |
149 | RDEPENDS_packagegroup-base-acpi = "\ | 149 | RDEPENDS:packagegroup-base-acpi = "\ |
150 | acpid" | 150 | acpid" |
151 | 151 | ||
152 | SUMMARY_packagegroup-base-apm = "APM support" | 152 | SUMMARY:packagegroup-base-apm = "APM support" |
153 | RDEPENDS_packagegroup-base-apm = "\ | 153 | RDEPENDS:packagegroup-base-apm = "\ |
154 | ${VIRTUAL-RUNTIME_apm} \ | 154 | ${VIRTUAL-RUNTIME_apm} \ |
155 | apmd" | 155 | apmd" |
156 | 156 | ||
157 | SUMMARY_packagegroup-base-ext2 = "ext2 filesystem support" | 157 | SUMMARY:packagegroup-base-ext2 = "ext2 filesystem support" |
158 | RDEPENDS_packagegroup-base-ext2 = "\ | 158 | RDEPENDS:packagegroup-base-ext2 = "\ |
159 | e2fsprogs-e2fsck \ | 159 | e2fsprogs-e2fsck \ |
160 | e2fsprogs-mke2fs" | 160 | e2fsprogs-mke2fs" |
161 | 161 | ||
162 | RRECOMMENDS_packagegroup-base-ext2 = "\ | 162 | RRECOMMENDS:packagegroup-base-ext2 = "\ |
163 | hdparm \ | 163 | hdparm \ |
164 | e2fsprogs" | 164 | e2fsprogs" |
165 | 165 | ||
166 | SUMMARY_packagegroup-base-vfat = "FAT filesystem support" | 166 | SUMMARY:packagegroup-base-vfat = "FAT filesystem support" |
167 | RRECOMMENDS_packagegroup-base-vfat = "\ | 167 | RRECOMMENDS:packagegroup-base-vfat = "\ |
168 | kernel-module-msdos \ | 168 | kernel-module-msdos \ |
169 | kernel-module-vfat \ | 169 | kernel-module-vfat \ |
170 | kernel-module-nls-iso8859-1 \ | 170 | kernel-module-nls-iso8859-1 \ |
171 | kernel-module-nls-cp437 \ | 171 | kernel-module-nls-cp437 \ |
172 | dosfstools" | 172 | dosfstools" |
173 | 173 | ||
174 | SUMMARY_packagegroup-base-alsa = "ALSA sound support" | 174 | SUMMARY:packagegroup-base-alsa = "ALSA sound support" |
175 | RDEPENDS_packagegroup-base-alsa = "\ | 175 | RDEPENDS:packagegroup-base-alsa = "\ |
176 | alsa-utils-alsactl \ | 176 | alsa-utils-alsactl \ |
177 | alsa-utils-amixer \ | 177 | alsa-utils-amixer \ |
178 | ${VIRTUAL-RUNTIME_alsa-state}" | 178 | ${VIRTUAL-RUNTIME_alsa-state}" |
179 | 179 | ||
180 | RRECOMMENDS_packagegroup-base-alsa = "\ | 180 | RRECOMMENDS:packagegroup-base-alsa = "\ |
181 | kernel-module-snd-mixer-oss \ | 181 | kernel-module-snd-mixer-oss \ |
182 | kernel-module-snd-pcm-oss" | 182 | kernel-module-snd-pcm-oss" |
183 | 183 | ||
184 | SUMMARY_packagegroup-base-pcmcia = "PC card slot support" | 184 | SUMMARY:packagegroup-base-pcmcia = "PC card slot support" |
185 | RDEPENDS_packagegroup-base-pcmcia = "\ | 185 | RDEPENDS:packagegroup-base-pcmcia = "\ |
186 | pcmciautils \ | 186 | pcmciautils \ |
187 | " | 187 | " |
188 | 188 | ||
189 | RRECOMMENDS_packagegroup-base-pcmcia = "\ | 189 | RRECOMMENDS:packagegroup-base-pcmcia = "\ |
190 | kernel-module-pcmcia \ | 190 | kernel-module-pcmcia \ |
191 | kernel-module-airo-cs \ | 191 | kernel-module-airo-cs \ |
192 | kernel-module-pcnet-cs \ | 192 | kernel-module-pcnet-cs \ |
@@ -197,12 +197,12 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\ | |||
197 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ | 197 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ |
198 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" | 198 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" |
199 | 199 | ||
200 | SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" | 200 | SUMMARY:packagegroup-base-bluetooth = "Bluetooth support" |
201 | RDEPENDS_packagegroup-base-bluetooth = "\ | 201 | RDEPENDS:packagegroup-base-bluetooth = "\ |
202 | bluez5 \ | 202 | bluez5 \ |
203 | " | 203 | " |
204 | 204 | ||
205 | RRECOMMENDS_packagegroup-base-bluetooth = "\ | 205 | RRECOMMENDS:packagegroup-base-bluetooth = "\ |
206 | kernel-module-bluetooth \ | 206 | kernel-module-bluetooth \ |
207 | kernel-module-l2cap \ | 207 | kernel-module-l2cap \ |
208 | kernel-module-rfcomm \ | 208 | kernel-module-rfcomm \ |
@@ -218,19 +218,19 @@ RRECOMMENDS_packagegroup-base-bluetooth = "\ | |||
218 | ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ | 218 | ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ |
219 | " | 219 | " |
220 | 220 | ||
221 | SUMMARY_packagegroup-base-usbgadget = "USB gadget support" | 221 | SUMMARY:packagegroup-base-usbgadget = "USB gadget support" |
222 | RRECOMMENDS_packagegroup-base-usbgadget = "\ | 222 | RRECOMMENDS:packagegroup-base-usbgadget = "\ |
223 | kernel-module-pxa27x_udc \ | 223 | kernel-module-pxa27x_udc \ |
224 | kernel-module-gadgetfs \ | 224 | kernel-module-gadgetfs \ |
225 | kernel-module-g-file-storage \ | 225 | kernel-module-g-file-storage \ |
226 | kernel-module-g-serial \ | 226 | kernel-module-g-serial \ |
227 | kernel-module-g-ether" | 227 | kernel-module-g-ether" |
228 | 228 | ||
229 | SUMMARY_packagegroup-base-usbhost = "USB host support" | 229 | SUMMARY:packagegroup-base-usbhost = "USB host support" |
230 | RDEPENDS_packagegroup-base-usbhost = "\ | 230 | RDEPENDS:packagegroup-base-usbhost = "\ |
231 | usbutils " | 231 | usbutils " |
232 | 232 | ||
233 | RRECOMMENDS_packagegroup-base-usbhost = "\ | 233 | RRECOMMENDS:packagegroup-base-usbhost = "\ |
234 | kernel-module-uhci-hcd \ | 234 | kernel-module-uhci-hcd \ |
235 | kernel-module-ohci-hcd \ | 235 | kernel-module-ohci-hcd \ |
236 | kernel-module-ehci-hcd \ | 236 | kernel-module-ehci-hcd \ |
@@ -244,36 +244,36 @@ RRECOMMENDS_packagegroup-base-usbhost = "\ | |||
244 | kernel-module-usbserial \ | 244 | kernel-module-usbserial \ |
245 | kernel-module-usb-storage " | 245 | kernel-module-usb-storage " |
246 | 246 | ||
247 | SUMMARY_packagegroup-base-ppp = "PPP dial-up protocol support" | 247 | SUMMARY:packagegroup-base-ppp = "PPP dial-up protocol support" |
248 | RDEPENDS_packagegroup-base-ppp = "\ | 248 | RDEPENDS:packagegroup-base-ppp = "\ |
249 | ppp \ | 249 | ppp \ |
250 | ppp-dialin" | 250 | ppp-dialin" |
251 | 251 | ||
252 | RRECOMMENDS_packagegroup-base-ppp = "\ | 252 | RRECOMMENDS:packagegroup-base-ppp = "\ |
253 | kernel-module-ppp-async \ | 253 | kernel-module-ppp-async \ |
254 | kernel-module-ppp-deflate \ | 254 | kernel-module-ppp-deflate \ |
255 | kernel-module-ppp-generic \ | 255 | kernel-module-ppp-generic \ |
256 | kernel-module-ppp-mppe \ | 256 | kernel-module-ppp-mppe \ |
257 | kernel-module-slhc" | 257 | kernel-module-slhc" |
258 | 258 | ||
259 | SUMMARY_packagegroup-base-ipsec = "IPSEC support" | 259 | SUMMARY:packagegroup-base-ipsec = "IPSEC support" |
260 | RDEPENDS_packagegroup-base-ipsec = "\ | 260 | RDEPENDS:packagegroup-base-ipsec = "\ |
261 | " | 261 | " |
262 | 262 | ||
263 | RRECOMMENDS_packagegroup-base-ipsec = "\ | 263 | RRECOMMENDS:packagegroup-base-ipsec = "\ |
264 | kernel-module-ipsec" | 264 | kernel-module-ipsec" |
265 | 265 | ||
266 | # | 266 | # |
267 | # packagegroup-base-wifi contain everything needed to get WiFi working | 267 | # packagegroup-base-wifi contain everything needed to get WiFi working |
268 | # WEP/WPA connection needs to be supported out-of-box | 268 | # WEP/WPA connection needs to be supported out-of-box |
269 | # | 269 | # |
270 | SUMMARY_packagegroup-base-wifi = "WiFi support" | 270 | SUMMARY:packagegroup-base-wifi = "WiFi support" |
271 | RDEPENDS_packagegroup-base-wifi = "\ | 271 | RDEPENDS:packagegroup-base-wifi = "\ |
272 | iw \ | 272 | iw \ |
273 | wireless-regdb-static \ | 273 | wireless-regdb-static \ |
274 | wpa-supplicant" | 274 | wpa-supplicant" |
275 | 275 | ||
276 | RRECOMMENDS_packagegroup-base-wifi = "\ | 276 | RRECOMMENDS:packagegroup-base-wifi = "\ |
277 | ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ | 277 | ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ |
278 | kernel-module-ieee80211-crypt \ | 278 | kernel-module-ieee80211-crypt \ |
279 | kernel-module-ieee80211-crypt-ccmp \ | 279 | kernel-module-ieee80211-crypt-ccmp \ |
@@ -287,59 +287,59 @@ RRECOMMENDS_packagegroup-base-wifi = "\ | |||
287 | kernel-module-aes-generic \ | 287 | kernel-module-aes-generic \ |
288 | kernel-module-aes" | 288 | kernel-module-aes" |
289 | 289 | ||
290 | SUMMARY_packagegroup-base-nfc = "Near Field Communication support" | 290 | SUMMARY:packagegroup-base-nfc = "Near Field Communication support" |
291 | RDEPENDS_packagegroup-base-nfc = "\ | 291 | RDEPENDS:packagegroup-base-nfc = "\ |
292 | neard" | 292 | neard" |
293 | 293 | ||
294 | RRECOMMENDS_packagegroup-base-nfc = "\ | 294 | RRECOMMENDS:packagegroup-base-nfc = "\ |
295 | kernel-module-nfc" | 295 | kernel-module-nfc" |
296 | 296 | ||
297 | SUMMARY_packagegroup-base-3g = "Cellular data support" | 297 | SUMMARY:packagegroup-base-3g = "Cellular data support" |
298 | RDEPENDS_packagegroup-base-3g = "\ | 298 | RDEPENDS:packagegroup-base-3g = "\ |
299 | ofono" | 299 | ofono" |
300 | 300 | ||
301 | RRECOMMENDS_packagegroup-base-3g = "\ | 301 | RRECOMMENDS:packagegroup-base-3g = "\ |
302 | kernel-module-cdc-acm \ | 302 | kernel-module-cdc-acm \ |
303 | kernel-module-cdc-wdm" | 303 | kernel-module-cdc-wdm" |
304 | 304 | ||
305 | SUMMARY_packagegroup-base-smbfs = "SMB network filesystem support" | 305 | SUMMARY:packagegroup-base-smbfs = "SMB network filesystem support" |
306 | RRECOMMENDS_packagegroup-base-smbfs = "\ | 306 | RRECOMMENDS:packagegroup-base-smbfs = "\ |
307 | kernel-module-cifs \ | 307 | kernel-module-cifs \ |
308 | kernel-module-smbfs" | 308 | kernel-module-smbfs" |
309 | 309 | ||
310 | SUMMARY_packagegroup-base-cramfs = "cramfs filesystem support" | 310 | SUMMARY:packagegroup-base-cramfs = "cramfs filesystem support" |
311 | RRECOMMENDS_packagegroup-base-cramfs = "\ | 311 | RRECOMMENDS:packagegroup-base-cramfs = "\ |
312 | kernel-module-cramfs" | 312 | kernel-module-cramfs" |
313 | 313 | ||
314 | # | 314 | # |
315 | # packagegroup-base-nfs provides ONLY client support - server is in nfs-utils package | 315 | # packagegroup-base-nfs provides ONLY client support - server is in nfs-utils package |
316 | # | 316 | # |
317 | SUMMARY_packagegroup-base-nfs = "NFS network filesystem support" | 317 | SUMMARY:packagegroup-base-nfs = "NFS network filesystem support" |
318 | RDEPENDS_packagegroup-base-nfs = "\ | 318 | RDEPENDS:packagegroup-base-nfs = "\ |
319 | rpcbind" | 319 | rpcbind" |
320 | 320 | ||
321 | RRECOMMENDS_packagegroup-base-nfs = "\ | 321 | RRECOMMENDS:packagegroup-base-nfs = "\ |
322 | kernel-module-nfs " | 322 | kernel-module-nfs " |
323 | 323 | ||
324 | SUMMARY_packagegroup-base-zeroconf = "Zeroconf support" | 324 | SUMMARY:packagegroup-base-zeroconf = "Zeroconf support" |
325 | RDEPENDS_packagegroup-base-zeroconf = "\ | 325 | RDEPENDS:packagegroup-base-zeroconf = "\ |
326 | avahi-daemon" | 326 | avahi-daemon" |
327 | RDEPENDS_packagegroup-base-zeroconf_append_libc-glibc = "\ | 327 | RDEPENDS:packagegroup-base-zeroconf:append:libc-glibc = "\ |
328 | libnss-mdns \ | 328 | libnss-mdns \ |
329 | " | 329 | " |
330 | 330 | ||
331 | SUMMARY_packagegroup-base-ipv6 = "IPv6 support" | 331 | SUMMARY:packagegroup-base-ipv6 = "IPv6 support" |
332 | RDEPENDS_packagegroup-base-ipv6 = "\ | 332 | RDEPENDS:packagegroup-base-ipv6 = "\ |
333 | " | 333 | " |
334 | 334 | ||
335 | RRECOMMENDS_packagegroup-base-ipv6 = "\ | 335 | RRECOMMENDS:packagegroup-base-ipv6 = "\ |
336 | kernel-module-ipv6 " | 336 | kernel-module-ipv6 " |
337 | 337 | ||
338 | SUMMARY_packagegroup-base-serial = "Serial port support" | 338 | SUMMARY:packagegroup-base-serial = "Serial port support" |
339 | RDEPENDS_packagegroup-base-serial = "\ | 339 | RDEPENDS:packagegroup-base-serial = "\ |
340 | setserial \ | 340 | setserial \ |
341 | lrzsz " | 341 | lrzsz " |
342 | 342 | ||
343 | SUMMARY_packagegroup-base-phone = "Cellular telephony (voice) support" | 343 | SUMMARY:packagegroup-base-phone = "Cellular telephony (voice) support" |
344 | RDEPENDS_packagegroup-base-phone = "\ | 344 | RDEPENDS:packagegroup-base-phone = "\ |
345 | ofono" | 345 | ofono" |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index abbee14bd4..faf7bc0026 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb | |||
@@ -22,7 +22,7 @@ SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '${VIRTUAL-R | |||
22 | ${VIRTUAL-RUNTIME_initscripts} \ | 22 | ${VIRTUAL-RUNTIME_initscripts} \ |
23 | " | 23 | " |
24 | 24 | ||
25 | RDEPENDS_${PN} = "\ | 25 | RDEPENDS:${PN} = "\ |
26 | base-files \ | 26 | base-files \ |
27 | base-passwd \ | 27 | base-passwd \ |
28 | ${VIRTUAL-RUNTIME_base-utils} \ | 28 | ${VIRTUAL-RUNTIME_base-utils} \ |
@@ -36,6 +36,6 @@ RDEPENDS_${PN} = "\ | |||
36 | ${VIRTUAL-RUNTIME_update-alternatives} \ | 36 | ${VIRTUAL-RUNTIME_update-alternatives} \ |
37 | ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" | 37 | ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" |
38 | 38 | ||
39 | RRECOMMENDS_${PN} = "\ | 39 | RRECOMMENDS:${PN} = "\ |
40 | ${VIRTUAL-RUNTIME_base-utils-syslog} \ | 40 | ${VIRTUAL-RUNTIME_base-utils-syslog} \ |
41 | ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" | 41 | ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb index 78cc65db87..32f4ac3586 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb | |||
@@ -7,7 +7,7 @@ SUMMARY = "Essential build dependencies" | |||
7 | 7 | ||
8 | inherit packagegroup | 8 | inherit packagegroup |
9 | 9 | ||
10 | RDEPENDS_packagegroup-core-buildessential = "\ | 10 | RDEPENDS:packagegroup-core-buildessential = "\ |
11 | autoconf \ | 11 | autoconf \ |
12 | automake \ | 12 | automake \ |
13 | binutils \ | 13 | binutils \ |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb index c45463fc6c..4e91aaf47b 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Remote debugging tools for Eclipse integration" | |||
2 | 2 | ||
3 | inherit packagegroup | 3 | inherit packagegroup |
4 | 4 | ||
5 | RDEPENDS_${PN} = "\ | 5 | RDEPENDS:${PN} = "\ |
6 | gdbserver \ | 6 | gdbserver \ |
7 | tcf-agent \ | 7 | tcf-agent \ |
8 | openssh-sftp-server \ | 8 | openssh-sftp-server \ |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb index 20fe6fc092..35beb3fc05 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb | |||
@@ -9,11 +9,11 @@ inherit packagegroup | |||
9 | 9 | ||
10 | PACKAGES = "${PN}-server ${PN}-client" | 10 | PACKAGES = "${PN}-server ${PN}-client" |
11 | 11 | ||
12 | SUMMARY_${PN}-client = "NFS client" | 12 | SUMMARY:${PN}-client = "NFS client" |
13 | RDEPENDS_${PN}-client = "nfs-utils-client" | 13 | RDEPENDS:${PN}-client = "nfs-utils-client" |
14 | 14 | ||
15 | SUMMARY_${PN}-server = "NFS server" | 15 | SUMMARY:${PN}-server = "NFS server" |
16 | RDEPENDS_${PN}-server = "\ | 16 | RDEPENDS:${PN}-server = "\ |
17 | nfs-utils \ | 17 | nfs-utils \ |
18 | nfs-utils-client \ | 18 | nfs-utils-client \ |
19 | " | 19 | " |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index 03fa5296c1..d70aff22c7 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | |||
@@ -11,7 +11,7 @@ inherit packagegroup | |||
11 | 11 | ||
12 | #PACKAGEFUNCS =+ 'generate_sdk_pkgs' | 12 | #PACKAGEFUNCS =+ 'generate_sdk_pkgs' |
13 | 13 | ||
14 | RDEPENDS_packagegroup-core-sdk = "\ | 14 | RDEPENDS:packagegroup-core-sdk = "\ |
15 | packagegroup-core-buildessential \ | 15 | packagegroup-core-buildessential \ |
16 | coreutils \ | 16 | coreutils \ |
17 | ccache \ | 17 | ccache \ |
@@ -26,15 +26,15 @@ RDEPENDS_packagegroup-core-sdk = "\ | |||
26 | tcl" | 26 | tcl" |
27 | 27 | ||
28 | SANITIZERS = "libasan-dev libubsan-dev" | 28 | SANITIZERS = "libasan-dev libubsan-dev" |
29 | SANITIZERS_arc = "" | 29 | SANITIZERS:arc = "" |
30 | SANITIZERS_microblaze = "" | 30 | SANITIZERS:microblaze = "" |
31 | SANITIZERS_mipsarch = "" | 31 | SANITIZERS:mipsarch = "" |
32 | SANITIZERS_nios2 = "" | 32 | SANITIZERS:nios2 = "" |
33 | SANITIZERS_riscv64 = "" | 33 | SANITIZERS:riscv64 = "" |
34 | SANITIZERS_riscv32 = "" | 34 | SANITIZERS:riscv32 = "" |
35 | SANITIZERS_libc-musl = "" | 35 | SANITIZERS:libc-musl = "" |
36 | 36 | ||
37 | RRECOMMENDS_packagegroup-core-sdk = "\ | 37 | RRECOMMENDS:packagegroup-core-sdk = "\ |
38 | libgomp \ | 38 | libgomp \ |
39 | libgomp-dev \ | 39 | libgomp-dev \ |
40 | ${SANITIZERS}" | 40 | ${SANITIZERS}" |
@@ -53,7 +53,7 @@ RRECOMMENDS_packagegroup-core-sdk = "\ | |||
53 | # # the package depchain code | 53 | # # the package depchain code |
54 | # spkgdata = read_subpkgdata(pkg, d) | 54 | # spkgdata = read_subpkgdata(pkg, d) |
55 | # | 55 | # |
56 | # rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '') | 56 | # rdepends = explode_deps(spkgdata.get('RDEPENDS:%s' % pkg) or '') |
57 | # rreclist = [] | 57 | # rreclist = [] |
58 | # | 58 | # |
59 | # for depend in rdepends: | 59 | # for depend in rdepends: |
@@ -63,16 +63,16 @@ RRECOMMENDS_packagegroup-core-sdk = "\ | |||
63 | # rreclist.append('%s-dev' % name) | 63 | # rreclist.append('%s-dev' % name) |
64 | # else: | 64 | # else: |
65 | # deppkgdata = read_subpkgdata(name, d) | 65 | # deppkgdata = read_subpkgdata(name, d) |
66 | # rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '') | 66 | # rdepends2 = explode_deps(deppkgdata.get('RDEPENDS:%s' % name) or '') |
67 | # for depend in rdepends2: | 67 | # for depend in rdepends2: |
68 | # split_depend = depend.split(' (') | 68 | # split_depend = depend.split(' (') |
69 | # name = split_depend[0].strip() | 69 | # name = split_depend[0].strip() |
70 | # if packaged('%s-dev' % name, d): | 70 | # if packaged('%s-dev' % name, d): |
71 | # rreclist.append('%s-dev' % name) | 71 | # rreclist.append('%s-dev' % name) |
72 | # | 72 | # |
73 | # oldrrec = d.getVar('RRECOMMENDS_%s' % newpkg, False) or '' | 73 | # oldrrec = d.getVar('RRECOMMENDS:%s' % newpkg, False) or '' |
74 | # d.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist)) | 74 | # d.setVar('RRECOMMENDS:%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist)) |
75 | # # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, d.getVar('RRECOMMENDS_%s' % newpkg, False))) | 75 | # # bb.note('RRECOMMENDS:%s = "%s"' % (newpkg, d.getVar('RRECOMMENDS:%s' % newpkg, False))) |
76 | # | 76 | # |
77 | # # bb.note('pkgs is %s' % pkgs) | 77 | # # bb.note('pkgs is %s' % pkgs) |
78 | # d.setVar('PACKAGES', ' '.join(pkgs)) | 78 | # d.setVar('PACKAGES', ' '.join(pkgs)) |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb index 5ec3f6c927..4f844ad925 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb | |||
@@ -3,4 +3,4 @@ PR = "r1" | |||
3 | 3 | ||
4 | inherit packagegroup | 4 | inherit packagegroup |
5 | 5 | ||
6 | RDEPENDS_${PN} = "dropbear" | 6 | RDEPENDS:${PN} = "dropbear" |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb index 703f956aea..846df12bc7 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb | |||
@@ -3,4 +3,4 @@ PR = "r1" | |||
3 | 3 | ||
4 | inherit packagegroup | 4 | inherit packagegroup |
5 | 5 | ||
6 | RDEPENDS_${PN} = "openssh" | 6 | RDEPENDS:${PN} = "openssh" |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb index 2a54f1ca3e..5ebcbcec82 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb | |||
@@ -5,7 +5,7 @@ PACKAGE_ARCH = "${TUNE_PKGARCH}" | |||
5 | 5 | ||
6 | inherit packagegroup | 6 | inherit packagegroup |
7 | 7 | ||
8 | RDEPENDS_${PN} = "\ | 8 | RDEPENDS:${PN} = "\ |
9 | libgcc \ | 9 | libgcc \ |
10 | libgcc-dev \ | 10 | libgcc-dev \ |
11 | libatomic \ | 11 | libatomic \ |
@@ -15,7 +15,7 @@ RDEPENDS_${PN} = "\ | |||
15 | ${LIBC_DEPENDENCIES} \ | 15 | ${LIBC_DEPENDENCIES} \ |
16 | " | 16 | " |
17 | 17 | ||
18 | RRECOMMENDS_${PN}_mingw32 = "\ | 18 | RRECOMMENDS:${PN}:mingw32 = "\ |
19 | libssp \ | 19 | libssp \ |
20 | libssp-dev \ | 20 | libssp-dev \ |
21 | " | 21 | " |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb index 542a02057c..c75850aa64 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb | |||
@@ -11,12 +11,12 @@ inherit packagegroup | |||
11 | PR = "r3" | 11 | PR = "r3" |
12 | 12 | ||
13 | MTRACE = "" | 13 | MTRACE = "" |
14 | MTRACE_libc-glibc = "libc-mtrace" | 14 | MTRACE:libc-glibc = "libc-mtrace" |
15 | 15 | ||
16 | STRACE = "strace" | 16 | STRACE = "strace" |
17 | STRACE_riscv32 = "" | 17 | STRACE:riscv32 = "" |
18 | 18 | ||
19 | RDEPENDS_${PN} = "\ | 19 | RDEPENDS:${PN} = "\ |
20 | gdb \ | 20 | gdb \ |
21 | gdbserver \ | 21 | gdbserver \ |
22 | ${MTRACE} \ | 22 | ${MTRACE} \ |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 194dca76d0..663a9cd57b 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | |||
@@ -12,11 +12,11 @@ inherit packagegroup | |||
12 | 12 | ||
13 | PROFILE_TOOLS_X = "" | 13 | PROFILE_TOOLS_X = "" |
14 | # sysprof doesn't support aarch64 and nios2 | 14 | # sysprof doesn't support aarch64 and nios2 |
15 | PROFILE_TOOLS_X_aarch64 = "" | 15 | PROFILE_TOOLS_X:aarch64 = "" |
16 | PROFILE_TOOLS_X_nios2 = "" | 16 | PROFILE_TOOLS_X:nios2 = "" |
17 | PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" | 17 | PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" |
18 | 18 | ||
19 | RRECOMMENDS_${PN} = "\ | 19 | RRECOMMENDS:${PN} = "\ |
20 | ${PERF} \ | 20 | ${PERF} \ |
21 | blktrace \ | 21 | blktrace \ |
22 | ${PROFILE_TOOLS_X} \ | 22 | ${PROFILE_TOOLS_X} \ |
@@ -27,19 +27,19 @@ PROFILETOOLS = "\ | |||
27 | powertop \ | 27 | powertop \ |
28 | " | 28 | " |
29 | PERF = "perf" | 29 | PERF = "perf" |
30 | PERF_libc-musl = "" | 30 | PERF:libc-musl = "" |
31 | PERF_libc-musl_arm = "perf" | 31 | PERF:libc-musl:arm = "perf" |
32 | PERF_riscv32 = "" | 32 | PERF:riscv32 = "" |
33 | 33 | ||
34 | # systemtap needs elfutils which is not fully buildable on some arches/libcs | 34 | # systemtap needs elfutils which is not fully buildable on some arches/libcs |
35 | SYSTEMTAP = "systemtap" | 35 | SYSTEMTAP = "systemtap" |
36 | SYSTEMTAP_libc-musl = "" | 36 | SYSTEMTAP:libc-musl = "" |
37 | SYSTEMTAP_nios2 = "" | 37 | SYSTEMTAP:nios2 = "" |
38 | SYSTEMTAP_riscv64 = "" | 38 | SYSTEMTAP:riscv64 = "" |
39 | 39 | ||
40 | LTTNGTOOLS = "lttng-tools" | 40 | LTTNGTOOLS = "lttng-tools" |
41 | LTTNGTOOLS_arc = "" | 41 | LTTNGTOOLS:arc = "" |
42 | LTTNGTOOLS_riscv32 = "" | 42 | LTTNGTOOLS:riscv32 = "" |
43 | 43 | ||
44 | BABELTRACE = "babeltrace" | 44 | BABELTRACE = "babeltrace" |
45 | BABELTRACE2 = "babeltrace2" | 45 | BABELTRACE2 = "babeltrace2" |
@@ -47,22 +47,22 @@ BABELTRACE2 = "babeltrace2" | |||
47 | # valgrind does not work on the following configurations/architectures | 47 | # valgrind does not work on the following configurations/architectures |
48 | 48 | ||
49 | VALGRIND = "valgrind" | 49 | VALGRIND = "valgrind" |
50 | VALGRIND_libc-musl = "" | 50 | VALGRIND:libc-musl = "" |
51 | VALGRIND_mipsarch = "" | 51 | VALGRIND:mipsarch = "" |
52 | VALGRIND_nios2 = "" | 52 | VALGRIND:nios2 = "" |
53 | VALGRIND_arc = "" | 53 | VALGRIND:arc = "" |
54 | VALGRIND_armv4 = "" | 54 | VALGRIND:armv4 = "" |
55 | VALGRIND_armv5 = "" | 55 | VALGRIND:armv5 = "" |
56 | VALGRIND_armv6 = "" | 56 | VALGRIND:armv6 = "" |
57 | VALGRIND_armeb = "" | 57 | VALGRIND:armeb = "" |
58 | VALGRIND_aarch64 = "" | 58 | VALGRIND:aarch64 = "" |
59 | VALGRIND_riscv64 = "" | 59 | VALGRIND:riscv64 = "" |
60 | VALGRIND_riscv32 = "" | 60 | VALGRIND:riscv32 = "" |
61 | VALGRIND_powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', '', 'valgrind', d)}" | 61 | VALGRIND:powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', '', 'valgrind', d)}" |
62 | VALGRIND_linux-gnux32 = "" | 62 | VALGRIND:linux-gnux32 = "" |
63 | VALGRIND_linux-gnun32 = "" | 63 | VALGRIND:linux-gnun32 = "" |
64 | 64 | ||
65 | RDEPENDS_${PN} = "\ | 65 | RDEPENDS:${PN} = "\ |
66 | ${PROFILETOOLS} \ | 66 | ${PROFILETOOLS} \ |
67 | ${LTTNGTOOLS} \ | 67 | ${LTTNGTOOLS} \ |
68 | ${BABELTRACE} \ | 68 | ${BABELTRACE} \ |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index 015810cb6b..94405fd8fe 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | |||
@@ -12,14 +12,14 @@ inherit packagegroup | |||
12 | 12 | ||
13 | # kexec-tools doesn't work on e5500-64b, microblaze and nios2 yet | 13 | # kexec-tools doesn't work on e5500-64b, microblaze and nios2 yet |
14 | KEXECTOOLS ?= "kexec" | 14 | KEXECTOOLS ?= "kexec" |
15 | KEXECTOOLS_e5500-64b ?= "" | 15 | KEXECTOOLS:e5500-64b ?= "" |
16 | KEXECTOOLS_microblaze ?= "" | 16 | KEXECTOOLS:microblaze ?= "" |
17 | KEXECTOOLS_nios2 ?= "" | 17 | KEXECTOOLS:nios2 ?= "" |
18 | KEXECTOOLS_riscv64 ?= "" | 18 | KEXECTOOLS:riscv64 ?= "" |
19 | KEXECTOOLS_riscv32 ?= "" | 19 | KEXECTOOLS:riscv32 ?= "" |
20 | 20 | ||
21 | GSTEXAMPLES ?= "gst-examples" | 21 | GSTEXAMPLES ?= "gst-examples" |
22 | GSTEXAMPLES_riscv64 = "" | 22 | GSTEXAMPLES:riscv64 = "" |
23 | 23 | ||
24 | X11GLTOOLS = "\ | 24 | X11GLTOOLS = "\ |
25 | mesa-demos \ | 25 | mesa-demos \ |
@@ -37,7 +37,7 @@ X11TOOLS = "\ | |||
37 | xprop \ | 37 | xprop \ |
38 | " | 38 | " |
39 | 39 | ||
40 | RDEPENDS_${PN} = "\ | 40 | RDEPENDS:${PN} = "\ |
41 | blktool \ | 41 | blktool \ |
42 | ${KEXECTOOLS} \ | 42 | ${KEXECTOOLS} \ |
43 | alsa-utils-amixer \ | 43 | alsa-utils-amixer \ |
diff --git a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb index 3b430c0814..49c075eb11 100644 --- a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb +++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb | |||
@@ -10,7 +10,7 @@ BINUTILS = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" | |||
10 | GCC = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 10 | GCC = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
11 | GDB = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 11 | GDB = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
12 | 12 | ||
13 | RDEPENDS_${PN} = "\ | 13 | RDEPENDS:${PN} = "\ |
14 | ${@all_multilib_tune_values(d, 'BINUTILS')} \ | 14 | ${@all_multilib_tune_values(d, 'BINUTILS')} \ |
15 | ${@all_multilib_tune_values(d, 'GCC')} \ | 15 | ${@all_multilib_tune_values(d, 'GCC')} \ |
16 | ${@all_multilib_tune_values(d, 'GDB')} \ | 16 | ${@all_multilib_tune_values(d, 'GDB')} \ |
diff --git a/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb index 3daace1a40..d0596efe7a 100644 --- a/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb +++ b/meta/recipes-core/packagegroups/packagegroup-go-cross-canadian.bb | |||
@@ -7,6 +7,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" | |||
7 | 7 | ||
8 | GO = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 8 | GO = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
9 | 9 | ||
10 | RDEPENDS_${PN} = " \ | 10 | RDEPENDS:${PN} = " \ |
11 | ${@all_multilib_tune_values(d, 'GO')} \ | 11 | ${@all_multilib_tune_values(d, 'GO')} \ |
12 | " | 12 | " |
diff --git a/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb index 9a52b0781c..61629d273c 100644 --- a/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-go-sdk-target.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Target packages for the Go SDK" | |||
2 | 2 | ||
3 | inherit packagegroup goarch | 3 | inherit packagegroup goarch |
4 | 4 | ||
5 | RDEPENDS_${PN} = " \ | 5 | RDEPENDS:${PN} = " \ |
6 | go \ | 6 | go \ |
7 | go-runtime \ | 7 | go-runtime \ |
8 | go-runtime-dev \ | 8 | go-runtime-dev \ |
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 9a70b189a4..9523aadd15 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | |||
@@ -24,7 +24,7 @@ PACKAGES = "\ | |||
24 | packagegroup-self-hosted-host-tools \ | 24 | packagegroup-self-hosted-host-tools \ |
25 | " | 25 | " |
26 | 26 | ||
27 | RDEPENDS_packagegroup-self-hosted = "\ | 27 | RDEPENDS:packagegroup-self-hosted = "\ |
28 | packagegroup-self-hosted-debug \ | 28 | packagegroup-self-hosted-debug \ |
29 | packagegroup-self-hosted-sdk \ | 29 | packagegroup-self-hosted-sdk \ |
30 | packagegroup-self-hosted-extended \ | 30 | packagegroup-self-hosted-extended \ |
@@ -32,7 +32,7 @@ RDEPENDS_packagegroup-self-hosted = "\ | |||
32 | packagegroup-self-hosted-host-tools \ | 32 | packagegroup-self-hosted-host-tools \ |
33 | " | 33 | " |
34 | 34 | ||
35 | RDEPENDS_packagegroup-self-hosted-host-tools = "\ | 35 | RDEPENDS:packagegroup-self-hosted-host-tools = "\ |
36 | e2fsprogs \ | 36 | e2fsprogs \ |
37 | e2fsprogs-e2fsck \ | 37 | e2fsprogs-e2fsck \ |
38 | e2fsprogs-mke2fs \ | 38 | e2fsprogs-mke2fs \ |
@@ -49,9 +49,9 @@ RDEPENDS_packagegroup-self-hosted-host-tools = "\ | |||
49 | screen \ | 49 | screen \ |
50 | " | 50 | " |
51 | PSEUDO = "pseudo" | 51 | PSEUDO = "pseudo" |
52 | PSEUDO_libc-musl = "" | 52 | PSEUDO:libc-musl = "" |
53 | 53 | ||
54 | RRECOMMENDS_packagegroup-self-hosted-host-tools = "\ | 54 | RRECOMMENDS:packagegroup-self-hosted-host-tools = "\ |
55 | kernel-module-tun \ | 55 | kernel-module-tun \ |
56 | kernel-module-iptable-raw \ | 56 | kernel-module-iptable-raw \ |
57 | kernel-module-iptable-nat \ | 57 | kernel-module-iptable-nat \ |
@@ -59,7 +59,7 @@ RRECOMMENDS_packagegroup-self-hosted-host-tools = "\ | |||
59 | kernel-module-iptable-filter \ | 59 | kernel-module-iptable-filter \ |
60 | " | 60 | " |
61 | 61 | ||
62 | RDEPENDS_packagegroup-self-hosted-sdk = "\ | 62 | RDEPENDS:packagegroup-self-hosted-sdk = "\ |
63 | autoconf \ | 63 | autoconf \ |
64 | automake \ | 64 | automake \ |
65 | binutils \ | 65 | binutils \ |
@@ -87,18 +87,18 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ | |||
87 | quilt \ | 87 | quilt \ |
88 | sed \ | 88 | sed \ |
89 | " | 89 | " |
90 | RDEPENDS_packagegroup-self-hosted-sdk_append_mingw32 = "\ | 90 | RDEPENDS:packagegroup-self-hosted-sdk:append:mingw32 = "\ |
91 | libssp \ | 91 | libssp \ |
92 | libssp-dev \ | 92 | libssp-dev \ |
93 | libssp-staticdev \ | 93 | libssp-staticdev \ |
94 | " | 94 | " |
95 | # rpcsvc-proto: for rpcgen | 95 | # rpcsvc-proto: for rpcgen |
96 | RDEPENDS_packagegroup-self-hosted-sdk_append_libc-glibc = "\ | 96 | RDEPENDS:packagegroup-self-hosted-sdk:append:libc-glibc = "\ |
97 | glibc-gconv-ibm850 \ | 97 | glibc-gconv-ibm850 \ |
98 | glibc-utils \ | 98 | glibc-utils \ |
99 | rpcsvc-proto \ | 99 | rpcsvc-proto \ |
100 | " | 100 | " |
101 | RDEPENDS_packagegroup-self-hosted-debug = " \ | 101 | RDEPENDS:packagegroup-self-hosted-debug = " \ |
102 | gdb \ | 102 | gdb \ |
103 | gdbserver \ | 103 | gdbserver \ |
104 | rsync \ | 104 | rsync \ |
@@ -106,7 +106,7 @@ RDEPENDS_packagegroup-self-hosted-debug = " \ | |||
106 | tcf-agent" | 106 | tcf-agent" |
107 | 107 | ||
108 | 108 | ||
109 | RDEPENDS_packagegroup-self-hosted-extended = "\ | 109 | RDEPENDS:packagegroup-self-hosted-extended = "\ |
110 | bzip2 \ | 110 | bzip2 \ |
111 | chrpath \ | 111 | chrpath \ |
112 | cpio \ | 112 | cpio \ |
@@ -177,7 +177,7 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ | |||
177 | " | 177 | " |
178 | 178 | ||
179 | 179 | ||
180 | RDEPENDS_packagegroup-self-hosted-graphics = "\ | 180 | RDEPENDS:packagegroup-self-hosted-graphics = "\ |
181 | builder \ | 181 | builder \ |
182 | libgl \ | 182 | libgl \ |
183 | libgl-dev \ | 183 | libgl-dev \ |
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index 59e1e3f194..e9789c4ce0 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb | |||
@@ -44,7 +44,7 @@ python __anonymous() { | |||
44 | pkgs.append(outname) | 44 | pkgs.append(outname) |
45 | localpaths.append(flocal) | 45 | localpaths.append(flocal) |
46 | 46 | ||
47 | # Set these so that we have less work to do in do_compile and do_install_append | 47 | # Set these so that we have less work to do in do_compile and do_install:append |
48 | d.setVar("SPLASH_INSTALL", " ".join(pkgs)) | 48 | d.setVar("SPLASH_INSTALL", " ".join(pkgs)) |
49 | d.setVar("SPLASH_LOCALPATHS", " ".join(localpaths)) | 49 | d.setVar("SPLASH_LOCALPATHS", " ".join(localpaths)) |
50 | for p in pkgs: | 50 | for p in pkgs: |
@@ -54,12 +54,12 @@ python __anonymous() { | |||
54 | for p in pkgs: | 54 | for p in pkgs: |
55 | ep = '%s%s' % (mlprefix, p) | 55 | ep = '%s%s' % (mlprefix, p) |
56 | epsplash = '%s%s' % (mlprefix, 'psplash') | 56 | epsplash = '%s%s' % (mlprefix, 'psplash') |
57 | d.setVar("FILES_%s" % ep, "${bindir}/%s" % p) | 57 | d.setVar("FILES:%s" % ep, "${bindir}/%s" % p) |
58 | d.setVar("ALTERNATIVE_%s" % ep, 'psplash') | 58 | d.setVar("ALTERNATIVE:%s" % ep, 'psplash') |
59 | d.setVarFlag("ALTERNATIVE_TARGET_%s" % ep, 'psplash', '${bindir}/%s' % p) | 59 | d.setVarFlag("ALTERNATIVE_TARGET_%s" % ep, 'psplash', '${bindir}/%s' % p) |
60 | d.appendVar("RDEPENDS_%s" % ep, " %s" % pn) | 60 | d.appendVar("RDEPENDS:%s" % ep, " %s" % pn) |
61 | if p == "psplash-default": | 61 | if p == "psplash-default": |
62 | d.appendVar("RRECOMMENDS_%s" % pn, " %s" % ep) | 62 | d.appendVar("RRECOMMENDS:%s" % pn, " %s" % ep) |
63 | } | 63 | } |
64 | 64 | ||
65 | S = "${WORKDIR}/git" | 65 | S = "${WORKDIR}/git" |
@@ -98,7 +98,7 @@ python do_compile () { | |||
98 | shutil.copyfile("psplash", outputfile) | 98 | shutil.copyfile("psplash", outputfile) |
99 | } | 99 | } |
100 | 100 | ||
101 | do_install_append() { | 101 | do_install:append() { |
102 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 102 | if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
103 | install -d ${D}${sysconfdir}/init.d/ | 103 | install -d ${D}${sysconfdir}/init.d/ |
104 | install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh | 104 | install -m 0755 ${WORKDIR}/psplash-init ${D}${sysconfdir}/init.d/psplash.sh |
@@ -122,9 +122,9 @@ do_install_append() { | |||
122 | } | 122 | } |
123 | 123 | ||
124 | SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" | 124 | SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" |
125 | SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start.service psplash-systemd.service', '', d)}" | 125 | SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start.service psplash-systemd.service', '', d)}" |
126 | 126 | ||
127 | INITSCRIPT_NAME = "psplash.sh" | 127 | INITSCRIPT_NAME = "psplash.sh" |
128 | INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." | 128 | INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ." |
129 | 129 | ||
130 | FILES_${PN} += "/mnt" | 130 | FILES:${PN} += "/mnt" |
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 039ffdee00..7f7f5ad2ee 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc | |||
@@ -21,13 +21,13 @@ EXTRA_AUTORECONF += "--exclude=autoheader" | |||
21 | 21 | ||
22 | LEAD_SONAME = "libreadline.so" | 22 | LEAD_SONAME = "libreadline.so" |
23 | 23 | ||
24 | do_configure_prepend () { | 24 | do_configure:prepend () { |
25 | if [ ! -e ${S}/acinclude.m4 ]; then | 25 | if [ ! -e ${S}/acinclude.m4 ]; then |
26 | cat ${S}/aclocal.m4 > ${S}/acinclude.m4 | 26 | cat ${S}/aclocal.m4 > ${S}/acinclude.m4 |
27 | fi | 27 | fi |
28 | } | 28 | } |
29 | 29 | ||
30 | do_install_append () { | 30 | do_install:append () { |
31 | # Make install doesn't properly install these | 31 | # Make install doesn't properly install these |
32 | oe_libinstall -so -C shlib libhistory ${D}${libdir} | 32 | oe_libinstall -so -C shlib libhistory ${D}${libdir} |
33 | oe_libinstall -so -C shlib libreadline ${D}${libdir} | 33 | oe_libinstall -so -C shlib libreadline ${D}${libdir} |
@@ -42,15 +42,15 @@ do_install_append () { | |||
42 | 42 | ||
43 | BBCLASSEXTEND = "native nativesdk" | 43 | BBCLASSEXTEND = "native nativesdk" |
44 | 44 | ||
45 | CONFFILES_${PN} += "${sysconfdir}/inputrc" | 45 | CONFFILES:${PN} += "${sysconfdir}/inputrc" |
46 | 46 | ||
47 | inherit update-alternatives | 47 | inherit update-alternatives |
48 | 48 | ||
49 | ALTERNATIVE_PRIORITY = "100" | 49 | ALTERNATIVE_PRIORITY = "100" |
50 | ALTERNATIVE_${PN}-doc = "history.3" | 50 | ALTERNATIVE:${PN}-doc = "history.3" |
51 | ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" | 51 | ALTERNATIVE_LINK_NAME[history.3] = "${mandir}/man3/history.3" |
52 | 52 | ||
53 | # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs | 53 | # OpenSuse injects versions into libreadline leading to conficits between our native one and theirs |
54 | # see their spec file for where this is injected. Extra versioning is harmless so we just do the same. | 54 | # see their spec file for where this is injected. Extra versioning is harmless so we just do the same. |
55 | SRC_URI_append_class-native = " file://rl-native.map" | 55 | SRC_URI:append:class-native = " file://rl-native.map" |
56 | LDFLAGS_append_class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" | 56 | LDFLAGS:append:class-native = " -Wl,--version-script=${WORKDIR}/rl-native.map" |
diff --git a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb index 34bf431f40..72f8069e61 100644 --- a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb +++ b/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 | |||
3 | HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html" | 3 | HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html" |
4 | 4 | ||
5 | LICENSE = "GPLv2 & LGPLv2.1" | 5 | LICENSE = "GPLv2 & LGPLv2.1" |
6 | LICENSE_${PN} = "GPLv2" | 6 | LICENSE:${PN} = "GPLv2" |
7 | LICENSE_libsysfs = "LGPLv2.1" | 7 | LICENSE:libsysfs = "LGPLv2.1" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=3d06403ea54c7574a9e581c6478cc393 \ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=3d06403ea54c7574a9e581c6478cc393 \ |
9 | file://cmd/GPL;md5=d41d4e2e1e108554e0388ea4aecd8d27 \ | 9 | file://cmd/GPL;md5=d41d4e2e1e108554e0388ea4aecd8d27 \ |
10 | file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e" | 10 | file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e" |
@@ -26,6 +26,6 @@ S = "${WORKDIR}/sysfsutils-${PV}" | |||
26 | inherit autotools | 26 | inherit autotools |
27 | 27 | ||
28 | PACKAGES =+ "libsysfs" | 28 | PACKAGES =+ "libsysfs" |
29 | FILES_libsysfs = "${libdir}/lib*${SOLIBS}" | 29 | FILES:libsysfs = "${libdir}/lib*${SOLIBS}" |
30 | 30 | ||
31 | export libdir = "${base_libdir}" | 31 | export libdir = "${base_libdir}" |
diff --git a/meta/recipes-core/systemd/systemd-boot_249.1.bb b/meta/recipes-core/systemd/systemd-boot_249.1.bb index 2c0bec4eda..d767b5bf8d 100644 --- a/meta/recipes-core/systemd/systemd-boot_249.1.bb +++ b/meta/recipes-core/systemd/systemd-boot_249.1.bb | |||
@@ -8,10 +8,10 @@ DEPENDS = "intltool-native libcap util-linux gnu-efi gperf-native python3-jinja2 | |||
8 | inherit meson pkgconfig gettext | 8 | inherit meson pkgconfig gettext |
9 | inherit deploy | 9 | inherit deploy |
10 | 10 | ||
11 | LDFLAGS_prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " | 11 | LDFLAGS:prepend = "${@ " ".join(d.getVar('LD').split()[1:])} " |
12 | 12 | ||
13 | do_write_config[vardeps] += "CC OBJCOPY" | 13 | do_write_config[vardeps] += "CC OBJCOPY" |
14 | do_write_config_append() { | 14 | do_write_config:append() { |
15 | cat >${WORKDIR}/meson-${PN}.cross <<EOF | 15 | cat >${WORKDIR}/meson-${PN}.cross <<EOF |
16 | [binaries] | 16 | [binaries] |
17 | efi_cc = ${@meson_array('CC', d)} | 17 | efi_cc = ${@meson_array('CC', d)} |
@@ -41,15 +41,15 @@ python __anonymous () { | |||
41 | d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix) | 41 | d.setVar("SYSTEMD_BOOT_IMAGE_PREFIX", prefix) |
42 | } | 42 | } |
43 | 43 | ||
44 | FILES_${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}" | 44 | FILES:${PN} = "${EFI_FILES_PATH}/${SYSTEMD_BOOT_IMAGE}" |
45 | 45 | ||
46 | RDEPENDS_${PN} += "virtual/systemd-bootconf" | 46 | RDEPENDS:${PN} += "virtual/systemd-bootconf" |
47 | 47 | ||
48 | # Imported from the old gummiboot recipe | 48 | # Imported from the old gummiboot recipe |
49 | TUNE_CCARGS_remove = "-mfpmath=sse" | 49 | TUNE_CCARGS:remove = "-mfpmath=sse" |
50 | 50 | ||
51 | COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*)-linux" | 51 | COMPATIBLE_HOST = "(aarch64.*|arm.*|x86_64.*|i.86.*)-linux" |
52 | COMPATIBLE_HOST_x86-x32 = "null" | 52 | COMPATIBLE_HOST:x86-x32 = "null" |
53 | 53 | ||
54 | do_compile() { | 54 | do_compile() { |
55 | ninja \ | 55 | ninja \ |
diff --git a/meta/recipes-core/systemd/systemd-bootconf_1.00.bb b/meta/recipes-core/systemd/systemd-bootconf_1.00.bb index d13b8c518f..12c4447f37 100644 --- a/meta/recipes-core/systemd/systemd-bootconf_1.00.bb +++ b/meta/recipes-core/systemd/systemd-bootconf_1.00.bb | |||
@@ -2,7 +2,7 @@ LICENSE = "MIT" | |||
2 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 2 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
3 | SUMMARY = "Basic systemd-boot configuration files" | 3 | SUMMARY = "Basic systemd-boot configuration files" |
4 | 4 | ||
5 | RPROVIDES_${PN} += "virtual/systemd-bootconf" | 5 | RPROVIDES:${PN} += "virtual/systemd-bootconf" |
6 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 6 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
7 | 7 | ||
8 | inherit systemd-boot-cfg | 8 | inherit systemd-boot-cfg |
@@ -12,7 +12,7 @@ S = "${WORKDIR}" | |||
12 | LABELS = "boot" | 12 | LABELS = "boot" |
13 | 13 | ||
14 | ROOT ?= "root=/dev/sda2" | 14 | ROOT ?= "root=/dev/sda2" |
15 | APPEND_append = " ${ROOT}" | 15 | APPEND:append = " ${ROOT}" |
16 | 16 | ||
17 | python do_configure() { | 17 | python do_configure() { |
18 | bb.build.exec_func('build_efi_cfg', d) | 18 | bb.build.exec_func('build_efi_cfg', d) |
@@ -29,4 +29,4 @@ do_install() { | |||
29 | install *.conf ${D}/boot/loader/entries/ | 29 | install *.conf ${D}/boot/loader/entries/ |
30 | } | 30 | } |
31 | 31 | ||
32 | FILES_${PN} = "/boot/loader/* /boot/loader/entries/*" | 32 | FILES:${PN} = "/boot/loader/* /boot/loader/entries/*" |
diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb index 361dc1cbb4..f7505f1eb8 100644 --- a/meta/recipes-core/systemd/systemd-compat-units.bb +++ b/meta/recipes-core/systemd/systemd-compat-units.bb | |||
@@ -12,7 +12,7 @@ inherit features_check | |||
12 | 12 | ||
13 | INHIBIT_DEFAULT_DEPS = "1" | 13 | INHIBIT_DEFAULT_DEPS = "1" |
14 | 14 | ||
15 | ALLOW_EMPTY_${PN} = "1" | 15 | ALLOW_EMPTY:${PN} = "1" |
16 | 16 | ||
17 | REQUIRED_DISTRO_FEATURES = "systemd" | 17 | REQUIRED_DISTRO_FEATURES = "systemd" |
18 | 18 | ||
@@ -25,7 +25,7 @@ SYSTEMD_DISABLED_SYSV_SERVICES = " \ | |||
25 | syslog.busybox \ | 25 | syslog.busybox \ |
26 | " | 26 | " |
27 | 27 | ||
28 | pkg_postinst_${PN} () { | 28 | pkg_postinst:${PN} () { |
29 | 29 | ||
30 | cd $D${sysconfdir}/init.d || exit 0 | 30 | cd $D${sysconfdir}/init.d || exit 0 |
31 | 31 | ||
@@ -46,4 +46,4 @@ pkg_postinst_${PN} () { | |||
46 | echo | 46 | echo |
47 | } | 47 | } |
48 | 48 | ||
49 | RDEPENDS_${PN} = "systemd" | 49 | RDEPENDS:${PN} = "systemd" |
diff --git a/meta/recipes-core/systemd/systemd-conf_1.0.bb b/meta/recipes-core/systemd/systemd-conf_1.0.bb index 235923be85..61ce7939d3 100644 --- a/meta/recipes-core/systemd/systemd-conf_1.0.bb +++ b/meta/recipes-core/systemd/systemd-conf_1.0.bb | |||
@@ -29,13 +29,13 @@ do_install() { | |||
29 | } | 29 | } |
30 | 30 | ||
31 | # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 | 31 | # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 |
32 | do_install_append_qemuall() { | 32 | do_install:append:qemuall() { |
33 | install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf | 33 | install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf |
34 | } | 34 | } |
35 | 35 | ||
36 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 36 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
37 | 37 | ||
38 | FILES_${PN} = "\ | 38 | FILES:${PN} = "\ |
39 | ${systemd_unitdir}/journald.conf.d/ \ | 39 | ${systemd_unitdir}/journald.conf.d/ \ |
40 | ${systemd_unitdir}/logind.conf.d/ \ | 40 | ${systemd_unitdir}/logind.conf.d/ \ |
41 | ${systemd_unitdir}/system.conf.d/ \ | 41 | ${systemd_unitdir}/system.conf.d/ \ |
diff --git a/meta/recipes-core/systemd/systemd-machine-units_1.0.bb b/meta/recipes-core/systemd/systemd-machine-units_1.0.bb index 02756f43d7..12f27d6ae3 100644 --- a/meta/recipes-core/systemd/systemd-machine-units_1.0.bb +++ b/meta/recipes-core/systemd/systemd-machine-units_1.0.bb | |||
@@ -8,6 +8,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
8 | PR = "r19" | 8 | PR = "r19" |
9 | 9 | ||
10 | inherit systemd | 10 | inherit systemd |
11 | SYSTEMD_SERVICE_${PN} = "" | 11 | SYSTEMD_SERVICE:${PN} = "" |
12 | 12 | ||
13 | ALLOW_EMPTY_${PN} = "1" | 13 | ALLOW_EMPTY:${PN} = "1" |
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb index 34defeb3b1..92d35ebcf7 100644 --- a/meta/recipes-core/systemd/systemd-serialgetty.bb +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb | |||
@@ -46,7 +46,7 @@ do_install() { | |||
46 | } | 46 | } |
47 | 47 | ||
48 | # This is a machine specific file | 48 | # This is a machine specific file |
49 | FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}" | 49 | FILES:${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}" |
50 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 50 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
51 | 51 | ||
52 | ALLOW_EMPTY_${PN} = "1" | 52 | ALLOW_EMPTY:${PN} = "1" |
diff --git a/meta/recipes-core/systemd/systemd_249.1.bb b/meta/recipes-core/systemd/systemd_249.1.bb index 9bfb12249c..5d472027c9 100644 --- a/meta/recipes-core/systemd/systemd_249.1.bb +++ b/meta/recipes-core/systemd/systemd_249.1.bb | |||
@@ -28,7 +28,7 @@ SRC_URI += "file://touchscreen.rules \ | |||
28 | " | 28 | " |
29 | 29 | ||
30 | # patches needed by musl | 30 | # patches needed by musl |
31 | SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}" | 31 | SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}" |
32 | SRC_URI_MUSL = "\ | 32 | SRC_URI_MUSL = "\ |
33 | file://0002-don-t-use-glibc-specific-qsort_r.patch \ | 33 | file://0002-don-t-use-glibc-specific-qsort_r.patch \ |
34 | file://0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch \ | 34 | file://0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch \ |
@@ -96,7 +96,7 @@ PACKAGECONFIG ??= " \ | |||
96 | xz \ | 96 | xz \ |
97 | " | 97 | " |
98 | 98 | ||
99 | PACKAGECONFIG_remove_libc-musl = " \ | 99 | PACKAGECONFIG:remove:libc-musl = " \ |
100 | gshadow \ | 100 | gshadow \ |
101 | idn \ | 101 | idn \ |
102 | localed \ | 102 | localed \ |
@@ -109,7 +109,7 @@ PACKAGECONFIG_remove_libc-musl = " \ | |||
109 | utmp \ | 109 | utmp \ |
110 | " | 110 | " |
111 | 111 | ||
112 | CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0 " | 112 | CFLAGS:append:libc-musl = " -D__UAPI_DEF_ETHHDR=0 " |
113 | 113 | ||
114 | # Some of the dependencies are weak-style recommends - if not available at runtime, | 114 | # Some of the dependencies are weak-style recommends - if not available at runtime, |
115 | # systemd won't fail but the library-related feature will be skipped with a warning. | 115 | # systemd won't fail but the library-related feature will be skipped with a warning. |
@@ -334,7 +334,7 @@ do_install() { | |||
334 | install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh | 334 | install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh |
335 | } | 335 | } |
336 | 336 | ||
337 | python populate_packages_prepend (){ | 337 | python populate_packages:prepend (){ |
338 | systemdlibdir = d.getVar("rootlibdir") | 338 | systemdlibdir = d.getVar("rootlibdir") |
339 | do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) | 339 | do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) |
340 | } | 340 | } |
@@ -359,96 +359,96 @@ PACKAGE_BEFORE_PN = "\ | |||
359 | udev-hwdb \ | 359 | udev-hwdb \ |
360 | " | 360 | " |
361 | 361 | ||
362 | SUMMARY_${PN}-container = "Tools for containers and VMs" | 362 | SUMMARY:${PN}-container = "Tools for containers and VMs" |
363 | DESCRIPTION_${PN}-container = "Systemd tools to spawn and manage containers and virtual machines." | 363 | DESCRIPTION:${PN}-container = "Systemd tools to spawn and manage containers and virtual machines." |
364 | 364 | ||
365 | SUMMARY_${PN}-journal-gatewayd = "HTTP server for journal events" | 365 | SUMMARY:${PN}-journal-gatewayd = "HTTP server for journal events" |
366 | 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." | 366 | 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." |
367 | 367 | ||
368 | SUMMARY_${PN}-journal-upload = "Send journal messages over the network" | 368 | SUMMARY:${PN}-journal-upload = "Send journal messages over the network" |
369 | DESCRIPTION_${PN}-journal-upload = "systemd-journal-upload uploads journal entries to a specified URL." | 369 | DESCRIPTION:${PN}-journal-upload = "systemd-journal-upload uploads journal entries to a specified URL." |
370 | 370 | ||
371 | SUMMARY_${PN}-journal-remote = "Receive journal messages over the network" | 371 | SUMMARY:${PN}-journal-remote = "Receive journal messages over the network" |
372 | DESCRIPTION_${PN}-journal-remote = "systemd-journal-remote is a command to receive serialized journal events and store them to journal files." | 372 | DESCRIPTION:${PN}-journal-remote = "systemd-journal-remote is a command to receive serialized journal events and store them to journal files." |
373 | 373 | ||
374 | SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)} \ | 374 | SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)} \ |
375 | ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \ | 375 | ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \ |
376 | ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ | 376 | ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ |
377 | ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ | 377 | ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ |
378 | " | 378 | " |
379 | SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" | 379 | SYSTEMD_SERVICE:${PN}-binfmt = "systemd-binfmt.service" |
380 | 380 | ||
381 | USERADD_PACKAGES = "${PN} ${PN}-extra-utils \ | 381 | USERADD_PACKAGES = "${PN} ${PN}-extra-utils \ |
382 | ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gateway', '', d)} \ | 382 | ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gateway', '', d)} \ |
383 | ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ | 383 | ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \ |
384 | ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ | 384 | ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \ |
385 | " | 385 | " |
386 | GROUPADD_PARAM_${PN} = "-r systemd-journal;" | 386 | GROUPADD_PARAM:${PN} = "-r systemd-journal;" |
387 | GROUPADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}" | 387 | GROUPADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}" |
388 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}" | 388 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}" |
389 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /sbin/nologin systemd-network;', '', d)}" | 389 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /sbin/nologin systemd-network;', '', d)}" |
390 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}" | 390 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}" |
391 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /sbin/nologin systemd-resolve;', '', d)}" | 391 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /sbin/nologin systemd-resolve;', '', d)}" |
392 | USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /sbin/nologin systemd-timesync;', '', d)}" | 392 | USERADD_PARAM:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /sbin/nologin systemd-timesync;', '', d)}" |
393 | USERADD_PARAM_${PN}-extra-utils = "--system -d / -M --shell /sbin/nologin systemd-bus-proxy" | 393 | USERADD_PARAM:${PN}-extra-utils = "--system -d / -M --shell /sbin/nologin systemd-bus-proxy" |
394 | USERADD_PARAM_${PN}-journal-gateway = "--system -d / -M --shell /sbin/nologin systemd-journal-gateway" | 394 | USERADD_PARAM:${PN}-journal-gateway = "--system -d / -M --shell /sbin/nologin systemd-journal-gateway" |
395 | USERADD_PARAM_${PN}-journal-remote = "--system -d / -M --shell /sbin/nologin systemd-journal-remote" | 395 | USERADD_PARAM:${PN}-journal-remote = "--system -d / -M --shell /sbin/nologin systemd-journal-remote" |
396 | USERADD_PARAM_${PN}-journal-upload = "--system -d / -M --shell /sbin/nologin systemd-journal-upload" | 396 | USERADD_PARAM:${PN}-journal-upload = "--system -d / -M --shell /sbin/nologin systemd-journal-upload" |
397 | 397 | ||
398 | FILES_${PN}-analyze = "${bindir}/systemd-analyze" | 398 | FILES:${PN}-analyze = "${bindir}/systemd-analyze" |
399 | 399 | ||
400 | FILES_${PN}-initramfs = "/init" | 400 | FILES:${PN}-initramfs = "/init" |
401 | RDEPENDS_${PN}-initramfs = "${PN}" | 401 | RDEPENDS:${PN}-initramfs = "${PN}" |
402 | 402 | ||
403 | FILES_${PN}-gui = "${bindir}/systemadm" | 403 | FILES:${PN}-gui = "${bindir}/systemadm" |
404 | 404 | ||
405 | FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ | 405 | FILES:${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \ |
406 | ${systemd_unitdir}/system/systemd-vconsole-setup.service \ | 406 | ${systemd_unitdir}/system/systemd-vconsole-setup.service \ |
407 | ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service" | 407 | ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service" |
408 | 408 | ||
409 | RDEPENDS_${PN}-kernel-install += "bash" | 409 | RDEPENDS:${PN}-kernel-install += "bash" |
410 | FILES_${PN}-kernel-install = "${bindir}/kernel-install \ | 410 | FILES:${PN}-kernel-install = "${bindir}/kernel-install \ |
411 | ${sysconfdir}/kernel/ \ | 411 | ${sysconfdir}/kernel/ \ |
412 | ${exec_prefix}/lib/kernel \ | 412 | ${exec_prefix}/lib/kernel \ |
413 | " | 413 | " |
414 | FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ | 414 | FILES:${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ |
415 | " | 415 | " |
416 | 416 | ||
417 | FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" | 417 | FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" |
418 | 418 | ||
419 | FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ | 419 | FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ |
420 | ${exec_prefix}/lib/binfmt.d \ | 420 | ${exec_prefix}/lib/binfmt.d \ |
421 | ${rootlibexecdir}/systemd/systemd-binfmt \ | 421 | ${rootlibexecdir}/systemd/systemd-binfmt \ |
422 | ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \ | 422 | ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \ |
423 | ${systemd_unitdir}/system/systemd-binfmt.service" | 423 | ${systemd_unitdir}/system/systemd-binfmt.service" |
424 | RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc" | 424 | RRECOMMENDS:${PN}-binfmt = "kernel-module-binfmt-misc" |
425 | 425 | ||
426 | RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" | 426 | RRECOMMENDS:${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" |
427 | 427 | ||
428 | 428 | ||
429 | FILES_${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \ | 429 | FILES:${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \ |
430 | ${systemd_system_unitdir}/systemd-journal-gatewayd.service \ | 430 | ${systemd_system_unitdir}/systemd-journal-gatewayd.service \ |
431 | ${systemd_system_unitdir}/systemd-journal-gatewayd.socket \ | 431 | ${systemd_system_unitdir}/systemd-journal-gatewayd.socket \ |
432 | ${systemd_system_unitdir}/sockets.target.wants/systemd-journal-gatewayd.socket \ | 432 | ${systemd_system_unitdir}/sockets.target.wants/systemd-journal-gatewayd.socket \ |
433 | ${datadir}/systemd/gatewayd/browse.html \ | 433 | ${datadir}/systemd/gatewayd/browse.html \ |
434 | " | 434 | " |
435 | SYSTEMD_SERVICE_${PN}-journal-gatewayd = "systemd-journal-gatewayd.socket" | 435 | SYSTEMD_SERVICE:${PN}-journal-gatewayd = "systemd-journal-gatewayd.socket" |
436 | 436 | ||
437 | FILES_${PN}-journal-upload = "${rootlibexecdir}/systemd/systemd-journal-upload \ | 437 | FILES:${PN}-journal-upload = "${rootlibexecdir}/systemd/systemd-journal-upload \ |
438 | ${systemd_system_unitdir}/systemd-journal-upload.service \ | 438 | ${systemd_system_unitdir}/systemd-journal-upload.service \ |
439 | ${sysconfdir}/systemd/journal-upload.conf \ | 439 | ${sysconfdir}/systemd/journal-upload.conf \ |
440 | " | 440 | " |
441 | SYSTEMD_SERVICE_${PN}-journal-upload = "systemd-journal-upload.service" | 441 | SYSTEMD_SERVICE:${PN}-journal-upload = "systemd-journal-upload.service" |
442 | 442 | ||
443 | FILES_${PN}-journal-remote = "${rootlibexecdir}/systemd/systemd-journal-remote \ | 443 | FILES:${PN}-journal-remote = "${rootlibexecdir}/systemd/systemd-journal-remote \ |
444 | ${sysconfdir}/systemd/journal-remote.conf \ | 444 | ${sysconfdir}/systemd/journal-remote.conf \ |
445 | ${systemd_system_unitdir}/systemd-journal-remote.service \ | 445 | ${systemd_system_unitdir}/systemd-journal-remote.service \ |
446 | ${systemd_system_unitdir}/systemd-journal-remote.socket \ | 446 | ${systemd_system_unitdir}/systemd-journal-remote.socket \ |
447 | " | 447 | " |
448 | SYSTEMD_SERVICE_${PN}-journal-remote = "systemd-journal-remote.socket" | 448 | SYSTEMD_SERVICE:${PN}-journal-remote = "systemd-journal-remote.socket" |
449 | 449 | ||
450 | 450 | ||
451 | FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ | 451 | FILES:${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \ |
452 | ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ | 452 | ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \ |
453 | ${sysconfdir}/systemd/system/multi-user.target.wants/machines.target \ | 453 | ${sysconfdir}/systemd/system/multi-user.target.wants/machines.target \ |
454 | ${base_bindir}/machinectl \ | 454 | ${base_bindir}/machinectl \ |
@@ -484,7 +484,7 @@ FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c | |||
484 | " | 484 | " |
485 | 485 | ||
486 | # "machinectl import-tar" uses "tar --numeric-owner", not supported by busybox. | 486 | # "machinectl import-tar" uses "tar --numeric-owner", not supported by busybox. |
487 | RRECOMMENDS_${PN}-container += "\ | 487 | RRECOMMENDS:${PN}-container += "\ |
488 | ${PN}-journal-gatewayd \ | 488 | ${PN}-journal-gatewayd \ |
489 | ${PN}-journal-remote \ | 489 | ${PN}-journal-remote \ |
490 | ${PN}-journal-upload \ | 490 | ${PN}-journal-upload \ |
@@ -494,7 +494,7 @@ RRECOMMENDS_${PN}-container += "\ | |||
494 | tar \ | 494 | tar \ |
495 | " | 495 | " |
496 | 496 | ||
497 | FILES_${PN}-extra-utils = "\ | 497 | FILES:${PN}-extra-utils = "\ |
498 | ${base_bindir}/systemd-escape \ | 498 | ${base_bindir}/systemd-escape \ |
499 | ${base_bindir}/systemd-inhibit \ | 499 | ${base_bindir}/systemd-inhibit \ |
500 | ${bindir}/systemd-detect-virt \ | 500 | ${bindir}/systemd-detect-virt \ |
@@ -538,14 +538,14 @@ FILES_${PN}-extra-utils = "\ | |||
538 | ${rootlibexecdir}/systemd/systemd-cgroups-agent \ | 538 | ${rootlibexecdir}/systemd/systemd-cgroups-agent \ |
539 | " | 539 | " |
540 | 540 | ||
541 | FILES_${PN}-udev-rules = "\ | 541 | FILES:${PN}-udev-rules = "\ |
542 | ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \ | 542 | ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \ |
543 | ${rootlibexecdir}/udev/rules.d/71-seat.rules \ | 543 | ${rootlibexecdir}/udev/rules.d/71-seat.rules \ |
544 | ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \ | 544 | ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \ |
545 | ${rootlibexecdir}/udev/rules.d/99-systemd.rules \ | 545 | ${rootlibexecdir}/udev/rules.d/99-systemd.rules \ |
546 | " | 546 | " |
547 | 547 | ||
548 | CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \ | 548 | CONFFILES:${PN} = "${sysconfdir}/systemd/coredump.conf \ |
549 | ${sysconfdir}/systemd/journald.conf \ | 549 | ${sysconfdir}/systemd/journald.conf \ |
550 | ${sysconfdir}/systemd/logind.conf \ | 550 | ${sysconfdir}/systemd/logind.conf \ |
551 | ${sysconfdir}/systemd/networkd.conf \ | 551 | ${sysconfdir}/systemd/networkd.conf \ |
@@ -557,7 +557,7 @@ CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \ | |||
557 | ${sysconfdir}/systemd/user.conf \ | 557 | ${sysconfdir}/systemd/user.conf \ |
558 | " | 558 | " |
559 | 559 | ||
560 | FILES_${PN} = " ${base_bindir}/* \ | 560 | FILES:${PN} = " ${base_bindir}/* \ |
561 | ${base_sbindir}/shutdown \ | 561 | ${base_sbindir}/shutdown \ |
562 | ${base_sbindir}/halt \ | 562 | ${base_sbindir}/halt \ |
563 | ${base_sbindir}/poweroff \ | 563 | ${base_sbindir}/poweroff \ |
@@ -619,13 +619,13 @@ FILES_${PN} = " ${base_bindir}/* \ | |||
619 | ${datadir}/dbus-1/system.d/org.freedesktop.oom1.conf \ | 619 | ${datadir}/dbus-1/system.d/org.freedesktop.oom1.conf \ |
620 | " | 620 | " |
621 | 621 | ||
622 | FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" | 622 | FILES:${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" |
623 | 623 | ||
624 | RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck" | 624 | RDEPENDS:${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck" |
625 | RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" | 625 | RDEPENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" |
626 | RDEPENDS_${PN} += "volatile-binds" | 626 | RDEPENDS:${PN} += "volatile-binds" |
627 | 627 | ||
628 | RRECOMMENDS_${PN} += "systemd-extra-utils \ | 628 | RRECOMMENDS:${PN} += "systemd-extra-utils \ |
629 | udev-hwdb \ | 629 | udev-hwdb \ |
630 | e2fsprogs-e2fsck \ | 630 | e2fsprogs-e2fsck \ |
631 | kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 kernel-module-sch-fq-codel \ | 631 | kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 kernel-module-sch-fq-codel \ |
@@ -633,15 +633,15 @@ RRECOMMENDS_${PN} += "systemd-extra-utils \ | |||
633 | systemd-conf \ | 633 | systemd-conf \ |
634 | " | 634 | " |
635 | 635 | ||
636 | INSANE_SKIP_${PN} += "dev-so libdir" | 636 | INSANE_SKIP:${PN} += "dev-so libdir" |
637 | INSANE_SKIP_${PN}-dbg += "libdir" | 637 | INSANE_SKIP:${PN}-dbg += "libdir" |
638 | INSANE_SKIP_${PN}-doc += " libdir" | 638 | INSANE_SKIP:${PN}-doc += " libdir" |
639 | 639 | ||
640 | RPROVIDES_udev = "hotplug" | 640 | RPROVIDES:udev = "hotplug" |
641 | 641 | ||
642 | RDEPENDS_udev-hwdb += "udev" | 642 | RDEPENDS:udev-hwdb += "udev" |
643 | 643 | ||
644 | FILES_udev += "${base_sbindir}/udevd \ | 644 | FILES:udev += "${base_sbindir}/udevd \ |
645 | ${rootlibexecdir}/systemd/network/99-default.link \ | 645 | ${rootlibexecdir}/systemd/network/99-default.link \ |
646 | ${rootlibexecdir}/systemd/systemd-udevd \ | 646 | ${rootlibexecdir}/systemd/systemd-udevd \ |
647 | ${rootlibexecdir}/udev/accelerometer \ | 647 | ${rootlibexecdir}/udev/accelerometer \ |
@@ -700,14 +700,14 @@ FILES_udev += "${base_sbindir}/udevd \ | |||
700 | ${systemd_unitdir}/system/systemd-hwdb-update.service \ | 700 | ${systemd_unitdir}/system/systemd-hwdb-update.service \ |
701 | " | 701 | " |
702 | 702 | ||
703 | FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \ | 703 | FILES:udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \ |
704 | " | 704 | " |
705 | 705 | ||
706 | RCONFLICTS_${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}" | 706 | RCONFLICTS:${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}" |
707 | 707 | ||
708 | INITSCRIPT_PACKAGES = "udev" | 708 | INITSCRIPT_PACKAGES = "udev" |
709 | INITSCRIPT_NAME_udev = "systemd-udevd" | 709 | INITSCRIPT_NAME:udev = "systemd-udevd" |
710 | INITSCRIPT_PARAMS_udev = "start 03 S ." | 710 | INITSCRIPT_PARAMS:udev = "start 03 S ." |
711 | 711 | ||
712 | python __anonymous() { | 712 | python __anonymous() { |
713 | if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): | 713 | if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): |
@@ -720,7 +720,7 @@ python do_warn_musl() { | |||
720 | } | 720 | } |
721 | addtask warn_musl before do_configure | 721 | addtask warn_musl before do_configure |
722 | 722 | ||
723 | ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" | 723 | ALTERNATIVE:${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" |
724 | 724 | ||
725 | ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd" | 725 | ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd" |
726 | ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf" | 726 | ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf" |
@@ -746,20 +746,20 @@ ALTERNATIVE_TARGET[runlevel] = "${base_bindir}/systemctl" | |||
746 | ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" | 746 | ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" |
747 | ALTERNATIVE_PRIORITY[runlevel] ?= "300" | 747 | ALTERNATIVE_PRIORITY[runlevel] ?= "300" |
748 | 748 | ||
749 | pkg_postinst_${PN}_libc-glibc () { | 749 | pkg_postinst:${PN}:libc-glibc () { |
750 | sed -e '/^hosts:/s/\s*\<myhostname\>//' \ | 750 | sed -e '/^hosts:/s/\s*\<myhostname\>//' \ |
751 | -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \ | 751 | -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \ |
752 | -i $D${sysconfdir}/nsswitch.conf | 752 | -i $D${sysconfdir}/nsswitch.conf |
753 | } | 753 | } |
754 | 754 | ||
755 | pkg_prerm_${PN}_libc-glibc () { | 755 | pkg_prerm:${PN}:libc-glibc () { |
756 | sed -e '/^hosts:/s/\s*\<myhostname\>//' \ | 756 | sed -e '/^hosts:/s/\s*\<myhostname\>//' \ |
757 | -e '/^hosts:/s/\s*myhostname//' \ | 757 | -e '/^hosts:/s/\s*myhostname//' \ |
758 | -i $D${sysconfdir}/nsswitch.conf | 758 | -i $D${sysconfdir}/nsswitch.conf |
759 | } | 759 | } |
760 | 760 | ||
761 | PACKAGE_WRITE_DEPS += "qemu-native" | 761 | PACKAGE_WRITE_DEPS += "qemu-native" |
762 | pkg_postinst_udev-hwdb () { | 762 | pkg_postinst:udev-hwdb () { |
763 | if test -n "$D"; then | 763 | if test -n "$D"; then |
764 | $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} rootlibexecdir="${rootlibexecdir}" PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}" | 764 | $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} rootlibexecdir="${rootlibexecdir}" PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}" |
765 | else | 765 | else |
@@ -767,6 +767,6 @@ pkg_postinst_udev-hwdb () { | |||
767 | fi | 767 | fi |
768 | } | 768 | } |
769 | 769 | ||
770 | pkg_prerm_udev-hwdb () { | 770 | pkg_prerm:udev-hwdb () { |
771 | rm -f $D${sysconfdir}/udev/hwdb.bin | 771 | rm -f $D${sysconfdir}/udev/hwdb.bin |
772 | } | 772 | } |
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index d95d1a63f5..bfcf51c35a 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | |||
@@ -53,14 +53,14 @@ EOF | |||
53 | fi | 53 | fi |
54 | } | 54 | } |
55 | 55 | ||
56 | pkg_postinst_${PN} () { | 56 | pkg_postinst:${PN} () { |
57 | # run this on host and on target | 57 | # run this on host and on target |
58 | if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then | 58 | if [ "${SERIAL_CONSOLES_CHECK}" = "" ]; then |
59 | exit 0 | 59 | exit 0 |
60 | fi | 60 | fi |
61 | } | 61 | } |
62 | 62 | ||
63 | pkg_postinst_ontarget_${PN} () { | 63 | pkg_postinst_ontarget:${PN} () { |
64 | # run this on the target | 64 | # run this on the target |
65 | if [ -e /proc/consoles ]; then | 65 | if [ -e /proc/consoles ]; then |
66 | tmp="${SERIAL_CONSOLES_CHECK}" | 66 | tmp="${SERIAL_CONSOLES_CHECK}" |
@@ -84,10 +84,10 @@ fi | |||
84 | # Set PACKAGE_ARCH appropriately. | 84 | # Set PACKAGE_ARCH appropriately. |
85 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 85 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
86 | 86 | ||
87 | FILES_${PN} = "${sysconfdir}/inittab ${base_bindir}/start_getty" | 87 | FILES:${PN} = "${sysconfdir}/inittab ${base_bindir}/start_getty" |
88 | CONFFILES_${PN} = "${sysconfdir}/inittab" | 88 | CONFFILES:${PN} = "${sysconfdir}/inittab" |
89 | 89 | ||
90 | USE_VT ?= "1" | 90 | USE_VT ?= "1" |
91 | SYSVINIT_ENABLED_GETTYS ?= "1" | 91 | SYSVINIT_ENABLED_GETTYS ?= "1" |
92 | 92 | ||
93 | RCONFLICTS_${PN} = "busybox-inittab" | 93 | RCONFLICTS:${PN} = "busybox-inittab" |
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.99.bb b/meta/recipes-core/sysvinit/sysvinit_2.99.bb index e39f22a8bb..9ba9652f94 100644 --- a/meta/recipes-core/sysvinit/sysvinit_2.99.bb +++ b/meta/recipes-core/sysvinit/sysvinit_2.99.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | |||
7 | file://COPYRIGHT;endline=15;md5=a1d3b3526501d3546d530bbe6ab6cdbe \ | 7 | file://COPYRIGHT;endline=15;md5=a1d3b3526501d3546d530bbe6ab6cdbe \ |
8 | " | 8 | " |
9 | 9 | ||
10 | RDEPENDS_${PN} = "${PN}-inittab" | 10 | RDEPENDS:${PN} = "${PN}-inittab" |
11 | 11 | ||
12 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ | 12 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ |
13 | file://install.patch \ | 13 | file://install.patch \ |
@@ -26,14 +26,14 @@ SRC_URI[sha256sum] = "b05c3677bb698afe64c997968b00c49b2a9bd320ce963523230ee7ea41 | |||
26 | S = "${WORKDIR}/sysvinit-${PV}" | 26 | S = "${WORKDIR}/sysvinit-${PV}" |
27 | 27 | ||
28 | inherit update-alternatives features_check | 28 | inherit update-alternatives features_check |
29 | DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt" | 29 | DEPENDS:append = " update-rc.d-native base-passwd virtual/crypt" |
30 | do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" | 30 | do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" |
31 | 31 | ||
32 | PACKAGECONFIG[psplash-text-updates] = ",," | 32 | PACKAGECONFIG[psplash-text-updates] = ",," |
33 | 33 | ||
34 | REQUIRED_DISTRO_FEATURES = "sysvinit" | 34 | REQUIRED_DISTRO_FEATURES = "sysvinit" |
35 | 35 | ||
36 | ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" | 36 | ALTERNATIVE:${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" |
37 | 37 | ||
38 | ALTERNATIVE_PRIORITY = "200" | 38 | ALTERNATIVE_PRIORITY = "200" |
39 | 39 | ||
@@ -49,13 +49,13 @@ ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" | |||
49 | ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" | 49 | ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown" |
50 | ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" | 50 | ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff" |
51 | 51 | ||
52 | ALTERNATIVE_${PN}-pidof = "pidof" | 52 | ALTERNATIVE:${PN}-pidof = "pidof" |
53 | ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof" | 53 | ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof" |
54 | 54 | ||
55 | ALTERNATIVE_${PN}-sulogin = "sulogin" | 55 | ALTERNATIVE:${PN}-sulogin = "sulogin" |
56 | ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" | 56 | ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" |
57 | 57 | ||
58 | ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 sulogin.8 utmpdump.1" | 58 | ALTERNATIVE:${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 sulogin.8 utmpdump.1" |
59 | 59 | ||
60 | ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" | 60 | ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1" |
61 | ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" | 61 | ALTERNATIVE_LINK_NAME[lastb.1] = "${mandir}/man1/lastb.1" |
@@ -66,13 +66,13 @@ ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" | |||
66 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" | 66 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" |
67 | 67 | ||
68 | PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" | 68 | PACKAGES =+ "sysvinit-pidof sysvinit-sulogin" |
69 | FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*" | 69 | FILES:${PN} += "${base_sbindir}/* ${base_bindir}/*" |
70 | FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" | 70 | FILES:sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5" |
71 | FILES_sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" | 71 | FILES:sysvinit-sulogin = "${base_sbindir}/sulogin.sysvinit" |
72 | 72 | ||
73 | RDEPENDS_${PN} += "sysvinit-pidof initd-functions base-passwd" | 73 | RDEPENDS:${PN} += "sysvinit-pidof initd-functions base-passwd" |
74 | 74 | ||
75 | CFLAGS_prepend = "-D_GNU_SOURCE " | 75 | CFLAGS:prepend = "-D_GNU_SOURCE " |
76 | export LCRYPT = "-lcrypt" | 76 | export LCRYPT = "-lcrypt" |
77 | EXTRA_OEMAKE += "'base_bindir=${base_bindir}' \ | 77 | EXTRA_OEMAKE += "'base_bindir=${base_bindir}' \ |
78 | 'base_sbindir=${base_sbindir}' \ | 78 | 'base_sbindir=${base_sbindir}' \ |
diff --git a/meta/recipes-core/udev/eudev/permissions.rules b/meta/recipes-core/udev/eudev/permissions.rules index 205b733292..bfdff4f8ce 100644 --- a/meta/recipes-core/udev/eudev/permissions.rules +++ b/meta/recipes-core/udev/eudev/permissions.rules | |||
@@ -10,9 +10,9 @@ SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" | |||
10 | SUBSYSTEM=="net", ENV{DRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" | 10 | SUBSYSTEM=="net", ENV{DRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" |
11 | 11 | ||
12 | # devices needed to load the drivers providing them | 12 | # devices needed to load the drivers providing them |
13 | KERNEL=="tun", OPTIONS+="ignore_remove" | 13 | KERNEL=="tun", OPTIONS+="ignore:remove" |
14 | KERNEL=="ppp", OPTIONS+="ignore_remove" | 14 | KERNEL=="ppp", OPTIONS+="ignore:remove" |
15 | KERNEL=="loop[0-9]*", OPTIONS+="ignore_remove" | 15 | KERNEL=="loop[0-9]*", OPTIONS+="ignore:remove" |
16 | 16 | ||
17 | # default permissions for block devices | 17 | # default permissions for block devices |
18 | SUBSYSTEM=="block", GROUP="disk" | 18 | SUBSYSTEM=="block", GROUP="disk" |
diff --git a/meta/recipes-core/udev/eudev_3.2.10.bb b/meta/recipes-core/udev/eudev_3.2.10.bb index a5d2115f80..347495cbdb 100644 --- a/meta/recipes-core/udev/eudev_3.2.10.bb +++ b/meta/recipes-core/udev/eudev_3.2.10.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "eudev is a fork of systemd's udev" | |||
2 | HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" | 2 | HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" |
3 | 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." | 3 | 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." |
4 | LICENSE = "GPLv2.0+ & LGPL-2.1+" | 4 | LICENSE = "GPLv2.0+ & LGPL-2.1+" |
5 | LICENSE_libudev = "LGPL-2.1+" | 5 | LICENSE:libudev = "LGPL-2.1+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
7 | 7 | ||
8 | DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" | 8 | DEPENDS = "glib-2.0 glib-2.0-native gperf-native kmod libxslt-native util-linux" |
@@ -38,7 +38,7 @@ EXTRA_OECONF = " \ | |||
38 | PACKAGECONFIG ??= "hwdb" | 38 | PACKAGECONFIG ??= "hwdb" |
39 | PACKAGECONFIG[hwdb] = "--enable-hwdb,--disable-hwdb" | 39 | PACKAGECONFIG[hwdb] = "--enable-hwdb,--disable-hwdb" |
40 | 40 | ||
41 | do_install_append() { | 41 | do_install:append() { |
42 | install -d ${D}${sysconfdir}/init.d | 42 | install -d ${D}${sysconfdir}/init.d |
43 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev | 43 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev |
44 | sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev | 44 | sed -i s%@UDEVD@%${base_sbindir}/udevd% ${D}${sysconfdir}/init.d/udev |
@@ -57,7 +57,7 @@ do_install_append() { | |||
57 | ln ${D}${bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm | 57 | ln ${D}${bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm |
58 | } | 58 | } |
59 | 59 | ||
60 | do_install_prepend_class-target () { | 60 | do_install:prepend:class-target () { |
61 | # Remove references to buildmachine | 61 | # Remove references to buildmachine |
62 | sed -i -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ | 62 | sed -i -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ |
63 | ${B}/src/udev/keyboard-keys-from-name.h | 63 | ${B}/src/udev/keyboard-keys-from-name.h |
@@ -70,21 +70,21 @@ PACKAGES =+ "libudev" | |||
70 | PACKAGES =+ "eudev-hwdb" | 70 | PACKAGES =+ "eudev-hwdb" |
71 | 71 | ||
72 | 72 | ||
73 | FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm" | 73 | FILES:${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm" |
74 | FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ | 74 | FILES:${PN}-dev = "${datadir}/pkgconfig/udev.pc \ |
75 | ${includedir}/libudev.h ${libdir}/libudev.so \ | 75 | ${includedir}/libudev.h ${libdir}/libudev.so \ |
76 | ${includedir}/udev.h ${libdir}/libudev.la \ | 76 | ${includedir}/udev.h ${libdir}/libudev.la \ |
77 | ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc" | 77 | ${libdir}/libudev.a ${libdir}/pkgconfig/libudev.pc" |
78 | FILES_libudev = "${base_libdir}/libudev.so.*" | 78 | FILES:libudev = "${base_libdir}/libudev.so.*" |
79 | FILES_eudev-hwdb = "${sysconfdir}/udev/hwdb.d" | 79 | FILES:eudev-hwdb = "${sysconfdir}/udev/hwdb.d" |
80 | 80 | ||
81 | RDEPENDS_eudev-hwdb += "eudev" | 81 | RDEPENDS:eudev-hwdb += "eudev" |
82 | 82 | ||
83 | RPROVIDES_${PN} = "hotplug udev" | 83 | RPROVIDES:${PN} = "hotplug udev" |
84 | RPROVIDES_eudev-hwdb += "udev-hwdb" | 84 | RPROVIDES:eudev-hwdb += "udev-hwdb" |
85 | 85 | ||
86 | PACKAGE_WRITE_DEPS += "qemu-native" | 86 | PACKAGE_WRITE_DEPS += "qemu-native" |
87 | pkg_postinst_eudev-hwdb () { | 87 | pkg_postinst:eudev-hwdb () { |
88 | if test -n "$D"; then | 88 | if test -n "$D"; then |
89 | $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} | 89 | $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} |
90 | else | 90 | else |
@@ -92,6 +92,6 @@ pkg_postinst_eudev-hwdb () { | |||
92 | fi | 92 | fi |
93 | } | 93 | } |
94 | 94 | ||
95 | pkg_prerm_eudev-hwdb () { | 95 | pkg_prerm:eudev-hwdb () { |
96 | rm -f $D${sysconfdir}/udev/hwdb.bin | 96 | rm -f $D${sysconfdir}/udev/hwdb.bin |
97 | } | 97 | } |
diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb index 90f933d981..2ba35b0df6 100644 --- a/meta/recipes-core/udev/udev-extraconf_1.1.bb +++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb | |||
@@ -35,11 +35,11 @@ do_install() { | |||
35 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts | 35 | install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts |
36 | } | 36 | } |
37 | 37 | ||
38 | FILES_${PN} = "${sysconfdir}/udev" | 38 | FILES:${PN} = "${sysconfdir}/udev" |
39 | RDEPENDS_${PN} = "udev" | 39 | RDEPENDS:${PN} = "udev" |
40 | CONFFILES_${PN} = "${sysconfdir}/udev/mount.blacklist" | 40 | CONFFILES:${PN} = "${sysconfdir}/udev/mount.blacklist" |
41 | 41 | ||
42 | # to replace udev-extra-rules from meta-oe | 42 | # to replace udev-extra-rules from meta-oe |
43 | RPROVIDES_${PN} = "udev-extra-rules" | 43 | RPROVIDES:${PN} = "udev-extra-rules" |
44 | RREPLACES_${PN} = "udev-extra-rules" | 44 | RREPLACES:${PN} = "udev-extra-rules" |
45 | RCONFLICTS_${PN} = "udev-extra-rules" | 45 | RCONFLICTS:${PN} = "udev-extra-rules" |
diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb index 9612c491cd..5d759aed94 100644 --- a/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb +++ b/meta/recipes-core/util-linux/util-linux-libuuid_2.37.bb | |||
@@ -9,7 +9,7 @@ S = "${WORKDIR}/util-linux-${PV}" | |||
9 | EXTRA_OECONF += "--disable-all-programs --enable-libuuid" | 9 | EXTRA_OECONF += "--disable-all-programs --enable-libuuid" |
10 | LICENSE = "BSD-3-Clause" | 10 | LICENSE = "BSD-3-Clause" |
11 | 11 | ||
12 | do_install_append() { | 12 | do_install:append() { |
13 | rm -rf ${D}${datadir} ${D}${bindir} ${D}${base_bindir} ${D}${sbindir} ${D}${base_sbindir} ${D}${exec_prefix}/sbin | 13 | rm -rf ${D}${datadir} ${D}${bindir} ${D}${base_bindir} ${D}${sbindir} ${D}${base_sbindir} ${D}${exec_prefix}/sbin |
14 | } | 14 | } |
15 | 15 | ||
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 0648366baf..d07f648041 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -7,10 +7,10 @@ disk partitioning, kernel message management, filesystem creation, and system lo | |||
7 | SECTION = "base" | 7 | SECTION = "base" |
8 | 8 | ||
9 | LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" | 9 | LICENSE = "GPLv2+ & LGPLv2.1+ & BSD-3-Clause & BSD-4-Clause" |
10 | LICENSE_${PN}-libblkid = "LGPLv2.1+" | 10 | LICENSE:${PN}-libblkid = "LGPLv2.1+" |
11 | LICENSE_${PN}-libfdisk = "LGPLv2.1+" | 11 | LICENSE:${PN}-libfdisk = "LGPLv2.1+" |
12 | LICENSE_${PN}-libmount = "LGPLv2.1+" | 12 | LICENSE:${PN}-libmount = "LGPLv2.1+" |
13 | LICENSE_${PN}-libsmartcols = "LGPLv2.1+" | 13 | LICENSE:${PN}-libsmartcols = "LGPLv2.1+" |
14 | 14 | ||
15 | LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ | 15 | LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da \ |
16 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 16 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
@@ -25,7 +25,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=0fd5c050c6187d2bf0a4492b7f4e33da | |||
25 | file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ | 25 | file://libsmartcols/COPYING;md5=693bcbbe16d3a4a4b37bc906bc01cc04 \ |
26 | " | 26 | " |
27 | 27 | ||
28 | FILESEXTRAPATHS_prepend := "${THISDIR}/util-linux:" | 28 | FILESEXTRAPATHS:prepend := "${THISDIR}/util-linux:" |
29 | MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | 29 | MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" |
30 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ | 30 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \ |
31 | file://configure-sbindir.patch \ | 31 | file://configure-sbindir.patch \ |
diff --git a/meta/recipes-core/util-linux/util-linux_2.37.bb b/meta/recipes-core/util-linux/util-linux_2.37.bb index 2548b7210b..b67c3dcb53 100644 --- a/meta/recipes-core/util-linux/util-linux_2.37.bb +++ b/meta/recipes-core/util-linux/util-linux_2.37.bb | |||
@@ -10,12 +10,12 @@ PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', '${PN}-pylibmou | |||
10 | python util_linux_binpackages () { | 10 | python util_linux_binpackages () { |
11 | def pkg_hook(f, pkg, file_regex, output_pattern, modulename): | 11 | def pkg_hook(f, pkg, file_regex, output_pattern, modulename): |
12 | pn = d.getVar('PN') | 12 | pn = d.getVar('PN') |
13 | d.appendVar('RRECOMMENDS_%s' % pn, ' %s' % pkg) | 13 | d.appendVar('RRECOMMENDS:%s' % pn, ' %s' % pkg) |
14 | 14 | ||
15 | if d.getVar('ALTERNATIVE_' + pkg): | 15 | if d.getVar('ALTERNATIVE:' + pkg): |
16 | return | 16 | return |
17 | if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): | 17 | if d.getVarFlag('ALTERNATIVE_LINK_NAME', modulename): |
18 | d.setVar('ALTERNATIVE_' + pkg, modulename) | 18 | d.setVar('ALTERNATIVE:' + pkg, modulename) |
19 | 19 | ||
20 | bindirs = sorted(list(set(d.expand("${base_sbindir} ${base_bindir} ${sbindir} ${bindir}").split()))) | 20 | bindirs = sorted(list(set(d.expand("${base_sbindir} ${base_bindir} ${sbindir} ${bindir}").split()))) |
21 | for dir in bindirs: | 21 | for dir in bindirs: |
@@ -41,9 +41,9 @@ python util_linux_binpackages () { | |||
41 | 41 | ||
42 | pn = d.getVar('PN') | 42 | pn = d.getVar('PN') |
43 | for pkg, links in extras.items(): | 43 | for pkg, links in extras.items(): |
44 | of = d.getVar('FILES_' + pn + '-' + pkg) | 44 | of = d.getVar('FILES:' + pn + '-' + pkg) |
45 | links = of + links | 45 | links = of + links |
46 | d.setVar('FILES_' + pn + '-' + pkg, links) | 46 | d.setVar('FILES:' + pn + '-' + pkg, links) |
47 | } | 47 | } |
48 | 48 | ||
49 | # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS | 49 | # we must execute before update-alternatives PACKAGE_PREPROCESS_FUNCS |
@@ -63,7 +63,7 @@ PACKAGES_DYNAMIC = "^${PN}-.*" | |||
63 | 63 | ||
64 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" | 64 | CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" |
65 | UTIL_LINUX_LIBDIR = "${libdir}" | 65 | UTIL_LINUX_LIBDIR = "${libdir}" |
66 | UTIL_LINUX_LIBDIR_class-target = "${base_libdir}" | 66 | UTIL_LINUX_LIBDIR:class-target = "${base_libdir}" |
67 | EXTRA_OECONF = "\ | 67 | EXTRA_OECONF = "\ |
68 | --enable-libuuid --enable-libblkid \ | 68 | --enable-libuuid --enable-libblkid \ |
69 | \ | 69 | \ |
@@ -81,17 +81,17 @@ EXTRA_OECONF = "\ | |||
81 | --libdir='${UTIL_LINUX_LIBDIR}' \ | 81 | --libdir='${UTIL_LINUX_LIBDIR}' \ |
82 | " | 82 | " |
83 | 83 | ||
84 | EXTRA_OECONF_append_class-target = " --enable-setpriv" | 84 | EXTRA_OECONF:append:class-target = " --enable-setpriv" |
85 | EXTRA_OECONF_append_class-native = " --without-cap-ng --disable-setpriv" | 85 | EXTRA_OECONF:append:class-native = " --without-cap-ng --disable-setpriv" |
86 | EXTRA_OECONF_append_class-nativesdk = " --without-cap-ng --disable-setpriv" | 86 | EXTRA_OECONF:append:class-nativesdk = " --without-cap-ng --disable-setpriv" |
87 | EXTRA_OECONF_append = " --disable-hwclock-gplv3" | 87 | EXTRA_OECONF:append = " --disable-hwclock-gplv3" |
88 | 88 | ||
89 | # enable pcre2 for native/nativesdk to match host distros | 89 | # enable pcre2 for native/nativesdk to match host distros |
90 | # this helps to keep same expectations when using the SDK or | 90 | # this helps to keep same expectations when using the SDK or |
91 | # build host versions during development | 91 | # build host versions during development |
92 | # | 92 | # |
93 | PACKAGECONFIG ?= "pcre2" | 93 | PACKAGECONFIG ?= "pcre2" |
94 | PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh pam', '', d)}" | 94 | PACKAGECONFIG:class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh pam', '', d)}" |
95 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," | 95 | PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," |
96 | # Respect the systemd feature for uuidd | 96 | # Respect the systemd feature for uuidd |
97 | PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" | 97 | PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" |
@@ -106,43 +106,43 @@ PACKAGECONFIG[chfn-chsh] = "--enable-chfn-chsh,--disable-chfn-chsh," | |||
106 | 106 | ||
107 | EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" | 107 | EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" |
108 | 108 | ||
109 | ALLOW_EMPTY_${PN} = "1" | 109 | ALLOW_EMPTY:${PN} = "1" |
110 | FILES_${PN} = "" | 110 | FILES:${PN} = "" |
111 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" | 111 | FILES:${PN}-doc += "${datadir}/getopt/getopt-*.*" |
112 | FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" | 112 | FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" |
113 | FILES_${PN}-mount = "${sysconfdir}/default/mountall" | 113 | FILES:${PN}-mount = "${sysconfdir}/default/mountall" |
114 | FILES_${PN}-runuser = "${sysconfdir}/pam.d/runuser*" | 114 | FILES:${PN}-runuser = "${sysconfdir}/pam.d/runuser*" |
115 | FILES_${PN}-su = "${sysconfdir}/pam.d/su-l" | 115 | FILES:${PN}-su = "${sysconfdir}/pam.d/su-l" |
116 | CONFFILES_${PN}-su = "${sysconfdir}/pam.d/su-l" | 116 | CONFFILES:${PN}-su = "${sysconfdir}/pam.d/su-l" |
117 | FILES_${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ | 117 | FILES:${PN}-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so \ |
118 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ | 118 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__init__.* \ |
119 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" | 119 | ${PYTHON_SITEPACKAGES_DIR}/libmount/__pycache__/*" |
120 | 120 | ||
121 | # Util-linux' blkid replaces the e2fsprogs one | 121 | # Util-linux' blkid replaces the e2fsprogs one |
122 | RCONFLICTS_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" | 122 | RCONFLICTS:${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" |
123 | RREPLACES_${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" | 123 | RREPLACES:${PN}-blkid = "${MLPREFIX}e2fsprogs-blkid" |
124 | 124 | ||
125 | RRECOMMENDS_${PN}_class-native = "" | 125 | RRECOMMENDS:${PN}:class-native = "" |
126 | RRECOMMENDS_${PN}_class-nativesdk = "" | 126 | RRECOMMENDS:${PN}:class-nativesdk = "" |
127 | RDEPENDS_${PN}_class-native = "" | 127 | RDEPENDS:${PN}:class-native = "" |
128 | RDEPENDS_${PN}_class-nativesdk = "" | 128 | RDEPENDS:${PN}:class-nativesdk = "" |
129 | 129 | ||
130 | RDEPENDS_${PN} += " util-linux-libuuid" | 130 | RDEPENDS:${PN} += " util-linux-libuuid" |
131 | RDEPENDS_${PN}-dev += " util-linux-libuuid-dev" | 131 | RDEPENDS:${PN}-dev += " util-linux-libuuid-dev" |
132 | 132 | ||
133 | RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" | 133 | RPROVIDES:${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" |
134 | 134 | ||
135 | RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" | 135 | RDEPENDS:${PN}-bash-completion += "${PN}-lsblk" |
136 | RDEPENDS_${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod mdadm procps sed socat which xz" | 136 | RDEPENDS:${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod mdadm procps sed socat which xz" |
137 | RRECOMMENDS_${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop" | 137 | RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop" |
138 | RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" | 138 | RDEPENDS:${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" |
139 | ALLOW_EMPTY_${PN}-swaponoff = "1" | 139 | ALLOW_EMPTY:${PN}-swaponoff = "1" |
140 | 140 | ||
141 | #SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" | 141 | #SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" |
142 | SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" | 142 | SYSTEMD_SERVICE:${PN}-uuidd = "uuidd.socket uuidd.service" |
143 | SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" | 143 | SYSTEMD_AUTO_ENABLE:${PN}-uuidd = "disable" |
144 | SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service" | 144 | SYSTEMD_SERVICE:${PN}-fstrim = "fstrim.timer fstrim.service" |
145 | SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" | 145 | SYSTEMD_AUTO_ENABLE:${PN}-fstrim = "disable" |
146 | 146 | ||
147 | do_install () { | 147 | do_install () { |
148 | # with ccache the timestamps on compiled files may | 148 | # with ccache the timestamps on compiled files may |
@@ -181,7 +181,7 @@ do_install () { | |||
181 | rm -f ${D}${bindir}/chkdupexe | 181 | rm -f ${D}${bindir}/chkdupexe |
182 | } | 182 | } |
183 | 183 | ||
184 | do_install_append_class-target () { | 184 | do_install:append:class-target () { |
185 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then | 185 | if [ "${@bb.utils.filter('PACKAGECONFIG', 'pam', d)}" ]; then |
186 | install -d ${D}${sysconfdir}/pam.d | 186 | install -d ${D}${sysconfdir}/pam.d |
187 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser | 187 | install -m 0644 ${WORKDIR}/runuser.pamd ${D}${sysconfdir}/pam.d/runuser |
@@ -194,14 +194,14 @@ do_install_append_class-target () { | |||
194 | } | 194 | } |
195 | # nologin causes a conflict with shadow-native | 195 | # nologin causes a conflict with shadow-native |
196 | # kill causes a conflict with coreutils-native (if ${bindir}==${base_bindir}) | 196 | # kill causes a conflict with coreutils-native (if ${bindir}==${base_bindir}) |
197 | do_install_append_class-native () { | 197 | do_install:append:class-native () { |
198 | rm -f ${D}${base_sbindir}/nologin | 198 | rm -f ${D}${base_sbindir}/nologin |
199 | rm -f ${D}${base_bindir}/kill | 199 | rm -f ${D}${base_bindir}/kill |
200 | } | 200 | } |
201 | 201 | ||
202 | # dm-verity support introduces a circular build dependency, so util-linux-libuuid is split out for target builds | 202 | # dm-verity support introduces a circular build dependency, so util-linux-libuuid is split out for target builds |
203 | # Need to build libuuid for uuidgen, but then delete it and let the other recipe ship it | 203 | # Need to build libuuid for uuidgen, but then delete it and let the other recipe ship it |
204 | do_install_append () { | 204 | do_install:append () { |
205 | rm -rf ${D}${includedir}/uuid ${D}${libdir}/pkgconfig/uuid.pc ${D}${libdir}/libuuid* ${D}${base_libdir}/libuuid* | 205 | rm -rf ${D}${includedir}/uuid ${D}${libdir}/pkgconfig/uuid.pc ${D}${libdir}/libuuid* ${D}${base_libdir}/libuuid* |
206 | } | 206 | } |
207 | 207 | ||
@@ -222,14 +222,14 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" | |||
222 | ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" | 222 | ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" |
223 | ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" | 223 | ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" |
224 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" | 224 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" |
225 | ALTERNATIVE_${PN}-agetty = "getty" | 225 | ALTERNATIVE:${PN}-agetty = "getty" |
226 | ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" | 226 | ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" |
227 | ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" | 227 | ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" |
228 | ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" | 228 | ALTERNATIVE_LINK_NAME[hexdump] = "${bindir}/hexdump" |
229 | ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" | 229 | ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" |
230 | ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" | 230 | ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" |
231 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" | 231 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" |
232 | ALTERNATIVE_${PN}-last = "last lastb" | 232 | ALTERNATIVE:${PN}-last = "last lastb" |
233 | ALTERNATIVE_LINK_NAME[last] = "${bindir}/last" | 233 | ALTERNATIVE_LINK_NAME[last] = "${bindir}/last" |
234 | ALTERNATIVE_LINK_NAME[lastb] = "${bindir}/lastb" | 234 | ALTERNATIVE_LINK_NAME[lastb] = "${bindir}/lastb" |
235 | ALTERNATIVE_LINK_NAME[logger] = "${bindir}/logger" | 235 | ALTERNATIVE_LINK_NAME[logger] = "${bindir}/logger" |
diff --git a/meta/recipes-core/volatile-binds/volatile-binds.bb b/meta/recipes-core/volatile-binds/volatile-binds.bb index 3c8b18291e..5eeb651330 100644 --- a/meta/recipes-core/volatile-binds/volatile-binds.bb +++ b/meta/recipes-core/volatile-binds/volatile-binds.bb | |||
@@ -33,9 +33,9 @@ def volatile_systemd_services(d): | |||
33 | services.append("%s.service" % what[1:].replace("/", "-")) | 33 | services.append("%s.service" % what[1:].replace("/", "-")) |
34 | return " ".join(services) | 34 | return " ".join(services) |
35 | 35 | ||
36 | SYSTEMD_SERVICE_${PN} = "${@volatile_systemd_services(d)}" | 36 | SYSTEMD_SERVICE:${PN} = "${@volatile_systemd_services(d)}" |
37 | 37 | ||
38 | FILES_${PN} += "${systemd_unitdir}/system/*.service ${servicedir}" | 38 | FILES:${PN} += "${systemd_unitdir}/system/*.service ${servicedir}" |
39 | 39 | ||
40 | do_compile () { | 40 | do_compile () { |
41 | while read spec mountpoint; do | 41 | while read spec mountpoint; do |
diff --git a/meta/recipes-core/zlib/zlib_1.2.11.bb b/meta/recipes-core/zlib/zlib_1.2.11.bb index ef9431ae47..1c06aa0ab5 100644 --- a/meta/recipes-core/zlib/zlib_1.2.11.bb +++ b/meta/recipes-core/zlib/zlib_1.2.11.bb | |||
@@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e1 | |||
17 | 17 | ||
18 | CFLAGS += "-D_REENTRANT" | 18 | CFLAGS += "-D_REENTRANT" |
19 | 19 | ||
20 | RDEPENDS_${PN}-ptest += "make" | 20 | RDEPENDS:${PN}-ptest += "make" |
21 | 21 | ||
22 | inherit ptest | 22 | inherit ptest |
23 | 23 | ||
@@ -39,7 +39,7 @@ do_install_ptest() { | |||
39 | 39 | ||
40 | # Move zlib shared libraries for target builds to $base_libdir so the library | 40 | # Move zlib shared libraries for target builds to $base_libdir so the library |
41 | # can be used in early boot before $prefix is mounted. | 41 | # can be used in early boot before $prefix is mounted. |
42 | do_install_append_class-target() { | 42 | do_install:append:class-target() { |
43 | if [ ${base_libdir} != ${libdir} ] | 43 | if [ ${base_libdir} != ${libdir} ] |
44 | then | 44 | then |
45 | mkdir -p ${D}/${base_libdir} | 45 | mkdir -p ${D}/${base_libdir} |