From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:ac2:491c:: with SMTP id n28mr20215620lfi.486.1643734855186; Tue, 01 Feb 2022 09:00:55 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3ba6:: with SMTP id g38ls924781lfv.3.gmail; Tue, 01 Feb 2022 09:00:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJxPR0q05QlwRVTv+8FEXinfFEppejsLl/fEH+tGnjOeYuGoqvEI+NysMcwk3XTPPgaZBrqU X-Received: by 2002:a05:6512:2311:: with SMTP id o17mr19476270lfu.345.1643734854145; Tue, 01 Feb 2022 09:00:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643734854; cv=none; d=google.com; s=arc-20160816; b=XgLoQ6pOYZw5ml8j4sF8qlxR3vgAZNTVCj9EqqBi0IkIZbcw4e4DbxwxQajsVFaomg xEAnUYpanj+2yLxxJI/ArG8dTpZZxmWAzTNWun3y720Mw15oa398X03TjExQOxuP5mh9 tCdqcgJxGZ7Wft5CfccvKsvhaHomlQlNsb6Fs4+pmJaDv5InBPy1/xfJTaFE+vcO4WCL asNm+iWDyi1LbQn9VqeSgXY0kIAK1LPmhIUrTme42vmZ2WC9hU74ck4o2qkqT1H4OHnu BsD7wXGGTH11oUbN5FVObJdjiQ/s5U+j6aCUHkE4VWh5uVqp8ropVAfkgahBpPSYMwyq yOMA== 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=KhfLC+iDCZ4dMZ/OOkNc24R2yVrJhH+HU869UCuoJWs=; b=X8O7agO36bdoKY69vXcCr/4QIEK0DQb3rtaC0IZfpTnCJ+jXKfhLfjj/qIciFcCGf8 lQc6FYrY1tLSjY8ekh2C38H1qeS9agQJbthOXY/Fo7MbQTjO78BlF2j/XtoOvGEEh8zk T8cLZ0PA/PHj6Z2uYk/YZYBJUJ7BptUo4YPQ9FYJYvgX1DeJGk7vbEhFyRcjZPwZZXfJ E6mHHRoPL6Wcyz4/Cv2dqfsVcuTSgj3wQPkSlulU3W37XCeMabPv0uroGIllhwu17Y5N 7tWx5ubFhXz2oGkA3hZ+SCZaNFSEKjZRkanLllZ4JhJQlZjsHV5o3EcNo/OYeo3pWa8k pAOg== 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 i4si482725lfg.6.2022.02.01.09.00.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Feb 2022 09:00:54 -0800 (PST) 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 211H0cA6019722 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Feb 2022 18:00:48 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 02/12] dpkg-gbp: Use host tools for dsc preparation Date: Tue, 1 Feb 2022 18:00:28 +0100 Message-Id: <20220201170038.5723-3-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220201170038.5723-1-ubely@ilbers.de> References: <20220201170038.5723-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: RGe+6EIwjNmQ 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 4d4fa763..df73ef89 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -80,7 +80,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 ddf23ca5..2fc37b2f 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-builder=/bin/true ${GBP_EXTRA_OPTIONS}" + sh -c " + cd ${WORKDIR}/${PPS} + gbp buildpackage --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