From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a05:6000:15c8:: with SMTP id y8mr6712489wry.55.1637324022748; Fri, 19 Nov 2021 04:13:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:1c7:: with SMTP id 190ls6996864wmb.3.canary-gmail; Fri, 19 Nov 2021 04:13:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJwL/zMNadi2LxscW9UAgLPJHaADJy/JHG6r+8fji/5D1Wgg/OfVizvw+zx/wp5KxGVCRQC3 X-Received: by 2002:a05:600c:500b:: with SMTP id n11mr6330783wmr.38.1637324021752; Fri, 19 Nov 2021 04:13:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324021; cv=none; d=google.com; s=arc-20160816; b=Nw1HFh4vd+VAM9gXNjCaptFaraGN4OSpkBDyVit+30DkjnbXIepunq5FjNia140Dny S1COH2kPWwS/g7QFAhtponm+iMQxKppG7acocq3srNeiW8K7oBCGiyyATExdQLr9JIXq QVTTDC+gOWpenhnrDPuD/e5SNWit+WlXF4eEB9/d/gXWyYcMACLp+pagd6vGuhjUpDZQ /4jJNcKQluo7cHIVBCnCI/MobFQt/dWtjSjFPBhHdDhJzl8cpCSjqShkdpiVTChlrDne NO3bgL2NWrHsoS0X2m2ErXUtm9JYx3PotGeNfp66V1xeb4GxH6amY6gMwREITIsX0YZM 2sQQ== 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=BYEXyAnI4HzFespAKACnDl3QbzOxFCYWq/YYwypr7LA=; b=ZqyFXsyJWantiS86aZ7QN+ovVP5kIZW2a6Jv3j16/IhLE1AM9gCtRduQEluO7gp9SM EyFnoJmEhleaeMCdtktZIPviuvPjgect+qsVFY0lMcPZug13AFK7++YnYAkFSSTbjotB 0eV5X0kzfJ1opFWtg/EWlAAUYT8a/r2vd6FM0/ATJZOA+WQ9QzkyYqV4xbP6qoQkcIOF EPljYpZfGjLpB1qG4BJ6HHR42ImchsFuCtkebDgs0XmajxQ7B8l5yCNQfRDwycpvjzH+ 9NzqpZ5VfHl4b9clXO4939e4NqDlCvYyzqJY8vMjo81yVpmjrBBwpp+Y0ggWLwqM8Z0i /7YQ== 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 a1si182041wrv.4.2021.11.19.04.13.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:41 -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 1AJCDX7W021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:41 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 22/24] dpkg-gbp: Use host tools for dsc preparation Date: Fri, 19 Nov 2021 13:13:31 +0100 Message-Id: <20211119121333.13805-23-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211119121333.13805-1-ubely@ilbers.de> References: <20211119121333.13805-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: +TJ2sE3RVRuH 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 | 4 +++- meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index 535d456a..84c99604 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -78,7 +78,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 436fad0f..c9cc487e 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -15,8 +15,10 @@ GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" SCHROOT_MOUNTS = "${WORKDIR}:${PP} ${GITDIR}:/home/.git-downloads" dpkg_runbuild_prepend() { - schroot_run -d ${PP}/${PPS} -c ${SBUILD_CHROOT} -- \ + 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` diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc index b6b73550..177a8a6d 100644 --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc @@ -12,8 +12,6 @@ inherit rootfs SBUILD_CHROOT_PREINSTALL_COMMON = " \ fakeroot \ - git-buildpackage \ - pristine-tar \ build-essential \ debhelper \ " -- 2.20.1