Re: [PATCH 3/3] dpkg-gbp: default to "git" patching

[Jan Kiszka <jan.kiszka@siemens.com>]

On 22.01.21 09:42, [ext] Henning Schild wrote:
> 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"
>  
> 

Sounds reasonable to me.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux