From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7184686172320301056 X-Received: by 2002:a25:ac11:0:b0:756:326f:f845 with SMTP id w17-20020a25ac11000000b00756326ff845mr5618659ybi.86.1672815105334; Tue, 03 Jan 2023 22:51:45 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:690c:a8e:b0:373:6b5d:4369 with SMTP id ci14-20020a05690c0a8e00b003736b5d4369ls1168133ywb.6.-pod-prod-gmail; Tue, 03 Jan 2023 22:51:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXvjv2HyuHmC8gkyXX9/ycEiyhhl7qcsNhMaRhM8LBD88jWgaDMzVD9jlCH2t/p4w8giIZau X-Received: by 2002:a81:920f:0:b0:3f4:ceae:6c17 with SMTP id j15-20020a81920f000000b003f4ceae6c17mr42874000ywg.5.1672815104486; Tue, 03 Jan 2023 22:51:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672815104; cv=none; d=google.com; s=arc-20160816; b=ArSyKoeYIhyWsAArNKGF0kYTBi3qOoDo5Q/KOzghBThl3l6Olor0uW7d1TsPk155kT +yU7vYbTy7F+SsxlliqCZLSoIuZVD+7dd10DFyQx8khyF/8NyS/YiMQIxQW/y1TPEr9S 5vmBkmVMg302cIExLTZVReP5HxOcB0nvI/T+LHXwp9dKog3krPrlom7+YN5fLT9eXj9I eZciP/ctr8icdRLy9NWOCqpkwVc83iaTzkvFo51MXsHOcOWO45DgmTFiH2LEXX6qcRoo 3MV/geurAz9le5lNMESi9J+reftScXTddIIQ5v0J0WOSR4q7NwWqpZbnQ64fQw1WbrdZ s23Q== 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=mK0G9q/2ezF/uuLxyY6J4vy64RuYFflYPlmwhni3iyc=; b=u0k9tbs8xsKg8spvnLsZNH0pTGWTuROdv8/i8OY7gMPteYPb+z9gDoJ8c7lTFcyYG2 IwP0M9Qtdjg8T3LcnJ6ZThp46rkXkFCEwsc1/FwO7KdsCGryq6+BxfaivZQspQbfqREN fpRsjKajlR00kMn4My7aF+mojZDgkHyNxjZ+/w/PBGX3vfLQroL9and+YQoc8gAs1sXD 2aV5qrnJdHG1ZfgLEBeQh4uax4PeO1EjJyLTtMvNT2fvHwf4II1LJ3+1DS9tPWLPfvx8 P/gaLVOzq0Sp+WFRsTbDyJL/Kt+IOCkBFHanzfYFOa3JjZCgMGdCe3uOwDKL3ILkePmV B5kg== 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 u5-20020a0deb05000000b004702fc7c59fsi2344374ywe.1.2023.01.03.22.51.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jan 2023 22:51:44 -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 3046pgLu001343 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 4 Jan 2023 07:51:42 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] Use GBP_EXPORT_ORIG_OPTIONS for dpg-gbp export command Date: Wed, 4 Jan 2023 07:51:41 +0100 Message-Id: <20230104065141.8984-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: +hiywjYNTwfx 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_OPTINS` 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