From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7291218501940805632 X-Received: by 2002:a05:651c:3dc:b0:2c5:14d3:f295 with SMTP id f28-20020a05651c03dc00b002c514d3f295mr11173521ljp.35.1698836299277; Wed, 01 Nov 2023 03:58:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:210f:b0:2c2:9016:aa8f with SMTP id a15-20020a05651c210f00b002c29016aa8fls2706068ljq.2.-pod-prod-07-eu; Wed, 01 Nov 2023 03:58:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGq/Xjq9hlSLj+Tnpse0JAZxSyKTgwyWhbMWYhmOAs3+qP041SirRN1WWlRlfIeW5zWxLYi X-Received: by 2002:a2e:8e8f:0:b0:2c5:234b:d1eb with SMTP id z15-20020a2e8e8f000000b002c5234bd1ebmr11743229ljk.50.1698836297335; Wed, 01 Nov 2023 03:58:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698836297; cv=none; d=google.com; s=arc-20160816; b=Zv3/sqZp07kryUW5GkKnktKR0BX1oKzNifns8Yjf8cmrkmKLA5P3medRBhrewHZuyM EZDdME/58OYjMDoEJFVKAmqY0T3ivCRRXxX/5N2WMC/p12orMwQgY8txeHytONKOO2/Y Eg0Kk/1kriPZknzpRCnldguI1ov5QcZUmByS4Sxxegt3S4zgy0uyKeVgKMhh2aFE5a71 AFUbpeQuUZfQHyr4GcpbimlVwz3ZNm+ITHDJGffTZcuFy31WZKn0tkUrFElsKE9hhOmE rilwO1GHE+GnioJtH8wF9Doz5b5hP3yrQOWt9Rdr8CB4EbCQclxS/ZhsWmTjmmThSgYz DURA== 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=6v2iw8nV37JJRz/q1SFB9sFLXiUbxsH7h/MULjCrKkc=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=yHLslCI0UZDZxJWPiNSMuknO5/JDLHL1guwUMDKSktIr60xlk6EFfECdmVVIXMSo3C AfErRJLmeiMDd7q6cylM+cod4ikUALMhCuzaD0rm5cCdas1DG09jlxplGxU8X/zxgNwp WXEQDByg1gsd9WVAKotqLNLNLeEvnjxeLKh5d8GTqYHmmJdGkXWNmuChIAg/mF7dc9Uo gVAm8SVUXA6tPOZHofTpR0OamHHiBEGwDFdweIC/JPetbWzQQ0+4iu8o0rftviVGwH8y rumuEk961VqyUpBKfjVrlF9MseuhR6zLBjri15dGgRS34IQWF77DRjegMLvk0KM5oilR Fqwg== 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 k5-20020a05651c0a0500b002b9d5a29ef7si77030ljq.4.2023.11.01.03.58.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Nov 2023 03:58:17 -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 3A1Aw4c5010660 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 1 Nov 2023 11:58:11 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v7 1/8] meta: Preinstall apt for Ubuntu and RPi targets Date: Wed, 1 Nov 2023 12:57:50 +0200 Message-Id: <20231101105757.1988498-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231101105757.1988498-1-amikan@ilbers.de> References: <20231101105757.1988498-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: mFB2eDjXJNvk 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 3477c2fb..334898fd 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 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