From patchwork Thu Mar 14 07:27:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 3405 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 14 Mar 2024 08:31:35 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f62.google.com (mail-wr1-f62.google.com [209.85.221.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 42E7V3dJ021579 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Mar 2024 08:31:04 +0100 Received: by mail-wr1-f62.google.com with SMTP id ffacd0b85a97d-33e7ef510aasf296906f8f.0 for ; Thu, 14 Mar 2024 00:31:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710401456; cv=pass; d=google.com; s=arc-20160816; b=bmvXauK5Fg608qGmPWmp/glfLH7B0uC5gjiRCMJz1SWy9jzAoYZanZRdJixj4/Skdd 84ht3Aurav/DIXk/Nuun+ef8RsLFpZV2Ibfo9qyjUg6vW8siwdQGASg3TKW1nXUJvF1z QwtNekmSIbPiqK71OvdZ6y/iGdrEBF6rMLaTkLoDvdTic8Z4XlhgAS5piq+xGUyGYSW8 pHXQl3mhrAx6ZN+1c/knkjUdQY8UVorByFFsUzIExBSlCAIwRhLCX20V+8tXLRChmXVr otktme7eYnqqQ33/mWXQp5qcGErfWPLUQVT/3DJHSoqy63XrwVBUpgrOOuqwKuUDlhc7 XVhA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=j3hf+dqUOOr6+JyxflK1UanAlbRAjriUIe9XRXLJA0M=; fh=epo2iNTgg1Sv/z5AErStHOZmGqrupst97YUxRwsk8QA=; b=tbno/LXAU2l9ghmev+ORwU5o6IxR5KYb16QFaLpiL3dzdI72lTQlj477s8w3X2SpAo WpRdWpewWjhaXBN7rWryrnTv/jZGmPAbQ3zwoUbmkWrQS96DRLkjCXkOsGNaO24p/Tq6 2bwEtco2nsP1+ygXJ2TfavUQdpvGZNrvUQ9jT3nnNJFpZY/owAkyb3PN4Kh/a3op4pLY a08dZ4z4l3WjZZDFmQpsMg09y8touIq8LVsDrE1zzo46lnMfrDHK+WodB6QpQiMj9yId btxqA7wpqbOQSuv44OXeAlNrNOVfJoiMDDOisAUCtDlgTd5DvTkQ6XlwTIzfo9/6K5/7 bFZw==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1710401456; x=1711006256; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=j3hf+dqUOOr6+JyxflK1UanAlbRAjriUIe9XRXLJA0M=; b=GIj4mWANze9gwVLogX3ZFetgGi3Fs3dzrYEOkpTfsoD3hSqz0FkJOLOVYmflF/009E 9UpZwdfYcQpjNPy7tEN5kChJ2LDQ5IiDGDOunjCpd/TeGIEQlqkM8+DRjbmezuukY5W1 0uKNmrIV2PMbnycTQNGD4l4c395GeceDO8z0uUwkYR3sOPH/1XXjKb6YzDvA0JwEmmT9 8vfsONAkMA7Jwh/b99aE4HuQYnT2SNiyNqC5Q0GFgmhEyfhogrEw/6wmAj1Myb2H4Awb DWhoqRDVc06umZl7kj4nNS1XzedoLmhtJHDMKK/YYBmDpMIxz+7JcMCNvsKjejM+hhwz W/uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710401456; x=1711006256; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=j3hf+dqUOOr6+JyxflK1UanAlbRAjriUIe9XRXLJA0M=; b=m+46UhbDTm0vvEGMDqSGxmg3b/kCrwWMajyQZF8jEi7RmczqhL54wqJBGkJT5oqJgm zTXlj1B/t+C25ljdN8zsAhp2d87UIWhx4grfyxBaiTkOW2hGYbMQ3WXOIYmGrI+0hQvl 7lVADENUt2C3uwyaTnVF3F9vUi9WdBR1efV76GbqOI9z3aU50N0nuFrp0K1bfF5cEIqD qK08iDR/CVt8ws1f45LF1zutKt/3aaeMCWndNj+HFZvEkTElC5DJaPB3Y5HYFvWFkwFY YqHzVkZ7LWHBq7lxYNDQ3D5BkvIpNX2XR4J1tCufBrb67+Y8JYk5KsYDGiQdmmYL91vu 6e3g== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXQUgXG6ath8LFVZvueD1H9IpT5FW/hr75OldMEUls7RDzy9Jlif5vDdfWHeDsj0rjomCvdPukLhodE75RARxigRT4/q4Q= X-Gm-Message-State: AOJu0YzV8o7VB05VY6Ox32fgYCSnPjEJUAUHW1ZRvrMkeDSdUkW18OlJ cR7+cXSb2f3YjNxScuo4iT/GIkL+bN0pdkXTKMjUqmHqK85xz6Nw X-Google-Smtp-Source: AGHT+IFcJJQdfOym4lv+FGPnP3uq6M0CJKSqjUeAiMrDxty2mQ/chLz5vMCcEJCsk8fpXOns5qM2+g== X-Received: by 2002:adf:a454:0:b0:33e:7cc8:bd7c with SMTP id e20-20020adfa454000000b0033e7cc8bd7cmr502202wra.19.1710401456297; 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-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 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; 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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS 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-Original-Sender: ubely@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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