From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7291218501940805632 X-Received: by 2002:a19:655d:0:b0:507:9d70:b297 with SMTP id c29-20020a19655d000000b005079d70b297mr7116852lfj.60.1698128651138; Mon, 23 Oct 2023 23:24:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:52b5:0:b0:507:c72c:9d86 with SMTP id r21-20020ac252b5000000b00507c72c9d86ls725212lfm.1.-pod-prod-01-eu; Mon, 23 Oct 2023 23:24:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFU5cnmNtohL0a2Zi8BbLIOOIGYekAZKZ80b/BIiDP5yyLpJ46CqBeXsGK6fuHtfT7/0xOe X-Received: by 2002:a05:6512:21a:b0:502:afea:dfdd with SMTP id a26-20020a056512021a00b00502afeadfddmr7775294lfo.13.1698128649215; Mon, 23 Oct 2023 23:24:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698128649; cv=none; d=google.com; s=arc-20160816; b=WKj8osG2+B+TvQE/KnJqTv/6y5rEAfPQFeIUrv/zHbXhEJbAREnezPeiX0RJs2Iuuq h8tx2xPz07clWdAiTr0mY6/e0BSj2jAYRX81fPxxbSfJbdANUheIAUX3kfYG5FEDewHy HLzere2ZKV6xFP+SwAIQirXDEGxifo1qMbSsFSiKMHWuvEv4mzWmv13ynNKYD0fGsZNs PI1lm32numuHEdcYdtuYka+jm3FmJdZv0Xr8LoDEdT9uS3RzFVVXX2nHRg/xvsec1Is1 oBCAt0NYjENo/e8D9m/0cMxlncbtzkDsDdYJO3hoEEF/UA2YKBR3bWcYeD8kqd7q952T 59WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=sCQmQlX9Zzd4MLPQQhOl7JSaMd8EjUk8dCW30yiODqE=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=Nf3zUJvoVWm74IgjJKOk6Y/6yAA35w0a2B25kwHfVoCeBbgh2wGRvZfWO2RFNrjNq6 376EXb8KG8gqTUESdIT/G3blM7loE1BtDr0KrpN4yrtq+lYKZKFino2C7KeMONpqfWN5 lc/ah0kFpN/S4oKpVI99oLAWRO/UASf/BVjoWKDQdswOHfTnheddCNibsiX9YniGMeyi gGzBLVifXxOc3FkOBsAb00kobw2O31/csdymfE02yLTLEfGViVOrdP6+PYKXsZOTnNTh WTUmWKtUyhCfHqkDnyElq7/q/W+MWyv8EVr5EUcG20pYOWcDLhwC9m5h/a8rTc1S8xFu mdvA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id br26-20020a056512401a00b005032919f892si353708lfb.6.2023.10.23.23.24.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Oct 2023 23:24:09 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (r154-240-38-77-broadband.btv.lv [77.38.240.154] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 39O6O5W9024986 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Oct 2023 08:24:08 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v6 2/8] meta: Preinstall apt for Ubuntu and RPi targets Date: Tue, 24 Oct 2023 09:23:52 +0300 Message-Id: <20231024062358.252053-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231024062358.252053-1-amikan@ilbers.de> References: <20231024062358.252053-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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: BZZCt26kvi+h Apt package is not in required packages in Ubuntu and Raspberry repos. To have it installed during bootstrap introduce BASE_DISTRO override and append apt to DISTRO_BOOTSTRAP_BASE_PACKAGES for this distros. Signed-off-by: Anton Mikanovich --- meta/conf/bitbake.conf | 2 +- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 80dc01c7..22fdc0e7 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -70,7 +70,7 @@ KERNEL_FILE:riscv64 ?= "vmlinux" KERNEL_FILE:arm64 ?= "vmlinux" MACHINEOVERRIDES ?= "${MACHINE}" -DISTROOVERRIDES ?= "${DISTRO}" +DISTROOVERRIDES ?= "${DISTRO}:${BASE_DISTRO}" OVERRIDES = "${PACKAGE_ARCH}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${BASE_DISTRO_CODENAME}:forcevariable" FILESOVERRIDES = "${PACKAGE_ARCH}:${MACHINE}" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 9f1142ba..22fb398f 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -25,6 +25,9 @@ DEPLOY_ISAR_BOOTSTRAP ?= "" DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales,usrmerge" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = ",gnupg" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = ",ca-certificates" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:ubuntu = ",apt" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:raspios = ",apt" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:raspios64 = ",apt" 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')}" -- 2.34.1