From patchwork Thu Dec 19 11:00:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 3988 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:25 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f55.google.com (mail-qv1-f55.google.com [209.85.219.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4BJB0Omg008572 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 19 Dec 2024 12:00:25 +0100 Received: by mail-qv1-f55.google.com with SMTP id 6a1803df08f44-6dcf01612f0sf21757726d6.3 for ; Thu, 19 Dec 2024 03:00:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1734606019; cv=pass; d=google.com; s=arc-20240605; b=dtDTuHtq+JiSHF8SmspTVAznX8dK07MmwWxJ5uU6UFnE4bSMKCDBGXZ+C4q2SQ7l2A xp6ncQC+5XjDR3mCIhU/MsWjAwgvYq2phJv1Gky97eAAexeDU1QzCuTaYAMkv5PK78cE HEt/LNQhU/noAvkiP8ZgWzI/hHr+XUOUUPw85EGcJwMfkCla/was1lrffVZHxeA4awJA VPI/Qsk6fIhVTPDcpQN94bb2MF+32VMtsJKgrWl1gRWPS/mY2Yf3FC246PbZmiFfYSvC OrQ0Hwc5mALOkypaOVkn4COoIVM+xcG99TViLUIrHwRwV4d+gAgKWtY365cefD16WFy2 GNFg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=KLYv/Gv+DLxUvrDFFLTCPby8WfMtnwUhzZCR0FeJVjg=; fh=J2KqzCAzk4e+R8vtZ4X65eVw6zTtxryuB1NdrNlM7vg=; b=KrGZPNAzskE96naMGpEeVX954MXPo+yOuTW/F4kSbTvOjtIFzAbNYQzyGvz7bscOce TiG991mufakyw+7EmAfycDhLODVMwd3wcJDr71xMSWEkvyB3xoZzDD6O5Hn+uGz17glI LE9IRjXJtRERtpPxrGsu56jxqDwUaoO4IRkREmO9AMg9vSLGokMya18/UM4dSiWnFk9F Sjp+j8CRippvS7K8y2wSJfzh8pxG0+mxEaKB3FrU328kYRBuY6XtlmMtrOoFRz9wmmbU z24ayVAHlTn72MMXlyF97m6T/hGp61rictLmogsiKvjVwqtYCH7B/B1FH2QH+0TwDxb0 II1A==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ISUGa5SH; spf=pass (google.com: domain of fm-1321639-202412191100168ff8cc3690ee6a3037-bpi3es@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1321639-202412191100168ff8cc3690ee6a3037-Bpi3Es@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=1734606019; x=1735210819; darn=isar-build.org; 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:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=KLYv/Gv+DLxUvrDFFLTCPby8WfMtnwUhzZCR0FeJVjg=; b=dDmMXhdPV5J5/ZLP2WwLs3Wwo8iVO8nhr3YnNdPhuw4f2v8JbjRRoMpvMfOx00Jreq Qv1rnXZq2hLWAQDIt5z3XRIuaknNNAjbXAdC3TCe7YGR4l8EDYZ+4HSaJgG/r+QtlMGI DkCGWQyipKmHLetr0kCKl8s18q7bMc09Avk5Qcw9AuPnlnNmfwbo+H9kdkvJQYa2c/Kb 6h9kGK2kKN1SIhw/BHawiY3oTfesPPQpfC6FJMN4xcbZCfThu8Yck1DoEk++6R4lZYvi gwWgVA7tixAacuho4p11JGrwON+/DuZz3OLg8co7oGsWN7PuJMemmQvVI8NnPTZi3Tn9 Tz2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734606019; x=1735210819; 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:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KLYv/Gv+DLxUvrDFFLTCPby8WfMtnwUhzZCR0FeJVjg=; b=pdS1t9mlPPIfEgrsy2IW1ayznFR39Zbef7hqavDBneUwWelmDf1G1ChYFiTN+L8QMu CKvULdqB4tuvcbUkm2FL7pUssPiPtOL1irVYxii6mwjHipljcSZJkUGcJadkGNquISvd z6aZ2H6+htV4h1KCE21xX8+/+KQWwMJJPS/Ac5JCoFEH5l0AIyT/0dlLtLAOtNftRNN1 KZyQPl9yD+d0SPwP/Se5XNpQyeFJsB/TrCFwhntDPvV95IsmHLYp4U0Gee33OmxUINLA rSZt79dCSrpeE3+/eSamJtOYo5YVdTTeTodTKZBBQQ05yhgZ4I9B5SVp/jIxlyrTgI/E UUxQ== X-Forwarded-Encrypted: i=2; AJvYcCUjkRRZLvM4EXFb4uE2scOUTzdS2yYoIydJ3yyXrbVo8j+LzA0WGxbFI5fAwUI12H8MyFH6vUk=@isar-build.org X-Gm-Message-State: AOJu0YxoaVloRWVgCyjmlbO4LI10BXjW2BZIYUHxUH27HK7iDo758+im oHFh/ZKIlriy8NfVnPwucn1DOaS+JfGM/7mSaNMODUjPDKD8Mn6/ X-Google-Smtp-Source: AGHT+IEBatm3ZizR4RAsO8RB4LjSLy0rNR1ItHuzkr+gz4wBuGt585IYg0i/lGq8C24NGoUayvh1Aw== X-Received: by 2002:a05:6214:1cc2:b0:6d8:981d:529 with SMTP id 6a1803df08f44-6dd14c9d32emr45378676d6.48.1734606018804; Thu, 19 Dec 2024 03:00:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:4d47:0:b0:6d9:188d:1886 with SMTP id 6a1803df08f44-6dd1549dddfls10249476d6.2.-pod-prod-04-us; Thu, 19 Dec 2024 03:00:18 -0800 (PST) X-Received: by 2002:a05:6214:252b:b0:6d8:8466:d205 with SMTP id 6a1803df08f44-6dd14b93385mr42822496d6.6.1734606017897; Thu, 19 Dec 2024 03:00:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1734606017; cv=none; d=google.com; s=arc-20240605; b=gkTRp/Q/l6q9XEkyPYdyP/XdULIfPudHRdVvHSVKTeEaEWJjt2TG1fldB/L9RLxpCp 5GHPmPIKwy5u1HWGxXwvBOmMnGnG+Dmj18kYP8+sMYC8VbnX76LZuDSddoepc05+K+0f arttISEHEcJZshwIsBjeMwvTDkEIZ5xS5+Xum42fluZhnq7VGbbkaoxKIfQNOC5FGUvP Sx8JcdmINWZm44mk/tt7t8ssbxKArJZPpov6pznrHfCiYqGS8imA9ZiZij682mMTqjMx 1hvjpPzyf997gUsmKx2gvddnIaT9motqB5R/PJnX+srHTWadD7/Ov3ESRAV9ArOxaCcb e8kQ== 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:message-id:date :subject:cc:to:from:dkim-signature; bh=kds4Lmnvijp+jg5rCVbQYAmIAn/S4d1atHaZgyM9PJY=; fh=KY5pqFGF6IW8oCSJ4x02Os6OdDMdfRHE/hcV+iRRVOY=; b=UY/zttQcFY3unGem6AYOS80UW2ODlxjMReAgwvn0gm9sJNOMAkds7uiuLp7LxYiCyA o7UARWUuCvQWEMi821Eth/iPDi5IKnfrwCc2BPf9acSVf2REIIqExYhs+RH0M026ifby tbvTvO+OHR/tj4hT8JuhyRHilSlRO0cUO7dGAYgsxNAFUo3/dUwLrXHkpouQ427/w/Sd jEXHQrfolm/I4ONzlsek9EOljQVuY29D+wgaXKHI532I4N0Q6NVBxVsj9B01n/APVMJ6 mO4rKpWFDlzOkloWgrrX27Qr9EOXyCJiAaTaBcQNcZOinir+7t1Avlj570r8qzakmz2D qySQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ISUGa5SH; spf=pass (google.com: domain of fm-1321639-202412191100168ff8cc3690ee6a3037-bpi3es@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1321639-202412191100168ff8cc3690ee6a3037-Bpi3Es@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 6a1803df08f44-6dd181f52f9si902216d6.7.2024.12.19.03.00.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Dec 2024 03:00:17 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1321639-202412191100168ff8cc3690ee6a3037-bpi3es@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202412191100168ff8cc3690ee6a3037 for ; Thu, 19 Dec 2024 12:00:16 +0100 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, srinuvasan.a@siemens.com, Felix Moessbauer Subject: [PATCH 1/3] bootstrap: space-separate base packages Date: Thu, 19 Dec 2024 12:00:08 +0100 Message-Id: <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=ISUGa5SH; spf=pass (google.com: domain of fm-1321639-202412191100168ff8cc3690ee6a3037-bpi3es@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1321639-202412191100168ff8cc3690ee6a3037-Bpi3Es@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 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_H2,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= The variable DISTRO_BOOTSTRAP_BASE_PACKAGES contains a list of base packages that need to be included when bootstrapping. This list was comma separated for technical reasons, which made it hard to append or remove from that list. Instead, we now make it space separated and join it by comma where needed. Signed-off-by: Felix Moessbauer --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 7 ++++--- meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index f9dae26a..6a612852 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -14,8 +14,8 @@ PV = "1.0" DEBOOTSTRAP ?= "qemu-debootstrap" ROOTFSDIR = "${WORKDIR}/rootfs" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" -DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = ",gnupg" -DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = ",ca-certificates" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = " gnupg" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = " ca-certificates" inherit deb-dl-dir @@ -79,13 +79,14 @@ do_bootstrap[network] = "${TASK_USE_NETWORK_AND_SUDO}" inherit compat +do_bootstrap[vardeps] += "DISTRO_BOOTSTRAP_BASE_PACKAGES" do_bootstrap() { if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then if [ -z "${COMPAT_DISTRO_ARCH}" ]; then bbfatal "${DISTRO_ARCH} does not have a compat arch" fi fi - debootstrap_args="--verbose --variant=minbase --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}" + debootstrap_args="--verbose --variant=minbase --include=${@','.join(d.getVar('DISTRO_BOOTSTRAP_BASE_PACKAGES').split())}" if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}" fi diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc index d7ddffdc..0f2e6dc9 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc @@ -11,8 +11,8 @@ inherit deb-dl-dir FILESEXTRAPATHS:append = ":${LAYERDIR_core}/recipes-core/isar-bootstrap/files" -DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales,apt,usrmerge" -DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = ",ca-certificates" +DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales apt usrmerge" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = " ca-certificates" BOOTSTRAP_TMPDIR = "${WORKDIR}/tempdir" @@ -85,13 +85,14 @@ do_bootstrap[network] = "${TASK_USE_NETWORK_AND_SUDO}" DEB_DL_LOCK ?= "${DEBDIR}/${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}.lock" +do_bootstrap[vardeps] += "DISTRO_BOOTSTRAP_BASE_PACKAGES" do_bootstrap() { if [ "${ISAR_ENABLE_COMPAT_ARCH}" = "1" ]; then if [ -z "${COMPAT_DISTRO_ARCH}" ]; then bbfatal "${DISTRO_ARCH} does not have a compat arch" fi fi - bootstrap_args="--verbose --variant=minbase --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}" + bootstrap_args="--verbose --variant=minbase --include=${@','.join(d.getVar('DISTRO_BOOTSTRAP_BASE_PACKAGES').split())}" if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then bootstrap_args="$bootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}" cp "${DISTRO_BOOTSTRAP_KEYRING}" "${WORKDIR}/trusted.gpg.d/" From patchwork Thu Dec 19 11:00:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 3989 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:28 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f61.google.com (mail-pj1-f61.google.com [209.85.216.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4BJB0RDY008582 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 19 Dec 2024 12:00:28 +0100 Received: by mail-pj1-f61.google.com with SMTP id 98e67ed59e1d1-2ee6b027a90sf915079a91.1 for ; Thu, 19 Dec 2024 03:00:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1734606021; cv=pass; d=google.com; s=arc-20240605; b=ePzuFhnaI3LP9n2yGUWaPadjXQI3a6UOuEJiau96ZiOTbyx5pIW5CHeh1SR9cB/3Mc FII0PgE11uWfTPMf/H59roqkYZczpsG+K1gpdRpENRBqSTdeQx+1YYkgTW/heDFd2JHP WHjG/W86pV5f8j1nrJc68up8GXdOetcZJzhPqSuY3HG/+yQ9n2fID4KSCTmqIzfhSoZp S/bUlkshgrMADxTGfLUcUnSYwMA+nR93JOBW1iVKty6v5qOAH370YW8h19DrZpF8wbcv VN/nSk1URLgLsHmGm7ZyimBoIbZerkByImgIqDumg5InylR5E03SP8L3zlXIrpP7H8zH pNgA== 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=dc2W1vRZkw5UggoxkmfXuz2i0kHn15KK3243uiwrFXo=; fh=I7KyQTkLL0Jh987uTXb4H42g12wn4EKFNUkz5dZUhtI=; b=jZmJgGrEq6EBGLmLzYXBPi/OzXnAu0OcY878bRVYUKyLPG22OFgMVsT2V/TUwlO9Sa 2wrQMb4YzGlD4NCDaLAUFuGiVRPTx3wm5CtmXqio2wAOVbTDC2vzaDCXR26dE91jF/c2 /T1JbrvZKyykvmdHg4yWxrMvHN34tZdklFGHONKsjT/ynzymCYd/g4JYx9TsunXM08dd gZQ4SLTblRmnOp0yupsHa/ID5Rw2sPauFXHKdJQmKs/IKABFOBqDC8xjD5gIkP7sQvit PKeoyw8MQlgL5TW2rhhULzVDTqFG7qtKCW1MiGr9wxIxMDnBlNW46hxYl1NRqrO0/shf 9s9w==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="YalWO/qG"; spf=pass (google.com: domain of fm-1321639-20241219110016c183b25ae339c5bbae-n6ms1k@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1321639-20241219110016c183b25ae339c5bbae-N6ms1K@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=1734606021; x=1735210821; darn=isar-build.org; 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=dc2W1vRZkw5UggoxkmfXuz2i0kHn15KK3243uiwrFXo=; b=Pt21SzYMu+JAzSq+1uzQH91dyszds0DVVsFMp1aOJh1erDw0483oJsAvNZbxpMd0IV 8wc8lXQstPd2GF9Eoc1cw2AtbUHkFyQGBscX4rXTXKmxfl+B0eft+cmnvl0BnKyDPycp pNciGx0RogAEHmwsYg33z7cKucPyB7iwiCoc+gZNuuWQhkpivrxkQMLaqqdsIVXCp6Zx jxNMhADCarB6pjFpEJrOoJaoVIopk5H5Dz+ajz+dqh6a9/zTAL/T5CVnqNANyuFT4601 QOEDkgqdKpSO8evIcP2w76/kJ4kkhuTZMi9OOOkBF1b5EbTSDIdJhnK14WbMOoT2oqdI vGlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734606021; x=1735210821; 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=dc2W1vRZkw5UggoxkmfXuz2i0kHn15KK3243uiwrFXo=; b=SKaLe/ypa6VpR94Ez0EeqC9zaWhWkPP7LGIJNQc5+yiJDE3ONZBtxfXiumV2SCn5Wf k8j/QnJ4Hfv84mjYXVJl0lIAoXSVXF7/3bLuYgPjTU3X8LfLFputguEWxPcFyLD4Gb3X HzkOwBgWkb8Ux0nqWhoOeW+kb4Y3aX4WlmEpIehIJoXujmZMVqP/RqRfT0me809kBS7u 7G8tbiyxx0WD7L1ZKMiu9ABFlcxdQ4M3kblVogm35SbdXH5iB24DtDFMKVJg+X3oIx3S IGGGaHnTxeyKXSPn2T82MLFKuVlrf9JSp18AxpH5xCtglySdPP26BZVW1RzDAYW357Fo 316A== X-Forwarded-Encrypted: i=2; AJvYcCVnPEz8AsoaNxiOb/WajPGsXv0XfrkMEhMU9CF3mDVNHDEs1JNN4KbbQ+kAQGOyMVqfMFuuik8=@isar-build.org X-Gm-Message-State: AOJu0Yyx3QIwmKKtMdVFAuM+v88+iaVyTFevupfHdGmMYdd/+bbyn2KQ fQdDEhDqbb0kIRgHEaVq0bJlh/GkGItIkfEC1PsTHe5bR1n7KToY X-Google-Smtp-Source: AGHT+IHbj2Zy/kMixy08tiu+eehhQUnqSm13SBVYz8aKhQ7qRHBQ55PTGxSmEd/YxuHFQNdZeVOkFQ== X-Received: by 2002:a17:90b:274b:b0:2ee:b2be:f398 with SMTP id 98e67ed59e1d1-2f2e91a4d69mr8661176a91.2.1734606021107; Thu, 19 Dec 2024 03:00:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:ca85:b0:2ea:4633:7a29 with SMTP id 98e67ed59e1d1-2f442de8da6ls724716a91.0.-pod-prod-03-us; Thu, 19 Dec 2024 03:00:19 -0800 (PST) X-Received: by 2002:a17:90a:53c7:b0:2ee:d18c:7d84 with SMTP id 98e67ed59e1d1-2f2e91f644bmr8700017a91.20.1734606019314; 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=MlIy18MfPBOPvwbliOVcF5qi5HOnvUlMoAWLombSAE8KWMazVC+Ws24pr/ckGTEtfn UpdHTNqANX/BFB7lNg99TY4MUrznpHLPeGlgqXU652ow00vMHnC0zvxXNuIJjS7ytVrd x2ClsxKwgqYAKtR2y/KA7yvIZS8SM6V/++DG0pZl1T4mGvDHZg0YuPNrjSWUiEM0T4D9 4QQXnYnRkvYIebqcnurnykMDkgsdY+spGDkl0TTRkoMQzFZWydGgdSCRMowAumnO1bUK ud94bw174u4oZX3BlRs8zF08KXLAJrCNvn7ZKxQR81mZXhOfdHRCblLPUnq+K3PXCefc Mtew== 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=48mt2lDJ+F3zioWPfSrBmkqJzj7A33cI+97a0EgWf/o=; fh=KY5pqFGF6IW8oCSJ4x02Os6OdDMdfRHE/hcV+iRRVOY=; b=QPDImA1vGOLo5GGAB6s1MpunaA9xfxGGCOMY8I3Vv9nQDEpO2QqMpn5LrAvZNf49mf hCNGYnlZyx5pk3gXWY2JaMn72S0d3yO7/9lvyYHNDPxA9O8MvQmRZGWq0VU+dbJlrmjM 6ZGna9RNxPJn2ouloWp1jGBk8D4ak4HZxflDKESUE4y2slqq058BWOeINF3ZElSF4Xk6 qKrgV08Zipm4m6s7T9yon72fGIRw9wZqGfP0QTVmRLr9Qm45dsJB9U7v5/hXW+s7983e Jn3o54ariGut+vwbwCXCJs18lN7HIsOcXw/pSxJylU9/ZTo3DITR/HPhZFj4JsK5f+w3 t6nw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="YalWO/qG"; spf=pass (google.com: domain of fm-1321639-20241219110016c183b25ae339c5bbae-n6ms1k@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1321639-20241219110016c183b25ae339c5bbae-N6ms1K@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 98e67ed59e1d1-2f2d9dc657fsi517172a91.0.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:18 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1321639-20241219110016c183b25ae339c5bbae-n6ms1k@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20241219110016c183b25ae339c5bbae for ; Thu, 19 Dec 2024 12:00:16 +0100 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, srinuvasan.a@siemens.com, Felix Moessbauer Subject: [PATCH 2/3] bootstrap: make DISTRO_BOOTSTRAP_BASE_PACKAGES changeable Date: Thu, 19 Dec 2024 12:00:09 +0100 Message-Id: <20241219110010.389690-2-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="YalWO/qG"; spf=pass (google.com: domain of fm-1321639-20241219110016c183b25ae339c5bbae-n6ms1k@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-1321639-20241219110016c183b25ae339c5bbae-N6ms1K@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 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= To deal with the complex situation of usrmerge during bootstrapping, we need to make DISTRO_BOOTSTRAP_BASE_PACKAGES modifyable in the distro conf. For that, we just append to that variable in the bootstrap recipe so we can define additional packages in the distro conf. Signed-off-by: Felix Moessbauer --- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +- meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 6a612852..08d61a84 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -13,7 +13,7 @@ PV = "1.0" DEBOOTSTRAP ?= "qemu-debootstrap" ROOTFSDIR = "${WORKDIR}/rootfs" -DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" +DISTRO_BOOTSTRAP_BASE_PACKAGES += "locales" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = " gnupg" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = " ca-certificates" diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc index 0f2e6dc9..01ed1e59 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 usrmerge" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = " ca-certificates" BOOTSTRAP_TMPDIR = "${WORKDIR}/tempdir" From patchwork Thu Dec 19 11:00:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 3990 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-f185.google.com (mail-qt1-f185.google.com [209.85.160.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4BJB0bGi008724 (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-f185.google.com with SMTP id d75a77b69052e-4675c482d6csf9719731cf.2 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=GmrR0Q7QdzPTM5N8h4Qtn80W9CB507JSJRXzJLz3qzqR8UqbGcseR4xrPgiQt717Hk BTqNWdfIil6qzxOQQyj6ENDeQJoXnyg8z/xAcg6NUqe396DkeNV12k09qHkmWNUrkgRt 1KcwiisFyVTVVnT6L+f+KroxD8H3x6azC5vvC6J3DVsGbYl9abpCgEZVFPKiTbE3J8XE RbcgXsDUtIkcNHJOvH4Q9xq3Y75+HjXLXNWjI9I+3QpdUhtXlPNPevcPi8VAxnMRoibk GB4/fyxfzbfN9d/+ySZVszoKLeZwIH1RJ569HxzDhN8T7kg4jhyLZXG64pRIgGm3vCMN 1Ezw== 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=upZ3qrLyZ7tJwC/0BUmIEJuwUhY4mIEVkbXWPD8js/c=; b=Xc/6QTvQcq/dhUgeU/8YE0tzQYovQQrETxpddbMv61e1TIcfj4kqTmUFi/KA5svLl+ i05vixC4nge9sMVAoZdaRHjqC/F6THLCm3nOmjj1VAHQ8RdqK6/Q32Ntkj3z9wAzqMrZ EJ2jMpHj3IYdd3iFy5AkH1VoIWAXbYHsgpFchHilnNti2qlWmSKAABpO6IWKXHNJMDtx U6nQvAd29YYu9kQtgfgPLxMtuIbUqxcNoTfw3pqO8uR3s+yisVyKP1KN8VfPlt22B0Ng Mb0OoJiCFDoG+Im3yOyUB79GpWa/w7CU8nknw2dzT9WKmObrzRqVMWtcswUO2Qm4iw6D 5fHg==; darn=isar-build.org 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=isar-build.org; 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=W5APvN2GxxQNK4VsOu9RDlp1xoK3FEOX/zwcdiqhPVzxkObH6wsKx9RwJzLZ+vKuB0 N0j0KvgII93a8dPkHT80rh64McO81qu7h6M/Nc/WcVjCGLtmhKrjWtEU7fJfm6wU4cDr vwXmOV6N9nLJrBCju0qFXoY5OR5DW3YFaGwCqZfxT3bTMIjZBIgIaB7MntXqnuibHdL7 f0Zn72y6mVHPIZD9Qn7NK8h4xkLo7meZbUHCjLd1xsynkz50hmTUWk3ubuPpI0MITvSj elM5MbRE0fQpurmAFy9UyODYkgqYSqXM4CjWUtDuOJBIK48Lc+FFebKVEDvO11/yP7Vm LMYQ== 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=PWlSDSxw484FI5g2jjkxUCYoKlcq0dGULkORruln7+b1hwO6ELw5kABl4pQL8gJfzn V3eCymdN64Hc7A++7VWULvOKEtkuB7mIctN6/m6qIZkzbmtHrZWUo0p7g238QGlnYPJI PdTBw7cPXqn6vGd4u1cF2/IzKLhqczxsrdNufxABTKWUjLvTi0hx9CBC1P7EIKq9aLCT 3tAeIRAb+b5OY2P1r1IARID2O+lfxx8VHOeTOWZFlNOjfQbQ5tx4CWZWY9z/hjkE+xQK LIs69IUWvWN6Poxx1BsFM3e8t9JGTAvjJ4mSJsNJrZBFNrcNkynKyVvfUXpIS54RWCzx NfvA== X-Forwarded-Encrypted: i=2; AJvYcCXgCVrxUVweax1T6u62E1A2TNz2R+CJIvNsWfHw3EzHgtCUics7VnNl6RRVA/WiHEv1AcUn1N4=@isar-build.org X-Gm-Message-State: AOJu0YynEmnB8XfsMH2bYxcS6Y4xTeG0gvXIgTSTk27l1IvNi5FqIPWP CJwB2+KpkZU43ESI6AApHdqfaU8X3Xc3QDWLa0Yugk0JA23fFgRN 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 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer 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 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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"