summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2020-01-28 19:37:53 -0800
committerMaciej Żenczykowski <maze@google.com>2020-01-28 19:39:20 -0800
commitd7bc2c97452ee81870c2490b218979b2eb614102 (patch)
treee48a0ac5f2d6fed968c3aed6eafd45993755fe7a /net/test
parent40fe1568e63c5c6b92f3c6ea5279228c77c2f595 (diff)
downloadkernel_tests-d7bc2c97452ee81870c2490b218979b2eb614102.tar.gz
kernel_tests-d7bc2c97452ee81870c2490b218979b2eb614102.tar.bz2
kernel_tests-d7bc2c97452ee81870c2490b218979b2eb614102.zip
remove Debian wheezy support
(it was never actually used) Test: 'git grep wheezy' & 'find | egrep wheezy' comes up empty Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I0ec29054a60e4b8738e6a9addc3f3396a57e82e6
Diffstat (limited to 'net/test')
-rwxr-xr-xnet/test/build_all_rootfs.sh6
-rwxr-xr-xnet/test/build_rootfs.sh8
-rw-r--r--net/test/rootfs/wheezy.list33
-rwxr-xr-xnet/test/rootfs/wheezy.sh50
4 files changed, 3 insertions, 94 deletions
diff --git a/net/test/build_all_rootfs.sh b/net/test/build_all_rootfs.sh
index 54ebde1c..379ab8b5 100755
--- a/net/test/build_all_rootfs.sh
+++ b/net/test/build_all_rootfs.sh
@@ -17,12 +17,8 @@
set -e
-for s in wheezy stretch buster; do
+for s in stretch buster; do
for a in i386 amd64 armhf arm64; do
-
- # Debian wheezy does not support arm64 architecture
- [[ "${s}-${a}" != "wheezy-arm64" ]] || continue
-
./build_rootfs.sh -s "${s}" -a "${a}"
done
done
diff --git a/net/test/build_rootfs.sh b/net/test/build_rootfs.sh
index e92a8f93..5049bc6a 100755
--- a/net/test/build_rootfs.sh
+++ b/net/test/build_rootfs.sh
@@ -20,7 +20,7 @@ set -e
SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
usage() {
- echo -n "usage: $0 [-h] [-s wheezy|stretch|buster] [-a i386|amd64|armhf|arm64] "
+ echo -n "usage: $0 [-h] [-s stretch|buster] [-a i386|amd64|armhf|arm64] "
echo "[-m http://mirror/debian] [-n net_test.rootfs.`date +%Y%m%d`]"
exit 1
}
@@ -36,16 +36,12 @@ while getopts ":hs:a:m:n:" opt; do
usage
;;
s)
- if [ "$OPTARG" != "wheezy" -a \
- "$OPTARG" != "stretch" -a \
+ if [ "$OPTARG" != "stretch" -a \
"$OPTARG" != "buster" ]; then
echo "Invalid suite: $OPTARG" >&2
usage
fi
suite="${OPTARG}"
- if [[ "${suite}" == wheezy ]]; then
- mirror=http://archive.debian.org/debian
- fi
;;
a)
case "${OPTARG}" in
diff --git a/net/test/rootfs/wheezy.list b/net/test/rootfs/wheezy.list
deleted file mode 100644
index 44e3d851..00000000
--- a/net/test/rootfs/wheezy.list
+++ /dev/null
@@ -1,33 +0,0 @@
-adduser
-apt
-apt-utils
-bash-completion
-binutils
-bsdmainutils
-ca-certificates
-file
-gpgv
-ifupdown
-insserv
-iptables
-iputils-ping
-less
-libpopt0
-mime-support
-netbase
-netcat6
-netcat-traditional
-net-tools
-module-init-tools
-openssl
-procps
-psmisc
-python2.7
-python-scapy
-strace
-tcpdump
-traceroute
-udev
-udhcpc
-vim-tiny
-wget
diff --git a/net/test/rootfs/wheezy.sh b/net/test/rootfs/wheezy.sh
deleted file mode 100755
index 81cfad74..00000000
--- a/net/test/rootfs/wheezy.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# NOTE: It is highly recommended that you do not create new wheezy rootfs
-# images. This script is here for forensic purposes only, to understand
-# how the original rootfs was created.
-
-set -e
-
-SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
-
-. $SCRIPT_DIR/common.sh
-
-chroot_sanity_check
-
-# Remove things pulled in by debootstrap that we do not need
-dpkg -P \
- debconf-i18n \
- liblocale-gettext-perl \
- libtext-charwidth-perl \
- libtext-iconv-perl \
- libtext-wrapi18n-perl \
- python2.6 \
- python2.6-minimal \
- xz-utils
-
-# We are done with apt; reclaim the disk space
-apt-get clean
-
-# Ensure a getty is spawned on ttyS0, if booting the image manually
-# This also removes the vt gettys, as we may have no vt
-sed -i '/tty[123456]/d' /etc/inittab
-echo "s0:1235:respawn:/sbin/getty 115200 ttyS0 linux" >>/etc/inittab
-
-# Finalize and tidy up the created image
-chroot_cleanup