From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:aa7:d5d7:0:b0:418:f7b0:88cc with SMTP id d23-20020aa7d5d7000000b00418f7b088ccmr1641608eds.227.1647492624047; Wed, 16 Mar 2022 21:50:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:b104:b0:6db:68d:9213 with SMTP id u4-20020a170906b10400b006db068d9213ls2376152ejy.0.gmail; Wed, 16 Mar 2022 21:50:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAu3zytoYPUutRkG5xHuZcDfCrK84B27b4TzM0e08GN66wpNpKLKU5RzvThJBnHealokUf X-Received: by 2002:a17:907:168b:b0:6db:a7da:2d4d with SMTP id hc11-20020a170907168b00b006dba7da2d4dmr2673907ejc.101.1647492623129; Wed, 16 Mar 2022 21:50:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647492623; cv=none; d=google.com; s=arc-20160816; b=MWjibqMRsw78iHNp/JTGziPnhjqhg+tsqXnhxGRehi77rqwKlTDdsBguWIRdfjnvw1 mJMFC/IATgpg7ZP/Lwie4YBGqr3E4cp4OvmukU7PCkVt85mcL/H1ac2XeTw2J1swqR2Z MP2dfGvsVF3uALhFR5FpsVGCg3JtCnwaHobkt3P9na1a106XEjfL3QQgwjyHBwpk3klE //GTEySy5ANKwQjWw9Ja4RbFaXRkkndarPymy/dNTMsjBHhqqVHU4x63CLXXxZCTE36q VDBgx8mik76YRlW5b9ZqaoVBQctRTM5i3HoAye3LeAplHTpO5J5U9Ki/9wTYi1zzqHH2 yf+w== 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=KTkl8xCGULIpxpCLfN1j786pYqx+iXX1wf5BsO0zR6E=; b=yKH+T/9wCXc7IquRmbflDTM5AIcfUlLZWXVaaBZtfjIUeskOILk6ylg8LmILtAcYET aF0PcoBFBIzNN+H/vlXh08crNVgS4YYi5aoRvWkCfkCRihKwAAwDdrV+HqhF/qUXi+Mr Xll04Jd9nMGZGH/jwI+7+iY36HPHobmnC4Bk73M9wf3zJgKQyvOz48HPOVEucgn6kmnI yoDB3DH9V+qhy4c4dx7djDWNS5smBFqwTCVOQfX+jC99OuAChu3nx85pZQ7AlWGj6war wyS8OMncXOaNl+e+i4L3P8jJEaHZcm9XB6gpriXHb2ukfHwCTia34ejmHhccpb7DJyd1 gqww== 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 m16-20020a509310000000b0041641784d3fsi121277eda.3.2022.03.16.21.50.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 21:50:23 -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 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) with ESMTPSA id 22H4oLHZ025716 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 17 Mar 2022 05:50:22 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 02/16] dpkg-gbp: Use host tools for dsc preparation Date: Thu, 17 Mar 2022 05:50:07 +0100 Message-Id: <20220317045021.4018-3-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220317045021.4018-1-ubely@ilbers.de> References: <20220317045021.4018-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: PJNGjGGREpxJ 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 466bf8ed..f1e3a83c 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 6129d734..2b0b8184 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.20.1