[PATCH v6 2/8] meta: Preinstall apt for Ubuntu and RPi targets

[Anton Mikanovich <amikan@ilbers.de>]

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 <amikan@ilbers.de>
---
 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