diff options
Diffstat (limited to 'meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb')
| -rw-r--r-- | meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb | 67 |
1 files changed, 26 insertions, 41 deletions
diff --git a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index 31f9aef48b..2e3aa54411 100644 --- a/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -1,5 +1,6 @@ SUMMARY = "Meta-networking packagegroups" +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup PROVIDES = "${PACKAGES}" @@ -12,12 +13,11 @@ PACKAGES = ' \ packagegroup-meta-networking-filter \ packagegroup-meta-networking-irc \ packagegroup-meta-networking-kernel \ - packagegroup-meta-networking-netkit \ packagegroup-meta-networking-protocols \ packagegroup-meta-networking-support \ ' -RDEPENDS_packagegroup-meta-networking = "\ +RDEPENDS:packagegroup-meta-networking = "\ packagegroup-meta-networking-connectivity \ packagegroup-meta-networking-daemons \ packagegroup-meta-networking-devtools \ @@ -25,13 +25,11 @@ RDEPENDS_packagegroup-meta-networking = "\ packagegroup-meta-networking-filter \ packagegroup-meta-networking-irc \ packagegroup-meta-networking-kernel \ - packagegroup-meta-networking-netkit \ packagegroup-meta-networking-protocols \ packagegroup-meta-networking-support \ " -RDEPENDS_packagegroup-meta-networking-connectivity = "\ - crda \ +RDEPENDS:packagegroup-meta-networking-connectivity = "\ daq \ adcli \ ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth x11", "blueman", "", d)} \ @@ -49,14 +47,13 @@ RDEPENDS_packagegroup-meta-networking-connectivity = "\ vlan \ vpnc \ ez-ipupdate \ - firewalld \ + ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python", "firewalld", "", d)} \ freeradius \ mbedtls \ miniupnpd \ mosquitto \ nanomsg \ nng \ - netplan \ networkmanager-openvpn \ networkmanager \ openconnect \ @@ -70,9 +67,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 +94,19 @@ 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 = "\ - python3-ldap \ +RDEPENDS:packagegroup-meta-networking-devtools = "\ 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,41 +123,26 @@ 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 = "\ - netkit-rwho-client \ - netkit-rwho-server \ - netkit-rsh-client \ - netkit-rsh-server \ - netkit-telnet \ - netkit-tftp-client \ - netkit-tftp-server \ - netkit-ftp \ - netkit-rpc \ - " - -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 \ + frr \ net-snmp \ openflow \ openflow \ openl2tp \ mdns \ nopoll \ - quagga \ radiusclient-ng \ tsocks \ openlldp \ @@ -172,11 +153,10 @@ RDEPENDS_packagegroup-meta-networking-protocols = "\ xl2tpd \ " -RDEPENDS_packagegroup-meta-networking-protocols_remove_libc-musl = "mdns" - -RDEPENDS_packagegroup-meta-networking-support = "\ +RDEPENDS:packagegroup-meta-networking-support = "\ aoetools \ arptables \ + bmon \ bridge-utils \ celt051 \ cim-schema-docs \ @@ -206,19 +186,23 @@ RDEPENDS_packagegroup-meta-networking-support = "\ libtevent \ linux-atm \ lksctp-tools \ + mctp \ memcached \ ifenslave \ netcat \ netcat-openbsd \ libtdb \ - ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "non-commercial", "netperf", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "non-commercial", "netperf", "", d)} \ yp-tools \ ypbind-mt \ yp-tools \ mtr \ - ntp ntpdate sntp ntpdc ntpq ntp-tickadj ntp-utils \ + netsniff-ng \ + ntp sntp ntpdc ntpq ntp-tickadj ntp-utils \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "ntpsec", "", d)} \ nbd-client \ nbd-server \ + nbd-trplay \ nbd-trdump \ openvpn \ macchanger \ @@ -232,7 +216,6 @@ RDEPENDS_packagegroup-meta-networking-support = "\ tcpdump \ tcpslice \ netcf \ - nghttp2 \ tnftp \ traceroute \ tunctl \ @@ -240,7 +223,6 @@ RDEPENDS_packagegroup-meta-networking-support = "\ ndpi \ ntopng \ nuttcp \ - nvmetcli \ open-isns \ openipmi \ phytool \ @@ -259,8 +241,11 @@ RDEPENDS_packagegroup-meta-networking-support = "\ vnstat \ wpan-tools \ ettercap \ + libcpr \ " -RDEPENDS_packagegroup-meta-networking-support_remove_mipsarch = "memcached" +RDEPENDS:packagegroup-meta-networking-support:remove:mipsarch = "memcached" +RDEPENDS:packagegroup-meta-networking-support:remove:riscv64 = "memcached" +RDEPENDS:packagegroup-meta-networking-support:remove:libc-musl = "ypbind-mt" EXCLUDE_FROM_WORLD = "1" # Empty packages, only devel headers and libs |