From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057122428766388224 X-Received: by 2002:a05:6402:22f3:: with SMTP id dn19mr9977195edb.449.1644738302580; Sat, 12 Feb 2022 23:45:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:2387:: with SMTP id j7ls663755eda.2.gmail; Sat, 12 Feb 2022 23:45:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJxZoHtdY082EySnxqy0QXMAcTRfsxmFMh5RzWFdiW45aI1XoOEJZ1Yactl0A6sPCIczm6rF X-Received: by 2002:a05:6402:448e:: with SMTP id er14mr9849202edb.440.1644738301616; Sat, 12 Feb 2022 23:45:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644738301; cv=none; d=google.com; s=arc-20160816; b=YICnmdUdPrhqtW9lKKiZ4h5sJ7D7u1Uzk+c8FG1sfV04hfxYEQpYgbkZHfwHma+gBe BYhvYyK4zmmYHUJxtWeRmQNap+JdQZKEsRzEKiGJ847A2lu73Tw8LHGcKs3SJ4SRwIIz D5tuTYe7AsLPAdReOav+7PKJBPpxE0wiluHuyjfW3k1/pfTrbA/Rg64rA0OBGAeglCwc OOKwlZ5s5yoRfvmiDEln//ckjpFCWp93dMyKza3IUCzEe80UgX3rmQTRKlohsTC2R6l4 nA7W4OBoXjoW7wyYZdkbP7+FnwCspUunZbo2MzjxXa/11cAQjqi4+hWMjNOsLZaVYuDS CyEg== 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=eO7m28mp32EbLwYzNiDD/M/1Bfa5TSrGtvzvRYL5LM4XtCSEVWX4NVv61LNN+gwdi5 wcXH5BskxpW1JKYwX8X+NUL6bV7kQNbZQjuxVAM9lHfzFano5TKpSYwBNhKMFCJzOCcj j/MKUl1sb8UVXtr4TFFkAuP/QrwBzauL4PV0O7jHbaQBRaxDCB2+/AVsGuibO4jddr/n VZqYMUHmxIyQwKco3daJKqcX/+iet/Re0ONltGZP5A4GCyzbuWwVvR5GvdIA3xFPPjX9 vDvey5SpfiEN/jyY8DKHxKFNXBXE4NxH075L6H3b5YEa6Lxi444Xu1tQ/SbjHBUVSFh/ OqeA== 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 s15si1275574eji.1.2022.02.12.23.45.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 12 Feb 2022 23:45:01 -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 21D7j0BU010453 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 13 Feb 2022 08:45:01 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v7 02/13] dpkg-gbp: Use host tools for dsc preparation Date: Sun, 13 Feb 2022 08:44:48 +0100 Message-Id: <20220213074459.24200-3-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220213074459.24200-1-ubely@ilbers.de> References: <20220213074459.24200-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: OsvPEqsEvx+8 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