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:26 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f56.google.com (mail-qv1-f56.google.com [209.85.219.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4BJB0OAQ008579 (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-f56.google.com with SMTP id 6a1803df08f44-6d8f14fc179sf18272366d6.2 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=NUFGaqd4wL2bGh1g9V3yip9alEidBExh/07ySM5hAud/tIzrlQmFF9SLdhfYe1yPtl hJf2sxWebfhj+IrLVGXvbKW40D2zb2W8POxV8qoPdnuuUelqbqaqkwrO/62CCFl9nlY1 lMyMRUqnEiweLnPIzTbSbqJxgj2s8mdDh1WHS3HVYuSPcfgTu3/RZmIHnRpMVQt07CLh x3JXMRQdwlGmnE2ImrbiZnqFWBWqmTPe+RmnjIY8FjjmN5+UouPu36yVCwqH0tF8bgZ/ +nPlGD9ZaIR6A0wVsqLoNmEpUjww97Cc1T1ohwu5YbZRV8SUt9uYocJTO69HbukiNQDT f55w== 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=QRtr+O/IzK3Plp4t6oKfq5vvGb72yJJUrY7YTo4xMZY=; b=JMpRzTWPDa3fbc62zfVN9eOVUqCImyRelfewHbrIPjWyOtPDi1v8FoJKrG9MHe/H4R GsodrLTELWBomrQlhJ9xFdV3WWjFdXXcD6n2VFConokE46gS4cjWvA3X5TNq1B/q/q65 L5OGSDbqkoVadROjE6dYc9xImLgpMVGkrhbexM/GPARAKlScTch+1auzeaHoDznTC7kE 7vHX/k1c8g/GJir94Wb62UHQsH3SE3/eyUZ70tqt7xSgb1IJDFe9pMhJj1Wpk9Ihpl2O u0OeBG/AlQ4Uy4hRxFi3DeJ8UjEq7kwIVLWo4uF3zzsntVD9fCVh7q1wU7J+IEWtQ5Ox 8f4w==; darn=ilbers.de 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=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:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=KLYv/Gv+DLxUvrDFFLTCPby8WfMtnwUhzZCR0FeJVjg=; b=LOSvK7wKEHOY40uUR7VhvdZvPqKqFCX6hxlveKrpquUjWL1sUe1W2Sq+SMcka/NuMc /CyYQlyFDSAL5uolsRCtoJ9qZ0uuXBuEf+kGh4qY5ZiAggMulLaOsWcBtKrh/jNtOc+N RuyHu75kXMhiPdJF8ljqux9AZDZ7X2s0ymnLz0gfK30vNRMr6ko8UrqToM63MIAvuc4n ECMNHsRz9/VMHtLB1/rYV72qhOJBMmmTg/SeNil/z5tqdFnLbvmHBZbd1vi2LpwRyaZY YRW14vttC32sshWcbBfm0Zh/ZexcO2oTAsx7dZ4balxmgV3LkUdWx/bnj2vDvtw1sxLS GEvw== 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=cSljXM5wMFuu+5gdUmPuTq+gHLn90WXWTRwkmdM3leTroFiNzsCt9QDnW7mHAR7+dD XPPF8gkdTPH3cevJm89Z5GHtfMXNHMOGNRDHbpkO+9YfuaU9tpQVUyLneG8L/e9hOgfN tpazKk0XomNukk60IdgT/E8SzOf2DT6QiSpGxT51IjOMQ7vq07/BEuRyB6SMFJ2Y854J tZpKx84oeb55XqD1+hdvYML0zwWCxh+NDZgBbOKRZcnNEEQIizKUu68pDEQrTZI22RzQ +9glI62jrqosbkbFyKovEy4wHHIqLGDtb2yb/15UkY5+aLyBCDbiiPjK6EvTLoiFO2QB Bpcw== X-Forwarded-Encrypted: i=2; AJvYcCUQNSQRGZt/haGWCXIkEckebOkOykUUZ/f4AiAgfEviacvrCaaD+670H63TP0KoMsnOfJZs@ilbers.de X-Gm-Message-State: AOJu0Yw6e7ZIOfgZn9eEDeJKTMEQEWC+2KNfBWaHQuRi20Asnhw+hCs5 XJc4Fddvw5uVJbQj2MbNXsghqbG2DLOowEiytjPCA9QgFmgHsaMb 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 From: "'Felix Moessbauer' via isar-users" 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 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_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-TUID: lR3xxeqokiQw 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/" -- 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-1-felix.moessbauer%40siemens.com.