From: Henning Schild <henning.schild@siemens.com>
To: Anton Mikanovich <amikan@ilbers.de>
Cc: isar-users@googlegroups.com
Subject: Re: [PATCH] meta: drop debian stretch support
Date: Thu, 22 Dec 2022 17:11:47 +0100 [thread overview]
Message-ID: <20221222171147.287a49a6@md1za8fc.ad001.siemens.net> (raw)
In-Reply-To: <20221222154730.10697-1-amikan@ilbers.de>
Am Thu, 22 Dec 2022 18:47:30 +0300
schrieb Anton Mikanovich <amikan@ilbers.de>:
> Debian Stretch state was moved to EOL since July 2020, so drop it.
> This will allow us to get rid of many hacks inside Isar core and
> single example packages.
> Also drop raspbian-stretch distro and rpi machine used it.
please run a round of grep over the codebase to look for 9 or stretch,
and maybe other hints like ">" or "<" and numbers.
You did miss a wic hack that will be really nice to finally get rid off.
set FAKEROOTCMD = "true" and remove scripts/wic_fakeroot
see
https://github.com/ilbers/isar/blob/a4de91e7debb49b47e502b70527a6a91fb8cb9fc/scripts/wic_fakeroot#L7
according to that comment that can be done once we do not have any
distro with e2fsck <= 1.43.5 ... but CI should tell.
Henning
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
> meta-isar/conf/distro/raspbian-stretch.conf | 17 -------
> meta-isar/conf/distro/raspbian-stretch.list | 2 -
> meta-isar/conf/local.conf.sample | 7 ---
> meta-isar/conf/machine/rpi.conf | 8 ----
> .../multiconfig/container-amd64-stretch.conf | 7 ---
> .../conf/multiconfig/qemuamd64-stretch.conf | 5 --
> .../conf/multiconfig/qemuarm-stretch.conf | 5 --
> .../conf/multiconfig/qemuarm64-stretch.conf | 6 ---
> .../conf/multiconfig/qemui386-stretch.conf | 5 --
> .../conf/multiconfig/qemumipsel-stretch.conf | 5 --
> meta-isar/conf/multiconfig/rpi-stretch.conf | 47
> ------------------- meta/classes/buildchroot.bbclass |
> 3 +- meta/classes/dpkg-gbp.bbclass | 7 +--
> meta/classes/image.bbclass | 2 -
> meta/classes/sbuild.bbclass | 3 +-
> meta/conf/distro/debian-stretch.conf | 17 -------
> meta/conf/distro/debian-stretch.list | 8 ----
> .../files/isar-apt-fallback.conf | 4 --
> .../isar-bootstrap/isar-bootstrap.inc | 18 +------
> meta/recipes-kernel/linux/linux-custom.inc | 1 -
> testsuite/cibuilder.py | 1 -
> testsuite/citest.py | 6 ---
> testsuite/start_vm.py | 2 +-
> 23 files changed, 6 insertions(+), 180 deletions(-)
> delete mode 100644 meta-isar/conf/distro/raspbian-stretch.conf
> delete mode 100644 meta-isar/conf/distro/raspbian-stretch.list
> delete mode 100644 meta-isar/conf/machine/rpi.conf
> delete mode 100644
> meta-isar/conf/multiconfig/container-amd64-stretch.conf delete mode
> 100644 meta-isar/conf/multiconfig/qemuamd64-stretch.conf delete mode
> 100644 meta-isar/conf/multiconfig/qemuarm-stretch.conf delete mode
> 100644 meta-isar/conf/multiconfig/qemuarm64-stretch.conf delete mode
> 100644 meta-isar/conf/multiconfig/qemui386-stretch.conf delete mode
> 100644 meta-isar/conf/multiconfig/qemumipsel-stretch.conf delete mode
> 100644 meta-isar/conf/multiconfig/rpi-stretch.conf delete mode 100644
> meta/conf/distro/debian-stretch.conf delete mode 100644
> meta/conf/distro/debian-stretch.list delete mode 100644
> meta/recipes-core/isar-bootstrap/files/isar-apt-fallback.conf
>
> diff --git a/meta-isar/conf/distro/raspbian-stretch.conf
> b/meta-isar/conf/distro/raspbian-stretch.conf deleted file mode 100644
> index 1ad0152f..00000000
> --- a/meta-isar/conf/distro/raspbian-stretch.conf
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -# Raspbian stable distribution configuration
> -#
> -# This software is a part of ISAR.
> -# Copyright (C) 2015-2019 ilbers GmbH
> -
> -BASE_DISTRO = "raspbian"
> -BASE_DISTRO_CODENAME = "stretch"
> -
> -HOST_BASE_DISTRO = "debian"
> -
> -HOST_DISTRO ?= "debian-stretch"
> -HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list"
> -
> -DISTRO_APT_SOURCES ?= "conf/distro/raspbian-stretch.list"
> -DISTRO_BOOTSTRAP_KEYS +=
> "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de"
> -DISTRO_CONFIG_SCRIPT ?=
> "${LAYERDIR_isar}/conf/distro/raspbian-configscript.sh"
> -DISTRO_KERNELS ?= "rpi rpi2 rpi-rpfv rpi2-rpfv" diff --git
> a/meta-isar/conf/distro/raspbian-stretch.list
> b/meta-isar/conf/distro/raspbian-stretch.list deleted file mode
> 100644 index 03b869ea..00000000 ---
> a/meta-isar/conf/distro/raspbian-stretch.list +++ /dev/null @@ -1,2
> +0,0 @@ -deb http://archive.raspbian.org/raspbian
> stretch main contrib non-free firmware -deb-src
> http://archive.raspbian.org/raspbian stretch main
> contrib non-free firmware diff --git
> a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
> index 57d06202..e1cd66e8 100644 ---
> a/meta-isar/conf/local.conf.sample +++
> b/meta-isar/conf/local.conf.sample @@ -38,27 +38,21 @@ DISTRO_ARCH
> ??= "armhf" # # This sets the default multiple configurations used:
> BBMULTICONFIG = " \
> - qemuarm-stretch \
> qemuarm-buster \
> qemuarm-bullseye \
> qemuarm-bookworm \
> - qemuarm64-stretch \
> qemuarm64-buster \
> qemuarm64-bullseye \
> qemuarm64-bookworm \
> - qemui386-stretch \
> qemui386-buster \
> qemui386-bullseye \
> qemui386-bookworm \
> - qemuamd64-stretch \
> qemuamd64-buster \
> qemuamd64-bullseye \
> qemuamd64-bookworm \
> - container-amd64-stretch \
> container-amd64-buster \
> container-amd64-bullseye \
> container-amd64-bookworm \
> - qemumipsel-stretch \
> qemumipsel-buster \
> qemumipsel-bullseye \
> qemumipsel-bookworm \
> @@ -77,7 +71,6 @@ BBMULTICONFIG = " \
> stm32mp15x-buster \
> stm32mp15x-bullseye \
> virtualbox-bullseye \
> - rpi-stretch \
> rpi-arm-bullseye \
> rpi-arm-v7-bullseye \
> rpi-arm-v7l-bullseye \
> diff --git a/meta-isar/conf/machine/rpi.conf
> b/meta-isar/conf/machine/rpi.conf deleted file mode 100644
> index 917527f0..00000000
> --- a/meta-isar/conf/machine/rpi.conf
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -# This software is a part of ISAR.
> -# Copyright (C) 2015-2017 ilbers GmbH
> -
> -MACHINE_SERIAL ?= "ttyAMA0"
> -BAUDRATE_TTY ?= "9600"
> -
> -IMAGE_FSTYPES ?= "wic"
> -WKS_FILE ?= "rpi-sdimg"
> diff --git a/meta-isar/conf/multiconfig/container-amd64-stretch.conf
> b/meta-isar/conf/multiconfig/container-amd64-stretch.conf deleted
> file mode 100644 index 76a34d55..00000000
> --- a/meta-isar/conf/multiconfig/container-amd64-stretch.conf
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -#
> -# Copyright (c) Siemens AG, 2021
> -#
> -# SPDX-License-Identifier: MIT
> -
> -MACHINE ?= "container-amd64"
> -DISTRO ?= "debian-stretch"
> diff --git a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf
> b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf deleted file mode
> 100644 index f9592c71..00000000
> --- a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# This software is a part of ISAR.
> -# Copyright (C) 2017 ilbers GmbH
> -
> -MACHINE ?= "qemuamd64"
> -DISTRO ?= "debian-stretch"
> diff --git a/meta-isar/conf/multiconfig/qemuarm-stretch.conf
> b/meta-isar/conf/multiconfig/qemuarm-stretch.conf deleted file mode
> 100644 index f3af9fc3..00000000
> --- a/meta-isar/conf/multiconfig/qemuarm-stretch.conf
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# This software is a part of ISAR.
> -# Copyright (C) 2017 ilbers GmbH
> -
> -MACHINE ?= "qemuarm"
> -DISTRO ?= "debian-stretch"
> diff --git a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf
> b/meta-isar/conf/multiconfig/qemuarm64-stretch.conf deleted file mode
> 100644 index 0fd39fca..00000000
> --- a/meta-isar/conf/multiconfig/qemuarm64-stretch.conf
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -# This software is a part of ISAR.
> -# Copyright (C) 2017 ilbers GmbH
> -# Copyright (c) Siemens AG, 2018
> -
> -MACHINE ?= "qemuarm64"
> -DISTRO ?= "debian-stretch"
> diff --git a/meta-isar/conf/multiconfig/qemui386-stretch.conf
> b/meta-isar/conf/multiconfig/qemui386-stretch.conf deleted file mode
> 100644 index 007e82b9..00000000
> --- a/meta-isar/conf/multiconfig/qemui386-stretch.conf
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# This software is a part of ISAR.
> -# Copyright (C) 2017 ilbers GmbH
> -
> -MACHINE ?= "qemui386"
> -DISTRO ?= "debian-stretch"
> diff --git a/meta-isar/conf/multiconfig/qemumipsel-stretch.conf
> b/meta-isar/conf/multiconfig/qemumipsel-stretch.conf deleted file
> mode 100644 index 53009be6..00000000
> --- a/meta-isar/conf/multiconfig/qemumipsel-stretch.conf
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# This software is a part of ISAR.
> -# Copyright (C) 2019 Mentor Graphics, a Siemens busines
> -
> -MACHINE ?= "qemumipsel"
> -DISTRO ?= "debian-stretch"
> diff --git a/meta-isar/conf/multiconfig/rpi-stretch.conf
> b/meta-isar/conf/multiconfig/rpi-stretch.conf deleted file mode 100644
> index 3c9470e8..00000000
> --- a/meta-isar/conf/multiconfig/rpi-stretch.conf
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -#
> -# This software is a part of ISAR.
> -# Copyright (C) 2015-2019 ilbers GmbH
> -#
> -# This configuration file is a part of bitbake multiconfig. Bitbake
> combines -# these settings with local.conf ones and start task
> execution with this -# environment.
> -
> -# This sets the default machine to be rpi in this configuration:
> -MACHINE ?= "rpi"
> -
> -# This sets the default distribution configuration:
> -DISTRO ?= "raspbian-stretch"
> -DISTRO_ARCH ?= "armhf"
> -
> -KERNEL_NAME ?= "rpi-rpfv"
> -
> -IMAGE_PREINSTALL += " \
> - bind9-host \
> - dnsutils \
> - iproute2 \
> - iputils-ping \
> - isc-dhcp-client \
> - lrzsz \
> - net-tools \
> - netcat-openbsd \
> - openssh-client \
> - openssh-server \
> - raspberrypi-bootloader-nokernel \
> - systemd-sysv \
> - telnet \
> - traceroute \
> - vim \
> - "
> -
> -IMAGE_INSTALL += "sshd-regen-keys \
> - bootconfig-${MACHINE}"
> -
> -WIC_IMAGER_INSTALL = "parted \
> - dosfstools \
> - mtools \
> - e2fsprogs \
> - python3 \
> - bmap-tools"
> -
> -IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \
> - ${IMAGE_ROOTFS}/boot/overlays/*;overlays/"
> diff --git a/meta/classes/buildchroot.bbclass
> b/meta/classes/buildchroot.bbclass index b4ff2886..5abd533b 100644
> --- a/meta/classes/buildchroot.bbclass
> +++ b/meta/classes/buildchroot.bbclass
> @@ -9,8 +9,7 @@ ISAR_CROSS_COMPILE ??= "0"
> python __anonymous() {
> mode = d.getVar('ISAR_CROSS_COMPILE', True)
> distro_arch = d.getVar('DISTRO_ARCH')
> - if mode == "0" or d.getVar('HOST_ARCH') == distro_arch or \
> - (d.getVar('HOST_DISTRO') == "debian-stretch" and distro_arch
> == "i386"):
> + if mode == "0" or d.getVar('HOST_ARCH') == distro_arch:
> dep = "buildchroot-target:do_build"
> rootfs = d.getVar('BUILDCHROOT_TARGET_DIR', False)
> else:
> diff --git a/meta/classes/dpkg-gbp.bbclass
> b/meta/classes/dpkg-gbp.bbclass index 68172b3f..f765eb9a 100644
> --- a/meta/classes/dpkg-gbp.bbclass
> +++ b/meta/classes/dpkg-gbp.bbclass
> @@ -9,16 +9,13 @@ S = "${WORKDIR}/git"
>
> PATCHTOOL ?= "git"
>
> -GBP_EXTRA_OPTIONS ?= "--git-pristine-tar"
> +GBP_EXTRA_OPTIONS ?= "--pristine-tar"
>
> SCHROOT_MOUNTS = "${WORKDIR}:${PP} ${GITDIR}:/home/.git-downloads"
>
> dpkg_runbuild_prepend() {
> sh -c "
> cd ${WORKDIR}/${PPS}
> - gbp buildpackage --git-ignore-new --git-builder=/bin/true
> ${GBP_EXTRA_OPTIONS}
> + gbp export-orig ${GBP_EXTRA_OPTIONS}
> "
> - # NOTE: `buildpackage --git-builder=/bin/true
> --git-pristine-tar` is used
> - # for compatibility with gbp version froms debian-stretch. In
> newer distros
> - # it's possible to use a subcommand `export-orig --pristine-tar`
> }
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 813e1f34..629a0c1d 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -419,8 +419,6 @@ do_rootfs_finalize() {
> mountpoint -q '${ROOTFSDIR}/sys' && \
> umount -l ${ROOTFSDIR}/sys
>
> - rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf"
> -
> rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list"
> rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt"
> rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list"
> diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass
> index a29b745b..6e3c790c 100644
> --- a/meta/classes/sbuild.bbclass
> +++ b/meta/classes/sbuild.bbclass
> @@ -11,8 +11,7 @@ python __anonymous() {
>
> mode = d.getVar('ISAR_CROSS_COMPILE', True)
> distro_arch = d.getVar('DISTRO_ARCH')
> - if mode == "0" or d.getVar('HOST_ARCH') == distro_arch or \
> - (d.getVar('HOST_DISTRO') == "debian-stretch" and distro_arch
> == "i386"):
> + if mode == "0" or d.getVar('HOST_ARCH') == distro_arch:
> d.setVar('SBUILD_HOST_ARCH', distro_arch)
> d.setVar('SCHROOT_DIR', d.getVar('SCHROOT_TARGET_DIR',
> False)) dep = "sbuild-chroot-target:do_build"
> diff --git a/meta/conf/distro/debian-stretch.conf
> b/meta/conf/distro/debian-stretch.conf deleted file mode 100644
> index 8b38fa54..00000000
> --- a/meta/conf/distro/debian-stretch.conf
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -# This software is a part of ISAR.
> -# Copyright (C) 2017 ilbers GmbH
> -
> -require debian-common.conf
> -
> -BASE_DISTRO_CODENAME = "stretch"
> -
> -HOST_DISTRO ?= "debian-stretch"
> -
> -DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
> -DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64
> armmp \
> - armmp-lpae kirkwood loongson-3 marvell octeon orion5x
> powerpc64le \
> - rt-686-pae rt-amd64 s390x"
> -
> -WIC_IMAGER_INSTALL += "python3"
> -WIC_IMAGER_INSTALL_remove = "fdisk"
> -WIC_IMAGER_INSTALL_remove = "python3-distutils"
> diff --git a/meta/conf/distro/debian-stretch.list
> b/meta/conf/distro/debian-stretch.list deleted file mode 100644
> index 8da9a43b..00000000
> --- a/meta/conf/distro/debian-stretch.list
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -deb http://deb.debian.org/debian stretch main contrib non-free
> -deb-src http://deb.debian.org/debian stretch main contrib
> non-free -
> -deb http://deb.debian.org/debian-security/ stretch/updates
> main contrib non-free -deb-src
> http://deb.debian.org/debian-security/ stretch/updates main contrib
> non-free - -deb http://deb.debian.org/debian stretch-updates
> main contrib non-free -deb-src http://deb.debian.org/debian
> stretch-updates main contrib non-free diff --git
> a/meta/recipes-core/isar-bootstrap/files/isar-apt-fallback.conf
> b/meta/recipes-core/isar-bootstrap/files/isar-apt-fallback.conf
> deleted file mode 100644 index 12ddbeac..00000000 ---
> a/meta/recipes-core/isar-bootstrap/files/isar-apt-fallback.conf +++
> /dev/null @@ -1,4 +0,0 @@
> -# Switch apt caching mechanism from mmap to array-based.
> -# This helps to build fresh Isar suites on old hosts.
> -
> -APT::Cache-Fallback "1";
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index
> b9ae16cd..faba73fe 100644 ---
> a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++
> b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -9,7 +9,6 @@
> LICENSE = "gpl-2.0" LIC_FILES_CHKSUM =
> "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
> FILESPATH_prepend := "${THISDIR}/files:" SRC_URI = " \
> - file://isar-apt-fallback.conf \
> file://locale \
> file://chroot-setup.sh"
> PV = "1.0"
> @@ -26,7 +25,7 @@ THIRD_PARTY_APT_KEYFILES = ""
> DEPLOY_ISAR_BOOTSTRAP ?= ""
> DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales"
> DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg"
> -DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support =
> "${@https_support(d)}"
> +DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support =
> ",ca-certificates" DISTRO_VARS_PREFIX ?= "${@'HOST_' if
> d.getVar('BOOTSTRAP_FOR_HOST') == '1' else ''}" BOOTSTRAP_DISTRO =
> "${@d.getVar('HOST_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1'
> else 'DISTRO')}" BOOTSTRAP_BASE_DISTRO =
> "${@d.getVar('HOST_BASE_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') ==
> '1' else 'BASE_DISTRO')}" @@ -180,12 +179,6 @@ def
> get_distro_primary_source_entry(d): def
> get_distro_have_https_source(d): return
> any(source[2].startswith("https://") for source in
> generate_distro_sources(d)) -def https_support(d):
> - if get_distro_suite(d) == "stretch":
> - return ",apt-transport-https,ca-certificates"
> - else:
> - return ",ca-certificates"
> -
> def get_distro_needs_https_support(d):
> if get_distro_have_https_source(d):
> return "https-support"
> @@ -284,9 +277,6 @@ do_bootstrap() {
> if [ -z "${COMPAT_DISTRO_ARCH}" ]; then
> bbfatal "${DISTRO_ARCH} does not have a compat arch"
> fi
> - if [ "${@get_distro_suite(d)}-${COMPAT_DISTRO_ARCH}" =
> "stretch-i386" ]; then
> - bbfatal "compat arch build for stretch-i386 not
> supported"
> - fi
> fi
> debootstrap_args="--verbose --variant=minbase
> --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}" if [ -f
> "${DISTRO_BOOTSTRAP_KEYRING}" ]; then @@ -357,12 +347,6 @@
> do_bootstrap() { rm -rf "${ROOTFSDIR}${MY_GPGHOME}"
> done
>
> - if [ "${@get_distro_suite(d)}" = "stretch" ] && [
> "${@get_host_release().split('.')[0]}" -lt "4" ]; then
> - mkdir -p "${ROOTFSDIR}/etc/apt/apt.conf.d"
> - install -v -m644 "${WORKDIR}/isar-apt-fallback.conf" \
> -
> "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf"
> - fi
> -
> # Set locale
> install -v -m644 "${WORKDIR}/locale"
> "${ROOTFSDIR}/etc/locale"
> diff --git a/meta/recipes-kernel/linux/linux-custom.inc
> b/meta/recipes-kernel/linux/linux-custom.inc index 96f0afc4..447d4e80
> 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc
> +++ b/meta/recipes-kernel/linux/linux-custom.inc
> @@ -30,7 +30,6 @@ KERNEL_DEBIAN_DEPENDS ?= "initramfs-tools |
> linux-initramfs-tool, \ linux-base (>= 4.3~),"
>
> LIBSSL_DEP = "libssl3"
> -LIBSSL_DEP_stretch = "libssl1.1"
> LIBSSL_DEP_buster = "libssl1.1"
> LIBSSL_DEP_bullseye = "libssl1.1"
>
> diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
> index d5c83b22..39cbd2e9 100755
> --- a/testsuite/cibuilder.py
> +++ b/testsuite/cibuilder.py
> @@ -92,7 +92,6 @@ class CIBuilder(Test):
> if compat_arch:
> f.write('ISAR_ENABLE_COMPAT_ARCH_amd64 = "1"\n')
> f.write('ISAR_ENABLE_COMPAT_ARCH_arm64 = "1"\n')
> -
> f.write('ISAR_ENABLE_COMPAT_ARCH_debian-stretch_amd64 = "0"\n')
> f.write('IMAGE_INSTALL += "kselftest"\n') if cross:
> f.write('ISAR_CROSS_COMPILE = "1"\n')
> diff --git a/testsuite/citest.py b/testsuite/citest.py
> index d4fb177f..7aa1e6b5 100755
> --- a/testsuite/citest.py
> +++ b/testsuite/citest.py
> @@ -161,7 +161,6 @@ class NoCrossTest(CIBaseTest):
> 'mc:qemuarm-buster:isar-image-base',
> 'mc:qemuarm-bullseye:isar-image-base',
> 'mc:qemuarm64-bullseye:isar-image-base',
> - 'mc:qemui386-stretch:isar-image-base',
> 'mc:qemui386-buster:isar-image-base',
> 'mc:qemui386-bullseye:isar-image-base',
> 'mc:qemuamd64-buster:isar-image-base',
> @@ -257,7 +256,6 @@ class ContainerImageTest(CIBaseTest):
> @skipUnless(UMOCI_AVAILABLE and SKOPEO_AVAILABLE, 'umoci/skopeo
> not found') def test_container_image(self):
> targets = [
> - 'mc:container-amd64-stretch:isar-image-base',
> 'mc:container-amd64-buster:isar-image-base',
> 'mc:container-amd64-bullseye:isar-image-base',
> 'mc:container-amd64-bookworm:isar-image-base'
> @@ -344,10 +342,6 @@ class VmBootTestFull(CIBaseTest):
> self.init()
> self.vm_start('amd64','bullseye')
>
> - def test_i386_stretch(self):
> - self.init()
> - self.vm_start('i386','stretch')
> -
> def test_i386_buster(self):
> self.init()
> self.vm_start('i386','buster')
> diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py
> index dbe70815..593e2607 100755
> --- a/testsuite/start_vm.py
> +++ b/testsuite/start_vm.py
> @@ -98,7 +98,7 @@ if __name__ == "__main__":
> parser = argparse.ArgumentParser()
> parser.add_argument('-a', '--arch', choices=['arm', 'arm64',
> 'amd64', 'i386', 'mipsel'], help='set isar machine architecture.',
> default='arm') parser.add_argument('-b', '--build', help='set path to
> build directory.', default=os.getcwd())
> - parser.add_argument('-d', '--distro', choices=['jessie',
> 'stretch', 'buster', 'bullseye', 'bookworm'], help='set isar Debian
> distribution.', default='stretch')
> + parser.add_argument('-d', '--distro', choices=['buster',
> 'bullseye', 'bookworm'], help='set isar Debian distribution.',
> default='bookworm') parser.add_argument('-o', '--out', help='Route
> QEMU console output to specified file.') parser.add_argument('-p',
> '--pid', help='Store QEMU pid to specified file.')
> parser.add_argument('--pcbios', action="store_true", help='remove any
> bios options to enforce use of pc bios')
prev parent reply other threads:[~2022-12-22 16:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-22 15:47 Anton Mikanovich
2022-12-22 16:11 ` Henning Schild [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221222171147.287a49a6@md1za8fc.ad001.siemens.net \
--to=henning.schild@siemens.com \
--cc=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox