diff options
author | jmbills <jason.m.bills@intel.com> | 2021-10-04 22:42:48 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-04 22:42:48 +0300 |
commit | 0c9e31989c615598b5d042ffab385606660c93c0 (patch) | |
tree | 8019999b0ca042482e5193d6cabc06220c71d776 /meta-openembedded/meta-networking/recipes-protocols | |
parent | 04cd92067d2481643df5010cb39b2134b648cf4d (diff) | |
parent | ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff) | |
download | openbmc-0c9e31989c615598b5d042ffab385606660c93c0.tar.xz |
Update
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-protocols')
14 files changed, 477 insertions, 140 deletions
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" |