diff options
| author | Maciej Żenczykowski <maze@google.com> | 2020-04-17 13:11:23 -0700 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2020-04-17 16:56:10 -0700 |
| commit | 16767ada8492094537644ee72428482949e94564 (patch) | |
| tree | bf385566ca200f30003eec91e9db560b601eb631 /net/test | |
| parent | f92d9bbf873e35c14df4265ce718a4a38ed5528d (diff) | |
| download | kernel_tests-16767ada8492094537644ee72428482949e94564.tar.gz kernel_tests-16767ada8492094537644ee72428482949e94564.tar.bz2 kernel_tests-16767ada8492094537644ee72428482949e94564.zip | |
net-test: upgrade to iptables 1.8.4-3
and various other changes to make things actually build
One of the more interesting aspects of things is that
the root directory must be root:root 0755 or systemd
fails to install.
Tested: built via ./build_all_rootfs.sh
net_test.rootfs.amd64.bullseye.20200417
net_test.rootfs.arm64.bullseye.20200417
net_test.rootfs.armhf.bullseye.20200417
net_test.rootfs.i386.bullseye.20200417
Haven't tested they work, but this is what is needed
to even make them build.
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie9f6f719993a7f4bb220de9218dcb590111b1e12
Diffstat (limited to 'net/test')
| -rwxr-xr-x | net/test/build_rootfs.sh | 16 | ||||
| -rw-r--r-- | net/test/rootfs/bullseye.list | 3 | ||||
| -rwxr-xr-x | net/test/rootfs/bullseye.sh | 6 |
3 files changed, 15 insertions, 10 deletions
diff --git a/net/test/build_rootfs.sh b/net/test/build_rootfs.sh index d31674da..5563d8a4 100755 --- a/net/test/build_rootfs.sh +++ b/net/test/build_rootfs.sh @@ -96,12 +96,18 @@ trap failure ERR packages=`cat $SCRIPT_DIR/rootfs/$suite.list | xargs | tr -s ' ' ','` # For the debootstrap intermediates -workdir=`mktemp -d` -workdir_remove() { +tmpdir=`mktemp -d` +tmpdir_remove() { echo "Removing temporary files.." >&2 - sudo rm -rf $workdir + sudo rm -rf "${tmpdir}" } -trap workdir_remove EXIT +trap tmpdir_remove EXIT + +workdir="${tmpdir}/_" + +mkdir "${workdir}" +chmod 0755 "${workdir}" +sudo chown root:root "${workdir}" # Run the debootstrap first cd $workdir @@ -126,7 +132,7 @@ cd - mount=`mktemp -d` mount_remove() { rmdir $mount - workdir_remove + tmpdir_remove } trap mount_remove EXIT diff --git a/net/test/rootfs/bullseye.list b/net/test/rootfs/bullseye.list index fbeddde3..b749472f 100644 --- a/net/test/rootfs/bullseye.list +++ b/net/test/rootfs/bullseye.list @@ -8,6 +8,7 @@ gpgv ifupdown insserv iputils-ping +iptables less libnetfilter-conntrack3 libnfnetlink0 @@ -21,7 +22,7 @@ pciutils procps psmisc python -python-scapy +python3-scapy strace systemd-sysv tcpdump diff --git a/net/test/rootfs/bullseye.sh b/net/test/rootfs/bullseye.sh index 9fde44ec..d198aac5 100755 --- a/net/test/rootfs/bullseye.sh +++ b/net/test/rootfs/bullseye.sh @@ -62,7 +62,7 @@ apt-get install -y \ apt-get clean # Construct the iptables source package to build -iptables=iptables-1.6.2 +iptables=iptables-1.8.4 mkdir -p /usr/src/$iptables cd /usr/src/$iptables @@ -74,14 +74,12 @@ wget -qO - \ # We don't want all of the sources, just the Debian modifications # NOTE: This will only work if Android always uses a version of iptables that exists # for Debian as well. -debian_iptables=1.6.2-1 +debian_iptables=1.8.4-3 debian_iptables_dir=pkg-iptables-debian-$debian_iptables wget -qO - \ https://salsa.debian.org/pkg-netfilter-team/pkg-iptables/-/archive/debian/$debian_iptables/$debian_iptables_dir.tar.gz | \ tar --strip-components 1 -zxf - \ $debian_iptables_dir/debian -# Work around bug in 1.6.2-1's Debian packaging -sed -i '/nfnl_osf.8/d' debian/iptables.manpages cd - cd /usr/src |