From c61dc077bbd81260e4f167fa2251643ba0ba6974 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 29 Jul 2021 17:04:53 +0200 Subject: 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 --- meta-oe/recipes-connectivity/ace/ace_6.5.12.bb | 6 +- meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb | 24 ++++---- .../recipes-connectivity/gattlib/gattlib_git.bb | 4 +- .../recipes-connectivity/gensio/gensio_2.2.8.bb | 2 +- .../recipes-connectivity/hostapd/hostapd_2.9.bb | 8 +-- .../recipes-connectivity/ifplugd/ifplugd_0.28.bb | 6 +- meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb | 2 +- meta-oe/recipes-connectivity/iwd/iwd_1.15.bb | 12 ++-- meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb | 70 +++++++++++----------- meta-oe/recipes-connectivity/libev/libev_4.33.bb | 2 +- .../recipes-connectivity/libmtp/libmtp_1.1.18.bb | 20 +++---- .../libtorrent/libtorrent_git.bb | 8 +-- .../libwebsockets/libwebsockets_4.2.1.bb | 16 ++--- .../recipes-connectivity/linuxptp/linuxptp_3.1.bb | 4 +- .../modemmanager/modemmanager_1.16.8.bb | 10 ++-- meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb | 6 +- .../obex/obex-data-server_0.4.6.bb | 2 +- .../recipes-connectivity/obex/openobex_1.7.2.bb | 12 ++-- .../recipes-connectivity/obexftp/obexftp_0.24.2.bb | 6 +- .../packagegroups/packagegroup-tools-bluetooth.bb | 2 +- .../paho-mqtt-c/paho-mqtt-c_1.3.8.bb | 4 +- .../rabbitmq-c/rabbitmq-c_0.11.0.bb | 2 +- meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb | 2 +- .../recipes-connectivity/rtorrent/rtorrent_git.bb | 2 +- .../telepathy/telepathy-glib_0.24.1.bb | 2 +- .../telepathy/telepathy-idle_0.2.0.bb | 2 +- .../recipes-connectivity/thrift/thrift_0.13.0.bb | 20 +++---- .../transmission/transmission_git.bb | 14 ++--- .../recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb | 4 +- .../wifi-test-suite/wifi-test-suite_git.bb | 2 +- meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb | 4 +- .../recipes-connectivity/wvdial/wvstreams_4.6.1.bb | 32 +++++----- .../recipes-connectivity/zabbix/zabbix_5.2.6.bb | 16 ++--- meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb | 2 +- meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb | 12 ++-- .../recipes-connectivity/zeromq/zeromq_4.3.4.bb | 2 +- 36 files changed, 172 insertions(+), 172 deletions(-) (limited to 'meta-oe/recipes-connectivity') diff --git a/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb b/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb index 086fc9d06e..6c68aede03 100644 --- a/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb +++ b/meta-oe/recipes-connectivity/ace/ace_6.5.12.bb @@ -14,7 +14,7 @@ SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_1 SRC_URI[sha256sum] = "ccd94fa45df1e8bb1c901d02c0a64c1626497e5eeda2f057fcf0a1578dae2148" -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" S = "${WORKDIR}/ACE_wrappers" B = "${WORKDIR}/ACE_wrappers/ace" @@ -22,8 +22,8 @@ export ACE_ROOT="${WORKDIR}/ACE_wrappers" inherit pkgconfig -CXXFLAGS_append = " -fpermissive -Wnodeprecated-declarations" -CXX_append = " -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " +CXXFLAGS:append = " -fpermissive -Wnodeprecated-declarations" +CXX:append = " -ffile-prefix-map=${WORKDIR}= -fdebug-prefix-map=${WORKDIR}= " EXTRA_OEMAKE += "INSTALL_LIB=${baselib}" do_install() { diff --git a/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb b/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb index fd6b85ff2e..c355dadf0b 100644 --- a/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb +++ b/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb @@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "de67caa102aa4c8fbed5300e5a0262e40411c4cc79f4379a8d34eed797 inherit distutils3 cmake gettext -do_install_append() { +do_install:append() { # these files seem to only be used by symbian and trigger QA warnings rm -rf ${D}/usr/share/gammu #install default configuration files @@ -42,19 +42,19 @@ EXTRA_OECMAKE = " \ PACKAGES =+ "${PN}-smsd libgammu libgsmsd python-${PN}" -FILES_${PN} = "${bindir}/gammu ${bindir}/jadmaker ${sysconfdir}/bash_completion.d/gammu \ +FILES:${PN} = "${bindir}/gammu ${bindir}/jadmaker ${sysconfdir}/bash_completion.d/gammu \ ${bindir}/gammu-detect ${sysconfdir}/gammurc" -CONFFILES_${PN} = "${sysconfdir}/gammurc" -FILES_${PN}-smsd = "${bindir}/gammu-smsd* ${sysconfdir}/gammu-smsdrc" -CONFFILES_${PN}-smsd = "${sysconfdir}/gammu-smsdrc" -FILES_${PN}-dev += "${bindir}/gammu-config ${libdir}/*.so" -FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug ${PYTHON_SITEPACKAGES_DIR}/gammu/.debug" -FILES_libgammu = "${libdir}/libGammu.so.*" -FILES_libgsmsd = "${libdir}/libgsmsd.so.*" -FILES_python-${PN} = "${PYTHON_SITEPACKAGES_DIR}/gammu/*.??" +CONFFILES:${PN} = "${sysconfdir}/gammurc" +FILES:${PN}-smsd = "${bindir}/gammu-smsd* ${sysconfdir}/gammu-smsdrc" +CONFFILES:${PN}-smsd = "${sysconfdir}/gammu-smsdrc" +FILES:${PN}-dev += "${bindir}/gammu-config ${libdir}/*.so" +FILES:${PN}-dbg += "${bindir}/.debug ${libdir}/.debug ${PYTHON_SITEPACKAGES_DIR}/gammu/.debug" +FILES:libgammu = "${libdir}/libGammu.so.*" +FILES:libgsmsd = "${libdir}/libgsmsd.so.*" +FILES:python-${PN} = "${PYTHON_SITEPACKAGES_DIR}/gammu/*.??" -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN}-dev += "bash" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN}-dev += "bash" # Fails to build with thumb-1 (qemuarm) # gammu-1.32.0/libgammu/service/sms/gsmems.c:542:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 diff --git a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb index d79dbed87a..234f840f95 100644 --- a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb @@ -28,5 +28,5 @@ EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF" inherit pkgconfig cmake -FILES_${PN} = "${libdir}/*" -FILES_${PN}-dev = "${includedir}/*" +FILES:${PN} = "${libdir}/*" +FILES:${PN}-dev = "${includedir}/*" diff --git a/meta-oe/recipes-connectivity/gensio/gensio_2.2.8.bb b/meta-oe/recipes-connectivity/gensio/gensio_2.2.8.bb index 4c85275f47..a2478dd54e 100644 --- a/meta-oe/recipes-connectivity/gensio/gensio_2.2.8.bb +++ b/meta-oe/recipes-connectivity/gensio/gensio_2.2.8.bb @@ -21,4 +21,4 @@ PACKAGECONFIG[swig] = "--with-swig,--without-swig, swig" EXTRA_OECONF = "--without-python" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb b/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb index a9780bc6db..3356f45ca1 100644 --- a/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb +++ b/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb @@ -31,10 +31,10 @@ CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" INITSCRIPT_NAME = "hostapd" -SYSTEMD_SERVICE_${PN} = "hostapd.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +SYSTEMD_SERVICE:${PN} = "hostapd.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" -do_configure_append() { +do_configure:append() { install -m 0644 ${WORKDIR}/defconfig ${B}/.config } @@ -54,4 +54,4 @@ do_install() { sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd.service } -CONFFILES_${PN} += "${sysconfdir}/hostapd.conf" +CONFFILES:${PN} += "${sysconfdir}/hostapd.conf" diff --git a/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb b/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb index 7dc83e85f7..3e6a01de87 100644 --- a/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb +++ b/meta-oe/recipes-connectivity/ifplugd/ifplugd_0.28.bb @@ -10,7 +10,7 @@ SRC_URI = "http://0pointer.de/lennart/projects/ifplugd/ifplugd-${PV}.tar.gz \ file://0001-src-interface.h-Make-declarations-as-extern.patch \ " -SRC_URI_append_libc-musl = " file://Fix-build-with-musl.patch" +SRC_URI:append:libc-musl = " file://Fix-build-with-musl.patch" SRC_URI[md5sum] = "df6f4bab52f46ffd6eb1f5912d4ccee3" SRC_URI[sha256sum] = "474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0" @@ -22,6 +22,6 @@ EXTRA_OECONF = "--disable-lynx --with-initdir=${sysconfdir}/init.d" INITSCRIPT_NAME = "ifplugd" INITSCRIPT_PARAMS = "defaults" -CONFFILES_${PN} = "${sysconfdir}/ifplugd/ifplugd.conf" +CONFFILES:${PN} = "${sysconfdir}/ifplugd/ifplugd.conf" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb b/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb index c95741cd94..bb476ca717 100644 --- a/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb +++ b/meta-oe/recipes-connectivity/irssi/irssi_1.2.3.bb @@ -19,4 +19,4 @@ EXTRA_OECONF += "--with-textui \ --with-perl=no \ --enable-true-color" -FILES_${PN}-staticdev += "${libdir}/${BPN}/modules/*.a" +FILES:${PN}-staticdev += "${libdir}/${BPN}/modules/*.a" diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.15.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.15.bb index 9a5256f94a..bb75387392 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.15.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.15.bb @@ -26,29 +26,29 @@ PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--dis EXTRA_OECONF = "--enable-external-ell" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ iwd.service \ ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ " -do_configure_prepend() { +do_configure:prepend() { install -d ${S}/build-aux } -do_install_append() { +do_install:append() { # If client and monitor are disabled, bindir is empty, causing a QA error rmdir --ignore-fail-on-non-empty ${D}/${bindir} } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${nonarch_libdir}/modules-load.d \ ${systemd_unitdir}/network \ " -RDEPENDS_${PN} = "dbus" +RDEPENDS:${PN} = "dbus" -RRECOMMENDS_${PN} = "\ +RRECOMMENDS:${PN} = "\ kernel-module-pkcs7-message \ kernel-module-pkcs8-key-parser \ kernel-module-x509-key-parser \ diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb index 29bcb48b15..8b83705f6b 100644 --- a/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb +++ b/meta-oe/recipes-connectivity/krb5/krb5_1.17.2.bb @@ -52,9 +52,9 @@ CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regc ac_cv_printf_positional=yes ac_cv_file__etc_environment=yes \ ac_cv_file__etc_TIMEZONE=no" -CFLAGS_append = " -fPIC -DDESTRUCTOR_ATTR_WORKS=1 -I${STAGING_INCDIR}/et" -CFLAGS_append_riscv64 = " -D_REENTRANT -pthread" -LDFLAGS_append = " -pthread" +CFLAGS:append = " -fPIC -DDESTRUCTOR_ATTR_WORKS=1 -I${STAGING_INCDIR}/et" +CFLAGS:append:riscv64 = " -D_REENTRANT -pthread" +LDFLAGS:append = " -pthread" do_configure() { gnu-configize --force @@ -62,7 +62,7 @@ do_configure() { oe_runconf } -do_install_append() { +do_install:append() { rm -rf ${D}/${localstatedir}/run rm -f ${D}${bindir}/sclient rm -f ${D}${bindir}/sim_client @@ -118,23 +118,23 @@ PACKAGES =+ "${PN}-admin-server \ libkrb5support \ libverto" -FILES_${PN} = "${libdir}/krb5/plugins/preauth/test.so" -FILES_${PN}-doc += "${datadir}/examples" -FILES_${PN}-dbg += "${libdir}/krb5/plugins/*/.debug" +FILES:${PN} = "${libdir}/krb5/plugins/preauth/test.so" +FILES:${PN}-doc += "${datadir}/examples" +FILES:${PN}-dbg += "${libdir}/krb5/plugins/*/.debug" -FILES_${PN}-admin-server = "${sbindir}/kadmin.local \ +FILES:${PN}-admin-server = "${sbindir}/kadmin.local \ ${sbindir}/kadmind \ ${sbindir}/kprop \ ${sysconfdir}/default/krb5-admin-server \ ${sysconfdir}/init.d/krb5-admin-server \ ${systemd_system_unitdir}/krb5-admin-server.service" -FILES_${PN}-gss-samples = "${bindir}/gss-client \ +FILES:${PN}-gss-samples = "${bindir}/gss-client \ ${sbindir}/gss-server" -FILES_${PN}-k5tls = "${libdir}/krb5/plugins/tls/k5tls.so" +FILES:${PN}-k5tls = "${libdir}/krb5/plugins/tls/k5tls.so" -FILES_${PN}-kdc = "${libdir}/krb5/plugins/kdb/db2.so \ +FILES:${PN}-kdc = "${libdir}/krb5/plugins/kdb/db2.so \ ${localstatedir}/krb5kdc \ ${sbindir}/kdb5_util \ ${sbindir}/kproplog \ @@ -145,41 +145,41 @@ FILES_${PN}-kdc = "${libdir}/krb5/plugins/kdb/db2.so \ ${sysconfdir}/tmpfiles.d/krb5.conf \ ${systemd_system_unitdir}/krb5-kdc.service" -FILES_${PN}-kdc-ldap = "${libdir}/krb5/libkdb_ldap${SOLIBS} \ +FILES:${PN}-kdc-ldap = "${libdir}/krb5/libkdb_ldap${SOLIBS} \ ${libdir}/krb5/plugins/kdb/kldap.so \ ${sbindir}/kdb5_ldap_util" -FILES_${PN}-kpropd = "${sbindir}/kpropd" -FILES_${PN}-otp = "${libdir}/krb5/plugins/preauth/otp.so" -FILES_${PN}-pkinit = "${libdir}/krb5/plugins/preauth/pkinit.so" -FILES_${PN}-spake = "${libdir}/krb5/plugins/preauth/spake.so" -FILES_${PN}-user = "${bindir}/k*" - -FILES_libgssapi-krb5 = "${libdir}/libgssapi_krb5${SOLIBS}" -FILES_libgssrpc = "${libdir}/libgssrpc${SOLIBS}" -FILES_libk5crypto = "${libdir}/libk5crypto${SOLIBS}" -FILES_libkadm5clnt-mit = "${libdir}/libkadm5clnt_mit${SOLIBS}" -FILES_libkadm5srv-mit = "${libdir}/libkadm5srv_mit${SOLIBS}" -FILES_libkdb5 = "${libdir}/libkdb5${SOLIBS}" -FILES_libkrad = "${libdir}/libkrad${SOLIBS}" -FILES_libkrb5 = "${libdir}/libkrb5${SOLIBS} \ +FILES:${PN}-kpropd = "${sbindir}/kpropd" +FILES:${PN}-otp = "${libdir}/krb5/plugins/preauth/otp.so" +FILES:${PN}-pkinit = "${libdir}/krb5/plugins/preauth/pkinit.so" +FILES:${PN}-spake = "${libdir}/krb5/plugins/preauth/spake.so" +FILES:${PN}-user = "${bindir}/k*" + +FILES:libgssapi-krb5 = "${libdir}/libgssapi_krb5${SOLIBS}" +FILES:libgssrpc = "${libdir}/libgssrpc${SOLIBS}" +FILES:libk5crypto = "${libdir}/libk5crypto${SOLIBS}" +FILES:libkadm5clnt-mit = "${libdir}/libkadm5clnt_mit${SOLIBS}" +FILES:libkadm5srv-mit = "${libdir}/libkadm5srv_mit${SOLIBS}" +FILES:libkdb5 = "${libdir}/libkdb5${SOLIBS}" +FILES:libkrad = "${libdir}/libkrad${SOLIBS}" +FILES:libkrb5 = "${libdir}/libkrb5${SOLIBS} \ ${libdir}/krb5/plugins/authdata \ ${libdir}/krb5/plugins/libkrb5" -FILES_libkrb5support = "${libdir}/libkrb5support${SOLIBS}" -FILES_libverto = "${libdir}/libverto${SOLIBS}" +FILES:libkrb5support = "${libdir}/libkrb5support${SOLIBS}" +FILES:libverto = "${libdir}/libverto${SOLIBS}" -RDEPENDS_${PN}-kadmin-server = "${PN}-kdc" -RDEPENDS_${PN}-kpropd = "${PN}-kdc" +RDEPENDS:${PN}-kadmin-server = "${PN}-kdc" +RDEPENDS:${PN}-kpropd = "${PN}-kdc" INITSCRIPT_PACKAGES = "${PN}-admin-server ${PN}-kdc" -INITSCRIPT_NAME_${PN}-admin-server = "krb5-admin-server" -INITSCRIPT_NAME_${PN}-kdc = "krb5-kdc" +INITSCRIPT_NAME:${PN}-admin-server = "krb5-admin-server" +INITSCRIPT_NAME:${PN}-kdc = "krb5-kdc" SYSTEMD_PACKAGES = "${PN}-admin-server ${PN}-kdc" -SYSTEMD_SERVICE_${PN}-admin-server = "krb5-admin-server.service" -SYSTEMD_SERVICE_${PN}-kdc = "krb5-kdc.service" +SYSTEMD_SERVICE:${PN}-admin-server = "krb5-admin-server.service" +SYSTEMD_SERVICE:${PN}-kdc = "krb5-kdc.service" -pkg_postinst_${PN}-kdc () { +pkg_postinst:${PN}-kdc () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/krb5.conf diff --git a/meta-oe/recipes-connectivity/libev/libev_4.33.bb b/meta-oe/recipes-connectivity/libev/libev_4.33.bb index 760c2dbce4..528b4e8b19 100644 --- a/meta-oe/recipes-connectivity/libev/libev_4.33.bb +++ b/meta-oe/recipes-connectivity/libev/libev_4.33.bb @@ -12,7 +12,7 @@ inherit autotools EXTRA_OECONF += "--with-pic" -do_install_append() { +do_install:append() { # Avoid conflicting with libevent. The provided compatibility layer is # still basic so drop it for now. rm ${D}${includedir}/event.h diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.18.bb b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.18.bb index 423bfd6890..7e3f91a419 100644 --- a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.18.bb +++ b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.18.bb @@ -16,10 +16,10 @@ LIC_FILES_CHKSUM = "\ BBCLASSEXTEND = "native" DEPENDS = "libusb1 gettext-native" -DEPENDS_append_class-target = " ${BPN}-native" +DEPENDS:append:class-target = " ${BPN}-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI_append_class-target = " file://0001-Use-native-mtp-hotplug.patch" +SRC_URI:append:class-target = " file://0001-Use-native-mtp-hotplug.patch" SRC_URI[md5sum] = "7915496daa3f4ea3e095f0161f83d4d4" SRC_URI[sha256sum] = "7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0" @@ -38,13 +38,13 @@ PACKAGECONFIG[mtpz] = "--enable-mtpz,--disable-mtpz,libgcrypt" PACKAGES =+ "${BPN}-common ${BPN}-runtime" -RDEPENDS_${BPN} += "libmtp-common" -RRECOMMENDS_${BPN} += "libmtp-runtime ${PN}-bin" +RDEPENDS:${BPN} += "libmtp-common" +RRECOMMENDS:${BPN} += "libmtp-runtime ${PN}-bin" -FILES_${BPN}-common = "${nonarch_base_libdir}/udev/rules.d/*" -SUMMARY_${BPN}-common = "The udev rules file for MTP devices" +FILES:${BPN}-common = "${nonarch_base_libdir}/udev/rules.d/*" +SUMMARY:${BPN}-common = "The udev rules file for MTP devices" -FILES_${BPN}-runtime = "${nonarch_base_libdir}/udev/mtp-probe" -RDEPENDS_${BPN}-runtime = "libmtp-common" -SUMMARY_${BPN}-runtime = "mtp-probe, used for the MTP udev rules" -DESCRIPTION_${BPN}-runtime = "This package provides mtp-probe, a program to probe newly connected device interfaces from userspace to determine if they are MTP devices, used for udev rules." +FILES:${BPN}-runtime = "${nonarch_base_libdir}/udev/mtp-probe" +RDEPENDS:${BPN}-runtime = "libmtp-common" +SUMMARY:${BPN}-runtime = "mtp-probe, used for the MTP udev rules" +DESCRIPTION:${BPN}-runtime = "This package provides mtp-probe, a program to probe newly connected device interfaces from userspace to determine if they are MTP devices, used for udev rules." diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index e0d3bef3ca..83326cb548 100644 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb @@ -17,9 +17,9 @@ S = "${WORKDIR}/git" PACKAGECONFIG ??= "instrumentation" -PACKAGECONFIG_remove_mipsarch = "instrumentation" -PACKAGECONFIG_remove_powerpc = "instrumentation" -PACKAGECONFIG_remove_riscv32 = "instrumentation" +PACKAGECONFIG:remove:mipsarch = "instrumentation" +PACKAGECONFIG:remove:powerpc = "instrumentation" +PACKAGECONFIG:remove:riscv32 = "instrumentation" PACKAGECONFIG[instrumentation] = "--enable-instrumentation,--disable-instrumentation," @@ -27,6 +27,6 @@ inherit autotools pkgconfig EXTRA_OECONF = "--with-zlib=${STAGING_EXECPREFIXDIR}" -do_configure_prepend() { +do_configure:prepend() { (cd ${S}; ./autogen.sh; cd -) } diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb index 685aebee59..8601a2c042 100644 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb +++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb @@ -31,13 +31,13 @@ EXTRA_OECMAKE += " \ PACKAGES =+ "${PN}-testapps ${PN}-evlib-event ${PN}-evlib-uv ${PN}-evlib-ev" -FILES_${PN}-testapps += "${datadir}/libwebsockets-test-server/* ${bindir}/libwebsockets-test-*" -FILES_${PN}-evlib-event += "${libdir}/libwebsockets-evlib_event.so" -FILES_${PN}-evlib-uv += "${libdir}/libwebsockets-evlib_uv.so" -FILES_${PN}-evlib-ev += "${libdir}/libwebsockets-evlib_ev.so" +FILES:${PN}-testapps += "${datadir}/libwebsockets-test-server/* ${bindir}/libwebsockets-test-*" +FILES:${PN}-evlib-event += "${libdir}/libwebsockets-evlib_event.so" +FILES:${PN}-evlib-uv += "${libdir}/libwebsockets-evlib_uv.so" +FILES:${PN}-evlib-ev += "${libdir}/libwebsockets-evlib_ev.so" -RDEPENDS_${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libevent', '${PN}-evlib-event', '', d)}" -RDEPENDS_${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libuv', '${PN}-evlib-uv', '', d)}" -RDEPENDS_${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libev', '${PN}-evlib-ev', '', d)}" +RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libevent', '${PN}-evlib-event', '', d)}" +RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libuv', '${PN}-evlib-uv', '', d)}" +RDEPENDS:${PN} += " ${@bb.utils.contains('PACKAGECONFIG', 'libev', '${PN}-evlib-ev', '', d)}" -RDEPENDS_${PN}-dev += " ${@bb.utils.contains('PACKAGECONFIG', 'static', '${PN}-staticdev', '', d)}" +RDEPENDS:${PN}-dev += " ${@bb.utils.contains('PACKAGECONFIG', 'static', '${PN}-staticdev', '', d)}" diff --git a/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb b/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb index a0f894a4db..4c6a0797bb 100644 --- a/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb +++ b/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb @@ -28,5 +28,5 @@ do_install() { PACKAGES =+ "${PN}-configs" -FILES_${PN}-configs = "${docdir}" -FILES_${PN}-doc = "${mandir}" +FILES:${PN}-configs = "${docdir}" +FILES:${PN}-doc = "${mandir}" diff --git a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb index acfa113edb..a97c94e5c3 100644 --- a/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb +++ b/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb @@ -31,7 +31,7 @@ EXTRA_OECONF = " \ --with-udev-base-dir=${nonarch_base_libdir}/udev \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/icons \ ${datadir}/polkit-1 \ ${datadir}/dbus-1 \ @@ -40,14 +40,14 @@ FILES_${PN} += " \ ${systemd_unitdir}/system \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/ModemManager/*.la \ " -FILES_${PN}-staticdev += " \ +FILES:${PN}-staticdev += " \ ${libdir}/ModemManager/*.a \ " -FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" +FILES:${PN}-dbg += "${libdir}/ModemManager/.debug" -SYSTEMD_SERVICE_${PN} = "ModemManager.service" +SYSTEMD_SERVICE:${PN} = "ModemManager.service" diff --git a/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb b/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb index 9c439354d1..220c0a8861 100644 --- a/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb +++ b/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb @@ -23,7 +23,7 @@ SRC_URI[sha256sum] = "da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e inherit autotools pkgconfig PACKAGE_BEFORE_PN += "${PN}-server" -FILES_${PN}-server = "${bindir}/mosh-server" +FILES:${PN}-server = "${bindir}/mosh-server" NEEDED_PERL_MODULES = "\ perl-module-socket \ @@ -34,9 +34,9 @@ NEEDED_PERL_MODULES = "\ " # mosh uses SSH to authenticate and the client uses OpenSSH-specific features -RDEPENDS_${PN} += "openssh-ssh ${NEEDED_PERL_MODULES}" +RDEPENDS:${PN} += "openssh-ssh ${NEEDED_PERL_MODULES}" # The server seemed not to work with dropbear either -RDEPENDS_${PN}-server += "openssh-sshd ${NEEDED_PERL_MODULES}" +RDEPENDS:${PN}-server += "openssh-sshd ${NEEDED_PERL_MODULES}" # Fails to build with thumb-1 (qemuarm) #| {standard input}: Assembler messages: diff --git a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb index 8763709355..a181ef0e13 100644 --- a/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb +++ b/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb @@ -14,4 +14,4 @@ inherit features_check autotools-brokensep pkgconfig REQUIRED_DISTRO_FEATURES = "x11" -FILES_${PN} += "${datadir}/dbus-1/" +FILES:${PN} += "${datadir}/dbus-1/" diff --git a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb index 8790723967..420d563acd 100644 --- a/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb +++ b/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ " DEPENDS = "virtual/libusb0" -DEPENDS_append_class-target = " bluez5" +DEPENDS:append:class-target = " bluez5" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}-Source.tar.gz \ " @@ -24,14 +24,14 @@ EXTRA_OECMAKE += "-DBUILD_DOCUMENTATION=OFF" ASNEEDED = "" -do_install_append () { +do_install:append () { rmdir ${D}${bindir} } PACKAGES =+ "openobex-apps" -FILES_${PN}-apps = "${bindir}/*" -FILES_${PN} += "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/openobex-config" -DEBIAN_NOAUTONAME_${PN}-apps = "1" +FILES:${PN}-apps = "${bindir}/*" +FILES:${PN} += "${libdir}/lib*.so.*" +FILES:${PN}-dev += "${bindir}/openobex-config" +DEBIAN_NOAUTONAME:${PN}-apps = "1" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb index b4a914d929..9c9c5965ed 100644 --- a/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb +++ b/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb @@ -23,7 +23,7 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[fuse] = "-DENABLE_FUSE=ON,-DENABLE_FUSE=OFF,fuse" PACKAGECONFIG[swig] = "-DENABLE_SWIG=ON,-DENABLE_SWIG=OFF,swig" -DEPENDS_remove_class-native = "fuse-native" +DEPENDS:remove:class-native = "fuse-native" S = "${WORKDIR}/${BP}-Source" @@ -32,11 +32,11 @@ EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=ON \ -DENABLE_RUBY=OFF -DENABLE_TCL=OFF \ " -do_compile_class-native () { +do_compile:class-native () { oe_runmake crctable } -do_install_class-native () { +do_install:class-native () { install -D -m 0755 ${B}/bfb/crctable ${D}${bindir}/crctable } diff --git a/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb b/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb index efa3467a7f..f976ca109c 100644 --- a/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb +++ b/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb @@ -11,7 +11,7 @@ These tools are used at runtime." inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ bluez5-noinst-tools \ bluez5-obex \ bluez5-testtools \ diff --git a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb index f9b503a2cd..01c961f8a9 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb +++ b/meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.8.bb @@ -21,11 +21,11 @@ S = "${WORKDIR}/git" inherit cmake -do_configure_prepend() { +do_configure:prepend() { sed -i s:\ lib/cmake:\ ${baselib}/cmake:g ${S}/src/CMakeLists.txt } -do_install_append() { +do_install:append() { # paho-mqtt installes some thing that we don't want. rm -rf ${D}${prefix}/samples find ${D}${prefix} -maxdepth 1 -type f -delete diff --git a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb index 0cfd225cf8..29474f17dd 100644 --- a/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb +++ b/meta-oe/recipes-connectivity/rabbitmq-c/rabbitmq-c_0.11.0.bb @@ -16,4 +16,4 @@ EXTRA_OECMAKE = "-DBUILD_EXAMPLES=OFF -DBUILD_TOOLS=ON -DBUILD_TOOLS_DOCS=OFF -D inherit cmake pkgconfig PACKAGE_BEFORE_PN += "${PN}-tools" -FILES_${PN}-tools = "${bindir}" +FILES:${PN}-tools = "${bindir}" diff --git a/meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb b/meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb index e9e35b1651..ac0e8b7686 100644 --- a/meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb +++ b/meta-oe/recipes-connectivity/rfkill/rfkill_1.0.bb @@ -20,6 +20,6 @@ do_install() { inherit update-alternatives -ALTERNATIVE_${PN} = "rfkill" +ALTERNATIVE:${PN} = "rfkill" ALTERNATIVE_PRIORITY = "60" ALTERNATIVE_LINK_NAME[rfkill] = "${sbindir}/rfkill" diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb index 331f978f86..86d3be1689 100644 --- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb @@ -21,6 +21,6 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," inherit autotools pkgconfig -do_configure_prepend() { +do_configure:prepend() { (cd ${S}; ./autogen.sh; cd -) } diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb index 4d4e841f62..e070d1b533 100644 --- a/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb +++ b/meta-oe/recipes-connectivity/telepathy/telepathy-glib_0.24.1.bb @@ -16,5 +16,5 @@ inherit autotools pkgconfig gettext gobject-introspection vala # configure: error: GObject-Introspection must be enabled for Vala bindings EXTRA_OECONF = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-vala-bindings', '--disable-vala-bindings', d)}" -FILES_${PN} += "${datadir}/telepathy \ +FILES:${PN} += "${datadir}/telepathy \ ${datadir}/dbus-1" diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb index 7cb25b6775..a8190a480a 100644 --- a/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb +++ b/meta-oe/recipes-connectivity/telepathy/telepathy-idle_0.2.0.bb @@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "3013ad4b38d14ee630b8cc8ada5e95ccaa849b9a6fe15d2eaf6d0717d7 inherit autotools pkgconfig ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)} -FILES_${PN} += "${datadir}/telepathy \ +FILES:${PN} += "${datadir}/telepathy \ ${datadir}/dbus-1" python() { diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb index e3880b357a..5a09697102 100644 --- a/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb +++ b/meta-oe/recipes-connectivity/thrift/thrift_0.13.0.bb @@ -42,7 +42,7 @@ PACKAGECONFIG ??= "libevent glib" PACKAGECONFIG[libevent] = "-DWITH_LIBEVENT=ON,-DWITH_LIBEVENT=OFF,libevent" PACKAGECONFIG[glib] = "-DWITH_C_GLIB=ON,-DWITH_C_GLIB=OFF,glib-2.0" -do_install_append () { +do_install:append () { ln -sf thrift ${D}/${bindir}/thrift-compiler } @@ -50,14 +50,14 @@ LEAD_SONAME = "libthrift.so.${PV}" # thrift packages PACKAGE_BEFORE_PN = "${PN}-compiler lib${BPN} lib${BPN}z lib${BPN}nb lib${BPN}-c-glib" -FILES_lib${BPN} = "${libdir}/libthrift.so.*" -FILES_lib${BPN}z = "${libdir}/libthriftz.so.*" -FILES_lib${BPN}nb = "${libdir}/libthriftnb.so.*" -FILES_lib${BPN}-c-glib = "${libdir}/libthrift_c_glib.so.*" -FILES_${PN}-compiler = "${bindir}/*" +FILES:lib${BPN} = "${libdir}/libthrift.so.*" +FILES:lib${BPN}z = "${libdir}/libthriftz.so.*" +FILES:lib${BPN}nb = "${libdir}/libthriftnb.so.*" +FILES:lib${BPN}-c-glib = "${libdir}/libthrift_c_glib.so.*" +FILES:${PN}-compiler = "${bindir}/*" # The thrift packages just pulls in some default dependencies but is otherwise empty -RRECOMMENDS_${PN} = "${PN}-compiler lib${BPN}" -ALLOW_EMPTY_${PN} = "1" -RRECOMMENDS_${PN}_class-native = "" -RRECOMMENDS_${PN}_class-nativesdk = "" +RRECOMMENDS:${PN} = "${PN}-compiler lib${BPN}" +ALLOW_EMPTY:${PN} = "1" +RRECOMMENDS:${PN}:class-native = "" +RRECOMMENDS:${PN}:class-nativesdk = "" diff --git a/meta-oe/recipes-connectivity/transmission/transmission_git.bb b/meta-oe/recipes-connectivity/transmission/transmission_git.bb index 57267a8de8..74902500d0 100644 --- a/meta-oe/recipes-connectivity/transmission/transmission_git.bb +++ b/meta-oe/recipes-connectivity/transmission/transmission_git.bb @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=73f535ddffcf2a0d3af4f381f84f9b33" DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" -RDEPENDS_${PN}-web = "${PN}" +RDEPENDS:${PN}-web = "${PN}" SRC_URI = " \ gitsm://github.com/transmission/transmission \ @@ -45,7 +45,7 @@ do_configure() { oe_runconf } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then sed -i '/USERNAME=/c\USERNAME=${TRANSMISSION_USER}' ${WORKDIR}/transmission-daemon install -d ${D}${sysconfdir}/init.d @@ -62,12 +62,12 @@ do_install_append() { PACKAGES += "${PN}-gtk ${PN}-client ${PN}-web" -FILES_${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit" -FILES_${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps" -FILES_${PN}-web = "${datadir}/transmission/web" -FILES_${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon ${datadir}/appdata" +FILES:${PN}-client = "${bindir}/transmission-remote ${bindir}/transmission-cli ${bindir}/transmission-create ${bindir}/transmission-show ${bindir}/transmission-edit" +FILES:${PN}-gtk += "${bindir}/transmission-gtk ${datadir}/icons ${datadir}/applications ${datadir}/pixmaps" +FILES:${PN}-web = "${datadir}/transmission/web" +FILES:${PN} = "${bindir}/transmission-daemon ${sysconfdir}/init.d/transmission-daemon ${datadir}/appdata" -SYSTEMD_SERVICE_${PN} = "transmission-daemon.service" +SYSTEMD_SERVICE:${PN} = "transmission-daemon.service" # Script transmission-daemon following the guidelines in: # https://trac.transmissionbt.com/wiki/Scripts/initd diff --git a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb index 3860fd8b99..a3d66f4881 100644 --- a/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb +++ b/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_1.1.1.bb @@ -17,6 +17,6 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "--without-preflight" -FILES_${PN} += "${base_libdir}/udev/rules.d/" +FILES:${PN} += "${base_libdir}/udev/rules.d/" -SYSTEMD_SERVICE_${PN} = "usbmuxd.service" +SYSTEMD_SERVICE:${PN} = "usbmuxd.service" diff --git a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb index cb39f5a0e1..5827e7ad9e 100644 --- a/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb +++ b/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_git.bb @@ -36,4 +36,4 @@ do_install () { install -m 0755 ${S}/scripts/sta_reset_parm ${D}${sbindir} } -RDEPENDS_${PN} = "wpa-supplicant" +RDEPENDS:${PN} = "wpa-supplicant" diff --git a/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb b/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb index 473ceabcf0..c41a1738c5 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb +++ b/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" inherit pkgconfig DEPENDS = "wvstreams" -RDEPENDS_${PN} = "ppp" +RDEPENDS:${PN} = "ppp" SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BP}.tar.bz2 \ file://typo_pon.wvdial.1.patch \ @@ -16,7 +16,7 @@ SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code. SRC_URI[md5sum] = "37e9a2d664effe4efd44c0e1a20136de" SRC_URI[sha256sum] = "99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82" -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" EXTRA_OEMAKE = "" export WVLINK="${LD}" diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb index 57163ce65a..5ff8496b83 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb @@ -5,7 +5,7 @@ LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "zlib openssl (>= 0.9.8) dbus readline" -DEPENDS_append_libc-musl = " argp-standalone libexecinfo" +DEPENDS:append:libc-musl = " argp-standalone libexecinfo" SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BP}.tar.gz \ file://04_signed_request.diff \ @@ -28,31 +28,31 @@ SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code. SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c" SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633" -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" inherit autotools-brokensep pkgconfig -TARGET_CFLAGS_append = " -fno-tree-dce -fno-optimize-sibling-calls" +TARGET_CFLAGS:append = " -fno-tree-dce -fno-optimize-sibling-calls" -LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib" +LDFLAGS:append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib" EXTRA_OECONF = " --without-tcl --without-qt --without-pam --without-valgrind" -PACKAGES_prepend = "libuniconf " -PACKAGES_prepend = "uniconfd " -PACKAGES_prepend = "libwvstreams-base " -PACKAGES_prepend = "libwvstreams-extras " -PACKAGES_prepend = "${PN}-valgrind " +PACKAGES:prepend = "libuniconf " +PACKAGES:prepend = "uniconfd " +PACKAGES:prepend = "libwvstreams-base " +PACKAGES:prepend = "libwvstreams-extras " +PACKAGES:prepend = "${PN}-valgrind " -RPROVIDES_${PN}-dbg += "libuniconf-dbg uniconfd-dbg libwvstreams-base-dbg libwvstreams-extras-dbg" +RPROVIDES:${PN}-dbg += "libuniconf-dbg uniconfd-dbg libwvstreams-base-dbg libwvstreams-extras-dbg" -FILES_libuniconf = "${libdir}/libuniconf.so.*" +FILES:libuniconf = "${libdir}/libuniconf.so.*" -FILES_uniconfd = "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf" +FILES:uniconfd = "${sbindir}/uniconfd ${sysconfdir}/uniconf.conf ${localstatedir}/uniconf" -FILES_libwvstreams-base = "${libdir}/libwvutils.so.*" +FILES:libwvstreams-base = "${libdir}/libwvutils.so.*" -FILES_libwvstreams-extras = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*" +FILES:libwvstreams-extras = "${libdir}/libwvbase.so.* ${libdir}/libwvstreams.so.*" -FILES_${PN}-valgrind = "${libdir}/valgrind/wvstreams.supp" -RDEPENDS_${PN} += "perl" +FILES:${PN}-valgrind = "${libdir}/valgrind/wvstreams.supp" +RDEPENDS:${PN} += "perl" diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.6.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.6.bb index 37bb9a2820..b5ab15df48 100644 --- a/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.6.bb +++ b/meta-oe/recipes-connectivity/zabbix/zabbix_5.2.6.bb @@ -34,12 +34,12 @@ SRC_URI[sha256sum] = "76cb704f2a04fbc87bb3eff44fa71339c355d467f7bbd8fb53f8927c76 inherit autotools-brokensep linux-kernel-base pkgconfig systemd useradd SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "zabbix-agent.service" +SYSTEMD_SERVICE:${PN} = "zabbix-agent.service" SYSTEMD_AUTO_ENABLE = "enable" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r zabbix" -USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ +GROUPADD_PARAM:${PN} = "-r zabbix" +USERADD_PARAM:${PN} = "-r -g zabbix -d /var/lib/zabbix \ -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix \ " @@ -60,13 +60,13 @@ EXTRA_OECONF = " \ --with-libpcre=${STAGING_EXECPREFIXDIR} \ --with-iconv=${STAGING_EXECPREFIXDIR} \ " -CFLAGS_append = " -lldap -llber -pthread" +CFLAGS:append = " -lldap -llber -pthread" -do_configure_prepend() { +do_configure:prepend() { export KERNEL_VERSION="${KERNEL_VERSION}" } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ @@ -74,6 +74,6 @@ do_install_append() { fi } -FILES_${PN} += "${libdir}" +FILES:${PN} += "${libdir}" -RDEPENDS_${PN} = "logrotate" +RDEPENDS:${PN} = "logrotate" diff --git a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb index 44e1e9164c..61ea68a605 100644 --- a/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb @@ -17,4 +17,4 @@ EXTRA_OECMAKE = "-DCPPZMQ_BUILD_TESTS=OFF" PACKAGES = "${PN}-dev" -RDEPENDS_${PN}-dev = "zeromq-dev" +RDEPENDS:${PN}-dev = "zeromq-dev" diff --git a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb index 75584498a6..86fde7ccfb 100644 --- a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb +++ b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb @@ -15,12 +15,12 @@ inherit cmake pkgconfig PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg" -FILES_${PN} = "${bindir}/*" -FILES_lib${BPN} = "${libdir}/*.so.*" -FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir} ${datadir}/cmake" -FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" +FILES:${PN} = "${bindir}/*" +FILES:lib${BPN} = "${libdir}/*.so.*" +FILES:lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir} ${datadir}/cmake" +FILES:lib${BPN}-staticdev = "${libdir}/lib*.a" -RDEPENDS_lib${BPN}-dev = "zeromq-dev" +RDEPENDS:lib${BPN}-dev = "zeromq-dev" PACKAGECONFIG ??= "lz4 uuid curl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[curl] = "-DCZMQ_WITH_LIBCURL=ON,-DCZMQ_WITH_LIBCURL=OFF,curl" @@ -32,7 +32,7 @@ PACKAGECONFIG[uuid] = "-DCZMQ_WITH_UUID=ON,-DCZMQ_WITH_UUID=OFF,util-linux" BBCLASSEXTEND = "nativesdk" -do_install_append() { +do_install:append() { mkdir -p ${D}/${includedir}/${BPN} mv ${D}/${includedir}/sha1.h ${D}/${includedir}/${BPN}/. } diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb index 4381f2d6d6..72fd561dd3 100644 --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb @@ -26,4 +26,4 @@ do_install_ptest () { install -m 0755 ${B}/bin/test_* ${D}${PTEST_PATH}/tests } -FILES_${PN}-doc += "${datadir}/zmq/*.txt" +FILES:${PN}-doc += "${datadir}/zmq/*.txt" -- cgit 1.2.3-korg