[PATCH] meta: drop debian stretch support

[Anton Mikanovich]

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.

Signed-off-by: Anton Mikanovich <ami...@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')
--
2.30.2

[Henning Schild]

Am Thu, 22 Dec 2022 18:47:30 +0300
schrieb Anton Mikanovich <ami...@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

[Anton Mikanovich]

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.

Drop wic_fakeroot fsck hack because it is no more needed.

Signed-off-by: Anton Mikanovich <ami...@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 -

scripts/start_vm | 2 +-
scripts/wic_fakeroot | 8 ----

testsuite/cibuilder.py | 1 -
testsuite/citest.py | 6 ---
testsuite/start_vm.py | 2 +-

25 files changed, 7 insertions(+), 189 deletions(-)

diff --git a/scripts/start_vm b/scripts/start_vm
index 8876e538..3b99c6ee 100755
--- a/scripts/start_vm
+++ b/scripts/start_vm
@@ -46,7 +46,7 @@ show_help() {
echo " Supported: arm, i386, amd64, arm64, mipsel, riscv64."
echo " -b, --build BUILD set path to build directory."
echo " -d, --distro DISTRO set isar Debian distribution."
- echo " Supported: stretch, buster"
+ echo " Supported: buster, bullseye, bookworm"
echo " -o, --out FILE Route QEMU console output to"
echo " specified file."
echo " -p, --pid FILE Store QEMU pid to file."
diff --git a/scripts/wic_fakeroot b/scripts/wic_fakeroot
index 304f9e8e..280d6c62 100755
--- a/scripts/wic_fakeroot
+++ b/scripts/wic_fakeroot
@@ -4,8 +4,6 @@
# use pseudo. And we call wic as root to begin with, so this script could be a
# dummy doing nothing. It is almost a dummy ...
#
-# If the fsck hack ever becomes obsolete, FAKEROOTCMD ?= "true;" can be used
-#
# This software is a part of Isar.
# Copyright (C) 2018 Siemens AG
#
@@ -30,10 +28,4 @@ assert os.geteuid() == 0, "wic_fakeroot must be run as root!"
if cmd.startswith('-'):
sys.exit(0)

-# e2fsck <= 1.43.5 returns 1 on non-errors (stretch and before affected)
-# treat 1 as safe ... the filesystem was successfully repaired and is OK
-if cmd.startswith('fsck.'):
- ret = subprocess.call(args)
- sys.exit(0 if ret == 1 else ret)
-
os.execvp(cmd, args)

--
2.30.2

[Anton Mikanovich]

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.
Drop wic_fakeroot fsck hack because it is no more needed.

Update documentation to remove Debian Stretch there also.

Signed-off-by: Anton Mikanovich <ami...@ilbers.de>
---

README.md | 2 +-
doc/offline.md | 4 +-
doc/technical_overview.md | 6 +--
doc/user_manual.md | 48 +++++++------------

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 -
scripts/start_vm | 2 +-
scripts/wic_fakeroot | 8 ----
testsuite/cibuilder.py | 1 -
testsuite/citest.py | 6 ---
testsuite/start_vm.py | 2 +-

29 files changed, 30 insertions(+), 226 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/README.md b/README.md
index 7728e647..118acf52 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ To test the QEMU image, run the following command:
$ start_vm -a <arch of your build> -d <distro of your build>

Ex: Architecture of your build could be arm,arm64,i386,amd64,etc.
- Distribution of your build could be stretch,buster,bullseye,etc.
+ Distribution of your build could be buster,bullseye,bookworm,etc.

The default root password is 'root'.

diff --git a/doc/offline.md b/doc/offline.md
index 11d1cc9e..84d50cb3 100644
--- a/doc/offline.md
+++ b/doc/offline.md
@@ -11,13 +11,13 @@ mkdir -p $WEB_HOME

```
DST=$WEB_HOME/debian
-DISTROS=stretch,stretch-updates,buster,buster-updates
+DISTROS=bullseye,bullseye-updates,bookworm,bookworm-updates
time debmirror -p --getcontents -e http -h $HOST -d $DISTROS -a $ARCHES $DST
```

```
DST=$WEB_HOME/debian-security
-DISTROS=stretch/updates,buster/updates
+DISTROS=bullseye/updates,bookworm/updates
time debmirror -p --getcontents -e http -h $HOST -r /debian-security \
-d $DISTROS -a $ARCHES $DST
```
diff --git a/doc/technical_overview.md b/doc/technical_overview.md
index bbd22b66..36bfc4a6 100644
--- a/doc/technical_overview.md
+++ b/doc/technical_overview.md
@@ -51,11 +51,11 @@ that include:

Typical example, when Isar builds the following configurations:

- - Debian Stretch, amd64
+ - Debian Bullseye, amd64

- - Debian Stretch, i386
+ - Debian Bullseye, arm64

- - Debian Buster, arm
+ - Debian Bookworm, arm

In this case there will be 3 different build subtrees. So the standard
hello-isar demo application will be processed 3 times for each
diff --git a/doc/user_manual.md b/doc/user_manual.md
index 251a2eb8..ec639e70 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -45,15 +45,10 @@ Isar provides:
For demonstration purposes, Isar provides support for the following
configurations:

- - QEMU ARM with Debian Stretch
- QEMU ARM with Debian Buster
- - QEMU ARM64 with Debian Stretch
- QEMU ARM64 with Debian Buster (for host >= buster)
- - QEMU i386 with Debian Stretch
- QEMU i386 with Debian Buster
- - QEMU amd64 with Debian Stretch
- QEMU amd64 with Debian Buster
- - Raspberry Pi 1 Model B with Raspbian Stretch
- Raspberry Pi various models with Raspberry OS Bullseye
- Banana Pi BPI-M1
- LeMaker HiKey
@@ -63,7 +58,7 @@ The steps below describe how to build the images provided by default.

### Install Host Tools

-The supported host system is >= stretch.
+The supported host system is >= buster.

Install the following packages:
```
@@ -190,15 +185,10 @@ a single call. List all configurations in `conf/local.conf`:

```

BBMULTICONFIG = " \
- qemuarm-stretch \
qemuarm-buster \

- qemuarm64-stretch \
qemuarm64-buster \
- qemui386-stretch \
qemui386-buster \
- qemuamd64-stretch \
qemuamd64-buster \
- rpi-stretch \
"
```

@@ -206,27 +196,19 @@ The following command will produce `isar-image-base` images for all targets:

```
$ bitbake \
- mc:qemuarm-stretch:isar-image-base \
mc:qemuarm-buster:isar-image-base \
- mc:qemuarm64-stretch:isar-image-base \
- mc:qemui386-stretch:isar-image-base \
+ mc:qemuarm64-buster:isar-image-base \
mc:qemui386-buster:isar-image-base \
- mc:qemuamd64-stretch:isar-image-base \
mc:qemuamd64-buster:isar-image-base \
- mc:rpi-stretch:isar-image-base
```

Created images are:

```
-tmp/deploy/images/qemuarm/isar-image-base-debian-stretch-qemuarm.ext4.img
tmp/deploy/images/qemuarm/isar-image-base-debian-buster-qemuarm.ext4.img
-tmp/deploy/images/qemuarm64/isar-image-base-debian-stretch-qemuarm64.ext4.img
-tmp/deploy/images/qemui386/isar-image-base-debian-stretch-qemui386.wic.img
+tmp/deploy/images/qemuarm64/isar-image-base-debian-buster-qemuarm64.ext4.img
tmp/deploy/images/qemui386/isar-image-base-debian-buster-qemui386.wic.img
-tmp/deploy/images/qemuamd64/isar-image-base-debian-stretch-qemuamd64.wic.img
tmp/deploy/images/qemuamd64/isar-image-base-debian-buster-qemuamd64.wic.img
-tmp/deploy/images/rpi/isar-image-base-raspbian-stretch-rpi.wic.img
```

### Generate full disk image
@@ -247,7 +229,7 @@ Variables may be used in `.wks.in` files; Isar will expand them and generate a r
In order to run the EFI images with `qemu`, an EFI firmware is required and available at the following address:
https://github.com/tianocore/edk2/tree/3858b4a1ff09d3243fea8d07bd135478237cb8f7

-Note that the `ovmf` package in Debian stretch/buster contains a pre-compiled firmware, but doesn't seem to be recent
+Note that the `ovmf` package in Debian Buster contains a pre-compiled firmware, but doesn't seem to be recent
enough to allow images to be testable under `qemu`.

```
@@ -408,7 +390,7 @@ following variables define the default configuration to build for:
- `MACHINE` - The board to build for (e.g., `qemuarm`, `rpi`). BitBake looks
for conf/multiconfig/${MACHINE}.conf in every layer.

- - `DISTRO` - The distro to use (e.g. `raspbian-stretch`, `debian-stretch`).
+ - `DISTRO` - The distro to use (e.g. `raspios-bullseye`, `debian-bookworm`).
BitBake looks for conf/distro/${DISTRO}.conf in every layer.

- `DISTRO_ARCH` - The Debian architecture to build for (e.g., `armhf`).
@@ -442,9 +424,10 @@ Some other variables include:

In Isar, each machine can use its specific Linux distro to generate `buildchroot` and target filesystem. By default, Isar provides configuration files for the following distros:

- - debian-stretch
- debian-buster
- - raspbian-stretch
+ - debian-bullseye
+ - debian-bookworm
+ - ubuntu-focal
- raspios-bullseye

User can select appropriate distro for specific machine by setting the following variable in machine configuration file:
@@ -527,8 +510,8 @@ To add new distro, user should perform the following steps:
- Create the `.conf` file in distro folder with the name of your distribution. We recommend to name distribution in the following format: `name`-`suite`, for example:

```
- debian-stretch
- debian-buster
+ debian-bullseye
+ debian-bookworm
```

- In this file, define the variables described above.
@@ -962,14 +945,17 @@ put into Isar apt.

### Limitation

-Debian cross-compilation works out of the box starting from Debian stretch distribution. Currently the following build configurations are supported in Isar:
+Debian cross-compilation works out of the box. Currently the following build configurations are supported in Isar:

- - stretch armhf
- - stretch arm64
- - stretch mipsel
- buster armhf
- buster arm64 (for host >= buster)
- buster mipsel (for host >= buster)
+ - bullseye armhf
+ - bullseye arm64
+ - bullseye mipsel
+ - bookworm armhf
+ - bookworm arm64
+ - bookworm mipsel

Experimental support for riscv64 is available as well.

[Anton Mikanovich]

27.12.2022 09:35, Anton Mikanovich wrote:
> 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.
> Drop wic_fakeroot fsck hack because it is no more needed.
>
> Update documentation to remove Debian Stretch there also.
>
> Signed-off-by: Anton Mikanovich <ami...@ilbers.de>

Applied to next.

[Jan Kiszka]

On 27.12.22 07:35, Anton Mikanovich wrote:
> 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.
> Drop wic_fakeroot fsck hack because it is no more needed.
>
> Update documentation to remove Debian Stretch there also.
>
> Signed-off-by: Anton Mikanovich <ami...@ilbers.de>

...

> 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`
> }

This cleanup is requiring an entry in RECIPE-API-CHANGELOG.md, see
https://github.com/siemens/meta-coral/blob/66a85fc4958524526d4a5e2eda0588de2a5f46f9/recipes-devtools/bazel-bootstrap/bazel-bootstrap_4.1.0%2Bds-1.bb#L14
and https://github.com/siemens/meta-iot2050/pull/396.

Jan

--
Siemens AG, Technology
Competence Center Embedded Linux

[Moessbauer, Felix]

Yes, we definitely need that API changelog entry. We have the following
pattern in many recipes:

GBP_EXTRA_OPTIONS = "--git-no-pristine-tar --git-upstream-
branch=master"

This now has to become:
GBP_EXTRA_OPTIONS = "--no-pristine-tar --upstream-branch=master"

Felix

[Moessbauer, Felix]

... and changing this breaks backwards compatibility. This is
especially problematic for layers that also have to support older
versions of ISAR. At least, there is no release in-between v0.9 and
next, so we could argue that breaking things is OK.

An alternative would be to simply replace the --git-<opt> with --<opt>
on the fly using bitbake magic.

Felix

[Jan Kiszka]

We could do that for existing GBP_EXTRA_OPTIONS and introduce a new
variable that targets the actually used GBP sub-command:
GBP_EXPORT_ORIG_EXTRA_OPTIONS.

[Henning Schild]

This one maybe should have waited a little longer for review, it fell
right into the time between christmas and new year.

A changelog to v1 would have been nice, or a reply to my review
comments i gave.

Am Tue, 27 Dec 2022 09:35:55 +0300
schrieb Anton Mikanovich <ami...@ilbers.de>:

I think this complete file can be removed. Not sure how i said it in my
review to v1. Right now this wrapper does nothing but wrap. All the
work it used to do has been deprecated and removed.

I suggest to throw a patch on top to remove the file and set

FAKEROOTCMD ?= "true;"

like the removed comment suggested.

Henning

[Henning Schild]

I tried dropping the now seemingly useless wrapper but that somehow did
not work like it used to. So maybe we need to keep it after all.

But it would be nice to know why we need to have it in place and have
that written down in a comment and a commit message.

regards,
Henning

[Baurzhan Ismagulov]

On Mon, Jan 02, 2023 at 02:06:08PM +0100, Jan Kiszka wrote:
> On 02.01.23 13:54, Moessbauer, Felix (T CED INW-CN) wrote:
> > On Mon, 2023-01-02 at 12:51 +0000, Moessbauer, Felix wrote:
> >> On Mon, 2023-01-02 at 12:01 +0100, Jan Kiszka wrote:
> >>> On 27.12.22 07:35, Anton Mikanovich wrote:
> >>>> Debian Stretch state was moved to EOL since July 2020, so drop
> >>>> it.
> >>>

> >>> This cleanup is requiring an entry in RECIPE-API-CHANGELOG.md, see
> >>> https://github.com/siemens/meta-coral/blob/66a85fc4958524526d4a5e2eda0588de2a5f46f9/recipes-devtools/bazel-bootstrap/bazel-bootstrap_4.1.0%2Bds-1.bb#L14
> >>> and https://github.com/siemens/meta-iot2050/pull/396.
> >>
> >> Yes, we definitely need that API changelog entry. We have the
> >> following
> >> pattern in many recipes:
> >>
> >> GBP_EXTRA_OPTIONS = "--git-no-pristine-tar --git-upstream-
> >> branch=master"
> >>
> >> This now has to become:
> >> GBP_EXTRA_OPTIONS = "--no-pristine-tar --upstream-branch=master"
> >
> > ... and changing this breaks backwards compatibility. This is
> > especially problematic for layers that also have to support older
> > versions of ISAR. At least, there is no release in-between v0.9 and
> > next, so we could argue that breaking things is OK.
> >
> > An alternative would be to simply replace the --git-<opt> with --<opt>
> > on the fly using bitbake magic.
>
> We could do that for existing GBP_EXTRA_OPTIONS and introduce a new
> variable that targets the actually used GBP sub-command:
> GBP_EXPORT_ORIG_EXTRA_OPTIONS.

Thanks for the info, we'll check the reported issues.

With kind regards,
Baurzhan

[Uladzimir Bely]

Hello.

I've just sent a patch that makes GBP_EXPORT_ORIG_OPTIONS variable used with
newer Isar. If downstream wants to use newer Isar, it should consider this in
the recipe. If not, it still can use old variable. To support both cases (e.g.
same layer is used in different projects with different Isar versions), both
variables should be used in the layer.

--
Uladzimir Bely

[Uladzimir Bely]

In the email from Tuesday, 3 January 2023 01:03:02 +03 user Henning Schild
wrote:

Hello.

I've experimented with this FAKEROOTCMD a bit and it seems we really still
need it.

It really almost dummy except removing first argument from command line passed
(`args.pop(0)`) and it seems to be the main thing we want from it (removing
"pseudo" or "fakeroot"?).

Simple replacing the script call with `true` command doesn't work as well as
attempt to use this logic without `pop(0)`.


--
Uladzimir Bely

[Henning Schild]

Am Wed, 04 Jan 2023 10:04:48 +0300
schrieb Uladzimir Bely <ub...@ilbers.de>:

Not sure if we want to do anything about that. Maybe we can shorten
that script and add comments on why we still have it. Or we just leave
it.

Henning