diff options
Diffstat (limited to 'meta-openembedded/meta-networking')
160 files changed, 1478 insertions, 896 deletions
diff --git a/meta-openembedded/meta-networking/conf/layer.conf b/meta-openembedded/meta-networking/conf/layer.conf index 968b21601..67fcda3d9 100644 --- a/meta-openembedded/meta-networking/conf/layer.conf +++ b/meta-openembedded/meta-networking/conf/layer.conf @@ -17,7 +17,7 @@ LAYERDEPENDS_networking-layer = "core" LAYERDEPENDS_networking-layer += "openembedded-layer" LAYERDEPENDS_networking-layer += "meta-python" -LAYERSERIES_COMPAT_networking-layer = " hardknott" +LAYERSERIES_COMPAT_networking-layer = "honister" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb index 76df27851..074292b43 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb @@ -8,6 +8,7 @@ SRCREV = "1b1528038e084a9f81ea108cffca9c2707623b9c" SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;branch=master \ file://Fixed-build-error-on-musl.patch \ + file://0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch \ " S = "${WORKDIR}/git" @@ -15,7 +16,7 @@ S = "${WORKDIR}/git" LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" -inherit autotools xmlcatalog +inherit autotools xmlcatalog DEPENDS += "virtual/crypt krb5 openldap gettext libxslt xmlto libxml2-native \ cyrus-sasl libxslt-native xmlto-native coreutils-native\ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/adcli/files/0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch b/meta-openembedded/meta-networking/recipes-connectivity/adcli/files/0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch new file mode 100644 index 000000000..8cc859318 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/adcli/files/0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch @@ -0,0 +1,39 @@ +From 98660f57a98f45dbf55414cfde46338019adcc33 Mon Sep 17 00:00:00 2001 +From: Sumit Bose <sbose@redhat.com> +Date: Wed, 28 Jul 2021 12:55:16 +0200 +Subject: [PATCH] configure: check for ns_get16 and ns_get32 as well + +With newer versions of glibc res_query() might ba already available in +glibc with ns_get16() and ns_get32() still requires libresolv. + +Upstream-Status: Backport [https://gitlab.freedesktop.org/realmd/adcli/-/commit/e841ba7513f3f8b6393183d2dea9adcbf7ba2e44] +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1984891 +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ebc6cb4..e8775d0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -98,13 +98,15 @@ AC_SUBST(LDAP_CFLAGS) + # ------------------------------------------------------------------- + # resolv + +-AC_MSG_CHECKING(for which library has res_query) ++AC_MSG_CHECKING([for which library has res_query, ns_get16 and ns_get32]) + for lib in "" "-lresolv"; do + saved_LIBS="$LIBS" + LIBS="$LIBS $lib" + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <resolv.h>], +- [res_query (0, 0, 0, 0, 0)]) ++ [res_query (0, 0, 0, 0, 0); ++ ns_get32 (NULL); ++ ns_get16 (NULL);]) + ], + [ AC_MSG_RESULT(${lib:-libc}); have_res_query="yes"; break; ], + [ LIBS="$saved_LIBS" ]) +-- +2.32.0 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb b/meta-openembedded/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb index 9b69601e7..125dfaaa9 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb @@ -8,15 +8,15 @@ SRC_URI = "https://www.harding.motd.ca/autossh/${BP}.tgz" SRC_URI[md5sum] = "2b804bc1bf6d2f2afaa526d02df7c0a2" SRC_URI[sha256sum] = "5fc3cee3361ca1615af862364c480593171d0c54ec156de79fc421e31ae21277" -RDEPENDS_${PN} = "ssh" +RDEPENDS:${PN} = "ssh" -CFLAGS_prepend = "-I${WORKDIR}/build " +CFLAGS:prepend = "-I${WORKDIR}/build " inherit autotools EXTRA_OECONF="--with-ssh=/usr/bin/ssh" -do_compile_append() { +do_compile:append() { cp ${WORKDIR}/autossh-${PV}/CHANGES ${WORKDIR}/build cp ${WORKDIR}/autossh-${PV}/README ${WORKDIR}/build cp ${WORKDIR}/autossh-${PV}/autossh.host ${WORKDIR}/build @@ -25,6 +25,6 @@ do_compile_append() { cp ${WORKDIR}/autossh-${PV}/autossh.spec ${WORKDIR}/build } -do_install_append() { +do_install:append() { rm -rf ${D}${datadir}/examples } diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.1.bb index 3cb01ff71..6ccb425e3 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.1.bb @@ -19,11 +19,11 @@ EXTRA_OECONF = " \ --disable-schemas-compile \ " -SYSTEMD_SERVICE_${PN} = "${BPN}-mechanism.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" RRECOMENDS_${PN} += "adwaita-icon-theme" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-core \ python3-dbus \ packagegroup-tools-bluetooth \ @@ -32,7 +32,7 @@ RDEPENDS_${PN} += " \ PACKAGECONFIG ??= "thunar" PACKAGECONFIG[thunar] = "--enable-thunar-sendto,--disable-thunar-sendto" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/Thunar \ ${systemd_user_unitdir} \ @@ -40,12 +40,12 @@ FILES_${PN} += " \ ${PYTHON_SITEPACKAGES_DIR} \ " -FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_blueman.a" +FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_blueman.a" # In code, path to python is a variable that is replaced with path to native version of it # during the configure stage, e.g ../recipe-sysroot-native/usr/bin/python3-native/python3. # Replace it with #!/usr/bin/env python3 -do_install_append() { +do_install:append() { sed -i "1s/.*/#!\/usr\/bin\/env python3/" ${D}${prefix}/libexec/blueman-rfcomm-watcher \ ${D}${prefix}/libexec/blueman-mechanism \ ${D}${bindir}/blueman-adapters \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb index e59d2f437..7b663cdbb 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -35,4 +35,4 @@ do_install() { oe_runmake SBINDIR=${sbindir}/ install } -RDEPENDS_${PN} = "udev wireless-regdb-static" +RDEPENDS:${PN} = "udev wireless-regdb-static" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb index 6ea5b4b27..93364758e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb @@ -32,11 +32,11 @@ S = "${WORKDIR}/dhcp-4.4.2-P1" inherit autotools-brokensep systemd -SYSTEMD_SERVICE_${PN} = "dhcrelay.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +SYSTEMD_SERVICE:${PN} = "dhcrelay.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" CFLAGS += "-D_GNU_SOURCE -fcommon" -LDFLAGS_append = " -pthread" +LDFLAGS:append = " -pthread" EXTRA_OECONF = "--enable-paranoia \ --disable-static \ @@ -46,13 +46,13 @@ EXTRA_OECONF = "--enable-paranoia \ EXTRA_OEMAKE += "LIBTOOL='${S}/${HOST_SYS}-libtool'" # Enable shared libs per dhcp README -do_configure_prepend () { +do_configure:prepend () { cp configure.ac+lt configure.ac rm ${S}/bind/bind.tar.gz mv ${WORKDIR}/bind.tar.gz ${S}/bind/ } -do_compile_prepend() { +do_compile:prepend() { rm -rf ${S}/bind/bind-9.11.32/ tar xf ${S}/bind/bind.tar.gz -C ${S}/bind install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/bind/bind-9.11.32/ @@ -62,7 +62,7 @@ do_compile_prepend() { install -m 0755 ${S}/${HOST_SYS}-libtool ${S}/bind/bind-9.11.32/ } -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/default install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index b19364e1e..7558c314f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -33,7 +33,7 @@ LDFLAGS += "-pthread" PACKAGES =+ "${PN}-requestor ${PN}-client ${PN}-relay ${PN}-server" -FILES_${PN}-client = "${sbindir}/${PN}-client" -FILES_${PN}-relay = "${sbindir}/${PN}-relay" -FILES_${PN}-requestor = "${sbindir}/${PN}-requestor" -FILES_${PN}-server = "${sbindir}/${PN}-server" +FILES:${PN}-client = "${sbindir}/${PN}-client" +FILES:${PN}-relay = "${sbindir}/${PN}-relay" +FILES:${PN}-requestor = "${sbindir}/${PN}-requestor" +FILES:${PN}-server = "${sbindir}/${PN}-server" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb index b8025c707..7aed5105c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb @@ -39,9 +39,9 @@ EXTRA_OECONF = "\ " INITSCRIPT_NAME = "firewalld" -SYSTEMD_SERVICE_${PN} = "firewalld.service" +SYSTEMD_SERVICE:${PN} = "firewalld.service" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then : else @@ -65,16 +65,16 @@ do_install_append() { rm -f ${D}${sysconfdir}/modprobe.d/firewalld-sysctls.conf } -FILES_${PN} += "\ +FILES:${PN} += "\ ${PYTHON_SITEPACKAGES_DIR}/firewall \ ${nonarch_libdir}/firewalld \ ${datadir}/dbus-1 \ ${datadir}/polkit-1 \ ${datadir}/metainfo \ " -FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" +FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ nftables-python \ iptables \ python3-core \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb index a6df2aeb0..0d1c4adc1 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.0.21.bb @@ -40,9 +40,9 @@ PARALLEL_MAKE = "" S = "${WORKDIR}/git" -LDFLAGS_append_powerpc = " -latomic" -LDFLAGS_append_mipsarch = " -latomic" -LDFLAGS_append_armv5 = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:mipsarch = " -latomic" +LDFLAGS:append:armv5 = " -latomic" EXTRA_OECONF = " --enable-strict-dependencies \ --with-docdir=${docdir}/freeradius-${PV} \ @@ -124,10 +124,10 @@ do_configure () { INITSCRIPT_NAME = "radiusd" -SYSTEMD_SERVICE_${PN} = "radiusd.service" +SYSTEMD_SERVICE:${PN} = "radiusd.service" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false --user-group radiusd" +USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false --user-group radiusd" do_install() { rm -rf ${D} @@ -173,7 +173,7 @@ do_install() { # This is only needed when we install/update on a running target. # -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then # create /var/log/radius, /var/run/radiusd @@ -189,52 +189,52 @@ pkg_postinst_${PN} () { } # We really need the symlink :( -INSANE_SKIP_${PN} = "dev-so" -INSANE_SKIP_${PN}-krb5 = "dev-so" -INSANE_SKIP_${PN}-ldap = "dev-so" -INSANE_SKIP_${PN}-mysql = "dev-so" -INSANE_SKIP_${PN}-perl = "dev-so" -INSANE_SKIP_${PN}-postgresql = "dev-so" -INSANE_SKIP_${PN}-python = "dev-so" -INSANE_SKIP_${PN}-unixodbc = "dev-so" +INSANE_SKIP:${PN} = "dev-so" +INSANE_SKIP:${PN}-krb5 = "dev-so" +INSANE_SKIP:${PN}-ldap = "dev-so" +INSANE_SKIP:${PN}-mysql = "dev-so" +INSANE_SKIP:${PN}-perl = "dev-so" +INSANE_SKIP:${PN}-postgresql = "dev-so" +INSANE_SKIP:${PN}-python = "dev-so" +INSANE_SKIP:${PN}-unixodbc = "dev-so" PACKAGES =+ "${PN}-utils ${PN}-ldap ${PN}-krb5 ${PN}-perl \ ${PN}-python ${PN}-mysql ${PN}-postgresql ${PN}-unixodbc" -FILES_${PN}-utils = "${bindir}/*" +FILES:${PN}-utils = "${bindir}/*" -FILES_${PN}-ldap = "${libdir}/rlm_ldap.so* \ +FILES:${PN}-ldap = "${libdir}/rlm_ldap.so* \ ${sysconfdir}/raddb/mods-available/ldap \ " -FILES_${PN}-krb5 = "${libdir}/rlm_krb5.so* \ +FILES:${PN}-krb5 = "${libdir}/rlm_krb5.so* \ ${sysconfdir}/raddb/mods-available/krb5 \ " -FILES_${PN}-perl = "${libdir}/rlm_perl.so* \ +FILES:${PN}-perl = "${libdir}/rlm_perl.so* \ ${sysconfdir}/raddb/mods-config/perl \ ${sysconfdir}/raddb/mods-available/perl \ " -FILES_${PN}-python = "${libdir}/rlm_python3.so* \ +FILES:${PN}-python = "${libdir}/rlm_python3.so* \ ${sysconfdir}/raddb/mods-config/python3 \ ${sysconfdir}/raddb/mods-available/python3 \ " -FILES_${PN}-mysql = "${libdir}/rlm_sql_mysql.so* \ +FILES:${PN}-mysql = "${libdir}/rlm_sql_mysql.so* \ ${sysconfdir}/raddb/mods-config/sql/*/mysql \ ${sysconfdir}/raddb/mods-available/sql \ " -FILES_${PN}-postgresql = "${libdir}/rlm_sql_postgresql.so* \ +FILES:${PN}-postgresql = "${libdir}/rlm_sql_postgresql.so* \ ${sysconfdir}/raddb/mods-config/sql/*/postgresql \ " -FILES_${PN}-unixodbc = "${libdir}/rlm_sql_unixodbc.so*" +FILES:${PN}-unixodbc = "${libdir}/rlm_sql_unixodbc.so*" -FILES_${PN} =+ "${libdir}/rlm_*.so* ${libdir}/proto_*so*" +FILES:${PN} =+ "${libdir}/rlm_*.so* ${libdir}/proto_*so*" -RDEPENDS_${PN} += "perl" -RDEPENDS_${PN}-utils = "${PN} perl" +RDEPENDS:${PN} += "perl" +RDEPENDS:${PN}-utils = "${PN} perl" CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb index e6240a58e..9b64388a0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.9.2.bb @@ -23,9 +23,9 @@ PACKAGECONFIG[gnutls] = "--with-gnutls, --without-gnutls, gnutls" PACKAGECONFIG[readline] = "--with-readline=${STAGING_INCDIR}/.. --with-readline-inc=${STAGING_INCDIR} --with-readline-lib=-lreadline, --with-readline=no, readline" PACKAGECONFIG[expat] = "--with-expat=${STAGING_INCDIR}/.. --with-expat-inc=${STAGING_INCDIR} --with-expat-lib=-lexpat, , expat" -do_install_append() { +do_install:append() { rm -rf ${D}${libdir}/charset.alias } -FILES_${PN} += "${datadir}/icons/hicolor" -FILES_${PN}-dbg += "${libdir}/lftp/${PV}/.debug" -RDEPENDS_${PN} = "perl bash readline" +FILES:${PN} += "${datadir}/icons/hicolor" +FILES:${PN}-dbg += "${libdir}/lftp/${PV}/.debug" +RDEPENDS:${PN} = "perl bash readline" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb index 18e299283..ab7167c94 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.0.bb @@ -28,10 +28,10 @@ EXTRA_OECMAKE = " \ -DBUILD_PYTHON_BINDINGS=ON \ " -RDEPENDS_${PN}-python = " python3-core " -RDEPENDS_${PN} = " python3-core " +RDEPENDS:${PN}-python = " python3-core " +RDEPENDS:${PN} = " python3-core " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/${PYTHON_DIR}/site-packages/iec61850.py \ ${libdir}/${PYTHON_DIR}/site-packages/_iec61850.so \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb index 3c7df4451..b62ed04ce 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb @@ -37,9 +37,9 @@ PACKAGECONFIG[werror] = "-DMBEDTLS_FATAL_WARNINGS=ON,-DMBEDTLS_FATAL_WARNINGS=OF EXTRA_OECMAKE = "-DENABLE_TESTING=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" PROVIDES += "polarssl" -RPROVIDES_${PN} = "polarssl" +RPROVIDES:${PN} = "polarssl" PACKAGES =+ "${PN}-programs" -FILES_${PN}-programs = "${bindir}/" +FILES:${PN}-programs = "${bindir}/" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb index a630d27b9..468569eef 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "218fad7af31f3c22fb4c9db28a55a2a8b5067d41f5b38f52008a057a00 IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" -do_configure_prepend() { +do_configure:prepend() { echo "${@d.getVar('DISTRO_VERSION')}" > ${S}/os.openembedded } @@ -47,4 +47,4 @@ do_install() { install -m 0644 ${WORKDIR}/miniupnpd.service ${D}${systemd_unitdir}/system/ } -SYSTEMD_SERVICE_${PN} = "miniupnpd.service" +SYSTEMD_SERVICE:${PN} = "miniupnpd.service" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.11.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.11.bb index 9f1c024bb..9a13e2bc6 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.11.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.11.bb @@ -40,7 +40,7 @@ EXTRA_OECMAKE = " \ -DWITH_ADNS=ON \ " -do_install_append() { +do_install:append() { install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/service/systemd/mosquitto.service.notify ${D}${systemd_unitdir}/system/mosquitto.service @@ -57,7 +57,7 @@ PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients" PACKAGE_BEFORE_PN = "${PN}-examples" -FILES_${PN} = "${sbindir}/mosquitto \ +FILES:${PN} = "${sbindir}/mosquitto \ ${bindir}/mosquitto_passwd \ ${bindir}/mosquitto_ctrl \ ${libdir}/mosquitto_dynamic_security.so \ @@ -66,26 +66,26 @@ FILES_${PN} = "${sbindir}/mosquitto \ ${systemd_unitdir}/system/mosquitto.service \ " -CONFFILES_${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" +CONFFILES:${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" -FILES_libmosquitto1 = "${libdir}/libmosquitto.so.*" +FILES:libmosquitto1 = "${libdir}/libmosquitto.so.*" -FILES_libmosquittopp1 = "${libdir}/libmosquittopp.so.*" +FILES:libmosquittopp1 = "${libdir}/libmosquittopp.so.*" -FILES_${PN}-clients = "${bindir}/mosquitto_pub \ +FILES:${PN}-clients = "${bindir}/mosquitto_pub \ ${bindir}/mosquitto_sub \ ${bindir}/mosquitto_rr \ " -FILES_${PN}-examples = "${sysconfdir}/mosquitto/*.example" +FILES:${PN}-examples = "${sysconfdir}/mosquitto/*.example" -SYSTEMD_SERVICE_${PN} = "mosquitto.service" +SYSTEMD_SERVICE:${PN} = "mosquitto.service" INITSCRIPT_NAME = "mosquitto" INITSCRIPT_PARAMS = "defaults 30" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false \ +USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false \ --user-group mosquitto" BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb index 8444f0b73..750b25210 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.1.5.bb @@ -22,7 +22,7 @@ inherit cmake pkgconfig EXTRA_OECMAKE = " -DNN_ENABLE_DOC=OFF " # we don't want nanomsg-tools to be renamed to libnanomsg-tools -DEBIAN_NOAUTONAME_${PN}-tools = "1" +DEBIAN_NOAUTONAME:${PN}-tools = "1" PACKAGES =+ "${PN}-tools" -FILES_${PN}-tools = "${bindir}/*" +FILES:${PN}-tools = "${bindir}/*" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.4.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.4.0.bb index f61aa0549..49e201564 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.4.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.4.0.bb @@ -21,4 +21,4 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[mbedtls] = "-DNNG_ENABLE_TLS=ON,-DNNG_ENABLE_TLS=OFF,mbedtls" PACKAGES =+ "${PN}-tools" -FILES_${PN}-tools = "${bindir}/*" +FILES:${PN}-tools = "${bindir}/*" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.102.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.102.bb index 3328dfbbb..6c624ce4e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.102.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.102.bb @@ -18,11 +18,11 @@ SRC_URI = " \ git://github.com/CanonicalLtd/netplan.git \ file://0001-Handle-enum-element-override.patch \ " -SRC_URI_append_libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" +SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" DEPENDS = "glib-2.0 libyaml ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -RDEPENDS_${PN} = "python3 python3-core python3-pyyaml python3-netifaces python3-nose python3-coverage python3-pycodestyle python3-pyflakes util-linux-libuuid libnetplan" +RDEPENDS:${PN} = "python3 python3-core python3-pyyaml python3-netifaces python3-nose python3-coverage python3-pycodestyle python3-pyflakes util-linux-libuuid libnetplan" inherit pkgconfig systemd @@ -56,6 +56,6 @@ do_install() { PACKAGES += "${PN}-dbus libnetplan" -FILES_libnetplan = "${libdir}/libnetplan.so.0.0" -FILES_${PN} = "${sbindir} ${base_libdir}/netplan/generate ${datadir}/netplan ${sysconfdir}/netplan ${systemd_unitdir}" -FILES_${PN}-dbus = "${base_libdir}/netplan/netplan-dbus ${datadir}/dbus-1" +FILES:libnetplan = "${libdir}/libnetplan.so.0.0" +FILES:${PN} = "${sbindir} ${base_libdir}/netplan/generate ${datadir}/netplan ${sysconfdir}/netplan ${systemd_unitdir}" +FILES:${PN}-dbus = "${base_libdir}/netplan/netplan-dbus ${datadir}/dbus-1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb index 1f76d8ab5..9f3054a7c 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.14.bb @@ -18,7 +18,7 @@ S = "${WORKDIR}/NetworkManager-openvpn-${PV}" # meta-gnome in layers is required using gnome: PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome,gtk+3 libnma libsecret" -do_configure_append() { +do_configure:append() { # network-manager-openvpn.metainfo.xml is created in source folder but # compile expects it in build folder. As long as nobody comes up with a # better solution just support build: @@ -28,26 +28,26 @@ do_configure_append() { fi } -do_install_append () { +do_install:append () { rm -rf ${D}${libdir}/NetworkManager/*.la } # Create user and group nm-openvpn that are needed since version 1.0.6 USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system nm-openvpn" +USERADD_PARAM:${PN} = "--system nm-openvpn" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/metainfo \ ${libdir}/NetworkManager/*.so \ ${nonarch_libdir}/NetworkManager/VPN/nm-openvpn-service.name \ " -FILES_${PN}-staticdev += " \ +FILES:${PN}-staticdev += " \ ${libdir}/NetworkManager/*.a \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ networkmanager \ openvpn \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.32.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.32.4.bb index a01e53009..0ef525d31 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.32.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.32.4.bb @@ -27,7 +27,7 @@ SRC_URI = " \ file://0002-Do-not-create-settings-settings-property-documentati.patch \ file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ " -SRC_URI[sha256sum] = "701d511067f757d0f92f412c98cdb49a74a6ba69448aabb1beadacbc171e3873" +SRC_URI[sha256sum] = "29acbd41c78b7ef87ff88fec5360d1eaf8b5b6fcb90555d7391abc5e36923158" S = "${WORKDIR}/NetworkManager-${PV}" @@ -47,11 +47,11 @@ EXTRA_OECONF = " \ # stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template # avoids: # | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'? -CFLAGS_append_libc-musl = " \ +CFLAGS:append:libc-musl = " \ -DRTLD_DEEPBIND=0 \ " -do_compile_prepend() { +do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/src/libnm-client-impl/.libs" } @@ -92,19 +92,19 @@ PACKAGES =+ " \ SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" -FILES_${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" +FILES:${PN}-adsl = "${libdir}/NetworkManager/${PV}/libnm-device-plugin-adsl.so" -FILES_${PN}-cloud-setup = " \ +FILES:${PN}-cloud-setup = " \ ${libexecdir}/nm-cloud-setup \ ${systemd_system_unitdir}/nm-cloud-setup.service \ ${systemd_system_unitdir}/nm-cloud-setup.timer \ ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ ${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \ " -ALLOW_EMPTY_${PN}-cloud-setup = "1" -SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" +ALLOW_EMPTY:${PN}-cloud-setup = "1" +SYSTEMD_SERVICE:${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libexecdir} \ ${libdir}/NetworkManager/${PV}/*.so \ ${libdir}/NetworkManager \ @@ -123,46 +123,46 @@ FILES_${PN} += " \ ${libdir}/pppd \ " -RRECOMMENDS_${PN} += "iptables \ +RRECOMMENDS:${PN} += "iptables \ ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ " -RCONFLICTS_${PN} = "connman" +RCONFLICTS:${PN} = "connman" -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/NetworkManager/gdb-cmd \ ${libdir}/pppd/*/*.la \ ${libdir}/NetworkManager/*.la \ ${libdir}/NetworkManager/${PV}/*.la \ " -FILES_${PN}-nmcli = " \ +FILES:${PN}-nmcli = " \ ${bindir}/nmcli \ " -FILES_${PN}-nmcli-doc = " \ +FILES:${PN}-nmcli-doc = " \ ${mandir}/man1/nmcli* \ " -FILES_${PN}-nmtui = " \ +FILES:${PN}-nmtui = " \ ${bindir}/nmtui \ ${bindir}/nmtui-edit \ ${bindir}/nmtui-connect \ ${bindir}/nmtui-hostname \ " -FILES_${PN}-nmtui-doc = " \ +FILES:${PN}-nmtui-doc = " \ ${mandir}/man1/nmtui* \ " INITSCRIPT_NAME = "network-manager" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}" ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" +ALTERNATIVE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}" ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" -do_install_append() { +do_install:append() { install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager rm -rf ${D}/run ${D}${localstatedir}/run diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb index a486cf0e0..c66192aea 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_8.10.bb @@ -8,7 +8,7 @@ SRC_URI = " \ SRCREV = "9d287e40c57233190a51b6434ba7345370e36f38" DEPENDS = "vpnc libxml2 krb5 gettext-native" -RDEPENDS_${PN} = "bash python3-core vpnc-script" +RDEPENDS:${PN} = "bash python3-core vpnc-script" PACKAGECONFIG ??= "gnutls lz4 libproxy" @@ -27,6 +27,6 @@ inherit autotools pkgconfig bash-completion EXTRA_OECONF += "--with-vpnc-script=${sysconfdir}/vpnc/vpnc-script \ --disable-static" -do_install_append() { +do_install:append() { rm ${D}/usr/libexec/openconnect/hipreport-android.sh } diff --git a/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb index d447231fc..60cf3c252 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/python-networkmanager/python3-networkmanager_2.2.bb @@ -10,4 +10,4 @@ SRC_URI[sha256sum] = "de6eb921d94aba7549f428ed2b3aa482a5d543ecb6965cbaa0fbb555ab PYPI_PACKAGE = "python-networkmanager" inherit pypi setuptools3 -RDEPENDS_${PN} = "networkmanager python3-dbus python3-six" +RDEPENDS:${PN} = "networkmanager python3-dbus python3-six" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb index 37b3eebe4..d81cc9a3d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb @@ -41,4 +41,4 @@ inherit autotools-brokensep EXTRA_OEMAKE = "BIN_GROUP=root MAN_GROUP=root RDIST_MODE=755 RDISTD_MODE=755 MAN_MODE=644" # http://errors.yoctoproject.org/Errors/Details/186972/ -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-openembedded/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb b/meta-openembedded/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb index e3567961a..e715135dc 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/restinio/restinio_0.6.13.bb @@ -27,5 +27,5 @@ EXTRA_OECMAKE += "\ " # Header-only library -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" +RDEPENDS:${PN}-dev = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.5.bb index 5c5ce3670..2bc43e714 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.5.bb @@ -26,7 +26,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch \ " -SRC_URI_append_libc-musl = " \ +SRC_URI:append:libc-musl = " \ file://netdb_defines.patch \ file://samba-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ @@ -45,31 +45,31 @@ inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version CVE_CHECK_WHITELIST += "CVE-2011-2411" # remove default added RDEPENDS on perl -RDEPENDS_${PN}_remove = "perl" +RDEPENDS:${PN}:remove = "perl" DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 jansson libparse-yapp-perl-native gnutls" inherit features_check REQUIRED_DISTRO_FEATURES = "pam" -DEPENDS_append_libc-musl = " libtirpc" -CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" -LDFLAGS_append_libc-musl = " -ltirpc" +DEPENDS:append:libc-musl = " libtirpc" +CFLAGS:append:libc-musl = " -I${STAGING_INCDIR}/tirpc" +LDFLAGS:append:libc-musl = " -ltirpc" -COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST:riscv32 = "null" INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." SYSTEMD_PACKAGES = "${PN}-base ${PN}-ad-dc winbind" -SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service" -SYSTEMD_SERVICE_${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" -SYSTEMD_SERVICE_winbind = "winbind.service" +SYSTEMD_SERVICE:${PN}-base = "nmb.service smb.service" +SYSTEMD_SERVICE:${PN}-ad-dc = "${@bb.utils.contains('PACKAGECONFIG', 'ad-dc', 'samba.service', '', d)}" +SYSTEMD_SERVICE:winbind = "winbind.service" # There are prerequisite settings to enable ad-dc, so disable the service by default. # Reference: # https://wiki.samba.org/index.php/Setting_up_Samba_as_an_Active_Directory_Domain_Controller -SYSTEMD_AUTO_ENABLE_${PN}-ad-dc = "disable" +SYSTEMD_AUTO_ENABLE:${PN}-ad-dc = "disable" #cross_compile cannot use preforked process, since fork process earlier than point subproces.popen #to cross Popen @@ -81,7 +81,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} acl cups ad-dc ldap mitkrb5 \ " -RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt" +RDEPENDS:${PN}-ctdb-tests += "bash util-linux-getopt" PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" @@ -130,7 +130,7 @@ EXTRA_OECONF += "--enable-fhs \ LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -do_configure_append () { +do_configure:append () { cd ${S}/pidl/ perl Makefile.PL PREFIX=${prefix} sed -e 's,VENDORPREFIX)/lib/perl,VENDORPREFIX)/${baselib}/perl,g' \ @@ -138,11 +138,11 @@ do_configure_append () { } -do_compile_append () { +do_compile:append () { oe_runmake -C ${S}/pidl } -do_install_append() { +do_install:append() { for section in 1 5 7; do install -d ${D}${mandir}/man$section install -m 0644 ctdb/doc/*.$section ${D}${mandir}/man$section @@ -223,7 +223,7 @@ PACKAGES =+ "${PN}-python3 ${PN}-pidl \ python samba_populate_packages() { def module_hook(file, pkg, pattern, format, basename): pn = d.getVar('PN') - d.appendVar('RRECOMMENDS_%s-base' % pn, ' %s' % pkg) + d.appendVar('RRECOMMENDS:%s-base' % pn, ' %s' % pkg) mlprefix = d.getVar('MLPREFIX') or '' pam_libdir = d.expand('${base_libdir}/security') @@ -240,25 +240,25 @@ python samba_populate_packages() { do_split_packages(d, moduledir, '^(.*)\.so$', 'samba-pdb-%s', 'Samba %s password backend', hook=module_hook, extra_depends='', prepend=True) } -PACKAGESPLITFUNCS_prepend = "samba_populate_packages " +PACKAGESPLITFUNCS:prepend = "samba_populate_packages " PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" -RDEPENDS_${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" -RDEPENDS_${PN}-python3 += "pytalloc python3-tdb" +RDEPENDS:${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" +RDEPENDS:${PN}-python3 += "pytalloc python3-tdb" -FILES_${PN}-base = "${sbindir}/nmbd \ +FILES:${PN}-base = "${sbindir}/nmbd \ ${sbindir}/smbd \ ${sysconfdir}/init.d \ ${systemd_system_unitdir}/nmb.service \ ${systemd_system_unitdir}/smb.service" -FILES_${PN}-ad-dc = "${sbindir}/samba \ +FILES:${PN}-ad-dc = "${sbindir}/samba \ ${systemd_system_unitdir}/samba.service \ ${libdir}/krb5/plugins/kdb/samba.so \ " -RDEPENDS_${PN}-ad-dc = "krb5-kdc" +RDEPENDS:${PN}-ad-dc = "krb5-kdc" -FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ +FILES:${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ ${bindir}/ctdb_run_cluster_tests \ ${sysconfdir}/ctdb/nodes \ ${datadir}/ctdb-tests \ @@ -266,34 +266,34 @@ FILES_${PN}-ctdb-tests = "${bindir}/ctdb_run_tests \ ${localstatedir}/lib/ctdb \ " -FILES_${BPN}-common = "${sysconfdir}/default \ +FILES:${BPN}-common = "${sysconfdir}/default \ ${sysconfdir}/samba \ ${sysconfdir}/tmpfiles.d \ ${localstatedir}/lib/samba \ ${localstatedir}/spool/samba \ " -FILES_${PN} += "${libdir}/vfs/*.so \ +FILES:${PN} += "${libdir}/vfs/*.so \ ${libdir}/charset/*.so \ ${libdir}/*.dat \ ${libdir}/auth/*.so \ ${datadir}/ctdb/events/* \ " -FILES_${PN}-dsdb-modules = "${libdir}/samba/ldb" +FILES:${PN}-dsdb-modules = "${libdir}/samba/ldb" -FILES_${PN}-testsuite = "${bindir}/gentest \ +FILES:${PN}-testsuite = "${bindir}/gentest \ ${bindir}/locktest \ ${bindir}/masktest \ ${bindir}/ndrdump \ ${bindir}/smbtorture" -FILES_registry-tools = "${bindir}/regdiff \ +FILES:registry-tools = "${bindir}/regdiff \ ${bindir}/regpatch \ ${bindir}/regshell \ ${bindir}/regtree" -FILES_winbind = "${sbindir}/winbindd \ +FILES:winbind = "${sbindir}/winbindd \ ${bindir}/wbinfo \ ${bindir}/ntlm_auth \ ${libdir}/samba/idmap \ @@ -303,9 +303,9 @@ FILES_winbind = "${sbindir}/winbindd \ ${sysconfdir}/init.d/winbind \ ${systemd_system_unitdir}/winbind.service" -FILES_${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" -FILES_smbclient = "${bindir}/cifsdd \ +FILES:smbclient = "${bindir}/cifsdd \ ${bindir}/rpcclient \ ${bindir}/smbcacls \ ${bindir}/smbclient \ @@ -316,31 +316,31 @@ FILES_smbclient = "${bindir}/cifsdd \ ${bindir}/smbtree \ ${libdir}/samba/smbspool_krb5_wrapper" -RDEPENDS_${PN}-pidl_append = " perl libparse-yapp-perl" -FILES_${PN}-pidl = "${bindir}/pidl \ +RDEPENDS:${PN}-pidl:append = " perl libparse-yapp-perl" +FILES:${PN}-pidl = "${bindir}/pidl \ ${libdir}/perl5 \ " -RDEPENDS_${PN}-client = "\ +RDEPENDS:${PN}-client = "\ smbclient \ winbind \ registry-tools \ ${PN}-pidl \ " -ALLOW_EMPTY_${PN}-client = "1" +ALLOW_EMPTY:${PN}-client = "1" -RDEPENDS_${PN}-server = "\ +RDEPENDS:${PN}-server = "\ ${PN} \ winbind \ registry-tools \ " -ALLOW_EMPTY_${PN}-server = "1" +ALLOW_EMPTY:${PN}-server = "1" -RDEPENDS_${PN}-test = "\ +RDEPENDS:${PN}-test = "\ ${PN}-ctdb-tests \ ${PN}-testsuite \ " -ALLOW_EMPTY_${PN}-test = "1" +ALLOW_EMPTY:${PN}-test = "1" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb index 5c7180b6a..744e78206 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/sethdlc/sethdlc_1.18.bb @@ -18,7 +18,7 @@ DEPENDS = "virtual/kernel" EXTRA_OEMAKE="CROSS_COMPILE=${TARGET_PREFIX} CC='${CC} ${LDFLAGS}' \ KERNEL_DIR=${STAGING_KERNEL_DIR} " -do_compile_prepend () { +do_compile:prepend () { oe_runmake clean } @@ -28,4 +28,4 @@ do_install() { install sethdlc ${D}/${bindir}/ } -FILES_${PN} += "${bindir}/sethdlc" +FILES:${PN} += "${bindir}/sethdlc" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.bb index cca18d726..47c201fa1 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.bb @@ -50,7 +50,7 @@ PACKAGECONFIG[appid] = "--enable-open-appid, --disable-open-appid, luajit, bash" CFLAGS += "-I${STAGING_INCDIR}/tirpc" LDFLAGS += " -ltirpc" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/snort/rules install -d ${D}${sysconfdir}/snort/preproc_rules install -d ${D}${sysconfdir}/init.d @@ -77,30 +77,30 @@ do_install_append() { sed -i -e 's|-ffile-prefix-map[^ ]*||g; s|-fdebug-prefix-map[^ ]*||g; s|-fmacro-prefix-map[^ ]*||g; s|${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc } -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then ${sysconfdir}/init.d/populate-volatile.sh update fi } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/snort_dynamicengine/*.so.* \ ${libdir}/snort_dynamicpreprocessor/*.so.* \ ${libdir}/snort_dynamicrules/*.so.* \ " -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/snort_dynamicengine/.debug \ ${libdir}/snort_dynamicpreprocessor/.debug \ ${libdir}/snort_dynamicrules/.debug \ " -FILES_${PN}-staticdev += " \ +FILES:${PN}-staticdev += " \ ${libdir}/snort_dynamicengine/*.a \ ${libdir}/snort_dynamicpreprocessor/*.a \ ${libdir}/snort_dynamicrules/*.a \ ${libdir}/snort/dynamic_preproc/*.a \ ${libdir}/snort/dynamic_output/*.a \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/snort_dynamicengine/*.la \ ${libdir}/snort_dynamicpreprocessor/*.la \ ${libdir}/snort_dynamicrules/*.la \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb index 8e35dc01e..40188cea2 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/ufw/ufw_0.36.bb @@ -21,13 +21,13 @@ SRC_URI[sha256sum] = "754b22ae5edff0273460ac9f57509c3938187e0cf4fb9692c6a02833ff inherit setuptools3 features_check systemd update-rc.d -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ iptables \ python3 \ python3-modules \ " -RRECOMMENDS_${PN} = " \ +RRECOMMENDS:${PN} = " \ kernel-module-ipv6 \ kernel-module-nf-conntrack-ipv6 \ kernel-module-nf-log-common \ @@ -39,7 +39,7 @@ RRECOMMENDS_${PN} = " \ kernel-module-nf-recent \ " -do_install_append() { +do_install:append() { install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/doc/systemd.example ${D}${systemd_unitdir}/system/ufw.service @@ -47,14 +47,14 @@ do_install_append() { install -m 0755 ${S}/doc/initscript.example ${D}${sysconfdir}/init.d/ufw } -SYSTEMD_SERVICE_${PN} = "ufw.service" +SYSTEMD_SERVICE:${PN} = "ufw.service" INITSCRIPT_NAME = "ufw" INITSCRIPT_PARAMS = "defaults" # Certain items are explicitly put under /lib, not base_libdir when installed. # -FILES_${PN} += " \ +FILES:${PN} += " \ ${sbindir}/* \ ${datadir}/ufw/* \ /lib/ufw/* \ @@ -64,5 +64,5 @@ FILES_${PN} += " \ REQUIRED_DISTRO_FEATURES = "ipv6" -DISTUTILS_BUILD_ARGS_append = " --iptables-dir /usr/sbin" -DISTUTILS_INSTALL_ARGS_append = " --iptables-dir /usr/sbin" +DISTUTILS_BUILD_ARGS:append = " --iptables-dir /usr/sbin" +DISTUTILS_INSTALL_ARGS:append = " --iptables-dir /usr/sbin" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb b/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb index 4c3d95bd8..8f899e62d 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/vlan/vlan_1.9.bb @@ -22,7 +22,7 @@ inherit update-alternatives EXTRA_OEMAKE = "-e MAKEFLAGS=" # comment out MakeInclude in Makefile which sets build environment -do_configure_append () { +do_configure:append () { sed -i 's/^ include/#^include/' ${S}/Makefile } @@ -37,5 +37,5 @@ do_install () { } ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "vconfig" +ALTERNATIVE:${PN} = "vconfig" ALTERNATIVE_LINK_NAME[vconfig] = "${base_sbindir}/vconfig" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index 54e855a09..63a0494e4 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -36,7 +36,7 @@ inherit perlnative pkgconfig #EXTRA_OEMAKE = "-e MAKEFLAGS=" -do_configure_append () { +do_configure:append () { # Make sure we use our nativeperl wrapper sed -i "1s:#!.*:#!/usr/bin/env nativeperl:" ${S}/*.pl cp ${WORKDIR}/long-help ${S} @@ -56,8 +56,8 @@ vpnc_sysroot_preprocess () { install -m 755 ${D}${sysconfdir}/vpnc/vpnc-script ${SYSROOT_DESTDIR}${sysconfdir}/vpnc } -FILES_${PN}-script = "${sysconfdir}/vpnc/vpnc-script" +FILES:${PN}-script = "${sysconfdir}/vpnc/vpnc-script" -CONFFILES_${PN} = "${sysconfdir}/vpnc/default.conf" -RDEPENDS_${PN} = "perl-module-io-file ${PN}-script" -RRECOMMENDS_${PN} = "kernel-module-tun" +CONFFILES:${PN} = "${sysconfdir}/vpnc/default.conf" +RDEPENDS:${PN} = "perl-module-io-file ${PN}-script" +RRECOMMENDS:${PN} = "kernel-module-tun" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.1.bb index 76a5fd75c..c2b3c3d63 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_4.7.1.bb @@ -10,7 +10,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PROVIDES += "cyassl" -RPROVIDES_${PN} = "cyassl" +RPROVIDES:${PN} = "cyassl" SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https \ " diff --git a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index 31f9aef48..59eb14a55 100644 --- a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -17,7 +17,7 @@ PACKAGES = ' \ packagegroup-meta-networking-support \ ' -RDEPENDS_packagegroup-meta-networking = "\ +RDEPENDS:packagegroup-meta-networking = "\ packagegroup-meta-networking-connectivity \ packagegroup-meta-networking-daemons \ packagegroup-meta-networking-devtools \ @@ -30,7 +30,7 @@ RDEPENDS_packagegroup-meta-networking = "\ packagegroup-meta-networking-support \ " -RDEPENDS_packagegroup-meta-networking-connectivity = "\ +RDEPENDS:packagegroup-meta-networking-connectivity = "\ crda \ daq \ adcli \ @@ -70,9 +70,9 @@ RDEPENDS_packagegroup-meta-networking-connectivity = "\ dhcp-relay \ " -RDEPENDS_packagegroup-meta-networking-connectivity_remove_libc-musl = "rdist" +RDEPENDS:packagegroup-meta-networking-connectivity:remove:libc-musl = "rdist" -RDEPENDS_packagegroup-meta-networking-daemons = "\ +RDEPENDS:packagegroup-meta-networking-daemons = "\ atftp \ autofs \ cyrus-sasl \ @@ -97,20 +97,20 @@ RDEPENDS_packagegroup-meta-networking-daemons = "\ opensaf \ " -RDEPENDS_packagegroup-meta-networking-daemons_remove_libc-musl = "opensaf" +RDEPENDS:packagegroup-meta-networking-daemons:remove:libc-musl = "opensaf" -RDEPENDS_packagegroup-meta-networking-devtools = "\ +RDEPENDS:packagegroup-meta-networking-devtools = "\ python3-ldap \ python3-scapy \ " -RDEPENDS_packagegroup-meta-networking-extended = "\ +RDEPENDS:packagegroup-meta-networking-extended = "\ corosync \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "dlm", "", d)} \ kronosnet \ " -RDEPENDS_packagegroup-meta-networking-filter = "\ +RDEPENDS:packagegroup-meta-networking-filter = "\ libnftnl \ conntrack-tools \ ebtables \ @@ -127,16 +127,16 @@ RDEPENDS_packagegroup-meta-networking-filter = "\ nftables \ " -RDEPENDS_packagegroup-meta-networking-irc = "\ +RDEPENDS:packagegroup-meta-networking-irc = "\ weechat \ znc \ " -RDEPENDS_packagegroup-meta-networking-kernel = "\ +RDEPENDS:packagegroup-meta-networking-kernel = "\ wireguard-tools \ " -RDEPENDS_packagegroup-meta-networking-netkit = "\ +RDEPENDS:packagegroup-meta-networking-netkit = "\ netkit-rwho-client \ netkit-rwho-server \ netkit-rsh-client \ @@ -148,10 +148,10 @@ RDEPENDS_packagegroup-meta-networking-netkit = "\ netkit-rpc \ " -RDEPENDS_packagegroup-meta-networking-netkit_remove_libc-musl = " \ +RDEPENDS:packagegroup-meta-networking-netkit:remove:libc-musl = " \ netkit-rsh-client netkit-rsh-server netkit-telnet" -RDEPENDS_packagegroup-meta-networking-protocols = "\ +RDEPENDS:packagegroup-meta-networking-protocols = "\ babeld \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "dante", "", d)} \ freediameter \ @@ -172,9 +172,9 @@ RDEPENDS_packagegroup-meta-networking-protocols = "\ xl2tpd \ " -RDEPENDS_packagegroup-meta-networking-protocols_remove_libc-musl = "mdns" +RDEPENDS:packagegroup-meta-networking-protocols:remove:libc-musl = "mdns" -RDEPENDS_packagegroup-meta-networking-support = "\ +RDEPENDS:packagegroup-meta-networking-support = "\ aoetools \ arptables \ bridge-utils \ @@ -260,7 +260,7 @@ RDEPENDS_packagegroup-meta-networking-support = "\ wpan-tools \ ettercap \ " -RDEPENDS_packagegroup-meta-networking-support_remove_mipsarch = "memcached" +RDEPENDS:packagegroup-meta-networking-support:remove:mipsarch = "memcached" EXCLUDE_FROM_WORLD = "1" # Empty packages, only devel headers and libs diff --git a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.4.bb b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.4.bb index 936fc723f..7661e9c48 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.4.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_0.7.4.bb @@ -21,13 +21,13 @@ PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" PACKAGECONFIG[readline] = "--enable-libreadline,--disable-libreadline,readline" INITSCRIPT_PACKAGES = "${PN}d" -INITSCRIPT_NAME_${PN}d = "atftpd" -INITSCRIPT_PARAMS_${PN}d = "defaults 80" +INITSCRIPT_NAME:${PN}d = "atftpd" +INITSCRIPT_PARAMS:${PN}d = "defaults 80" EXTRA_OEMAKE = "CFLAGS='${CFLAGS} -std=gnu89'" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/atftpd.init ${D}${sysconfdir}/init.d/atftpd @@ -41,16 +41,16 @@ do_install_append() { PACKAGES =+ "${PN}d" -FILES_${PN} = "${bindir}/*" +FILES:${PN} = "${bindir}/*" -FILES_${PN}d = "${sbindir}/* \ +FILES:${PN}d = "${sbindir}/* \ ${sysconfdir} \ /srv/tftp \ ${systemd_unitdir}/system/atftpd.service \ " SYSTEMD_PACKAGES = "${PN}d" -SYSTEMD_SERVICE_${PN}d = "atftpd.service" -RPROVIDES_${PN}d += "${PN}d-systemd" -RREPLACES_${PN}d += "${PN}d-systemd" -RCONFLICTS_${PN}d += "${PN}d-systemd" +SYSTEMD_SERVICE:${PN}d = "atftpd.service" +RPROVIDES:${PN}d += "${PN}d-systemd" +RREPLACES:${PN}d += "${PN}d-systemd" +RCONFLICTS:${PN}d += "${PN}d-systemd" diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch index 117b1e58a..f16ae5277 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch @@ -13,8 +13,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> lib/log.c | 6 +++++- 3 files changed, 24 insertions(+), 7 deletions(-) -diff --git a/daemon/automount.c b/daemon/automount.c -index e476f6b..3a1514b 100644 --- a/daemon/automount.c +++ b/daemon/automount.c @@ -1,7 +1,7 @@ @@ -50,7 +48,7 @@ index e476f6b..3a1514b 100644 #include "automount.h" #if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND) #include <dlfcn.h> -@@ -282,7 +290,7 @@ int rmdir_path(struct autofs_point *ap, const char *path, dev_t dev) +@@ -282,7 +290,7 @@ int rmdir_path(struct autofs_point *ap, dev, buf, st.st_dev); return -1; } @@ -59,7 +57,7 @@ index e476f6b..3a1514b 100644 /* * Last element of path may be a symbolic link; all others * are directories (and the last directory element is -@@ -455,7 +463,7 @@ int count_mounts(struct autofs_point *ap, const char *path, dev_t dev) +@@ -455,7 +463,7 @@ int count_mounts(struct autofs_point *ap counter.count = 0; counter.dev = dev; @@ -68,7 +66,7 @@ index e476f6b..3a1514b 100644 if (walk_tree(path, counter_fn, 1, ap, &counter) == -1) return -1; -@@ -811,7 +819,7 @@ static char *automount_path_to_fifo(unsigned logopt, const char *path) +@@ -811,7 +819,7 @@ static char *automount_path_to_fifo(unsi /* * An automount path can be made up of subdirectories. So, to * create the fifo name, we will just replace instances of '/' with @@ -77,7 +75,7 @@ index e476f6b..3a1514b 100644 */ p = fifo_name + strlen(fifodir); while (*p != '\0') { -@@ -1640,7 +1648,7 @@ static void return_start_status(void *arg) +@@ -1640,7 +1648,7 @@ static void return_start_status(void *ar sc->done = 1; /* @@ -86,8 +84,6 @@ index e476f6b..3a1514b 100644 * the startup process. */ status = pthread_cond_signal(&sc->cond); -diff --git a/include/hash.h b/include/hash.h -index 2447f29..6f0dee6 100644 --- a/include/hash.h +++ b/include/hash.h @@ -5,6 +5,11 @@ @@ -102,11 +98,9 @@ index 2447f29..6f0dee6 100644 /* * The "GOLDEN_RATIO_PRIME" is used in ifs/btrfs/brtfs_inode.h and -diff --git a/lib/log.c b/lib/log.c -index 0cb47d7..39b1e3b 100644 --- a/lib/log.c +++ b/lib/log.c -@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(const char *msg) +@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons char buffer[ATTEMPT_ID_SIZE + 1]; char *prefixed_msg = NULL; @@ -119,6 +113,3 @@ index 0cb47d7..39b1e3b 100644 if (attempt_id) { int len = sizeof(buffer) + 1 + strlen(msg) + 1; --- -2.32.0 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.7-use-default-stack-size-for-threads.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.7-use-default-stack-size-for-threads.patch new file mode 100644 index 000000000..b21e7c03b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.1.7-use-default-stack-size-for-threads.patch @@ -0,0 +1,110 @@ +autofs-5.1.7 - use default stack size for threads + +From: Ian Kent <raven@themaw.net> + +autofs uses PTHREAD_STACK_MIN to set the stack size for threads it +creates. + +In two cases it is used to reduce the stack size for long running +service threads while it's used to allocate a larger stack for worker +threads that can have larger memory requirements. + +In recent glibc releases PTHREAD_STACK_MIN is no longer a constant +which can lead to unexpectedly different stack sizes on different +architectures and the autofs assumption it's a constant causes a +compile failure. + +The need to alter the stack size was due to observed stack overflow +which was thought to be due the thread stack being too small for autofs +and glibc alloca(3) usage. + +Quite a bit of that alloca(3) usage has been eliminated from autofs now, +particularly those that might be allocating largish amounts of storage, +and there has been a lot of change in glibc too so using the thread +default stack should be ok. + +Signed-off-by: Ian Kent <raven@themaw.net> +--- + CHANGELOG | 1 + + daemon/automount.c | 29 ----------------------------- + daemon/state.c | 6 +----- + lib/alarm.c | 6 +----- + 4 files changed, 3 insertions(+), 39 deletions(-) + +--- a/daemon/automount.c ++++ b/daemon/automount.c +@@ -92,7 +92,6 @@ static size_t kpkt_len; + /* Attributes for creating detached and joinable threads */ + pthread_attr_t th_attr; + pthread_attr_t th_attr_detached; +-size_t detached_thread_stack_size = PTHREAD_STACK_MIN * 144; + + struct master_readmap_cond mrc = { + PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, NULL, 0, 0, 0, 0}; +@@ -2617,34 +2616,6 @@ int main(int argc, char *argv[]) + if (start_pipefd[1] != -1) { + res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat)); + close(start_pipefd[1]); +- } +- release_flag_file(); +- macro_free_global_table(); +- exit(1); +- } +- +-#ifdef _POSIX_THREAD_ATTR_STACKSIZE +- if (pthread_attr_setstacksize( +- &th_attr_detached, detached_thread_stack_size)) { +- logerr("%s: failed to set stack size thread attribute!", +- program); +- if (start_pipefd[1] != -1) { +- res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat)); +- close(start_pipefd[1]); +- } +- release_flag_file(); +- macro_free_global_table(); +- exit(1); +- } +-#endif +- +- if (pthread_attr_getstacksize( +- &th_attr_detached, &detached_thread_stack_size)) { +- logerr("%s: failed to get detached thread stack size!", +- program); +- if (start_pipefd[1] != -1) { +- res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat)); +- close(start_pipefd[1]); + } + release_flag_file(); + macro_free_global_table(); +--- a/daemon/state.c ++++ b/daemon/state.c +@@ -1173,12 +1173,8 @@ int st_start_handler(void) + status = pthread_attr_init(pattrs); + if (status) + pattrs = NULL; +- else { ++ else + pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED); +-#ifdef _POSIX_THREAD_ATTR_STACKSIZE +- pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4); +-#endif +- } + + status = pthread_create(&thid, pattrs, st_queue_handler, NULL); + +--- a/lib/alarm.c ++++ b/lib/alarm.c +@@ -270,12 +270,8 @@ int alarm_start_handler(void) + status = pthread_attr_init(pattrs); + if (status) + pattrs = NULL; +- else { ++ else + pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED); +-#ifdef _POSIX_THREAD_ATTR_STACKSIZE +- pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4); +-#endif +- } + + status = pthread_condattr_init(&condattrs); + if (status) diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.7.bb b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.7.bb index 019b453c2..3fc574fd0 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.7.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.7.bb @@ -26,6 +26,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ file://0001-Do-not-hardcode-path-for-pkg.m4.patch \ file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \ file://0001-Define-__SWORD_TYPE-if-undefined.patch \ + file://autofs-5.1.7-use-default-stack-size-for-threads.patch \ " SRC_URI[sha256sum] = "a18619e5ad18960fe382354eef33f070e57e4e5711d484b010acde080a003312" @@ -59,14 +60,14 @@ CACHED_CONFIGUREVARS = "ac_cv_path_RANLIB=${RANLIB} \ piddir=/run \ " -do_configure_prepend () { +do_configure:prepend () { if [ ! -e ${S}/acinclude.m4 ]; then cp ${S}/aclocal.m4 ${S}/acinclude.m4 fi cp ${STAGING_DATADIR_NATIVE}/aclocal/pkg.m4 . } -do_install_append () { +do_install:append () { # samples have been removed from SUBDIRS from 5.1.5, need to install separately oe_runmake 'DESTDIR=${D}' install_samples @@ -89,9 +90,9 @@ SOLIBS = ".so" FILES_SOLIBSDEV = "" # Some symlinks are created in plugins dir e.g. # mount_nfs4.so -> mount_nfs.so -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "autofs.service" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "autofs.service" diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb index c4b41ace8..46aeb23a3 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb @@ -41,7 +41,7 @@ PACKAGECONFIG[ntlm] = "--enable-ntlm=yes,--enable-ntlm=no,," CFLAGS += "-fPIC" -do_configure_prepend () { +do_configure:prepend () { # make it be able to work with db 5.0 version local sed_files="sasldb/db_berkeley.c utils/dbconverter-2.c" for sed_file in $sed_files; do @@ -49,14 +49,14 @@ do_configure_prepend () { done } -do_compile_prepend () { +do_compile:prepend () { cd include ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} ${S}/include/makemd5.c -o makemd5 touch makemd5.o makemd5.lo makemd5 cd .. } -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}/saslauthd.service ${D}${systemd_unitdir}/system @@ -75,10 +75,10 @@ do_install_append() { } USERADD_PACKAGES = "${PN}-bin" -USERADD_PARAM_${PN}-bin = "--system --home=/var/spool/mail -g mail cyrus" +USERADD_PARAM:${PN}-bin = "--system --home=/var/spool/mail -g mail cyrus" SYSTEMD_PACKAGES = "${PN}-bin" -SYSTEMD_SERVICE_${PN}-bin = "saslauthd.service" +SYSTEMD_SERVICE:${PN}-bin = "saslauthd.service" SYSTEMD_AUTO_ENABLE = "disable" SRC_URI[md5sum] = "a7f4e5e559a0e37b3ffc438c9456e425" @@ -86,16 +86,16 @@ SRC_URI[sha256sum] = "8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f134 PACKAGES =+ "${PN}-bin" -FILES_${PN} += "${libdir}/sasl2/*.so*" -FILES_${PN}-bin += "${bindir} \ +FILES:${PN} += "${libdir}/sasl2/*.so*" +FILES:${PN}-bin += "${bindir} \ ${sysconfdir}/default/saslauthd \ ${systemd_unitdir}/system/saslauthd.service \ ${sysconfdir}/tmpfiles.d/saslauthd.conf" -FILES_${PN}-dev += "${libdir}/sasl2/*.la" -FILES_${PN}-dbg += "${libdir}/sasl2/.debug" -FILES_${PN}-staticdev += "${libdir}/sasl2/*.a" +FILES:${PN}-dev += "${libdir}/sasl2/*.la" +FILES:${PN}-dbg += "${libdir}/sasl2/.debug" +FILES:${PN}-staticdev += "${libdir}/sasl2/*.a" -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" # CVE-2020-8032 affects only openSUSE CVE_CHECK_WHITELIST += "CVE-2020-8032" diff --git a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 3554e688a..19fbd0fa2 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -36,7 +36,7 @@ SRC_URI[sha256sum] = "d3eab7d6cad5da8ccc9d1e31d5303e27a39622c07bdb8fa3618eea3144 inherit systemd DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc" -RDEPENDS_${PN} = "rpcbind" +RDEPENDS:${PN} = "rpcbind" EXTRA_OEMAKE = "CC='${CC}' AS='${AS}' LD='${LD}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}" @@ -45,11 +45,11 @@ EXTRA_OEMAKE += "IPPOOL_TEST=y" CPPFLAGS += "${SELECTED_OPTIMIZATION} -I${STAGING_INCDIR}/tirpc" -SYSTEMD_SERVICE_${PN} = "ippool.service" +SYSTEMD_SERVICE:${PN} = "ippool.service" SYSTEMD_AUTO_ENABLE = "disable" -do_compile_prepend() { +do_compile:prepend() { # fix the CFLAGS= and CPPFLAGS= in main Makefile, to have the extra CFLAGS in env sed -i -e "s/^CFLAGS=/CFLAGS+=/" ${S}/Makefile sed -i -e "s/^CPPFLAGS=/CPPFLAGS+=/" ${S}/Makefile @@ -79,12 +79,12 @@ do_install() { PACKAGES =+ "${PN}-test" -FILES_${PN} += "${libdir}/pppd/${PPPD_VERSION}/ippool.so" -FILES_${PN}-dbg += "${libdir}/pppd/${PPPD_VERSION}/.debug/ippool.so" -FILES_${PN}-test = "/opt/${BPN}" +FILES:${PN} += "${libdir}/pppd/${PPPD_VERSION}/ippool.so" +FILES:${PN}-dbg += "${libdir}/pppd/${PPPD_VERSION}/.debug/ippool.so" +FILES:${PN}-test = "/opt/${BPN}" # needs tcl to run tests -RDEPENDS_${PN}-test += "tcl ${BPN}" +RDEPENDS:${PN}-test += "tcl ${BPN}" PPPD_VERSION="${@get_ppp_version(d)}" diff --git a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb index 8a3dd011e..8e0da23b6 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb @@ -100,7 +100,7 @@ do_install () { fi } -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if [ "x$D" = "x" ]; then if [ -e /etc/init.d/populate-volatile.sh ]; then /etc/init.d/populate-volatile.sh update @@ -114,4 +114,4 @@ SYSTEMD_SERVICE = " iscsi-initiator.service iscsi-initiator-targets.service " INITSCRIPT_NAME = "iscsid" INITSCRIPT_PARAMS = "start 30 1 2 3 4 5 . stop 70 0 1 2 3 4 5 6 ." -FILES_${PN} += "${nonarch_libdir}/iscsi" +FILES:${PN} += "${nonarch_libdir}/iscsi" diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb index f0cbca1be..d04b73876 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb @@ -29,7 +29,7 @@ PACKAGECONFIG[systemd] = "--with-init=systemd --with-systemdsystemunitdir=${syst EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d" -do_install_append() { +do_install:append() { if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then chmod 0755 ${D}${sysconfdir}/init.d/${BPN} sed -i 's#rc.d/##' ${D}${sysconfdir}/init.d/${BPN} @@ -40,7 +40,7 @@ do_install_append() { fi } -FILES_${PN} += "${datadir}/snmp/mibs/KEEPALIVED-MIB.txt" +FILES:${PN} += "${datadir}/snmp/mibs/KEEPALIVED-MIB.txt" -SYSTEMD_SERVICE_${PN} = "keepalived.service" +SYSTEMD_SERVICE:${PN} = "keepalived.service" SYSTEMD_AUTO_ENABLE ?= "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb index bd94c0919..d5e9e2c30 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.8.bb @@ -17,8 +17,8 @@ SRC_URI[sha256sum] = "98d200e76e30f6262c4a4493148c1840827898329146a57a34f8f0f928 inherit autotools update-rc.d useradd systemd pkgconfig bash-completion USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system -g lldpd --shell /bin/false lldpd" -GROUPADD_PARAM_${PN} = "--system lldpd" +USERADD_PARAM:${PN} = "--system -g lldpd --shell /bin/false lldpd" +GROUPADD_PARAM:${PN} = "--system lldpd" EXTRA_OECONF += "--without-embedded-libevent \ --disable-oldies \ @@ -45,9 +45,9 @@ PACKAGECONFIG[custom] = "--enable-custom,--disable-custom" INITSCRIPT_NAME = "lldpd" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "lldpd.service" +SYSTEMD_SERVICE:${PN} = "lldpd.service" -do_install_append() { +do_install:append() { install -Dm 0755 ${WORKDIR}/lldpd.init.d ${D}${sysconfdir}/init.d/lldpd install -Dm 0644 ${WORKDIR}/lldpd.default ${D}${sysconfdir}/default/lldpd # Make an empty configuration file @@ -56,9 +56,9 @@ do_install_append() { PACKAGES =+ "${PN}-zsh-completion" -FILES_${PN} += "${libdir}/sysusers.d" -RDEPENDS_${PN} += "os-release" +FILES:${PN} += "${libdir}/sysusers.d" +RDEPENDS:${PN} += "os-release" -FILES_${PN}-zsh-completion += "${datadir}/zsh/" +FILES:${PN}-zsh-completion += "${datadir}/zsh/" # FIXME: zsh is broken in meta-oe so this cannot be enabled for now #RDEPENDS_${PN}-zsh-completion += "zsh" diff --git a/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb index ee6da5737..592f98f9d 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.6.bb @@ -21,7 +21,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[ccdv] = "--enable-ccdv,--disable-ccdv,," EXTRA_OECONF = "--disable-precomp" -TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" +TARGET_CC_ARCH:append = " ${SELECTED_OPTIMIZATION}" do_configure() { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} diff --git a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb index a697e983f..5159cf51e 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/networkd-dispatcher/networkd-dispatcher_2.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" inherit features_check systemd -RDEPENDS_${PN} = "python3-pygobject python3-dbus" +RDEPENDS:${PN} = "python3-pygobject python3-dbus" REQUIRED_DISTRO_FEATURES = "systemd" SRCREV = "30e278e50749a60a930ceaa0971207c6436b8a0c" @@ -18,7 +18,7 @@ SRC_URI = "git://gitlab.com/craftyguy/networkd-dispatcher;protocol=https;nobranc S = "${WORKDIR}/git" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "networkd-dispatcher.service" +SYSTEMD_SERVICE:${PN} = "networkd-dispatcher.service" SYSTEMD_AUTO_ENABLE = "disable" # Nothing to build, just a python script to install diff --git a/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb index e8d19a2c0..bacf984e7 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb @@ -55,10 +55,10 @@ inherit autotools pkgconfig ptest update-rc.d systemd PACKAGES =+ "${PN}-libs" -FILES_${PN}-libs = "${libdir}/${BPN}/*.so /usr/lib/${BPN}/*.so" +FILES:${PN}-libs = "${libdir}/${BPN}/*.so /usr/lib/${BPN}/*.so" -INSANE_SKIP_${PN}-libs = "dev-so" -RDEPENDS_${PN} += "${PN}-libs" +INSANE_SKIP:${PN}-libs = "dev-so" +RDEPENDS:${PN} += "${PN}-libs" PACKAGECONFIG ??= "libgcrypt non32bit snmp-bc" PACKAGECONFIG[sysfs] = "--enable-sysfs,--disable-sysfs,sysfsutils," @@ -68,7 +68,7 @@ PACKAGECONFIG[snmp-bc] = "--enable-snmp_bc,--disable-snmp_bc" export DISTRO -do_install_append () { +do_install:append () { install -m 0755 -d ${D}${sysconfdir}/${BPN} install -m 0644 ${S}/openhpiclient.conf.example ${D}${sysconfdir}/${BPN}/openhpiclient.conf install -m 0600 ${S}/openhpi.conf.example ${D}${sysconfdir}/${BPN}/openhpi.conf @@ -134,5 +134,5 @@ do_install_ptest () { INITSCRIPT_NAME = "openhpid" INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." -SYSTEMD_SERVICE_${PN} = "openhpid.service" +SYSTEMD_SERVICE:${PN} = "openhpid.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.06.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.06.bb index a97167720..caa85e040 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.06.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.06.bb @@ -37,10 +37,10 @@ UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" inherit autotools useradd systemd pkgconfig USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-f -r opensaf" -USERADD_PARAM_${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" +GROUPADD_PARAM:${PN} = "-f -r opensaf" +USERADD_PARAM:${PN} = "-r -g opensaf -d ${datadir}/opensaf/ -s ${sbindir}/nologin -c \"OpenSAF\" opensaf" -SYSTEMD_SERVICE_${PN} += "opensafd.service" +SYSTEMD_SERVICE:${PN} += "opensafd.service" SYSTEMD_AUTO_ENABLE = "disable" PACKAGECONFIG[systemd] = ",,systemd" @@ -53,7 +53,7 @@ CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" -do_install_append() { +do_install:append() { rm -fr "${D}${localstatedir}/lock" rm -fr "${D}${localstatedir}/run" rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" @@ -64,15 +64,15 @@ do_install_append() { fi } -FILES_${PN} += "${libdir}/libSa*.so ${systemd_unitdir}/system/*.service" -FILES_${PN}-dev += "${libdir}/libopensaf_core.so" -FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" +FILES:${PN} += "${libdir}/libSa*.so ${systemd_unitdir}/system/*.service" +FILES:${PN}-dev += "${libdir}/libopensaf_core.so" +FILES:${PN}-staticdev += "${PKGLIBDIR}/*.a" -INSANE_SKIP_${PN} = "dev-so" +INSANE_SKIP:${PN} = "dev-so" -RDEPENDS_${PN} += "bash python3-core" +RDEPENDS:${PN} += "bash python3-core" # http://errors.yoctoproject.org/Errors/Details/186970/ -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' FILES_SOLIBSDEV = "" diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc index 4b9940cc7..7bf258374 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc @@ -25,11 +25,11 @@ inherit update-rc.d useradd update-alternatives systemd lib_package INITSCRIPT_NAME = "postfix" INITSCRIPT_PARAMS = "start 58 3 4 5 . stop 13 0 1 6 ." USERADD_PACKAGES = "${PN}-bin" -USERADD_PARAM_${PN}-bin = \ +USERADD_PARAM:${PN}-bin = \ "-d /var/spool/postfix -r -g postfix --shell /bin/false postfix; \ -d /var/spool/vmail -r -g vmail --shell /bin/false vmail \ " -GROUPADD_PARAM_${PN}-bin = "--system postfix;--system postdrop;--system vmail" +GROUPADD_PARAM:${PN}-bin = "--system postfix;--system postdrop;--system vmail" export SYSLIBS = "${LDFLAGS}" @@ -45,10 +45,10 @@ export AUXLIBS-ldap = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}" # no native openldap -export CCARGS-ldap_class-native = "" -export AUXLIBS-ldap_class-native = "" +export CCARGS-ldap:class-native = "" +export AUXLIBS-ldap:class-native = "" -export CCARGS-nonis_libc-musl = "-DNO_NIS" +export CCARGS-nonis:libc-musl = "-DNO_NIS" export CCARGS-nonis = "" # SASL support -DUSE_LDAP_SASL -DUSE_SASL_AUTH @@ -57,8 +57,8 @@ export CCARGS-sasl = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${STAGING_INCDIR}/sasl', '', d)}" export AUXLIBS-sasl = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}" -export CCARGS-sasl_class-native = "" -export AUXLIBS-sasl_class-native = "" +export CCARGS-sasl:class-native = "" +export AUXLIBS-sasl:class-native = "" # PCRE, TLS support default export CCARGS = "${CFLAGS} -DHAS_PCRE -DUSE_TLS -I${STAGING_INCDIR}/openssl ${CCARGS-ldap} ${CCARGS-sasl} ${CCARGS-nonis}" @@ -95,11 +95,11 @@ do_compile () { oe_runmake } -do_install_prepend_class-native() { +do_install:prepend:class-native() { export POSTCONF="bin/postconf" } -SYSTEMD_SERVICE_${PN} = "postfix.service" +SYSTEMD_SERVICE:${PN} = "postfix.service" do_install () { sh ./postfix-install 'install_root=${D}' \ @@ -180,14 +180,14 @@ do_install () { rm -rf ${D}/etc/postfix/makedefs.out } -do_install_append_class-native() { +do_install:append:class-native() { ln -sf ../sbin/sendmail.postfix ${D}${bindir}/newaliases ln -sf ../sbin/sendmail.postfix ${D}${bindir}/mailq } -ALTERNATIVE_${PN}-bin = "sendmail mailq newaliases" +ALTERNATIVE:${PN}-bin = "sendmail mailq newaliases" # /usr/lib/sendmial is required by LSB core test -ALTERNATIVE_${PN}-bin_linuxstdbase = "sendmail mailq newaliases usr-lib-sendmail" +ALTERNATIVE:${PN}-bin:linuxstdbase = "sendmail mailq newaliases usr-lib-sendmail" ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq" ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases" ALTERNATIVE_TARGET[sendmail] = "${sbindir}/sendmail.postfix" @@ -197,12 +197,12 @@ ALTERNATIVE_LINK_NAME[usr-lib-sendmail] = "/usr/lib/sendmail" ALTERNATIVE_PRIORITY = "120" -ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" +ALTERNATIVE:${PN}-doc += "mailq.1 newaliases.1 sendmail.1" ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1" -pkg_postinst_ontarget_${PN}-cfg () { +pkg_postinst_ontarget:${PN}-cfg () { touch /etc/aliases newaliases @@ -212,11 +212,11 @@ pkg_postinst_ontarget_${PN}-cfg () { } PACKAGES =+ "${PN}-cfg" -RDEPENDS_${PN}-cfg_class-target += "${PN}-bin" -RDEPENDS_${PN}_class-target += "${PN}-cfg" +RDEPENDS:${PN}-cfg:class-target += "${PN}-bin" +RDEPENDS:${PN}:class-target += "${PN}-cfg" # Exclude .debug directories from the main package -FILES_${PN}-bin += "${localstatedir} ${bindir}/* ${sbindir}/* \ +FILES:${PN}-bin += "${localstatedir} ${bindir}/* ${sbindir}/* \ ${libexecdir}/* ${systemd_unitdir}/*" -FILES_${PN}-cfg = "${sysconfdir}" -FILES_${PN}-dbg += "${libexecdir}/postfix/.debug" -ALLOW_EMPTY_${PN} = "1" +FILES:${PN}-cfg = "${sysconfdir}" +FILES:${PN}-dbg += "${libexecdir}/postfix/.debug" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.1.bb b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.2.bb index c139f0661..982544d5c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.2.bb @@ -15,5 +15,5 @@ SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P file://0001-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ file://0007-correct-signature-of-closefrom-API.patch \ " -SRC_URI[sha256sum] = "20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c" -UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.3(\.\d+)+).tar.gz" +SRC_URI[sha256sum] = "507323d20d7b3f705f49cf8c07d437c6d8090bed07e15a3c0ec405edad54a7d4" +UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.6(\.\d+)+).tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb index f2a89e5a2..981757b56 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7a.bb @@ -131,15 +131,15 @@ INITSCRIPT_NAME = "proftpd" INITSCRIPT_PARAM = "defaults 85 15" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "proftpd.service" +SYSTEMD_SERVICE:${PN} = "proftpd.service" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system ${FTPGROUP}" -USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --no-create-home \ +GROUPADD_PARAM:${PN} = "--system ${FTPGROUP}" +USERADD_PARAM:${PN} = "--system -g ${FTPGROUP} --home-dir /var/lib/${FTPUSER} --no-create-home \ --shell /bin/false ${FTPUSER}" MULTILIB_SCRIPTS = "${PN}:${bindir}/prxs" -FILES_${PN} += "/home/${FTPUSER}" +FILES:${PN} += "/home/${FTPUSER}" -RDEPENDS_${PN} += "perl" +RDEPENDS:${PN} += "perl" diff --git a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb index 227c9f917..d1eb6e28f 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ptpd/ptpd_2.3.1.bb @@ -58,5 +58,5 @@ do_install() { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "ptpd.service" +SYSTEMD_SERVICE:${PN} = "ptpd.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc index 802dbe34e..2afaa4841 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc @@ -23,10 +23,10 @@ SRC_URI = "http://v6web.litech.org/radvd/dist/radvd-${PV}.tar.gz \ inherit autotools useradd pkgconfig systemd -SYSTEMD_SERVICE_${PN} = "radvd.service" +SYSTEMD_SERVICE:${PN} = "radvd.service" SYSTEMD_AUTO_ENABLE = "disable" -do_install_append () { +do_install:append () { install -m 0755 -d ${D}${sysconfdir}/init.d \ ${D}${sysconfdir}/default/volatiles \ ${D}${docdir}/radvd @@ -58,9 +58,9 @@ do_install_append () { } USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ -z "$D" -a -x /etc/init.d/populate-volatile.sh ]; then /etc/init.d/populate-volatile.sh update fi diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb index 8ba10674c..5af00d626 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_4.15.bb @@ -27,7 +27,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2 file://0001-Fix-build-on-Fedora-Rawhide-772.patch \ " -SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" +SRC_URI:remove:toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" SRC_URI[sha256sum] = "71635811e766ce8b155225a9e3c7757cfc7ff93df26b28d82e5e6fc021b9a605" @@ -38,13 +38,13 @@ DEPENDS = "libtool krb5 openldap db cyrus-sasl" inherit autotools pkgconfig useradd ptest perlnative -LDFLAGS_append_mipsarch = " -latomic" -LDFLAGS_append_powerpc = " -latomic" -LDFLAGS_append_riscv64 = " -latomic" -LDFLAGS_append_riscv32 = " -latomic" +LDFLAGS:append:mipsarch = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:riscv64 = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" +USERADD_PARAM:${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " @@ -68,7 +68,7 @@ export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" TESTDIR = "test-suite" -do_configure_prepend() { +do_configure:prepend() { export SYSROOT=$PKG_CONFIG_SYSROOT_DIR } @@ -92,7 +92,7 @@ do_install_ptest() { sed -i 's:^TRUE = .*$:TRUE = /bin/true:' ${D}${PTEST_PATH}/${TESTDIR}/Makefile } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf @@ -109,9 +109,9 @@ do_install_append() { rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log" } -FILES_${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" -FILES_${PN}-dbg += "/usr/src/debug" -FILES_${PN}-doc += "${datadir}/*.txt" +FILES:${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" +FILES:${PN}-dbg += "/usr/src/debug" +FILES:${PN}-doc += "${datadir}/*.txt" -RDEPENDS_${PN} += "perl" -RDEPENDS_${PN}-ptest += "make" +RDEPENDS:${PN} += "perl" +RDEPENDS:${PN}-ptest += "make" diff --git a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index dc1d6c67e..af42bda93 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -72,26 +72,26 @@ do_install() { sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/tftpd-hpa.service } -FILES_${PN} = "${bindir}" +FILES:${PN} = "${bindir}" PACKAGES += "tftp-hpa-server" -SUMMARY_tftp-hpa-server = "Server for the Trivial File Transfer Protocol" -FILES_tftp-hpa-server = "${sbindir} ${sysconfdir} ${localstatedir}" -CONFFILES_tftp-hpa-server = "${sysconfdir}/default/tftpd-hpa" +SUMMARY:tftp-hpa-server = "Server for the Trivial File Transfer Protocol" +FILES:tftp-hpa-server = "${sbindir} ${sysconfdir} ${localstatedir}" +CONFFILES:tftp-hpa-server = "${sysconfdir}/default/tftpd-hpa" INITSCRIPT_PACKAGES = "tftp-hpa-server" INITSCRIPT_NAME = "tftpd-hpa" INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 1 ." -ALTERNATIVE_${PN}-doc = "tftpd.8 tftp.1" +ALTERNATIVE:${PN}-doc = "tftpd.8 tftp.1" ALTERNATIVE_LINK_NAME[tftpd.8] = "${mandir}/man8/tftpd.8" ALTERNATIVE_LINK_NAME[tftp.1] = "${mandir}/man1/tftp.1" -ALTERNATIVE_${PN} = "tftp" +ALTERNATIVE:${PN} = "tftp" ALTERNATIVE_TARGET[tftp] = "${bindir}/tftp-hpa" ALTERNATIVE_PRIORITY = "100" SYSTEMD_PACKAGES = "tftp-hpa-server" -SYSTEMD_SERVICE_tftp-hpa-server = "tftpd-hpa.socket tftpd-hpa.service" -SYSTEMD_AUTO_ENABLE_tftp-hpa-server = "enable" +SYSTEMD_SERVICE:tftp-hpa-server = "tftpd-hpa.socket tftpd-hpa.service" +SYSTEMD_AUTO_ENABLE:tftp-hpa-server = "enable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb index 647abbfd2..15bf350c7 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_25.bb @@ -51,5 +51,5 @@ do_install() { INITSCRIPT_NAME = "vblade" INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." -SYSTEMD_SERVICE_${PN} = "vblade.service" +SYSTEMD_SERVICE:${PN} = "vblade.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb index 024b776de..cf3d7fc96 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb @@ -39,16 +39,16 @@ PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" +RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" WRAPLIB = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '-lwrap', '', d)}" NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" inherit update-rc.d useradd systemd -CONFFILES_${PN} = "${sysconfdir}/vsftpd.conf" -LDFLAGS_append =" -lcrypt -lcap" -CFLAGS_append_libc-musl = " -D_GNU_SOURCE -include fcntl.h" +CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf" +LDFLAGS:append =" -lcrypt -lcap" +CFLAGS:append:libc-musl = " -D_GNU_SOURCE -include fcntl.h" EXTRA_OEMAKE = "-e MAKEFLAGS=" do_configure() { @@ -95,17 +95,17 @@ do_install() { } INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "vsftpd" -INITSCRIPT_PARAMS_${PN} = "defaults 80" +INITSCRIPT_NAME:${PN} = "vsftpd" +INITSCRIPT_PARAMS:${PN} = "defaults 80" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home-dir /var/lib/ftp --no-create-home -g ftp \ +USERADD_PARAM:${PN} = "--system --home-dir /var/lib/ftp --no-create-home -g ftp \ --shell /bin/false ftp " -GROUPADD_PARAM_${PN} = "-r ftp" +GROUPADD_PARAM:${PN} = "-r ftp" -SYSTEMD_SERVICE_${PN} = "vsftpd.service" +SYSTEMD_SERVICE:${PN} = "vsftpd.service" -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { if [ -z "$D" ]; then if type systemd-tmpfiles >/dev/null; then systemd-tmpfiles --create diff --git a/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.3.1.bb b/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.3.1.bb index 4a2ab3efb..0f62b5790 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.3.1.bb +++ b/meta-openembedded/meta-networking/recipes-devtools/python/python3-ldap_3.3.1.bb @@ -18,12 +18,12 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=36ce9d726d0321b73c1521704d07db1b" SRC_URI[md5sum] = "7608579722c491e42f5f63b3f88a95fb" SRC_URI[sha256sum] = "4711cacf013e298754abd70058ccc995758177fb425f1c2d30e71adfc1d00aa5" -do_configure_prepend() { +do_configure:prepend() { sed -i -e 's:^library_dirs =.*::' ${S}/setup.cfg sed -i -e 's:^include_dirs =.*:include_dirs = =/usr/include/sasl/:' ${S}/setup.cfg } -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ ${PYTHON_PN}-pprint \ ${PYTHON_PN}-threading \ ${PYTHON_PN}-pyasn1 \ diff --git a/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb b/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb index 01ca63746..84acc8681 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb +++ b/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb @@ -26,7 +26,7 @@ UPSTREAM_CHECK_COMMITS = "1" inherit setuptools3 ptest -do_install_append() { +do_install:append() { mv ${D}${bindir}/scapy ${D}${bindir}/scapy3 mv ${D}${bindir}/UTscapy ${D}${bindir}/UTscapy3 } @@ -36,6 +36,6 @@ do_install_ptest() { sed -i 's,@PTEST_PATH@,${PTEST_PATH},' ${D}${PTEST_PATH}/run-ptest } -RDEPENDS_${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-cryptography ${PYTHON_PN}-netclient \ +RDEPENDS:${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-cryptography ${PYTHON_PN}-netclient \ ${PYTHON_PN}-netserver ${PYTHON_PN}-pydoc ${PYTHON_PN}-pkgutil ${PYTHON_PN}-shell \ ${PYTHON_PN}-threading ${PYTHON_PN}-numbers ${PYTHON_PN}-pycrypto" diff --git a/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb b/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb index c0531d386..909296197 100644 --- a/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb +++ b/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" DEPENDS = "groff-native nss libqb kronosnet" -SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \ +SYSTEMD_SERVICE:${PN} = "corosync.service corosync-notifyd.service \ ${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'corosync-qnetd.service', '', d)} \ " @@ -37,12 +37,12 @@ PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_un EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash ap_cv_cc_pie=no" EXTRA_OEMAKE = "tmpfilesdir_DATA=" -#do_configure_prepend() { +#do_configure:prepend() { # ( cd ${S} # ${S}/autogen.sh ) #} -do_install_append() { +do_install:append() { install -D -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example install -d ${D}${sysconfdir}/sysconfig/ install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync @@ -64,11 +64,11 @@ do_install_append() { fi } -RDEPENDS_${PN} += "bash ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" +RDEPENDS:${PN} += "bash ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" -FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug" -FILES_${PN}-doc += "${datadir}/snmp/mibs/COROSYNC-MIB.txt" +FILES:${PN}-dbg += "${libexecdir}/lcrso/.debug" +FILES:${PN}-doc += "${datadir}/snmp/mibs/COROSYNC-MIB.txt" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system coroqnetd" -USERADD_PARAM_${PN} = "--system -d / -M -s /bin/nologin -c 'User for corosync-qnetd' -g coroqnetd coroqnetd" +GROUPADD_PARAM:${PN} = "--system coroqnetd" +USERADD_PARAM:${PN} = "--system -d / -M -s /bin/nologin -c 'User for corosync-qnetd' -g coroqnetd coroqnetd" diff --git a/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb index 577db7087..b99c30cc9 100644 --- a/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb +++ b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb @@ -30,14 +30,14 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[pacemaker] = ",,pacemaker" -SYSTEMD_SERVICE_${PN} = "dlm.service" +SYSTEMD_SERVICE:${PN} = "dlm.service" SYSTEMD_AUTO_ENABLE = "enable" export EXTRA_OEMAKE = "" DONTBUILD = "${@bb.utils.contains('PACKAGECONFIG', 'pacemaker', '', 'fence', d)}" -do_compile_prepend_toolchain-clang() { +do_compile:prepend:toolchain-clang() { sed -i -e "s/-fstack-clash-protection//g" ${S}/*/Makefile } diff --git a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.20.bb b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.20.bb index a468a9ab6..edbca246d 100644 --- a/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.20.bb +++ b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.20.bb @@ -23,8 +23,8 @@ S = "${WORKDIR}/git" # libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare] # for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { # ^~~~~~~~~~~~~~~~~~~~~~~ -CFLAGS_append_toolchain-clang = " -Wno-sign-compare" +CFLAGS:append:toolchain-clang = " -Wno-sign-compare" PACKAGECONFIG[man] = "enable_man="yes", --disable-man, " -PACKAGECONFIG_remove = "man" +PACKAGECONFIG:remove = "man" diff --git a/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb b/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb index bc9297eab..48723d92b 100644 --- a/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb +++ b/meta-openembedded/meta-networking/recipes-filter/arno-iptables-firewall/arno-iptables-firewall_2.1.1.bb @@ -29,5 +29,5 @@ do_install() { sed -i -e 's%#!/bin/bash%#!/bin/sh%g' ${D}${datadir}/arno-iptables-firewall/plugins/dyndns-host-open-helper } -SYSTEMD_SERVICE_${PN} = "arno-iptables-firewall.service" -FILES_${PN} += "${systemd_unitdir}/system/arno-iptables-firewall.service" +SYSTEMD_SERVICE:${PN} = "arno-iptables-firewall.service" +FILES:${PN} += "${systemd_unitdir}/system/arno-iptables-firewall.service" diff --git a/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb b/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb index ad50a89a4..0e009da02 100644 --- a/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb +++ b/meta-openembedded/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.6.bb @@ -19,7 +19,7 @@ inherit autotools update-rc.d pkgconfig INITSCRIPT_NAME = "conntrackd" -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/conntrackd install -d ${D}/${sysconfdir}/init.d install -m 0644 ${S}/doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample diff --git a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb index bc33c18c0..21e5c1877 100644 --- a/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb +++ b/meta-openembedded/meta-networking/recipes-filter/ebtables/ebtables_2.0.11.bb @@ -6,9 +6,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e" SECTION = "net" -RDEPENDS_${PN} += "bash perl" +RDEPENDS:${PN} += "bash perl" -RRECOMMENDS_${PN} += "kernel-module-ebtables \ +RRECOMMENDS:${PN} += "kernel-module-ebtables \ " SRC_URI = "http://ftp.netfilter.org/pub/ebtables/ebtables-${PV}.tar.gz \ @@ -18,14 +18,14 @@ SRC_URI = "http://ftp.netfilter.org/pub/ebtables/ebtables-${PV}.tar.gz \ file://ebtables.service \ " -SRC_URI_append_libc-musl = " file://0010-Adjust-header-include-sequence.patch" +SRC_URI:append:libc-musl = " file://0010-Adjust-header-include-sequence.patch" SRC_URI[md5sum] = "071c8b0a59241667a0044fb040d4fc72" SRC_URI[sha256sum] = "b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a" inherit systemd autotools -do_install_append () { +do_install:append () { # Replace upstream ebtables-save perl script with Fedora bash based rewrite # http://pkgs.fedoraproject.org/cgit/rpms/ebtables.git/tree/ebtables-save rm -f ${D}${sbindir}/ebtables-legacy-save @@ -43,11 +43,11 @@ do_install_append () { ln -sf ${sbindir}/ebtables-legacy ${D}${base_sbindir}/ebtables } -do_configure_prepend () { +do_configure:prepend () { ( cd ${S}; ./autogen.sh ) } -FILES_${PN}-dbg += "${base_libdir}/ebtables/.debug" -FILES_${PN} += "${base_libdir}/ebtables/*.so" +FILES:${PN}-dbg += "${base_libdir}/ebtables/.debug" +FILES:${PN} += "${base_libdir}/ebtables/*.so" -SYSTEMD_SERVICE_${PN} = "ebtables.service" +SYSTEMD_SERVICE:${PN} = "ebtables.service" diff --git a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.11.bb b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.11.bb index 693aa9031..3e64f4159 100644 --- a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.11.bb +++ b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.11.bb @@ -16,6 +16,6 @@ inherit autotools pkgconfig module-base EXTRA_OECONF += "-with-kbuild=${KBUILD_OUTPUT} --with-ksource=${STAGING_KERNEL_DIR}" -RRECOMMENDS_${PN} = "\ +RRECOMMENDS:${PN} = "\ kernel-module-ip-set \ " diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.9.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.9.bb index cbe2bb399..cf7c01bbc 100644 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.9.bb +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.9.bb @@ -24,8 +24,8 @@ PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" inherit ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} -RRECOMMENDS_${PN} += "kernel-module-nf-tables" +RRECOMMENDS:${PN} += "kernel-module-nf-tables" PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" -RDEPENDS_${PN}-python = "python3-core python3-json ${PN}" +FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" +RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" diff --git a/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.0.bb b/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.0.bb index 6a0c9386c..9f7e39297 100644 --- a/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.0.bb +++ b/meta-openembedded/meta-networking/recipes-irc/weechat/weechat_3.0.bb @@ -18,16 +18,16 @@ PACKAGECONFIG ??= " ncurses python" PACKAGECONFIG[ncurses] = "-DENABLE_NCURSES=ON,-DENABLE_NCURSES=OFF,ncurses" PACKAGECONFIG[python] = "-DENABLE_PYTHON=ON,-DENABLE_PYTHON=OFF,python3,python3" -EXTRA_OECMAKE_append = " -DENABLE_PHP=OFF -DENABLE_TCL=OFF -DENABLE_LUA=OFF -DENABLE_JAVASCRIPT=OFF -DENABLE_RUBY=OFF -DENABLE_GUILE=OFF -DENABLE_PERL=OFF -DENABLE_ASPELL=ON" +EXTRA_OECMAKE:append = " -DENABLE_PHP=OFF -DENABLE_TCL=OFF -DENABLE_LUA=OFF -DENABLE_JAVASCRIPT=OFF -DENABLE_RUBY=OFF -DENABLE_GUILE=OFF -DENABLE_PERL=OFF -DENABLE_ASPELL=ON" -do_configure_prepend(){ +do_configure:prepend(){ # Make sure we get dependencies from recipe-sysroot sed -i -e 's# /usr/bin# ${RECIPE_SYSROOT}/${bindir}/#g' ${S}/cmake/FindPerl.cmake sed -i -e 's# /usr/local/bin##g' ${S}/cmake/FindPerl.cmake sed -i -e 's# /usr/pkg/bin##g' ${S}/cmake/FindPerl.cmake } -do_install_append(){ +do_install:append(){ rm -rf ${D}/${datadir} } diff --git a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb index 806d622d7..fff198d06 100644 --- a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb +++ b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb @@ -23,10 +23,10 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail -do_configure_prepend() { +do_configure:prepend() { automake --add-missing || true } -do_install_append() { +do_install:append() { sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc } diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb index 01e3b74c6..92614b22e 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb @@ -12,14 +12,14 @@ DEPENDS = "virtual/kernel libmnl" # configuration options. For exact kernel requirements visit: # https://www.wireguard.io/install/#kernel-requirements -EXTRA_OEMAKE_append = " \ +EXTRA_OEMAKE:append = " \ KERNELDIR=${STAGING_KERNEL_DIR} \ " MAKE_TARGETS = "module" MODULES_INSTALL_TARGET = "module-install" -RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" +RRECOMMENDS:${PN} = "kernel-module-xt-hashlimit" MODULE_NAME = "wireguard" diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210315.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210315.bb index f02303e0e..b16e0c829 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210315.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210315.bb @@ -16,11 +16,11 @@ do_install () { install } -FILES_${PN} = " \ +FILES:${PN} = " \ ${sysconfdir} \ ${systemd_system_unitdir} \ ${bindir} \ " -RDEPENDS_${PN} = "bash" -RRECOMMENDS_${PN} = "kernel-module-wireguard" +RDEPENDS:${PN} = "bash" +RRECOMMENDS:${PN} = "kernel-module-wireguard" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb index 628047eee..1ba0dd46a 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-ftp/netkit-ftp_0.17.bb @@ -41,13 +41,13 @@ do_install () { } PACKAGES = "${PN} ${PN}-doc ${BPN}-dbg" -FILES_${PN} = "${bindir}/*" -FILES_${PN}-doc = "${mandir}" -FILES_${PN}-dbg = "${prefix}/src/debug \ +FILES:${PN} = "${bindir}/*" +FILES:${PN}-doc = "${mandir}" +FILES:${PN}-dbg = "${prefix}/src/debug \ ${bindir}/.debug" -RDEPENDS_${PN} = "readline" +RDEPENDS:${PN} = "readline" ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "ftp" +ALTERNATIVE:${PN} = "ftp" ALTERNATIVE_LINK_NAME[ftp] = "${bindir}/ftp" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb index a787e52f7..cb05645ee 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rpc/netkit-rpc_0.17.bb @@ -47,5 +47,5 @@ do_install () { } ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "rpcinfo" +ALTERNATIVE:${PN} = "rpcinfo" ALTERNATIVE_LINK_NAME[rpcinfo] = "${bindir}/rpcinfo" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb index 70fb4cf5f..5ea553e87 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb @@ -37,10 +37,10 @@ CFLAGS += " -D_GNU_SOURCE -Wno-deprecated-declarations" LDFLAGS += " -L${STAGING_LIBDIR} -lutil -lcrypt" PACKAGECONFIG ??= "" -PACKAGECONFIG_append = " ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG:append = " ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG[pam] = " , --without-pam, libpam, libpam" -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' do_configure () { ./configure --prefix=${prefix} --exec-prefix=${exec_prefix} @@ -82,15 +82,15 @@ do_install () { PACKAGES = "${PN}-client ${PN}-server ${PN}-doc ${BPN}-dbg" -FILES_${PN}-client = "${bindir}/*" -FILES_${PN}-server = "${sbindir}/* ${sysconfdir}" -FILES_${PN}-doc = "${mandir}" -FILES_${PN}-dbg = "${prefix}/src/debug \ +FILES:${PN}-client = "${bindir}/*" +FILES:${PN}-server = "${sbindir}/* ${sysconfdir}" +FILES:${PN}-doc = "${mandir}" +FILES:${PN}-dbg = "${prefix}/src/debug \ ${sbindir}/.debug ${bindir}/.debug" ALTERNATIVE_PRIORITY = "80" -ALTERNATIVE_${PN}-client = "rcp rexec rlogin rsh" -ALTERNATIVE_${PN}-server = "rshd rexecd rlogind" +ALTERNATIVE:${PN}-client = "rcp rexec rlogin rsh" +ALTERNATIVE:${PN}-server = "rshd rexecd rlogind" ALTERNATIVE_LINK_NAME[server] = "${bindir}/rshd" ALTERNATIVE_TARGET[rshd] = "${sbindir}/in.rshd" ALTERNATIVE_LINK_NAME[rexecd] = "${bindir}/rexecd" @@ -98,8 +98,8 @@ ALTERNATIVE_TARGET[rexecd] = "${sbindir}/in.rexecd" ALTERNATIVE_LINK_NAME[rlogind] = "${bindir}/rlogind" ALTERNATIVE_TARGET[rlogind] = "${sbindir}/in.rlogind" -RCONFLICTS_${PN}-server += "inetutils-rshd" -RPROVIDES_${PN}-server = "rshd" +RCONFLICTS:${PN}-server += "inetutils-rshd" +RPROVIDES:${PN}-server = "rshd" -RDEPENDS_${PN}-server = "xinetd" -RDEPENDS_${PN}-server += "tcp-wrappers" +RDEPENDS:${PN}-server = "xinetd" +RDEPENDS:${PN}-server += "tcp-wrappers" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb index eee96d865..48b32eb7e 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rusers/netkit-rusers_0.17.bb @@ -59,14 +59,14 @@ EOF } PACKAGES = "${PN}-client ${PN}-server ${PN}-doc ${BPN}-dbg" -FILES_${PN}-client = "${bindir}/*" -FILES_${PN}-server = "${sbindir}/* ${sysconfdir}" -FILES_${PN}-doc = "${mandir}" -FILES_${PN}-dbg = "${prefix}/src/debug \ +FILES:${PN}-client = "${bindir}/*" +FILES:${PN}-server = "${sbindir}/* ${sysconfdir}" +FILES:${PN}-doc = "${mandir}" +FILES:${PN}-dbg = "${prefix}/src/debug \ ${bindir}/.debug ${sbindir}/.debug" -RDEPENDS_${PN}-server += "tcp-wrappers xinetd rpcbind" +RDEPENDS:${PN}-server += "tcp-wrappers xinetd rpcbind" # http://errors.yoctoproject.org/Errors/Details/186962/ -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' PNBLACKLIST[netkit-rusers] ?= "Fails to build rup.c:51:10: fatal error: rstat.h: No such file or directory" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb index 308582398..51168f958 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb @@ -82,11 +82,11 @@ do_install () { mkdir -p -m 755 ${D}${localstatedir}/spool/rwho chown -R rwhod ${D}${localstatedir}/spool/rwho } -pkg_postinst_ontarget_${PN}-server() { +pkg_postinst_ontarget:${PN}-server() { ${sysconfdir}/init.d/rwhod start } -pkg_postrm_${PN}-server() { +pkg_postrm:${PN}-server() { ${sysconfdir}/init.d/rwhod stop } @@ -94,15 +94,15 @@ INITSCRIPT_NAME = "rwhod" INITSCRIPT_PARAM = "defaults 85 15" USERADD_PACKAGES = "${PN}-server" -GROUPADD_PARAM_${PN}-server = "--system rwhod" -USERADD_PARAM_${PN}-server = "--system -g rwhod --home-dir ${localstatedir}/spool/rwho \ +GROUPADD_PARAM:${PN}-server = "--system rwhod" +USERADD_PARAM:${PN}-server = "--system -g rwhod --home-dir ${localstatedir}/spool/rwho \ --no-create-home --shell /bin/false rwhod" -INSANE_SKIP_${PN} = "already-stripped" +INSANE_SKIP:${PN} = "already-stripped" PACKAGES = "${PN}-client ${PN}-server ${PN}-doc ${BPN}-dbg" -FILES_${PN}-client = "${bindir}/*" -FILES_${PN}-server = "${sbindir}/* ${localstatedir} ${sysconfdir}/default/* ${sysconfdir}/init.d/*" -FILES_${PN}-doc = "${mandir}" -FILES_${PN}-dbg = "${prefix}/src/debug \ +FILES:${PN}-client = "${bindir}/*" +FILES:${PN}-server = "${sbindir}/* ${localstatedir} ${sysconfdir}/default/* ${sysconfdir}/init.d/*" +FILES:${PN}-doc = "${mandir}" +FILES:${PN}-dbg = "${prefix}/src/debug \ ${bindir}/.debug ${sbindir}/.debug" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb index c05d0fd6c..56860ea09 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-telnet/netkit-telnet_0.17.bb @@ -55,17 +55,17 @@ do_install () { inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "telnet" +ALTERNATIVE:${PN} = "telnet" ALTERNATIVE_LINK_NAME[telnet] = "${bindir}/telnet" ALTERNATIVE_TARGET[telnet] = "${bindir}/telnet.${PN}" -ALTERNATIVE_${PN}-doc = "telnetd.8" +ALTERNATIVE:${PN}-doc = "telnetd.8" ALTERNATIVE_LINK_NAME[telnetd.8] = "${mandir}/man8/telnetd.8" SRC_URI[md5sum] = "d6beabaaf53fe6e382c42ce3faa05a36" SRC_URI[sha256sum] = "9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00" -FILES_${PN} += "${sbindir}/in.* ${libdir}/* ${sysconfdir}/xinetd.d/*" +FILES:${PN} += "${sbindir}/in.* ${libdir}/* ${sysconfdir}/xinetd.d/*" # http://errors.yoctoproject.org/Errors/Details/186954/ -COMPATIBLE_HOST_libc-musl = 'null' -RCONFLICTS_${PN} = "inetutils-telnetd" +COMPATIBLE_HOST:libc-musl = 'null' +RCONFLICTS:${PN} = "inetutils-telnetd" diff --git a/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb b/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb index 28e016400..8de3e4a34 100644 --- a/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb +++ b/meta-openembedded/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb @@ -46,14 +46,14 @@ do_install () { } PACKAGES = "${PN}-client ${PN}-server ${PN}-doc ${BPN}-dbg" -FILES_${PN}-client = "${bindir}/*" -FILES_${PN}-server = "${sbindir}/* ${sysconfdir}/xinetd.d/*" -FILES_${PN}-doc = "${mandir}" -FILES_${PN}-dbg = "${prefix}/src/debug \ +FILES:${PN}-client = "${bindir}/*" +FILES:${PN}-server = "${sbindir}/* ${sysconfdir}/xinetd.d/*" +FILES:${PN}-doc = "${mandir}" +FILES:${PN}-dbg = "${prefix}/src/debug \ ${bindir}/.debug ${sbindir}/.debug" -RDEPENDS_${PN}-server = "tcp-wrappers xinetd" +RDEPENDS:${PN}-server = "tcp-wrappers xinetd" ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN}-client = "tftp" +ALTERNATIVE:${PN}-client = "tftp" ALTERNATIVE_LINK_NAME[tftp] = "${bindir}/tftp" diff --git a/meta-openembedded/meta-networking/recipes-protocols/dante/dante_1.4.1.bb b/meta-openembedded/meta-networking/recipes-protocols/dante/dante_1.4.1.bb index cfe71dd69..48f970856 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/dante/dante_1.4.1.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/dante/dante_1.4.1.bb @@ -36,14 +36,14 @@ PACKAGECONFIG[krb5] = ",--without-krb5,krb5" PACKAGECONFIG ??= "" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir} cp ${S}/example/sock[sd].conf ${D}${sysconfdir} } PACKAGES =+ "${PN}-sockd ${PN}-libdsocks " -FILES_${PN}-libdsocks = "${libdir}/libdsocks.so" -FILES_${PN}-sockd = "${bindir}/sockd ${sysconfdir}/sockd.conf" +FILES:${PN}-libdsocks = "${libdir}/libdsocks.so" +FILES:${PN}-sockd = "${bindir}/sockd ${sysconfdir}/sockd.conf" -INSANE_SKIP_${PN}-libdsocks = "dev-elf" +INSANE_SKIP:${PN}-libdsocks = "dev-elf" diff --git a/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.4.0.bb b/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.4.0.bb index 15ee56196..3ec20d3ab 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.4.0.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.4.0.bb @@ -68,7 +68,7 @@ FD_DH_PEM ?= "${BPN}-dh.pem" FD_HOSTNAME ?= "${MACHINE}" FD_REALM ?= "openembedded.org" -do_install_append() { +do_install:append() { # install the sample configuration files install -d -m 0755 ${D}${sysconfdir}/${fd_pkgname} for i in ${S}/doc/*.conf.sample; do @@ -116,23 +116,23 @@ do_install_ptest() { install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/ } -FILES_${PN}-dbg += "${libdir}/${fd_pkgname}/.debug/*" +FILES:${PN}-dbg += "${libdir}/${fd_pkgname}/.debug/*" # include the extensions in main package -FILES_${PN} += "${libdir}/${fd_pkgname}/*" +FILES:${PN} += "${libdir}/${fd_pkgname}/*" -RDEPENDS_${PN} = "glib-2.0 gnutls libidn" -RDEPENDS_${PN} += "openssl openssl-conf openssl-engines" -RRECOMMENDS_${PN} += "kernel-module-tipc kernel-module-sctp" -RRECOMMENDS_${PN} += "kernel-module-udp-tunnel kernel-module-ipip" -RDEPENDS_${PN}-ptest = "cmake" +RDEPENDS:${PN} = "glib-2.0 gnutls libidn" +RDEPENDS:${PN} += "openssl openssl-conf openssl-engines" +RRECOMMENDS:${PN} += "kernel-module-tipc kernel-module-sctp" +RRECOMMENDS:${PN} += "kernel-module-udp-tunnel kernel-module-ipip" +RDEPENDS:${PN}-ptest = "cmake" INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "${BPN}" +INITSCRIPT_NAME:${PN} = "${BPN}" INITSCRIPT_PARAMS$_${PN} = "start 30 . stop 70 0 1 2 3 4 5 6 ." -SYSTEMD_SERVICE_${PN} = "freediameter.service" +SYSTEMD_SERVICE:${PN} = "freediameter.service" SYSTEMD_AUTO_ENABLE = "disable" -CONFFILES_${PN} = "${sysconfdir}/freediameter.conf" +CONFFILES:${PN} = "${sysconfdir}/freediameter.conf" diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.40.42.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.40.42.bb index 60bc26bf1..c9bfef2d1 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.40.42.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_1310.40.42.bb @@ -4,9 +4,9 @@ HOMEPAGE = "http://developer.apple.com/networking/bonjour/" LICENSE = "Apache-2.0 & BSD-3-Clause" LIC_FILES_CHKSUM = "file://../LICENSE;md5=31c50371921e0fb731003bbc665f29bf" -COMPATIBLE_HOST_libc-musl = 'null' +COMPATIBLE_HOST:libc-musl = 'null' -RPROVIDES_${PN} += "libdns_sd.so" +RPROVIDES:${PN} += "libdns_sd.so" SRC_URI = "https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ file://mdns.service \ @@ -83,13 +83,13 @@ do_install () { install -m 0644 ${WORKDIR}/mdns.service ${D}${systemd_unitdir}/system/ } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { sed -e '/^hosts:/s/\s*\<mdns\>//' \ -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 mdns\3\4\5/' \ -i $D/etc/nsswitch.conf } -pkg_prerm_${PN} () { +pkg_prerm:${PN} () { sed -e '/^hosts:/s/\s*\<mdns\>//' \ -e '/^hosts:/s/\s*mdns//' \ -i $D/etc/nsswitch.conf @@ -97,18 +97,18 @@ pkg_prerm_${PN} () { inherit systemd -SYSTEMD_SERVICE_${PN} = "mdns.service" +SYSTEMD_SERVICE:${PN} = "mdns.service" -FILES_${PN} += "${systemd_unitdir}/system/mdns.service" -FILES_${PN} += "${libdir}/libdns_sd.so.1 \ +FILES:${PN} += "${systemd_unitdir}/system/mdns.service" +FILES:${PN} += "${libdir}/libdns_sd.so.1 \ ${bindir}/dns-sd \ ${libdir}/libnss_mdns-0.2.so \ ${sysconfdir}/nss_mdns.conf" -FILES_${PN}-dev += "${libdir}/libdns_sd.so \ +FILES:${PN}-dev += "${libdir}/libdns_sd.so \ ${includedir}/dns_sd.h " -FILES_${PN}-man += "${mandir}/man8/mdnsd.8 \ +FILES:${PN}-man += "${mandir}/man8/mdnsd.8 \ ${mandir}/man5/nss_mdns.conf.5 \ ${mandir}/man8/libnss_mdns.8" diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb index ed7f8428b..5fa617094 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb @@ -6,7 +6,7 @@ LICENSE = "BSD & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=9d100a395a38584f2ec18a8275261687" DEPENDS = "openssl" -DEPENDS_append_class-target = " pciutils" +DEPENDS:append:class-target = " pciutils" SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://init \ @@ -62,7 +62,7 @@ EXTRA_OECONF = " \ " MIB_MODULES = "" -MIB_MODULES_append = " ${@bb.utils.filter('PACKAGECONFIG', 'smux', d)}" +MIB_MODULES:append = " ${@bb.utils.filter('PACKAGECONFIG', 'smux', d)}" CACHED_CONFIGUREVARS = " \ ac_cv_header_valgrind_valgrind_h=no \ @@ -74,15 +74,15 @@ CACHED_CONFIGUREVARS = " \ NETSNMP_CONFIGURE_OPTIONS= \ " PERLPROG = "${bindir}/env perl" -PERLPROG_class-native = "${bindir_native}/env perl" -PERLPROG_append = "${@bb.utils.contains('PACKAGECONFIG', 'perl', ' -I${WORKDIR}', '', d)}" +PERLPROG:class-native = "${bindir_native}/env perl" +PERLPROG:append = "${@bb.utils.contains('PACKAGECONFIG', 'perl', ' -I${WORKDIR}', '', d)}" export PERLPROG HAS_PERL = "${@bb.utils.contains('PACKAGECONFIG', 'perl', '1', '0', d)}" PTEST_BUILD_HOST_FILES += "net-snmp-config gen-variables" -do_configure_prepend() { +do_configure:prepend() { sed -i -e "s|I/usr/include|I${STAGING_INCDIR}|g" \ "${S}"/configure \ "${S}"/configure.d/config_os_libs2 @@ -103,14 +103,14 @@ do_configure_prepend() { } -do_configure_append() { +do_configure:append() { sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=${STAGING_DIR_TARGET}\$\{includedir\}@g" \ -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L${STAGING_DIR_TARGET}\$\{libdir\}@g" \ -e "s@^NSC_LDFLAGS=\"-L.* @NSC_LDFLAGS=\"-L${STAGING_DIR_TARGET}\$\{libdir\} @g" \ -i ${B}/net-snmp-config } -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/snmp install -d ${D}${sysconfdir}/init.d install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd @@ -132,6 +132,11 @@ do_install_append() { -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \ -i ${D}${bindir}/net-snmp-config + sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ + -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ + -i ${D}${libdir}/pkgconfig/netsnmp*.pc + # ${STAGING_DIR_HOST} is empty for native builds, and the sed command below # will result in errors if run for native. if [ "${STAGING_DIR_HOST}" ]; then @@ -197,83 +202,83 @@ PACKAGES += "${PN}-libs ${PN}-mibs ${PN}-server ${PN}-client \ # perl module PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'perl', '${PN}-perl-modules', '', d)}" -ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-server = "1" -ALLOW_EMPTY_${PN}-libs = "1" +ALLOW_EMPTY:${PN} = "1" +ALLOW_EMPTY:${PN}-server = "1" +ALLOW_EMPTY:${PN}-libs = "1" -FILES_${PN}-perl-modules = "${libdir}/perl?/*" -RDEPENDS_${PN}-perl-modules = "perl" +FILES:${PN}-perl-modules = "${libdir}/perl?/*" +RDEPENDS:${PN}-perl-modules = "perl" -FILES_${PN}-libs = "" -FILES_${PN}-mibs = "${datadir}/snmp/mibs" -FILES_${PN}-server-snmpd = "${sbindir}/snmpd \ +FILES:${PN}-libs = "" +FILES:${PN}-mibs = "${datadir}/snmp/mibs" +FILES:${PN}-server-snmpd = "${sbindir}/snmpd \ ${sysconfdir}/snmp/snmpd.conf \ ${sysconfdir}/init.d \ ${systemd_unitdir}/system/snmpd.service \ " -FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd \ +FILES:${PN}-server-snmptrapd = "${sbindir}/snmptrapd \ ${sysconfdir}/snmp/snmptrapd.conf \ ${systemd_unitdir}/system/snmptrapd.service \ " -FILES_${PN}-lib-netsnmp = "${libdir}/libnetsnmp${SOLIBS}" -FILES_${PN}-lib-agent = "${libdir}/libnetsnmpagent${SOLIBS}" -FILES_${PN}-lib-helpers = "${libdir}/libnetsnmphelpers${SOLIBS}" -FILES_${PN}-lib-mibs = "${libdir}/libnetsnmpmibs${SOLIBS}" -FILES_${PN}-lib-trapd = "${libdir}/libnetsnmptrapd${SOLIBS}" +FILES:${PN}-lib-netsnmp = "${libdir}/libnetsnmp${SOLIBS}" +FILES:${PN}-lib-agent = "${libdir}/libnetsnmpagent${SOLIBS}" +FILES:${PN}-lib-helpers = "${libdir}/libnetsnmphelpers${SOLIBS}" +FILES:${PN}-lib-mibs = "${libdir}/libnetsnmpmibs${SOLIBS}" +FILES:${PN}-lib-trapd = "${libdir}/libnetsnmptrapd${SOLIBS}" -FILES_${PN} = "" -FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/" -FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" -FILES_${PN}-dev += "${bindir}/mib2c \ +FILES:${PN} = "" +FILES:${PN}-client = "${bindir}/* ${datadir}/snmp/" +FILES:${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" +FILES:${PN}-dev += "${bindir}/mib2c \ ${bindir}/mib2c-update \ ${bindir}/net-snmp-config \ ${bindir}/net-snmp-create-v3-user \ " -CONFFILES_${PN}-server-snmpd = "${sysconfdir}/snmp/snmpd.conf" -CONFFILES_${PN}-server-snmptrapd = "${sysconfdir}/snmp/snmptrapd.conf" +CONFFILES:${PN}-server-snmpd = "${sysconfdir}/snmp/snmpd.conf" +CONFFILES:${PN}-server-snmptrapd = "${sysconfdir}/snmp/snmptrapd.conf" INITSCRIPT_PACKAGES = "${PN}-server-snmpd" -INITSCRIPT_NAME_${PN}-server-snmpd = "snmpd" -INITSCRIPT_PARAMS_${PN}-server-snmpd = "start 90 2 3 4 5 . stop 60 0 1 6 ." +INITSCRIPT_NAME:${PN}-server-snmpd = "snmpd" +INITSCRIPT_PARAMS:${PN}-server-snmpd = "start 90 2 3 4 5 . stop 60 0 1 6 ." SYSTEMD_PACKAGES = "${PN}-server-snmpd \ ${PN}-server-snmptrapd" -SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service" -SYSTEMD_SERVICE_${PN}-server-snmptrapd = "snmptrapd.service" +SYSTEMD_SERVICE:${PN}-server-snmpd = "snmpd.service" +SYSTEMD_SERVICE:${PN}-server-snmptrapd = "snmptrapd.service" -RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'net-snmp-perl-modules', '', d)}" -RDEPENDS_${PN} += "net-snmp-client" -RDEPENDS_${PN}-server-snmpd += "net-snmp-mibs" -RDEPENDS_${PN}-server-snmptrapd += "net-snmp-server-snmpd ${PN}-lib-trapd" -RDEPENDS_${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd" -RDEPENDS_${PN}-client += "net-snmp-mibs net-snmp-libs" -RDEPENDS_${PN}-libs += "libpci \ +RDEPENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'net-snmp-perl-modules', '', d)}" +RDEPENDS:${PN} += "net-snmp-client" +RDEPENDS:${PN}-server-snmpd += "net-snmp-mibs" +RDEPENDS:${PN}-server-snmptrapd += "net-snmp-server-snmpd ${PN}-lib-trapd" +RDEPENDS:${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd" +RDEPENDS:${PN}-client += "net-snmp-mibs net-snmp-libs" +RDEPENDS:${PN}-libs += "libpci \ ${PN}-lib-netsnmp \ ${PN}-lib-agent \ ${PN}-lib-helpers \ ${PN}-lib-mibs \ " -RDEPENDS_${PN}-ptest += "perl \ +RDEPENDS:${PN}-ptest += "perl \ perl-module-test \ perl-module-file-basename \ perl-module-getopt-long \ perl-module-file-temp \ perl-module-data-dumper \ " -RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})" -RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})" +RDEPENDS:${PN}-dev = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})" +RRECOMMENDS:${PN}-dbg = "net-snmp-client (= ${EXTENDPKGV}) net-snmp-server (= ${EXTENDPKGV})" -RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" -RREPLACES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" -RCONFLICTS_${PN}-server-snmpd += "${PN}-server-snmpd-systemd" +RPROVIDES:${PN}-server-snmpd += "${PN}-server-snmpd-systemd" +RREPLACES:${PN}-server-snmpd += "${PN}-server-snmpd-systemd" +RCONFLICTS:${PN}-server-snmpd += "${PN}-server-snmpd-systemd" -RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" -RREPLACES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" -RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" +RPROVIDES:${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" +RREPLACES:${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" +RCONFLICTS:${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" LEAD_SONAME = "libnetsnmp.so" diff --git a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc index cccbfa19a..1640911fd 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc +++ b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc @@ -27,11 +27,11 @@ S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig -do_configure_prepend() { +do_configure:prepend() { ./boot.sh } -do_install_append() { +do_install:append() { # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run } diff --git a/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index 9c0c28e19..6ce15a282 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -41,7 +41,7 @@ SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444 inherit autotools-brokensep pkgconfig systemd ptest -SYSTEMD_SERVICE_${PN} = "openl2tpd.service" +SYSTEMD_SERVICE:${PN} = "openl2tpd.service" SYSTEMD_AUTO_ENABLE = "disable" DEPENDS += "libtirpc" @@ -52,7 +52,7 @@ LDFLAGS += "-ltirpc" PARALLEL_MAKE = "" EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable" CPPFLAGS="${CPPFLAGS}" OPT_CFLAGS="${CFLAGS}"' -do_compile_prepend() { +do_compile:prepend() { sed -i -e "s:SYS_LIBDIR=.*:SYS_LIBDIR=${libdir}:g" \ -e 's:$(CROSS_COMPILE)as:${AS}:g' \ -e 's:$(CROSS_COMPILE)ld:${LD}:g' \ @@ -65,7 +65,7 @@ do_compile_prepend() { ${S}/Makefile } -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/default install -m 0755 ${S}/etc/rc.d/init.d/openl2tpd ${D}${sysconfdir}/init.d/openl2tpd @@ -91,4 +91,4 @@ do_install_ptest () { done } -RDEPENDS_${PN} = "ppp ppp-l2tp bash" +RDEPENDS:${PN} = "ppp ppp-l2tp bash" diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/lldp_head-remove-all-references.patch b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/lldp_head-remove-all-references.patch new file mode 100644 index 000000000..bb3400cfa --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/files/lldp_head-remove-all-references.patch @@ -0,0 +1,331 @@ +From ed6a8e5a75f56b7034a46294a0bf2a9a7fd14fbc Mon Sep 17 00:00:00 2001 +From: Aaron Conole <aconole@redhat.com> +Date: Fri, 23 Oct 2020 14:40:32 -0400 +Subject: [PATCH] lldp_head: remove all references + +There were a number of references missed during the module cleanup. This hits the remaining +ones. + +Fixes: 07a83c583b9d ("lldp_head: rename and make extern") +Signed-off-by: Aaron Conole <aconole@redhat.com> + +Reference to upstream patch: +https://github.com/intel/openlldp/commit/ed6a8e5a75f56b7034a46294a0bf2a9a7fd14fbc + +Signed-off-by: Li Wang <li.wang@windriver.com> +--- + ctrl_iface.c | 4 +--- + lldp_8021qaz.c | 11 +++++------ + lldp_8023.c | 6 ++---- + lldp_basman.c | 6 ++---- + lldp_evb.c | 6 ++---- + lldp_evb22.c | 6 ++---- + lldp_mand.c | 10 ++++------ + lldp_med.c | 6 ++---- + qbg_utils.c | 3 +-- + 9 files changed, 21 insertions(+), 37 deletions(-) + +diff --git a/ctrl_iface.c b/ctrl_iface.c +index 1734f49..666f7c8 100644 +--- a/ctrl_iface.c ++++ b/ctrl_iface.c +@@ -53,8 +53,6 @@ + #include "lldp_util.h" + #include "messages.h" + +-extern struct lldp_head lldp_head; +- + struct ctrl_dst { + struct ctrl_dst *next; + struct sockaddr_un addr; +@@ -116,7 +114,7 @@ int clif_iface_module(struct clif_data *clifd, + return cmd_invalid; + } + +- mod = find_module_by_id(&lldp_head, module_id); ++ mod = find_module_by_id(&lldp_mod_head, module_id); + if (mod && mod->ops && mod->ops->client_cmd) + return (mod->ops->client_cmd)(clifd, from, fromlen, + cmd_start, cmd_len, rbuf+strlen(rbuf), rlen); +diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c +index 16ae167..e747710 100644 +--- a/lldp_8021qaz.c ++++ b/lldp_8021qaz.c +@@ -48,7 +48,6 @@ + #include "lldp_dcbx.h" + + +-struct lldp_head lldp_head; + extern config_t lldpad_cfg; + extern bool read_only_8021qaz; + +@@ -84,7 +83,7 @@ static int ieee8021qaz_check_pending(struct port *port, + if (!port->portEnabled) + return 0; + +- iud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8021QAZ); ++ iud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8021QAZ); + if (iud) { + LIST_FOREACH(tlv, &iud->head, entry) { + if (!strncmp(port->ifname, tlv->ifname, IFNAMSIZ)) { +@@ -143,7 +142,7 @@ struct ieee8021qaz_tlvs *ieee8021qaz_data(const char *ifname) + struct ieee8021qaz_user_data *iud; + struct ieee8021qaz_tlvs *tlv = NULL; + +- iud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8021QAZ); ++ iud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8021QAZ); + if (iud) { + LIST_FOREACH(tlv, &iud->head, entry) { + if (!strncmp(tlv->ifname, ifname, IFNAMSIZ)) +@@ -629,7 +628,7 @@ void ieee8021qaz_ifup(char *ifname, struct lldp_agent *agent) + LIST_INIT(&tlvs->app_head); + read_cfg_file(port->ifname, agent, tlvs); + +- iud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8021QAZ); ++ iud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8021QAZ); + LIST_INSERT_HEAD(&iud->head, tlvs, entry); + + initialized: +@@ -2179,7 +2178,7 @@ int ieee8021qaz_tlvs_rxed(const char *ifname) + struct ieee8021qaz_user_data *iud; + struct ieee8021qaz_tlvs *tlv = NULL; + +- iud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8021QAZ); ++ iud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8021QAZ); + if (iud) { + LIST_FOREACH(tlv, &iud->head, entry) { + if (!strncmp(tlv->ifname, ifname, IFNAMSIZ)) +@@ -2198,7 +2197,7 @@ int ieee8021qaz_check_active(const char *ifname) + struct ieee8021qaz_user_data *iud; + struct ieee8021qaz_tlvs *tlv = NULL; + +- iud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8021QAZ); ++ iud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8021QAZ); + if (iud) { + LIST_FOREACH(tlv, &iud->head, entry) { + if (!strncmp(tlv->ifname, ifname, IFNAMSIZ)) +diff --git a/lldp_8023.c b/lldp_8023.c +index 422026e..8a03211 100644 +--- a/lldp_8023.c ++++ b/lldp_8023.c +@@ -39,8 +39,6 @@ + #include "lldp_8023_clif.h" + #include "lldp_8023_cmds.h" + +-extern struct lldp_head lldp_head; +- + struct tlv_info_8023_maccfg { + u8 oui[3]; + u8 sub; +@@ -84,7 +82,7 @@ static struct ieee8023_data *ieee8023_data(const char *ifname, enum agent_type t + struct ieee8023_user_data *ud; + struct ieee8023_data *bd = NULL; + +- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8023); ++ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8023); + if (ud) { + LIST_FOREACH(bd, &ud->head, entry) { + if (!strncmp(ifname, bd->ifname, IFNAMSIZ) && +@@ -456,7 +454,7 @@ void ieee8023_ifup(char *ifname, struct lldp_agent *agent) + goto out_err; + } + +- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_8023); ++ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_8023); + LIST_INSERT_HEAD(&ud->head, bd, entry); + LLDPAD_INFO("%s:port %s added\n", __func__, ifname); + return; +diff --git a/lldp_basman.c b/lldp_basman.c +index a4f69c1..614e2a2 100644 +--- a/lldp_basman.c ++++ b/lldp_basman.c +@@ -75,8 +75,6 @@ struct tlv_info_manaddr { + struct tlv_info_maoid o; + } __attribute__ ((__packed__)); + +-extern struct lldp_head lldp_head; +- + static const struct lldp_mod_ops basman_ops = { + .lldp_mod_register = basman_register, + .lldp_mod_unregister = basman_unregister, +@@ -91,7 +89,7 @@ static struct basman_data *basman_data(const char *ifname, enum agent_type type) + struct basman_user_data *bud; + struct basman_data *bd = NULL; + +- bud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_BASIC); ++ bud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_BASIC); + if (bud) { + LIST_FOREACH(bd, &bud->head, entry) { + if (!strncmp(ifname, bd->ifname, IFNAMSIZ) && +@@ -688,7 +686,7 @@ void basman_ifup(char *ifname, struct lldp_agent *agent) + goto out_err; + } + +- bud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_BASIC); ++ bud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_BASIC); + LIST_INSERT_HEAD(&bud->head, bd, entry); + LLDPAD_DBG("%s:port %s added\n", __func__, ifname); + return; +diff --git a/lldp_evb.c b/lldp_evb.c +index dcdcc7e..a8f3965 100644 +--- a/lldp_evb.c ++++ b/lldp_evb.c +@@ -36,14 +36,12 @@ + #include "messages.h" + #include "config.h" + +-extern struct lldp_head lldp_head; +- + struct evb_data *evb_data(char *ifname, enum agent_type type) + { + struct evb_user_data *ud; + struct evb_data *ed = NULL; + +- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_EVB); ++ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_EVB); + if (ud) { + LIST_FOREACH(ed, &ud->head, entry) { + if (!strncmp(ifname, ed->ifname, IFNAMSIZ) && +@@ -347,7 +345,7 @@ static void evb_ifup(char *ifname, struct lldp_agent *agent) + + evb_init_tlv(ed, agent); + +- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_EVB); ++ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_EVB); + LIST_INSERT_HEAD(&ud->head, ed, entry); + LLDPAD_DBG("%s:%s agent %d added\n", __func__, ifname, agent->type); + } +diff --git a/lldp_evb22.c b/lldp_evb22.c +index 76ba883..6e92d9d 100644 +--- a/lldp_evb22.c ++++ b/lldp_evb22.c +@@ -37,14 +37,12 @@ + #include "messages.h" + #include "config.h" + +-extern struct lldp_head lldp_head; +- + struct evb22_data *evb22_data(char *ifname, enum agent_type type) + { + struct evb22_user_data *ud; + struct evb22_data *ed = NULL; + +- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_EVB22); ++ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_EVB22); + if (ud) { + LIST_FOREACH(ed, &ud->head, entry) { + if (!strncmp(ifname, ed->ifname, IFNAMSIZ) && +@@ -453,7 +451,7 @@ static void evb22_ifup(char *ifname, struct lldp_agent *agent) + STRNCPY_TERMINATED(ed->ifname, ifname, IFNAMSIZ); + ed->agenttype = agent->type; + evb22_init_tlv(ed, agent); +- ud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_EVB22); ++ ud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_EVB22); + LIST_INSERT_HEAD(&ud->head, ed, entry); + LLDPAD_DBG("%s:%s agent %d added\n", __func__, ifname, agent->type); + } +diff --git a/lldp_mand.c b/lldp_mand.c +index 0db63cb..b857a88 100644 +--- a/lldp_mand.c ++++ b/lldp_mand.c +@@ -42,8 +42,6 @@ + #include "lldp/l2_packet.h" + #include "lldp_tlv.h" + +-extern struct lldp_head lldp_head; +- + static const struct lldp_mod_ops mand_ops = { + .lldp_mod_register = mand_register, + .lldp_mod_unregister = mand_unregister, +@@ -59,7 +57,7 @@ struct mand_data *mand_data(const char *ifname, enum agent_type type) + struct mand_user_data *mud; + struct mand_data *md = NULL; + +- mud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_MAND); ++ mud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_MAND); + if (mud) { + LIST_FOREACH(md, &mud->head, entry) { + if (!strncmp(ifname, md->ifname, IFNAMSIZ) && +@@ -608,7 +606,7 @@ void mand_ifup(char *ifname, struct lldp_agent *agent) + STRNCPY_TERMINATED(md->ifname, ifname, IFNAMSIZ); + md->agenttype = agent->type; + +- mud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_MAND); ++ mud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_MAND); + LIST_INSERT_HEAD(&mud->head, md, entry); + } + +@@ -636,7 +634,7 @@ struct lldp_module *mand_register(void) + LLDPAD_ERR("failed to malloc LLDP Mandatory module data\n"); + goto out_err; + } +- mud = malloc(sizeof(struct mand_user_data)); ++ mud = malloc(sizeof(struct mand_user_data)); + if (!mud) { + free(mod); + LLDPAD_ERR("failed to malloc LLDP Mandatory module user data\n"); +@@ -644,8 +642,8 @@ struct lldp_module *mand_register(void) + } + LIST_INIT(&mud->head); + mod->id = LLDP_MOD_MAND; ++ mod->data = mud; + mod->ops = &mand_ops; +- mod->data = mud; + LLDPAD_INFO("%s:done\n", __func__); + return mod; + out_err: +diff --git a/lldp_med.c b/lldp_med.c +index f6c373e..7b6996e 100644 +--- a/lldp_med.c ++++ b/lldp_med.c +@@ -40,8 +40,6 @@ + #include "lldp_mand_clif.h" + #include "lldp_med_cmds.h" + +-extern struct lldp_head lldp_head; +- + struct tlv_info_medcaps { + u8 oui[OUI_SIZE]; + u8 subtype; +@@ -95,7 +93,7 @@ static struct med_data *med_data(const char *ifname, enum agent_type type) + struct med_user_data *mud; + struct med_data *md = NULL; + +- mud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_MED); ++ mud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_MED); + if (mud) { + LIST_FOREACH(md, &mud->head, entry) { + if (!strncmp(ifname, md->ifname, IFNAMSIZ) && +@@ -914,7 +912,7 @@ void med_ifup(char *ifname, struct lldp_agent *agent) + free(md); + goto out_err; + } +- mud = find_module_user_data_by_id(&lldp_head, LLDP_MOD_MED); ++ mud = find_module_user_data_by_id(&lldp_mod_head, LLDP_MOD_MED); + LIST_INSERT_HEAD(&mud->head, md, entry); + LLDPAD_INFO("%s:port %s added\n", __func__, ifname); + return; +diff --git a/qbg_utils.c b/qbg_utils.c +index 9daeade..0d40c5b 100644 +--- a/qbg_utils.c ++++ b/qbg_utils.c +@@ -36,7 +36,6 @@ + #include "qbg_utils.h" + + extern int loglvl; /* Global lldpad log level */ +-extern struct lldp_head lldp_head; + + /* + * hexdump_frame - print raw evb/ecp/vdp frame +@@ -73,7 +72,7 @@ void hexdump_frame(const char *ifname, char *txt, const unsigned char *buf, + */ + int modules_notify(int id, int sender_id, char *ifname, void *data) + { +- struct lldp_module *mp = find_module_by_id(&lldp_head, id); ++ struct lldp_module *mp = find_module_by_id(&lldp_mod_head, id); + int rc = 0; + + if (mp && mp->ops->lldp_mod_notify) +-- +2.18.1 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb b/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb index d8a0d6913..abfa713dc 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.0.1.bb @@ -27,6 +27,7 @@ SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=master \ file://0007-lldp_8021qaz-extern-config-object.patch \ file://0008-stringops-fix-some-string-copy-errors.patch \ file://0009-8021qaz-mark-prio-map-functions-static.patch \ + file://lldp_head-remove-all-references.patch \ " # Makefile.am adds -Werror to AM_CFLAGS. There are warnings so disable it. @@ -35,9 +36,9 @@ TARGET_CFLAGS += "-Wno-error" # Enable install of systemd conf files. EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_system_unitdir}', '', d)}" -SYSTEMD_SERVICE_${PN} = "lldpad.service lldpad.socket" +SYSTEMD_SERVICE:${PN} = "lldpad.service lldpad.socket" # To enable service at boot set to enable in local.conf. SYSTEMD_AUTO_ENABLE ?= "disable" -RRECOMMENDS_${PN} = "iproute2-tc" +RRECOMMENDS:${PN} = "iproute2-tc" diff --git a/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb b/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb index 53a79af76..71046ce24 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.10.0.bb @@ -29,4 +29,4 @@ do_install() { install -m 644 ${WORKDIR}/options.pptp ${D}${sysconfdir}/ppp } -RDEPENDS_${PN} = "ppp" +RDEPENDS:${PN} = "ppp" diff --git a/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc b/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc index 3b7a425bb..b3574a7ff 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc @@ -18,7 +18,7 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" SNMP_CONF="${@bb.utils.contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" # the "ip" command from busybox is not sufficient (flush by protocol flushes all routes) -RDEPENDS_${PN} += "iproute2" +RDEPENDS:${PN} += "iproute2" SRC_URI = "https://github.com/Quagga/quagga/releases/download/quagga-${PV}/quagga-${PV}.tar.gz \ file://quagga.init \ @@ -45,13 +45,13 @@ inherit autotools update-rc.d useradd systemd pkgconfig multilib_header update-a CFLAGS += "-fcommon" SYSTEMD_PACKAGES = "${PN} ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" -SYSTEMD_SERVICE_${PN}-bgpd = "bgpd.service" -SYSTEMD_SERVICE_${PN}-isisd = "isisd.service" -SYSTEMD_SERVICE_${PN}-ospf6d = "ospf6d.service" -SYSTEMD_SERVICE_${PN}-ospfd = "ospfd.service" -SYSTEMD_SERVICE_${PN}-ripd = "ripd.service" -SYSTEMD_SERVICE_${PN}-ripngd = "ripngd.service" -SYSTEMD_SERVICE_${PN} = "zebra.service" +SYSTEMD_SERVICE:${PN}-bgpd = "bgpd.service" +SYSTEMD_SERVICE:${PN}-isisd = "isisd.service" +SYSTEMD_SERVICE:${PN}-ospf6d = "ospf6d.service" +SYSTEMD_SERVICE:${PN}-ospfd = "ospfd.service" +SYSTEMD_SERVICE:${PN}-ripd = "ripd.service" +SYSTEMD_SERVICE:${PN}-ripngd = "ripngd.service" +SYSTEMD_SERVICE:${PN} = "zebra.service" EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \ --localstatedir=${localstatedir}/run/quagga \ @@ -144,8 +144,8 @@ do_install () { -i ${D}${systemd_unitdir}/system/*.service } -DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}" -pkg_postinst_${PN} () { +DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-systemctl-native', '', d)}" +pkg_postinst:${PN} () { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd sysvinit', 'true', 'false', d)}; then if [ -n "$D" ]; then OPTS="--root=$D" @@ -159,22 +159,22 @@ PACKAGE_BEFORE_PN = "${PN}-ospfd ${PN}-ospf6d ${PN}-bgpd \ ${PN}-ripd ${PN}-ripngd ${PN}-isisd \ ${PN}-ospfclient ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}" -RDEPENDS_${PN} += "${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" +RDEPENDS:${PN} += "${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" -FILES_${PN}-ospfd = "${sbindir}/ospfd ${libdir}/libospf.so.*" -FILES_${PN}-ospf6d = "${sbindir}/ospf6d" -FILES_${PN}-bgpd = "${sbindir}/bgpd" -FILES_${PN}-ripd = "${sbindir}/ripd" -FILES_${PN}-ripngd = "${sbindir}/ripngd" -FILES_${PN}-isisd = "${sbindir}/isisd" -FILES_${PN}-ospfclient = "${sbindir}/ospfclient ${libdir}/libospfapiclient.so.*" -FILES_${PN}-watchquagga = "${sbindir}/watchquagga ${sysconfdir}/default/watchquagga \ +FILES:${PN}-ospfd = "${sbindir}/ospfd ${libdir}/libospf.so.*" +FILES:${PN}-ospf6d = "${sbindir}/ospf6d" +FILES:${PN}-bgpd = "${sbindir}/bgpd" +FILES:${PN}-ripd = "${sbindir}/ripd" +FILES:${PN}-ripngd = "${sbindir}/ripngd" +FILES:${PN}-isisd = "${sbindir}/isisd" +FILES:${PN}-ospfclient = "${sbindir}/ospfclient ${libdir}/libospfapiclient.so.*" +FILES:${PN}-watchquagga = "${sbindir}/watchquagga ${sysconfdir}/default/watchquagga \ ${sysconfdir}/init.d/watchquagga" -FILES_${PN} += "${nonarch_libdir}/tmpfiles.d/*.conf" +FILES:${PN} += "${nonarch_libdir}/tmpfiles.d/*.conf" # Indicate that the default files are configuration files -CONFFILES_${PN} = "${sysconfdir}/default/quagga \ +CONFFILES:${PN} = "${sysconfdir}/default/quagga \ ${sysconfdir}/quagga/bgpd.conf \ ${sysconfdir}/quagga/vtysh.conf \ ${sysconfdir}/quagga/isisd.conf \ @@ -184,60 +184,60 @@ CONFFILES_${PN} = "${sysconfdir}/default/quagga \ ${sysconfdir}/quagga/ripd.conf \ ${sysconfdir}/quagga/ospf6d.conf \ " -CONFFILES_${PN}-watchquagga = "${sysconfdir}/default/watchquagga" +CONFFILES:${PN}-watchquagga = "${sysconfdir}/default/watchquagga" # Stop the names being rewritten due to the internal shared libraries -DEBIAN_NOAUTONAME_${PN}-ospfd = "1" -DEBIAN_NOAUTONAME_${PN}-ospfclient = "1" +DEBIAN_NOAUTONAME:${PN}-ospfd = "1" +DEBIAN_NOAUTONAME:${PN}-ospfclient = "1" # Main init script starts all deamons # Seperate init script for watchquagga INITSCRIPT_PACKAGES = "${PN} ${PN}-watchquagga" -INITSCRIPT_NAME_${PN} = "quagga" -INITSCRIPT_PARAMS_${PN} = "defaults 15 85" -INITSCRIPT_NAME_${PN}-watchquagga = "watchquagga" -INITSCRIPT_PARAMS_${PN}-watchquagga = "defaults 90 10" +INITSCRIPT_NAME:${PN} = "quagga" +INITSCRIPT_PARAMS:${PN} = "defaults 15 85" +INITSCRIPT_NAME:${PN}-watchquagga = "watchquagga" +INITSCRIPT_PARAMS:${PN}-watchquagga = "defaults 90 10" # Add quagga's user and group USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system quagga ; --system quaggavty" -USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/quagga/ -M -g quagga -G quaggavty --shell /bin/false quagga" +GROUPADD_PARAM:${PN} = "--system quagga ; --system quaggavty" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/quagga/ -M -g quagga -G quaggavty --shell /bin/false quagga" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then ${sysconfdir}/init.d/populate-volatile.sh update fi } # Stop apps before uninstall -pkg_prerm_${PN} () { +pkg_prerm:${PN} () { ${sysconfdir}/init.d/quagga stop } -pkg_prerm_${PN}-ospfd () { +pkg_prerm:${PN}-ospfd () { ${sysconfdir}/init.d/quagga stop ospfd } -pkg_prerm_${PN}-ospf6d () { +pkg_prerm:${PN}-ospf6d () { ${sysconfdir}/init.d/quagga stop ospf6d } -pkg_prerm_${PN}-bgpd () { +pkg_prerm:${PN}-bgpd () { ${sysconfdir}/init.d/quagga stop bgpd } -pkg_prerm_${PN}-ripd () { +pkg_prerm:${PN}-ripd () { ${sysconfdir}/init.d/quagga stop ripd } -pkg_prerm_${PN}-ripngd () { +pkg_prerm:${PN}-ripngd () { ${sysconfdir}/init.d/quagga stop ripngd } -pkg_prerm_${PN}-isisd () { +pkg_prerm:${PN}-isisd () { ${sysconfdir}/init.d/quagga stop isisd } -ALTERNATIVE_${PN} = "pimd" +ALTERNATIVE:${PN} = "pimd" ALTERNATIVE_LINK_NAME[pimd] = "${sbindir}/pimd" diff --git a/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb b/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb index ea3775452..4696c3bae 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb @@ -21,11 +21,11 @@ DEPENDS += "virtual/crypt" EXTRA_OECONF += "--disable-static" -do_configure_prepend () { +do_configure:prepend () { export CONFIG_SITE=./config-site.${P} } -do_compile_prepend() { +do_compile:prepend() { for m in `find . -name "Makefile"` ; do sed -i -e 's:^program_transform_name =.*:program_transform_name =:g' ${m} done diff --git a/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb index 492ade5ae..344aa33de 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.13.bb @@ -26,7 +26,7 @@ SRC_URI[sha256sum] = "8cd6bc71ba46bd5f6eb4daf60220ccdcd991a8525111dee466501b1b97 inherit autotools-brokensep update-rc.d systemd -do_install_append() { +do_install:append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service @@ -48,29 +48,29 @@ do_install() { } SYSTEMD_PACKAGES = "${PN}-server" -SYSTEMD_SERVICE_${PN}-server = "pppoe-server.service" +SYSTEMD_SERVICE:${PN}-server = "pppoe-server.service" SYSTEMD_AUTO_ENABLE = "disable" # Insert server package before main package PACKAGES = "${PN}-dbg ${PN}-server ${PN}-relay ${PN}-sniff ${PN} ${PN}-doc" -FILES_${PN}-server = "${sysconfdir}/default/pppoe-server \ +FILES:${PN}-server = "${sysconfdir}/default/pppoe-server \ ${sysconfdir}/init.d/pppoe-server \ ${sbindir}/pppoe-server \ ${sysconfdir}/ppp/pppoe-server-options" -FILES_${PN}-relay = "${sbindir}/pppoe-relay" -FILES_${PN}-sniff = "${sbindir}/pppoe-sniff" +FILES:${PN}-relay = "${sbindir}/pppoe-relay" +FILES:${PN}-sniff = "${sbindir}/pppoe-sniff" -CONFFILES_${PN} = "${sysconfdir}/ppp/pppoe.conf \ +CONFFILES:${PN} = "${sysconfdir}/ppp/pppoe.conf \ ${sysconfdir}/ppp/firewall-standalone \ ${sysconfdir}/ppp/firewall-masq" -CONFFILES_${PN}-server = "${sysconfdir}/ppp/pppoe-server-options \ +CONFFILES:${PN}-server = "${sysconfdir}/ppp/pppoe-server-options \ ${sysconfdir}/default/pppoe-server" INITSCRIPT_PACKAGES = "${PN}-server" -INITSCRIPT_NAME_${PN}-server = "pppoe-server" -INITSCRIPT_PARAMS_${PN}-server = "defaults 92 8" +INITSCRIPT_NAME:${PN}-server = "pppoe-server" +INITSCRIPT_PARAMS:${PN}-server = "defaults 92 8" -RDEPENDS_${PN} = "ppp" -RDEPENDS_${PN}-server = "${PN}" -RRECOMMENDS_${PN} = "ppp-oe" +RDEPENDS:${PN} = "ppp" +RDEPENDS:${PN}-server = "${PN}" +RRECOMMENDS:${PN} = "ppp-oe" diff --git a/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb b/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb index 725ba189c..09699f332 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb @@ -18,14 +18,14 @@ SRC_URI[sha256sum] = "849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863 inherit autotools-brokensep -LIBS_append_libc-musl = " -lssp_nonshared" -LIBS_append_libc-glibc = " -lc_nonshared" +LIBS:append:libc-musl = " -lssp_nonshared" +LIBS:append:libc-glibc = " -lc_nonshared" S = "${WORKDIR}/tsocks-1.8" -FILES_${PN} = "${libdir}/* ${bindir}/tsocks" -FILES_${PN}-dev = "" -INSANE_SKIP_${PN} = "dev-so" +FILES:${PN} = "${libdir}/* ${bindir}/tsocks" +FILES:${PN}-dev = "" +INSANE_SKIP:${PN} = "dev-so" EXTRA_OEMAKE = "SHCC='${CC} -fPIC ${LDFLAGS}' LIBS='${LIBS}'" diff --git a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb index b02e183db..52f5ef275 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/xl2tpd/xl2tpd_1.3.14.bb @@ -34,7 +34,7 @@ do_install () { install -m 0644 debian/xl2tpd.default ${D}${sysconfdir}/default/xl2tpd } -CONFFILES_${PN} += "${sysconfdir}/xl2tpd.conf ${sysconfdir}/default/xl2tpd" +CONFFILES:${PN} += "${sysconfdir}/xl2tpd.conf ${sysconfdir}/default/xl2tpd" INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "xl2tpd" +INITSCRIPT_NAME:${PN} = "xl2tpd" diff --git a/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb b/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb index 60f3dc9b2..676d2e567 100644 --- a/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb +++ b/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://sourceforge.net/projects/${BPN}" SECTION = "admin" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -RRECOMMENDS_${PN} = "kernel-module-aoe" +RRECOMMENDS:${PN} = "kernel-module-aoe" SRC_URI = "http://sourceforge.net/projects/${BPN}/files/${BPN}/${BPN}-${PV}.tar.gz \ file://aoe-stat-no-bashism.patch \ diff --git a/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb index 5afec7663..33e4e13ac 100644 --- a/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb @@ -15,7 +15,7 @@ SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} = "arptables.service" +SYSTEMD_SERVICE:${PN} = "arptables.service" inherit systemd @@ -29,7 +29,7 @@ do_install() { fi } -RDEPENDS_${PN} += "perl" +RDEPENDS:${PN} += "perl" # the install target is not multi-job safe, but it doesn't do much # so we just install serially diff --git a/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb b/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb index cf7185864..b8975dec0 100644 --- a/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb +++ b/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb @@ -20,16 +20,16 @@ DEPENDS = "sysfsutils" inherit autotools-brokensep update-alternatives -ALTERNATIVE_${PN} = "brctl" +ALTERNATIVE:${PN} = "brctl" ALTERNATIVE_PRIORITY[brctl] = "100" ALTERNATIVE_LINK_NAME[brctl] = "${sbindir}/brctl" EXTRA_OECONF = "--with-linux-headers=${STAGING_INCDIR}" -do_install_append () { +do_install:append () { install -d ${D}/${datadir}/bridge-utils install -d ${D}/${sysconfdir}/network/if-pre-up.d install -d ${D}/${sysconfdir}/network/if-post-down.d } -RRECOMMENDS_${PN} = "kernel-module-bridge" +RRECOMMENDS:${PN} = "kernel-module-bridge" diff --git a/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb b/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb index c3e4cbbe6..62682cfce 100644 --- a/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb @@ -25,7 +25,7 @@ S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep -PACKAGECONFIG_class-native = "" +PACKAGECONFIG:class-native = "" PACKAGECONFIG ??= "" PACKAGECONFIG[ogg] = "--enable-tools,--disable-tools,libogg," diff --git a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.1.bb b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.1.bb index 0262a6e8d..6a450c3e8 100644 --- a/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/chrony/chrony_4.1.bb @@ -36,7 +36,7 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ file://arm_eabi.patch \ " -SRC_URI_append_libc-musl = " \ +SRC_URI:append:libc-musl = " \ file://0001-Fix-compilation-with-musl.patch \ " SRC_URI[sha256sum] = "ed76f2d3f9347ac6221a91ad4bd553dd0565ac188cd7490d0801d08f7171164c" @@ -119,20 +119,20 @@ do_install() { sed -i 's!^EnvironmentFile=.*!EnvironmentFile=-${sysconfdir}/default/chronyd!' ${D}${systemd_unitdir}/system/chronyd.service } -FILES_${PN} = "${sbindir}/chronyd ${sysconfdir} ${localstatedir}/lib/chrony ${localstatedir}" -CONFFILES_${PN} = "${sysconfdir}/chrony.conf" +FILES:${PN} = "${sbindir}/chronyd ${sysconfdir} ${localstatedir}/lib/chrony ${localstatedir}" +CONFFILES:${PN} = "${sysconfdir}/chrony.conf" INITSCRIPT_NAME = "chronyd" INITSCRIPT_PARAMS = "defaults" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "chronyd.service" +SYSTEMD_SERVICE:${PN} = "chronyd.service" # It's probably a bad idea to run chrony and another time daemon on # the same system. systemd includes the SNTP client 'timesyncd', which # will be disabled by chronyd.service, however it will remain on the rootfs -# wasting 150 kB unless you put 'PACKAGECONFIG_remove_pn-systemd = "timesyncd"' +# wasting 150 kB unless you put 'PACKAGECONFIG:remove:pn-systemd = "timesyncd"' # in a conf file or bbappend somewhere. -RCONFLICTS_${PN} = "ntp ntimed" +RCONFLICTS:${PN} = "ntp ntimed" # Separate the client program into its own package PACKAGES =+ "chronyc" -FILES_chronyc = "${bindir}/chronyc" +FILES:chronyc = "${bindir}/chronyc" diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb index bf8b18043..54aa3ce19 100644 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb +++ b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb @@ -12,9 +12,9 @@ DEPENDS += "libtalloc" PACKAGECONFIG ??= "" PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" -# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install_append is needed +# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install:append is needed PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils" -# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install_append is needed +# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install:append is needed PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 libtalloc keyutils" PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samba" PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" @@ -22,7 +22,7 @@ PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disab inherit autotools pkgconfig -do_configure_prepend() { +do_configure:prepend() { # want installed to /usr/sbin rather than /sbin to be DISTRO_FEATURES usrmerge compliant # must override ROOTSBINDIR (default '/sbin'), # setting --exec-prefix or --prefix in EXTRA_OECONF does not work @@ -31,7 +31,7 @@ do_configure_prepend() { fi } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then # Remove empty /usr/bin and /usr/sbin directories since the mount helper # is installed to /sbin @@ -39,6 +39,6 @@ do_install_append() { fi } -FILES_${PN} += "${base_libdir}/security" -FILES_${PN}-dbg += "${base_libdir}/security/.debug" -RRECOMMENDS_${PN} = "kernel-module-cifs" +FILES:${PN} += "${base_libdir}/security" +FILES:${PN}-dbg += "${base_libdir}/security/.debug" +RRECOMMENDS:${PN} = "kernel-module-cifs" diff --git a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb index 4ecaabd7e..62daf3279 100644 --- a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-docs_2.40.0.bb @@ -16,5 +16,5 @@ do_install() { cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/doc/cim-schema-${PV}-docs } -FILES_${PN} = "${datadir}/doc/*" -FILES_${PN}-doc = "" +FILES:${PN} = "${datadir}/doc/*" +FILES:${PN}-doc = "" diff --git a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb index 90ea882b7..7d51bc1c9 100644 --- a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.50.0.bb @@ -2,7 +2,7 @@ require cim-schema.inc LICENSE = "DMTF" -RCONFLICTS_${PN} = "cim-schema-final" +RCONFLICTS:${PN} = "cim-schema-final" SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2500/cim_schema_${PV}Experimental-MOFs.zip;subdir=${BPN}-${PV} \ file://LICENSE \ @@ -25,5 +25,5 @@ do_install() { ln -s cim_schema_${PV}.mof ${D}${datadir}/mof/cim-current/CIM_Schema.mof } -FILES_${PN} = "${datadir}/mof/* ${datadir}/doc/*" -FILES_${PN}-doc = "" +FILES:${PN} = "${datadir}/mof/* ${datadir}/doc/*" +FILES:${PN}-doc = "" diff --git a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb index 67d1db222..32bd8acbb 100644 --- a/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb @@ -2,7 +2,7 @@ require cim-schema.inc LICENSE = "DMTF" -RCONFLICTS_${PN} = "cim-schema-exper" +RCONFLICTS:${PN} = "cim-schema-exper" SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_${PV}Final-MOFs.zip;subdir=${BP} \ file://LICENSE \ @@ -25,5 +25,5 @@ do_install() { ln -s cim_schema_${PV}.mof ${D}${datadir}/mof/cim-current/CIM_Schema.mof } -FILES_${PN} = "${datadir}/mof/* ${datadir}/doc/*" -FILES_${PN}-doc = "" +FILES:${PN} = "${datadir}/mof/* ${datadir}/doc/*" +FILES:${PN}-doc = "" diff --git a/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb index 799cf8611..6ce52d717 100644 --- a/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=fd0c9adf285a69aa3b4faf34384e1029" DEPENDS = "curl" -DEPENDS_class-native = "curl-native" +DEPENDS:class-native = "curl-native" SRC_URI = "git://github.com/jpbarrette/curlpp.git" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index 33678e234..cd51c07dc 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -37,7 +37,7 @@ EXTRA_OEMAKE = "\ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'file://dnsmasq.resolvconf file://99_dnsmasq file://dnsmasq-resolvconf-helper', '', d)}" -do_compile_append() { +do_compile:append() { # build dhcp_release cd ${S}/contrib/lease-tools oe_runmake @@ -78,9 +78,9 @@ do_install () { fi } -CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf" +CONFFILES:${PN} = "${sysconfdir}/dnsmasq.conf" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "dnsmasq.service" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "dnsmasq.service" diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb index 26b4f5ee8..464f62250 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb @@ -50,10 +50,10 @@ EXTRA_OECONF = " --with-ioloop=epoll \ LTO = "" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "dovecot.service dovecot.socket" +SYSTEMD_SERVICE:${PN} = "dovecot.service dovecot.socket" SYSTEMD_AUTO_ENABLE = "disable" -do_install_append () { +do_install:append () { install -d 755 ${D}/etc/dovecot touch 644 ${D}/etc/dovecot/dovecot.conf install -m 0644 ${WORKDIR}/dovecot.service ${D}${systemd_unitdir}/system @@ -62,16 +62,16 @@ do_install_append () { } USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovecot dovecot; \ +USERADD_PARAM:${PN} = "-r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovecot dovecot; \ -r -d ${libexecdir} -M -s ${base_sbindir}/nologin -g dovenull dovenull" -GROUPADD_PARAM_${PN} = "-f -r dovecot;-f -r dovenull" +GROUPADD_PARAM:${PN} = "-f -r dovecot;-f -r dovenull" -FILES_${PN} += "${libdir}/dovecot/*plugin.so \ +FILES:${PN} += "${libdir}/dovecot/*plugin.so \ ${libdir}/dovecot/libfs_compress.so \ ${libdir}/dovecot/libssl_iostream_openssl.so" -FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" -FILES_${PN}-dev += "${libdir}/dovecot/libdovecot*.so" -FILES_${PN}-dbg += "${libdir}/dovecot/*/.debug" +FILES:${PN}-staticdev += "${libdir}/dovecot/*/*.a" +FILES:${PN}-dev += "${libdir}/dovecot/libdovecot*.so" +FILES:${PN}-dbg += "${libdir}/dovecot/*/.debug" # CVE-2016-4983 affects only postinstall script on specific distribution CVE_CHECK_WHITELIST += "CVE-2016-4983" diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb index 5b0979f96..ceb40185f 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.13.1.bb @@ -22,7 +22,7 @@ S = "${WORKDIR}/git" UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases" -SYSTEMD_SERVICE_${PN} = "drbd.service" +SYSTEMD_SERVICE:${PN} = "drbd.service" SYSTEMD_AUTO_ENABLE = "disable" DEPENDS = "flex-native" @@ -43,20 +43,20 @@ EXTRA_OECONF = " \ # If we have inherited reproducible_build, we want to use it. export WANT_DRBD_REPRODUCIBLE_BUILD = "yes" -do_install_append() { +do_install:append() { # don't install empty /var/lock and /var/run to avoid conflict with base-files rm -rf ${D}${localstatedir}/lock rm -rf ${D}${localstatedir}/run } -RDEPENDS_${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" +RDEPENDS:${PN} += "bash perl-module-getopt-long perl-module-exporter perl-module-constant perl-module-overloading perl-module-exporter-heavy" # The drbd items are explicitly put under /lib when installed. # -FILES_${PN} += "/run" -FILES_${PN} += "${nonarch_base_libdir}/drbd \ +FILES:${PN} += "/run" +FILES:${PN} += "${nonarch_base_libdir}/drbd \ ${nonarch_libdir}/drbd \ ${nonarch_libdir}/tmpfiles.d" -FILES_${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" +FILES:${PN}-dbg += "${nonarch_base_libdir}/drbd/.debug" CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb b/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb index 972d5aa73..110399a36 100644 --- a/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb @@ -18,9 +18,9 @@ EXTRA_OECONF = "--with-libesmtp=${STAGING_EXECPREFIXDIR}" inherit autotools update-alternatives -ALTERNATIVE_${PN} = "sendmail mailq newaliases" +ALTERNATIVE:${PN} = "sendmail mailq newaliases" # /usr/lib/sendmial is required by LSB core test -ALTERNATIVE_${PN}_linuxstdbase = "sendmail mailq newaliases usr-lib-sendmail" +ALTERNATIVE:${PN}:linuxstdbase = "sendmail mailq newaliases usr-lib-sendmail" ALTERNATIVE_TARGET[mailq] = "${bindir}/mailq" ALTERNATIVE_TARGET[newaliases] = "${bindir}/newaliases" ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" @@ -30,7 +30,7 @@ ALTERNATIVE_TARGET[usr-lib-sendmail] = "${bindir}/esmtp" ALTERNATIVE_PRIORITY = "10" -ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" +ALTERNATIVE:${PN}-doc += "mailq.1 newaliases.1 sendmail.1" ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1" @@ -38,9 +38,9 @@ ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1" SRC_URI[md5sum] = "79a9c1f9023d53f35bb82bf446150a72" SRC_URI[sha256sum] = "a0d26931bf731f97514da266d079d8bc7d73c65b3499ed080576ab606b21c0ce" -do_install_append() { +do_install:append() { # only one file /usr/lib/sendmail in ${D}${libdir} rm -rf ${D}${libdir} } -FILES_${PN} += "${libdir}/" +FILES:${PN} += "${libdir}/" diff --git a/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb b/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb index c641c265e..9ebed2a14 100644 --- a/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/ettercap/ettercap_0.8.3.1.bb @@ -17,7 +17,7 @@ DEPENDS += "ethtool \ flex-native \ " -RDEPENDS_${PN} += "bash ethtool libgcc" +RDEPENDS:${PN} += "bash ethtool libgcc" SRC_URI = "gitsm://github.com/Ettercap/ettercap" @@ -36,7 +36,7 @@ EXTRA_OECMAKE = " \ # configuration file installed by the package. # It ensures that all characters are properly decoded and avoids # any fatal errors while running in text mode (-T). -do_install_append() { +do_install:append() { sed -i 's@utf8_encoding.*@utf8_encoding = "UTF-8"@g' \ ${D}/etc/ettercap/etter.conf } diff --git a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.19.bb b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.20.bb index aead5e9f0..13d91b4d5 100644 --- a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.19.bb +++ b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.20.bb @@ -12,11 +12,11 @@ DEPENDS = "openssl" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "cd8d11a3d103e50caa2ec64bcda6307eb3d0783a4d4dfd88e668b81aaf9d6b5f" +SRC_URI[sha256sum] = "c82141ae2e8f0039ceb0c5c2eda43c5e93ad0bf7f9c6bb628092b3be74386176" inherit autotools gettext python3-dir python3native EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" PACKAGES =+ "fetchmail-python" -FILES_fetchmail-python = "${libdir}/${PYTHON_DIR}/*" +FILES:fetchmail-python = "${libdir}/${PYTHON_DIR}/*" diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb index c3681f925..2dfd8d5d4 100644 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb @@ -30,8 +30,8 @@ do_configure () { PACKAGES =+ "${PN}-client ${PN}-daemon" -FILES_${PN}-client = "${bindir}/fwknop" -FILES_${PN}-daemon = "${sbindir}/fwknopd \ +FILES:${PN}-client = "${bindir}/fwknop" +FILES:${PN}-daemon = "${sbindir}/fwknopd \ ${sysconfdir}/fwknop/access.conf \ ${sysconfdir}/fwknop/fwknopd.conf" diff --git a/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb b/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb index 944c00576..1ee04bd47 100644 --- a/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb +++ b/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb @@ -31,5 +31,5 @@ do_install_ptest () { install ${S}/t/data/* ${D}${PTEST_PATH}/t/data } -FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/Geo/IP/.debug" +FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/Geo/IP/.debug" diff --git a/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.12.bb b/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.12.bb index 143100e48..775398474 100644 --- a/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.12.bb +++ b/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.12.bb @@ -54,12 +54,12 @@ do_install() { } PACKAGES =+ "${PN}-database" -FILES_${PN}-database = "" -FILES_${PN}-database += "${datadir}/GeoIP/*" +FILES:${PN}-database = "" +FILES:${PN}-database += "${datadir}/GeoIP/*" # We cannot do much looking up without databases. # -RDEPENDS_${PN} += "${PN}-database" +RDEPENDS:${PN} += "${PN}-database" inherit ptest diff --git a/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb b/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb index f4eb2b799..9494bd36c 100644 --- a/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.5.0.bb @@ -18,14 +18,14 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "\ file://ChangeLog.md;md5=11d2e31df0de2be3ccc3e2286c4dafcb \ " -FILES_${PN} = "/usr/share/GeoIP \ +FILES:${PN} = "/usr/share/GeoIP \ /etc/GeoIP.conf \ /etc/cron.d/geoipupdate.cron \ /usr/bin/geoipupdate \ " inherit autotools -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir} install -d ${D}/${sysconfdir}/cron.d install ${WORKDIR}/GeoIP.conf ${D}/${sysconfdir}/ diff --git a/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.12.bb b/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.12.bb index db2d3a964..025482330 100644 --- a/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.12.bb +++ b/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.12.bb @@ -19,4 +19,4 @@ do_install() { install -m 0755 -D ${S}/debian/ifenslave.if-up ${D}${sysconfdir}/network/if-up.d/ifenslave } -FILES_${PN}-doc_remove = "${mandir}" +FILES:${PN}-doc:remove = "${mandir}" diff --git a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb index 71c5d940b..ed2a5d904 100644 --- a/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb +++ b/meta-openembedded/meta-networking/recipes-support/libesmtp/libesmtp_1.0.6.bb @@ -30,9 +30,9 @@ EXTRA_OECONF = " \ --disable-static \ " -FILES_${PN} = "${libdir}/lib*${SOLIBS} \ +FILES:${PN} = "${libdir}/lib*${SOLIBS} \ ${libdir}/esmtp-plugins/*${SOLIBSDEV}" -FILES_${PN}-dev += "${libdir}/esmtp-plugins/*.la" -FILES_${PN}-static += "${libdir}/esmtp-plugins/*.a" -FILES_${PN}-dbg += "${libdir}/esmtp-plugins/.debug/" +FILES:${PN}-dev += "${libdir}/esmtp-plugins/*.la" +FILES:${PN}-static += "${libdir}/esmtp-plugins/*.a" +FILES:${PN}-dbg += "${libdir}/esmtp-plugins/.debug/" diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb index 3731c260b..719353058 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" DEPENDS += "libtdb libtalloc libtevent popt" -RDEPENDS_pyldb += "python3" +RDEPENDS:pyldb += "python3" SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ file://0001-do-not-import-target-module-while-cross-compile.patch \ @@ -55,15 +55,15 @@ PACKAGES =+ "pyldb pyldb-dbg pyldb-dev" NOAUTOPACKAGEDEBUG = "1" -FILES_${PN} += "${libdir}/ldb/*" -FILES_${PN}-dbg += "${bindir}/.debug/* \ +FILES:${PN} += "${libdir}/ldb/*" +FILES:${PN}-dbg += "${bindir}/.debug/* \ ${libdir}/.debug/* \ ${libdir}/ldb/.debug/* \ ${libdir}/ldb/modules/ldb/.debug/*" -FILES_pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ +FILES:pyldb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ ${libdir}/libpyldb-util.*.so.* \ " -FILES_pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ +FILES:pyldb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug \ ${libdir}/.debug/libpyldb-util.*.so.*" -FILES_pyldb-dev = "${libdir}/libpyldb-util.*.so" +FILES:pyldb-dev = "${libdir}/libpyldb-util.*.so" diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.2.bb b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.3.bb index ae92de2db..e6e2066a5 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.3.3.bb @@ -3,14 +3,14 @@ HOMEPAGE = "http://talloc.samba.org" SECTION = "libs" LICENSE = "LGPL-3.0+ & GPL-3.0+" LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6d5228bfa7825249 \ - file://pytalloc.h;beginline=1;endline=18;md5=2c498cc6f2263672483237b20f46b43d" + file://pytalloc.h;beginline=1;endline=18;md5=21ab13bd853679d7d47a1739cb3b7db6 \ + " SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ file://options-2.2.0.patch \ " -SRC_URI[md5sum] = "3376a86bdf9dd4abc6b8d8d645390902" -SRC_URI[sha256sum] = "27a03ef99e384d779124df755deb229cd1761f945eca6d200e8cfd9bf5297bd7" +SRC_URI[sha256sum] = "6be95b2368bd0af1c4cd7a88146eb6ceea18e46c3ffc9330bf6262b40d1d8aaa" inherit waf-samba @@ -43,11 +43,11 @@ EXTRA_OECONF += "--disable-rpath \ PACKAGES += "pytalloc pytalloc-dev" -RPROVIDES_${PN}-dbg += "pytalloc-dbg" +RPROVIDES:${PN}-dbg += "pytalloc-dbg" -FILES_pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ +FILES:pytalloc = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ ${libdir}/libpytalloc-util.so.2 \ ${libdir}/libpytalloc-util.so.2.1.1 \ " -FILES_pytalloc-dev = "${libdir}/libpytalloc-util.so" -RDEPENDS_pytalloc = "python3" +FILES:pytalloc-dev = "${libdir}/libpytalloc-util.so" +RDEPENDS:pytalloc = "python3" diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb index c131014ff..ad8459389 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb @@ -39,7 +39,7 @@ EXTRA_OECONF += "--disable-rpath \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ " -do_install_append() { +do_install:append() { # add this link for cross check python module existence. eg: on x86-64 host, check python module # under recipe-sysroot which is mips64. cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s tdb.*.so tdb.so @@ -47,10 +47,10 @@ do_install_append() { PACKAGES += "tdb-tools python3-tdb" -RPROVIDES_${PN}-dbg += "python3-tdb-dbg" +RPROVIDES:${PN}-dbg += "python3-tdb-dbg" -FILES_${PN} = "${libdir}/*.so.*" -FILES_tdb-tools = "${bindir}/*" -FILES_python3-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -RDEPENDS_python3-tdb = "python3" -INSANE_SKIP_${MLPREFIX}python3-tdb = "dev-so" +FILES:${PN} = "${libdir}/*.so.*" +FILES:tdb-tools = "${bindir}/*" +FILES:python3-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +RDEPENDS:python3-tdb = "python3" +INSANE_SKIP:${MLPREFIX}python3-tdb = "dev-so" diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb index 21f83ad35..fa5b4ade8 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "LGPLv3+" DEPENDS += "libtalloc libtirpc" -RDEPENDS_python3-tevent = "python3" +RDEPENDS:python3-tevent = "python3" SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ file://options-0.10.0.patch \ @@ -42,7 +42,7 @@ EXTRA_OECONF += "--disable-rpath \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ --without-gettext \ " -do_install_append() { +do_install:append() { # add this link for cross check python module existence. eg: on x86-64 host, check python module # under recipe-sysroot which is mips64. cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s _tevent.*.so _tevent.so @@ -50,8 +50,8 @@ do_install_append() { PACKAGES += "python3-tevent" -RPROVIDES_${PN}-dbg += "python3-tevent-dbg" +RPROVIDES:${PN}-dbg += "python3-tevent-dbg" -FILES_python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +FILES:python3-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -INSANE_SKIP_${MLPREFIX}python3-tevent = "dev-so" +INSANE_SKIP:${MLPREFIX}python3-tevent = "dev-so" diff --git a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index e594906c3..538fca784 100644 --- a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -15,7 +15,7 @@ SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${P file://0001-saaldump-atmdump-Include-linux-sockios.h-for-SIOCGST.patch \ " -SRC_URI_append_libc-musl = " file://musl-no-on_exit.patch" +SRC_URI:append:libc-musl = " file://musl-no-on_exit.patch" SRC_URI[md5sum] = "d49499368c3cf15f73a05d9bce8824a8" SRC_URI[sha256sum] = "9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a" @@ -30,4 +30,4 @@ inherit autotools pkgconfig # The firmware is explicitly put under /lib when installed. # -FILES_${PN} += "/lib/firmware" +FILES:${PN} += "/lib/firmware" diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb index 5eea5c208..4549a068c 100644 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb +++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb @@ -39,25 +39,25 @@ SOLIBMAJORVERSION="1" PACKAGES =+ "${PN}-withsctp ${PN}-utils" -FILES_${PN} = " \ +FILES:${PN} = " \ ${libdir}/libsctp.so.${SOLIBVERSION} \ ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \ " -FILES_${PN}-withsctp = " \ +FILES:${PN}-withsctp = " \ ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \ ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/libsctp.so \ ${libdir}/lksctp-tools/libwithsctp.so \ ${datadir}/lksctp-tools/*.c \ ${datadir}/lksctp-tools/*.h \ " -FILES_${PN}-utils = "${bindir}/*" +FILES:${PN}-utils = "${bindir}/*" -RRECOMMENDS_${PN} += "kernel-module-sctp" -RRECOMMENDS_${PN}-utils += "kernel-module-sctp" -RRECOMMENDS_${PN}-ptest += "kernel-module-sctp" +RRECOMMENDS:${PN} += "kernel-module-sctp" +RRECOMMENDS:${PN}-utils += "kernel-module-sctp" +RRECOMMENDS:${PN}-ptest += "kernel-module-sctp" diff --git a/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index 4a1bbe620..197703e90 100644 --- a/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -27,13 +27,13 @@ CACHED_CONFIGUREVARS += "am_cv_python_pythondir=${PYTHON_SITEPACKAGES_DIR}/lowpa CFLAGS += "-Wno-initializer-overrides" -do_install_append() { +do_install:append() { rmdir ${D}${localstatedir}/run } -FILES_${PN}-dbg += "${libexecdir}/lowpan-tools/.debug/" +FILES:${PN}-dbg += "${libexecdir}/lowpan-tools/.debug/" PACKAGES =+ "${PN}-python" -FILES_${PN}-python = "${libdir}/python*" +FILES:${PN}-python = "${libdir}/python*" PNBLACKLIST[lowpan-tools] ?= "WARNING these tools are deprecated! Use wpan-tools instead" diff --git a/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb b/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb index 6506fd8ef..f2b7ce953 100644 --- a/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/macchanger/macchanger_1.7.0.bb @@ -11,13 +11,13 @@ SRC_URI = "https://github.com/alobbs/macchanger/releases/download/${PV}/${BPN}-$ SRC_URI[md5sum] = "ca56f16142914337391dac91603eb332" SRC_URI[sha256sum] = "dae2717c270fd5f62d790dbf80c19793c651b1b26b62c101b82d5fdf25a845bf" -FILES_${PN} = " \ +FILES:${PN} = " \ ${bindir}/${BPN} \ ${datadir}/${BPN}/wireless.list \ ${datadir}/${BPN}/OUI.list \ " -FILES_${PN}-doc = " \ +FILES:${PN}-doc = " \ ${datadir}/info \ ${datadir}/man \ " diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.9.bb b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.9.bb index 73e18a403..adf3c34e1 100644 --- a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.9.bb +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.9.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff" inherit autotools DEPENDS += "libevent" -RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ +RDEPENDS:${PN} += "perl perl-module-posix perl-module-autoloader \ perl-module-tie-hash bash \ " @@ -44,7 +44,7 @@ inherit update-rc.d INITSCRIPT_NAME = "memcached" INITSCRIPT_PARAMS = "defaults" -do_install_append() { +do_install:append() { install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached mkdir -p ${D}/usr/share/memcached/scripts install -m 755 ${S}/scripts/memcached-tool ${D}/usr/share/memcached/scripts diff --git a/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.94.bb b/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.94.bb index 265eefb94..c046499a2 100644 --- a/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.94.bb +++ b/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.94.bb @@ -22,4 +22,4 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," PACKAGES += "${PN}-bash-completions" -FILES_${PN}-bash-completions = "${datadir}/bash-completion/" +FILES:${PN}-bash-completions = "${datadir}/bash-completion/" diff --git a/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb b/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb index 12a82c25b..589ac879c 100644 --- a/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb +++ b/meta-openembedded/meta-networking/recipes-support/nbd/nbd_3.20.bb @@ -14,6 +14,6 @@ inherit autotools pkgconfig PACKAGES = "${PN}-client ${PN}-server ${PN}-dbg ${PN}-trdump ${PN}-doc" -FILES_${PN}-client = "${sbindir}/${BPN}-client" -FILES_${PN}-server = "${bindir}/${BPN}-server" -FILES_${PN}-trdump = "${bindir}/${BPN}-trdump" +FILES:${PN}-client = "${sbindir}/${BPN}-client" +FILES:${PN}-server = "${bindir}/${BPN}-server" +FILES:${PN}-trdump = "${bindir}/${BPN}-trdump" diff --git a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb index ec24578b7..4e67f6c91 100644 --- a/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb +++ b/meta-openembedded/meta-networking/recipes-support/ncp/libowfat_0.32.bb @@ -27,6 +27,6 @@ do_install() { MAN3DIR=${mandir}/man3 } -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb index 5f866052c..e9af2c43f 100644 --- a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_git.bb @@ -25,39 +25,39 @@ USE_NLS = "yes" EXTRA_OECONF += "--disable-rpath" -do_configure_prepend() { +do_configure:prepend() { cp ${STAGING_DATADIR_NATIVE}/gettext/gettext.h ${S}/include ${S}/autogen.sh } -do_install_append () { +do_install:append () { rm -rf ${D}${localstatedir} # Enable SUID bit for applications that need it chmod 4555 ${D}${bindir}/rltraceroute6 chmod 4555 ${D}${bindir}/ndisc6 chmod 4555 ${D}${bindir}/rdisc6 } -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" # Split into seperate packages since we normal don't want them all # The main package is left empty and therefore not created. PACKAGES += "${PN}-ndisc6 ${PN}-tcpspray6 ${PN}-rdisc6 \ ${PN}-tcptraceroute6 ${PN}-rltraceroute6 \ ${PN}-tracert6 ${PN}-rdnssd ${PN}-misc" -FILES_${PN} = "" -FILES_${PN}-ndisc6 = "${bindir}/ndisc6" -FILES_${PN}-tcpspray6 = "${bindir}/tcpspray6" -FILES_${PN}-rdisc6 = "${bindir}/rdisc6" -FILES_${PN}-tcptraceroute6 = "${bindir}/tcptraceroute6" -FILES_${PN}-rltraceroute6 = "${bindir}/rltraceroute6" -FILES_${PN}-tracert6 = "${bindir}/tracert6" -FILES_${PN}-rdnssd = "${sbindir}/rdnssd ${sysconfdir}/rdnssd" -FILES_${PN}-misc = "${bindir}/dnssort ${bindir}/name2addr ${bindir}/tcpspray ${bindir}/addr2name" +FILES:${PN} = "" +FILES:${PN}-ndisc6 = "${bindir}/ndisc6" +FILES:${PN}-tcpspray6 = "${bindir}/tcpspray6" +FILES:${PN}-rdisc6 = "${bindir}/rdisc6" +FILES:${PN}-tcptraceroute6 = "${bindir}/tcptraceroute6" +FILES:${PN}-rltraceroute6 = "${bindir}/rltraceroute6" +FILES:${PN}-tracert6 = "${bindir}/tracert6" +FILES:${PN}-rdnssd = "${sbindir}/rdnssd ${sysconfdir}/rdnssd" +FILES:${PN}-misc = "${bindir}/dnssort ${bindir}/name2addr ${bindir}/tcpspray ${bindir}/addr2name" -DESCRIPTION_${PN}-ndisc6 = "ICMPv6 Neighbor Discovery tool. \ +DESCRIPTION:${PN}-ndisc6 = "ICMPv6 Neighbor Discovery tool. \ Performs IPv6 neighbor discovery in userland. Replaces arping from the \ IPv4 world." -DESCRIPTION_${PN}-rdisc6 = "ICMPv6 Router Discovery tool. \ +DESCRIPTION:${PN}-rdisc6 = "ICMPv6 Router Discovery tool. \ Queries IPv6 routers on the network for advertised prefixes. Can be used \ to detect rogue IPv6 routers, monitor legitimate IPv6 routers." DESCRITPION_${PN}-tcpspray6 = "Performs bandwidth measurements of TCP \ @@ -69,7 +69,7 @@ servers through slateless IPv6 autoconfiguration." # The tcptraceroute6 and tracert6 commands depend on rltraceroute6 to # perform the actual trace operation. -RDEPENDS_${PN}-tcptraceroute6 = "${PN}-rltraceroute6" -RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6" -RDEPENDS_${PN}-misc += "perl" +RDEPENDS:${PN}-tcptraceroute6 = "${PN}-rltraceroute6" +RDEPENDS:${PN}-tracert6 = "${PN}-rltraceroute6" +RDEPENDS:${PN}-misc += "perl" diff --git a/meta-openembedded/meta-networking/recipes-support/netcat/netcat.inc b/meta-openembedded/meta-networking/recipes-support/netcat/netcat.inc index 15441645b..9a8775b6c 100644 --- a/meta-openembedded/meta-networking/recipes-support/netcat/netcat.inc +++ b/meta-openembedded/meta-networking/recipes-support/netcat/netcat.inc @@ -11,5 +11,5 @@ capabilities." SECTION = "net" inherit update-alternatives gettext pkgconfig -ALTERNATIVE_${PN} = "nc" +ALTERNATIVE:${PN} = "nc" diff --git a/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb b/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb index 1e113de51..fc0955497 100644 --- a/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/netcat/netcat_0.7.1.bb @@ -18,7 +18,7 @@ inherit autotools CVE_PRODUCT = "netcat_project:netcat" -do_install_append() { +do_install:append() { install -d ${D}${bindir} mv ${D}${bindir}/nc ${D}${bindir}/nc.${BPN} } diff --git a/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb index a180571f2..88a19e264 100644 --- a/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb @@ -22,14 +22,14 @@ S = "${WORKDIR}/git" inherit gettext autotools perlnative pkgconfig systemd -EXTRA_OECONF_append_class-target = " --with-driver=redhat" +EXTRA_OECONF:append:class-target = " --with-driver=redhat" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "--with-sysinit=systemd,--with-sysinit=initscripts," EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" -do_configure_prepend() { +do_configure:prepend() { currdir=`pwd` cd ${S} @@ -49,7 +49,7 @@ do_configure_prepend() { cd $currdir } -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system if [ -d "${D}${libdir}/systemd/system" ]; then @@ -67,9 +67,9 @@ do_install_append() { fi } -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir} \ ${nonarch_libdir} \ " -SYSTEMD_SERVICE_${PN} = "netcf-transaction.service" +SYSTEMD_SERVICE:${PN} = "netcf-transaction.service" diff --git a/meta-openembedded/meta-networking/recipes-support/netperf/files/netserver.service b/meta-openembedded/meta-networking/recipes-support/netperf/files/netserver.service new file mode 100644 index 000000000..0876a0d22 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/netperf/files/netserver.service @@ -0,0 +1,9 @@ +[Unit] +Description=Netperf Benchmark Server +After=network.target + +[Service] +ExecStart=/usr/sbin/netserver -D + +[Install] +WantedBy=multi-user.target diff --git a/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb index a084fb4c1..724869b60 100644 --- a/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb @@ -2,9 +2,8 @@ SUMMARY = "A networking benchmarking tool" DESCRIPTION = "Network performance benchmark including tests for TCP, UDP, sockets, ATM and more." SECTION = "net" HOMEPAGE = "http://www.netperf.org/" -LICENSE = "netperf" -LICENSE_FLAGS = "non-commercial" -LIC_FILES_CHKSUM = "file://COPYING;md5=a0ab17253e7a3f318da85382c7d5d5d6" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=e661ab33a2a71ad6652c178dedf8aaa2" PV = "2.7.0+git${SRCPV}" @@ -12,22 +11,23 @@ SRC_URI = "git://github.com/HewlettPackard/netperf.git \ file://cpu_set.patch \ file://vfork.patch \ file://init \ + file://netserver.service \ file://0001-netlib.c-Move-including-sched.h-out-og-function.patch \ file://0001-nettest_omni-Remove-duplicate-variable-definitions.patch \ " -SRCREV = "f482bab49fcedee46fc5b755da127f608325cd13" +SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4" S = "${WORKDIR}/git" -inherit update-rc.d autotools texinfo +inherit update-rc.d autotools texinfo systemd # cpu_set.patch plus _GNU_SOURCE makes src/netlib.c compile with CPU_ macros -CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE" +CFLAGS:append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE" # set the "_FILE_OFFSET_BITS" preprocessor symbol to 64 to support files # larger than 2GB -CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', \ +CFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', \ ' -D_FILE_OFFSET_BITS=64', '', d)}" PACKAGECONFIG ??= "" @@ -37,14 +37,16 @@ PACKAGECONFIG[histogram] = "--enable-histogram,--disable-histogram,," # autotools.bbclass attends to include m4 files with path depth <= 2 by # "find ${S} -maxdepth 2 -name \*.m4", so move m4 files from m4/m4. -do_configure_prepend() { +do_configure:prepend() { test -d ${S}/m4/m4 && mv -f ${S}/m4/m4 ${S}/m4-files } do_install() { sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${WORKDIR}/init - - install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d + install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d ${D}${systemd_system_unitdir} + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + sed -e 's#/usr/sbin/#${sbindir}/#g' ${WORKDIR}/netserver.service > ${D}${systemd_system_unitdir}/netserver.service + fi install -m 4755 src/netperf ${D}${bindir} install -m 4755 src/netserver ${D}${sbindir} install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/netperf @@ -65,7 +67,8 @@ do_install() { install -m 0644 ${S}/doc/netperf_old.ps ${D}${docdir}/netperf } -RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" +RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" INITSCRIPT_NAME="netperf" INITSCRIPT_PARAMS="defaults" +SYSTEMD_SERVICE:${PN} = "netserver.service" diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.44.0.bb index 08b855262..6e133ec20 100644 --- a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.44.0.bb @@ -11,7 +11,7 @@ SRC_URI = "\ https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz \ file://0001-fetch-ocsp-response-use-python3.patch \ " -SRC_URI[sha256sum] = "f7d54fa6f8aed29f695ca44612136fa2359013547394d5dffeffca9e01a26b0f" +SRC_URI[sha256sum] = "5699473b29941e8dafed10de5c8cb37a3581edf62ba7d04b911ca247d4de3c5d" inherit cmake manpages python3native PACKAGECONFIG[manpages] = "" @@ -22,15 +22,15 @@ EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON -DENABLE_HPACK_TOOLS=OFF" PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server" -RDEPENDS_${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})" -RDEPENDS_${PN}_class-native = "" -RDEPENDS_${PN}-proxy = "openssl python3-core python3-io python3-shell" +RDEPENDS:${PN} = "${PN}-client (>= ${PV}) ${PN}-proxy (>= ${PV}) ${PN}-server (>= ${PV})" +RDEPENDS:${PN}:class-native = "" +RDEPENDS:${PN}-proxy = "openssl python3-core python3-io python3-shell" -ALLOW_EMPTY_${PN} = "1" -FILES_${PN} = "" -FILES_lib${PN} = "${libdir}/*${SOLIBS}" -FILES_${PN}-client = "${bindir}/h2load ${bindir}/nghttp" -FILES_${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response" -FILES_${PN}-server = "${bindir}/nghttpd" +ALLOW_EMPTY:${PN} = "1" +FILES:${PN} = "" +FILES:lib${PN} = "${libdir}/*${SOLIBS}" +FILES:${PN}-client = "${bindir}/h2load ${bindir}/nghttp" +FILES:${PN}-proxy = "${bindir}/nghttpx ${datadir}/${BPN}/fetch-ocsp-response" +FILES:${PN}-server = "${bindir}/nghttpd" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-support/nis/nis.inc b/meta-openembedded/meta-networking/recipes-support/nis/nis.inc index a968af174..3ae0f7e95 100644 --- a/meta-openembedded/meta-networking/recipes-support/nis/nis.inc +++ b/meta-openembedded/meta-networking/recipes-support/nis/nis.inc @@ -20,12 +20,3 @@ inherit autotools gettext pkgconfig do_install() { oe_runmake 'DESTDIR=${D}' install-strip } - -# An attempt to build on uclibc will fail, causing annoyance, -# so force the package to be skipped here (this will cause a -# 'nothing provides' error) -python () { - os = d.getVar("TARGET_OS") - if os == "linux-uclibc": - raise bb.parse.SkipRecipe("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this") -} diff --git a/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_2.14.bb b/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_2.14.bb index 8c6837bac..8b7ed6fa2 100644 --- a/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_2.14.bb +++ b/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_2.14.bb @@ -20,15 +20,15 @@ SRC_URI[md5sum] = "ba1f121c17e3ad65368be173b977cd13" SRC_URI[sha256sum] = "d01f70fadc643a55107a0edc47c6be99d0306bcc4f66df56f65e74238b0124c9" inherit systemd -SYSTEMD_SERVICE_${PN} = "domainname.service" +SYSTEMD_SERVICE:${PN} = "domainname.service" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" -do_install_append() { +do_install:append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system } diff --git a/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb b/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb index bb401666c..ce22943d6 100644 --- a/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb @@ -23,25 +23,25 @@ S = "${WORKDIR}/git" DEPENDS = "libtirpc libnsl2 virtual/crypt" inherit autotools systemd -SYSTEMD_SERVICE_${PN} = "domainname.service" +SYSTEMD_SERVICE:${PN} = "domainname.service" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" CACHED_CONFIGUREVARS += "ac_cv_prog_STRIP=/bin/true" EXTRA_OECONF = " \ --disable-rpath --disable-domainname \ " -CFLAGS_append_libc-musl = " -Wno-error=cpp" +CFLAGS:append:libc-musl = " -Wno-error=cpp" -FILES_${PN} += " ${libdir}/yp-nis/*.so.*.* ${libdir}/yp-nis/pkgconfig/" -FILES_${PN}-dbg += " ${libdir}/yp-nis/.debug" -FILES_${PN}-dev += " ${libdir}/yp-nis/*.so ${libdir}/yp-nis/*.so.[12] ${libdir}/yp-nis/*.la" -FILES_${PN}-staticdev += " ${libdir}/yp-nis/*.a" +FILES:${PN} += " ${libdir}/yp-nis/*.so.*.* ${libdir}/yp-nis/pkgconfig/" +FILES:${PN}-dbg += " ${libdir}/yp-nis/.debug" +FILES:${PN}-dev += " ${libdir}/yp-nis/*.so ${libdir}/yp-nis/*.so.[12] ${libdir}/yp-nis/*.la" +FILES:${PN}-staticdev += " ${libdir}/yp-nis/*.a" -do_install_append() { +do_install:append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system } diff --git a/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.6.bb b/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.6.bb index 03b98c9c2..2c5e2bd93 100644 --- a/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.6.bb +++ b/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.6.bb @@ -21,8 +21,8 @@ DEPENDS = " \ yp-tools \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ " -DEPENDS_append_libc-musl = " bsd-headers nss" -RDEPENDS_${PN} += "yp-tools" +DEPENDS:append:libc-musl = " bsd-headers nss" +RDEPENDS:${PN} += "yp-tools" # ypbind-mt now provides all the functionality of ypbind # and is used in place of it. @@ -39,15 +39,15 @@ SRC_URI[sha256sum] = "0696c0263c4fd48a4ff2ce6c109f05f37aab0f71646d81cb22c7c28591 inherit systemd update-rc.d -SYSTEMD_SERVICE_${PN} = "ypbind.service" +SYSTEMD_SERVICE:${PN} = "ypbind.service" INITSCRIPT_NAME = "ypbind" INITSCRIPT_PARAMS = "start 44 3 5 . stop 70 0 1 2 6 ." CACHED_CONFIGUREVARS = "ac_cv_prog_STRIP=/bin/true" -CFLAGS_append = " -I${STAGING_INCDIR}/nss3 -I${STAGING_INCDIR}/nspr" +CFLAGS:append = " -I${STAGING_INCDIR}/nss3 -I${STAGING_INCDIR}/nspr" -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/rcS.d @@ -58,6 +58,6 @@ do_install_append () { } -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" diff --git a/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb b/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb index a749b1659..ccfe11288 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb @@ -17,7 +17,7 @@ SRCREV = "db0abbb4c80f2ecef6bc5d9639bca5bea28532a2" S = "${WORKDIR}/git" # use adjtimex on musl -CFLAGS_append_libc-musl = " -Dntp_adjtime=adjtimex" +CFLAGS:append:libc-musl = " -Dntp_adjtime=adjtimex" EXTRA_OEMAKE = "\ 'CC=${CC}' \ @@ -33,8 +33,8 @@ do_install () { install -D -m 0755 ntimed-client ${D}${sbindir}/ntimed-client } -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += "ntimed-client" +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} += "ntimed-client" PACKAGE_BEFORE_PN += "ntimed-client" -FILES_ntimed-client = "${sbindir}/ntimed-client" +FILES:ntimed-client = "${sbindir}/ntimed-client" diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb index 22e4d8e9a..cfc60a7aa 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ndpi_3.4.bb @@ -4,7 +4,7 @@ inspection. Based on OpenDPI it includes ntop extensions" SECTION = "libdevel" DEPENDS = "libpcap" -RDEPENDS_${PN} += " libpcap" +RDEPENDS:${PN} += " libpcap" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" @@ -19,7 +19,7 @@ inherit autotools-brokensep pkgconfig CPPFLAGS += "${SELECTED_OPTIMIZATION}" -do_configure_prepend() { +do_configure:prepend() { ${S}/autogen.sh } diff --git a/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_4.2.bb b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_4.2.bb index 596186651..cc2320788 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_4.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntopng/ntopng_4.2.bb @@ -7,7 +7,7 @@ usability, and features." SECTION = "console/network" DEPENDS = "curl libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq" -RDEPENDS_${PN} = "bash redis" +RDEPENDS:${PN} = "bash redis" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" @@ -26,24 +26,24 @@ S = "${WORKDIR}/git" # don't use the lua under thirdparty as it supports cross compiling badly export LUA_LIB = "${STAGING_LIBDIR}/liblua.a" -LDFLAGS_append_mipsarch = " -latomic" -LDFLAGS_append_powerpc = " -latomic" -LDFLAGS_append_riscv32 = " -latomic" +LDFLAGS:append:mipsarch = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" inherit autotools-brokensep gettext systemd -do_install_append() { +do_install:append() { install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/ntopng.service ${D}${systemd_unitdir}/system } -FILES_${PN} += "\ +FILES:${PN} += "\ ${systemd_unitdir}/system/ntopng.service" -FILES_${PN}-doc += "\ +FILES:${PN}-doc += "\ /usr/man/man8/ntopng.8" -do_configure_prepend() { +do_configure:prepend() { ${S}/autogen.sh } -SYSTEMD_SERVICE_${PN} = "ntopng.service" +SYSTEMD_SERVICE:${PN} = "ntopng.service" diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch new file mode 100644 index 000000000..372938c6d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch @@ -0,0 +1,32 @@ +From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 31 Jul 2021 10:51:41 -0700 +Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc + +In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which +could mean different stack sizes at runtime on different architectures +and it also causes compile failure. Default glibc thread stack size +or 64Kb set by ntp should be good in glibc these days. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libntp/work_thread.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libntp/work_thread.c b/libntp/work_thread.c +index 03a5647..3ddd751 100644 +--- a/libntp/work_thread.c ++++ b/libntp/work_thread.c +@@ -41,7 +41,7 @@ + #ifndef THREAD_MINSTACKSIZE + # define THREAD_MINSTACKSIZE (64U * 1024) + #endif +-#ifndef __sun ++#if !defined(__sun) && !defined(__GLIBC__) + #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN + # undef THREAD_MINSTACKSIZE + # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN +-- +2.32.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch new file mode 100644 index 000000000..42e1efd8b --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch @@ -0,0 +1,66 @@ +From 778f3cddc20930185a917fa3f8ffe1ef2b0b0ea0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 31 Jul 2021 13:27:16 -0700 +Subject: [PATCH] test: Fix build with new compiler defaults to -fno-common + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sntp/tests/run-packetHandling.c | 2 +- + sntp/tests/run-t-log.c | 2 +- + sntp/tests/run-utilities.c | 2 +- + tests/libntp/test-libntp.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/sntp/tests/run-packetHandling.c b/sntp/tests/run-packetHandling.c +index 7790b20..c58380c 100644 +--- a/sntp/tests/run-packetHandling.c ++++ b/sntp/tests/run-packetHandling.c +@@ -64,7 +64,7 @@ void resetTest(void) + setUp(); + } + +-char const *progname; ++extern char const *progname; + + + //=======MAIN===== +diff --git a/sntp/tests/run-t-log.c b/sntp/tests/run-t-log.c +index 268bf41..cd835bc 100644 +--- a/sntp/tests/run-t-log.c ++++ b/sntp/tests/run-t-log.c +@@ -50,7 +50,7 @@ void resetTest(void) + setUp(); + } + +-char const *progname; ++extern char const *progname; + + + //=======MAIN===== +diff --git a/sntp/tests/run-utilities.c b/sntp/tests/run-utilities.c +index f717882..98d9bf1 100644 +--- a/sntp/tests/run-utilities.c ++++ b/sntp/tests/run-utilities.c +@@ -58,7 +58,7 @@ void resetTest(void) + setUp(); + } + +-char const *progname; ++extern char const *progname; + + + //=======MAIN===== +diff --git a/tests/libntp/test-libntp.h b/tests/libntp/test-libntp.h +index 93050b3..60461d8 100644 +--- a/tests/libntp/test-libntp.h ++++ b/tests/libntp/test-libntp.h +@@ -5,4 +5,4 @@ + + time_t timefunc(time_t *ptr); + void settime(int y, int m, int d, int H, int M, int S); +-time_t nowtime; ++extern time_t nowtime; +-- +2.32.0 + diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb index e668113c5..4a719ae9c 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb @@ -13,6 +13,8 @@ DEPENDS = "libevent" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \ file://ntp-4.2.4_p6-nano.patch \ file://reproducibility-fixed-path-to-posix-shell.patch \ + file://0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch \ + file://0001-test-Fix-build-with-new-compiler-defaults-to-fno-com.patch \ file://ntpd \ file://ntp.conf \ file://ntpdate \ @@ -40,11 +42,11 @@ EXTRA_OECONF += "--with-net-snmp-config=no \ --with-locfile=redhat \ --without-rpath \ " -CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" +CFLAGS:append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" USERADD_PACKAGES = "${PN}" NTP_USER_HOME ?= "/var/lib/ntp" -USERADD_PARAM_${PN} = "--system --home-dir ${NTP_USER_HOME} \ +USERADD_PARAM:${PN} = "--system --home-dir ${NTP_USER_HOME} \ --no-create-home \ --shell /bin/false --user-group ntp" @@ -64,7 +66,7 @@ PACKAGECONFIG[debug] = "--enable-debugging,--disable-debugging" PACKAGECONFIG[mdns] = "ac_cv_header_dns_sd_h=yes,ac_cv_header_dns_sd_h=no,mdns" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 644 ${WORKDIR}/ntp.conf ${D}${sysconfdir} install -m 755 ${WORKDIR}/ntpd ${D}${sysconfdir}/init.d @@ -111,60 +113,60 @@ PACKAGES += "ntpdate sntp ntpdc ntpq ${PN}-tickadj ${PN}-utils" # ntp originally includes tickadj. It's split off for inclusion in small firmware images on platforms # with wonky clocks (e.g. OpenSlug) -RDEPENDS_${PN} = "${PN}-tickadj" +RDEPENDS:${PN} = "${PN}-tickadj" # ntpd require libgcc for execution -RDEPENDS_${PN} += "libgcc" +RDEPENDS:${PN} += "libgcc" # Handle move from bin to utils package -RPROVIDES_${PN}-utils = "${PN}-bin" -RREPLACES_${PN}-utils = "${PN}-bin" -RCONFLICTS_${PN}-utils = "${PN}-bin" +RPROVIDES:${PN}-utils = "${PN}-bin" +RREPLACES:${PN}-utils = "${PN}-bin" +RCONFLICTS:${PN}-utils = "${PN}-bin" # ntpdc and ntpq were split out of ntp-utils -RDEPENDS_${PN}-utils = "ntpdc ntpq" +RDEPENDS:${PN}-utils = "ntpdc ntpq" SYSTEMD_PACKAGES = "${PN} ntpdate sntp" -SYSTEMD_SERVICE_${PN} = "ntpd.service" -SYSTEMD_SERVICE_ntpdate = "ntpdate.service" -SYSTEMD_SERVICE_sntp = "sntp.service" -SYSTEMD_AUTO_ENABLE_sntp = "disable" +SYSTEMD_SERVICE:${PN} = "ntpd.service" +SYSTEMD_SERVICE:ntpdate = "ntpdate.service" +SYSTEMD_SERVICE:sntp = "sntp.service" +SYSTEMD_AUTO_ENABLE:sntp = "disable" -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" -RPROVIDES_ntpdate += "ntpdate-systemd" -RREPLACES_ntpdate += "ntpdate-systemd" -RCONFLICTS_ntpdate += "ntpdate-systemd" +RPROVIDES:ntpdate += "ntpdate-systemd" +RREPLACES:ntpdate += "ntpdate-systemd" +RCONFLICTS:ntpdate += "ntpdate-systemd" -RSUGGESTS_${PN} = "iana-etc" +RSUGGESTS:${PN} = "iana-etc" -FILES_${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd \ +FILES:${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd \ ${NTP_USER_HOME} \ ${systemd_unitdir}/ntp-units.d/60-ntpd.list \ " -FILES_${PN}-tickadj = "${sbindir}/tickadj" -FILES_${PN}-utils = "${sbindir} ${datadir}/ntp/lib" -RDEPENDS_${PN}-utils += "perl" -FILES_ntpdate = "${sbindir}/ntpdate \ +FILES:${PN}-tickadj = "${sbindir}/tickadj" +FILES:${PN}-utils = "${sbindir} ${datadir}/ntp/lib" +RDEPENDS:${PN}-utils += "perl" +FILES:ntpdate = "${sbindir}/ntpdate \ ${sysconfdir}/network/if-up.d/ntpdate-sync \ ${bindir}/ntpdate-sync \ ${sysconfdir}/default/ntpdate \ ${systemd_unitdir}/system/ntpdate.service \ " -FILES_sntp = "${sbindir}/sntp \ +FILES:sntp = "${sbindir}/sntp \ ${sysconfdir}/default/sntp \ ${systemd_unitdir}/system/sntp.service \ " -FILES_ntpdc = "${sbindir}/ntpdc" -FILES_ntpq = "${sbindir}/ntpq" +FILES:ntpdc = "${sbindir}/ntpdc" +FILES:ntpq = "${sbindir}/ntpq" -CONFFILES_${PN} = "${sysconfdir}/ntp.conf" -CONFFILES_ntpdate = "${sysconfdir}/default/ntpdate" +CONFFILES:${PN} = "${sysconfdir}/ntp.conf" +CONFFILES:ntpdate = "${sysconfdir}/default/ntpdate" INITSCRIPT_NAME = "ntpd" # No dependencies, so just go in at the standard level (20) INITSCRIPT_PARAMS = "defaults" -pkg_postinst_ntpdate() { +pkg_postinst:ntpdate() { if ! grep -q -s ntpdate $D/var/spool/cron/root; then echo "adding crontab" test -d $D/var/spool/cron || mkdir -p $D/var/spool/cron @@ -176,5 +178,5 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "ntpd" +ALTERNATIVE:${PN} = "ntpd" ALTERNATIVE_LINK_NAME[ntpd] = "${sbindir}/ntpd" diff --git a/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb b/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb index 193caf3cf..677b031a9 100644 --- a/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_8.2.2.bb @@ -32,7 +32,7 @@ do_install () { install -m 0644 ${WORKDIR}/nuttcp.socket ${D}${systemd_system_unitdir} } -FILES_${PN} += " \ +FILES:${PN} += " \ ${bindir} \ ${systemd_system_unitdir} \ " diff --git a/meta-openembedded/meta-networking/recipes-support/nvmetcli/nvmetcli_0.7.bb b/meta-openembedded/meta-networking/recipes-support/nvmetcli/nvmetcli_0.7.bb index 31f55e358..ec483321b 100644 --- a/meta-openembedded/meta-networking/recipes-support/nvmetcli/nvmetcli_0.7.bb +++ b/meta-openembedded/meta-networking/recipes-support/nvmetcli/nvmetcli_0.7.bb @@ -13,18 +13,18 @@ inherit systemd setuptools3 # file. This file is not installed by default since the configuration will vary # on real systems. Example configuration files are provided by including the # nvmetcli-examples package. -SYSTEMD_SERVICE_${PN} = "nvmet.service" +SYSTEMD_SERVICE:${PN} = "nvmet.service" SYSTEMD_AUTO_ENABLE ?= "disable" -RDEPENDS_${PN} += "python3 python3-six python3-pyparsing python3-configshell-fb" +RDEPENDS:${PN} += "python3 python3-six python3-pyparsing python3-configshell-fb" SRCREV = "0a6b088db2dc2e5de11e6f23f1e890e4b54fee64" SRC_URI = "git://git.infradead.org/users/hch/nvmetcli.git;branch=master" S = "${WORKDIR}/git" -do_install_append() { +do_install:append() { # Install example configuration scripts. install -d ${D}${datadir}/nvmet cp -fr ${S}/examples ${D}${datadir}/nvmet/ @@ -36,4 +36,4 @@ do_install_append() { # Examples package contains example json files used to configure nvmet. PACKAGES += "${PN}-examples" -FILES_${PN}-examples = "${datadir}/nvmet/examples/*" +FILES:${PN}-examples = "${datadir}/nvmet/examples/*" diff --git a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.101.bb b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.101.bb index 0b1bb6d51..676647819 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.101.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-isns/open-isns_0.101.bb @@ -26,7 +26,7 @@ inherit systemd autotools-brokensep update-rc.d EXTRA_OECONF = " --prefix=${prefix} --enable-shared" EXTRA_OEMAKE += "SYSTEMDDIR=${D}${systemd_unitdir}/system" -do_install_append () { +do_install:append () { oe_runmake INCDIR=${D}${includedir}/libisns/ install_hdrs oe_runmake LIBDIR=${D}${libdir} install_lib @@ -35,6 +35,6 @@ do_install_append () { ${D}${sysconfdir}/init.d/openisns } -FILES_${PN} += "${libdir} ${systemd_unitdir}" +FILES:${PN} += "${libdir} ${systemd_unitdir}" INITSCRIPT_NAME = "openisns" diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.2.5.bb b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.2.5.bb index 473af8d41..116ff81a3 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.2.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_11.2.5.bb @@ -19,11 +19,11 @@ SECTION = "vmware-tools" LICENSE = "LGPL-2.0 & GPL-2.0 & BSD & CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=559317809c5444fb39ceaf6ac45c43ac" -LICENSE_modules/freebsd/vmblock = "BSD" -LICENSE_modules/freebsd/vmmemctl = "GPL-2.0" -LICENSE_modules/freebsd/vmxnet = "GPL-2.0" -LICENSE_modules/linux = "GPL-2.0" -LICENSE_modules/solaris = "CDDL-1.0" +LICENSE:modules/freebsd/vmblock = "BSD" +LICENSE:modules/freebsd/vmmemctl = "GPL-2.0" +LICENSE:modules/freebsd/vmxnet = "GPL-2.0" +LICENSE:modules/linux = "GPL-2.0" +LICENSE:modules/solaris = "CDDL-1.0" SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ file://tools.conf \ @@ -47,7 +47,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https \ file://0001-pollGtk-Fix-volatile-qualifier-exposed-incorrectly.patch;patchdir=.. \ " -SRC_URI_append_libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ +SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ " SRCREV = "7ae57c3c7c1f68c74637ad009673dae94ee52570" @@ -61,7 +61,7 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' inherit autotools pkgconfig systemd update-rc.d -SYSTEMD_SERVICE_${PN} = "vmtoolsd.service" +SYSTEMD_SERVICE:${PN} = "vmtoolsd.service" EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ --disable-tests --without-gtkmm --without-xerces --without-pam \ @@ -76,20 +76,20 @@ PACKAGECONFIG[x11] = ",${NO_X11_FLAGS},${X11_DEPENDS}" # fuse gets implicitly detected; there is no --without-fuse option. PACKAGECONFIG[fuse] = ",,fuse" -CFLAGS_append_toolchain-clang = " -Wno-address-of-packed-member" -FILES_${PN} += "\ +CFLAGS:append:toolchain-clang = " -Wno-address-of-packed-member" +FILES:${PN} += "\ ${libdir}/open-vm-tools/plugins/vmsvc/lib*.so \ ${libdir}/open-vm-tools/plugins/common/lib*.so \ ${sysconfdir}/vmware-tools/tools.conf \ " -FILES_${PN}-locale += "${datadir}/open-vm-tools/messages" -FILES_${PN}-dev += "${libdir}/open-vm-tools/plugins/common/lib*.la" +FILES:${PN}-locale += "${datadir}/open-vm-tools/messages" +FILES:${PN}-dev += "${libdir}/open-vm-tools/plugins/common/lib*.la" -CONFFILES_${PN} += "${sysconfdir}/vmware-tools/tools.conf" +CONFFILES:${PN} += "${sysconfdir}/vmware-tools/tools.conf" -RDEPENDS_${PN} = "util-linux libdnet fuse" +RDEPENDS:${PN} = "util-linux libdnet fuse" -do_install_append() { +do_install:append() { if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then install -d ${D}/sbin ln -sf ${sbindir}/mount.vmhgfs ${D}/sbin/mount.vmhgfs @@ -105,14 +105,14 @@ do_install_append() { install -m 0644 ${WORKDIR}/tools.conf ${D}${sysconfdir}/vmware-tools/tools.conf } -do_configure_prepend() { +do_configure:prepend() { export CUSTOM_DNET_NAME=dnet export CUSTOM_DNET_LIBS=-L${STAGING_LIBDIR}/libdnet.so } INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "vmtoolsd" -INITSCRIPT_PARAMS_${PN} = "start 90 2 3 4 5 . stop 60 0 1 6 ." +INITSCRIPT_NAME:${PN} = "vmtoolsd" +INITSCRIPT_PARAMS:${PN} = "start 90 2 3 4 5 . stop 60 0 1 6 ." python() { if 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split(): diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.31.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.31.bb index d172083bb..ecc98dd8b 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.31.bb +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.31.bb @@ -50,16 +50,16 @@ PACKAGECONFIG ??= "gdbm" PACKAGECONFIG[gdbm] = "ac_cv_header_gdbm_h=yes,ac_cv_header_gdbm_h=no,gdbm," PACKAGES += "${PN}-perl ${PN}-python" -PRIVATE_LIBS_${PN}-perl = "libOpenIPMI.so.0" +PRIVATE_LIBS:${PN}-perl = "libOpenIPMI.so.0" -FILES_${PN}-perl = " \ +FILES:${PN}-perl = " \ ${libdir}/perl/vendor_perl/*/OpenIPMI.pm \ ${libdir}/perl/vendor_perl/*/auto/OpenIPMI/OpenIPMI.so \ " -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/perl/vendor_perl/*/auto/OpenIPMI/.debug \ ${PYTHON_SITEPACKAGES_DIR}/.debug \ " @@ -84,7 +84,7 @@ do_configure () { done } -do_install_append () { +do_install:append () { echo "SAL: D = $D" echo "SAL: libdir = $libdir" install -m 0755 -d ${D}${sysconfdir}/sysconfig ${D}${sysconfdir}/init.d @@ -108,5 +108,5 @@ do_install_append () { INITSCRIPT_NAME = "ipmi" INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ." -SYSTEMD_SERVICE_${PN} = "ipmi.service" +SYSTEMD_SERVICE:${PN} = "ipmi.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.3.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.3.bb index 7f4cc189c..a70e9708d 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.3.bb @@ -20,12 +20,12 @@ SRC_URI[sha256sum] = "75f0044df449430555ca7b995a2b77ab24f2946fdc3668301b8edc2398 # CVE-2020-7224 and CVE-2020-27569 are for Aviatrix OpenVPN client, not for openvpn. CVE_CHECK_WHITELIST += "CVE-2020-7224 CVE-2020-27569" -SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" +SYSTEMD_SERVICE:${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" SYSTEMD_AUTO_ENABLE = "disable" INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "openvpn" -INITSCRIPT_PARAMS_${PN} = "start 10 2 3 4 5 . stop 70 0 1 6 ." +INITSCRIPT_NAME:${PN} = "openvpn" +INITSCRIPT_PARAMS:${PN} = "start 10 2 3 4 5 . stop 70 0 1 6 ." CFLAGS += "-fno-inline" @@ -36,7 +36,7 @@ EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-p # Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. EXTRA_OECONF += "IPROUTE=${base_sbindir}/ip" -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/init.d install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d @@ -65,12 +65,12 @@ do_install_append() { PACKAGES =+ " ${PN}-sample " -RRECOMMENDS_${PN} = "kernel-module-tun" +RRECOMMENDS:${PN} = "kernel-module-tun" -FILES_${PN}-dbg += "${libdir}/openvpn/plugins/.debug" -FILES_${PN} += "${systemd_unitdir}/system/openvpn@.service \ +FILES:${PN}-dbg += "${libdir}/openvpn/plugins/.debug" +FILES:${PN} += "${systemd_unitdir}/system/openvpn@.service \ ${sysconfdir}/tmpfiles.d \ " -FILES_${PN}-sample += "${systemd_unitdir}/system/openvpn@loopback-server.service \ +FILES:${PN}-sample += "${systemd_unitdir}/system/openvpn@loopback-server.service \ ${systemd_unitdir}/system/openvpn@loopback-client.service \ ${sysconfdir}/openvpn/sample/" diff --git a/meta-openembedded/meta-networking/recipes-support/pimd/pimd_2.3.2.bb b/meta-openembedded/meta-networking/recipes-support/pimd/pimd_2.3.2.bb index df9e85d7d..2b622ae6d 100644 --- a/meta-openembedded/meta-networking/recipes-support/pimd/pimd_2.3.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/pimd/pimd_2.3.2.bb @@ -10,7 +10,7 @@ SRC_URI = "ftp://ftp.troglobit.com/pimd/${BP}.tar.gz \ SRC_URI[md5sum] = "a3c03e40540980b2c06e265a17988e60" SRC_URI[sha256sum] = "c77a9812751f114490a28a6839b16aac8b020c8d9fd6aa22bf3880c054e19f1d" -EXTRA_OECONF_append_libc-musl = " --embedded-libc" +EXTRA_OECONF:append:libc-musl = " --embedded-libc" inherit autotools-brokensep update-alternatives @@ -20,5 +20,5 @@ do_configure() { ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "pimd" +ALTERNATIVE:${PN} = "pimd" ALTERNATIVE_LINK_NAME[pimd] = "${sbindir}/pimd" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_35.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_35.0.bb index af4b3788b..dcdfb5bd4 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_35.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_35.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "This is the userspace components for the Linux Kernel's drivers I SECTION = "libs" DEPENDS = "libnl" -RDEPENDS_${PN} = "bash perl" +RDEPENDS:${PN} = "bash perl" SRC_URI = "git://github.com/linux-rdma/rdma-core.git" SRCREV = "e29a698e99028e9a092bb00c03ee4bfa31ae0cf3" @@ -23,12 +23,12 @@ EXTRA_OECMAKE = " \ LTO = "" FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/*" -INSANE_SKIP_${PN} += "dev-so" +FILES:${PN} += "${libdir}/*" +INSANE_SKIP:${PN} += "dev-so" inherit cmake cpan-base python3native systemd -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ srp_daemon.service \ iwpmd.service \ ibacm.socket \ diff --git a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb index 52dad7124..b0f1d5110 100644 --- a/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/spice/spice_git.bb @@ -33,14 +33,14 @@ S = "${WORKDIR}/git" inherit autotools gettext python3native python3-dir pkgconfig DEPENDS += "spice-protocol jpeg pixman alsa-lib glib-2.0 python3-pyparsing-native python3-six-native glib-2.0-native" -DEPENDS_append_class-nativesdk = " nativesdk-openssl" +DEPENDS:append:class-nativesdk = " nativesdk-openssl" export PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3" -CFLAGS_append = " -Wno-error" +CFLAGS:append = " -Wno-error" -PACKAGECONFIG_class-native = "" -PACKAGECONFIG_class-nativesdk = "" +PACKAGECONFIG:class-native = "" +PACKAGECONFIG:class-nativesdk = "" PACKAGECONFIG ?= "sasl" PACKAGECONFIG[celt051] = "--enable-celt051,--disable-celt051,celt051" @@ -56,4 +56,4 @@ COMPATIBLE_HOST = '(x86_64|i.86).*-linux' BBCLASSEXTEND = "native nativesdk" -EXTRA_OECONF_append_toolchain-clang = " --disable-werror" +EXTRA_OECONF:append:toolchain-clang = " --disable-werror" diff --git a/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb b/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb index bae29aa80..decac0c2b 100644 --- a/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb +++ b/meta-openembedded/meta-networking/recipes-support/ssmtp/ssmtp_2.64.bb @@ -25,7 +25,7 @@ EXTRA_OEMAKE = "GEN_CONFIG='/bin/true'" LDFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'ssl', '-lssl -lcrypto', '', d)}" -do_install_append () { +do_install:append () { install -d ${D}${mandir}/ mv ${D}${exec_prefix}/man/* ${D}${mandir}/ rmdir ${D}${exec_prefix}/man @@ -36,7 +36,7 @@ do_install_append () { ALTERNATIVE_PRIORITY_${PN} = "100" -ALTERNATIVE_${PN} = "mailq newaliases sendmail" +ALTERNATIVE:${PN} = "mailq newaliases sendmail" ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" ALTERNATIVE_LINK_NAME[newaliases] = "${sbindir}/newaliases" ALTERNATIVE_LINK_NAME[mailq] = "${sbindir}/mailq" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.3.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.3.bb index 8a704f6dc..ad104e44e 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.3.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.3.bb @@ -47,17 +47,17 @@ PACKAGECONFIG[systemd-charon] = "--enable-systemd,--disable-systemd,systemd," inherit autotools systemd pkgconfig -RRECOMMENDS_${PN} = "kernel-module-ipsec" +RRECOMMENDS:${PN} = "kernel-module-ipsec" -FILES_${PN} += "${libdir}/ipsec/lib*${SOLIBS}" -FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" -FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la ${libdir}/ipsec/include/config.h" -FILES_${PN}-staticdev += "${libdir}/ipsec/*.a" +FILES:${PN} += "${libdir}/ipsec/lib*${SOLIBS}" +FILES:${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" +FILES:${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la ${libdir}/ipsec/include/config.h" +FILES:${PN}-staticdev += "${libdir}/ipsec/*.a" -CONFFILES_${PN} = "${sysconfdir}/*.conf ${sysconfdir}/ipsec.d/*.conf ${sysconfdir}/strongswan.d/*.conf" +CONFFILES:${PN} = "${sysconfdir}/*.conf ${sysconfdir}/ipsec.d/*.conf ${sysconfdir}/strongswan.d/*.conf" PACKAGES += "${PN}-plugins" -ALLOW_EMPTY_${PN}-plugins = "1" +ALLOW_EMPTY:${PN}-plugins = "1" PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" NOAUTOPACKAGEDEBUG = "1" @@ -69,13 +69,13 @@ python split_strongswan_plugins () { def add_plugin_conf(f, pkg, file_regex, output_pattern, modulename): dvar = d.getVar('PKGD') - oldfiles = d.getVar('CONFFILES_' + pkg) + oldfiles = d.getVar('CONFFILES:' + pkg) newfile = '/' + os.path.relpath(f, dvar) if not oldfiles: - d.setVar('CONFFILES_' + pkg, newfile) + d.setVar('CONFFILES:' + pkg, newfile) else: - d.setVar('CONFFILES_' + pkg, oldfiles + " " + newfile) + d.setVar('CONFFILES:' + pkg, oldfiles + " " + newfile) split_packages = do_split_packages(d, libdir, 'libstrongswan-(.*)\.so', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True) do_split_packages(d, sysconfdir, '(.*)\.conf', '${PN}-plugin-%s', 'strongSwan %s plugin', prepend=True, hook=add_plugin_conf) @@ -86,17 +86,17 @@ python split_strongswan_plugins () { if split_packages: pn = d.getVar('PN') - d.setVar('RRECOMMENDS_' + pn + '-plugins', ' '.join(split_packages)) - d.appendVar('RRECOMMENDS_' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) - d.appendVar('RRECOMMENDS_' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) - d.appendVar('RRECOMMENDS_' + pn + '-staticdev', ' ' + ' '.join(split_staticdev_packages)) + d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-dev', ' ' + ' '.join(split_dev_packages)) + d.appendVar('RRECOMMENDS:' + pn + '-staticdev', ' ' + ' '.join(split_staticdev_packages)) } -PACKAGESPLITFUNCS_prepend = "split_strongswan_plugins " +PACKAGESPLITFUNCS:prepend = "split_strongswan_plugins " # Install some default plugins based on default strongSwan ./configure options # See https://wiki.strongswan.org/projects/strongswan/wiki/Pluginlist -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ ${PN}-plugin-aes \ ${PN}-plugin-attr \ ${PN}-plugin-cmac \ @@ -130,14 +130,14 @@ RDEPENDS_${PN} += "\ ${PN}-plugin-curve25519 \ " -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" # The deprecated legacy 'strongswan-starter' service should only be used when charon and # stroke are enabled. When swanctl is in use, 'strongswan.service' is needed. # See: https://wiki.strongswan.org/projects/strongswan/wiki/Charon-systemd -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ ${@bb.utils.contains('PACKAGECONFIG', 'swanctl', '${BPN}.service', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'charon', '${BPN}-starter.service', '', d)} \ " diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.59.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.59.bb index e3704ae1d..9321070bc 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.59.bb +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.59.bb @@ -32,5 +32,5 @@ EXTRA_OEMAKE += "DEFAULT_GROUP='nogroup'" # stunnel3 is a Perl wrapper to allow use of the legacy stunnel 3.x commandline # syntax with stunnel >= 4.05 PACKAGES =+ "stunnel3" -FILES_stunnel3 = "${bindir}/stunnel3" -RDEPENDS_stunnel3 += "${PN} perl" +FILES:stunnel3 = "${bindir}/stunnel3" +RDEPENDS:stunnel3 += "${PN} perl" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb index 66510b7fd..97a9027af 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453" DEPENDS = "libpcap" -RDEPENDS_${PN}-ptest += " make perl \ +RDEPENDS:${PN}-ptest += " make perl \ perl-module-file-basename \ perl-module-file-spec \ perl-module-file-spec-unix \ @@ -44,14 +44,14 @@ PACKAGECONFIG[smb] = "--enable-smb,--disable-smb" EXTRA_AUTORECONF += "-I m4" -do_configure_prepend() { +do_configure:prepend() { mkdir -p ${S}/m4 if [ -f aclocal.m4 ]; then mv aclocal.m4 ${S}/m4 fi } -do_install_append() { +do_install:append() { # make install installs an unneeded extra copy of the tcpdump binary rm ${D}${bindir}/tcpdump.${PV} } diff --git a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb index 7fb29279e..f20013b19 100644 --- a/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/tinyproxy/tinyproxy_1.11.0.bb @@ -26,14 +26,14 @@ inherit autotools systemd useradd #User specific USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home /dev/null \ +USERADD_PARAM:${PN} = "--system --home /dev/null \ --no-user-group --gid nogroup tinyproxy" SYSTEMD_PACKAGES += "${BPN}" -SYSTEMD_SERVICE_${PN} = "tinyproxy.service" -SYSTEMD_AUTO_ENABLE_${PN} = "enable" +SYSTEMD_SERVICE:${PN} = "tinyproxy.service" +SYSTEMD_AUTO_ENABLE:${PN} = "enable" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/tinyproxy.service ${D}${systemd_system_unitdir} diff --git a/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20151004.bb b/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20151004.bb index 83ad11b0e..8e03f1bdb 100644 --- a/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20151004.bb +++ b/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20151004.bb @@ -22,11 +22,11 @@ inherit autotools update-alternatives pkgconfig ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "ftp" +ALTERNATIVE:${PN} = "ftp" ALTERNATIVE_LINK_NAME_${PN} = "${bindir}/ftp" ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp" -FILES_${PN} = "${bindir}/tnftp" +FILES:${PN} = "${bindir}/tnftp" LIC_FILES_CHKSUM = "file://COPYING;md5=6d6796cb166a9bb050958241dad9479e" SRC_URI[md5sum] = "a49fbe752318d5a7893f900046ea00d5" diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb index c673ed009..82077db54 100644 --- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb @@ -41,5 +41,5 @@ do_install() { } ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE_${PN} = "traceroute" +ALTERNATIVE:${PN} = "traceroute" ALTERNATIVE_LINK_NAME[traceroute] = "${bindir}/traceroute" diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.12.0.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.12.0.bb index 6fc163171..8ab8b7b84 100644 --- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.12.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.12.0.bb @@ -17,7 +17,7 @@ SRCREV="52b04806f4236c37acd10179ab465a54adc7e86a" inherit autotools pkgconfig systemd update-rc.d DEPENDS = "openssl libevent libtool-native bison-native expat" -RDEPENDS_${PN} = "bash openssl-bin daemonize" +RDEPENDS:${PN} = "bash openssl-bin daemonize" S = "${WORKDIR}/git" @@ -32,7 +32,7 @@ PACKAGECONFIG[dnscrypt] = "--enable-dnscrypt, --disable-dnscrypt, libsodium" PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" -do_install_append() { +do_install:append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system @@ -40,7 +40,7 @@ do_install_append() { install -m 0755 ${S}/contrib/unbound.init ${D}${sysconfdir}/init.d/unbound } -SYSTEMD_SERVICE_${PN} = "${BPN}.service" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" INITSCRIPT_NAME = "unbound" INITSCRIPT_PARAMS = "defaults" diff --git a/meta-openembedded/meta-networking/recipes-support/vnstat/vnstat_2.6.bb b/meta-openembedded/meta-networking/recipes-support/vnstat/vnstat_2.6.bb index ad8802f3a..a7e008e55 100644 --- a/meta-openembedded/meta-networking/recipes-support/vnstat/vnstat_2.6.bb +++ b/meta-openembedded/meta-networking/recipes-support/vnstat/vnstat_2.6.bb @@ -13,10 +13,10 @@ inherit autotools pkgconfig systemd EXTRA_OECONF = "--disable-extra-paths" -do_install_append() { +do_install:append() { install -Dm644 ${S}/examples/systemd/vnstat.service "${D}${systemd_system_unitdir}/vnstat.service" } PARALLEL_MAKEINST = "" -SYSTEMD_SERVICE_${PN} = "vnstat.service" +SYSTEMD_SERVICE:${PN} = "vnstat.service" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/README b/meta-openembedded/meta-networking/recipes-support/wireshark/README index 63b5b7263..f5e4d0477 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/README +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/README @@ -14,12 +14,12 @@ Adding the wireshark to your build ======================================== via local.conf -IMAGE_INSTALL_append = " wireshark" +IMAGE_INSTALL:append = " wireshark" Adding the wireshark to your graphical build ======================================== via local.conf -IMAGE_INSTALL_append = " wireshark" +IMAGE_INSTALL:append = " wireshark" and one of: diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.6.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.7.bb index 3062633bc..fc360f669 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.6.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.7.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6e271234ba1a13c6e512e76b94ac2f77" DEPENDS = "pcre expat glib-2.0 glib-2.0-native libgcrypt libgpg-error libxml2 bison-native c-ares" -DEPENDS_append_class-target = " wireshark-native chrpath-replacement-native " +DEPENDS:append:class-target = " wireshark-native chrpath-replacement-native " SRC_URI = "https://1.eu.dl.wireshark.org/src/all-versions/wireshark-${PV}.tar.xz" @@ -19,7 +19,7 @@ SRC_URI += " \ UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "12a678208f8cb009e6b9d96026e41a6ef03c7ad086b9e1029f42053b249b4628" +SRC_URI[sha256sum] = "6c4cee51ef997cb9d9aaee84113525a5629157d3c743d7c4e320000de804a09d" PE = "1" @@ -27,7 +27,7 @@ inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime m PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" -PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh" +PACKAGECONFIG:class-native = "libpcap gnutls ssl libssh" PACKAGECONFIG[libcap] = "-DENABLE_CAP=ON,-DENABLE_CAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON, libcap" PACKAGECONFIG[libpcap] = "-DENABLE_PCAP=ON,-DENABLE_PCAP=OFF -DENABLE_PCAP_NG_DEFAULT=ON , libpcap" @@ -60,9 +60,9 @@ EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ -DM_INCLUDE_DIR=${includedir} \ -DM_LIBRARY=${libdir} \ " -CFLAGS_append = " -lm" +CFLAGS:append = " -lm" -do_install_append_class-native() { +do_install:append:class-native() { install -d ${D}${bindir} for f in lemon do @@ -70,7 +70,7 @@ do_install_append_class-native() { done } -do_install_append_class-target() { +do_install:append:class-target() { for f in `find ${D}${libdir} ${D}${bindir} -type f -executable` do chrpath --delete $f @@ -79,10 +79,10 @@ do_install_append_class-target() { PACKAGE_BEFORE_PN += "tshark" -FILES_tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" +FILES:tshark = "${bindir}/tshark ${mandir}/man1/tshark.*" -FILES_${PN} += "${datadir}*" +FILES:${PN} += "${datadir}*" -RDEPENDS_tshark = "wireshark" +RDEPENDS:tshark = "wireshark" BBCLASSEXTEND = "native" |