diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 17:04:53 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-03 10:21:25 -0700 |
commit | c61dc077bbd81260e4f167fa2251643ba0ba6974 (patch) | |
tree | 66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-oe/recipes-extended | |
parent | c5f7cfb8db54cfa4257797db5bd87828dea43296 (diff) | |
download | meta-openembedded-contrib-c61dc077bbd81260e4f167fa2251643ba0ba6974.tar.gz |
Convert to new override syntax
This is the result of automated script (0.9.1) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
87 files changed, 382 insertions, 382 deletions
diff --git a/meta-oe/recipes-extended/beep/beep_1.4.9.bb b/meta-oe/recipes-extended/beep/beep_1.4.9.bb index 8d332b2fafb..9437b4523ad 100644 --- a/meta-oe/recipes-extended/beep/beep_1.4.9.bb +++ b/meta-oe/recipes-extended/beep/beep_1.4.9.bb @@ -20,7 +20,7 @@ EXTRA_OEMAKE = " \ LINKER_clang=no \ " -EXTRA_OEMAKE_toolchain-clang = " \ +EXTRA_OEMAKE:toolchain-clang = " \ COMPILER_clang='${CC}' \ LINKER_clang='${CC}' \ COMPILER_gcc=no \ diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb index d2e81ee7802..0acd0999565 100644 --- a/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb +++ b/meta-oe/recipes-extended/boinc/boinc-client_7.16.16.bb @@ -59,7 +59,7 @@ EXTRA_OECONF += "\ " export PKG_CONFIG = "${STAGING_BINDIR_NATIVE}/pkg-config" -do_configure_prepend () { +do_configure:prepend () { if [ "${@bb.utils.contains('DEPENDS', 'gtk+', '1', '0', d)}" = "0" ] then export GTK2_CFLAGS="" @@ -67,14 +67,14 @@ do_configure_prepend () { fi } -do_compile_prepend () { +do_compile:prepend () { # Disable rpaths sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${B}/${TARGET_SYS}-libtool sed -i -e 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec=""|g' ${B}/${TARGET_SYS}-libtool sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${B}/${TARGET_SYS}-libtool } -do_install_append() { +do_install:append() { if [ -e ${D}${nonarch_libdir}/systemd/system/boinc-client.service ]; then install -d ${D}${systemd_system_unitdir} mv \ @@ -86,6 +86,6 @@ do_install_append() { fi } -SYSTEMD_SERVICE_${PN} = "boinc-client.service" +SYSTEMD_SERVICE:${PN} = "boinc-client.service" -FILES_${PN} += "${libdir}/systemd" +FILES:${PN} += "${libdir}/systemd" diff --git a/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb index 0038ba74d24..92d6d9f186e 100644 --- a/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb +++ b/meta-oe/recipes-extended/brotli/brotli_1.0.9.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/git" inherit cmake lib_package -do_install_append () { +do_install:append () { for lib in $(ls ${D}${libdir}/*-static.a); do mv -v "${lib}" "$(echo ${lib} | sed s/-static//)" done diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb index 35ac8559899..4ef3fc15ad7 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.15.0.bb @@ -32,10 +32,10 @@ export EXPLICIT_VERSION="${PV}" EXTRA_OECONF = "--prefix=${datadir}/cfengine" -do_install_append() { +do_install:append() { rm -rf ${D}${datadir}/cfengine/modules/packages/zypper ${D}${datadir}/cfengine/modules/packages/yum } -FILES_${PN} = "${datadir}/cfengine" +FILES:${PN} = "${datadir}/cfengine" -RDEPENDS_${PN} += "python3-core" +RDEPENDS:${PN} += "python3-core" diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb index 2d146bf88c6..38efe6306d0 100644 --- a/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb +++ b/meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb @@ -25,11 +25,11 @@ inherit autotools-brokensep systemd export EXPLICIT_VERSION="${PV}" -SYSTEMD_SERVICE_${PN} = "cfengine3.service cf-apache.service cf-hub.service cf-postgres.service \ +SYSTEMD_SERVICE:${PN} = "cfengine3.service cf-apache.service cf-hub.service cf-postgres.service \ cf-runalerts.service cf-execd.service \ cf-monitord.service cf-serverd.service \ " -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" PACKAGECONFIG ??= "libpcre openssl \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \ @@ -48,7 +48,7 @@ PACKAGECONFIG[libcurl] = "--with-libcurl,--without-libcurl,curl," EXTRA_OECONF = "hw_cv_func_va_copy=yes --with-init-script=${sysconfdir}/init.d --with-tokyocabinet" -do_install_append() { +do_install:append() { install -d ${D}${localstatedir}/${BPN}/bin for f in `ls ${D}${bindir}`; do ln -s ${bindir}/`basename $f` ${D}${localstatedir}/${BPN}/bin/ @@ -69,4 +69,4 @@ EOF rm -rf ${D}${datadir}/cfengine/modules/packages/zypper } -RDEPENDS_${PN} += "${BPN}-masterfiles" +RDEPENDS:${PN} += "${BPN}-masterfiles" diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb index 6c71d534be2..5c9ea129c07 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb @@ -30,13 +30,13 @@ EXTRA_OECMAKE = "-DLIB='${baselib}' \ # ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$) OECMAKE_GENERATOR = "Unix Makefiles" -do_configure_prepend() { +do_configure:prepend() { export STAGING_LIBDIR=${STAGING_LIBDIR} export STAGING_INCDIR=${STAGING_INCDIR} export ENV_INSTALL_PATH=${PYTHON_SITEPACKAGES_DIR} } -FILES_${PN} =+"${libdir}/cmpi/libpyCmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*" -FILES_${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so" +FILES:${PN} =+"${libdir}/cmpi/libpyCmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*" +FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb index f84a91adf19..b443afdb189 100644 --- a/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb +++ b/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c inherit autotools python3native update-rc.d pkgconfig systemd -SYSTEMD_SERVICE_${PN} = "collectd.service" +SYSTEMD_SERVICE:${PN} = "collectd.service" # Floatingpoint layout, architecture dependent # 'nothing', 'endianflip' or 'intswap' @@ -59,7 +59,7 @@ EXTRA_OECONF = " \ --disable-notify_desktop --disable-werror \ " -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/collectd.init ${D}${sysconfdir}/init.d/collectd sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/collectd @@ -80,7 +80,7 @@ do_install_append() { ${D}${systemd_unitdir}/system/collectd.service } -CONFFILES_${PN} = "${sysconfdir}/collectd.conf" +CONFFILES:${PN} = "${sysconfdir}/collectd.conf" INITSCRIPT_NAME = "collectd" INITSCRIPT_PARAMS = "defaults" diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb index a16e810be6b..94df015068b 100644 --- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb +++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb @@ -49,19 +49,19 @@ EXTRA_OECMAKE += "-DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_syste PACKAGES += "${PN}-systemd" SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" -SYSTEMD_SERVICE_${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt.service', '', d)} \ +SYSTEMD_SERVICE:${PN} = " ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'dlt.service', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'dlt-system', 'dlt-system.service', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'dlt-dbus', 'dlt-dbus.service', '', d)}" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" -SYSTEMD_SERVICE_${PN}-systemd = " \ +SYSTEMD_AUTO_ENABLE:${PN} = "enable" +SYSTEMD_SERVICE:${PN}-systemd = " \ ${@bb.utils.contains('PACKAGECONFIG', 'dlt-adaptor', 'dlt-adaptor-udp.service', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples', 'dlt-example-user.service', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'dlt-examples dlt-console', 'dlt-receive.service', '', d)} \ " -SYSTEMD_AUTO_ENABLE_${PN}-systemd = "disable" +SYSTEMD_AUTO_ENABLE:${PN}-systemd = "disable" -FILES_${PN}-doc += "${datadir}/dlt-filetransfer" +FILES:${PN}-doc += "${datadir}/dlt-filetransfer" -do_install_append() { +do_install:append() { rm -f ${D}${bindir}/dlt-test-* } diff --git a/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb b/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb index 82791f5794a..aa08216eb12 100644 --- a/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb +++ b/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb @@ -22,4 +22,4 @@ EXTRA_OECONF += "PERL='${USRBINPATH}/env perl'" SRC_URI[md5sum] = "3acc242b829adacabcaf28533f049afd" SRC_URI[sha256sum] = "6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb" -RDEPENDS_${PN} = "perl" +RDEPENDS:${PN} = "perl" diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb index eac26704156..670d596cad9 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb @@ -26,9 +26,9 @@ S = "${WORKDIR}/fluent-bit-${PV}" DEPENDS = "zlib bison-native flex-native" DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -DEPENDS_append_libc-musl = " fts " +DEPENDS:append:libc-musl = " fts " -INSANE_SKIP_${PN}-dev += "dev-elf" +INSANE_SKIP:${PN}-dev += "dev-elf" LTO = "" @@ -49,8 +49,8 @@ EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off -DFLB_EXAMPLES=Off " EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','',d)}" -EXTRA_OECMAKE_append_riscv64 = " -DFLB_DEPS='atomic'" -EXTRA_OECMAKE_append_riscv32 = " -DFLB_DEPS='atomic'" +EXTRA_OECMAKE:append:riscv64 = " -DFLB_DEPS='atomic'" +EXTRA_OECMAKE:append:riscv32 = " -DFLB_DEPS='atomic'" # Kafka Output plugin (disabled by default): note that when # enabling Kafka output plugin, the backend library librdkafka @@ -63,5 +63,5 @@ inherit cmake systemd CFLAGS += "-fcommon" -SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" -TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" +SYSTEMD_SERVICE:${PN} = "td-agent-bit.service" +TARGET_CC_ARCH:append = " ${SELECTED_OPTIMIZATION}" diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.1.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.1.bb index 3d75f0604b5..775125575dd 100644 --- a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.1.bb +++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.1.bb @@ -17,7 +17,7 @@ SRC_URI = " \ file://gnuplot.desktop \ file://gnuplot.png \ " -SRC_URI_append_class-target = " \ +SRC_URI:append:class-target = " \ file://0002-do-not-build-demos.patch \ file://0003-Use-native-tools-to-build-docs.patch \ file://0004-Add-configure-option-to-find-qt5-native-tools.patch \ @@ -28,12 +28,12 @@ SRC_URI[qtplot.sha256sum] = "6df317183ff62cc82f3dcf88207a267cd6478cb5147f55d7530 # for building docs (they deserve it) we need *doc2* tools native BBCLASSEXTEND = "native" -DEPENDS_class-native = "readline-native" -PACKAGECONFIG_class-native = "" +DEPENDS:class-native = "readline-native" +PACKAGECONFIG:class-native = "" -SRC_URI_append_class-native = " file://0001-reduce-build-to-conversion-tools-for-native-build.patch" +SRC_URI:append:class-native = " file://0001-reduce-build-to-conversion-tools-for-native-build.patch" -do_install_class-native() { +do_install:class-native() { install -d ${D}${bindir} install ${B}/docs/*doc* ${D}${bindir} rm ${D}${bindir}/*.o @@ -49,11 +49,11 @@ EXTRA_OECONF = " \ -disable-wxwidgets \ " -do_compile_prepend() { +do_compile:prepend() { install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/ } -do_install_append_class-target() { +do_install:append:class-target() { install -d ${D}${datadir}/applications/ install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/ install -d ${D}${datadir}/pixmaps/ @@ -62,10 +62,10 @@ do_install_append_class-target() { PACKAGES =+ "${PN}-x11" -RPROVIDES_${PN}-dbg += "${PN}-x11-dbg" +RPROVIDES:${PN}-dbg += "${PN}-x11-dbg" -DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot." -SECTION_${PN}-x11 = "x11/scientific" -FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 " +DESCRIPTION:${PN}-x11 = "X11 display terminal for Gnuplot." +SECTION:${PN}-x11 = "x11/scientific" +FILES:${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 " -FILES_${PN} += "${datadir}/texmf" +FILES:${PN} += "${datadir}/texmf" diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb index b56b2271b1a..30e126db1dc 100644 --- a/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb +++ b/meta-oe/recipes-extended/haveged/haveged_1.9.14.bb @@ -26,12 +26,12 @@ PACKAGECONFIG[systemd] = "--enable-init=service.fedora --enable-initdir=${system INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME = "haveged" -INITSCRIPT_PARAMS_${PN} = "defaults 9" +INITSCRIPT_PARAMS:${PN} = "defaults 9" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "haveged.service" +SYSTEMD_SERVICE:${PN} = "haveged.service" -do_install_append() { +do_install:append() { # The exit status is 143 when the service is stopped if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then sed -i '/ExecStart/a SuccessExitStatus=143' ${D}${systemd_system_unitdir}/haveged.service diff --git a/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb b/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb index 3a7413d8a8a..7928df4485a 100644 --- a/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb +++ b/meta-oe/recipes-extended/hexedit/hexedit_1.5.bb @@ -15,6 +15,6 @@ S = "${WORKDIR}/git" inherit autotools-brokensep update-alternatives -ALTERNATIVE_${PN} = "hexedit" +ALTERNATIVE:${PN} = "hexedit" ALTERNATIVE_LINK_NAME[hexedit] = "${bindir}/hexedit" diff --git a/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb b/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb index a41888802f2..ed818591906 100644 --- a/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb +++ b/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb @@ -19,6 +19,6 @@ EXTRA_OEMAKE = "PREFIX=${prefix} LIBRARY_PATH=${baselib}" # By default INSTALL variable in Makefile is equal to 'cp -a', which preserves # ownership and causes host-user-contamination QA issue. # And PREFIX defaults to /usr/local. -do_install_prepend() { +do_install:prepend() { export INSTALL='cp -r' } diff --git a/meta-oe/recipes-extended/hplip/hplip_3.19.12.bb b/meta-oe/recipes-extended/hplip/hplip_3.19.12.bb index 457a974534e..0f314288c9d 100644 --- a/meta-oe/recipes-extended/hplip/hplip_3.19.12.bb +++ b/meta-oe/recipes-extended/hplip/hplip_3.19.12.bb @@ -45,7 +45,7 @@ EXTRA_OECONF += "\ EXTRA_OEMAKE = "rulessystemdir=${systemd_unitdir}/system/" -do_install_append() { +do_install:append() { rm -rf ${D}${datadir}/hplip/upgrade.py rm -rf ${D}${datadir}/hplip/uninstall.py sed -i -e "s|/usr/bin/env python|/usr/bin/env python3|g" ${D}${datadir}/hplip/*.py @@ -54,7 +54,7 @@ do_install_append() { PACKAGE_BEFORE_PN += "${PN}-ppd ${PN}-cups ${PN}-backend ${PN}-filter ${PN}-hal" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3\ python3-syslog \ python3-pprint \ @@ -66,23 +66,23 @@ RDEPENDS_${PN} += " \ python3-resource \ python3-terminal \ " -RDEPENDS_${PN}-filter += "perl" +RDEPENDS:${PN}-filter += "perl" # need to snag the debug file or OE will fail on backend package -FILES_${PN}-dbg += "\ +FILES:${PN}-dbg += "\ ${libexecdir}/cups/backend/.debug \ ${PYTHON_SITEPACKAGES_DIR}/.debug \ ${libexecdir}/cups/filter/.debug " -FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" -FILES_${PN}-ppd = "${datadir}/ppd" -FILES_${PN}-cups = "${datadir}/cups" -FILES_${PN}-backend = "${libexecdir}/cups/backend" -FILES_${PN}-filter = "${libexecdir}/cups/filter" -FILES_${PN}-hal = "${datadir}/hal" +FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" +FILES:${PN}-ppd = "${datadir}/ppd" +FILES:${PN}-cups = "${datadir}/cups" +FILES:${PN}-backend = "${libexecdir}/cups/backend" +FILES:${PN}-filter = "${libexecdir}/cups/filter" +FILES:${PN}-hal = "${datadir}/hal" -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/*.so" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/*.so" -SYSTEMD_SERVICE_${PN} = "hplip-printer@.service" +SYSTEMD_SERVICE:${PN} = "hplip-printer@.service" CLEANBROKEN = "1" diff --git a/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb b/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb index 2b0dfe4ea57..e6fed584f93 100644 --- a/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb +++ b/meta-oe/recipes-extended/hwloc/hwloc_1.11.13.bb @@ -26,6 +26,6 @@ PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 cairo,cairo" PACKAGECONFIG[pci] = "--enable-pci,--disable-pci,libpciaccess,libpciaccess" # Split hwloc library into separate subpackage -PACKAGES_prepend = " libhwloc " -FILES_libhwloc += "${libdir}/libhwloc.so.*" -RDEPENDS_${PN} += "libhwloc (= ${EXTENDPKGV})" +PACKAGES:prepend = " libhwloc " +FILES:libhwloc += "${libdir}/libhwloc.so.*" +RDEPENDS:${PN} += "libhwloc (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-extended/icewm/icewm_2.6.0.bb b/meta-oe/recipes-extended/icewm/icewm_2.6.0.bb index 90c0d244f2d..d7365521770 100644 --- a/meta-oe/recipes-extended/icewm/icewm_2.6.0.bb +++ b/meta-oe/recipes-extended/icewm/icewm_2.6.0.bb @@ -22,10 +22,10 @@ EXTRA_OECONF += "--with-libdir=${datadir}/icewm \ DEPENDS = "asciidoc-native fontconfig fribidi gdk-pixbuf imlib2 libxft libxpm libxrandr \ libxinerama libice libsm libx11 libxext libxrender libxcomposite libxdamage \ libxfixes" -DEPENDS_append = " qemu-native" -RDEPENDS_${PN} = "perl fribidi" +DEPENDS:append = " qemu-native" +RDEPENDS:${PN} = "perl fribidi" -do_compile_prepend_class-target() { +do_compile:prepend:class-target() { cd ${B} oe_runmake -C src genpref @@ -39,8 +39,8 @@ EOF ./qemuwrapper > src/preferences } -ALTERNATIVE_${PN} = "x-session-manager" +ALTERNATIVE:${PN} = "x-session-manager" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/icewm-session" ALTERNATIVE_PRIORITY_${PN} = "100" -FILES_${PN} += "${datadir}/xsessions" +FILES:${PN} += "${datadir}/xsessions" diff --git a/meta-oe/recipes-extended/indent/indent_2.2.12.bb b/meta-oe/recipes-extended/indent/indent_2.2.12.bb index 829bf0fc1d4..80f599b313f 100644 --- a/meta-oe/recipes-extended/indent/indent_2.2.12.bb +++ b/meta-oe/recipes-extended/indent/indent_2.2.12.bb @@ -23,6 +23,6 @@ SRC_URI[sha256sum] = "e77d68c0211515459b8812118d606812e300097cfac0b4e9fb34726642 inherit autotools gettext texinfo -CFLAGS_append_class-native = " -Wno-error=unused-value" +CFLAGS:append:class-native = " -Wno-error=unused-value" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-extended/iotop/iotop_0.6.bb b/meta-oe/recipes-extended/iotop/iotop_0.6.bb index 3a597218dba..d1b288cf2ed 100644 --- a/meta-oe/recipes-extended/iotop/iotop_0.6.bb +++ b/meta-oe/recipes-extended/iotop/iotop_0.6.bb @@ -19,11 +19,11 @@ UPSTREAM_CHECK_REGEX = "iotop-(?P<pver>\d+(\.\d+)+)" inherit distutils3 -do_install_append() { +do_install:append() { rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo || true rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py || true } -RDEPENDS_${PN} = "python3-curses \ +RDEPENDS:${PN} = "python3-curses \ python3-codecs python3-ctypes python3-pprint \ python3-shell python3-core" diff --git a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb index b7899a11b69..0c8aaef7db5 100644 --- a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb +++ b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb @@ -2,7 +2,7 @@ SUMMARY = "Tools for taking the MD5 sum of ISO images" DESCRIPTION = "Tools for taking the MD5 sum of ISO images" DEPENDS = "popt python3 openssl curl popt-native" -RDEPENDS_${BPN} = "openssl curl" +RDEPENDS:${BPN} = "openssl curl" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" @@ -27,9 +27,9 @@ do_install () { PACKAGES += "${PYTHON_PN}-${BPN}" -RPROVIDES_${BPN}-dbg += "${PYTHON_PN}-${BPN}-dbg" +RPROVIDES:${BPN}-dbg += "${PYTHON_PN}-${BPN}-dbg" -FILES_${PYTHON_PN}-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" +FILES:${PYTHON_PN}-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" SRCREV = "7860901f726f5d92689cb67243cc7f981f21f74b" diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb index e6d5663f855..99cf6ab08a8 100644 --- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb @@ -6,8 +6,8 @@ implementations for many of the provider operations." HOMEPAGE = "https://github.com/rnovacek/konkretcmpi" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f673270bfc350d9ce1efc8724c6c1873" -DEPENDS_append_class-target = " swig-native sblim-cmpi-devel python3" -DEPENDS_append_class-native = " cmpi-bindings-native" +DEPENDS:append:class-target = " swig-native sblim-cmpi-devel python3" +DEPENDS:append:class-native = " cmpi-bindings-native" SRC_URI = "git://github.com/rnovacek/konkretcmpi.git \ file://0001-CMakeLists.txt-fix-lib64-can-not-be-shiped-in-64bit-.patch \ @@ -24,16 +24,16 @@ EXTRA_OECMAKE = "-DWITH_PYTHON=ON \ ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " -LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -do_install_append() { +do_install:append() { rm -rf ${D}${datadir} } PACKAGES =+ "${PN}-python" -RPROVIDES_${PN}-dbg += "${PN}-python-dbg" +RPROVIDES:${PN}-dbg += "${PN}-python-dbg" -FILES_${PN}-python = "${libdir}/python*/site-packages/konkretmof.py* ${libdir}/python*/site-packages/_konkretmof.so" +FILES:${PN}-python = "${libdir}/python*/site-packages/konkretmof.py* ${libdir}/python*/site-packages/_konkretmof.so" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb b/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb index 1f3cb97c13c..d930b434800 100644 --- a/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb +++ b/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb @@ -26,5 +26,5 @@ do_configure() { } # libunwind does not support RISCV yet -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_2.25.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_2.25.bb index 2c8fdc75ca6..e18a28e9138 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_2.25.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_2.25.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/storaged-project/libblockdev;branch=2.x-branch" SRCREV = "c50869272b54bf4b4bc3825e8c3332a54678b43f" S = "${WORKDIR}/git" -FILES_${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages" +FILES:${PN} += "${libdir}/python2.7/dist-packages ${libdir}/python3.*/site-packages" PACKAGECONFIG ??= "python3 lvm dm kmod parted fs escrow btrfs crypto mdraid kbd mpath nvdimm" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" diff --git a/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb b/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb index 48be1fdac5e..1e20338827d 100644 --- a/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb +++ b/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b3a719e97f49e4841e90573f9b1a98ac" DEPENDS = "p8platform udev ncurses swig-native python3" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', '', d)}" -DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" +DEPENDS:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" SRCREV = "29d82c80bcc62be2878a9ac080de7eb286c4beb9" SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release \ @@ -26,18 +26,18 @@ EXTRA_OECMAKE += "${PLATFORM_CMAKE_FLAGS}" # Put client examples into separate packages PACKAGE_BEFORE_PN += "${PN}-examples-python ${PN}-examples" -FILES_${PN}-examples-python = "${bindir}/py*" -FILES_${PN}-examples = "${bindir}" -RDEPENDS_${PN}-examples-python = "python3-${BPN} python3-core" +FILES:${PN}-examples-python = "${bindir}/py*" +FILES:${PN}-examples = "${bindir}" +RDEPENDS:${PN}-examples-python = "python3-${BPN} python3-core" # Create the wrapper for python3 PACKAGES += "python3-${BPN}" -FILES_python3-${BPN} = "${libdir}/python3* ${bindir}/py*" -RDEPENDS_${PN} = "python3-core" +FILES:python3-${BPN} = "${libdir}/python3* ${bindir}/py*" +RDEPENDS:${PN} = "python3-core" # cec-client and xbmc need the .so present to work :( -FILES_${PN} += "${libdir}/*.so" -INSANE_SKIP_${PN} = "dev-so" +FILES:${PN} += "${libdir}/*.so" +INSANE_SKIP:${PN} = "dev-so" # Adapter shows up as a CDC-ACM device -RRECOMMENDS_${PN} = "kernel-module-cdc-acm" +RRECOMMENDS:${PN} = "kernel-module-cdc-acm" diff --git a/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb b/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb index 3d87e448179..2369f038b44 100644 --- a/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb +++ b/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb @@ -18,4 +18,4 @@ SRC_URI[md5sum] = "15ec701205f91f21b1187f8b61e0d64f" SRC_URI[sha256sum] = "545166d6cac037744381d1e9cc5a5405094e7bfad16a411699bcff40bbb31ee7" PACKAGE_BEFORE_PN = "${PN}++" -FILES_${PN}++ = "${libdir}/${BPN}++*${SOLIBS}" +FILES:${PN}++ = "${libdir}/${BPN}++*${SOLIBS}" diff --git a/meta-oe/recipes-extended/libidn/libidn_1.36.bb b/meta-oe/recipes-extended/libidn/libidn_1.36.bb index 4c6c8fde4ad..addc57e4147 100644 --- a/meta-oe/recipes-extended/libidn/libidn_1.36.bb +++ b/meta-oe/recipes-extended/libidn/libidn_1.36.bb @@ -25,14 +25,14 @@ SRC_URI[sha256sum] = "14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86 # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 # so package command into a separate package PACKAGES =+ "idn" -FILES_idn = "${bindir}/*" +FILES:idn = "${bindir}/*" -LICENSE_${PN} = "LGPLv2.1+ | LGPLv3" -LICENSE_idn = "GPLv3+" +LICENSE:${PN} = "LGPLv2.1+ | LGPLv3" +LICENSE:idn = "GPLv3+" EXTRA_OECONF = "--disable-csharp" -do_install_append() { +do_install:append() { rm -rf ${D}${datadir}/emacs } diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb index 6ef5b4f4323..41147647bfa 100644 --- a/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb +++ b/meta-oe/recipes-extended/libimobiledevice/libplist_2.2.0.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https" S = "${WORKDIR}/git" -do_install_append () { +do_install:append () { if [ -e ${D}${libdir}/python*/site-packages/plist/_plist.so ]; then chrpath -d ${D}${libdir}/python*/site-packages/plist/_plist.so fi @@ -23,7 +23,7 @@ PACKAGES =+ "${PN}-utils \ ${PN}++ \ ${PN}-python" -FILES_${PN} = "${libdir}/libplist-2.0${SOLIBS}" -FILES_${PN}++ = "${libdir}/libplist++-2.0${SOLIBS}" -FILES_${PN}-utils = "${bindir}/*" -FILES_${PN}-python = "${libdir}/python*/site-packages/*" +FILES:${PN} = "${libdir}/libplist-2.0${SOLIBS}" +FILES:${PN}++ = "${libdir}/libplist++-2.0${SOLIBS}" +FILES:${PN}-utils = "${bindir}/*" +FILES:${PN}-python = "${libdir}/python*/site-packages/*" diff --git a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb index 343d0bc63f5..f94c76797e7 100644 --- a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb +++ b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb @@ -13,4 +13,4 @@ SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https" S = "${WORKDIR}/git" -FILES_${PN} += "${base_libdir}/udev/rules.d/" +FILES:${PN} += "${base_libdir}/udev/rules.d/" diff --git a/meta-oe/recipes-extended/libleak/libleak_git.bb b/meta-oe/recipes-extended/libleak/libleak_git.bb index 309553c9093..32d509b4ad7 100644 --- a/meta-oe/recipes-extended/libleak/libleak_git.bb +++ b/meta-oe/recipes-extended/libleak/libleak_git.bb @@ -31,8 +31,8 @@ do_install () { FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/libleak.so" +FILES:${PN} += "${libdir}/libleak.so" # libunwind does not support RISCV yet -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb index 10d88a3b5a4..880770f34e3 100644 --- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb +++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb @@ -33,5 +33,5 @@ EXTRA_OECONF = "--enable-shared \ # at https://github.com/miquels/liblockfile.git EXTRA_OEMAKE += "DESTDIR=${D}" -FILES_${PN} += "${libdir}/nfslock.so.*" -FILES_${PN}-dev += "${libdir}/nfslock.so" +FILES:${PN} += "${libdir}/nfslock.so.*" +FILES:${PN}-dev += "${libdir}/nfslock.so" diff --git a/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb b/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb index 075487ae906..8e42fdc5d29 100644 --- a/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb +++ b/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.6.bb @@ -7,6 +7,6 @@ SRC_URI[md5sum] = "15c84c1f7fb49502b3efaaa668cfd25e" SRC_URI[sha256sum] = "d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16" # this file has been created one minute after the configure file, so it doesn't get recreated during configure step -do_configure_prepend() { +do_configure:prepend() { rm -rf ${S}/tests/unit-test.h } diff --git a/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb b/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb index c9d259b1a09..602e9637522 100644 --- a/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb +++ b/meta-oe/recipes-extended/libnss-nisplus/libnss-nisplus.bb @@ -28,4 +28,4 @@ BBCLASSEXTEND += "native nativesdk" # # We will skip parsing this packagegeoup for non-glibc systems # -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb index ee75a9847ce..7ff0725a20f 100644 --- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb +++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb @@ -35,7 +35,7 @@ EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam" -FILES_${PN} += "${libdir}/security/pam_pwquality.so" -FILES_${PN}-dbg += "${libdir}/security/.debug" -FILES_${PN}-staticdev += "${libdir}/security/pam_pwquality.a" -FILES_${PN}-dev += "${libdir}/security/pam_pwquality.la" +FILES:${PN} += "${libdir}/security/pam_pwquality.so" +FILES:${PN}-dbg += "${libdir}/security/.debug" +FILES:${PN}-staticdev += "${libdir}/security/pam_pwquality.a" +FILES:${PN}-dev += "${libdir}/security/pam_pwquality.la" diff --git a/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb b/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb index cd4019666d5..d14fbaed3ea 100644 --- a/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb +++ b/meta-oe/recipes-extended/libqb/libqb_1.0.5.bb @@ -23,13 +23,13 @@ S = "${WORKDIR}/git" # WORKDIR/libqb/1.0.3+gitAUTOINC+c235284b5f-r0/recipe-sysroot-native/usr/bin/i586-oe-linux/../../libexec/i586-oe-linux/gcc/i586-oe-linux/8.1.0/ld: internal error in write_sections, at ../../gold/reloc.cc:791 # collect2: error: ld returned 1 exit status NOSECTION_FALLBACK = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-nosection-fallback', '', d)}" -NOSECTION_FALLBACK_toolchain-clang_mips64 = "--enable-nosection-fallback" +NOSECTION_FALLBACK:toolchain-clang:mips64 = "--enable-nosection-fallback" EXTRA_OECONF += "${NOSECTION_FALLBACK}" CFLAGS += "-pthread -D_REENTRANT" -do_configure_prepend() { +do_configure:prepend() { ( cd ${S} ${S}/autogen.sh ) } diff --git a/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb b/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb index 4276c49173e..7741305f019 100644 --- a/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb +++ b/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb @@ -33,7 +33,7 @@ PACKAGECONFIG[gtk] = "--with-gtk, --without-gtk, gtk+3," EXTRA_OECONF += "--without-python2 --with-python3" -RDEPENDS_python3-libreport += "${PN}" +RDEPENDS:python3-libreport += "${PN}" do_patch[prefuncs] += "do_gen_version" do_gen_version() { @@ -43,7 +43,7 @@ do_gen_version() { PACKAGES += "python3-libreport" -FILES_${PN} += "${datadir}/*" -FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug" -FILES_python3-libreport = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES:${PN} += "${datadir}/*" +FILES:${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug" +FILES:python3-libreport = "${PYTHON_SITEPACKAGES_DIR}/*" diff --git a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb index a47d3bf000c..3f15a259bf4 100644 --- a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb +++ b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "ncurses" -PACKAGES_prepend = "statgrab statgrab-dbg saidar saidar-dbg ${PN}-mrtg " +PACKAGES:prepend = "statgrab statgrab-dbg saidar saidar-dbg ${PN}-mrtg " # don't use the git tag unless docbooc2x is available to build the manpages SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATGRAB_0_92/libstatgrab-0.92.tar.gz \ @@ -27,9 +27,9 @@ PACKAGECONFIG[logging] = "--enable-logging,--disable-logging," inherit autotools pkgconfig -FILES_statgrab = "${bindir}/statgrab" -FILES_statgrab-dbg = "${bindir}/.debug/statgrab" -FILES_saidar = "${bindir}/saidar" -FILES_saidar-dbg = "${bindir}/.debug/saidar" -FILES_${PN}-mrtg = "${bindir}/statgrab-make-mrtg-config ${bindir}/statgrab-make-mrtg-index" -RDEPENDS_${PN}-mrtg_append = " perl statgrab" +FILES:statgrab = "${bindir}/statgrab" +FILES:statgrab-dbg = "${bindir}/.debug/statgrab" +FILES:saidar = "${bindir}/saidar" +FILES:saidar-dbg = "${bindir}/.debug/saidar" +FILES:${PN}-mrtg = "${bindir}/statgrab-make-mrtg-config ${bindir}/statgrab-make-mrtg-index" +RDEPENDS:${PN}-mrtg:append = " perl statgrab" diff --git a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb index dd34c180a33..781e7aab716 100644 --- a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb +++ b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb @@ -18,5 +18,5 @@ S = "${WORKDIR}/git" PACKAGES += "${PN}-tools" -FILES_${PN} = "${libdir}" -FILES_${PN}-tools = "${bindir}" +FILES:${PN} = "${libdir}" +FILES:${PN}-tools = "${bindir}" diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb index 401c2c4dab4..792d6962419 100644 --- a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb +++ b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PR = "r3" -DEPENDS_class-native = "freetype-native libpng-native jpeg-native" +DEPENDS:class-native = "freetype-native libpng-native jpeg-native" DEPENDS = "freetype libpng jpeg expat gtk+" BBCLASSEXTEND = "native" @@ -25,8 +25,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${BPN}/${PV}/${BPN}-${PV}.tar.gz;name=ta SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0" SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/2.10.0/loaders/.debug" -FILES_${PN}-dev += "${libdir}/gtk-2.0/2.10.0/loaders/*.la" -FILES_${PN}-staticdev += "${libdir}/gtk-2.0/2.10.0/loaders/*.a" -FILES_${PN} += "${libdir}/gtk-2.0/2.10.0/loaders/*.so" +FILES:${PN}-dbg += "${libdir}/gtk-2.0/2.10.0/loaders/.debug" +FILES:${PN}-dev += "${libdir}/gtk-2.0/2.10.0/loaders/*.la" +FILES:${PN}-staticdev += "${libdir}/gtk-2.0/2.10.0/loaders/*.a" +FILES:${PN} += "${libdir}/gtk-2.0/2.10.0/loaders/*.so" diff --git a/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb b/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb index 8e9e8cc02f3..6c675c40675 100644 --- a/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb +++ b/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb @@ -15,9 +15,9 @@ SRC_URI = "git://github.com/CESNET/libyang.git \ S = "${WORKDIR}/git" -COMPATIBLE_HOST_riscv32 = "null" -COMPATIBLE_HOST_armv5 = "null" -COMPATIBLE_HOST_riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" +COMPATIBLE_HOST:armv5 = "null" +COMPATIBLE_HOST:riscv64 = "null" # Main dependencies inherit cmake pkgconfig lib_package binconfig-disabled ptest @@ -26,7 +26,7 @@ DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" BINCONFIG = "${bindir}/pcre2-config" # Ptest dependencies -RDEPENDS_${PN}-ptest += "valgrind" +RDEPENDS:${PN}-ptest += "valgrind" EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_BUILD_TESTS=ON', '', d)}" diff --git a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb index fb161b65833..504176d6325 100644 --- a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb +++ b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.0.bb @@ -28,8 +28,8 @@ EXTRA_OEMAKE = "DESTDIR=${D} PREFIX=${prefix} -C utils" EXTRA_OEMAKE += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'SYSTEMD_SUPPORT=1', '', d)}" SYSTEMD_PACKAGES += "inputattach" -SYSTEMD_SERVICE_inputattach = "inputattach.service" -SYSTEMD_AUTO_ENABLE_inputattach = "enable" +SYSTEMD_SERVICE:inputattach = "inputattach.service" +SYSTEMD_AUTO_ENABLE:inputattach = "enable" PROVIDES += "joystick" @@ -60,15 +60,15 @@ PACKAGES += "inputattach joystick-jscal joystick" # We won't package any file here as we are following the same packaging schema # Debian does and we are splitting it in 'inputattach' and 'joystick' packages. -FILES_${PN} = "" +FILES:${PN} = "" -FILES_inputattach += "\ +FILES:inputattach += "\ ${bindir}/inputattach \ ${bindir}/inputattachctl \ ${systemd_system_unitdir}/inputattach.service \ " -FILES_joystick += "\ +FILES:joystick += "\ ${bindir}/evdev-joystick \ ${bindir}/ffcfstress \ ${bindir}/ffmvforce \ @@ -81,16 +81,16 @@ FILES_joystick += "\ ${nonarch_base_libdir}/udev/rules.d/80-stelladaptor-joystick.rules \ " -FILES_joystick-jscal = " \ +FILES:joystick-jscal = " \ ${datadir}/joystick \ ${bindir}/jscal \ ${bindir}/jscal-restore \ ${bindir}/jscal-store \ " -RDEPENDS_inputattach += "inputattach-config" +RDEPENDS:inputattach += "inputattach-config" -RDEPENDS_joystick-jscal += "\ +RDEPENDS:joystick-jscal += "\ bash \ gawk \ " diff --git a/meta-oe/recipes-extended/logwatch/logwatch_7.5.3.bb b/meta-oe/recipes-extended/logwatch/logwatch_7.5.3.bb index 644e4207114..b2fb7718e2d 100644 --- a/meta-oe/recipes-extended/logwatch/logwatch_7.5.3.bb +++ b/meta-oe/recipes-extended/logwatch/logwatch_7.5.3.bb @@ -9,7 +9,7 @@ SECTION = "devel" HOMEPAGE = "http://www.logwatch.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=ad199c8aca74e70f296f731ad9a1521c" -RDEPENDS_${PN} = "perl" +RDEPENDS:${PN} = "perl" SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz" SRC_URI[md5sum] = "8bcf3edc5a4687c8aad1b9c01e2be54b" diff --git a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb b/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb index 44323423664..53d4f463b54 100644 --- a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb +++ b/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb @@ -12,12 +12,12 @@ SRC_URI[sha256sum] = "694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f inherit autotools gettext EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost" -FILES_${PN}-dbg += "${libdir}/lprng/filters/.debug" +FILES:${PN}-dbg += "${libdir}/lprng/filters/.debug" # configure: WARNING: Program 'clear' is not found. Set environment CLEAR=no if you do not want to use it export CLEAR = "no" -do_install_append() { +do_install:append() { mv ${D}/etc/printcap.sample ${D}/etc/printcap mv ${D}/etc/lpd/lpd.conf.sample ${D}/etc/lpd/lpd.conf mv ${D}/etc/lpd/lpd.perms.sample ${D}/etc/lpd/lpd.perms diff --git a/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb b/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb index 4161ea67502..dbf5d59d18d 100644 --- a/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb +++ b/meta-oe/recipes-extended/mailx/mailx_12.5-5.bb @@ -36,7 +36,7 @@ S = "${WORKDIR}/heirloom-mailx-12.5" inherit autotools-brokensep -CFLAGS_append = " -D_BSD_SOURCE -DDEBIAN -I${S}/EXT" +CFLAGS:append = " -D_BSD_SOURCE -DDEBIAN -I${S}/EXT" # "STRIP=true" means that 'true' command will be used to 'strip' files which will achieve the effect of not stripping them # mailx's Makefile doesn't allow a more straightforward way to avoid stripping @@ -50,5 +50,5 @@ PARALLEL_MAKE = "" # Causes gcc to get stuck and eat all available memory in qemuarm builds # http://errors.yoctoproject.org/Errors/Details/20488/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index ef82a8fb081..596ec0b43cc 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -8,7 +8,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9534eb5f4ab800b573a37bffc62f3a7" DEPENDS = "virtual/crypt expat flex python3 bison-native libxml2 nettle lz4" -RDEPENDS_${PN} = "python3-core" +RDEPENDS:${PN} = "python3-core" SRCREV = "aa42957a2e227df41510047cece3cd606dc1cb6a" SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ @@ -47,7 +47,7 @@ S = "${WORKDIR}/git" inherit pkgconfig cmake systemd SYSTEMD_PACKAGES = "minifi-cpp" -SYSTEMD_SERVICE_${PN} = "minifi.service" +SYSTEMD_SERVICE:${PN} = "minifi.service" SYSTEMD_AUTO_ENABLE = "disable" OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" @@ -58,23 +58,23 @@ EXTRA_OECMAKE += " \ -DGCC_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \ -DGCC_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \ " -EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib" -LDFLAGS_append_toolchain-clang = " -fuse-ld=lld" +EXTRA_OECMAKE:append:toolchain-clang = " -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib" +LDFLAGS:append:toolchain-clang = " -fuse-ld=lld" # RV lld errors out: # riscv64-yoe-linux-ld.lld: error: init.c:(.text+0x0): relocation R_RISCV_ALIGN requires unimplemented linker relaxation; recompile with -mno-relax -LDFLAGS_remove_riscv32 = "-fuse-ld=lld" -LDFLAGS_remove_riscv64 = "-fuse-ld=lld" +LDFLAGS:remove:riscv32 = "-fuse-ld=lld" +LDFLAGS:remove:riscv64 = "-fuse-ld=lld" # There are endian issues when communicating with the x86 nifi on the the mips and the ppc machines. -COMPATIBLE_MACHINE_mips = "(!.*mips).*" -COMPATIBLE_MACHINE_mips64 = "(!.*mips64).*" -COMPATIBLE_MACHINE_powerpc = "(!.*ppc).*" +COMPATIBLE_MACHINE:mips = "(!.*mips).*" +COMPATIBLE_MACHINE:mips64 = "(!.*mips64).*" +COMPATIBLE_MACHINE:powerpc = "(!.*ppc).*" -TARGET_CFLAGS_append_riscv32 = " -fpic" -TARGET_CXXFLAGS_append_riscv32 = " -fpic" -TARGET_CFLAGS_append_riscv64 = " -fpic" -TARGET_CXXFLAGS_append_riscv64 = " -fpic" +TARGET_CFLAGS:append:riscv32 = " -fpic" +TARGET_CXXFLAGS:append:riscv32 = " -fpic" +TARGET_CFLAGS:append:riscv64 = " -fpic" +TARGET_CXXFLAGS:append:riscv64 = " -fpic" do_install[cleandirs] += "${WORKDIR}/minifi-install" PSEUDO_CONSIDER_PATHS .= ",${WORKDIR}/minifi-install" @@ -130,7 +130,7 @@ do_install() { fi } -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if [ -z "$D" ]; then if type systemd-tmpfiles >/dev/null; then systemd-tmpfiles --create diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb index 9b3289f174b..dcfbabc8a86 100644 --- a/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -22,7 +22,7 @@ inherit cmake distutils3-base DEPENDS += "json-c" -EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=ON -DPYTHON2_LIBRARY=OFF \ +EXTRA_OECMAKE:append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH=ON -DPYTHON2_LIBRARY=OFF \ -DPYTHON3_PACKAGES_PATH:PATH=${baselib}/python${PYTHON_BASEVERSION}/site-packages \ -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \ @@ -31,20 +31,20 @@ EXTRA_OECMAKE_append = " -DINSTALLTOOLS:BOOL=ON -DFIRMATA=ON -DCMAKE_SKIP_RPATH= # Prepend mraa-utils to make sure bindir ends up in there PACKAGES =+ "${PN}-utils" -FILES_${PN}-doc += "${datadir}/mraa/examples/" +FILES:${PN}-doc += "${datadir}/mraa/examples/" -FILES_${PN}-utils = "${bindir}/" +FILES:${PN}-utils = "${bindir}/" # override this in local.conf to get needed bindings. -# BINDINGS_pn-mraa="python" +# BINDINGS:pn-mraa="python" # will result in only the python bindings being built/packaged. # Note: 'nodejs' is disabled by default because the bindings # generation currently fails with nodejs (>v7.x). BINDINGS ??= "python" # nodejs isn't available for armv4/armv5 architectures -BINDINGS_armv4 ??= "python" -BINDINGS_armv5 ??= "python" +BINDINGS:armv4 ??= "python" +BINDINGS:armv5 ??= "python" PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" @@ -53,11 +53,11 @@ PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-nativ PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," PACKAGECONFIG[ft4222] = "-DUSBPLAT=ON -DFTDI4222=ON, -DUSBPLAT=OFF -DFTDI4222=OFF,, libft4222" -FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/" -RDEPENDS_${PYTHON_PN}-${PN} += "${PYTHON_PN}" +FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/" +RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}" -FILES_node-${PN} = "${prefix}/lib/node_modules/" -RDEPENDS_node-${PN} += "nodejs" +FILES:node-${PN} = "${prefix}/lib/node_modules/" +RDEPENDS:node-${PN} += "nodejs" ### Include desired language bindings ### PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" diff --git a/meta-oe/recipes-extended/nana/nana_2.5.bb b/meta-oe/recipes-extended/nana/nana_2.5.bb index 4235006984b..e0b6f569ca4 100644 --- a/meta-oe/recipes-extended/nana/nana_2.5.bb +++ b/meta-oe/recipes-extended/nana/nana_2.5.bb @@ -19,14 +19,14 @@ inherit autotools-brokensep pkgconfig texinfo EXTRA_OEMAKE = "DESTDIR=${D}" -do_configure_prepend_class-nativesdk() { +do_configure:prepend:class-nativesdk() { sed -i -e 's:@CPP@:\$\{CXX\} \$\{CXXFLAGS\} \-E:g' ${S}/src/nana.in sed -i -e 's:@CC@:\$\{CC\} \$\{CFLAGS\} \-E:g' ${S}/src/nana-clg.in sed -i -e 's:@CXX@::g' ${S}/src/nana-c++lg.in sed -i -e 's:@GDB@:\$\{GDB\}:g' ${S}/src/nana-run.in } -do_install_prepend() { +do_install:prepend() { install -d ${D}${mandir}/man1 install -d ${D}${mandir}/man3 install -d ${D}${datadir}/info diff --git a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb index 6009cd03042..850ed4f5fa9 100644 --- a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb +++ b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb @@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "292b8f5f2250655a4add8183c529b73358bc980bd4f23cfa484a940953 S = "${WORKDIR}/${BP}/cli" -do_configure_prepend() { +do_configure:prepend() { sed 's/@@VERSION@@/$(VERSION)/g' ${S}/setup.py.skel > ${S}/setup.py } diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb index 9d5a2307e7f..23db7c679b9 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb @@ -30,10 +30,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba" inherit systemd cmake pkgconfig python3native perlnative -SYSTEMD_SERVICE_${PN} = "openwsmand.service" +SYSTEMD_SERVICE:${PN} = "openwsmand.service" SYSTEMD_AUTO_ENABLE = "disable" -LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd ", '', d)}" +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd ", '', d)}" EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \ -DBUILD_LIBCIM=NO \ @@ -44,12 +44,12 @@ EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \ -DLIB=${baselib} \ " -do_configure_prepend() { +do_configure:prepend() { export STAGING_INCDIR=${STAGING_INCDIR} export STAGING_LIBDIR=${STAGING_LIBDIR} } -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/init.d install -m 755 ${B}/etc/init/openwsmand.sh ${D}/${sysconfdir}/init.d/openwsmand ln -sf ${sysconfdir}/init.d/openwsmand ${D}/${sbindir}/rcopenwsmand @@ -64,9 +64,9 @@ do_install_append() { fi } -FILES_${PN}-dbg += "${libdir}/openwsman/plugins/.debug/ \ +FILES:${PN}-dbg += "${libdir}/openwsman/plugins/.debug/ \ ${libdir}/openwsman/authenticators/.debug/ \ " -INSANE_SKIP_${PN} = "dev-so" -RDEPENDS_${PN} = "ruby" +INSANE_SKIP:${PN} = "dev-so" +RDEPENDS:${PN} = "ruby" diff --git a/meta-oe/recipes-extended/ostree/ostree_2021.3.bb b/meta-oe/recipes-extended/ostree/ostree_2021.3.bb index c735f6d8b8b..a0576b51e28 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2021.3.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2021.3.bb @@ -45,7 +45,7 @@ PACKAGECONFIG ??= " \ # We include soup because ostree can't (currently) be built without # soup or curl - https://github.com/ostreedev/ostree/issues/1897 -PACKAGECONFIG_class-native ??= " \ +PACKAGECONFIG:class-native ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ builtin-grub2-mkconfig \ gpgme \ @@ -84,7 +84,7 @@ EXTRA_OEMAKE = " \ INTROSPECTION_SCANNER_ENV= \ " -EXTRA_OECONF_class-native = " \ +EXTRA_OECONF:class-native = " \ --enable-wrpseudo-compat \ --disable-otmpfile \ " @@ -92,17 +92,17 @@ EXTRA_OECONF_class-native = " \ # Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the # do_configure stage so we do depend on it SYSROOT_DIR = "${STAGING_DIR_TARGET}" -SYSROOT_DIR_class-native = "${STAGING_DIR_NATIVE}" +SYSROOT_DIR:class-native = "${STAGING_DIR_NATIVE}" do_configure[vardeps] += "SYSROOT_DIR" -do_configure_prepend() { +do_configure:prepend() { # this reflects what autogen.sh does, but the OE wrappers for autoreconf # allow it to work without the other gyrations which exist there cp ${S}/libglnx/Makefile-libglnx.am ${S}/libglnx/Makefile-libglnx.am.inc cp ${S}/bsdiff/Makefile-bsdiff.am ${S}/bsdiff/Makefile-bsdiff.am.inc } -do_install_append_class-native() { +do_install:append:class-native() { create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" } @@ -114,38 +114,38 @@ PACKAGE_BEFORE_PN = " \ ${PN}-trivial-httpd \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${nonarch_libdir}/${BPN} \ ${nonarch_libdir}/tmpfiles.d \ ${systemd_unitdir}/system \ ${systemd_unitdir}/system-generators \ " -FILES_${PN}-dracut = " \ +FILES:${PN}-dracut = " \ ${sysconfdir}/dracut.conf.d \ ${libdir}/dracut \ " -FILES_${PN}-grub = " \ +FILES:${PN}-grub = " \ ${sysconfdir}/grub.d \ ${libexecdir}/libostree/grub2-15_ostree \ " -FILES_${PN}-mkinitcpio = " \ +FILES:${PN}-mkinitcpio = " \ ${sysconfdir}/ostree-mkinitcpio.conf \ ${libdir}/initcpio \ " -FILES_${PN}-switchroot = " \ +FILES:${PN}-switchroot = " \ ${nonarch_libdir}/${BPN}/ostree-prepare-root \ ${systemd_unitdir}/system/ostree-prepare-root.service \ " -FILES_${PN}-trivial-httpd = " \ +FILES:${PN}-trivial-httpd = " \ ${libexecdir}/libostree/ostree-trivial-httpd \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ ${@bb.utils.contains('PACKAGECONFIG', 'trivial-httpd-cmdline', '${PN}-trivial-httpd', '', d)} \ " -RDEPENDS_${PN}-dracut = "bash" -RDEPENDS_${PN}-mkinitcpio = "bash" -RDEPENDS_${PN}_class-target = " \ +RDEPENDS:${PN}-dracut = "bash" +RDEPENDS:${PN}-mkinitcpio = "bash" +RDEPENDS:${PN}:class-target = " \ ${@bb.utils.contains('PACKAGECONFIG', 'gpgme', 'gnupg', '', d)} \ ${PN}-switchroot \ " @@ -161,7 +161,7 @@ RDEPENDS_${PN}_class-target = " \ # /var/tmp as a real filesystem (not a tmpfs) # Sufficient disk space (IMAGE_ROOTFS_SIZE = "524288") and RAM (QB_MEM = "-m 1024") # -RDEPENDS_${PN}-ptest += " \ +RDEPENDS:${PN}-ptest += " \ attr \ bash \ coreutils \ @@ -179,11 +179,11 @@ RDEPENDS_${PN}-ptest += " \ python3-pyyaml \ ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ " -RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils glibc-localedata-en-us" -RRECOMMENDS_${PN} += "kernel-module-overlay" +RRECOMMENDS:${PN} += "kernel-module-overlay" -SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path" -SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" +SYSTEMD_SERVICE:${PN} = "ostree-remount.service ostree-finalize-staged.path" +SYSTEMD_SERVICE:${PN}-switchroot = "ostree-prepare-root.service" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb index ada49114c89..a5e9539e9d9 100644 --- a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb +++ b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb @@ -17,13 +17,13 @@ SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6 S = "${WORKDIR}/${BPN}_${PV}" -do_compile_append() { +do_compile:append() { oe_runmake 7z } -FILES_${PN} += "${libdir}/* ${bindir}/7z" +FILES:${PN} += "${libdir}/* ${bindir}/7z" FILES_SOLIBSDEV = "" -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" do_install() { install -d ${D}${bindir} @@ -36,7 +36,7 @@ do_install() { install -m 0755 ${S}/bin/7z.so ${D}${libdir}/lib7z.so } -RPROVIDES_${PN} += "lib7z.so()(64bit) 7z lib7z.so" -RPROVIDES_${PN}-dev += "lib7z.so()(64bit) 7z lib7z.so" +RPROVIDES:${PN} += "lib7z.so()(64bit) 7z lib7z.so" +RPROVIDES:${PN}-dev += "lib7z.so()(64bit) 7z lib7z.so" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-oe/recipes-extended/p8platform/p8platform_git.bb index 0690d4ba3c3..b18e52ff415 100644 --- a/meta-oe/recipes-extended/p8platform/p8platform_git.bb +++ b/meta-oe/recipes-extended/p8platform/p8platform_git.bb @@ -16,4 +16,4 @@ inherit cmake pkgconfig EXTRA_OECMAKE += "-DCMAKE_INSTALL_LIBDIR=${libdir} -DCMAKE_INSTALL_LIBDIR_NOARCH=${libdir}" -FILES_${PN}-dev += "${libdir}/p8-platform" +FILES:${PN}-dev += "${libdir}/p8-platform" diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb index 9838e75ef51..f98c4a7be84 100644 --- a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb +++ b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb @@ -19,4 +19,4 @@ inherit autotools EXTRA_OECONF += "--libdir=${base_libdir} " -FILES_${PN} += "${base_libdir}/security/pam*" +FILES:${PN} += "${base_libdir}/security/pam*" diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb index 626b22fe484..53745394a83 100644 --- a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb +++ b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb @@ -21,4 +21,4 @@ do_install () { oe_runmake install DESTDIR=${D} PAMDIR=${base_libdir}/security } -FILES_${PN} += "${base_libdir}/security/pam_ldapdb.so" +FILES:${PN} += "${base_libdir}/security/pam_ldapdb.so" diff --git a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb index 7871801b6b8..2db8b18160f 100644 --- a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +++ b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb @@ -21,7 +21,7 @@ REQUIRED_DISTRO_FEATURES = "pam" # This gets us ssh-agent, which we are almost certain to want. # -RDEPENDS_${PN} += "openssh-misc" +RDEPENDS:${PN} += "openssh-misc" # Kind of unfortunate to have underscores in the name. # @@ -50,5 +50,5 @@ do_compile () { # This stuff is not any place looked at by default. # -FILES_${PN} += "${base_libdir}/security/pam*" -FILES_${PN}-dbg += "${base_libdir}/security/.debug" +FILES:${PN} += "${base_libdir}/security/pam*" +FILES:${PN}-dbg += "${base_libdir}/security/.debug" diff --git a/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb b/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb index 8bb89f418ce..4325c15c33a 100644 --- a/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb +++ b/meta-oe/recipes-extended/pmdk/pmdk_1.9.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b44ee63f162f9cdb18fff1224877aafd" DEPENDS = "ndctl" # Required to have the fts.h header for musl -DEPENDS_append_libc-musl = " fts" +DEPENDS:append:libc-musl = " fts" S = "${WORKDIR}/git" @@ -25,9 +25,9 @@ inherit autotools-brokensep pkgconfig EXTRA_OEMAKE = "BUILD_EXAMPLES='n' DOC='n' HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}' LIB_PREFIX=${baselib}" # Fix the missing fts libs when using musl -EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'" +EXTRA_OEMAKE:append:libc-musl = " EXTRA_LIBS='-lfts'" -do_configure_prepend() { +do_configure:prepend() { touch .skip-doc } @@ -39,11 +39,11 @@ do_install() { } # Include these by default otherwise the SDK is not very useful -FILES_${PN} += "${bindir}/pmempool ${bindir}/daxio" -FILES_${PN} += "${libdir}/*so*" -FILES_${PN} += "${libdir}/pkgconfig/*.pc" -FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/* /usr/*/include/" -FILES_${PN} += "/usr/etc" -FILES_${PN} += "/usr/share" +FILES:${PN} += "${bindir}/pmempool ${bindir}/daxio" +FILES:${PN} += "${libdir}/*so*" +FILES:${PN} += "${libdir}/pkgconfig/*.pc" +FILES:${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/* /usr/*/include/" +FILES:${PN} += "/usr/etc" +FILES:${PN} += "/usr/share" COMPATIBLE_HOST='(x86_64).*' diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb index 934a53e5c33..8a14018a823 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb @@ -11,4 +11,4 @@ do_install() { } USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system datetime" +GROUPADD_PARAM:${PN} = "--system datetime" diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb index 66a73eaaf48..8266fa63964 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb @@ -11,4 +11,4 @@ do_install() { } USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system network" +GROUPADD_PARAM:${PN} = "--system network" diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc index e38e344c14d..4aeeb77d040 100644 --- a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc +++ b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc @@ -6,8 +6,8 @@ REQUIRED_DISTRO_FEATURES = "polkit" inherit useradd -do_install_prepend() { +do_install:prepend() { install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d } -USERADD_PARAM_${PN}_prepend = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;" +USERADD_PARAM:${PN}:prepend = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;" diff --git a/meta-oe/recipes-extended/polkit/polkit_0.116.bb b/meta-oe/recipes-extended/polkit/polkit_0.116.bb index ad1973b136c..55d11a6516d 100644 --- a/meta-oe/recipes-extended/polkit/polkit_0.116.bb +++ b/meta-oe/recipes-extended/polkit/polkit_0.116.bb @@ -34,13 +34,13 @@ EXTRA_OECONF = "--with-os-type=moblin \ --disable-libelogind \ " -do_compile_prepend () { +do_compile:prepend () { export GIR_EXTRA_LIBS_PATH="${B}/src/polkit/.libs" } PACKAGES =+ "${PN}-examples" -FILES_${PN}_append = " \ +FILES:${PN}:append = " \ ${libdir}/${BPN}-1 \ ${nonarch_libdir}/${BPN}-1 \ ${datadir}/dbus-1 \ @@ -48,10 +48,10 @@ FILES_${PN}_append = " \ ${datadir}/gettext \ " -FILES_${PN}-examples = "${bindir}/*example*" +FILES:${PN}-examples = "${bindir}/*example*" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 polkitd" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 polkitd" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb b/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb index 5db38ac987f..450bbb918f8 100644 --- a/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb +++ b/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb @@ -13,10 +13,10 @@ SRC_URI = "git://github.com/lib-cpp/${BPN}.git" S = "${WORKDIR}/git" -do_configure_prepend() { +do_configure:prepend() { echo " " > ${S}/tests/CMakeLists.txt } inherit cmake pkgconfig -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" diff --git a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb index 7c9f2df9dbf..214768fe5b8 100644 --- a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb +++ b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb @@ -45,7 +45,7 @@ do_install() { inherit systemd SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "rarpd.service" +SYSTEMD_SERVICE:${PN} = "rarpd.service" SYSTEMD_AUTO_ENABLE = "disable" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb index 8b7a8d06e34..0870c6629d1 100644 --- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb +++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.2.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sewenew/redis-plus-plus" SECTION = "libs" DEPENDS += "hiredis" -RDEPENDS_${PN} += "hiredis" +RDEPENDS:${PN} += "hiredis" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" @@ -15,4 +15,4 @@ S = "${WORKDIR}/git" inherit cmake FILES_SOLIBSDEV = "" -FILES_${PN} += " ${libdir}/libredis++.so" +FILES:${PN} += " ${libdir}/libredis++.so" diff --git a/meta-oe/recipes-extended/redis/redis_6.2.4.bb b/meta-oe/recipes-extended/redis/redis_6.2.4.bb index 35f34a27def..0db71240ede 100644 --- a/meta-oe/recipes-extended/redis/redis_6.2.4.bb +++ b/meta-oe/recipes-extended/redis/redis_6.2.4.bb @@ -21,21 +21,21 @@ SRC_URI[sha256sum] = "ba32c406a10fc2c09426e2be2787d74ff204eb3a2e496d87cff76a476b inherit autotools-brokensep update-rc.d systemd useradd -FINAL_LIBS_x86_toolchain-clang = "-latomic" -FINAL_LIBS_riscv32_toolchain-clang = "-latomic" -FINAL_LIBS_mips = "-latomic" -FINAL_LIBS_arm = "-latomic" -FINAL_LIBS_powerpc = "-latomic" +FINAL_LIBS:x86:toolchain-clang = "-latomic" +FINAL_LIBS:riscv32:toolchain-clang = "-latomic" +FINAL_LIBS:mips = "-latomic" +FINAL_LIBS:arm = "-latomic" +FINAL_LIBS:powerpc = "-latomic" export FINAL_LIBS USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" -GROUPADD_PARAM_${PN} = "--system redis" +USERADD_PARAM:${PN} = "--system --home-dir /var/lib/redis -g redis --shell /bin/false redis" +GROUPADD_PARAM:${PN} = "--system redis" REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" -do_compile_prepend() { +do_compile:prepend() { (cd deps && oe_runmake hiredis lua linenoise) } @@ -58,9 +58,9 @@ do_install() { fi } -CONFFILES_${PN} = "${sysconfdir}/redis/redis.conf" +CONFFILES:${PN} = "${sysconfdir}/redis/redis.conf" INITSCRIPT_NAME = "redis-server" INITSCRIPT_PARAMS = "defaults 87" -SYSTEMD_SERVICE_${PN} = "redis.service" +SYSTEMD_SERVICE:${PN} = "redis.service" diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb index 5662e634747..a1919e74007 100644 --- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb +++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.7.2.bb @@ -20,7 +20,7 @@ inherit cpan autotools-brokensep gettext python3native python3-dir systemd BBCLASSEXTEND = "native" SYSTEMD_PACKAGES = "rrdcached" -SYSTEMD_SERVICE_rrdcached = "rrdcached.socket rrdcached.service" +SYSTEMD_SERVICE:rrdcached = "rrdcached.socket rrdcached.service" EXTRA_AUTORECONF = "-I m4 --exclude=autopoint" @@ -104,26 +104,26 @@ do_configure() { PACKAGES =+ "${PN}-perl ${PN}-python" PACKAGES =+ "rrdcached" -DESCRIPTION_rrdcached = \ +DESCRIPTION:rrdcached = \ "The rrdcached package contains the data caching daemon for RRDtool." -FILES_rrdcached = "${bindir}/rrdcached \ +FILES:rrdcached = "${bindir}/rrdcached \ ${systemd_unitdir}/system/rrdcached.service \ ${systemd_unitdir}/system/rrdcached.socket" -FILES_${PN}-doc += "${datadir}/rrdtool/examples" +FILES:${PN}-doc += "${datadir}/rrdtool/examples" -DESCRIPTION_${PN}-perl = \ +DESCRIPTION:${PN}-perl = \ "The ${PN}-perl package includes RRDtool bindings for perl." -FILES_${PN}-perl = "${libdir}/perl/vendor_perl/*/*.pm \ +FILES:${PN}-perl = "${libdir}/perl/vendor_perl/*/*.pm \ ${libdir}/perl/vendor_perl/*/auto/RRDs/RRDs.*" -RDEPENDS_${PN}-perl = "perl perl-module-lib perl-module-getopt-long perl-module-time-hires \ +RDEPENDS:${PN}-perl = "perl perl-module-lib perl-module-getopt-long perl-module-time-hires \ perl-module-io-file perl-module-ipc-open2 perl-module-io-socket" -DESCRIPTION_${PN}-python = \ +DESCRIPTION:${PN}-python = \ "The ${PN}-python package includes RRDtool bindings for python." -FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -RDEPENDS_${PN}-python = "python3" +FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +RDEPENDS:${PN}-python = "python3" -FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \ +FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \ ${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug" diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb index 37f391356f0..9d7e494d08e 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb @@ -27,7 +27,7 @@ SRC_URI = "http://www.rsyslog.com/download/files/download/rsyslog/${BPN}-${PV}.t file://0001-tests-disable-the-check-for-inotify.patch \ " -SRC_URI_append_libc-musl = " \ +SRC_URI:append:libc-musl = " \ file://0001-Include-sys-time-h.patch \ " @@ -41,9 +41,9 @@ inherit autotools pkgconfig systemd update-rc.d ptest EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" EXTRA_OECONF += "--enable-imfile-tests" -EXTRA_OECONF_remove_mipsarch = "ap_cv_atomic_builtins=yes" -EXTRA_OECONF_remove_powerpc = "ap_cv_atomic_builtins=yes" -EXTRA_OECONF_remove_riscv32 = "ap_cv_atomic_builtins=yes" +EXTRA_OECONF:remove:mipsarch = "ap_cv_atomic_builtins=yes" +EXTRA_OECONF:remove:powerpc = "ap_cv_atomic_builtins=yes" +EXTRA_OECONF:remove:riscv32 = "ap_cv_atomic_builtins=yes" # first line is default yes in configure PACKAGECONFIG ??= " \ @@ -132,7 +132,7 @@ do_install_ptest() { sed -i -e s:${HOSTTOOLS_DIR}:${bindir}:g ${D}${PTEST_PATH}/tests/set-envvars } -do_install_append() { +do_install:append() { install -d "${D}${sysconfdir}/init.d" install -d "${D}${sysconfdir}/logrotate.d" install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog @@ -155,51 +155,51 @@ do_install_append() { fi } -FILES_${PN} += "${bindir}" +FILES:${PN} += "${bindir}" INITSCRIPT_NAME = "syslog" INITSCRIPT_PARAMS = "defaults" -CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf" +CONFFILES:${PN} = "${sysconfdir}/rsyslog.conf" -RCONFLICTS_${PN} = "busybox-syslog sysklogd syslog-ng" +RCONFLICTS:${PN} = "busybox-syslog sysklogd syslog-ng" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" -RDEPENDS_${PN} += "logrotate" +RDEPENDS:${PN} += "logrotate" # for rsyslog-ptest VALGRIND = "valgrind" # valgrind supports armv7 and above -VALGRIND_armv4 = '' -VALGRIND_armv5 = '' -VALGRIND_armv6 = '' +VALGRIND:armv4 = '' +VALGRIND:armv5 = '' +VALGRIND:armv6 = '' # X32 isn't supported by valgrind at this time -VALGRIND_linux-gnux32 = '' -VALGRIND_linux-muslx32 = '' +VALGRIND:linux-gnux32 = '' +VALGRIND:linux-muslx32 = '' # Disable for some MIPS variants -VALGRIND_mipsarchr6 = '' -VALGRIND_linux-gnun32 = '' +VALGRIND:mipsarchr6 = '' +VALGRIND:linux-gnun32 = '' # Disable for powerpc64 with musl -VALGRIND_libc-musl_powerpc64 = '' -VALGRIND_libc-musl_powerpc64le = '' +VALGRIND:libc-musl:powerpc64 = '' +VALGRIND:libc-musl:powerpc64le = '' # RISC-V support for valgrind is not there yet -VALGRIND_riscv64 = "" -VALGRIND_riscv32 = "" +VALGRIND:riscv64 = "" +VALGRIND:riscv32 = "" # util-linux: logger needs the -d option -RDEPENDS_${PN}-ptest += "\ +RDEPENDS:${PN}-ptest += "\ make diffutils gzip bash gawk coreutils procps \ libgcc python3-core python3-io python3-json \ curl util-linux shadow \ " -RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" +RRECOMMENDS:${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb b/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb index e8b2e372120..11a165ed790 100644 --- a/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb +++ b/meta-oe/recipes-extended/sanlock/sanlock_3.8.3.bb @@ -26,12 +26,12 @@ inherit distutils3 useradd do_configure[noexec] = "1" -do_compile_prepend () { +do_compile:prepend () { oe_runmake -C ${S}/../wdmd CMD_LDFLAGS="${LDFLAGS}" LIB_LDFLAGS="${LDFLAGS}" oe_runmake -C ${S}/../src CMD_LDFLAGS="${LDFLAGS}" LIB_ENTIRE_LDFLAGS="${LDFLAGS}" LIB_CLIENT_LDFLAGS="${LDFLAGS}" } -do_install_prepend () { +do_install:prepend () { oe_runmake -C ${S}/../wdmd DESTDIR=${D} LIBDIR=${libdir} install oe_runmake -C ${S}/../src DESTDIR=${D} LIBDIR=${libdir} install } @@ -39,7 +39,7 @@ do_install_prepend () { SANLOCKGROUP ?= "sanlock" SANLOCKUSER ?= "sanlock" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system ${SANLOCKGROUP}" -USERADD_PARAM_${PN} = "--system -g ${SANLOCKGROUP} -G disk \ +GROUPADD_PARAM:${PN} = "--system ${SANLOCKGROUP}" +USERADD_PARAM:${PN} = "--system -g ${SANLOCKGROUP} -G disk \ --home-dir /run/${SANLOCKUSER} --no-create-home \ --shell /sbin/nologin ${SANLOCKUSER}" diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index 9a3a66c2a8a..7e00f150d32 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -36,10 +36,10 @@ inherit autotools inherit systemd SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "sblim-sfcb.service" +SYSTEMD_SERVICE:${PN} = "sblim-sfcb.service" SYSTEMD_AUTO_ENABLE = "enable" -LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" EXTRA_OECONF = '--enable-debug \ --enable-ssl \ @@ -50,7 +50,7 @@ EXTRA_OECONF = '--enable-debug \ # make all with -j option is unsafe. PARALLEL_MAKE = "" -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" CONFIG_SITE = "${WORKDIR}/config-site.${P}" do_install() { @@ -68,16 +68,16 @@ do_install() { rm -rf ${D}${libdir}/sfcb/*.la } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} } -pkg_postinst_ontarget_${PN} () { +pkg_postinst_ontarget:${PN} () { ${datadir}/sfcb/genSslCert.sh ${sysconfdir}/sfcb ${bindir}/sfcbrepos -f } -FILES_${PN} += "${libdir}/sfcb ${datadir}/sfcb" -FILES_${PN}-dbg += "${libdir}/sfcb/.debug" +FILES:${PN} += "${libdir}/sfcb ${datadir}/sfcb" +FILES:${PN}-dbg += "${libdir}/sfcb/.debug" -RDEPENDS_${PN} = "perl bash" +RDEPENDS:${PN} = "perl bash" diff --git a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb index 2b7571e232d..66620ea5ff0 100644 --- a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb +++ b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb @@ -23,25 +23,25 @@ inherit autotools update-rc.d EXTRA_OEMAKE += "CC='${CC}'" -do_configure_append() { +do_configure:append() { oe_runmake -C mdadm.d mdadm-1.3.0 patch -p0 < ${WORKDIR}/mdadm.patch } INITSCRIPT_PACKAGES = "${PN}-diskmon ${PN}-raidmon" -INITSCRIPT_NAME_${PN}-diskmon = "sgdisk" -INITSCRIPT_PARAMS_${PN}-diskmon = "defaults 80 20" -INITSCRIPT_NAME_${PN}-raidmon = "sgraid" -INITSCRIPT_PARAMS_${PN}-raidmon = "defaults 80 20" +INITSCRIPT_NAME:${PN}-diskmon = "sgdisk" +INITSCRIPT_PARAMS:${PN}-diskmon = "defaults 80 20" +INITSCRIPT_NAME:${PN}-raidmon = "sgraid" +INITSCRIPT_PARAMS:${PN}-raidmon = "defaults 80 20" PACKAGES =+ "${PN}-diskmon" PACKAGES =+ "${PN}-raidmon" -RPROVIDES_${PN}-dbg += "${PN}-diskmon-dbg ${PN}-raidmon-dbg" +RPROVIDES:${PN}-dbg += "${PN}-diskmon-dbg ${PN}-raidmon-dbg" -FILES_${PN}-diskmon = "${sbindir}/sgdiskmon ${sysconfdir}/init.d/sgdisk" +FILES:${PN}-diskmon = "${sbindir}/sgdiskmon ${sysconfdir}/init.d/sgdisk" -FILES_${PN}-raidmon = "${sbindir}/sgraidmon ${sysconfdir}/init.d/sgraid" +FILES:${PN}-raidmon = "${sbindir}/sgraidmon ${sysconfdir}/init.d/sgraid" -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN}-diskmon += "${PN} bash" -RDEPENDS_${PN}-raidmon += "${PN} bash" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN}-diskmon += "${PN} bash" +RDEPENDS:${PN}-raidmon += "${PN} bash" diff --git a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb index 63e8d36d0ab..0628c1d586c 100644 --- a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb +++ b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/${BPN}" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE_GPL;md5=393a5ca445f6965873eca0259a17f833" -do_compile_prepend() { +do_compile:prepend() { oe_runmake clean } diff --git a/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb b/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb index e8c36a81d71..5a5b357f0c5 100644 --- a/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb +++ b/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb @@ -22,4 +22,4 @@ SRC_URI = "http://sigrok.org/download/source/libsigrok/libsigrok-${PV}.tar.gz" SRC_URI[md5sum] = "e258d471b6d5eaa58daf927a0dc3ba67" SRC_URI[sha256sum] = "4d341f90b6220d3e8cb251dacf726c41165285612248f2c52d15df4590a1ce3c" -FILES_${PN} += "${datadir}/*" +FILES:${PN} += "${datadir}/*" diff --git a/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb b/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb index 4fd516bc2b5..2f0aa8cc065 100644 --- a/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb +++ b/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb @@ -16,4 +16,4 @@ SRC_URI = "http://sigrok.org/download/source/sigrok-cli/sigrok-cli-${PV}.tar.gz" SRC_URI[md5sum] = "856fd496cd99d1091aa128405c522a36" SRC_URI[sha256sum] = "71d0443f36897bf565732dec206830dbea0f2789b6601cf10536b286d1140ab8" -FILES_${PN} += "${datadir}/icons/hicolor" +FILES:${PN} += "${datadir}/icons/hicolor" diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb index cd979335926..f2ee97b9340 100644 --- a/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb +++ b/meta-oe/recipes-extended/smartmontools/smartmontools_7.2.bb @@ -28,10 +28,10 @@ SRC_URI[sha256sum] = "5cd98a27e6393168bc6aaea070d9e1cd551b0f898c52f66b2ff2e5d274 inherit autotools update-rc.d systemd -SYSTEMD_SERVICE_${PN} = "smartd.service" +SYSTEMD_SERVICE:${PN} = "smartd.service" SYSTEMD_AUTO_ENABLE = "disable" -do_install_append () { +do_install:append () { #install the init.d/smartd install -d ${D}${sysconfdir}/init.d install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd @@ -50,4 +50,4 @@ do_install_append () { INITSCRIPT_NAME = "smartd" INITSCRIPT_PARAMS = "start 60 2 3 4 5 . stop 60 0 1 6 ." -RDEPENDS_${PN} += "mailx" +RDEPENDS:${PN} += "mailx" diff --git a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index 0278b533806..eed79ae7feb 100644 --- a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -12,7 +12,7 @@ inherit module EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}" -do_install_append() { +do_install:append() { install -Dm 644 ${S}/include/uapi/linux/can/isotp.h ${D}${includedir}/linux/can/isotp.h } diff --git a/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-oe/recipes-extended/socketcan/can-utils_git.bb index 36e7d1ef57f..ad7fc596ed2 100644 --- a/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -16,7 +16,7 @@ inherit autotools pkgconfig update-alternatives PACKAGES =+ "${PN}-access ${PN}-isotp ${PN}-j1939 ${PN}-cantest ${PN}-slcan ${PN}-log" -FILES_${PN}-access = " \ +FILES:${PN}-access = " \ ${bindir}/cangw \ ${bindir}/canlogserver \ ${bindir}/bcmserver \ @@ -24,24 +24,24 @@ FILES_${PN}-access = " \ ${bindir}/cannelloni \ " -FILES_${PN}-isotp = "${bindir}/isotp*" +FILES:${PN}-isotp = "${bindir}/isotp*" -FILES_${PN}-j1939 = " \ +FILES:${PN}-j1939 = " \ ${bindir}/j* \ ${bindir}/testj1939 \ " -FILES_${PN}-cantest = " \ +FILES:${PN}-cantest = " \ ${bindir}/canbusload \ ${bindir}/can-calc-bit-timing \ ${bindir}/canfdtest \ " -FILES_${PN}-slcan = "${bindir}/slcan*" +FILES:${PN}-slcan = "${bindir}/slcan*" -FILES_${PN}-log = "${bindir}/*log*" +FILES:${PN}-log = "${bindir}/*log*" -ALTERNATIVE_${PN} = "candump cansend cansequence" +ALTERNATIVE:${PN} = "candump cansend cansequence" ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence" diff --git a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb index 8b13daea1c4..65e1fde0bfa 100644 --- a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb +++ b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb @@ -19,10 +19,10 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig # Busybox ip doesn't support can interface configuration, use the real thing -RDEPENDS_${PN} += "iproute2" +RDEPENDS:${PN} += "iproute2" ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE_${PN} = "candump cansend cansequence" +ALTERNATIVE:${PN} = "candump cansend cansequence" ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence" diff --git a/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-oe/recipes-extended/sysdig/sysdig_git.bb index a626e3b2070..a12f8ba5e1c 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -10,16 +10,16 @@ inherit cmake pkgconfig #OECMAKE_GENERATOR = "Unix Makefiles" JIT ?= "jit" -JIT_mipsarchn32 = "" -JIT_mipsarchn64 = "" -JIT_riscv64 = "" -JIT_riscv32 = "" -JIT_powerpc = "" -JIT_powerpc64le = "" -JIT_powerpc64 = "" +JIT:mipsarchn32 = "" +JIT:mipsarchn64 = "" +JIT:riscv64 = "" +JIT:riscv32 = "" +JIT:powerpc = "" +JIT:powerpc64le = "" +JIT:powerpc64 = "" DEPENDS += "libb64 lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp tbb jq openssl elfutils protobuf protobuf-native jq-native" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" SRC_URI = "git://github.com/draios/sysdig.git;branch=dev \ file://0001-fix-build-with-LuaJIT-2.1-betas.patch \ @@ -39,7 +39,7 @@ EXTRA_OECMAKE = "\ -DLUA_LIBRARY=libluajit-5.1.so \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${DIR_ETC}/* \ ${datadir}/zsh/* \ ${prefix}/src/* \ @@ -48,8 +48,8 @@ FILES_${PN} += " \ # It should be fixed in sysdig, until then disable # on musl # Something like this https://code.videolan.org/ePirat/vlc/-/commit/01fd9fe4c7f6c5558f7345f38abf0152e17853ab is needed to fix it -COMPATIBLE_HOST_libc-musl = "null" -COMPATIBLE_HOST_mips = "null" -COMPATIBLE_HOST_riscv64 = "null" -COMPATIBLE_HOST_riscv32 = "null" -COMPATIBLE_HOST_powerpc = "null" +COMPATIBLE_HOST:libc-musl = "null" +COMPATIBLE_HOST:mips = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" +COMPATIBLE_HOST:powerpc = "null" diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index 637770af24d..e2e6de6b5f3 100644 --- a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -15,15 +15,15 @@ inherit autotools pkgconfig DEPENDS += "libdaemon" -RDEPENDS_${PN} = "iproute2-tipc" +RDEPENDS:${PN} = "iproute2-tipc" S = "${WORKDIR}/git" -do_configure_prepend() { +do_configure:prepend() { ( cd ${S}; ${S}/bootstrap ) } -do_install_append() { +do_install:append() { demos="benchmark hello_world topology_subscr_demo connection_demo \ multicast_demo stream_demo" for i in $demos;do @@ -44,6 +44,6 @@ do_install_append() { } PACKAGES += "${PN}-demos" -FILES_${PN}-dbg += "/opt/tipcutils/demos/*/.debug /opt/tipcutils/ptts/.debug" -FILES_${PN}-demos = "/opt/tipcutils/*" +FILES:${PN}-dbg += "/opt/tipcutils/demos/*/.debug /opt/tipcutils/ptts/.debug" +FILES:${PN}-demos = "/opt/tipcutils/*" diff --git a/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb b/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb index cf67a08b3e1..31d0dae25c6 100644 --- a/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb +++ b/meta-oe/recipes-extended/tiptop/tiptop_2.3.1.bb @@ -17,7 +17,7 @@ inherit autotools EXTRA_OECONF = "CFLAGS="$CFLAGS -I${STAGING_INCDIR}/libxml2"" COMPATIBLE_HOST = "(i.86|x86_64|arm|powerpc|aarch64).*-linux" -do_configure_prepend () { +do_configure:prepend () { # Two bugs in configure.ac when cross-compiling. # 1. The path of libxml2. Specify it in EXTRA_OECONF. # 2. hw's value on other platforms. Replace it if the target is diff --git a/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb b/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb index df534ddda44..7ae8c515085 100644 --- a/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb +++ b/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://tmate.io/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://COPYING;md5=f7d9aab84ec6567139a4755c48d147fb" -DEPENDS_append = " libevent libssh msgpack-c ncurses" +DEPENDS:append = " libevent libssh msgpack-c ncurses" SRC_URI = "\ git://github.com/tmate-io/tmate.git;protocol=https \ " diff --git a/meta-oe/recipes-extended/tmux/tmux_3.1c.bb b/meta-oe/recipes-extended/tmux/tmux_3.1c.bb index 7cac48eb6c8..ec9fe34cf18 100644 --- a/meta-oe/recipes-extended/tmux/tmux_3.1c.bb +++ b/meta-oe/recipes-extended/tmux/tmux_3.1c.bb @@ -18,7 +18,7 @@ inherit autotools pkgconfig PACKAGECONFIG ??= "" PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter," -do_configure_prepend() { +do_configure:prepend() { # The 'compat' directory is needed for output during the build but it's # not automatically created when building outside the source directory. mkdir -p ${B}/compat diff --git a/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb index 38ce4f55716..472a39589e0 100644 --- a/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb +++ b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb @@ -18,9 +18,9 @@ PACKAGECONFIG[systemd] = ",,systemd" INITSCRIPT_NAME = "triggerhappy" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "triggerhappy.service triggerhappy.socket" +SYSTEMD_SERVICE:${PN} = "triggerhappy.service triggerhappy.socket" -FILES_${PN} = "\ +FILES:${PN} = "\ ${sbindir}/thd \ ${sbindir}/th-cmd \ ${sysconfdir}/triggerhappy/triggers.d \ @@ -28,9 +28,9 @@ FILES_${PN} = "\ ${sysconfdir}/init.d/triggerhappy \ ${systemd_unitdir}/system \ " -CONFFILES_${PN} = "${sysconfdir}/udev/rules.d/80-triggerhappy.rules" +CONFFILES:${PN} = "${sysconfdir}/udev/rules.d/80-triggerhappy.rules" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/triggerhappy/triggers.d install -d ${D}${nonarch_base_libdir}/udev/rules.d diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb index f86b2b912e4..3e8d87f9aa2 100644 --- a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb +++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb @@ -25,7 +25,7 @@ do_install() { oe_runmake install DESTDIR=${D} } -FILES_${PN} += "${libdir}/uml" +FILES:${PN} += "${libdir}/uml" -ALTERNATIVE_${PN} = "tunctl" +ALTERNATIVE:${PN} = "tunctl" ALTERNATIVE_LINK_NAME[tunctl] = "${bindir}/tunctl" diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 6a7611f3826..cd7dd9ae0f2 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http \ file://0001-cmake-Disable-using-Wno-maybe-uninitialized.patch \ " -SRC_URI_append_toolchain-clang_x86 = " file://0001-nmea_gps-Link-with-latomic.patch " +SRC_URI:append:toolchain-clang:x86 = " file://0001-nmea_gps-Link-with-latomic.patch " S = "${WORKDIR}/git" @@ -30,15 +30,15 @@ inherit distutils3-base cmake pkgconfig EXTRA_OECMAKE += "-UPYTHON_EXECUTABLE -DWERROR=off" # override this in local.conf to get needed bindings. -# BINDINGS_pn-upm="python" +# BINDINGS:pn-upm="python" # will result in only the python bindings being built/packaged. # Note: 'nodejs' is disabled by default because the bindings # generation currently fails with nodejs (>v7.x). BINDINGS ??= "python" # nodejs isn't available for armv4/armv5 architectures -BINDINGS_armv4 ??= "python" -BINDINGS_armv5 ??= "python" +BINDINGS:armv4 ??= "python" +BINDINGS:armv5 ??= "python" PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" @@ -46,15 +46,15 @@ PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN}," PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," -do_configure_prepend() { +do_configure:prepend() { sed -i s:\"lib/${_packages_path}:\"${baselib}/${_packages_path}:g ${S}/cmake/modules/OpenCVDetectPython.cmake } -FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}" -RDEPENDS_${PYTHON_PN}-${PN} += "${PYTHON_PN}" +FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}" +RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}" -FILES_node-${PN} = "${prefix}/lib/node_modules/" -RDEPENDS_node-${PN} += "nodejs" +FILES:node-${PN} = "${prefix}/lib/node_modules/" +RDEPENDS:node-${PN} += "nodejs" ### Include desired language bindings ### PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" diff --git a/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb b/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb index 259d3a5e161..3c17d7a3c5c 100644 --- a/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb +++ b/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb @@ -47,13 +47,13 @@ do_configure () { ${PACKAGECONFIG_CONFARGS} } -do_install_append () { +do_install:append () { if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ]; then install -d -m 0755 ${D}/${sysconfdir}/pam.d install -m 0644 ${WORKDIR}/vlock_pam ${D}${sysconfdir}/pam.d/vlock fi } -ALTERNATIVE_${PN} = "vlock" +ALTERNATIVE:${PN} = "vlock" ALTERNATIVE_PRIORITY = "60" ALTERNATIVE_LINK_NAME[vlock] = "${bindir}/vlock" diff --git a/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb index e036f714bad..bfecc7ebd84 100644 --- a/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb +++ b/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb @@ -32,7 +32,7 @@ PACKAGECONFIG[python3] = "--with-python3,--without-python3,python3,python3" EXTRA_OECONF = "--without-python" -RDEPENDS_python3-${BPN} += "${PN}" +RDEPENDS:python3-${BPN} += "${PN}" PACKAGES += "python3-${BPN}" -FILES_python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/*" diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb index 26a9004fb7b..f1e87ba220e 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_git.bb @@ -38,7 +38,7 @@ EXTRA_OECMAKE += " \ -DwxUSE_LIBTIFF=sys \ -DwxUSE_REGEX=builtin \ " -EXTRA_OECMAKE_append_libc-musl = " \ +EXTRA_OECMAKE:append:libc-musl = " \ -DHAVE_LOCALE_T=OFF \ " @@ -70,7 +70,7 @@ PACKAGECONFIG[opengl] = ",,libglu" PACKAGECONFIG[sdl_audio] = "-DwxUSE_LIBSDL=ON,-DwxUSE_LIBSDL=OFF,libsdl2" PACKAGECONFIG[webkit] = "-DwxUSE_WEBVIEW_WEBKIT=ON,-DwxUSE_WEBVIEW_WEBKIT=OFF,webkitgtk,,,no_gui" -do_compile_append() { +do_compile:append() { # if not at re-compile if [ -L ${B}/wx-config ]; then # ${B}/wx-config is a symlink for build and not needed after compile @@ -88,7 +88,7 @@ do_compile_append() { ${B}/wx-config } -do_install_append() { +do_install:append() { # do not ship bindir if empty rmdir --ignore-fail-on-non-empty ${D}${bindir} } @@ -96,9 +96,9 @@ do_install_append() { # lib names are not canonical FILES_SOLIBSDEV = "" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/libwx_*.so \ ${libdir}/wx/ \ " -FILES_${PN}-dev += "${libdir}/wx/include/" +FILES:${PN}-dev += "${libdir}/wx/include/" diff --git a/meta-oe/recipes-extended/zram/zram_0.2.bb b/meta-oe/recipes-extended/zram/zram_0.2.bb index 98c47af7acd..97db34134e4 100644 --- a/meta-oe/recipes-extended/zram/zram_0.2.bb +++ b/meta-oe/recipes-extended/zram/zram_0.2.bb @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit update-rc.d systemd -RDEPENDS_${PN} = "kmod \ +RDEPENDS:${PN} = "kmod \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','util-linux','util-linux-swaponoff',d)}" -RRECOMMENDS_${PN} = "kernel-module-zram" +RRECOMMENDS:${PN} = "kernel-module-zram" PR = "r3" @@ -36,7 +36,7 @@ do_install () { fi } -FILES_${PN} = " \ +FILES:${PN} = " \ ${sysconfdir} \ ${systemd_unitdir} \ ${libexecdir} \ @@ -44,7 +44,7 @@ FILES_${PN} = " \ INITSCRIPT_NAME = "zram" INITSCRIPT_PARAMS = "start 05 2 3 4 5 . stop 22 0 1 6 ." -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "dev-zram0.swap" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "dev-zram0.swap" |