From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7291218501940805632 X-Received: by 2002:a2e:a58c:0:b0:2c5:8a4:9e6f with SMTP id m12-20020a2ea58c000000b002c508a49e6fmr3430792ljp.37.1697619098680; Wed, 18 Oct 2023 01:51:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:487:b0:2b9:631f:ac29 with SMTP id s7-20020a05651c048700b002b9631fac29ls503904ljc.1.-pod-prod-08-eu; Wed, 18 Oct 2023 01:51:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFhdH6M8wtBGG0GnNXxg3qJULXH0uNapY+WfRrmM4pCK35UDIkQ01yPd7IHu80AFMRU5x9p X-Received: by 2002:a05:651c:154:b0:2b6:da88:a2d0 with SMTP id c20-20020a05651c015400b002b6da88a2d0mr3480812ljd.47.1697619096682; Wed, 18 Oct 2023 01:51:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697619096; cv=none; d=google.com; s=arc-20160816; b=qe9S/TC1YtWb9t+VrvzsG3TotysYd31CDceAN3Spk+BSVPyDFAy0HwYcOOV8HVFmNa qvxAIuGo2poKuB9byC5BkkNKyLYGyPi+bTL6m0Ugk7qoJJXPmgx9nvhroDSBJmOjIoKN WmW81gQQmzCe1ukaz30p+5b70HVscl3gRyc4jNAI5DZlARDklLGDapT/xjmP6FggZ3qQ Arkhc292+Sa/tcvCDVQ/zfnjDiYFnKeq/RnNJyJYjQiy23kLtfkalvYLaHA9R6tz8hwh FD7hi8g/3h5V9FxEocrJJnrVV3caoUuP9BZ4IZcsUccDMTCH+AwfvDvK1aM+ItI4L/67 fzAw== 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=RIT6GfFUflTOknJJPhk32NAp54n6O+x9c+pshy9SzySoipDi3cyu+Y0h0n/qOupcCl ocqJbhCq7gRbepyyMmo/ImsZ6+agvMmPKn4M16SdO/mNpyao+ACZt1LP8aKBf6/cIuxx qjunAgs6tk2XiZFF7//jMnIzz0pPHRorFa3BNm71yEeVSi2h/F5PyggaE3TENVTnbWiA gzAVd5AQ0AgitzE55GMg08jmuyAtxoONuW1bWAlGmZ0LFTPZJUk0eW71kn3GfWsSi6OK /WBamFRnNyMstl5I7qD4gBX2C6748ZSDOjJGIrBbmqjaOSuXYlifrfA8nTjwvRVr8w3n WgJA== 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 y38-20020a2ebba6000000b002b9d5a29ef7si127359lje.4.2023.10.18.01.51.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Oct 2023 01:51:36 -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 39I8pXU2024948 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Oct 2023 10:51:35 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v5 2/7] meta: Preinstall apt for Ubuntu and RPi targets Date: Wed, 18 Oct 2023 11:51:20 +0300 Message-Id: <20231018085125.378989-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231018085125.378989-1-amikan@ilbers.de> References: <20231018085125.378989-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: xgattNs8Ep6z 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