From 63e6b8e38ea081d366b4be50150fe77e2bca143f Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 26 Apr 2023 14:33:39 -0500 Subject: Add nftables to feeds and mlinux images --- recipes-core/images/mlinux-mtcap-image.bb | 1 + recipes-core/images/mlinux-rs9113-factory-image.bb | 2 ++ recipes-core/images/mlinux-rs9113-mtrv1-image.bb | 1 + scripts/build-feed-extras.sh | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes-core/images/mlinux-mtcap-image.bb b/recipes-core/images/mlinux-mtcap-image.bb index 4fde767..f0894c5 100644 --- a/recipes-core/images/mlinux-mtcap-image.bb +++ b/recipes-core/images/mlinux-mtcap-image.bb @@ -24,6 +24,7 @@ NETWORKING_FEATURES_append = " \ wget \ strongswan \ busybox-ifplugd \ + nftables \ " TIME_FEATURES = "tzdata-core tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \ diff --git a/recipes-core/images/mlinux-rs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb index 63a8d95..8bb1da6 100644 --- a/recipes-core/images/mlinux-rs9113-factory-image.bb +++ b/recipes-core/images/mlinux-rs9113-factory-image.bb @@ -8,3 +8,5 @@ RSI_91X_ADDITIONAL = "rs9113-autostart" # Extra stuff to install IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools python3-dbus" + +NETWORKING_FEATURES_append = " nftables" diff --git a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb index be70d93..e688fae 100644 --- a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb +++ b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb @@ -33,6 +33,7 @@ NETWORKING_FEATURES_append = " bridge-utils \ wget \ strongswan \ busybox-ifplugd \ + nftables \ " WIFI_FEATURES = " \ diff --git a/scripts/build-feed-extras.sh b/scripts/build-feed-extras.sh index bde2593..ea28473 100755 --- a/scripts/build-feed-extras.sh +++ b/scripts/build-feed-extras.sh @@ -2,7 +2,7 @@ # Extra packages to build for mLinux feed FS_PACKAGES="sshfs-fuse fuse-exfat exfat-utils" -NET_PACKAGES="wget netcat openvpn iftop dnsmasq strongswan stunnel tunctl ethtool openobex obexftp socat openldap" +NET_PACKAGES="wget netcat openvpn iftop dnsmasq strongswan stunnel tunctl ethtool openobex obexftp socat openldap nftables" RS9113TEST_PACKAGES="config-wifi-bt-ap rs9113rf" UTIL_PACKAGES="logrotate fatrace stressapptest gawk rsyslog zip gnupg rrdtool i2c-tools spitools memtester uhubctl" -- cgit v1.2.3