From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7345128867348086784 X-Received: by 2002:ac2:5195:0:b0:513:353e:bcaa with SMTP id u21-20020ac25195000000b00513353ebcaamr4535550lfi.36.1710171082170; Mon, 11 Mar 2024 08:31:22 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3991:b0:513:b062:1908 with SMTP id j17-20020a056512399100b00513b0621908ls351382lfu.1.-pod-prod-08-eu; Mon, 11 Mar 2024 08:31:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFXyg/NILkgVFZXsC+ashtjivY51T9E94sknvz3Z2ItxsbBJX663Cwsn73K0HIIvcEkz01C X-Received: by 2002:a19:3807:0:b0:513:8f53:cab0 with SMTP id f7-20020a193807000000b005138f53cab0mr4698369lfa.27.1710171079981; Mon, 11 Mar 2024 08:31:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710171079; cv=none; d=google.com; s=arc-20160816; b=lwMNHeuhmb5sICgT81V6JDOMOZX9+C+cYwPn50CemYzbX39HhJS5gNQ/I2jwnw5u1f 7Gi7kONsecShOpk1GHVrFmKnfoSzoC5mgCo9PXdCJov9SrR11+gdtMZqbfNDpO4nAtL5 FF2G1HAM8vwMpGTlsx9f2JLjWzX098qenPyLq+2Gzsr/QlCyVSV9sHUkFqykjvPDqQPv 1GOoM1aBaXIQiTTAJ3xarD3WXDL3MVJaWWf2QUNU6ZvYD8NZWdnXGG20XzFr/JE2Jxgx PuzJJrmoSKWp6vooeaUXHn1Y9TMvJvzE7sDjhLcAcaNrR7dtCdxWkg49wE6s/7vUwgQL r4Ug== 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=xRZ66neD4D5YnTDCHjqEFGhKv59/eV7o40VjxL708o8=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=hWbQCQMwT6YZCdrngrdCfJKEEKVNTT1Y8UMrQvA2KiwdKHQHw+Hsns9wf5N6SB3DX6 Ac/2uMXnD5AF8gXPpSO2aTg9wcu2Se6NgGLT6gDi0GYIf59++7zRbvqCnG1vVuDvCsc9 uDbPXhzLybH6JBCK2B52bzxbiPhwCgnFuEBXuNQeKjJMUqywU80xUJfOc7rDfN4MooAH M5P5Re9PzF44+ID8n0CC5oVOH4rqBaL2Ns4h/lOd/x+581FuflZnz1eNPFcV071D3UUq NRVak8Wq8+anANMoWCMD94cAGv76B5dpBIA4q9LgrdP6HirYcW+0jCqsUipckXoiapaY ytUw==; dara=google.com 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 o30-20020a198c1e000000b0051399d23b1bsi688199lfd.5.2024.03.11.08.31.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Mar 2024 08:31:19 -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 user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 42BFVHal007311 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Mar 2024 16:31:19 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v8 1/8] meta: Preinstall apt for Ubuntu and RPi targets Date: Mon, 11 Mar 2024 17:31:04 +0200 Message-Id: <20240311153111.3772144-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240311153111.3772144-1-amikan@ilbers.de> References: <20240311153111.3772144-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: hSiHQqelBSE7 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 91c5c815..11db1261 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 17f19fd8..585a42b5 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -26,6 +26,9 @@ DEPLOY_ISAR_BOOTSTRAP ?= "" 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:ubuntu = ",apt" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:raspios = ",apt" +DISTRO_BOOTSTRAP_BASE_PACKAGES:append:raspios64 = ",apt" DISTRO_VARS_PREFIX ?= "${@'HOST_' if bb.utils.to_boolean(d.getVar('BOOTSTRAP_FOR_HOST')) else ''}" BOOTSTRAP_DISTRO = "${@d.getVar('HOST_DISTRO' if bb.utils.to_boolean(d.getVar('BOOTSTRAP_FOR_HOST')) else 'DISTRO')}" BOOTSTRAP_BASE_DISTRO = "${@d.getVar('HOST_BASE_DISTRO' if bb.utils.to_boolean(d.getVar('BOOTSTRAP_FOR_HOST')) else 'BASE_DISTRO')}" -- 2.34.1