From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a05:600c:1d28:: with SMTP id l40mr15816935wms.192.1638968749466; Wed, 08 Dec 2021 05:05:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f885:: with SMTP id u5ls1390501wrp.3.gmail; Wed, 08 Dec 2021 05:05:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJw5vLyg2S7dIs148sH0jwNCbUB+eGzrIGCa//2Y9F7m9GnGA/qw3I6+scOyV/ZERt68AHTU X-Received: by 2002:adf:cd06:: with SMTP id w6mr60537739wrm.431.1638968748426; Wed, 08 Dec 2021 05:05:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638968748; cv=none; d=google.com; s=arc-20160816; b=LLRwO7AnZF19Qd2SAjOJAnrDVTTznaJ9L3TgI++VLonkFSxgiyGAJqYbuqfNlkY3lW zHQrmh/ys8FRpUXx/587gRM9CKJfoldA2RjlcBGifnh8HRHV6qLeYAXvRwIblBLLS9Lo ExspbSemk6TzvWI4qwkoAcC4n41k+9XC2FNXbnA54tgYUgDCBWP3dNsxzH2jKSSyZI+S a7NV7bGYIE7yy/f1cRIMNWUAa2/7lAi+s9UQ70iBFztXGE3N+pFDPbqLE4RvjHkO2DnY WXNPGa/3a1COfm5nMlqnSJCe/ccDlFQXUw7HIM29JC4Swpmf3/8KqKDB84QfTsyQQ8/+ B3DA== 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=dBTPlYDbmYxHfyiSCPGQh+h1QjUNdBHcBcjuKdhqIwU=; b=AM8Zkx0bIafmIdoiXVErg8K4m1odOyQC9RSgWk84Qh0b+KCg0U/9HrmgpW9v+PMg16 x2VN1F0egfU+CyVgLpYWzPc8O/hnnrKEBy0RPksWhDBJyTON63Q2UFFJiwDnIvvfk3P3 IUbTRuzL8eECWbH2pWZSJvIKROm8lumI40K3HXqd20EpLPOMtfETtZP/IjGma5e0Fy41 Jb3Xz9BG0FetrqQOYBk7nWdzlRJ6lqci8Sbitejise520LCYWEU4M2OGUclrEuhrQwTO hU/nCqBDyU/kcfMjCl5LY3Ajealo3j1uC5j1xAwF3uwsCzvC4UqZsW7Rn6tv/9ru7/bA sxYg== 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 p11si429429wms.3.2021.12.08.05.05.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Dec 2021 05:05:48 -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 1B8D5iLA009193 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Dec 2021 14:05:47 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 09/20] dpkg-gbp: Use host tools for dsc preparation Date: Wed, 8 Dec 2021 14:05:33 +0100 Message-Id: <20211208130544.15133-10-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208130544.15133-1-ubely@ilbers.de> References: <20211208130544.15133-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: r9QEGQfBmCeq 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 c81c6e46..9017dd89 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -79,7 +79,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