From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v5 07/12] meta: Consider global debrepo context
Date: Fri, 26 May 2023 09:00:22 +0200 [thread overview]
Message-ID: <20230526070027.16890-8-ubely@ilbers.de> (raw)
In-Reply-To: <20230526070027.16890-1-ubely@ilbers.de>
For host/target and cross/native modes different debrepo context
(e.g., working dir) should be used.
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
meta/classes/dpkg-base.bbclass | 11 +++++++++++
meta/recipes-devtools/buildchroot/buildchroot.inc | 11 +++++++++++
meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc | 11 +++++++++++
3 files changed, 33 insertions(+)
diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index e3412c82..c3e47a69 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -12,6 +12,17 @@ inherit repository
inherit deb-dl-dir
inherit essential
+python __anonymous() {
+ distro_arch = d.getVar('DISTRO_ARCH')
+ host_arch = d.getVar('HOST_ARCH')
+ cross = d.getVar('ISAR_CROSS_COMPILE', True)
+
+ if cross == "0" or host_arch == distro_arch:
+ d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_TARGET_DIR', True))
+ else:
+ d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_HOST_DIR', True))
+}
+
DEPENDS ?= ""
RPROVIDES ?= "${PROVIDES}"
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc
index f74896fb..320df55a 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.inc
+++ b/meta/recipes-devtools/buildchroot/buildchroot.inc
@@ -13,6 +13,17 @@ SRC_URI = "file://configscript.sh \
file://deps.sh"
PV = "1.0"
+python __anonymous() {
+ distro_arch = d.getVar('DISTRO_ARCH')
+ host_arch = d.getVar('HOST_ARCH')
+ variant = d.getVar('BUILDCHROOT_VARIANT', True)
+
+ if variant == "target" or host_arch == distro_arch:
+ d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_TARGET_DIR', True))
+ else:
+ d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_HOST_DIR', True))
+}
+
inherit rootfs
BUILDCHROOT_DIR = "${WORKDIR}/rootfs"
diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc
index fd8bb648..03f812c9 100644
--- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc
+++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc
@@ -8,6 +8,17 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260
PV = "1.0"
+python __anonymous() {
+ distro_arch = d.getVar('DISTRO_ARCH')
+ host_arch = d.getVar('HOST_ARCH')
+ variant = d.getVar('SBUILD_VARIANT', True)
+
+ if variant == "target" or host_arch == distro_arch:
+ d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_TARGET_DIR', True))
+ else:
+ d.setVar('DEBREPO_WORKDIR', d.getVar('DEBREPO_HOST_DIR', True))
+}
+
inherit rootfs
inherit compat
--
2.20.1
next prev parent reply other threads:[~2023-05-26 7:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-26 7:00 [PATCH v5 00/12] Improving base-apt usage PoC Uladzimir Bely
2023-05-26 7:00 ` [PATCH v5 01/12] meta: move base-apt from deploy directory to the top Uladzimir Bely
2023-05-26 7:00 ` [PATCH v5 02/12] ci_build.sh: Install python3-apt if not installed Uladzimir Bely
2023-05-26 7:00 ` [PATCH v5 03/12] scripts: Add debrepo python script handling base-apt Uladzimir Bely
2023-05-26 7:00 ` [PATCH v5 04/12] meta: Add debrepo bbclass handling base-apt prefetching Uladzimir Bely
2023-05-26 7:00 ` [PATCH v5 05/12] meta: Always use base-apt repo in local mode Uladzimir Bely
2023-05-26 7:00 ` [PATCH v5 06/12] meta: Use cached base-apt repo to debootstrap Uladzimir Bely
2023-05-26 7:00 ` Uladzimir Bely [this message]
2023-05-26 7:00 ` [PATCH v5 08/12] base-apt: Predownload packages to base-apt before install Uladzimir Bely
2023-05-26 7:00 ` [PATCH v5 09/12] meta: Add cache-deb-src functionality in base-apt mode Uladzimir Bely
2023-05-26 7:00 ` [PATCH v5 10/12] Set ISAR_PREFETCH_BASE_APT by default Uladzimir Bely
2023-05-26 7:00 ` [PATCH v5 11/12] meta: Specify grub-efi packages arch Uladzimir Bely
2023-05-26 7:00 ` [PATCH v5 12/12] Disable deb-dl-dir in base-apt prefetch mode Uladzimir Bely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230526070027.16890-8-ubely@ilbers.de \
--to=ubely@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox