From patchwork Fri May 26 07:00:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 2849 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 26 May 2023 09:00:48 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oi1-f189.google.com (mail-oi1-f189.google.com [209.85.167.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 34Q70gF2013380 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 26 May 2023 09:00:48 +0200 Received: by mail-oi1-f189.google.com with SMTP id 5614622812f47-3941c5de005sf400044b6e.2; Fri, 26 May 2023 00:00:43 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1685084437; cv=pass; d=google.com; s=arc-20160816; b=IXwOqhJEk4wl8RVs1nmMye16BjQjgIFA2jpzV2VKvimy3X/1N5ar6LuGPdy/BscXzT 6Vra7OcpUdEhEECMKHIG53SEwF/vq+EnLmZhKzTVngnrF5kTLdY2FobmbTN0KsbIhFOB A6RwEbyteCOBRcdCezAbYVlFBwVZCQvqarnFDJWBEeAx68GaX4Ks+gTjPNqfH+PSjjwp NRi8EeFdeM4MH+RdP5lwuMYcvzLiadOy/WGTlfE9ksX7EtKqeP4kdHUGVy7ptkZeo/CM GfleEHTqK0LqP1Jftgz/lS/CeNvs9n7aKqdCS5cP3CrItrpR3x/u5mRWg+AOga69tAgC KtFw== 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=NjhARR1ryE7xast3iZGXrUNxujbMjYoTyLZLQSIr0Ls=; b=nccE1PNgFK4cDn1qojhuac+mWzFlepm2eLXOIsnxqXbzsQvsj/4RGibLur6EMf8mfC ChJocPHex+Y4/egRV7mjF+OIFW2vsOy8ShnQdUAobf+csDqAUhxD0zSt9efbiDZUkZfv q5m8frPB+aq08Q5WFZMrg+BWJB2rUEAA3SYwM3To7ULLLyWkxqoIOGFrgzxB7ts/RoFF QbCZbyWihP1GSYnvrc8a/6cOBVxKYRUau94GgElYeI6nCABswb0buMX6g8N6hJr60Rou lvF4BnlXyj6lAvkANzWdUhIPot2nHdJpRk03Foje79hCPDqg0B/7i/xAHhrNqdrBMn5i HTvg== 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=20221208; t=1685084437; x=1687676437; 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=NjhARR1ryE7xast3iZGXrUNxujbMjYoTyLZLQSIr0Ls=; b=gCRNBvM+j7F+Xi+b/2jzFrXgCNdX6DTHM/QApsxKnytYnOzQ5JnN949/MjDRydPXm0 agSudRv061+so7MN24nga4Q/zPEkzDVVHQiRbG8OYpcbGiNFrp822/zDYcbnbldm+c64 eRZ2JdA+RDiUd4By3ye62VsNqsHm7yFAUnJH18MzhlMtFFraUenI3pVLTivcFLqdFa9A xjhz8F+PCo/IKV9ZVwMWe+oXdYeZUPZgxUU+uYwYoBudZLTMCGHIj+dV0eYlYfmPf0iS EzGPvKNJ0a/ANlNOq7b45GblIu9rnp488x6WbU6Q3itlazYufGoZsRGeV98snsIz3FKu vVmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685084437; x=1687676437; 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=NjhARR1ryE7xast3iZGXrUNxujbMjYoTyLZLQSIr0Ls=; b=PCluKzQEJuYaqtOqhS2T/q5XdxGrdWBxCrr7VxhxixWURv3riiTgC68WAXg1GqbCCR gE3M+CHEnjIOskn0yv/dHfP+sWNKgRyFT3XLNDlIRnIGUqwVdmLBUEHtiVEL/mQW3Gmn 3gPksogm0pSMVWn37Azu12w/taeaQTElwMS4jZbmmxGxCWkwIKh/yPVD2BXCSHC2gVrM 8ZvyVvP/fe3NWQzH1PNWU/n2U5xiUKAT96fPvy5utkTec83ufKLYK/DzZQM7PNJFhesP 3gSE5tsLiYvmLf9VxzkDTeJuPckQ0MvEmXggGvX3yrqkRSabMPsbMt1UPZ2PjLdTSz8X 6DpA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AC+VfDwzEocSMLiAXuJYp6jnAVH/IYhJiDZcxJh9AYr7m2HR9rC44dhK JjFl8fTIowuU1beqp0gviyY= X-Google-Smtp-Source: ACHHUZ73pRALhIYOviTIS2TYnq58O4e9HX5r9ls5KGjCjmtqlVFjVr4xcO4e71CSybPNDZ4Y2Vnjxg== X-Received: by 2002:aca:3354:0:b0:38d:788b:38cd with SMTP id z81-20020aca3354000000b0038d788b38cdmr194634oiz.3.1685084436947; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:7711:b0:196:8f78:768d with SMTP id dw17-20020a056870771100b001968f78768dls1055917oab.0.-pod-prod-03-us; Fri, 26 May 2023 00:00:36 -0700 (PDT) X-Received: by 2002:a05:6871:3d5:b0:18f:dfb:bcb4 with SMTP id a21-20020a05687103d500b0018f0dfbbcb4mr431583oag.12.1685084436431; Fri, 26 May 2023 00:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685084436; cv=none; d=google.com; s=arc-20160816; b=AOtLobFIZmy3wWUIsVTd7/CBUWr7VYpH0g7aOXaiZLhPXFLWVESDIcyh5b1psCk1Zb RMqi/yA7mMuzQO5T7OTV/sTrzINupkZ2dQjygsBHtHaVqHVNrL3jpN4+2EW7idOKREUn 3uFIhcJSIxmTo4lfYSes8Z9TOw2MD2NUzf0k6T0LwGDhV1JBcxNOON7fegKogvQpiwL8 WoH4xnajoH/Fxg5hkDncWreeSOtdNCX8lvkzGUtnvPMvAm8J0o96pm5rtoTyGphdSVTj 9kXXP8hpGFHLpIz7Uk/p5HoRcniqFlD7ua/NYMKs3SawI9ycYbn+tG+1k6CIr4Fs8+r6 orTA== 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=ZSlLTd3Oeeo9kcw/ANv9ho2DaxV6xk5H7pxvkl6K/Qk=; b=gEVZoplVqIRMuil8FRnvLVvbOX9oDQH7BCIPLWXQd/xIt6iRdHL6a7AVFMAWSu3vrY TCIUB+edzg7Eyj9oAr5NDiFPgsMS10t3JT+P/OET7Z4NpMJKoqX754Bb0mA/PLkLaViy 2v1m2wSBQ5fkmvBFpQLliuNLfhPq0dJi10S2yB7X3gStlJb/nL8LTISK9w7dOXlB51Ra RZTRvOP8cp5rACT7m49I9ZQhsCHNd0f+ffKWJyQ8z5RrSwqmFF6p5FN1JN+uIfmeGijO HlO1l4Ne0t1UObhHTB5U1bPph2L7FzBMu+RzjWduA3jk1VASvchP5XoYXm4KM1Y6lzug s/WQ== 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 el1-20020a056870f68100b00192c6345ea7si478438oab.2.2023.05.26.00.00.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 May 2023 00:00:36 -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 baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 34Q70R3b013306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 09:00:30 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 07/12] meta: Consider global debrepo context Date: Fri, 26 May 2023 09:00:22 +0200 Message-Id: <20230526070027.16890-8-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230526070027.16890-1-ubely@ilbers.de> References: <20230526070027.16890-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/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