From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7114179385042665472 X-Received: by 2002:a05:6512:e95:b0:47f:9d60:d90a with SMTP id bi21-20020a0565120e9500b0047f9d60d90amr11390259lfb.591.1656398968134; Mon, 27 Jun 2022 23:49:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3b0c:b0:47f:9907:2b50 with SMTP id f12-20020a0565123b0c00b0047f99072b50ls1758498lfv.3.gmail; Mon, 27 Jun 2022 23:49:26 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uVyYBMNhW7n6RvAO9Mnkwm6xpgZYQ1oGcLJVTQ05lvEbWVzyl0HGg6pmBgi1NWRhyayoyy X-Received: by 2002:ac2:44b1:0:b0:47f:6279:5f45 with SMTP id c17-20020ac244b1000000b0047f62795f45mr10080150lfm.283.1656398966875; Mon, 27 Jun 2022 23:49:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656398966; cv=none; d=google.com; s=arc-20160816; b=Kbhff/73zH/4jhzx0xjpTIBZafbJGADJ5Ti1141XZHQ10BooKkbt9QYqnZ/7SeKkHT 1Wdw4cGy7wnS6VmcltKwnW3v/dnFrJq+LUpO4EU3NYLGmjbOmbCQK5GxUU7smAWjFmH8 pdMvctteWDAitF3WAkT+Fl+j1SbtXQI+bf8PbERRZIRl2L3O1/Fct+F9XT09bvnuZ0ep VmPVv0zNu8pWE5BxNGEhRA1CuHQ3XYsuPYoHSaHJt03madsqXGV/lc3ZYX+OPPwmr88G laVXZjV7okH6kWRKSqvg0eiebHERPwHxhCODnO7uuSPNNcFRCmZO/BSvvQ7yufOG4Zm/ Vpog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=6nQ//XbwTJiABSF85AnmfoHRKNsBeAHfEGk+UUhcwV0=; b=xEFOJsOWVY8SqjTybnynMqoT3DVdSOvBEENia9KbbUwJeZVfb/t2Lnl2r+5jyPesaF 3E//4PhpBt13cBuvMBwUA/lO/6asOaRFau3WlM52+bGwERoH+pYxtMFx1gCGMQBylwuy mX4AYntnmb8c9UibVVKNrqrsJVxE/pvBk9Cw3oTbFUAEGX73A6ksK7fxA8RQZkFlCOSx ZXU4eJSZ/MNg+dBuDGHTN+un9D8AD6PRjPq/eSzW1RoQ7S3nR+dWbd64y1Ccx0/+i9Si gzicmRSY9WimQPyzsMnbTjwAzb0ogpJgfz9vJAYlbR1TD6MGo/MGjIWBdKgr1LkzcasC 900g== 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 bj25-20020a2eaa99000000b0024da01a8c6dsi437957ljb.1.2022.06.27.23.49.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jun 2022 23:49:26 -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 localhost.localdomain (mm-172-27-214-37.mgts.dynamic.pppoe.byfly.by [37.214.27.172] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 25S6nMS6030758 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Jun 2022 08:49:25 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Uladzimir Bely Subject: [PATCH v12 02/21] dpkg-gbp: Use host tools for dsc preparation Date: Tue, 28 Jun 2022 09:48:54 +0300 Message-Id: <20220628064913.27938-3-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220628064913.27938-1-amikan@ilbers.de> References: <20220628064913.27938-1-amikan@ilbers.de> 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: 2PToGX6DU+DW From: Uladzimir Bely Instead of preinstalling gbp-related packages in sbuild chroot we will use their host versions in order to keep sbuild environment as clean as possible. Signed-off-by: Uladzimir Bely --- doc/user_manual.md | 4 +++- meta/classes/dpkg-gbp.bbclass | 24 ++++-------------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index 02874b6..61834af 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -81,7 +81,9 @@ apt install \ qemu \ qemu-user-static \ reprepro \ - sudo + sudo \ + git-buildpackage \ + pristine-tar ``` If your host is >= buster, also install the following package. diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index 6129d73..2b0b818 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -9,29 +9,13 @@ S = "${WORKDIR}/git" PATCHTOOL ?= "git" -GBP_DEPENDS ?= "git-buildpackage pristine-tar" GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" -do_install_builddeps_append() { - dpkg_do_mounts - distro="${DISTRO}" - if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then - distro="${HOST_DISTRO}" - fi - deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" - sudo -E chroot ${BUILDCHROOT_DIR} \ - apt-get install -y -o Debug::pkgProblemResolver=yes \ - --no-install-recommends --download-only ${GBP_DEPENDS} - deb_dl_dir_export "${BUILDCHROOT_DIR}" "${distro}" - sudo -E chroot ${BUILDCHROOT_DIR} \ - apt-get install -y -o Debug::pkgProblemResolver=yes \ - --no-install-recommends ${GBP_DEPENDS} - dpkg_undo_mounts -} - dpkg_runbuild_prepend() { - sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ - sh -c "cd ${PP}/${PPS} && gbp buildpackage --git-ignore-new --git-builder=/bin/true ${GBP_EXTRA_OPTIONS}" + sh -c " + cd ${WORKDIR}/${PPS} + gbp buildpackage --git-ignore-new --git-builder=/bin/true ${GBP_EXTRA_OPTIONS} + " # NOTE: `buildpackage --git-builder=/bin/true --git-pristine-tar` is used # for compatibility with gbp version froms debian-stretch. In newer distros # it's possible to use a subcommand `export-orig --pristine-tar` -- 2.17.1