From: Henning Schild <henning.schild@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 3/3] dpkg-gbp: default to "git" patching
Date: Fri, 22 Jan 2021 09:42:41 +0100 [thread overview]
Message-ID: <20210122084241.10573-4-henning.schild@siemens.com> (raw)
In-Reply-To: <20210122084241.10573-1-henning.schild@siemens.com>
From: Henning Schild <henning.schild@siemens.com>
That class is about packages coming from git, so that is the natural
choice for the patching tool.
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
RECIPE-API-CHANGELOG.md | 5 +++++
meta-isar/recipes-app/cowsay/cowsay_git.bb | 1 -
meta/classes/dpkg-gbp.bbclass | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index cc45f3f66e..c4ec5894a8 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -282,3 +282,8 @@ like /boot/efi to avoid such issues.
### Deprecate BUILD_DEPENDS in u-boot-custom.inc
Use DEBIAN_BUILD_DEPENDS instead, to align with deb_debianize.
+
+### Default to PATCHTOOL ?= "git" for dpkg-gbp
+
+Migrate your patches so they can be applied with "git am", or
+"unset PATCHTOOL" to get old behaviour.
diff --git a/meta-isar/recipes-app/cowsay/cowsay_git.bb b/meta-isar/recipes-app/cowsay/cowsay_git.bb
index 2e885a8aa3..c3a1f4942a 100644
--- a/meta-isar/recipes-app/cowsay/cowsay_git.bb
+++ b/meta-isar/recipes-app/cowsay/cowsay_git.bb
@@ -5,7 +5,6 @@
inherit dpkg-gbp
-PATCHTOOL = "git"
SRC_URI = "git://salsa.debian.org/debian/cowsay.git;protocol=https"
SRC_URI += "file://isar.patch"
SRCREV = "756f0c41fbf582093c0c1dff9ff77734716cb26f"
diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass
index ba5c3ebb89..d956e8c3bc 100644
--- a/meta/classes/dpkg-gbp.bbclass
+++ b/meta/classes/dpkg-gbp.bbclass
@@ -7,6 +7,8 @@ inherit dpkg
S = "${WORKDIR}/git"
+PATCHTOOL ?= "git"
+
GBP_DEPENDS ?= "git-buildpackage pristine-tar"
GBP_EXTRA_OPTIONS ?= "--git-pristine-tar"
--
2.26.2
next prev parent reply other threads:[~2021-01-22 8:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 8:42 [PATCH 0/3] allow do_patch to use the "git" tool Henning Schild
2021-01-22 8:42 ` [PATCH 1/3] dpkg: adjust task order to allow using "git" for patching Henning Schild
2021-01-22 10:53 ` Jan Kiszka
2021-01-22 13:40 ` Henning Schild
2021-02-08 16:06 ` Anton Mikanovich
2021-02-08 16:16 ` Henning Schild
2021-01-22 8:42 ` [PATCH 2/3] meta-isar: apply a "git" patch in cowsay Henning Schild
2021-01-22 8:42 ` Henning Schild [this message]
2021-01-22 10:55 ` [PATCH 3/3] dpkg-gbp: default to "git" patching Jan Kiszka
2021-08-11 18:14 ` Jan Kiszka
2021-08-11 18:36 ` Henning Schild
2021-08-11 18:44 ` Henning Schild
2021-08-11 19:15 ` Jan Kiszka
2021-08-13 20:22 ` Henning Schild
2021-08-11 19:12 ` Jan Kiszka
2021-08-13 20:32 ` Henning Schild
2021-02-10 9:17 ` [PATCH 0/3] allow do_patch to use the "git" tool Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210122084241.10573-4-henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox