From bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 28 Jul 2021 23:28:15 +0100 Subject: Convert to new override syntax This is the result of automated script conversion: scripts/contrib/convert-overrides.py converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie --- meta/recipes-support/apr/apr-util_1.6.1.bb | 24 ++++++------- meta/recipes-support/apr/apr_1.7.0.bb | 14 ++++---- .../argp-standalone/argp-standalone_1.3.bb | 4 +-- meta/recipes-support/aspell/aspell_0.60.8.bb | 18 +++++----- meta/recipes-support/atk/at-spi2-atk_2.38.0.bb | 4 +-- meta/recipes-support/atk/at-spi2-core_2.40.3.bb | 2 +- meta/recipes-support/attr/acl_2.3.1.bb | 8 ++--- meta/recipes-support/attr/attr.inc | 10 +++--- .../bash-completion/bash-completion_2.11.bb | 6 ++-- meta/recipes-support/bmap-tools/bmap-tools_3.6.bb | 2 +- .../boost/boost-build-native_4.4.1.bb | 2 +- meta/recipes-support/boost/boost.inc | 40 +++++++++++----------- .../ca-certificates/ca-certificates_20210119.bb | 24 ++++++------- .../recipes-support/consolekit/consolekit_0.4.6.bb | 10 +++--- meta/recipes-support/curl/curl_7.77.0.bb | 12 +++---- meta/recipes-support/db/db_5.3.28.bb | 14 ++++---- .../debianutils/debianutils_4.11.2.bb | 16 ++++----- meta/recipes-support/diffoscope/diffoscope_177.bb | 6 ++-- meta/recipes-support/dos2unix/dos2unix_7.4.2.bb | 2 +- meta/recipes-support/enchant/enchant2_2.3.0.bb | 4 +-- meta/recipes-support/gdbm/gdbm_1.19.bb | 6 ++-- meta/recipes-support/gmp/gmp.inc | 4 +-- meta/recipes-support/gmp/gmp_6.2.1.bb | 8 ++--- meta/recipes-support/gnupg/gnupg_2.3.1.bb | 18 +++++----- meta/recipes-support/gnutls/gnutls_3.7.2.bb | 20 +++++------ meta/recipes-support/gnutls/libtasn1_4.17.0.bb | 4 +-- meta/recipes-support/gpgme/gpgme_1.16.0.bb | 22 ++++++------ meta/recipes-support/icu/icu_69.1.bb | 38 ++++++++++---------- meta/recipes-support/iso-codes/iso-codes_4.6.0.bb | 2 +- meta/recipes-support/itstool/itstool_2.0.6.bb | 8 ++--- meta/recipes-support/libassuan/libassuan_2.5.5.bb | 8 ++--- .../libatomic-ops/libatomic-ops_7.6.10.bb | 2 +- meta/recipes-support/libbsd/libbsd_0.11.3.bb | 2 +- .../libcap-ng/libcap-ng-python_0.8.2.bb | 8 ++--- meta/recipes-support/libcap-ng/libcap-ng.inc | 4 +-- meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb | 2 +- meta/recipes-support/libcap/libcap_2.51.bb | 10 +++--- meta/recipes-support/libcheck/libcheck_0.15.2.bb | 6 ++-- meta/recipes-support/libevent/libevent_2.1.12.bb | 4 +-- meta/recipes-support/libffi/libffi_3.4.2.bb | 6 ++-- meta/recipes-support/libfm/libfm_1.3.2.bb | 6 ++-- meta/recipes-support/libgcrypt/libgcrypt_1.9.3.bb | 16 ++++----- .../libgpg-error/libgpg-error_1.42.bb | 6 ++-- meta/recipes-support/libical/libical_3.0.10.bb | 6 ++-- meta/recipes-support/libksba/libksba_1.6.0.bb | 6 ++-- .../libmicrohttpd/libmicrohttpd_0.9.73.bb | 4 +-- meta/recipes-support/libnl/libnl_3.5.0.bb | 30 ++++++++-------- meta/recipes-support/libpcre/libpcre2_10.37.bb | 24 ++++++------- meta/recipes-support/libpcre/libpcre_8.45.bb | 26 +++++++------- meta/recipes-support/libproxy/libproxy_0.4.17.bb | 4 +-- .../recipes-support/libseccomp/libseccomp_2.5.1.bb | 6 ++-- meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb | 6 ++-- meta/recipes-support/libssh2/libssh2_1.9.0.bb | 6 ++-- meta/recipes-support/libunwind/libunwind.inc | 10 +++--- meta/recipes-support/libunwind/libunwind_1.5.0.bb | 16 ++++----- meta/recipes-support/liburcu/liburcu_0.13.0.bb | 4 +-- meta/recipes-support/libusb/libusb1_1.0.24.bb | 8 ++--- meta/recipes-support/libxslt/libxslt_1.1.34.bb | 16 ++++----- meta/recipes-support/libyaml/libyaml_0.2.5.bb | 4 +-- meta/recipes-support/lzop/lzop_1.04.bb | 2 +- meta/recipes-support/nettle/nettle_3.7.3.bb | 8 ++--- meta/recipes-support/npth/npth_1.6.bb | 6 ++-- .../nss-myhostname/nss-myhostname_0.3.bb | 6 ++-- meta/recipes-support/numactl/numactl_git.bb | 6 ++-- meta/recipes-support/p11-kit/p11-kit_0.24.0.bb | 6 ++-- .../ptest-runner/ptest-runner_2.4.1.bb | 4 +-- meta/recipes-support/rng-tools/rng-tools_6.13.bb | 8 ++--- meta/recipes-support/serf/serf_1.3.9.bb | 2 +- .../shared-mime-info/shared-mime-info_git.bb | 8 ++--- meta/recipes-support/sqlite/sqlite3.inc | 18 +++++----- meta/recipes-support/taglib/taglib_1.12.bb | 4 +-- .../user-creation/xuser-account_0.1.bb | 6 ++-- meta/recipes-support/vim/vim.inc | 24 ++++++------- meta/recipes-support/vim/vim_8.2.bb | 4 +-- meta/recipes-support/vte/vte_0.64.2.bb | 14 ++++---- 75 files changed, 367 insertions(+), 367 deletions(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/apr/apr-util_1.6.1.bb b/meta/recipes-support/apr/apr-util_1.6.1.bb index 4e183ca374..b851d46351 100644 --- a/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/meta/recipes-support/apr/apr-util_1.6.1.bb @@ -32,35 +32,35 @@ MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apu-1-config" OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" -do_configure_append() { +do_configure:append() { if [ "${CLASSOVERRIDE}" = "class-target" ]; then cp ${STAGING_DATADIR}/apr/apr_rules.mk ${B}/build/rules.mk sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${B}/build/rules.mk fi } -do_configure_prepend_class-native() { +do_configure:prepend:class-native() { mkdir ${B}/build cp ${STAGING_DATADIR_NATIVE}/apr/apr_rules.mk ${B}/build/rules.mk } -do_configure_append_class-native() { +do_configure:append:class-native() { sed -i "s#LIBTOOL=\$(SHELL) \$(apr_builddir)#LIBTOOL=\$(SHELL) ${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk # sometimes there isn't SHELL sed -i "s#LIBTOOL=\$(apr_builddir)#LIBTOOL=${STAGING_BINDIR_NATIVE}#" ${B}/build/rules.mk } -do_configure_prepend_class-nativesdk() { +do_configure:prepend:class-nativesdk() { cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk sed -i -e 's#^CFLAGS=.*#CFLAGS=${TARGET_CFLAGS}#g' ${S}/build/rules.mk } -do_configure_append_class-nativesdk() { +do_configure:append:class-nativesdk() { sed -i "s#\(apr_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk sed -i "s#\(apr_builders\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk sed -i "s#\(top_builddir\)=.*#\1=${STAGING_DATADIR}/build-1#" ${B}/build/rules.mk sed -i "s#\(LIBTOOL=\$(apr_builddir)\).*#\1/libtool#" ${B}/build/rules.mk } -do_install_append_class-target() { +do_install:append:class-target() { sed -i -e 's,${STAGING_DIR_HOST},,g' \ -e 's,APU_SOURCE_DIR=.*,APR_SOURCE_DIR=,g' \ -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config @@ -73,16 +73,16 @@ PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without- PACKAGECONFIG[gdbm] = "--with-dbm=gdbm --with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" #files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} -FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" -FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/*.la" -FILES_${PN}-staticdev += "${libdir}/apr-util-1/*.a" +FILES:${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" +FILES:${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/*.la" +FILES:${PN}-staticdev += "${libdir}/apr-util-1/*.a" -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" inherit ptest -RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-iso8859-1 glibc-gconv-iso8859-2 glibc-gconv-utf-7" -RDEPENDS_${PN}-ptest += "libgcc" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-iso8859-1 glibc-gconv-iso8859-2 glibc-gconv-utf-7" +RDEPENDS:${PN}-ptest += "libgcc" do_compile_ptest() { cd ${B}/test diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.0.bb index 82317396cd..08d9edf3c2 100644 --- a/meta/recipes-support/apr/apr_1.7.0.bb +++ b/meta/recipes-support/apr/apr_1.7.0.bb @@ -47,7 +47,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," PACKAGECONFIG[timed-tests] = "--enable-timed-tests,--disable-timed-tests," -do_configure_prepend() { +do_configure:prepend() { # Avoid absolute paths for grep since it causes failures # when using sstate between different hosts with different # install paths for grep. @@ -61,24 +61,24 @@ do_configure_prepend() { MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/apr-1-config \ ${PN}-dev:${datadir}/build-1/apr_rules.mk" -FILES_${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" -RDEPENDS_${PN}-dev += "bash" +FILES:${PN}-dev += "${libdir}/apr.exp ${datadir}/build-1/*" +RDEPENDS:${PN}-dev += "bash" -RDEPENDS_${PN}-ptest += "libgcc" +RDEPENDS:${PN}-ptest += "libgcc" #for some reason, build/libtool.m4 handled by buildconf still be overwritten #when autoconf, so handle it again. -do_configure_append() { +do_configure:append() { sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' ${S}/build/libtool.m4 sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' ${S}/build/apr_rules.mk } -do_install_append() { +do_install:append() { oe_multilib_header apr.h install -d ${D}${datadir}/apr } -do_install_append_class-target() { +do_install:append:class-target() { sed -i -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${STAGING_DIR_HOST},,g' ${D}${datadir}/build-1/apr_rules.mk sed -i -e 's,${STAGING_DIR_HOST},,g' \ diff --git a/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb b/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb index d1db562bb5..317f71b772 100644 --- a/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb +++ b/meta/recipes-support/argp-standalone/argp-standalone_1.3.bb @@ -20,8 +20,8 @@ inherit autotools CFLAGS += "-fPIC -U__OPTIMIZE__" -RDEPENDS_${PN}-dev = "" -RDEPENDS_${PN}-staticdev = "" +RDEPENDS:${PN}-dev = "" +RDEPENDS:${PN}-staticdev = "" do_install() { install -D -m 0644 ${B}/libargp.a ${D}${libdir}/libargp.a diff --git a/meta/recipes-support/aspell/aspell_0.60.8.bb b/meta/recipes-support/aspell/aspell_0.60.8.bb index 6548c54b64..2fe8f66908 100644 --- a/meta/recipes-support/aspell/aspell_0.60.8.bb +++ b/meta/recipes-support/aspell/aspell_0.60.8.bb @@ -22,17 +22,17 @@ PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses" PACKAGES += "libaspell libpspell aspell-utils" -RDEPENDS_${PN}-utils += "perl" +RDEPENDS:${PN}-utils += "perl" -FILES_libaspell = "${libdir}/libaspell.so.* ${libdir}/aspell*" -FILES_aspell-utils = "${bindir}/word-list-compress ${bindir}/aspell-import ${bindir}/run-with-aspell ${bindir}/pre*" -FILES_${PN} = "${bindir}/aspell" -FILES_libpspell = "${libdir}/libpspell.so.*" -FILES_${PN}-dev += "${bindir}/pspell-config" +FILES:libaspell = "${libdir}/libaspell.so.* ${libdir}/aspell*" +FILES:aspell-utils = "${bindir}/word-list-compress ${bindir}/aspell-import ${bindir}/run-with-aspell ${bindir}/pre*" +FILES:${PN} = "${bindir}/aspell" +FILES:libpspell = "${libdir}/libpspell.so.*" +FILES:${PN}-dev += "${bindir}/pspell-config" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv6 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" inherit autotools-brokensep gettext texinfo binconfig-disabled diff --git a/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb index c7aee34628..f041584878 100644 --- a/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb +++ b/meta/recipes-support/atk/at-spi2-atk_2.38.0.bb @@ -14,7 +14,7 @@ inherit gnomebase upstream-version-is-even PACKAGES =+ "${PN}-gnome ${PN}-gtk2" -FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" -FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" +FILES:${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules" +FILES:${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/atk/at-spi2-core_2.40.3.bb b/meta/recipes-support/atk/at-spi2-core_2.40.3.bb index b1a7b51b92..427ea7c165 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.40.3.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.40.3.bb @@ -31,7 +31,7 @@ GIR_MESON_OPTION = 'introspection' GIR_MESON_ENABLE_FLAG = 'yes' GIR_MESON_DISABLE_FLAG = 'no' -FILES_${PN} += "${datadir}/dbus-1/services/*.service \ +FILES:${PN} += "${datadir}/dbus-1/services/*.service \ ${datadir}/dbus-1/accessibility-services/*.service \ ${datadir}/defaults/at-spi2 \ ${systemd_user_unitdir}/at-spi-dbus-bus.service \ diff --git a/meta/recipes-support/attr/acl_2.3.1.bb b/meta/recipes-support/attr/acl_2.3.1.bb index 7f6cbf5c43..c965ac553f 100644 --- a/meta/recipes-support/attr/acl_2.3.1.bb +++ b/meta/recipes-support/attr/acl_2.3.1.bb @@ -8,8 +8,8 @@ BUGTRACKER = "http://savannah.nongnu.org/bugs/?group=acl" SECTION = "libs" LICENSE = "LGPLv2.1+ & GPLv2+" -LICENSE_${PN} = "GPLv2+" -LICENSE_lib${BPN} = "LGPLv2.1+" +LICENSE:${PN} = "GPLv2+" +LICENSE:lib${BPN} = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764" @@ -27,7 +27,7 @@ inherit autotools gettext ptest PACKAGES =+ "lib${BPN}" -FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}" +FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" PTEST_BUILD_HOST_FILES = "builddefs" PTEST_BUILD_HOST_PATTERN = "^RPM" @@ -58,7 +58,7 @@ do_install_ptest() { rm ${D}${PTEST_PATH}/.libs/libtestlookup.lai } -RDEPENDS_${PN}-ptest = "acl \ +RDEPENDS:${PN}-ptest = "acl \ bash \ coreutils \ perl \ diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc index e427ba9901..02645db748 100644 --- a/meta/recipes-support/attr/attr.inc +++ b/meta/recipes-support/attr/attr.inc @@ -7,8 +7,8 @@ SECTION = "libs" DEPENDS = "virtual/libintl" LICENSE = "LGPLv2.1+ & GPLv2+" -LICENSE_${PN} = "GPLv2+" -LICENSE_lib${BPN} = "LGPLv2.1+" +LICENSE:${PN} = "GPLv2+" +LICENSE:lib${BPN} = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ file://doc/COPYING.LGPL;md5=b8d31f339300bc239d73461d68e77b9c \ file://tools/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ @@ -22,10 +22,10 @@ inherit ptest update-alternatives autotools gettext PACKAGES =+ "lib${BPN}" -FILES_lib${BPN} = "${libdir}/lib*${SOLIBS}" +FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "setfattr" +ALTERNATIVE:${PN} = "setfattr" ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr" PTEST_BUILD_HOST_FILES = "builddefs" @@ -48,7 +48,7 @@ do_install_ptest() { cp -rf ${S}/test/ ${D}${PTEST_PATH} } -RDEPENDS_${PN}-ptest = "attr \ +RDEPENDS:${PN}-ptest = "attr \ coreutils \ perl-module-filehandle \ perl-module-getopt-std \ diff --git a/meta/recipes-support/bash-completion/bash-completion_2.11.bb b/meta/recipes-support/bash-completion/bash-completion_2.11.bb index 67738c3c83..f63a69b5b4 100644 --- a/meta/recipes-support/bash-completion/bash-completion_2.11.bb +++ b/meta/recipes-support/bash-completion/bash-completion_2.11.bb @@ -23,18 +23,18 @@ PARALLEL_MAKE = "" inherit autotools -do_install_append() { +do_install:append() { # compatdir install -d ${D}${sysconfdir}/bash_completion.d/ echo '. ${datadir}/${BPN}/bash_completion' >${D}${sysconfdir}/bash_completion } -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" # Some recipes are providing ${PN}-bash-completion packages PACKAGES =+ "${PN}-extra" -FILES_${PN}-extra = "${datadir}/${BPN}/completions/ \ +FILES:${PN}-extra = "${datadir}/${BPN}/completions/ \ ${datadir}/${BPN}/helpers/" BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-support/bmap-tools/bmap-tools_3.6.bb b/meta/recipes-support/bmap-tools/bmap-tools_3.6.bb index 611c0fb680..c830a92776 100644 --- a/meta/recipes-support/bmap-tools/bmap-tools_3.6.bb +++ b/meta/recipes-support/bmap-tools/bmap-tools_3.6.bb @@ -18,7 +18,7 @@ PV .= "+git${SRCPV}" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" # Need df from coreutils -RDEPENDS_${PN} = "python3-core python3-compression python3-mmap python3-setuptools python3-fcntl python3-six coreutils" +RDEPENDS:${PN} = "python3-core python3-compression python3-mmap python3-setuptools python3-fcntl python3-six coreutils" inherit python3native inherit setuptools3 diff --git a/meta/recipes-support/boost/boost-build-native_4.4.1.bb b/meta/recipes-support/boost/boost-build-native_4.4.1.bb index d4df5b5cf1..2de05369a8 100644 --- a/meta/recipes-support/boost/boost-build-native_4.4.1.bb +++ b/meta/recipes-support/boost/boost-build-native_4.4.1.bb @@ -24,4 +24,4 @@ do_install() { } # The build is either release mode (pre-stripped) or debug (-O0). -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP:${PN} = "already-stripped" diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index 291a052ec6..fa49ed3f8a 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -8,8 +8,8 @@ DEPENDS = "boost-build-native zlib bzip2" CVE_PRODUCT = "boost:boost" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" B = "${WORKDIR}/build" do_configure[cleandirs] = "${B}" @@ -71,35 +71,35 @@ python __anonymous () { if "-native" in pn: pkg = pkg + "-native" packages.append(mlprefix + pkg) - if not d.getVar("FILES_%s" % pkg): - d.setVar("FILES_%s%s" % (mlprefix, pkg), "${libdir}/libboost_%s*.so.*" % lib) + if not d.getVar("FILES:%s" % pkg): + d.setVar("FILES:%s%s" % (mlprefix, pkg), "${libdir}/libboost_%s*.so.*" % lib) else: - d.setVar("FILES_%s%s" % (mlprefix, pkg), d.getVar("FILES_%s" % pkg)) + d.setVar("FILES:%s%s" % (mlprefix, pkg), d.getVar("FILES:%s" % pkg)) d.setVar("BOOST_PACKAGES", " ".join(packages)) d.setVar("BJAM_EXTRA", " ".join(extras)) } # Override the contents of specific packages -FILES_${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" -FILES_${PN}-locale = "${libdir}/libboost_locale.so.*" -FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" -FILES_boost-serialization = "${libdir}/libboost_serialization*.so.* \ +FILES:${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" +FILES:${PN}-locale = "${libdir}/libboost_locale.so.*" +FILES:${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" +FILES:boost-serialization = "${libdir}/libboost_serialization*.so.* \ ${libdir}/libboost_wserialization*.so.*" -FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ +FILES:boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ ${libdir}/libboost_unit_test_framework*.so.*" # -dev last to pick up the remaining stuff PACKAGES += "${PN}-dev ${PN}-staticdev" -FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake" -FILES_${PN}-staticdev = "${libdir}/libboost_*.a" +FILES:${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake" +FILES:${PN}-staticdev = "${libdir}/libboost_*.a" # "boost" is a metapackage which pulls in all boost librabries PACKAGES += "${PN}" -FILES_${PN} = "" -ALLOW_EMPTY_${PN} = "1" -RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" -RRECOMMENDS_${PN}_class-native = "" +FILES:${PN} = "" +ALLOW_EMPTY:${PN} = "1" +RRECOMMENDS:${PN} += "${BOOST_PACKAGES}" +RRECOMMENDS:${PN}:class-native = "" # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works TARGET_CC_ARCH += "${LDFLAGS}" @@ -155,14 +155,14 @@ BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ ${BJAM_EXTRA}' # Native compilation of bzip2 isn't working -BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1' +BJAM_OPTS:append:class-native = ' -sNO_BZIP2=1' # Adjust the build for x32 -BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64" +BJAM_OPTS:append:x86-x32 = " abi=x32 address-model=64" # cross compiling for arm fails to detect abi, so provide some help -BJAM_OPTS_append_arm = " abi=aapcs architecture=arm" -BJAM_OPTS_append_aarch64 = " abi=aapcs address-model=64 architecture=arm" +BJAM_OPTS:append:arm = " abi=aapcs architecture=arm" +BJAM_OPTS:append:aarch64 = " abi=aapcs address-model=64 architecture=arm" do_configure() { cd ${S} diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb b/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb index 7dcc86fdc1..363203854f 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=ae5b36b514e3f12ce1aa8e2ee67f3d7e # This is needed to ensure we can run the postinst at image creation time DEPENDS = "" -DEPENDS_class-native = "openssl-native" -DEPENDS_class-nativesdk = "openssl-native" +DEPENDS:class-native = "openssl-native" +DEPENDS:class-nativesdk = "openssl-native" # Need rehash from openssl and run-parts from debianutils PACKAGE_WRITE_DEPS += "openssl-native debianutils-native" @@ -35,7 +35,7 @@ EXTRA_OEMAKE = "\ 'SBINDIR=${sbindir}' \ " -do_compile_prepend() { +do_compile:prepend() { oe_runmake clean } @@ -58,7 +58,7 @@ do_install () { } >${D}${sysconfdir}/ca-certificates.conf } -do_install_append_class-target () { +do_install:append:class-target () { sed -i -e 's,/etc/,${sysconfdir}/,' \ -e 's,/usr/share/,${datadir}/,' \ -e 's,/usr/local,${prefix}/local,' \ @@ -66,25 +66,25 @@ do_install_append_class-target () { ${D}${mandir}/man8/update-ca-certificates.8 } -pkg_postinst_${PN}_class-target () { +pkg_postinst:${PN}:class-target () { SYSROOT="$D" $D${sbindir}/update-ca-certificates } -CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf" +CONFFILES:${PN} += "${sysconfdir}/ca-certificates.conf" # Rather than make a postinst script that works for both target and nativesdk, # we just run update-ca-certificate from do_install() for nativesdk. -CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" -do_install_append_class-nativesdk () { +CONFFILES:${PN}:append:class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" +do_install:append:class-nativesdk () { SYSROOT="${D}${SDKPATHNATIVE}" ${D}${sbindir}/update-ca-certificates } -do_install_append_class-native () { +do_install:append:class-native () { SYSROOT="${D}${base_prefix}" ${D}${sbindir}/update-ca-certificates } -RDEPENDS_${PN}_append_class-target = " openssl-bin openssl" -RDEPENDS_${PN}_append_class-native = " openssl-native" -RDEPENDS_${PN}_append_class-nativesdk = " nativesdk-openssl-bin nativesdk-openssl" +RDEPENDS:${PN}:append:class-target = " openssl-bin openssl" +RDEPENDS:${PN}:append:class-native = " openssl-native" +RDEPENDS:${PN}:append:class-nativesdk = " nativesdk-openssl-bin nativesdk-openssl" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb index 22e755747b..3d28ba2a24 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3" DEPENDS = "glib-2.0 glib-2.0-native dbus dbus-glib virtual/libx11" -RDEPENDS_${PN} += "base-files" +RDEPENDS:${PN} += "base-files" inherit autotools pkgconfig features_check # depends on virtual/libx11 @@ -31,15 +31,15 @@ PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/s PACKAGECONFIG[polkit] = "--with-polkit,--without-polkit,polkit" PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--with-systemdsystemunitdir=" -FILES_${PN} += "${exec_prefix}/lib/ConsoleKit \ +FILES:${PN} += "${exec_prefix}/lib/ConsoleKit \ ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" PACKAGES =+ "pam-plugin-ck-connector" -FILES_pam-plugin-ck-connector += "${base_libdir}/security/*.so" -RDEPENDS_pam-plugin-ck-connector += "${PN}" +FILES:pam-plugin-ck-connector += "${base_libdir}/security/*.so" +RDEPENDS:pam-plugin-ck-connector += "${PN}" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/ConsoleKit - - - -" \ diff --git a/meta/recipes-support/curl/curl_7.77.0.bb b/meta/recipes-support/curl/curl_7.77.0.bb index ee1aa89f27..6b15a6a3e8 100644 --- a/meta/recipes-support/curl/curl_7.77.0.bb +++ b/meta/recipes-support/curl/curl_7.77.0.bb @@ -21,8 +21,8 @@ CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl dan inherit autotools pkgconfig binconfig multilib_header PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} ssl libidn proxy threaded-resolver verbose zlib" -PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" -PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" +PACKAGECONFIG:class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" +PACKAGECONFIG:class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" # 'ares' and 'threaded-resolver' are mutually exclusive PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" @@ -68,7 +68,7 @@ EXTRA_OECONF = " \ --disable-curldebug \ " -do_install_append_class-target() { +do_install:append:class-target() { # cleanup buildpaths from curl-config sed -i \ -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ @@ -79,10 +79,10 @@ do_install_append_class-target() { PACKAGES =+ "lib${BPN}" -FILES_lib${BPN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${BPN} += "ca-certificates" +FILES:lib${BPN} = "${libdir}/lib*.so.*" +RRECOMMENDS:lib${BPN} += "ca-certificates" -FILES_${PN} += "${datadir}/zsh" +FILES:${PN} += "${datadir}/zsh" inherit multilib_script MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config" diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb index b2ae98f05c..d5b788a3d7 100644 --- a/meta/recipes-support/db/db_5.3.28.bb +++ b/meta/recipes-support/db/db_5.3.28.bb @@ -13,7 +13,7 @@ SUMMARY = "Berkeley Database v5" DESCRIPTION = "Provides the foundational storage services for your application, no matter how demanding and unique your requirements may seem to be" HOMEPAGE = "https://www.oracle.com/database/technologies/related/berkeleydb.html" LICENSE = "Sleepycat" -RCONFLICTS_${PN} = "db3" +RCONFLICTS:${PN} = "db3" CVE_PRODUCT = "oracle_berkeley_db berkeley_db" CVE_VERSION = "11.2.${PV}" @@ -47,7 +47,7 @@ inherit autotools inherit lib_package PACKAGES =+ "${PN}-cxx" -FILES_${PN}-cxx = "${libdir}/*cxx*so" +FILES:${PN}-cxx = "${libdir}/*cxx*so" # The dev package has the .so link (as in db3) and the .a's - # it is therefore incompatible (cannot be installed at the @@ -75,7 +75,7 @@ AUTOTOOLS_SCRIPT_PATH = "${S}/dist" # configure. CONFIG_SITE = "" -oe_runconf_prepend() { +oe_runconf:prepend() { . ${S}/dist/RELEASE # Edit version information we couldn't pre-compute. sed -i -e "s/__EDIT_DB_VERSION_FAMILY__/$DB_VERSION_FAMILY/g" \ @@ -89,12 +89,12 @@ oe_runconf_prepend() { -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" ${S}/dist/configure } -do_compile_prepend() { +do_compile:prepend() { # Stop libtool adding RPATHs sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' ${B}/${HOST_SYS}-libtool } -do_install_append() { +do_install:append() { mkdir -p ${D}/${includedir}/db51 mv ${D}/${includedir}/db.h ${D}/${includedir}/db51/. mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db51/. @@ -115,7 +115,7 @@ do_install_append() { fi } -INSANE_SKIP_${PN} = "dev-so" -INSANE_SKIP_${PN}-cxx = "dev-so" +INSANE_SKIP:${PN} = "dev-so" +INSANE_SKIP:${PN}-cxx = "dev-so" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/debianutils/debianutils_4.11.2.bb b/meta/recipes-support/debianutils/debianutils_4.11.2.bb index 1aedd8e6f3..231666c4dc 100644 --- a/meta/recipes-support/debianutils/debianutils_4.11.2.bb +++ b/meta/recipes-support/debianutils/debianutils_4.11.2.bb @@ -18,11 +18,11 @@ SRC_URI[sha256sum] = "3b680e81709b740387335fac8f8806d71611dcf60874e1a792e862e48a inherit autotools update-alternatives S = "${WORKDIR}/debianutils" -do_configure_prepend() { +do_configure:prepend() { sed -i -e 's:tempfile.1 which.1:which.1:g' ${S}/Makefile.am } -do_install_append() { +do_install:append() { if [ "${base_bindir}" != "${bindir}" ]; then # Debian places some utils into ${base_bindir} as does busybox install -d ${D}${base_bindir} @@ -35,18 +35,18 @@ do_install_append() { # Note that we package the update-alternatives name. # PACKAGES =+ "${PN}-run-parts" -FILES_${PN}-run-parts = "${base_bindir}/run-parts.debianutils" +FILES:${PN}-run-parts = "${base_bindir}/run-parts.debianutils" -RDEPENDS_${PN} += "${PN}-run-parts" -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN} += "${PN}-run-parts" +RDEPENDS:${PN}:class-native = "" ALTERNATIVE_PRIORITY = "30" -ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which" +ALTERNATIVE:${PN} = "add-shell installkernel remove-shell savelog tempfile which" ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" -ALTERNATIVE_${PN}-run-parts = "run-parts" +ALTERNATIVE:${PN}-run-parts = "run-parts" -ALTERNATIVE_${PN}-doc = "which.1" +ALTERNATIVE:${PN}-doc = "which.1" ALTERNATIVE_LINK_NAME[which.1] = "${mandir}/man1/which.1" ALTERNATIVE_LINK_NAME[add-shell] = "${sbindir}/add-shell" diff --git a/meta/recipes-support/diffoscope/diffoscope_177.bb b/meta/recipes-support/diffoscope/diffoscope_177.bb index 0d9061dda0..107e97cd77 100644 --- a/meta/recipes-support/diffoscope/diffoscope_177.bb +++ b/meta/recipes-support/diffoscope/diffoscope_177.bb @@ -14,12 +14,12 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "8ac0cad150914bab2a53caa3f21876a78b092f3d2a36b9134874cd5c04a26b2e" -RDEPENDS_${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm" +RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm" # Dependencies don't build for musl -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' -do_install_append_class-native() { +do_install:append:class-native() { create_wrapper ${D}${bindir}/diffoscope \ MAGIC=${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc \ RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ diff --git a/meta/recipes-support/dos2unix/dos2unix_7.4.2.bb b/meta/recipes-support/dos2unix/dos2unix_7.4.2.bb index 9005bdea59..15d097ebed 100644 --- a/meta/recipes-support/dos2unix/dos2unix_7.4.2.bb +++ b/meta/recipes-support/dos2unix/dos2unix_7.4.2.bb @@ -25,7 +25,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[nls] = "ENABLE_NLS=1,ENABLE_NLS=,po4a-native" EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS} LDFLAGS_USER='${LDFLAGS}'" -EXTRA_OEMAKE_class-native = "ENABLE_NLS=" +EXTRA_OEMAKE:class-native = "ENABLE_NLS=" do_install () { oe_runmake DESTDIR="${D}${base_prefix}" install diff --git a/meta/recipes-support/enchant/enchant2_2.3.0.bb b/meta/recipes-support/enchant/enchant2_2.3.0.bb index 5d0f10d0bc..165b08f871 100644 --- a/meta/recipes-support/enchant/enchant2_2.3.0.bb +++ b/meta/recipes-support/enchant/enchant2_2.3.0.bb @@ -24,8 +24,8 @@ PACKAGECONFIG ??= "aspell" PACKAGECONFIG[aspell] = "--with-aspell,--without-aspell,aspell,aspell" PACKAGECONFIG[hunspell] = "--with-hunspell,--without-hunspell,hunspell,hunspell" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/enchant-2 \ ${libdir}/enchant-2 \ " -FILES_${PN}-staticdev += "${libdir}/enchant-2/*.a" +FILES:${PN}-staticdev += "${libdir}/enchant-2/*.a" diff --git a/meta/recipes-support/gdbm/gdbm_1.19.bb b/meta/recipes-support/gdbm/gdbm_1.19.bb index cd2617b130..1d1a0c8dd1 100644 --- a/meta/recipes-support/gdbm/gdbm_1.19.bb +++ b/meta/recipes-support/gdbm/gdbm_1.19.bb @@ -26,7 +26,7 @@ CACHED_CONFIGUREVARS += "ac_cv_lib_ndbm_main=no ac_cv_lib_dbm_main=no" BBCLASSEXTEND = "native nativesdk" -do_install_append () { +do_install:append () { # Create a symlink to ndbm.h and gdbm.h in include/gdbm to let other packages to find # these headers install -d ${D}${includedir}/gdbm @@ -34,7 +34,7 @@ do_install_append () { ln -sf ../gdbm.h ${D}/${includedir}/gdbm/gdbm.h } -RDEPENDS_${PN}-ptest += "diffutils ${PN}-bin" +RDEPENDS:${PN}-ptest += "diffutils ${PN}-bin" do_compile_ptest() { oe_runmake -C tests buildtests @@ -42,5 +42,5 @@ do_compile_ptest() { PACKAGES =+ "${PN}-compat \ " -FILES_${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS} \ +FILES:${PN}-compat = "${libdir}/libgdbm_compat${SOLIBS} \ " diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc index 948b89288e..1872226616 100644 --- a/meta/recipes-support/gmp/gmp.inc +++ b/meta/recipes-support/gmp/gmp.inc @@ -8,5 +8,5 @@ inherit autotools texinfo multilib_header PACKAGECONFIG ??= "" PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" diff --git a/meta/recipes-support/gmp/gmp_6.2.1.bb b/meta/recipes-support/gmp/gmp_6.2.1.bb index 3c50f928ab..d5996abd00 100644 --- a/meta/recipes-support/gmp/gmp_6.2.1.bb +++ b/meta/recipes-support/gmp/gmp_6.2.1.bb @@ -19,16 +19,16 @@ SRC_URI[sha256sum] = "eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a3 acpaths = "" EXTRA_OECONF += " --enable-cxx=detect" -EXTRA_OECONF_mipsarchr6_append = " --disable-assembly" +EXTRA_OECONF:mipsarchr6:append = " --disable-assembly" PACKAGES =+ "libgmpxx" -FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}" +FILES:libgmpxx = "${libdir}/libgmpxx${SOLIBS}" -do_install_append() { +do_install:append() { oe_multilib_header gmp.h } -do_install_prepend_class-target() { +do_install:prepend:class-target() { sed -i \ -e "s|--sysroot=${STAGING_DIR_HOST}||g" \ -e "s|${DEBUG_PREFIX_MAP}||g" \ diff --git a/meta/recipes-support/gnupg/gnupg_2.3.1.bb b/meta/recipes-support/gnupg/gnupg_2.3.1.bb index 77331efc0b..b8b0314d2f 100644 --- a/meta/recipes-support/gnupg/gnupg_2.3.1.bb +++ b/meta/recipes-support/gnupg/gnupg_2.3.1.bb @@ -20,9 +20,9 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ " -SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ +SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch" -SRC_URI_append_class-nativesdk = " file://relocate.patch" +SRC_URI:append:class-nativesdk = " file://relocate.patch" SRC_URI[sha256sum] = "c498db346a9b9a4b399e514c8f56dfc0a888ce8f327f10376ff984452cd154ec" @@ -36,7 +36,7 @@ EXTRA_OECONF = "--disable-ldap \ # A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg) PACKAGES =+ "${PN}-gpg" -FILES_${PN}-gpg = " \ +FILES:${PN}-gpg = " \ ${bindir}/gpg \ ${bindir}/gpg2 \ ${bindir}/gpg-agent \ @@ -46,11 +46,11 @@ FILES_${PN}-gpg = " \ # to ensure all tools are included. This is done only in non-native # builds. Native builds don't have sub-packages, so appending RDEPENDS # in this case breaks recipe parsing. -RDEPENDS_${PN} += "${@ "" if ("native" in d.getVar("PN")) else (d.getVar("PN") + "-gpg")}" +RDEPENDS:${PN} += "${@ "" if ("native" in d.getVar("PN")) else (d.getVar("PN") + "-gpg")}" -RRECOMMENDS_${PN} = "pinentry" +RRECOMMENDS:${PN} = "pinentry" -do_configure_prepend () { +do_configure:prepend () { # Else these could be used in prefernce to those in aclocal-copy rm -f ${S}/m4/gpg-error.m4 rm -f ${S}/m4/libassuan.m4 @@ -58,16 +58,16 @@ do_configure_prepend () { rm -f ${S}/m4/libgcrypt.m4 } -do_install_append() { +do_install:append() { ln -sf gpg2 ${D}${bindir}/gpg ln -sf gpgv2 ${D}${bindir}/gpgv } -do_install_append_class-native() { +do_install:append:class-native() { create_wrappers ${STAGING_BINDIR_NATIVE} } -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { create_wrappers ${SDKPATHNATIVE}${bindir_nativesdk} } diff --git a/meta/recipes-support/gnutls/gnutls_3.7.2.bb b/meta/recipes-support/gnutls/gnutls_3.7.2.bb index 430d1f2d7d..e1a084fac4 100644 --- a/meta/recipes-support/gnutls/gnutls_3.7.2.bb +++ b/meta/recipes-support/gnutls/gnutls_3.7.2.bb @@ -5,17 +5,17 @@ HOMEPAGE = "https://gnutls.org/" BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" LICENSE = "GPLv3+ & LGPLv2.1+" -LICENSE_${PN} = "LGPLv2.1+" -LICENSE_${PN}-xx = "LGPLv2.1+" -LICENSE_${PN}-bin = "GPLv3+" -LICENSE_${PN}-openssl = "GPLv3+" +LICENSE:${PN} = "LGPLv2.1+" +LICENSE:${PN}-xx = "LGPLv2.1+" +LICENSE:${PN}-bin = "GPLv3+" +LICENSE:${PN}-openssl = "GPLv3+" LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \ file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" DEPENDS = "nettle gmp virtual/libiconv libunistring" -DEPENDS_append_libc-musl = " argp-standalone" +DEPENDS:append:libc-musl = " argp-standalone" SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" @@ -52,9 +52,9 @@ EXTRA_OECONF = " \ # Otherwise the tools try and use HOSTTOOLS_DIR/bash as a shell. export POSIX_SHELL="${base_bindir}/sh" -LDFLAGS_append_libc-musl = " -largp" +LDFLAGS:append:libc-musl = " -largp" -do_configure_prepend() { +do_configure:prepend() { for dir in . lib; do rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 done @@ -62,8 +62,8 @@ do_configure_prepend() { PACKAGES =+ "${PN}-openssl ${PN}-xx" -FILES_${PN}-dev += "${bindir}/gnutls-cli-debug" -FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" -FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*" +FILES:${PN}-dev += "${bindir}/gnutls-cli-debug" +FILES:${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" +FILES:${PN}-xx = "${libdir}/libgnutlsxx.so.*" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/gnutls/libtasn1_4.17.0.bb b/meta/recipes-support/gnutls/libtasn1_4.17.0.bb index 64e798b188..111f5ac13d 100644 --- a/meta/recipes-support/gnutls/libtasn1_4.17.0.bb +++ b/meta/recipes-support/gnutls/libtasn1_4.17.0.bb @@ -4,8 +4,8 @@ DER/BER data following an ASN.1 schema. " HOMEPAGE = "http://www.gnu.org/software/libtasn1/" LICENSE = "GPLv3+ & LGPLv2.1+" -LICENSE_${PN}-bin = "GPLv3+" -LICENSE_${PN} = "LGPLv2.1+" +LICENSE:${PN}-bin = "GPLv3+" +LICENSE:${PN} = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://doc/COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ file://COPYING;md5=75ac100ec923f959898182307970c360" diff --git a/meta/recipes-support/gpgme/gpgme_1.16.0.bb b/meta/recipes-support/gpgme/gpgme_1.16.0.bb index 13f456fcfc..0ab30d93b9 100644 --- a/meta/recipes-support/gpgme/gpgme_1.16.0.bb +++ b/meta/recipes-support/gpgme/gpgme_1.16.0.bb @@ -26,10 +26,10 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ SRC_URI[sha256sum] = "6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0" DEPENDS = "libgpg-error libassuan" -RDEPENDS_${PN}-cpp += "libstdc++" +RDEPENDS:${PN}-cpp += "libstdc++" -RDEPENDS_python2-gpg += "python-unixadmin" -RDEPENDS_python3-gpg += "python3-unixadmin" +RDEPENDS:python2-gpg += "python-unixadmin" +RDEPENDS:python3-gpg += "python3-unixadmin" BINCONFIG = "${bindir}/gpgme-config" @@ -45,7 +45,7 @@ PACKAGECONFIG[python3] = ",,python3 swig-native," # Building the C++ bindings for native requires a C++ compiler with C++11 # support. Since these bindings are currently not needed, we can disable them. DEFAULT_LANGUAGES = "" -DEFAULT_LANGUAGES_class-target = "cpp" +DEFAULT_LANGUAGES:class-target = "cpp" LANGUAGES ?= "${DEFAULT_LANGUAGES} python" PYTHON_INHERIT = "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'pythonnative', '', d)}" @@ -69,19 +69,19 @@ PACKAGES =+ "${PN}-cpp" PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python2-gpg ', '', d)}" PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-gpg ', '', d)}" -FILES_${PN}-cpp = "${libdir}/libgpgmepp.so.*" -FILES_python2-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" -FILES_python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" -FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" +FILES:${PN}-cpp = "${libdir}/libgpgmepp.so.*" +FILES:python2-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES:python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES:${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" -CFLAGS_append_libc-musl = " -D__error_t_defined " -do_configure_prepend () { +CFLAGS:append:libc-musl = " -D__error_t_defined " +do_configure:prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/gpg-error.m4 rm -f ${S}/m4/libassuan.m4 rm -f ${S}/m4/python.m4 } -do_install_append() { +do_install:append() { oe_multilib_header gpgme.h } diff --git a/meta/recipes-support/icu/icu_69.1.bb b/meta/recipes-support/icu/icu_69.1.bb index bfeea8d2f0..4daf0fe82e 100644 --- a/meta/recipes-support/icu/icu_69.1.bb +++ b/meta/recipes-support/icu/icu_69.1.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://site.icu-project.org/" LICENSE = "ICU" DEPENDS = "icu-native" -DEPENDS_class-native = "" +DEPENDS:class-native = "" CVE_PRODUCT = "international_components_for_unicode" @@ -27,15 +27,15 @@ MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/icu-config" # cross-compiling. Taken the situation that different builds may share a common sstate-cache # into consideration, the native build directory needs to be staged. EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_class-native = "" -EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" +EXTRA_OECONF:class-native = "" +EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}" -EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" +EXTRA_OECONF:append:class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" +TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" ASNEEDED = "" -do_compile_prepend_class-target () { +do_compile:prepend:class-target () { # Make sure certain build host references do not end up being compiled # in the image. This only affects libicutu and icu-dbg sed \ @@ -45,7 +45,7 @@ do_compile_prepend_class-target () { } PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install_append_class-native() { +do_install:append:class-native() { mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config @@ -54,7 +54,7 @@ do_install_append_class-native() { cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} } -do_install_append_class-target() { +do_install:append:class-target() { # The native pkgdata can not generate the correct data file. # Use icupkg to re-generate it. if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then @@ -73,13 +73,13 @@ do_install_append_class-target() { PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" -FILES_${PN}-dev += "${libdir}/${BPN}/" +FILES:${PN}-dev += "${libdir}/${BPN}/" -FILES_libicudata = "${libdir}/libicudata.so.*" -FILES_libicuuc = "${libdir}/libicuuc.so.*" -FILES_libicui18n = "${libdir}/libicui18n.so.*" -FILES_libicutu = "${libdir}/libicutu.so.*" -FILES_libicuio = "${libdir}/libicuio.so.*" +FILES:libicudata = "${libdir}/libicudata.so.*" +FILES:libicuuc = "${libdir}/libicuuc.so.*" +FILES:libicui18n = "${libdir}/libicui18n.so.*" +FILES:libicutu = "${libdir}/libicutu.so.*" +FILES:libicuio = "${libdir}/libicuio.so.*" BBCLASSEXTEND = "native nativesdk" @@ -97,8 +97,8 @@ ICU_PV = "${@icu_download_version(d)}" ICU_FOLDER = "${@icu_download_folder(d)}" # http://errors.yoctoproject.org/Errors/Details/20486/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" DATA_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-data.zip" @@ -109,7 +109,7 @@ SRC_URI = "${BASE_SRC_URI};name=code \ file://0001-icu-Added-armeb-support.patch \ " -SRC_URI_append_class-target = "\ +SRC_URI:append:class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " SRC_URI[code.sha256sum] = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745" @@ -118,12 +118,12 @@ SRC_URI[data.sha256sum] = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204 UPSTREAM_CHECK_REGEX = "icu4c-(?P\d+(_\d+)+)-src" UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases" -EXTRA_OECONF_append_libc-musl = " ac_cv_func_strtod_l=no" +EXTRA_OECONF:append:libc-musl = " ac_cv_func_strtod_l=no" PACKAGECONFIG ?= "" PACKAGECONFIG[make-icudata] = ",,," -do_make_icudata_class-target () { +do_make_icudata:class-target () { ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} cd ${S} rm -rf data diff --git a/meta/recipes-support/iso-codes/iso-codes_4.6.0.bb b/meta/recipes-support/iso-codes/iso-codes_4.6.0.bb index f915716ce7..6dd9bfa24c 100644 --- a/meta/recipes-support/iso-codes/iso-codes_4.6.0.bb +++ b/meta/recipes-support/iso-codes/iso-codes_4.6.0.bb @@ -19,4 +19,4 @@ S = "${WORKDIR}/git" inherit allarch autotools -FILES_${PN} += "${datadir}/xml/" +FILES:${PN} += "${datadir}/xml/" diff --git a/meta/recipes-support/itstool/itstool_2.0.6.bb b/meta/recipes-support/itstool/itstool_2.0.6.bb index e28e2a2005..eba53e728d 100644 --- a/meta/recipes-support/itstool/itstool_2.0.6.bb +++ b/meta/recipes-support/itstool/itstool_2.0.6.bb @@ -12,13 +12,13 @@ inherit autotools python3native DEPENDS = "libxml2-native" SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2" -SRC_URI_append_class-native = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch" -SRC_URI_append_class-nativesdk = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch" -SRC_URI_append_class-target = " file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch" +SRC_URI:append:class-native = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch" +SRC_URI:append:class-nativesdk = " file://0001-Native-Don-t-use-build-time-hardcoded-python-binary-.patch" +SRC_URI:append:class-target = " file://0002-Don-t-use-build-time-hardcoded-python-binary-path.patch" SRC_URI[md5sum] = "4306eeba4f4aee6b393d14f9c3c57ca1" SRC_URI[sha256sum] = "6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9" BBCLASSEXTEND = "native nativesdk" -RDEPENDS_${PN} += "libxml2-python" +RDEPENDS:${PN} += "libxml2-python" diff --git a/meta/recipes-support/libassuan/libassuan_2.5.5.bb b/meta/recipes-support/libassuan/libassuan_2.5.5.bb index 3d12ea09e8..2d78911c65 100644 --- a/meta/recipes-support/libassuan/libassuan_2.5.5.bb +++ b/meta/recipes-support/libassuan/libassuan_2.5.5.bb @@ -6,8 +6,8 @@ HOMEPAGE = "http://www.gnupg.org/related_software/libassuan/" BUGTRACKER = "https://bugs.g10code.com/gnupg/index" LICENSE = "GPLv3+ & LGPLv2.1+" -LICENSE_${PN} = "LGPLv2.1+" -LICENSE_${PN}-doc = "GPLv3+" +LICENSE:${PN} = "LGPLv2.1+" +LICENSE:${PN}-doc = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/assuan.c;endline=20;md5=ab92143a5a2adabd06d7994d1467ea5c\ @@ -26,12 +26,12 @@ BINCONFIG = "${bindir}/libassuan-config" inherit autotools texinfo binconfig-disabled pkgconfig multilib_header -do_configure_prepend () { +do_configure:prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/*.m4 } -do_install_append () { +do_install:append () { oe_multilib_header assuan.h } diff --git a/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.10.bb b/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.10.bb index 3089d1f7ff..74afe9c92f 100644 --- a/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.10.bb +++ b/meta/recipes-support/libatomic-ops/libatomic-ops_7.6.10.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708 S = "${WORKDIR}/libatomic_ops-${PV}" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" inherit autotools pkgconfig diff --git a/meta/recipes-support/libbsd/libbsd_0.11.3.bb b/meta/recipes-support/libbsd/libbsd_0.11.3.bb index 55ecae2ea5..8daea9f762 100644 --- a/meta/recipes-support/libbsd/libbsd_0.11.3.bb +++ b/meta/recipes-support/libbsd/libbsd_0.11.3.bb @@ -28,7 +28,7 @@ HOMEPAGE = "https://libbsd.freedesktop.org/wiki/" # License: public-domain # License: public-domain-Colin-Plumb LICENSE = "BSD-3-Clause & BSD-4-Clause & ISC & PD" -LICENSE_${PN} = "BSD-3-Clause & ISC & PD" +LICENSE:${PN} = "BSD-3-Clause & ISC & PD" LIC_FILES_CHKSUM = "file://COPYING;md5=adf6172075bcc5837e33a8a688eb7e22" SECTION = "libs" diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb index 6cea422d11..1240589d00 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb +++ b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.2.bb @@ -1,6 +1,6 @@ require libcap-ng.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/libcap-ng:" +FILESEXTRAPATHS:prepend := "${THISDIR}/libcap-ng:" SUMMARY .= " - python" @@ -12,7 +12,7 @@ S = "${WORKDIR}/libcap-ng-${PV}" EXTRA_OECONF += "--with-python --with-python3" -do_install_append() { +do_install:append() { rm -rf ${D}${bindir} rm -rf ${D}${libdir}/.debug rm -f ${D}${libdir}/lib* @@ -23,6 +23,6 @@ do_install_append() { # PACKAGES = "${PN}" -FILES_${PN} = "${libdir}/python${PYTHON_BASEVERSION}" -FILES_${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/.debug/_capng.so" +FILES:${PN} = "${libdir}/python${PYTHON_BASEVERSION}" +FILES:${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/.debug/_capng.so" diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc index 64bc62de24..34374b4dbf 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng.inc +++ b/meta/recipes-support/libcap-ng/libcap-ng.inc @@ -13,7 +13,7 @@ SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \ SRC_URI[sha256sum] = "52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9" -EXTRA_OECONF_append_class-target = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h" -EXTRA_OECONF_append_class-nativesdk = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h" +EXTRA_OECONF:append:class-target = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h" +EXTRA_OECONF:append:class-nativesdk = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb index 6e6de45494..6e16e886b9 100644 --- a/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb +++ b/meta/recipes-support/libcap-ng/libcap-ng_0.8.2.bb @@ -6,7 +6,7 @@ EXTRA_OECONF += "--without-python --without-python3" BBCLASSEXTEND = "native nativesdk" -do_install_append() { +do_install:append() { # Moving libcap-ng to base_libdir if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then mkdir -p ${D}/${base_libdir}/ diff --git a/meta/recipes-support/libcap/libcap_2.51.bb b/meta/recipes-support/libcap/libcap_2.51.bb index a43dca9f13..3e653e371e 100644 --- a/meta/recipes-support/libcap/libcap_2.51.bb +++ b/meta/recipes-support/libcap/libcap_2.51.bb @@ -21,7 +21,7 @@ UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs inherit lib_package PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG_class-native ??= "" +PACKAGECONFIG:class-native ??= "" PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam" @@ -33,7 +33,7 @@ EXTRA_OEMAKE = " \ BUILD_GPERF=yes \ " -EXTRA_OEMAKE_append_class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}" +EXTRA_OEMAKE:append:class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}" do_compile() { unset CFLAGS BUILD_CFLAGS @@ -54,7 +54,7 @@ do_install() { SBINDIR="${sbindir}" } -do_install_append() { +do_install:append() { # Move the library to base_libdir install -d ${D}${base_libdir} if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then @@ -65,9 +65,9 @@ do_install_append() { fi } -FILES_${PN}-dev += "${base_libdir}/*.so" +FILES:${PN}-dev += "${base_libdir}/*.so" # pam files -FILES_${PN} += "${base_libdir}/security/*.so" +FILES:${PN} += "${base_libdir}/security/*.so" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libcheck/libcheck_0.15.2.bb b/meta/recipes-support/libcheck/libcheck_0.15.2.bb index 62823023c7..89bcafc453 100644 --- a/meta/recipes-support/libcheck/libcheck_0.15.2.bb +++ b/meta/recipes-support/libcheck/libcheck_0.15.2.bb @@ -21,13 +21,13 @@ inherit autotools pkgconfig texinfo CACHED_CONFIGUREVARS += "ac_cv_path_AWK_PATH=${bindir}/gawk" -RREPLACES_${PN} = "check (<= 0.9.5)" +RREPLACES:${PN} = "check (<= 0.9.5)" BBCLASSEXTEND = "native nativesdk" PACKAGES =+ "checkmk" -FILES_checkmk = "${bindir}/checkmk" +FILES:checkmk = "${bindir}/checkmk" -RDEPENDS_checkmk = "gawk" +RDEPENDS:checkmk = "gawk" diff --git a/meta/recipes-support/libevent/libevent_2.1.12.bb b/meta/recipes-support/libevent/libevent_2.1.12.bb index 6d53fea5a8..2a562fe2e9 100644 --- a/meta/recipes-support/libevent/libevent_2.1.12.bb +++ b/meta/recipes-support/libevent/libevent_2.1.12.bb @@ -40,11 +40,11 @@ PACKAGES_DYNAMIC = "^${PN}-.*$" python split_libevent_libs () { do_split_packages(d, '${libdir}', r'^libevent_([a-z]*)-.*\.so\..*', '${PN}-%s', '${SUMMARY} (%s)', prepend=True, allow_links=True) } -PACKAGESPLITFUNCS_prepend = "split_libevent_libs " +PACKAGESPLITFUNCS:prepend = "split_libevent_libs " BBCLASSEXTEND = "native nativesdk" -do_install_append() { +do_install:append() { rm ${D}${bindir}/event_rpcgen.py rmdir ${D}${bindir} oe_multilib_header event2/event-config.h diff --git a/meta/recipes-support/libffi/libffi_3.4.2.bb b/meta/recipes-support/libffi/libffi_3.4.2.bb index 19b6ed3e58..733fcc5e6c 100644 --- a/meta/recipes-support/libffi/libffi_3.4.2.bb +++ b/meta/recipes-support/libffi/libffi_3.4.2.bb @@ -19,14 +19,14 @@ UPSTREAM_CHECK_URI = "https://github.com/libffi/libffi/releases/" UPSTREAM_CHECK_REGEX = "libffi-(?P\d+(\.\d+)+)\.tar" EXTRA_OECONF += "--disable-builddir --disable-exec-static-tramp" -EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'" +EXTRA_OEMAKE:class-target = "LIBTOOLFLAGS='--tag=CC'" inherit autotools texinfo multilib_header -do_install_append() { +do_install:append() { oe_multilib_header ffi.h ffitarget.h } -FILES_${PN}-dev += "${libdir}/libffi-${PV}" +FILES:${PN}-dev += "${libdir}/libffi-${PV}" # Doesn't compile in MIPS16e mode due to use of hand-written # assembly diff --git a/meta/recipes-support/libfm/libfm_1.3.2.bb b/meta/recipes-support/libfm/libfm_1.3.2.bb index eb0949ae7d..79c7c8eeda 100644 --- a/meta/recipes-support/libfm/libfm_1.3.2.bb +++ b/meta/recipes-support/libfm/libfm_1.3.2.bb @@ -29,7 +29,7 @@ do_configure[dirs] =+ "${S}/m4" PACKAGES =+ "libfm-gtk" PACKAGES += "${PN}-mime" -FILES_libfm-gtk = " \ +FILES:libfm-gtk = " \ ${libdir}/libfm-gtk*so.* \ ${libdir}/libfm/modules/gtk* \ ${bindir}/libfm-pref-apps \ @@ -40,9 +40,9 @@ FILES_libfm-gtk = " \ ${datadir}/libfm/images/unknown.png \ ${datadir}/libfm/ui/*.ui \ " -FILES_${PN}-mime = "${datadir}/mime/" +FILES:${PN}-mime = "${datadir}/mime/" -do_install_append () { +do_install:append () { # remove files which are part of libfm-extra rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h rm -f ${D}${includedir}/libfm-1.0/fm-version.h diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.9.3.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.9.3.bb index fd3d8e09f2..dee936dbc4 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt_1.9.3.bb +++ b/meta/recipes-support/libgcrypt/libgcrypt_1.9.3.bb @@ -8,9 +8,9 @@ SECTION = "libs" # helper program gcryptrnd and getrandom are under GPL, rest LGPL LICENSE = "GPLv2+ & LGPLv2.1+ & GPLv3+" -LICENSE_${PN} = "LGPLv2.1+" -LICENSE_${PN}-dev = "GPLv2+ & LGPLv2.1+" -LICENSE_dumpsexp-dev = "GPLv3+" +LICENSE:${PN} = "LGPLv2.1+" +LICENSE:${PN}-dev = "GPLv2+ & LGPLv2.1+" +LICENSE:dumpsexp-dev = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \ @@ -37,25 +37,25 @@ BINCONFIG = "${bindir}/libgcrypt-config" inherit autotools texinfo binconfig-disabled pkgconfig EXTRA_OECONF = "--disable-asm" -EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'" +EXTRA_OEMAKE:class-target = "LIBTOOLFLAGS='--tag=CC'" PACKAGECONFIG ??= "capabilities" PACKAGECONFIG[capabilities] = "--with-capabilities,--without-capabilities,libcap" -do_configure_prepend () { +do_configure:prepend () { # Else this could be used in preference to the one in aclocal-copy rm -f ${S}/m4/gpg-error.m4 } # libgcrypt.pc is added locally and thus installed here -do_install_append() { +do_install:append() { install -d ${D}/${libdir}/pkgconfig install -m 0644 ${B}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/ } PACKAGES =+ "dumpsexp-dev" -FILES_${PN}-dev += "${bindir}/hmac256" -FILES_dumpsexp-dev += "${bindir}/dumpsexp" +FILES:${PN}-dev += "${bindir}/hmac256" +FILES:dumpsexp-dev += "${bindir}/dumpsexp" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.42.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.42.bb index c972d9a953..04f5760b76 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.42.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.42.bb @@ -31,13 +31,13 @@ MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/gpgrt-config" CPPFLAGS += "-P" -do_install_append() { +do_install:append() { # we don't have common lisp in OE rm -rf "${D}${datadir}/common-lisp/" oe_multilib_header gpg-error.h gpgrt.h } -FILES_${PN}-dev += "${bindir}/gpg-error" -FILES_${PN}-doc += "${datadir}/libgpg-error/errorref.txt" +FILES:${PN}-dev += "${bindir}/gpg-error" +FILES:${PN}-doc += "${datadir}/libgpg-error/errorref.txt" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libical/libical_3.0.10.bb b/meta/recipes-support/libical/libical_3.0.10.bb index 30d6bbfd0f..aa5f11e817 100644 --- a/meta/recipes-support/libical/libical_3.0.10.bb +++ b/meta/recipes-support/libical/libical_3.0.10.bb @@ -19,7 +19,7 @@ UPSTREAM_CHECK_URI = "https://github.com/libical/libical/releases" inherit cmake pkgconfig -DEPENDS_append_class-target = "libical-native" +DEPENDS:append:class-target = "libical-native" PACKAGECONFIG ??= "icu glib" PACKAGECONFIG[bdb] = ",-DCMAKE_DISABLE_FIND_PACKAGE_BDB=True,db" @@ -32,9 +32,9 @@ EXTRA_OECMAKE += "-DPERL_EXECUTABLE=${HOSTTOOLS_DIR}/perl" # doc build fails with linker error (??) for libical-glib so disable it EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false" -EXTRA_OECMAKE_append_class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" +EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" -do_install_append () { +do_install:append () { # Remove build host references sed -i \ -e 's,${STAGING_LIBDIR},${libdir},g' \ diff --git a/meta/recipes-support/libksba/libksba_1.6.0.bb b/meta/recipes-support/libksba/libksba_1.6.0.bb index 552007d6cc..1374394610 100644 --- a/meta/recipes-support/libksba/libksba_1.6.0.bb +++ b/meta/recipes-support/libksba/libksba_1.6.0.bb @@ -6,8 +6,8 @@ library does not rely on another cryptographic library but provides \ hooks for easy integration with Libgcrypt. " HOMEPAGE = "http://www.gnupg.org/related_software/libksba/" LICENSE = "GPLv3+ & (GPLv2+ | LGPLv3+)" -LICENSE_${PN} = "GPLv2+ | LGPLv3+" -LICENSE_${PN}-doc = "GPLv3+" +LICENSE:${PN} = "GPLv2+ | LGPLv3+" +LICENSE:${PN}-doc = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=fd541d83f75d038c4e0617b672ed8bda \ file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ @@ -26,7 +26,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ SRC_URI[sha256sum] = "dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b" -do_configure_prepend () { +do_configure:prepend () { # Else these could be used in preference to those in aclocal-copy rm -f ${S}/m4/gpg-error.m4 } diff --git a/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.73.bb b/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.73.bb index 219f0c44d6..0b5901bc74 100644 --- a/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.73.bb +++ b/meta/recipes-support/libmicrohttpd/libmicrohttpd_0.9.73.bb @@ -17,14 +17,14 @@ CFLAGS += "-pthread -D_REENTRANT" EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" PACKAGECONFIG ?= "curl https" -PACKAGECONFIG_append_class-target = "\ +PACKAGECONFIG:append:class-target = "\ ${@bb.utils.filter('DISTRO_FEATURES', 'largefile', d)} \ " PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," PACKAGECONFIG[https] = "--enable-https,--disable-https,libgcrypt gnutls," -do_compile_append() { +do_compile:append() { sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc } diff --git a/meta/recipes-support/libnl/libnl_3.5.0.bb b/meta/recipes-support/libnl/libnl_3.5.0.bb index 9753f93267..7480202f13 100644 --- a/meta/recipes-support/libnl/libnl_3.5.0.bb +++ b/meta/recipes-support/libnl/libnl_3.5.0.bb @@ -28,32 +28,32 @@ UPSTREAM_CHECK_URI = "https://github.com/thom311/${BPN}/releases" inherit autotools pkgconfig ptest -FILES_${PN} = "${libdir}/libnl-3.so.* \ +FILES:${PN} = "${libdir}/libnl-3.so.* \ ${libdir}/libnl.so.* \ ${sysconfdir}" -RREPLACES_${PN} = "libnl2" -RCONFLICTS_${PN} = "libnl2" +RREPLACES:${PN} = "libnl2" +RCONFLICTS:${PN} = "libnl2" -FILES_${PN}-dev += "${libdir}/libnl/cli/*/*.la" -FILES_${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" +FILES:${PN}-dev += "${libdir}/libnl/cli/*/*.la" +FILES:${PN}-staticdev += "${libdir}/libnl/cli/*/*.a" PACKAGES += "${PN}-cli ${PN}-genl ${PN}-idiag ${PN}-nf ${PN}-route ${PN}-xfrm" -FILES_${PN}-cli = "${libdir}/libnl-cli-3.so.* \ +FILES:${PN}-cli = "${libdir}/libnl-cli-3.so.* \ ${libdir}/libnl/cli/*/*.so \ ${bindir}/genl-ctrl-list \ ${bindir}/idiag-socket-details \ ${bindir}/nf-* \ ${bindir}/nl-*" -FILES_${PN}-genl = "${libdir}/libnl-genl-3.so.* \ +FILES:${PN}-genl = "${libdir}/libnl-genl-3.so.* \ ${libdir}/libnl-genl.so.*" -FILES_${PN}-idiag = "${libdir}/libnl-idiag-3.so.*" -FILES_${PN}-nf = "${libdir}/libnl-nf-3.so.*" -FILES_${PN}-route = "${libdir}/libnl-route-3.so.*" -FILES_${PN}-xfrm = "${libdir}/libnl-xfrm-3.so.*" -RREPLACES_${PN}-genl = "libnl-genl2" -RCONFLICTS_${PN}-genl = "libnl-genl2" - -RDEPENDS_${PN}-ptest += "libcheck" +FILES:${PN}-idiag = "${libdir}/libnl-idiag-3.so.*" +FILES:${PN}-nf = "${libdir}/libnl-nf-3.so.*" +FILES:${PN}-route = "${libdir}/libnl-route-3.so.*" +FILES:${PN}-xfrm = "${libdir}/libnl-xfrm-3.so.*" +RREPLACES:${PN}-genl = "libnl-genl2" +RCONFLICTS:${PN}-genl = "libnl-genl2" + +RDEPENDS:${PN}-ptest += "libcheck" DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'libcheck', '', d)}" # make sure the tests don't link against wrong so file diff --git a/meta/recipes-support/libpcre/libpcre2_10.37.bb b/meta/recipes-support/libpcre/libpcre2_10.37.bb index b596fbe87d..e0ead59da6 100644 --- a/meta/recipes-support/libpcre/libpcre2_10.37.bb +++ b/meta/recipes-support/libpcre/libpcre2_10.37.bb @@ -33,20 +33,20 @@ EXTRA_OECONF = "\ --enable-pcre2-32 \ " CFLAGS += "-D_REENTRANT" -CXXFLAGS_append_powerpc = " -lstdc++" +CXXFLAGS:append:powerpc = " -lstdc++" PACKAGES =+ "libpcre2-16 libpcre2-32 pcre2grep pcre2grep-doc pcre2test pcre2test-doc" -SUMMARY_pcre2grep = "grep utility that uses perl 5 compatible regexes" -SUMMARY_pcre2grep-doc = "grep utility that uses perl 5 compatible regexes - docs" -SUMMARY_pcre2test = "program for testing Perl-comatible regular expressions" -SUMMARY_pcre2test-doc = "program for testing Perl-comatible regular expressions - docs" - -FILES_libpcre2-16 = "${libdir}/libpcre2-16.so.*" -FILES_libpcre2-32 = "${libdir}/libpcre2-32.so.*" -FILES_pcre2grep = "${bindir}/pcre2grep" -FILES_pcre2grep-doc = "${mandir}/man1/pcre2grep.1" -FILES_pcre2test = "${bindir}/pcre2test" -FILES_pcre2test-doc = "${mandir}/man1/pcre2test.1" +SUMMARY:pcre2grep = "grep utility that uses perl 5 compatible regexes" +SUMMARY:pcre2grep-doc = "grep utility that uses perl 5 compatible regexes - docs" +SUMMARY:pcre2test = "program for testing Perl-comatible regular expressions" +SUMMARY:pcre2test-doc = "program for testing Perl-comatible regular expressions - docs" + +FILES:libpcre2-16 = "${libdir}/libpcre2-16.so.*" +FILES:libpcre2-32 = "${libdir}/libpcre2-32.so.*" +FILES:pcre2grep = "${bindir}/pcre2grep" +FILES:pcre2grep-doc = "${mandir}/man1/pcre2grep.1" +FILES:pcre2test = "${bindir}/pcre2test" +FILES:pcre2test-doc = "${mandir}/man1/pcre2test.1" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libpcre/libpcre_8.45.bb b/meta/recipes-support/libpcre/libpcre_8.45.bb index 345c46e86e..76b20f5f08 100644 --- a/meta/recipes-support/libpcre/libpcre_8.45.bb +++ b/meta/recipes-support/libpcre/libpcre_8.45.bb @@ -38,19 +38,19 @@ EXTRA_OECONF = "--enable-utf" PACKAGES =+ "libpcrecpp libpcreposix pcregrep pcregrep-doc pcretest pcretest-doc" -SUMMARY_libpcrecpp = "${SUMMARY} - C++ wrapper functions" -SUMMARY_libpcreposix = "${SUMMARY} - C wrapper functions based on the POSIX regex API" -SUMMARY_pcregrep = "grep utility that uses perl 5 compatible regexes" -SUMMARY_pcregrep-doc = "grep utility that uses perl 5 compatible regexes - docs" -SUMMARY_pcretest = "program for testing Perl-comatible regular expressions" -SUMMARY_pcretest-doc = "program for testing Perl-comatible regular expressions - docs" +SUMMARY:libpcrecpp = "${SUMMARY} - C++ wrapper functions" +SUMMARY:libpcreposix = "${SUMMARY} - C wrapper functions based on the POSIX regex API" +SUMMARY:pcregrep = "grep utility that uses perl 5 compatible regexes" +SUMMARY:pcregrep-doc = "grep utility that uses perl 5 compatible regexes - docs" +SUMMARY:pcretest = "program for testing Perl-comatible regular expressions" +SUMMARY:pcretest-doc = "program for testing Perl-comatible regular expressions - docs" -FILES_libpcrecpp = "${libdir}/libpcrecpp.so.*" -FILES_libpcreposix = "${libdir}/libpcreposix.so.*" -FILES_pcregrep = "${bindir}/pcregrep" -FILES_pcregrep-doc = "${mandir}/man1/pcregrep.1" -FILES_pcretest = "${bindir}/pcretest" -FILES_pcretest-doc = "${mandir}/man1/pcretest.1" +FILES:libpcrecpp = "${libdir}/libpcrecpp.so.*" +FILES:libpcreposix = "${libdir}/libpcreposix.so.*" +FILES:pcregrep = "${bindir}/pcregrep" +FILES:pcregrep-doc = "${mandir}/man1/pcregrep.1" +FILES:pcretest = "${bindir}/pcretest" +FILES:pcretest-doc = "${mandir}/man1/pcretest.1" BBCLASSEXTEND = "native nativesdk" @@ -70,4 +70,4 @@ do_install_ptest() { sed -i -e 's:do3=yes:do3=no:g' ${D}${PTEST_PATH}/RunTest } -RDEPENDS_${PN}-ptest += "make" +RDEPENDS:${PN}-ptest += "make" diff --git a/meta/recipes-support/libproxy/libproxy_0.4.17.bb b/meta/recipes-support/libproxy/libproxy_0.4.17.bb index c2579b3941..7e97d36339 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.17.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.17.bb @@ -37,6 +37,6 @@ EXTRA_OECMAKE += " \ -DLIB_INSTALL_DIR=${libdir} \ -DLIBEXEC_INSTALL_DIR=${libexecdir} \ " -SECURITY_PIE_CFLAGS_remove = "-fPIE -pie" +SECURITY_PIE_CFLAGS:remove = "-fPIE -pie" -FILES_${PN} += "${libdir}/${BPN}/${PV}/modules" +FILES:${PN} += "${libdir}/${BPN}/${PV}/modules" diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb b/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb index 79736f2ad1..74bface4a1 100644 --- a/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb +++ b/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb @@ -50,7 +50,7 @@ do_install_ptest() { done } -FILES_${PN} = "${bindir} ${libdir}/${BPN}.so*" -FILES_${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" +FILES:${PN} = "${bindir} ${libdir}/${BPN}.so*" +FILES:${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" -RDEPENDS_${PN}-ptest = "coreutils bash" +RDEPENDS:${PN}-ptest = "coreutils bash" diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb index 5b74119d94..3149896466 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.72.0.bb @@ -28,7 +28,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false" PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5" -EXTRA_OEMESON_append = " -Dvapi=disabled -Dtls_check=false" +EXTRA_OEMESON:append = " -Dvapi=disabled -Dtls_check=false" GTKDOC_MESON_OPTION = "gtk_doc" @@ -36,9 +36,9 @@ GTKDOC_MESON_OPTION = "gtk_doc" # and will therefore become subject to renaming by debian.bbclass. Prevent # renaming in order to keep the package name consistent regardless of whether # gnome support is enabled or disabled. -DEBIAN_NOAUTONAME_${PN} = "1" +DEBIAN_NOAUTONAME:${PN} = "1" # glib-networking is needed for SSL, proxies, etc. -RRECOMMENDS_${PN} = "glib-networking" +RRECOMMENDS:${PN} = "glib-networking" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libssh2/libssh2_1.9.0.bb b/meta/recipes-support/libssh2/libssh2_1.9.0.bb index f290bf3268..9ae736d25a 100644 --- a/meta/recipes-support/libssh2/libssh2_1.9.0.bb +++ b/meta/recipes-support/libssh2/libssh2_1.9.0.bb @@ -14,7 +14,7 @@ SRC_URI = "http://www.libssh2.org/download/${BP}.tar.gz \ file://0001-kex.c-move-EC-macro-outside-of-if-check-549-550.patch \ " -SRC_URI_append_ptest = " file://0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch" +SRC_URI:append_ptest = " file://0001-Don-t-let-host-enviroment-to-decide-if-a-test-is-bui.patch" SRC_URI[md5sum] = "1beefafe8963982adc84b408b2959927" SRC_URI[sha256sum] = "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" @@ -34,8 +34,8 @@ PACKAGECONFIG[gcrypt] = "--with-crypto=libgcrypt --with-libgcrypt-prefix=${STAGI BBCLASSEXTEND = "native nativesdk" # required for ptest on documentation -RDEPENDS_${PN}-ptest = "man-db openssh util-linux-col" -RDEPENDS_${PN}-ptest_append_libc-glibc = " locale-base-en-us" +RDEPENDS:${PN}-ptest = "man-db openssh util-linux-col" +RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-en-us" do_compile_ptest() { sed -i "/\$(MAKE) \$(AM_MAKEFLAGS) check-TESTS/d" tests/Makefile diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc index 17ba151933..bf74f9fa3c 100644 --- a/meta/recipes-support/libunwind/libunwind.inc +++ b/meta/recipes-support/libunwind/libunwind.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.nongnu.org/libunwind" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=2d80c8ed4062b8339b715f90fa68cc9f" DEPENDS += "libatomic-ops" -DEPENDS_append_libc-musl = " libucontext" +DEPENDS:append:libc-musl = " libucontext" inherit autotools multilib_header @@ -12,11 +12,11 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,xz" PACKAGECONFIG[latexdocs] = "--enable-documentation, --disable-documentation, latex2man-native" -EXTRA_OECONF_arm = "--enable-debug-frame" -EXTRA_OECONF_armeb = "--enable-debug-frame" -EXTRA_OECONF_aarch64 = "--enable-debug-frame" +EXTRA_OECONF:arm = "--enable-debug-frame" +EXTRA_OECONF:armeb = "--enable-debug-frame" +EXTRA_OECONF:aarch64 = "--enable-debug-frame" -do_install_append () { +do_install:append () { oe_multilib_header libunwind.h } diff --git a/meta/recipes-support/libunwind/libunwind_1.5.0.bb b/meta/recipes-support/libunwind/libunwind_1.5.0.bb index 6392cac5c9..9b515b58f4 100644 --- a/meta/recipes-support/libunwind/libunwind_1.5.0.bb +++ b/meta/recipes-support/libunwind/libunwind_1.5.0.bb @@ -8,21 +8,21 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV file://0006-Fix-for-X32.patch \ file://0001-configure-Do-not-enforce-libdir-for-ppc64.patch \ " -SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" +SRC_URI:append:libc-musl = " file://musl-header-conflict.patch" SRC_URI[md5sum] = "c6923dda0675f6a4ef21426164dc8b6a" SRC_URI[sha256sum] = "90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017" -EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests --enable-static" +EXTRA_OECONF:append:libc-musl = " --disable-documentation --disable-tests --enable-static" # http://errors.yoctoproject.org/Errors/Details/20487/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SECURITY_LDFLAGS_append_libc-musl = " -lssp_nonshared" -CACHED_CONFIGUREVARS_append_libc-musl = " LDFLAGS='${LDFLAGS} -lucontext'" +SECURITY_LDFLAGS:append:libc-musl = " -lssp_nonshared" +CACHED_CONFIGUREVARS:append:libc-musl = " LDFLAGS='${LDFLAGS} -lucontext'" diff --git a/meta/recipes-support/liburcu/liburcu_0.13.0.bb b/meta/recipes-support/liburcu/liburcu_0.13.0.bb index c9fef89789..aba8d070ed 100644 --- a/meta/recipes-support/liburcu/liburcu_0.13.0.bb +++ b/meta/recipes-support/liburcu/liburcu_0.13.0.bb @@ -18,8 +18,8 @@ SRC_URI[sha256sum] = "cbb20dbe1a892c2a4d8898bac4316176e585392693d498766ccbbc68cf S = "${WORKDIR}/userspace-rcu-${PV}" inherit autotools multilib_header -CPPFLAGS_append_riscv64 = " -pthread -D_REENTRANT" +CPPFLAGS:append:riscv64 = " -pthread -D_REENTRANT" -do_install_append() { +do_install:append() { oe_multilib_header urcu/config.h } diff --git a/meta/recipes-support/libusb/libusb1_1.0.24.bb b/meta/recipes-support/libusb/libusb1_1.0.24.bb index 92e66b1b16..95a20958a1 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.24.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.24.bb @@ -20,12 +20,12 @@ S = "${WORKDIR}/libusb-${PV}" inherit autotools pkgconfig ptest -PACKAGECONFIG_class-target ??= "udev" +PACKAGECONFIG:class-target ??= "udev" PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" EXTRA_OECONF = "--libdir=${base_libdir}" -do_install_append() { +do_install:append() { install -d ${D}${libdir} if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then mv ${D}${base_libdir}/pkgconfig ${D}${libdir} @@ -40,6 +40,6 @@ do_install_ptest() { install -m 755 ${B}/tests/.libs/stress ${D}${PTEST_PATH} } -FILES_${PN} += "${base_libdir}/*.so.*" +FILES:${PN} += "${base_libdir}/*.so.*" -FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" +FILES:${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la" diff --git a/meta/recipes-support/libxslt/libxslt_1.1.34.bb b/meta/recipes-support/libxslt/libxslt_1.1.34.bb index 63cce6fe06..c888f3d7e1 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.34.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.34.bb @@ -27,7 +27,7 @@ BINCONFIG = "${bindir}/xslt-config" inherit autotools pkgconfig binconfig-disabled lib_package multilib_header -do_configure_prepend () { +do_configure:prepend () { # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header. # This can be removed when upgrading to 1.1.34. sed -i -e 's/ansidecl.h//' ${S}/configure.ac @@ -39,20 +39,20 @@ do_configure_prepend () { EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto --with-html-subdir=${BPN}" # older versions of this recipe had ${PN}-utils -RPROVIDES_${PN}-bin += "${PN}-utils" -RCONFLICTS_${PN}-bin += "${PN}-utils" -RREPLACES_${PN}-bin += "${PN}-utils" +RPROVIDES:${PN}-bin += "${PN}-utils" +RCONFLICTS:${PN}-bin += "${PN}-utils" +RREPLACES:${PN}-bin += "${PN}-utils" # This is only needed until libxml can load the relocated catalog itself -do_install_append_class-native () { +do_install:append:class-native () { create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog } -do_install_append () { +do_install:append () { oe_multilib_header libxslt/xsltconfig.h } -FILES_${PN} += "${libdir}/libxslt-plugins" -FILES_${PN}-dev += "${libdir}/xsltConf.sh" +FILES:${PN} += "${libdir}/libxslt-plugins" +FILES:${PN}-dev += "${libdir}/xsltConf.sh" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libyaml/libyaml_0.2.5.bb b/meta/recipes-support/libyaml/libyaml_0.2.5.bb index 778e091638..4cb5717ece 100644 --- a/meta/recipes-support/libyaml/libyaml_0.2.5.bb +++ b/meta/recipes-support/libyaml/libyaml_0.2.5.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/yaml-${PV}" inherit autotools -DISABLE_STATIC_class-nativesdk = "" -DISABLE_STATIC_class-native = "" +DISABLE_STATIC:class-nativesdk = "" +DISABLE_STATIC:class-native = "" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/lzop/lzop_1.04.bb b/meta/recipes-support/lzop/lzop_1.04.bb index 59c2003b74..8ac7efbbfd 100644 --- a/meta/recipes-support/lzop/lzop_1.04.bb +++ b/meta/recipes-support/lzop/lzop_1.04.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f30 inherit autotools -do_configure_prepend () { +do_configure:prepend () { install -Dm 0644 ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4 } diff --git a/meta/recipes-support/nettle/nettle_3.7.3.bb b/meta/recipes-support/nettle/nettle_3.7.3.bb index 031500d741..877f5f169f 100644 --- a/meta/recipes-support/nettle/nettle_3.7.3.bb +++ b/meta/recipes-support/nettle/nettle_3.7.3.bb @@ -20,7 +20,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://check-header-files-of-openssl-only-if-enable_.patch \ " -SRC_URI_append_class-target = "\ +SRC_URI:append:class-target = "\ file://dlopen-test.patch \ " @@ -38,7 +38,7 @@ do_compile_ptest() { oe_runmake buildtest } -do_install_append() { +do_install:append() { oe_multilib_header nettle/version.h } @@ -51,7 +51,7 @@ do_install_ptest() { install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ } -RDEPENDS_${PN}-ptest += "${PN}-dev" -INSANE_SKIP_${PN}-ptest += "dev-deps" +RDEPENDS:${PN}-ptest += "${PN}-dev" +INSANE_SKIP:${PN}-ptest += "dev-deps" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/npth/npth_1.6.bb b/meta/recipes-support/npth/npth_1.6.bb index d5a149e041..8c94cc22c1 100644 --- a/meta/recipes-support/npth/npth_1.6.bb +++ b/meta/recipes-support/npth/npth_1.6.bb @@ -19,10 +19,10 @@ BINCONFIG = "${bindir}/npth-config" inherit autotools binconfig-disabled multilib_header -FILES_${PN} = "${libdir}/libnpth.so.*" -FILES_${PN}-dev += "${bindir}/npth-config" +FILES:${PN} = "${libdir}/libnpth.so.*" +FILES:${PN}-dev += "${bindir}/npth-config" -do_install_append() { +do_install:append() { oe_multilib_header npth.h } diff --git a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb index 074f713205..969e20e283 100644 --- a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb +++ b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb @@ -14,18 +14,18 @@ SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67 inherit autotools features_check -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' # The systemd has its own copy of nss-myhostname CONFLICT_DISTRO_FEATURES = "systemd" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { sed -e '/^hosts:/s/\s*\//' \ -e 's/\(^hosts:.*\)\(\\)\(.*\)\(\\)\(.*\)/\1\2 myhostname \3\4\5/' \ -i $D${sysconfdir}/nsswitch.conf } -pkg_prerm_${PN} () { +pkg_prerm:${PN} () { sed -e '/^hosts:/s/\s*\//' \ -e '/^hosts:/s/\s*myhostname//' \ -i $D${sysconfdir}/nsswitch.conf diff --git a/meta/recipes-support/numactl/numactl_git.bb b/meta/recipes-support/numactl/numactl_git.bb index 6c8a667a41..7b1b14d1d5 100644 --- a/meta/recipes-support/numactl/numactl_git.bb +++ b/meta/recipes-support/numactl/numactl_git.bb @@ -22,8 +22,8 @@ SRC_URI = "git://github.com/numactl/numactl \ S = "${WORKDIR}/git" -LDFLAGS_append_riscv64 = " -latomic" -LDFLAGS_append_riscv32 = " -latomic" +LDFLAGS:append:riscv64 = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" do_install() { oe_runmake DESTDIR=${D} prefix=${D}/usr install @@ -56,4 +56,4 @@ do_install_ptest() { install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/ } -RDEPENDS_${PN}-ptest = "bash" +RDEPENDS:${PN}-ptest = "bash" diff --git a/meta/recipes-support/p11-kit/p11-kit_0.24.0.bb b/meta/recipes-support/p11-kit/p11-kit_0.24.0.bb index 6759168b37..9cac87ed32 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.24.0.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.24.0.bb @@ -8,7 +8,7 @@ inherit meson gettext pkgconfig gtk-doc bash-completion manpages DEPENDS = "libtasn1 libtasn1-native libffi" -DEPENDS_append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" +DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" SRC_URI = "git://github.com/p11-glue/p11-kit" SRCREV = "34826623f58399b24c21f1788e2cdaea34521b7b" @@ -20,13 +20,13 @@ PACKAGECONFIG[trust-paths] = "-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,, GTKDOC_MESON_OPTION = 'gtk_doc' -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/p11-kit-proxy.so \ ${libdir}/pkcs11/*.so \ ${libdir}/pkcs11/*.la \ ${systemd_user_unitdir}/*" # PN contains p11-kit-proxy.so, a symlink to a loadable module -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.1.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.1.bb index 6bd10d2fec..c6a1ab1781 100644 --- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.1.bb +++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.1.bb @@ -15,7 +15,7 @@ SRC_URI = "git://git.yoctoproject.org/ptest-runner2 \ S = "${WORKDIR}/git" -FILES_${PN} = "${bindir}/ptest-runner" +FILES:${PN} = "${bindir}/ptest-runner" EXTRA_OEMAKE = "-e MAKEFLAGS= CFLAGS="${CFLAGS} -DDEFAULT_DIRECTORY=\\\"${libdir}\\\""" @@ -27,4 +27,4 @@ do_install () { install -D -m 0755 ${S}/ptest-runner ${D}${bindir}/ptest-runner } -RDEPENDS_${PN}_append_libc-glibc = " libgcc" +RDEPENDS:${PN}:append:libc-glibc = " libgcc" diff --git a/meta/recipes-support/rng-tools/rng-tools_6.13.bb b/meta/recipes-support/rng-tools/rng-tools_6.13.bb index fb2fd63c5d..84dbc76855 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.13.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.13.bb @@ -23,7 +23,7 @@ inherit autotools update-rc.d systemd pkgconfig EXTRA_OECONF = "--without-rtlsdr" PACKAGECONFIG ??= "libjitterentropy" -PACKAGECONFIG_libc-musl = "libargp libjitterentropy" +PACKAGECONFIG:libc-musl = "libargp libjitterentropy" PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone," PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,--disable-jitterentropy,libjitterentropy" @@ -33,14 +33,14 @@ PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2 INITSCRIPT_NAME = "rng-tools" INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ." -SYSTEMD_SERVICE_${PN} = "rngd.service" +SYSTEMD_SERVICE:${PN} = "rngd.service" # Refer autogen.sh in rng-tools -do_configure_prepend() { +do_configure:prepend() { cp ${S}/README.md ${S}/README } -do_install_append() { +do_install:append() { install -Dm 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools install -Dm 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools install -Dm 0644 ${WORKDIR}/rngd.service \ diff --git a/meta/recipes-support/serf/serf_1.3.9.bb b/meta/recipes-support/serf/serf_1.3.9.bb index 3276d40df6..21515866a9 100644 --- a/meta/recipes-support/serf/serf_1.3.9.bb +++ b/meta/recipes-support/serf/serf_1.3.9.bb @@ -36,7 +36,7 @@ EXTRA_OESCONS = " \ " # scons creates non-reproducible archives -do_install_append() { +do_install:append() { rm ${D}/${libdir}/*.a } diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb index ff32259d8e..714aca62f0 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb @@ -17,13 +17,13 @@ inherit meson pkgconfig gettext python3native mime EXTRA_OEMESON = "-Dupdate-mimedb=true" -FILES_${PN} += "${datadir}/mime" -FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc ${datadir}/gettext/its" +FILES:${PN} += "${datadir}/mime" +FILES:${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc ${datadir}/gettext/its" # freedesktop.org.xml is only required when updating the mime database, # package it separately PACKAGES =+ "shared-mime-info-data" -FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml" -RDEPENDS_shared-mime-info-data = "shared-mime-info" +FILES:shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml" +RDEPENDS:shared-mime-info-data = "shared-mime-info" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc index 1adc0eba66..aa5dc0974b 100644 --- a/meta/recipes-support/sqlite/sqlite3.inc +++ b/meta/recipes-support/sqlite/sqlite3.inc @@ -24,7 +24,7 @@ inherit autotools pkgconfig siteinfo # enable those which are enabled by default in configure PACKAGECONFIG ?= "fts4 fts5 json1 rtree dyn_ext" -PACKAGECONFIG_class-native ?= "fts4 fts5 json1 rtree dyn_ext" +PACKAGECONFIG:class-native ?= "fts4 fts5 json1 rtree dyn_ext" PACKAGECONFIG[editline] = "--enable-editline,--disable-editline,libedit" PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline ncurses" @@ -46,23 +46,23 @@ EXTRA_OECONF = " \ " # pread() is in POSIX.1-2001 so any reasonable system must surely support it -CFLAGS_append = " -DUSE_PREAD" +CFLAGS:append = " -DUSE_PREAD" # Provide column meta-data API -CFLAGS_append = " -DSQLITE_ENABLE_COLUMN_METADATA" +CFLAGS:append = " -DSQLITE_ENABLE_COLUMN_METADATA" # Unless SQLITE_BYTEORDER is predefined, the code falls back to build time # huristics, which are not always correct -CFLAGS_append = " ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DSQLITE_BYTEORDER=1234', '-DSQLITE_BYTEORDER=4321', d)}" +CFLAGS:append = " ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DSQLITE_BYTEORDER=1234', '-DSQLITE_BYTEORDER=4321', d)}" PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}" -FILES_${PN} = "${bindir}/*" -FILES_lib${BPN} = "${libdir}/*.so.*" -FILES_lib${BPN}-dev = "${libdir}/*.la ${libdir}/*.so \ +FILES:${PN} = "${bindir}/*" +FILES:lib${BPN} = "${libdir}/*.so.*" +FILES:lib${BPN}-dev = "${libdir}/*.la ${libdir}/*.so \ ${libdir}/pkgconfig ${includedir}" -FILES_lib${BPN}-doc = "${docdir} ${mandir} ${infodir}" -FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" +FILES:lib${BPN}-doc = "${docdir} ${mandir} ${infodir}" +FILES:lib${BPN}-staticdev = "${libdir}/lib*.a" AUTO_LIBNAME_PKGS = "${MLPREFIX}lib${BPN}" diff --git a/meta/recipes-support/taglib/taglib_1.12.bb b/meta/recipes-support/taglib/taglib_1.12.bb index efa56253bb..2b0961818a 100644 --- a/meta/recipes-support/taglib/taglib_1.12.bb +++ b/meta/recipes-support/taglib/taglib_1.12.bb @@ -21,7 +21,7 @@ BINCONFIG = "${bindir}/taglib-config" inherit cmake pkgconfig binconfig-disabled PACKAGES =+ "${PN}-c" -FILES_${PN}-c = "${libdir}/libtag_c.so.*" +FILES:${PN}-c = "${libdir}/libtag_c.so.*" EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ -DCMAKE_DISABLE_FIND_PACKAGE_Boost=TRUE \ @@ -32,7 +32,7 @@ EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON \ " CXXFLAGS += "-std=c++11" -do_configure_prepend () { +do_configure:prepend () { rm -f ${S}/admin/ltmain.sh rm -f ${S}/admin/libtool.m4.in } diff --git a/meta/recipes-support/user-creation/xuser-account_0.1.bb b/meta/recipes-support/user-creation/xuser-account_0.1.bb index 81817d1e25..639b01f6eb 100644 --- a/meta/recipes-support/user-creation/xuser-account_0.1.bb +++ b/meta/recipes-support/user-creation/xuser-account_0.1.bb @@ -18,11 +18,11 @@ do_install() { install -D -m 0644 ${WORKDIR}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf } -FILES_${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf" +FILES:${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--create-home \ +USERADD_PARAM:${PN} = "--create-home \ --groups video,tty,audio,input,shutdown,disk \ --user-group xuser" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 878d0f18ae..9e4117466e 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -7,7 +7,7 @@ BUGTRACKER = "https://github.com/vim/vim/issues" DEPENDS = "ncurses gettext-native" # vimdiff doesn't like busybox diff -RSUGGESTS_${PN} = "diffutils" +RSUGGESTS:${PN} = "diffutils" LICENSE = "vim" LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=a19edd7ec70d573a005d9e509375a99a" @@ -113,18 +113,18 @@ do_install() { PARALLEL_MAKEINST = "" PACKAGES =+ "${PN}-common ${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-tools" -FILES_${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax" -FILES_${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc" -FILES_${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor" -FILES_${PN}-vimrc = "${datadir}/${BPN}/vimrc" -FILES_${PN}-data = "${datadir}/${BPN}" +FILES:${PN}-syntax = "${datadir}/${BPN}/${VIMDIR}/syntax" +FILES:${PN}-help = "${datadir}/${BPN}/${VIMDIR}/doc" +FILES:${PN}-tutor = "${datadir}/${BPN}/${VIMDIR}/tutor ${bindir}/${BPN}tutor" +FILES:${PN}-vimrc = "${datadir}/${BPN}/vimrc" +FILES:${PN}-data = "${datadir}/${BPN}" # We do not want to complain if perl or gawk are not on the target. # -FILES_${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools" -INSANE_SKIP_${PN}-tools = "file-rdeps" +FILES:${PN}-tools = "${datadir}/${BPN}/${VIMDIR}/tools" +INSANE_SKIP:${PN}-tools = "file-rdeps" -FILES_${PN}-common = " \ +FILES:${PN}-common = " \ ${datadir}/${BPN}/${VIMDIR}/*.vim \ ${datadir}/${BPN}/${VIMDIR}/autoload \ ${datadir}/${BPN}/${VIMDIR}/colors \ @@ -140,11 +140,11 @@ FILES_${PN}-common = " \ ${datadir}/icons \ " -RDEPENDS_${BPN} = "ncurses-terminfo-base" +RDEPENDS:${BPN} = "ncurses-terminfo-base" # Recommend that runtime data is installed along with vim -RRECOMMENDS_${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common" +RRECOMMENDS:${BPN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common" -ALTERNATIVE_${PN} = "vi vim" +ALTERNATIVE:${PN} = "vi vim" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_TARGET = "${bindir}/${BPN}.${BPN}" ALTERNATIVE_LINK_NAME[vi] = "${base_bindir}/vi" diff --git a/meta/recipes-support/vim/vim_8.2.bb b/meta/recipes-support/vim/vim_8.2.bb index 7e4654e472..3c1b98dca0 100644 --- a/meta/recipes-support/vim/vim_8.2.bb +++ b/meta/recipes-support/vim/vim_8.2.bb @@ -2,10 +2,10 @@ require vim.inc PROVIDES = "xxd" -PACKAGECONFIG_class-native = "" +PACKAGECONFIG:class-native = "" BBCLASSEXTEND = "native nativesdk" -ALTERNATIVE_${PN}_append = " xxd" +ALTERNATIVE:${PN}:append = " xxd" ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd" ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd" diff --git a/meta/recipes-support/vte/vte_0.64.2.bb b/meta/recipes-support/vte/vte_0.64.2.bb index b0baa3f422..a79f2e4451 100644 --- a/meta/recipes-support/vte/vte_0.64.2.bb +++ b/meta/recipes-support/vte/vte_0.64.2.bb @@ -3,7 +3,7 @@ DESCRIPTION = "VTE provides a virtual terminal widget for GTK applications." HOMEPAGE = "https://wiki.gnome.org/Apps/Terminal/VTE" BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" LICENSE = "GPLv3 & LGPLv3+ & MIT-X" -LICENSE_libvte = "LGPLv3+" +LICENSE:libvte = "LGPLv3+" LIC_FILES_CHKSUM = " \ file://COPYING.GPL3;md5=cc702cf3444d1f19680c794cc61948f9 \ @@ -33,29 +33,29 @@ export STAGING_DATADIR export XDG_DATA_DIRS = "${STAGING_DATADIR}" # Help g-ir-scanner find the .so for linking -do_compile_prepend() { +do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/src/.libs" } # Package additional files -FILES_${PN}-dev += "${datadir}/vala/vapi/*" +FILES:${PN}-dev += "${datadir}/vala/vapi/*" PACKAGECONFIG ??= "gnutls" PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala" PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" # vala requires gir -PACKAGECONFIG_remove_class-native = "vala" +PACKAGECONFIG:remove:class-native = "vala" CFLAGS += "-D_GNU_SOURCE" PACKAGES =+ "libvte ${PN}-prompt" -FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" -FILES_${PN}-prompt = " \ +FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" +FILES:${PN}-prompt = " \ ${sysconfdir}/profile.d \ ${libexecdir}/vte-urlencode-cwd \ " -FILES_${PN}-dev += "${datadir}/glade/" +FILES:${PN}-dev += "${datadir}/glade/" BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf