Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add nftables binary #66

Merged
merged 1 commit into from
Nov 8, 2024
Merged

Add nftables binary #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildroot/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3474,7 +3474,7 @@ BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS=y
# BR2_PACKAGE_LIBFRIBIDI is not set
# BR2_PACKAGE_LIBUNIBREAK is not set
# BR2_PACKAGE_LIBUNISTRING is not set
# BR2_PACKAGE_LINENOISE is not set
BR2_PACKAGE_LINENOISE=y
# BR2_PACKAGE_NCURSES is not set

#
Expand Down Expand Up @@ -3905,7 +3905,7 @@ BR2_PACKAGE_IPTABLES_NFTABLES=y
# NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 4.6, dynamic library, wchar, threads, gcc >= 4.9
#
# BR2_PACKAGE_NFACCT is not set
# BR2_PACKAGE_NFTABLES is not set
BR2_PACKAGE_NFTABLES=y
# BR2_PACKAGE_NGINX is not set
# BR2_PACKAGE_NGIRCD is not set
# BR2_PACKAGE_NGREP is not set
Expand Down
2 changes: 1 addition & 1 deletion scripts/download
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eux -o pipefail

: "${BUILDROOT_VERSION:=2024.02.3}"
: "${BUILDROOT_VERSION:=2024.02.7}"
export BUILDROOT_VERSION

mkdir -p /usr/src/buildroot
Expand Down
6 changes: 4 additions & 2 deletions scripts/package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ set -eux -o pipefail

mkdir -p \
/source/dist \
/source/artifacts/"${BUILDARCH}"/{bin,etc,xtables-bin}
/source/artifacts/"${BUILDARCH}"/{bin,etc,xtables-bin} \
/source/artifacts/"${BUILDARCH}"/bin/aux

pushd /usr/src

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

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

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

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

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

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

popd