Skip to content

Commit

Permalink
Drop socat from config
Browse files Browse the repository at this point in the history
We have been stripping this out on the K3s side for a while, no point in building it.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
  • Loading branch information
brandond committed Nov 22, 2022
1 parent 48b49ad commit e865834
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion buildroot/config
Original file line number Diff line number Diff line change
Expand Up @@ -3791,7 +3791,7 @@ BR2_PACKAGE_IPTABLES_NFTABLES=y
#
# snort3 needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.9
#
BR2_PACKAGE_SOCAT=y
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SOCKETCAND is not set
# BR2_PACKAGE_SOFTETHER is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
Expand Down
12 changes: 6 additions & 6 deletions scripts/package
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ mkdir -p \
pushd /usr/src

# copy binaries
cp -d buildroot/output/target/usr/sbin/*tables* "/source/artifacts/${BUILDARCH}/bin/"
cp buildroot/output/target/usr/sbin/{conntrack,ethtool,ipset} "/source/artifacts/${BUILDARCH}/bin/"
cp buildroot/output/target/usr/bin/{find,nsenter,pigz,socat,coreutils} "/source/artifacts/${BUILDARCH}/bin/"
cp buildroot/output/target/usr/bin/{slirp4netns,fuse-overlayfs} "/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 -d buildroot/output/target/usr/sbin/*tables* "/source/artifacts/${BUILDARCH}/bin/"
cp buildroot/output/target/usr/sbin/{conntrack,ethtool,ipset} "/source/artifacts/${BUILDARCH}/bin/"
cp buildroot/output/target/usr/bin/{find,nsenter,pigz,coreutils} "/source/artifacts/${BUILDARCH}/bin/"
cp buildroot/output/target/usr/bin/{slirp4netns,fuse-overlayfs} "/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 -r /source/iptables-detect/*.sh "/source/artifacts/${BUILDARCH}/xtables-bin/"

Expand Down

0 comments on commit e865834

Please sign in to comment.