Skip to content

Commit 1f35cfd

Browse files
committed
Add nftables binary
Also bump to the latest patch release of buildroot 2024.02 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
1 parent 56c2c4a commit 1f35cfd

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

buildroot/config

+2-2
Original file line numberDiff line numberDiff line change
@@ -3474,7 +3474,7 @@ BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS=y
34743474
# BR2_PACKAGE_LIBFRIBIDI is not set
34753475
# BR2_PACKAGE_LIBUNIBREAK is not set
34763476
# BR2_PACKAGE_LIBUNISTRING is not set
3477-
# BR2_PACKAGE_LINENOISE is not set
3477+
BR2_PACKAGE_LINENOISE=y
34783478
# BR2_PACKAGE_NCURSES is not set
34793479

34803480
#
@@ -3905,7 +3905,7 @@ BR2_PACKAGE_IPTABLES_NFTABLES=y
39053905
# NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9
39063906
#
39073907
# BR2_PACKAGE_NFACCT is not set
3908-
# BR2_PACKAGE_NFTABLES is not set
3908+
BR2_PACKAGE_NFTABLES=y
39093909
# BR2_PACKAGE_NGINX is not set
39103910
# BR2_PACKAGE_NGIRCD is not set
39113911
# BR2_PACKAGE_NGREP is not set

scripts/download

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eux -o pipefail
44

5-
: "${BUILDROOT_VERSION:=2024.02.3}"
5+
: "${BUILDROOT_VERSION:=2024.02.7}"
66
export BUILDROOT_VERSION
77

88
mkdir -p /usr/src/buildroot

scripts/package

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ set -eux -o pipefail
44

55
mkdir -p \
66
/source/dist \
7-
/source/artifacts/"${BUILDARCH}"/{bin,etc,xtables-bin}
7+
/source/artifacts/"${BUILDARCH}"/{bin,etc,xtables-bin} \
8+
/source/artifacts/"${BUILDARCH}"/bin/aux
89

910
pushd /usr/src
1011

@@ -14,6 +15,7 @@ cp buildroot/output/target/usr/sbin/{conntrack,ethtool,ipset} "/source/artifa
1415
cp buildroot/output/target/usr/bin/{coreutils,find,fuse-overlayfs,nsenter,pigz,slirp4netns,xargs} "/source/artifacts/${BUILDARCH}/bin/"
1516
cp buildroot/output/target/sbin/{blkid,ip,losetup} "/source/artifacts/${BUILDARCH}/bin/"
1617
cp buildroot/output/target/bin/busybox "/source/artifacts/${BUILDARCH}/bin/"
18+
cp buildroot/output/target/usr/sbin/nft "/source/artifacts/${BUILDARCH}/bin/aux/"
1719

1820
cp -r /source/iptables-detect/*.sh "/source/artifacts/${BUILDARCH}/xtables-bin/"
1921

@@ -31,7 +33,6 @@ ln -sf pigz "/source/artifacts/${BUILDARCH}/bin/unpigz"
3133
rm -f "/source/artifacts/${BUILDARCH}/bin/mount"
3234
rm -f "/source/artifacts/${BUILDARCH}/bin/modprobe"
3335

34-
mkdir -p "/source/artifacts/${BUILDARCH}/bin/aux"
3536
ln -sf ../busybox "/source/artifacts/${BUILDARCH}/bin/aux/mount"
3637
ln -sf ../busybox "/source/artifacts/${BUILDARCH}/bin/aux/modprobe"
3738

@@ -43,5 +44,6 @@ cp -rp /source/artifacts/"${BUILDARCH}"/xtables-bin/* "/source/artifacts/${BUILD
4344

4445
tar cf - -C "/source/artifacts/${BUILDARCH}" ./bin ./etc > "/source/dist/k3s-root-${BUILDARCH}.tar"
4546
tar cf - -C "/source/artifacts/${BUILDARCH}" --transform s/xtables-bin/bin/ ./xtables-bin > "/source/dist/k3s-root-xtables-${BUILDARCH}.tar"
47+
tar -vtf "/source/dist/k3s-root-${BUILDARCH}.tar"
4648

4749
popd

0 commit comments

Comments
 (0)