From: Janpieter Sollie <janpieter.sol...@edpnet.be>
Whereas MIPS and MIPS64 are abandoned my manufacturer,
SPARC and POWER seem to be still alive,
and upcoming RISCV also deserves some attention,
so add those to the list of supported architectures.
Signed-off-by: Janpieter Sollie <janpieter.sol...@edpnet.be>
---
build-test-kernel | 9 +++++---
cross.conf | 3 +++
lib/common.sh | 59 ++++++++++++++---------------------------------
lib/libktest.sh | 12 ++++++----
root_image | 17 ++++++++------
tests/kconfig.sh | 27 +++++++++++++---------
6 files changed, 59 insertions(+), 68 deletions(-)
diff --git a/build-test-kernel b/build-test-kernel
index 2d74947..9970e31 100755
--- a/build-test-kernel
+++ b/build-test-kernel
@@ -228,11 +228,14 @@ build_kernel()
;;
mips)
install -m0644 "$BOOT/vmlinux.strip"
"$ktest_kernel_binary/vmlinuz"
- #install -m0644 "$ktest_kernel_build/vmlinux"
"$ktest_kernel_binary/vmlinuz"
;;
default)
- echo "Don't know how to install kernel"
- exit 1
+ if [ -f "$BOOT/Image" ]; then
+ install -m0644 "$BOOT/Image" "$ktest_kernel_binary/vmlinuz"
+ else
+ echo "Don't know how to install kernel"
+ exit 1
+ fi
;;
esac
diff --git a/cross.conf b/cross.conf
index d98219e..a78bffd 100644
--- a/cross.conf
+++ b/cross.conf
@@ -6,3 +6,6 @@ ARCH_TRIPLE_X86=x86-linux-gnu
ARCH_TRIPLE_X86_64=x86_64-linux-gnu
ARCH_TRIPLE_ARM64=aarch64-linux-gnu
ARCH_TRIPLE_ARMV7=arm-linux-gnueabihf
+ARCH_TRIPLE_PPC64=powerpc64-linux-gnu
+ARCH_TRIPLE_SPARC64=sparc64-linux-gnu
+ARCH_TRIPLE_RISCV64=riscv64-linux-gnu
diff --git a/lib/common.sh b/lib/common.sh
index 7aadfaa..8758683 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -131,39 +131,23 @@ parse_arch()
QEMU_PACKAGE=qemu-system-arm
QEMU_BIN=qemu-system-arm
;;
- mips)
- DEBIAN_ARCH=mips
- ARCH_TRIPLE=mips-linux-gnu
-
- KERNEL_ARCH=mips
- BITS=32
-
- QEMU_PACKAGE=qemu-system-mips
- QEMU_BIN=qemu-system-mips
- ;;
- mips64)
- DEBIAN_ARCH=mips
- ARCH_TRIPLE=mips-linux-gnu
+ riscv64)
+ DEBIAN_ARCH=riscv64
+ ARCH_TRIPLE=${ARCH_TRIPLE_RISCV64}
+ MIRROR=http://deb.debian.org/debian-ports
+ RUST_TRIPLE=riscv64gc-unknown-linux-gnu
- KERNEL_ARCH=mips
+ KERNEL_ARCH=riscv
BITS=64
- QEMU_PACKAGE=qemu-system-mips
- QEMU_BIN=qemu-system-mips64
- ;;
- sparc)
- DEBIAN_ARCH=sparc
- ARCH_TRIPLE=sparc64-linux-gnu
-
- KERNEL_ARCH=sparc
- BITS=32
-
- QEMU_PACKAGE=qemu-system-sparc
- QEMU_BIN=qemu-system-sparc
+ QEMU_PACKAGE=qemu-system-riscv
+ QEMU_BIN=qemu-system-riscv64
;;
sparc64)
- DEBIAN_ARCH=sparc
- ARCH_TRIPLE=sparc64-linux-gnu
+ DEBIAN_ARCH=sparc64
+ ARCH_TRIPLE=${ARCH_TRIPLE_SPARC64}
+ MIRROR=http://deb.debian.org/debian-ports
+ RUST_TRIPLE=sparc64-unknown-linux-gnu
KERNEL_ARCH=sparc
BITS=64
@@ -171,23 +155,13 @@ parse_arch()
QEMU_PACKAGE=qemu-system-sparc
QEMU_BIN=qemu-system-sparc64
;;
- ppc|powerpc)
- DEBIAN_ARCH=powerpc
- MIRROR=http://deb.debian.org/debian-ports
-
- ARCH_TRIPLE=powerpc-linux-gnu
-
- KERNEL_ARCH=powerpc
- BITS=32
-
- QEMU_PACKAGE=qemu-system-ppc
- QEMU_BIN=qemu-system-ppc
- ;;
- ppc64)
+ ppc64|powerpc)
+ ktest_arch=ppc64
DEBIAN_ARCH=ppc64
MIRROR=http://deb.debian.org/debian-ports
- ARCH_TRIPLE=powerpc-linux-gnu
+ ARCH_TRIPLE=${ARCH_TRIPLE_PPC64}
+ RUST_TRIPLE=powerpc64-unknown-linux-gnu
KERNEL_ARCH=powerpc
BITS=64
@@ -213,6 +187,7 @@ parse_arch()
export QEMU_BIN
export ktest_arch
export BITS
+ export RUST_TRIPLE
}
find_command() {
diff --git a/lib/libktest.sh b/lib/libktest.sh
index 3bcf6f9..98d5742 100644
--- a/lib/libktest.sh
+++ b/lib/libktest.sh
@@ -317,12 +317,14 @@ start_vm()
aarch64|arm)
qemu_cmd+=(-cpu $cputype -machine
type=virt,gic-version=max,accel=$accel)
;;
- mips)
- qemu_cmd+=(-cpu 24Kf -machine malta)
- ktest_cpus=1
+ ppc64)
+ qemu_cmd+=(-cpu power9)
;;
- mips64)
- qemu_cmd+=(-cpu MIPS64R2-generic -machine malta)
+ sparc64)
+ qemu_cmd+=(-cpu default)
+ ;;
+ riscv64)
+ qemu_cmd+=(-cpu any)
;;
esac
diff --git a/root_image b/root_image
index 4416132..bc257d2 100755
--- a/root_image
+++ b/root_image
@@ -34,7 +34,7 @@ usage()
echo
echo "options:"
echo " -h Display this help and exit"
- echo " -a <arch> Architecture for vm image"
+ echo " -a <arch> Architecture for vm image
(x86_64,armhf,i386,aarch64,sparc64,ppc64,riscv64)"
echo " -m <mirror> Debian mirror"
echo ' -i <image> Image to create/update, defaults to
/var/lib/ktest/root.$arch'
}
@@ -233,9 +233,11 @@ update_packages()
mkdir -p "$MNT"/run/user/0
cp /etc/resolv.conf "$MNT/etc/resolv.conf"
_chroot "$MNT" mount -t proc none /proc
- _chroot "$MNT" apt-get -qq update
- _chroot "$MNT" apt-get -qq upgrade
- _chroot "$MNT" apt-get -qq install --no-install-recommends "${PACKAGES[@]}"
+ [[ $MIRROR == *"debian-ports"* ]] && _chroot "$MNT" apt-get -qq install
debian-ports-archive-keyring
+ _chroot "$MNT" apt-get -qq --allow-unauthenticated
--allow-insecure-repositories update --fix-missing
+ _chroot "$MNT" apt-get -qq --allow-unauthenticated upgrade
+ _chroot "$MNT" apt-get -qq install -f
+ _chroot "$MNT" apt-get -qq install -m --allow-unauthenticated
--no-install-recommends "${PACKAGES[@]}"
rm -f "$MNT/var/cache/apt/archives/*.deb"
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs >
"$MNT"/tmp/rustup.sh
@@ -328,14 +330,15 @@ cmd_create()
--no-check-gpg \
--arch="$DEBIAN_ARCH" \
--exclude=$(join_by , "${EXCLUDE[@]}") \
+ $keyring \
--foreign \
--components='main,contrib,non-free' \
- trixie "$MNT" "$MIRROR"
+ $debian_release "$MNT" "$MIRROR"
- [[ ${CROSS_COMPILE+x} ]] && cp $(which qemu-${ktest_arch}) ${MNT}$(which
qemu-${ktest_arch})
+ statichelper=$(which qemu-${ktest_arch}) || statichelper=$(which
qemu-${ktest_arch}-static)
+ [ ${CROSS_COMPILE:-0} == 1 ] && cp $statichelper ${MNT}$statichelper
_chroot "$MNT" /debootstrap/debootstrap --second-stage
_chroot "$MNT" dpkg --configure -a
-
update_packages
update_files
diff --git a/tests/kconfig.sh b/tests/kconfig.sh
index abb7012..9a30094 100644
--- a/tests/kconfig.sh
+++ b/tests/kconfig.sh
@@ -69,24 +69,29 @@ case $ktest_arch in
require-kernel-append console=hvc0
;;
- powerpc)
- require-kernel-config ADVANCED_OPTIONS
+ ppc64)
+ require-kernel-config PPC64
+
+ have_virtio=1
+
+ require-kernel-append console=hvc0
+ ;;
+ sparc64)
+ require-kernel-config 64BIT
+ require-kernel-config SMP
+ require-kernel-config VIRTIO_MENU
+ require-kernel-config PCI
- have_kvmguest=1
have_virtio=1
- have_suspend=1
require-kernel-append console=hvc0
;;
- mips)
- require-kernel-config MIPS_MALTA
- require-kernel-config CPU_MIPS${BITS}_R2
- require-kernel-config CPU_BIG_ENDIAN=y
- require-kernel-config CPU_LITTLE_ENDIAN=n
- require-kernel-config 32BIT
+ riscv64)
+ require-kernel-config SOC_VIRT
+ require-kernel-config VIRTIO_MENU
+ require-kernel-config PCI
have_virtio=1
- ktest_storage_bus=piix4-ide
require-kernel-append console=hvc0
;;
--
2.42.1
