From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7075595997826514944 X-Received: by 2002:ac2:44bc:0:b0:448:30ec:685c with SMTP id c28-20020ac244bc000000b0044830ec685cmr18794411lfm.404.1647415570744; Wed, 16 Mar 2022 00:26:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls717075lfb.1.gmail; Wed, 16 Mar 2022 00:26:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2L2jHNPM+hWbasvkZFXGVoRIBg8ZeZlTlx1pb1GoQ2n89JkaKcqpGbuMlCAMVLpgb2Ja7 X-Received: by 2002:a05:6512:3a83:b0:448:9135:d9f4 with SMTP id q3-20020a0565123a8300b004489135d9f4mr9439187lfu.259.1647415569657; Wed, 16 Mar 2022 00:26:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647415569; cv=none; d=google.com; s=arc-20160816; b=Mq/1EIejfyrS/A7IH6g/ilKlXNScXFGm5chkQOoMW8V0oaykXkq0mBTZbgI6rUvvCp JXj1TBwGa9fO5Nj5Pg/2y2JpinvzJm1SkptOoAxCjAzLiDmGYXGiL2xg+vIUW3Dihzuj tcsW2QkRcWiI0l66TqRA069cG7I1tFEhMu6YeEJx/O4oMCnTTd7PLaayGu+sAn7x5taG T3pHlvtVQ3UI0JLiPqEjk5eeP39eSsiRWUinKdTPGUEjmOkc2IyyRphttvYMvW1J4LVv ZvvAZ6vy7tLIn+4V6P/Spfsod/F9kuNiKT9ZKIB3uYDxEw7NT04lNHV9b/3RXKKUcR7A 3pfw== 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=ixOwuxaI9NggAsdAE7iDqGI2n4wE3gbRb4eY0JTrQTLFCfrmWPkBP8hpT8zZtMppXn T/VK5V4Ys0kNI2mZefnrSQrbnB5M6DQ83hEmQBGO87Wywxm8Fmo+qlaRxfcxiSLKVV0M qyi+6vzjmOHq1knHNT6hYlPiWVjxJyZ9cne1Qhao8JzNiqIrgDvvYi2arT198aqatjVe VJ7RlA3o6cFqhW7dSHu0SQ8YwQ286MB2SZMdT6U1kdawBo3AHpYLuEAPOsmZtO+nS/Jx VYbBykCZA6A5f90jZVjFSzRChivELWOgdrqdKxX/w4YxjrwDN761Wjfc8kgbLzoB59aN nYHw== 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 a9-20020ac25049000000b004487cee8a6csi70518lfm.11.2022.03.16.00.26.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Mar 2022 00:26:09 -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 22G7Q7dg021517 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 16 Mar 2022 08:26:09 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v8 02/15] dpkg-gbp: Use host tools for dsc preparation Date: Wed, 16 Mar 2022 08:25:54 +0100 Message-Id: <20220316072607.20518-3-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220316072607.20518-1-ubely@ilbers.de> References: <20220316072607.20518-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: zutMJ7FCL7W7 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