From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7180000193640660992 X-Received: by 2002:a2e:959a:0:b0:27f:c0b1:c2b2 with SMTP id w26-20020a2e959a000000b0027fc0b1c2b2mr2213962ljh.89.1672674996021; Mon, 02 Jan 2023 07:56:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4e8a:0:b0:4c8:8384:83f3 with SMTP id o10-20020ac24e8a000000b004c8838483f3ls63426lfr.3.-pod-prod-gmail; Mon, 02 Jan 2023 07:56:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXv2yg+rqQvSulTxIETfcKSUfRqf7vJWaUjNa7lfwbOfKRxRCKU9lSNgrPvgjMGAmziza4K0 X-Received: by 2002:ac2:5479:0:b0:4a4:68b9:66f3 with SMTP id e25-20020ac25479000000b004a468b966f3mr10385848lfn.62.1672674994617; Mon, 02 Jan 2023 07:56:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672674994; cv=pass; d=google.com; s=arc-20160816; b=n4lSRNCW5Xx41168jfXm9XLn7E1DWD906HrZ+038ODso5oF6Qnbld/lyFUfs39Duqa ADFZRGbBYRR23lb9bZjI5kPe8SWgGWI2MQORTCjFCkPRbamXqUUifLR2dNPGU1eTPzIW Aa6MeSqZ1pFRkrkeMn+0MJ0Tb0I3bkjrL6POi8S+fEdLSPg7V4taYcxD+gmvB2rWaE1l iqNDDbZI7zMBplWV7DCwUfXAXOyZATd/WwMyBE6NVQv7F2dQizTOIhP9srXUyIAyuMZE lF95dsmGry025m4IeYhdG8H3INFUO8dvfFja4o7deVmQBM6Ljt5QLVaB/aDKbOT77WJW u1Aw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=ibD1gQ8FJoFU1UbyZF+Fgl1HGtG/ppNV91whMfTf8lk=; b=E5s7YiT1p6VbxoaX4/lVTk4/vv9l7ueWQzFvuZpgbUIoqPRoxxBapp0Q+/5nSN+kzG yDZ2KGtYbHbRYPD9zmc//jdNLUmU+3MysACuqa5OPj8z8fGbtlGoPsNx4j1LwNXuToiE M4agIVMmj8Ri5chB0ceyYCaQl+ZabFwtVrAkbK5bSYjgWBs8iLP3trLZ6FY6nGFq/NeX l6isU7vdTYxOfT7ojoZbhrE8pzyqs3OsWqN9v0NzKSbQM7eu2Y1vs893YEla5Ic0DG81 CZASEtpxpGg/zeXmoJXVza/hOqLBBUpHNnSHtiup1juk/4LnYbotYDa8bRnxPLV2lFWt voMQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=CiRocgM9; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.21.84 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2084.outbound.protection.outlook.com. [40.107.21.84]) by gmr-mx.google.com with ESMTPS id w2-20020a05651234c200b004b49cc7bf6asi946729lfr.9.2023.01.02.07.56.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jan 2023 07:56:34 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.21.84 as permitted sender) client-ip=40.107.21.84; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=CiRocgM9; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.21.84 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J13p++heJ7QWy42EmGsqw2nnZkGOpDbSWYrzbrvIb9e4oI6yMAC5zAsA1SzUSpSVZfqpr6VjGGLFS7leU6KoWjkjY/W19cPwjGBEP17GIPQRvLdu+QDDHkES7OaDIkOKyHcQW8u04PUGoRdw39siSLY0QwYqsJNm3BGWhayt9haad8jqHTwi90Rbnc5Uk8sfRK/iyi9+tflXi8v5nVwKOeGApAAcF6nDFHCZtadgPX5MUh/pvx7k0ZDopF1YsI44c8WNFJz/MYeKbcPpiVk7lEPgLzzu6wFybl9yOnacJfxpcoAWDCwU2Dv4O7859Dq7dQ2PD7CYz4e+gcU2xSgCHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ibD1gQ8FJoFU1UbyZF+Fgl1HGtG/ppNV91whMfTf8lk=; b=oQe7dytccAK4UCrcrWJ5+US/eYHXqhrlo2gv48c/A3xxMmYR44t8KVNHOJnORiC9gHyccfJiQsgGh6zKW8Y0fXiA0y6Jbin6ThJFtCl2T9SMaxyTJVx6t4wLSJsTTtKK3x6IYnIQ5ed4SzwL7cNxE/E8SBA7+DE3idPr/6zKxOy8EBrjYzZEHjozDRl8vPZCxseU4viPVyGmtjWN/ycOgrxIEH5OPnzua5L40DY6IfxqXWNZUwLjPNZlWjUJ8G4DyVgmVhEiGvcWYIQYrSbOuLqc5Ks6zfLo+6VfWBKGPr74jWHmsOGGCkVDLnSfDuBzLL7Wswugsbda4NXIuCLiCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ibD1gQ8FJoFU1UbyZF+Fgl1HGtG/ppNV91whMfTf8lk=; b=CiRocgM9BpYq2lhVcQ9s5jfPbuqZ4O1ZzVHEsgFxWAKUAVKc9fNYCHs8RdMgYLXWaxswiHDXQcFlId6zx14ZozxUZUMSlsiMX9NOGWfcZy+ZoQ3AK+g0nf6CiQIMMrmQ8KthYiZLDWGj7iebakiYbAu55fsdek3gMjUoNWmKYT2lRZC2wyNmCr9GVvFy/KnbUXaBSGdQ99p1jMb0kRcE6vDhOo/pq1gNGzJRvw0mHVMlsl2ZeYxAVfS2Qmqyy16l85TsSLIvMQD5CRtWJp6qNZ29riCnZyw8oMmx0zxKBIn0pnYstK3iglz1XPDrV7rQf6o1hT9FKncY109K1jPd2Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by AS8PR10MB6844.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5b6::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.13; Mon, 2 Jan 2023 15:56:32 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::bdf0:fdeb:f955:bc79%3]) with mapi id 15.20.5944.019; Mon, 2 Jan 2023 15:56:32 +0000 Date: Mon, 2 Jan 2023 16:56:24 +0100 From: Henning Schild To: Anton Mikanovich Cc: isar-users@googlegroups.com Subject: Re: [PATCH v3] meta: drop debian stretch support Message-ID: <20230102165624.635728f9@md1za8fc.ad001.siemens.net> In-Reply-To: <20221227063555.22836-1-amikan@ilbers.de> References: <20221227063555.22836-1-amikan@ilbers.de> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.35; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH2PR02CA0025.namprd02.prod.outlook.com (2603:10b6:610:4e::35) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|AS8PR10MB6844:EE_ X-MS-Office365-Filtering-Correlation-Id: abba7b21-c528-4809-b30b-08daecd9eac0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V34TQbMEFi0phFhDBqJx8RsEMhl83QflkWzxGVh85H8voury9LvHDCqLsZEdFvhUstYoxbEB47OfJFIobJTTkYbzds3MRKhIqjJ8Hh5/kDiNcl7kBs+jovLXfnGMDd8IInEw12PfoacI+zzj8KvsssS2JAS2ZrfabxxncNg0W4lMDSDDl+JARiRzli+o7q4v+U6aTLVRnTEB2gAIhoCUGcLds8xWfIZDxFWqB+YAZqtQlEAOF9ASFXk+AC15H3LzulWXp1zGeNNebZOBqo7lXvAKYW/4YufrkIMNno0Sk0Q6aOtP6vubchkeiuEypD9+rCEu5R3NXRwirPiJJZhji/MS8qY8lSbKQaPYnfnjF0dPGN2q3K1aemP/DrIgrXhar9Sn/kAgCj36dnAANw3izOwtUesG4umuj4spPl3NNan+5OYYUGVHq8gQn14ceVUB9CXrZaJo/wSShNWBUjLUH3ybJvBXuR///L0unGv4b5mh1jAJgene6Ug4IRs3xAGrahkeUha++f0M2DjMc4Zm1N/8ssisa/9be3iXzgqARk8B0a/uBIgJTEGrQjBlsWK8f/7rmDAVohXxKQizQ9JwiPf/N6uqvorSowZZXkz6WShGsIRafY9E3UJ9tzEW0N2nCulAPb5XtSeNEdI6nkWehbHJ/ZJt1GW3kA2b7SSgWL1u4IVIFgM7Da798/4DxqXRhcBP4bx8yrKQifNi7CQyAP/Teelqe3RUJl6rnBAnUBNVbv3o8f5IB6rbufPROeQy X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(136003)(366004)(346002)(376002)(396003)(451199015)(5660300002)(83380400001)(8936002)(30864003)(44832011)(2906002)(41300700001)(86362001)(82960400001)(38100700002)(26005)(186003)(6916009)(9686003)(6512007)(6666004)(316002)(966005)(6486002)(478600001)(6506007)(66556008)(66946007)(4326008)(8676002)(66476007)(1076003)(22166006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8wr1QgB4P1ZGNtrn6rIUVAxZj+dNoe+pEYLZ1PTkL+6lfhbxpQwBoJVP+hZg?= =?us-ascii?Q?SYBfK/2Lv6BzxNBiXofWlvhh8R2v3F2U43PTpd2+K2gyDYfymhwlGDlMu19R?= =?us-ascii?Q?w+bDVrcO8ujt9NDLHxHBcRMlSsbrH2R1sKPgMqAORKSChCTbfQdW21+aT/KU?= =?us-ascii?Q?6D00lfD+KQBRJYS/37euVwVxP07/zG1PE9wDkWpBu6XCNU7sdkgp4Dljfxi7?= =?us-ascii?Q?fwjUyDcl4/rVZX7AhFhxki9tMjthAhv48YPeo2JmDYYQkUel0xYytu1za8kb?= =?us-ascii?Q?f5F9RemEBRaI4kQ2aQdPHai6gcIZSdQqsebgZ5pvd7Q1GzvzDF/KAa2Loce8?= =?us-ascii?Q?dpz016IJ2q7+/Yo0bgE+xwIUV89QEu6PB63kejhIBj8vfL9oTPrDBngkmIKJ?= =?us-ascii?Q?CANey3TIgUhyWvgUJD9lDc4RhgAbjxp7q9IwtJwe2r81FIdgrKHOgHHmymdd?= =?us-ascii?Q?g67xIaE+KHGYuELfEYNQjAD8bRzImNq2NXwAaebp/vz4uBJVmtUJVJgUcLdp?= =?us-ascii?Q?PTfBEXKiTaoTvszYQACZ419BXmYe1NLpd8Me7lOOdXZtqNYNKxCER2WEYw2T?= =?us-ascii?Q?cEEywsTSfFERvU/dTXFvtt//FF7cqYAN5gcXt7Hq7VZ7ohULhU8HxqFu3sYu?= =?us-ascii?Q?Pxbtkvbbxq/ix/6Wcy/TjM9jeHBEnyYn/45nWea9w/O9w7dr5zhrabv901cI?= =?us-ascii?Q?Or99OPskBgOMg5zLa0VHc5hedMySJ0DBfs3OzNS2/7n+xWj1RZt2s4l3KN4A?= =?us-ascii?Q?HnTeagsY6fzonhNwH25dGjUDYQ642kM4gy4wSRoshADw5vxqORXXpO3WlLGf?= =?us-ascii?Q?ipuKBgUcbREauhi6bISUK/qZPh2Yi1+vC2t/Ny88oclIXGvZHKOjEik1uU8w?= =?us-ascii?Q?UJR/6u1rrrqvAJ00HUamEYIkOjicJkkSGQgLGie2lVluYfia+VKzL0mCb878?= =?us-ascii?Q?AJHrb0aU3xMzTylfkYs/MFHT7hnLp96oEWQfGmBoM9IXbuGq/Wdq4BB/NjOQ?= =?us-ascii?Q?3GV6DmZeEJrwgAJBHlHj+gI0i+rBRnfXV+cAIyXDK+sEoOBHnJHmP1LZUqym?= =?us-ascii?Q?1oOUwLMxWMNrKiObf/ELfOEmQiQsoNTq+qXlpoVkbyFbo0BzhQYe0J+7yZSc?= =?us-ascii?Q?gbF0oL6IsMhvKmmFih/tuOBgADISoBAJE54gOwhqiCDXlXGjXplDcI0bpV0/?= =?us-ascii?Q?Bt1ZyuAmlL80meDjjJPfz3689t+YfqliZXFnS1tUpx9mukzMc7DzIPePXq+U?= =?us-ascii?Q?v0buBIYWXIn6r1J/e4J0DSbakMKMh6buetxLPWWBiQBydiC+MMZrEJGCxFc1?= =?us-ascii?Q?aWABaNx6xWcrhIopCZmqeSYe6epvI74mTnYZlNPoEMA2bwunz1OUFNAHvtDT?= =?us-ascii?Q?X2x49y29IbBi7A0xjYaldenF7upW384CHb1J6BDRHtKziCvJz3uvpttVmzV6?= =?us-ascii?Q?9Fhl8KlDrg6P0rGhBhlxbh/7SzQ4Wg1+s7zgVis46ZXl+Sz3/JCaP0ElDM4x?= =?us-ascii?Q?W39YyIF55fJ74LWECYvdVRRg1KTq3CYAjSJtLgMruO241G0+YDCyym2Qc93W?= =?us-ascii?Q?D+UNG12q5T4EyO2cVSAsSnmS0V0f9HwjC55vb0JAiuCGLN9XdYoAOZ7WXng7?= =?us-ascii?Q?Zg=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: abba7b21-c528-4809-b30b-08daecd9eac0 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jan 2023 15:56:32.2213 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UoK+56xGLXkQKFl4ZbVGVygJ4sYpyQiTCZUnU6yU3GiWCJ0pBpZOeOedOA5oU/BqmWXQ614P5WAEy+n0u6MQvdK2T8aFK1IZZjgeqJcXJkk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB6844 X-TUID: D2jLLsa21DMK 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 : > 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 > --- > 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 ---- 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 > 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 -d > > 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. > > 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/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) > 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')