From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7184686172320301056 X-Received: by 2002:aa7:8201:0:b0:577:81cb:4761 with SMTP id k1-20020aa78201000000b0057781cb4761mr3099284pfi.46.1672823224670; Wed, 04 Jan 2023 01:07:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:8f91:b0:188:b504:8ce4 with SMTP id z17-20020a1709028f9100b00188b5048ce4ls17958808plo.7.-pod-prod-gmail; Wed, 04 Jan 2023 01:07:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXua1Y/9WLX0qa+3hYu3cbKCRdkDWNrm0UgISQs+MHXQVpYvYpt+VuH7J+7lvOJjgEtx0Eeu X-Received: by 2002:a05:6a20:d80a:b0:af:7c29:8a98 with SMTP id iv10-20020a056a20d80a00b000af7c298a98mr61120198pzb.16.1672823223693; Wed, 04 Jan 2023 01:07:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672823223; cv=none; d=google.com; s=arc-20160816; b=l6cr40/Aoo1VeM2+no2EADQExaOIZWIheM8nfNUiTf4xlgdC9Zu/ycP0FfqLIHP1vs EF30giXTHlagUGcUBRCdQMZ1NGvHrvkwO/Qoy53FQZHnstSZVz+boY7xQtXR8Io/BhKm 5IOQUuNEY6vwNdTD1mYSsKKZtPJv5U3BpSWy40kw5+5rQlXK6etIZ5BG3Ft56xl12DT7 AqTazqB8cwnkyovlS0DBGGH9f0W9eP1CvcpttF2IBDgzmD/Bz4LcVUmRrth7rEQ1Ss1w oI/g/vk2ylc1IgSODLL04MLPPmSygrR5qB3tL5FNR6CE8OxRGT5612Q6TLSQAfKGH7DS trLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=CR9mUG9AqLx9rEkhPL7RJMCGkl3ByGzXFB0Fq39kfLo=; b=COPCO561udqzfPEqEfgTZt/4/r09pDezFVRRv1Px376tqW2oyYuyQ8CN83gwm9j0V/ zW3p792YOza4U2ziqThKSosNZoaBnqrmy3kHCCAo1VWsvBOR8v0eKY+E91lGprpPdpGK U/CneeENTRzBST5hmWe3TjEiaGAO00udOyaZC9iCdVanh+nXH7umVI8KpOAvvxmD9AlW SUXyd5wwkgMLntsQascvn9lAa+vd7dVite7QnBE8gbqnhyT+JdCcyBnknteMtn1gsgYR H7497LpfbuQ8Y6HF0MOADeRx9uPbHFURNPeXeKhk3IPaauaNGB4vdHCJ+SMl5EThV9Rz N3tw== 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 r10-20020a170902c60a00b00189348ab16fsi3047591plr.13.2023.01.04.01.07.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Jan 2023 01:07:03 -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+deb9u1) with ESMTPSA id 304970dj001969 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 4 Jan 2023 10:07:01 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2] Use GBP_EXPORT_ORIG_OPTIONS for dpg-gbp export command Date: Wed, 4 Jan 2023 10:07:00 +0100 Message-Id: <20230104090700.3916-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 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: i610x4JwfU2k Since we now use `gbp export-orig ` and they need different options than `gbp buildpackage`, we should store these options in different variable. This patch intruduces `GBP_EXPORT_ORIG_OPTIONS` variable and describes it in RECIPE-API-CHANGELOG. Signed-off-by: Uladzimir Bely --- RECIPE-API-CHANGELOG.md | 16 ++++++++++++++++ meta/classes/dpkg-gbp.bbclass | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 0bb83389..8013e585 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -441,3 +441,19 @@ exist, empty variables are forwarded. **Note about reproducibility**: the forwarded variables must not have any influence on the generated package. This mechanism must also not be used to inject build configurations. For these cases, templates should be used. + +### Switch to `gbp export-orig` and `GBP_EXPORT_ORIG_OPTIONS` + +Since Debian Stretch support is removed, we can now use short `gbp export-orig` +instead of long `gbp buildpackage --git-ignore-new --git-builder=/bin/true` +to prepare gbp-based sources for building. + +Options for `export-orig` should be specified with `GBP_EXPORT_ORIG_OPTIONS` +variable in favor of previously used `GBP_EXTRA_OPTIONS` one. For example: + +``` +GBP_EXTRA_OPTIONS = "--git-no-pristine-tar --git-upstream-branch=master" +GBP_EXPORT_ORIG_OPTIONS = "--no-pristine-tar --upstream-branch=master" +``` + +To support both old and new Isar, custom recipe should have both variables. diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index f765eb9a..4e29f62d 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -9,13 +9,13 @@ S = "${WORKDIR}/git" PATCHTOOL ?= "git" -GBP_EXTRA_OPTIONS ?= "--pristine-tar" +GBP_EXPORT_ORIG_OPTIONS ?= "--pristine-tar" SCHROOT_MOUNTS = "${WORKDIR}:${PP} ${GITDIR}:/home/.git-downloads" dpkg_runbuild_prepend() { sh -c " cd ${WORKDIR}/${PPS} - gbp export-orig ${GBP_EXTRA_OPTIONS} + gbp export-orig ${GBP_EXPORT_ORIG_OPTIONS} " } -- 2.20.1 Changes since v1: - Fixed typo in commit message