From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 19 Dec 2024 12:00:38 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f189.google.com (mail-qt1-f189.google.com [209.85.160.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4BJB0bM0008720 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 19 Dec 2024 12:00:37 +0100 Received: by mail-qt1-f189.google.com with SMTP id d75a77b69052e-46798d74f0csf11441641cf.0 for ; Thu, 19 Dec 2024 03:00:37 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1734606031; cv=pass; d=google.com; s=arc-20240605; b=je4W6f2sMOtz6wRDWtOFzuwI5NVJXAhD0YWlD0CdcgPbrmeswAZbVvlxiwXh4LFzAr QLzx/MwRWUydUHbDN9E7bXmn8MNRvwqusCnBYhrPPXlp5poSSInfW8E50T9wmLa0TkeZ 47S+l6z3QlH4mM3UEiZyW7eMjba2qD0CKD1wdyMZyCgDWlm+HJOso1a4ilHeLQ4LzrFH SpXVkHgc/If243IRQGO0wEEo3Pja6qmRx9CywYN2Ulcnt63rDVSBVDMlkeoapcJC5qdP XFa5zf4m74t0FEYAh9SRFXmJFHLO9OFrT2p7efFC35VF7tD9aSbI13Jke35RsTBGO5WR fXIA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=H2k/96uaU8TADdpSOOFvAJl14W8UvXqCtTQ5Nr3lHlY=; fh=bPEfpMjI1onRYSDPaZyiW3UkGJ8lFJ93j7DZXyAKeaE=; b=J4qpp9zuUwIFz/6dzMDk69cDZHlz8Q71d0rnYhgyK99XjYKUmasMysyCNgJMxhxXZB XbHBfkWTMA0eMYVON2JoXzx6z3lAPYS7Kj96NewPIto+I/EaaEsCLpZCO2jCIudvHRgH eFrUrNKd+sVOnrHucXZP9ZH3KPHvDttLU9tmEg6xmLUn3qfh15rnizvqJOR6Sy4+yHqR 8NzQKRr0hAptFZapDEvNBNMMmqMGo/MM53gTPOiyHUJW3Nb/HCSS9AbCYDoslZvRlpfI TUkyUWpkRAoKGnYqfWuKw71FuQZgtWyJfAd5FCRSWzInjseaNaPuWjzYhIg8koYvL2D7 tfDA==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=J6QXp3cN; spf=pass (google.com: domain of fm-1321639-2024121911001667cdc49fc0bb4bf2f0-u9t1zx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1321639-2024121911001667cdc49fc0bb4bf2f0-u9t1ZX@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1734606031; x=1735210831; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=H2k/96uaU8TADdpSOOFvAJl14W8UvXqCtTQ5Nr3lHlY=; b=B77HlEXf29pPsRIg25g3CTPHcgJFHJVoQ0VYwotmb7O614bstHiI6JDDXKptNPbIJB RbTfE2WFMLQjLOFFtYcM2uM3klnW6Bp5c58Sk/TBwyyR/cr190bOgV/Xm7UvNDZPT1D8 ugOFV/0vTsB4Wu1QIPS4oKgM2Jr/qdLNj3gnfeNYn/yI6ok5v0QJenQAeNEhi1V8mLV5 7JrYhxSrf7oGBNv6iv3ImQXiaG6AD9c76SwAsAP9rmioBKOHZuBuVyer3cTRP/t+4jUn hTEDTtJ9xIF+XWzyt8r8QyS9yfsCAP1r5unLKsZVzRNbQWP+TQ1uDYkk+2tZvseYryvd FUfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734606031; x=1735210831; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=H2k/96uaU8TADdpSOOFvAJl14W8UvXqCtTQ5Nr3lHlY=; b=Spt483XnlU+qIeX8eN4kg5LtobW9i0ipTYRwnJOQ6ZQb1w/p59WqcYojD0naz/msQI 6DJ+dd7EYmgeUEYNgCybGYbLQ63DeIDxcivb9NX1RH1cKP2nVM1TkA5gJJHH7dMnu2bn +YliAurAoT+ge/58wP+xVOhsj3ejk3Nwn+9uHS0IdEulRpR+ERBRnwzn6IcSQjOAJ532 SFnQZtlfM8QE/bmnFtcv5i9gxcdhZ0AJoLiTxDHOqysAzeMWq2vDOtkHTuU7EXIlxEA3 tyNGIH1P9wEwVYdkymTxMETTjFyP2YHKaatL+hRAsQZtJdSK+A4Fwy3tNFa0dgytAAMc uAYA== X-Forwarded-Encrypted: i=2; AJvYcCXmhDVtD5x6t0niV6bvytpVrTFNfP8WCfEVOfIilJYN+oRsGnt+pKu5zoA8H8fT4OdDsd8u@ilbers.de X-Gm-Message-State: AOJu0YxhYbBL2WKi3l6JyJKbC2WKnycWLJJ572/Bv/l7c3IQIqd2U86R oVMQA/RXj2RqrVIdP+9cDjwYE/ZxEktIZMWfYAPeVUg0J9Q6mtXF X-Google-Smtp-Source: AGHT+IGKRRWYt4z4WrS2TOXgSqTS9gaW2BhivowxbBBp2U5wIaXV6oBCC/pywTwGYUhYFiJGhAn71g== X-Received: by 2002:ac8:7f11:0:b0:467:8783:e48b with SMTP id d75a77b69052e-46a3a884bc2mr42977191cf.35.1734606031488; Thu, 19 Dec 2024 03:00:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:40d0:0:b0:469:63f:ce11 with SMTP id d75a77b69052e-46a3b05ca6els10761201cf.0.-pod-prod-05-us; Thu, 19 Dec 2024 03:00:30 -0800 (PST) X-Received: by 2002:a05:6e02:20e5:b0:3a3:b5ba:bfba with SMTP id e9e14a558f8ab-3c013b0724dmr28285945ab.15.1734606019215; Thu, 19 Dec 2024 03:00:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1734606019; cv=none; d=google.com; s=arc-20240605; b=XdKhRcyHd62pWscHPPlAn7e8VI7gcvg8S4xcDmYAZNjCS6+E0S9dVUf9GTKP7dc/zT bjwHzetM65g1qY9g+w/62dYKMfn4gtnf1HvaVSeUgx//yQo7n2wsvToLjXuvWlmNIiF3 5GFmg/q2Via3MSm8hVrWF+m0ehMM3/W+/tyiETri35h/stZJ0ImCaeew0zaOl/vT88f8 9dd72ieXcvbc/UWd5fW8l7F5YxWnloLYfAOj34Aes1vQw3dNitSJN1yoQN+Z1EuRAjmE WeyUtz20t/QYWvKcOtCwy4hWZK9j5rRZlsVznXXgjavpLGXw1apXs8YyThG8vnptgJO5 qnLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=5/EQWLJMYDPL5E2F/ggFH8nkObUe3IDXkTBbaaH68x4=; fh=KY5pqFGF6IW8oCSJ4x02Os6OdDMdfRHE/hcV+iRRVOY=; b=EWm/ZXsqxAdXmAlxgZ0/OYNIwDuBS4s/SXZDyF4Es+pvQcWst5WPdeyIHKQlQOxHn0 ctx24edugB52mbtoJUk7bhXpi9tkAEzCxA07ULt2jZIfU/eOFH+JIakGdhWZBVgJJvdj DDnt/uG6kq9a/p3AQYtGdm+5lmWDmzCeCHHffyb0h6RnwhZyYVRhniRkky9Emmom42VK AIJ6F3tFsm+KgvNbYshyMZvYZ+/10k97mDjxNbIDZNwXUvsteEOE6KYE/KI/n8SZQ92N H1qAGDYXnUlN6hrwrS1pSw5UCVmX0Rulw8T4V9f5Q5NhEPFaowHXhQs3tP94maE5WtcZ ieNA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=J6QXp3cN; spf=pass (google.com: domain of fm-1321639-2024121911001667cdc49fc0bb4bf2f0-u9t1zx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1321639-2024121911001667cdc49fc0bb4bf2f0-u9t1ZX@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 8926c6da1cb9f-4e68bf712fasi44870173.2.2024.12.19.03.00.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Dec 2024 03:00:19 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1321639-2024121911001667cdc49fc0bb4bf2f0-u9t1zx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2024121911001667cdc49fc0bb4bf2f0 for ; Thu, 19 Dec 2024 12:00:17 +0100 From: "'Felix Moessbauer' via isar-users" To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, srinuvasan.a@siemens.com, Felix Moessbauer Subject: [PATCH 3/3] make usage of usrmerge distro dependent Date: Thu, 19 Dec 2024 12:00:10 +0100 Message-Id: <20241219110010.389690-3-felix.moessbauer@siemens.com> In-Reply-To: <20241219110010.389690-1-felix.moessbauer@siemens.com> References: <20241219110010.389690-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1321639:519-21489:flowmailer X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=J6QXp3cN; spf=pass (google.com: domain of fm-1321639-2024121911001667cdc49fc0bb4bf2f0-u9t1zx@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1321639-2024121911001667cdc49fc0bb4bf2f0-u9t1ZX@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: 6IYtdgAtcIAs The situation around usrmerge is complex: In older distro versions that must be included to get the /{bin,sbin,lib} dirs symlinked to their counterparts in /usr. In debian, the essential package init-system-helpers depends on usrmerge from bookworm on, so it is discouraged to manually include it (in the future it might be dropped completely). In Ubuntu, the usrmerge package is already dropped from noble on, currently breaking the build. We now add the package using the distro conf just for the distros that need it, restoring the ubuntu build and making it future-proof. Signed-off-by: Felix Moessbauer --- meta-isar/conf/distro/raspios-bullseye.conf | 1 + meta-isar/conf/distro/ubuntu-common.inc | 4 ++++ meta/conf/distro/debian-common.conf | 4 ++++ meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/meta-isar/conf/distro/raspios-bullseye.conf b/meta-isar/conf/distro/raspios-bullseye.conf index 2515f0fd..a362289d 100644 --- a/meta-isar/conf/distro/raspios-bullseye.conf +++ b/meta-isar/conf/distro/raspios-bullseye.conf @@ -17,6 +17,7 @@ DISTRO_APT_SOURCES:arm64 ?= "conf/distro/raspios-bullseye-64.list" DISTRO_BOOTSTRAP_KEYS = "http://raspbian.raspberrypi.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de" DISTRO_BOOTSTRAP_KEYS:arm64 = "" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append = " usrmerge" DISTRO_KERNELS ?= "kernel kernel7 kernel7l kernel8" diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc index d3374baa..88a3b4f0 100644 --- a/meta-isar/conf/distro/ubuntu-common.inc +++ b/meta-isar/conf/distro/ubuntu-common.inc @@ -16,6 +16,10 @@ BOOTSTRAP_KEY = "file://${LAYERDIR_isar}/conf/distro/ubuntu.public.key;sha256sum DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}" HOST_DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}" +# from noble on this package does not exist anymore, before it is needed +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:focal = " usrmerge" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:jammy = " usrmerge" + # kernel package name is linux-image-generic in Ubuntu KERNEL_NAME = "generic" diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf index b5d8aa9a..8da17d6f 100644 --- a/meta/conf/distro/debian-common.conf +++ b/meta/conf/distro/debian-common.conf @@ -39,6 +39,10 @@ SYSTEMD_BOOTLOADER_INSTALL:buster = "systemd:${DISTRO_ARCH}" COMPAT_DISTRO_ARCH:amd64 = "i386" COMPAT_DISTRO_ARCH:arm64 = "armhf" +# from debian 12 on, this is referenced by init-system-helpers, before it is needed +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:buster = " usrmerge" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:bullseye = " usrmerge" + # snapshot mirror for reproducible builds DISTRO_APT_SNAPSHOT_PREMIRROR ??= " \ deb.debian.org/(debian-security)/? snapshot.debian.org/archive/\1/${@d.getVarFlag('ISAR_APT_SNAPSHOT_DATE', 'security')}\n \ diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc index 01ed1e59..931f6f13 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc @@ -11,7 +11,7 @@ inherit deb-dl-dir FILESEXTRAPATHS:append = ":${LAYERDIR_core}/recipes-core/isar-bootstrap/files" -DISTRO_BOOTSTRAP_BASE_PACKAGES += "locales apt usrmerge" +DISTRO_BOOTSTRAP_BASE_PACKAGES += "locales apt" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = " ca-certificates" BOOTSTRAP_TMPDIR = "${WORKDIR}/tempdir" -- 2.39.5 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/20241219110010.389690-3-felix.moessbauer%40siemens.com.