From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7180000193640660992 X-Received: by 2002:a17:906:511:b0:7c0:f213:edab with SMTP id j17-20020a170906051100b007c0f213edabmr492225eja.358.1671725517601; Thu, 22 Dec 2022 08:11:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:4413:b0:43d:b3c4:cd21 with SMTP id y19-20020a056402441300b0043db3c4cd21ls2591149eda.2.-pod-prod-gmail; Thu, 22 Dec 2022 08:11:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXuu+jdwnUX1irjyhxoKytpav5Sdx2WHmBAt+VZuN9CBsuZlzUl44d6Flc4LURAxGIJAzSu1 X-Received: by 2002:a05:6402:2488:b0:46b:34a:3945 with SMTP id q8-20020a056402248800b0046b034a3945mr6405892eda.31.1671725516527; Thu, 22 Dec 2022 08:11:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671725516; cv=pass; d=google.com; s=arc-20160816; b=rGf8MhVD6JHb4dXeoAI/xzGxjhmhZ53qcEFAAmsij9fMtnRPJYsEM57FJBfTPy0N5+ KOtm5On/X3Fb1wCniii3Gdsp/IQYbKfCHpxWMG8xIDZ2uAWTojL8k6RjuxM7GK5weZW7 z58EB0KyyF5dluCfGJEktij7QZqwegIHa5XriDWz+r+CwKGV/7H+LrNthm4FtAVbaQek SJq36trlSlxIa4wu4kM93FU80cdNOWiXKbCxgeRREnRANiyKo2v8Rc+CdlalvPb3mZ2n yzp7fsTHbNuQfWEAvYEpNAc+dph5HwLCtx7YTfH6aT1lemo517b42Q0ADyV9uQV2XXYR IhRQ== 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=+xAbR/52sue83d7ursSD8r/Us57bszGgHudRCzRak7A=; b=cXewgfNBiFbjufKhZ31SoWtNntq6KZpu4ibvP9qWQHD2oC2tWZUw7DbiYod2/JnU1i xwEs9II5ACnIUJQFiHkLVdeafXg44zw/wq3VKb0lat/DW3c1fI38HXNG2seNH5iKElDp VeuSU7ds01LPsePgPdegDh1ZCGFvw7vqr6TwcjHb0mw/6ie3J7dH9lGSxX19HYgwrSPu cWvGYJW0kg1tXFHDtX0V/dJznsWdlTHu5qmmXCIlxI/u4uOto5ihdx9kXDWtRIPcdyqE phH/fuO0qRqMREIlQuv9gfvZCyPQvrOM2aoBq8sPaqcrdW6tJEEuyCGRJjwT8w/kSv4h K33g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Z5VdcCVP; 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.8.81 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 EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2081.outbound.protection.outlook.com. [40.107.8.81]) by gmr-mx.google.com with ESMTPS id o13-20020aa7d3cd000000b004704dd69bc2si50600edr.5.2022.12.22.08.11.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Dec 2022 08:11:56 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.8.81 as permitted sender) client-ip=40.107.8.81; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Z5VdcCVP; 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.8.81 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=OEZ8DGMKMrxmtCV+hsGueMCS9y9+xOpNvMbk/F1OPsx+jysEyfUBm0DfcEr6SiXIONxG/KyI99GRJbMy9h0VsrVwqFu+0VDiIK9VjN4F8fJTZ2q8PX60fjjjQmoR7ZwC7p2bSM5/vFybQPA46DsYSVKHOWP9EVhBRabONGYKN391pBLqlT0D+8tCe80AVgzCExetNbBzjvdHVc8KGjS6+1+SAFWmvyS6Jtq2+LLfGlY/NV3ThBW4VY4wR54VfVNgxTw8RSjOqoFwPRfez9zc0WYbcUgIKcE7XKUQgIXvO+NE4RY3gor9UdwSYIWPsqcLfp/T7tJBcr8nEjfbcQFfTw== 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=+xAbR/52sue83d7ursSD8r/Us57bszGgHudRCzRak7A=; b=PeNr2yjAr1daJISyc8YDrnUVT98roSTXvlRdUicV9AXIZjl+Rd0jYkEz4hgj4m+r5HTqyK+XI/FECGgyvTYM8FWAiU9pur8ltuEoDkTSc1LEQFjou8mnAVEh5ECBhB2Vhnj/JxwyOxft18qN9fVbutGC/pfE9pAJI4ltFHPVlAu6swdPeVFXkrF2KouUY6AIJVwGRf8a7+4Gu+u45O3OaqvDt6IHqpfvAKgNeL2ESrAIQLbDJAsVKLMAk2au8YamkkR0ELDvS5ISuYIULoEunVW0Cz7s2oo9hYly2m19mzqNJeloRmCLpR8OxUhVJECc6dZgkA/fu6zX0muoLXs0Vg== 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=+xAbR/52sue83d7ursSD8r/Us57bszGgHudRCzRak7A=; b=Z5VdcCVPLOMGaION6c9SoHgPF1yFv38wREV6bWhGnB6j3nC6XijzWkWOkjA4fxVoHM0j3bx8QnySSN+oHxfRck7rmALs8pHpK7qLrljEwbH/ZiiVNMuv1Q0VxmBVj5lFvkAhO3+/PLw4PFE9xYoAPwO4yyFeT0JRpsNZnjKLgs1nfcCip/db+sYNtgi5mAA4/TNtExgpLeN9YsalF2nSTDEUaejQOgslVpenEPxre+9+/F1YgFkrLx48WMQaUld7TVqgVRW1kdp79gcOTYNC5qzVRrV2M9K9l/ycPGWhJPQvHGVAjIZBcZhGSMbRPv9A5DZkTXxQ4xVpDawPXe83Og== 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 AS8PR10MB7858.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:631::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.12; Thu, 22 Dec 2022 16:11:55 +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.5924.016; Thu, 22 Dec 2022 16:11:55 +0000 Date: Thu, 22 Dec 2022 17:11:47 +0100 From: Henning Schild To: Anton Mikanovich Cc: isar-users@googlegroups.com Subject: Re: [PATCH] meta: drop debian stretch support Message-ID: <20221222171147.287a49a6@md1za8fc.ad001.siemens.net> In-Reply-To: <20221222154730.10697-1-amikan@ilbers.de> References: <20221222154730.10697-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_|AS8PR10MB7858:EE_ X-MS-Office365-Filtering-Correlation-Id: 7504e786-989c-4655-5beb-08dae4373e87 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OIwiSlSm8OCy/9EqXHaFpTIsuDKAYwPtAs/lKkeBqfNKPn0Z6XGGRa8LtPVMos7Ol15cKqUBzyHTigDvNyTbqUMsQUaBfnQ7fXht4dW8up6AYV19yj9TknlW/dzpMusRl2rpRhE8tavjFJLQjLWUF+7fH8Mio/u3Rsc7OeA7qwSUsLCWDB63aM5OPc+zy0jKs1EPWGHmG42LQssrz99pS6Kn2wfPZzB0m/WTzHO5oG2dPnnD7WUAIEcntKxRLaibrmWQcIWFsp70Ada+0jCYp1cky5fbjspDtJFsnmItq8UQaAYdgLQgp8VyFSFoSJEAaIisH+9Qb3pnATfj+5mxw6My99OJIFW2s70HOa1N69vQhQuMt2BLYHxdEJilpH2iJsMdWTPvGJmybsBUCUzlrHA5pK7hsulpfNpBrA/eiC926+jKpOWpmRUV4HIRmA9lXvvCfGR9WAug28RuoxhFJXetwWmcNM3fVIbde8E2lWC6QQJfpMzxnxGhxxDeA+ZtDPppkxJTrtZrQvXnlUaBvFH2rC+AvtSeFcOY9GSQjrPBllNVFAbZxAiSdlHRDm1Qw7k1a2PcoBOu9NjHAFuwByKW490neDX3ojbTFMT1sCS+WAYzyCPiRRAcPf1xDeadE9/DzpMCYl7mpkzAz3OXvqYG7QgGEkVaHKYj3NB1LqQ= 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)(396003)(136003)(376002)(366004)(39860400002)(346002)(451199015)(1076003)(6486002)(966005)(478600001)(8936002)(30864003)(5660300002)(44832011)(82960400001)(38100700002)(2906002)(83380400001)(6916009)(86362001)(316002)(41300700001)(66946007)(66556008)(4326008)(8676002)(66476007)(9686003)(6512007)(26005)(186003)(6506007)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?53Yi4WQEy61yu3TndUMdDyPqVHGzqWpdHKZqpPSkbth0Wd6rTd089KvEA+rl?= =?us-ascii?Q?hiBdTqvprLtA5ZxU4Di1egNyd4oVBtvhHns+HHY53+fj+3DaeVBh9ZFFLbkA?= =?us-ascii?Q?8OjJAUtPtOyCG0QI7J24r7mfCcbv/sumKGP88PzVrSN1yDXnwwcTOEBZ1OsF?= =?us-ascii?Q?ZRJaCde3AQnngMUKLg2HBsF6o+FEX80DCSfMSMLtVL4M6riskzFqBvGoMGEI?= =?us-ascii?Q?UMoDZNY8HQFqXMgQJiVQbjNXpn+xQpct3L4QxLFQPk8COVt1QgnKh7sT2+v0?= =?us-ascii?Q?aaMzhAj610/7VSrRIHQEwhvFHpsPbVdao9lNyeyK4TzxYqz1k/Kl1y1Qsox5?= =?us-ascii?Q?EHN9u6R6buAps/kta2J3IYDDNtH8LnnUb8nDcR20N2P8EZMwS6J9EvGaSZIQ?= =?us-ascii?Q?L75KEX+dW1JoVe2LOv6DV8VotzNYgOmaUXGR3J/3pBDcpVNn3gQv6u0pysE9?= =?us-ascii?Q?CID3CYdUbWCn30DXTht0+lblNSulDQqNfclWi5uvDrDOfyYO+N2qp/3a7nPo?= =?us-ascii?Q?g2mXvsDCz5zYTZPf/WTTJgxJs5dPlVIOdt+r5yTELOkuqyW3k9rydSgSymDq?= =?us-ascii?Q?K7ykETTB6Ze3FIvZBn+xj0oPDaGNyE1Jd//Fkt3kDXzP7xFUKSFhVNcM2E/O?= =?us-ascii?Q?f0Tra4A3Ux8JOuJHP/AEToNxLb61Qw5NHmp8bOZYsNiY124e+CHM4gTiobU0?= =?us-ascii?Q?BFfZBNDagtNBaDzoNkyJUpMOrHTbGmj8kJdyB4kNjP+npUGrAxXC0LTdHaAW?= =?us-ascii?Q?JYAYdUOuYrdHRtArt/BcKhPvN3q3xPtGUS0QspRTCjTPVsou6CpWlkuVvotd?= =?us-ascii?Q?IgmSaA10RoUZzipb0w0qe7s6ZpTYnbgAhGMXpj4IG3BcrQzb3IXcx+HZZ7BM?= =?us-ascii?Q?UwsFjATTDkHUNxqff1hHqcaBGaZdtKYZVOLj9RmD6Cmwz2lDEQZQ5kRupK6b?= =?us-ascii?Q?KvJDLTbhNozkLTvQ9blaiLc2xX0mcL7/I0jSnSeCC2kPN2sxfsOPo8fCD1iC?= =?us-ascii?Q?YZvG2V4LSssVrC43vr0lnkvtdmfaXLoqYQ7yltC2BmOe4nyJrWgYFhR+zo5p?= =?us-ascii?Q?wYJhLLkWx/x8oTpl97LB+uJqC3AvESNNsSosZU/3XEgiBa8/oMUAPP7MrIHB?= =?us-ascii?Q?pZ+OThbsgNnKNSRDaPOtSAcZMMPbJfMwoG45J16SdXsVvQjkxj06+5Xs3oIf?= =?us-ascii?Q?782mB4dlaGPWe08RjUBTl4dLqrE/MSO+H437Qusng0x9gA2/z4kX8QmU48uG?= =?us-ascii?Q?8QUqprExpDZYBrD18KEbL0m+lE9SARFQ0gynpt4aBrpHRl3wzMnHXvsljQ3o?= =?us-ascii?Q?xgo3oKcSE5gADw4MJouIlV1o0FQCZ4iv8qll0xc7KP4ZaANPe0j2xTJ/F8XH?= =?us-ascii?Q?/NFQDo/izWQjeYZuU26TnVh7VqwWHlMFqJbz31HNc1mUyX5T7FNbAovJXBti?= =?us-ascii?Q?6sjqJpnxXVsTQzSPgieRsSgoSyexXRyM/UBRKdDSABaVWQSQ5K7SE0fVZ6lx?= =?us-ascii?Q?kJypQQ28U3HBeUOnyv3Zwiuh3pD/7IV1yx4m2xd/w68uQ+XVjPw7AVvWZE+o?= =?us-ascii?Q?JJV+ctrK95w7j9D4St0we9FHAkLa0Ugia9sXDrfmjoFEtDTwrldQaym3OsQo?= =?us-ascii?Q?hS5WZdpR0nOwfzpMVwX10AA=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7504e786-989c-4655-5beb-08dae4373e87 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2022 16:11:55.1782 (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: ibZrgOuwPJf7iUCPYlFiA5LGQsOCHTe2GBNcvxEtfKkw/4IhYJrKnn1dYpLZxXzoJX+vAmBU4UwXjeJvtP4JvyLVNjqnr4lnDHdm77LcxcE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB7858 X-TUID: c0BGQFlkCcKJ Am Thu, 22 Dec 2022 18:47:30 +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. 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 > --- > 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')