From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:a2e:934b:0:b0:24f:cce:5501 with SMTP id m11-20020a2e934b000000b0024f0cce5501mr16809880ljh.443.1651761586921; Thu, 05 May 2022 07:39:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:bc0e:0:b0:24f:4ed5:39e4 with SMTP id b14-20020a2ebc0e000000b0024f4ed539e4ls1113373ljf.8.gmail; Thu, 05 May 2022 07:39:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwI4Jqy6LVBhhDkreVZA+kH6nvZfrxJvHAA1hI8YbavyanRtZKZxSbHVuNaXv8p3QGhgkM2 X-Received: by 2002:a2e:3217:0:b0:24f:14a4:bfcb with SMTP id y23-20020a2e3217000000b0024f14a4bfcbmr17175992ljy.96.1651761585707; Thu, 05 May 2022 07:39:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651761585; cv=none; d=google.com; s=arc-20160816; b=YwhQ78UR0hnDfbFK+qr4ueaTTdXw6LTkMJZ82ZQJnyVsHRjz044EOcQcHInHCWxgHn G5QsqrGUOB5MuN+1v1jrCL4VL7lWjBoRjMcfC6lO2HBwVZUBEkuyxNwlDRw5KNN0TMKK kYfP6kjNichmVVpr/FSjAfa67JV8vNvuomjd5hFq/Alw3lY+GS/zGY5aZoxI7VgqF1VR gVKJ3ake7rXNEF3iLONBSRvYa5WmsbaqvggnJ5+3PtsUrMemt95rrfQGOG8DuC4PFvC0 YZuQalkQ/WSPe6POa7Nfpp/CC0aC1azn9iTFsGhlI+agS4j/T0x3XHmcXdDa9Q1kuK3n hA+Q== 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=jIDRfoVRd3LKb+Xrmo7hUABwIcWy4n3mWXWvV/gkUnM=; b=Zch5KAyp53C28of/Z99kP0mFz4Jg6Fbiasnc/L7drNu7jXKidr6GP0wBpMAmdCn0Tv D2/DiqOjaj3HKoLBQCsFv0gSZm2yOMDPof8olZaOeDz+E9lBIk793rhyDWW7xT+M6NKm FWbz4cer7itwiJPQayCwBvpayFB5QvyAuWxs1XLamRA4qaQXGd08QHwQVU+jO7W7Keuo naeSyB04eZDddWv8mI15WtkShrngAFTKUYaWaYoTGUY4elsjBCRLqty0IOpag3e5BZ7S dMeuoPUVDzcTk0epkZfvQzQFGGD1loglJIlJRKDTUCePTSJjSnKSj7LnOBTTJ9KRKjOu pn+Q== 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 v8-20020a056512348800b0047238f0bc72si96344lfr.12.2022.05.05.07.39.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 07:39:45 -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-0-74-214-37.mgts.dynamic.pppoe.byfly.by [37.214.74.0] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 245Edf7U014026 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 5 May 2022 16:39:44 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Uladzimir Bely Subject: [PATCH v10 02/19] dpkg-gbp: Use host tools for dsc preparation Date: Thu, 5 May 2022 17:39:17 +0300 Message-Id: <20220505143934.16096-3-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220505143934.16096-1-amikan@ilbers.de> References: <20220505143934.16096-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: t7IVVTEX+exv 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 cdb7322..bcff8d9 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