From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989231260094693376 X-Received: by 2002:a05:6512:3d21:: with SMTP id d33mr12648701lfv.352.1627307214300; Mon, 26 Jul 2021 06:46:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8999:: with SMTP id c25ls2697844lji.5.gmail; Mon, 26 Jul 2021 06:46:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySJ7PGgLeD4hNDuvZOBdnt6ijnB9uT7HUcdGGXE9AnuRJ1KTegCJ5MQDz4iqjt3RNbwJD5 X-Received: by 2002:a2e:9b84:: with SMTP id z4mr12474769lji.360.1627307213290; Mon, 26 Jul 2021 06:46:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627307213; cv=none; d=google.com; s=arc-20160816; b=Yb/CD0e8sz0XdpzC1dH5dEMjUJAq2o8pqDO2ENMQUKMcbr1wTvIYayQEI9YC2Vy3Ql 7YFMCnrhrJLAn4VxIrabzUmsva6OGfi1zD4wbQ8cyChbX9l3Exe7LL2UbWtSVAn+WJ9k u6mmjjVr3ywFaCGd7FF7tgxJ4ZYU68XdgvtmCy+uGe9iwqUFJjTTJ35LKjDPfNIWKIvC v8FzwYFacwVmO5N0/j3m4Mpz0g55trK8upXMhlgxbRm9KxfwN+Th9Zv/pKgTn4Ym5HGJ 0vNh8yh5w9LlnbsvyaJUDl54rO7v5+vFxGI7r3RA7Lmj+OxoDlRUnDc4WVpiHE3YGWCv Y4PA== 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:cc:to:from; bh=FLXAA3fNzHZKEkUvGQxst6Xv+T6r/Lb6V7iAFyGwwPM=; b=aKXPRJJkrvQPQ3xGc9l9aSmioHgwtZpjSDw4ghLl5eBNcs/t6dzSf69f7DxCfgHoX8 mrjhGJ8vmvdsuZByvF/qdw2cVXTJ+TYjcl8cb68F9OrtlpiL7XH2ykr8ik3B1Wp2Wxkq NsNygveIkBTYTDwPW5XTQeQRvadLOvVA/EJfomHabg+0EZSB1U+0f/oRthoUe6k8K9hl r9AWZVAOhstTgAp20okE3eepGRZf5Wv6ACMLDL/yJ8zGB52PvIuf1I/2d4nCFhsYZYDF NsnBOOl5h0OeMO+wBRcEetSg6/bgTunsmtku4XTsrZUvpcx8WQ9H70qWvHDz2rthfTOS PwFg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id a2si438076lji.5.2021.07.26.06.46.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jul 2021 06:46:53 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-198-62-214-37.mgts.dynamic.pppoe.byfly.by [37.214.62.198] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16QDknus019679 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Jul 2021 15:46:52 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 02/15] dpkg-gbp: Use separate export-orig command Date: Mon, 26 Jul 2021 16:46:23 +0300 Message-Id: <20210726134636.30800-3-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210726134636.30800-1-amikan@ilbers.de> References: <20210726134636.30800-1-amikan@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: RPaBMSOfmlcU We don't actually build the package with gbp, but only prepare it for the building with external dpkg-buildpackage command. In case there is no need in real build we can perform only export-orig command which will produce upstream tarball to pass for later building. This allows to use any build tool for later processing. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-gbp.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index 20d2d4c..2711e6c 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -10,7 +10,7 @@ S = "${WORKDIR}/git" PATCHTOOL ?= "git" GBP_DEPENDS ?= "git-buildpackage pristine-tar" -GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" +GBP_EXTRA_OPTIONS ?= "--pristine-tar" builddeps_install_append() { deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" @@ -24,5 +24,6 @@ builddeps_install_append() { } dpkg_runbuild_prepend() { - export GBP_PREFIX="gbp buildpackage --git-ignore-new ${GBP_EXTRA_OPTIONS} --git-builder=" + sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ + sh -c "cd ${PP}/${PPS} && gbp export-orig ${GBP_EXTRA_OPTIONS}" } -- 2.25.1