From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7185045987324329984 X-Received: by 2002:a63:ba49:0:b0:479:3383:d771 with SMTP id l9-20020a63ba49000000b004793383d771mr2953229pgu.283.1672898881564; Wed, 04 Jan 2023 22:08:01 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:903:2448:b0:186:9fc5:6c01 with SMTP id l8-20020a170903244800b001869fc56c01ls36938890pls.6.-pod-prod-gmail; Wed, 04 Jan 2023 22:08:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXvnvan5hs0pPkIWPx1+ZVwaQ2R6qESXZJxomjsIrAgZKbAWwDTxBpcCETDgLmqKro72RZzs X-Received: by 2002:a17:90b:698:b0:226:9982:70c9 with SMTP id m24-20020a17090b069800b00226998270c9mr9233360pjz.30.1672898880325; Wed, 04 Jan 2023 22:08:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672898880; cv=none; d=google.com; s=arc-20160816; b=FCqLF3p/bDsiDOo9kC01ilnf0l/Fnhg848iIolQveFCaWwAlb6aFmR4P25adySXVyL rr+mxjRBH66A0popqX6h7ix9ZzzY25EZJlxk3ulCEiiSaj2gHzUjKnq0IVW4jjBVgyul pwviDW9w0RJd+N6Chtb+uMBRutPQ189QdYBgKGaqRaUrLpMHTJ11v8mIRq43US5xUae2 zEvmtAhZJcjpcnvvXnive3eS407eNHFQxYx3V0/hi7NRatw9KYYnCrltR1A0W/y+pEjP JRucWGhcs0F4v4Dpz60HLxqqUeQxJFW13dUwri0ojJYJYO/T4se2tpXZz5aSMr8i761n HVYQ== 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=N3vbYGAHLJBkVebBY9B0WH5R1gCo4c8VC6T5K62Ln7k=; b=rU4Yg9bJx8WftASp3AcAo0WiYcC2KxwNe2hEzyda3/d7zDC/M7sgR+S9rVOe/gBQoB rBs5cOztePboLUVj2Xm+5VCqXeg3+IK6BOne7Pk9GPWKrbBOhzwywJP8E8c8f1ZefkEy u4JA8w8DVvodoeertMENiGUru8IHvV4nVn/1wsx4FQJUa3ZhK6ER4Ez5RBI/EFb0zXcn HiB9THhwMnuPFQ26luh/6GruHayh9CZTcm57OUNI8ksmd26MrWBlOCCgIF7OksiNx9PE L5Q+ARa8j5jUvF6LSJDi0CU8+7/4KprJIR0lhdFD32ZMVedN7cesR0Chf+yMthm06LXy 1tpQ== 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 lj6-20020a17090b344600b00223fd3b537asi61659pjb.1.2023.01.04.22.07.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Jan 2023 22:08:00 -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 30567vEo006418 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 5 Jan 2023 07:07:57 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] Get back to gbp buildpackage command to prepare gbp source Date: Thu, 5 Jan 2023 07:07:57 +0100 Message-Id: <20230105060757.2918-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: xbG8mXRin39k With removing stretch support we switched to `gbp export-orig` command instead of `gbp buildpackage --git-ignore-new --git-builder=/bin/true` one, since gbp versions in >= buster support this. Unfortunately, this change makes other downstream layers change their `GBP_EXTRA_OPTIONS` values in multiple recipes, e.g.: `--git-(no-)pristine-tar` => `--(no-)pristine-tar` `--git-upstream-branch=master` => `--upstream-branch=master`. This creates too much inconvenience - we need to mention it in RECIPE-API-CHANGELOG, use a different variable for `export-orig` options, warn user if they still use old variable and, finally, support both vars in Isar until all downstreams stop using old case. It is not worth implementing all this stuff just for switching from long 'buildpackage ...' to shorter 'export-orig ...' gbp subcommand So, it's better to just revert a piece of "stretch removal" patch. Signed-off-by: Uladzimir Bely --- meta/classes/dpkg-gbp.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index f765eb9a..b1d7b240 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_EXTRA_OPTIONS ?= "--git-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 buildpackage --git-ignore-new --git-builder=/bin/true ${GBP_EXTRA_OPTIONS} " } -- 2.20.1 This replaces `Use GBP_EXPORT_ORIG_OPTIONS for dpg-gbp export command` by switching to previous `gbp buildpackage` functionality.