From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7346118313451192320 X-Received: by 2002:adf:cf08:0:b0:33d:2474:5aa with SMTP id o8-20020adfcf08000000b0033d247405aamr608084wrj.40.1710401456364; Thu, 14 Mar 2024 00:30:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:66cd:0:b0:33e:77b4:c05d with SMTP id k13-20020a5d66cd000000b0033e77b4c05dls230098wrw.0.-pod-prod-05-eu; Thu, 14 Mar 2024 00:30:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH/aED0kdrXlkYmnusm+E0xuUMuvb5H4cfO1+dXksLOVjyHqU4jPLQ8ce3rwgqmoBji62rR X-Received: by 2002:adf:ff87:0:b0:33e:c4c1:b45a with SMTP id j7-20020adfff87000000b0033ec4c1b45amr702931wrr.8.1710401454092; Thu, 14 Mar 2024 00:30:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710401454; cv=none; d=google.com; s=arc-20160816; b=UB3/0pgs0e+/VnJ4mcTNTOPGo9mr9cr5TMM+7m/92h2/tMsbFnr4WjdieouAfHNfps RnmuKv36EWfttSaCRp1hK6Gi6kBmfWeDm3MCGg0Zpr1o8x9fwGhTnkPFBqHdNOm+q5M3 AP4K+Tf85YaEEbAa/d415uubu9tAimuJsU7psNQ4UHskJnxJkUeQ+b2HV96YJFKtQTKC ehLRYeK3zzncjGgYQI9UqBTC1JOE/LmftpV/VVHVUldnySLg4NKf11/cpNEyZpe2TzmU ampw0dG9p3QTjdTyKsD2haetCRxurSVT4YDulOS8r/VjEJr7W+0iuXNVYzbyDwHQPDi9 jqyA== 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:to:from; bh=owX1JO1KAHmznsCtmChnOOBL/knoW/E14MzygLcANHc=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=QEbqMqiI/oMSobFmettt9prcAh7FR/2usUyPdN90lr514j5glFYVyjm0dz62UvBNA8 rbmvqDxhSU/hPyaAUXtH+QDNnFsmIMoOF6b+PSbs25K5liFBDMyaDDEUlwWH5IgorX2X YEy9uqoiKPn8oVVCZ0kE+GKYt8hoYTbgtTqp1mUchvY7PbwMsMAF+pkf3aHKVHyCXnnF lKdPTtDS5aMv+GGSkoYkFN9D8p9sg2T9pIs2GAeUc0tWYTLjHKDg7cNoV4L97nT16U+I Yu0iKy8m2WWK2HxRbGFS4iy6h9ovpUcFcBRP/jb472/+u+PuLbE4JkFyeVX0ySqlMb5g NRgA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id h8-20020a5d4fc8000000b0033da656f9edsi4480wrw.0.2024.03.14.00.30.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Mar 2024 00:30:54 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from hp15.localdomain (mm-209-185-213-37.mogilev.dynamic.pppoe.byfly.by [37.213.185.209]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 42E7UoA0021482 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Mar 2024 08:30:53 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v6 05/11] meta: Consider global debrepo context Date: Thu, 14 Mar 2024 10:27:22 +0300 Message-ID: <20240314073047.29465-6-ubely@ilbers.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240314073047.29465-1-ubely@ilbers.de> References: <20240314073047.29465-1-ubely@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: wDXCcNmFBVfZ For host/target and cross/native modes different debrepo context (e.g., working dir) should be used. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-base.bbclass | 11 +++++++++++ meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 30caedf9..361a7e9b 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/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index d794c6fd..2755eaa8 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.43.0