From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6920502129401528320 X-Received: by 2002:a7b:ce96:: with SMTP id q22mr3426202wmj.165.1611312942206; Fri, 22 Jan 2021 02:55:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:bb0b:: with SMTP id l11ls2774990wmf.0.gmail; Fri, 22 Jan 2021 02:55:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyrpca8qsiIzwd81EHjDC/sR+kOiA6L485E4k9JWzI1xTl+HL8evp/h0kiOUiijWtVTc2bf X-Received: by 2002:a1c:4e:: with SMTP id 75mr3405615wma.150.1611312941171; Fri, 22 Jan 2021 02:55:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611312941; cv=none; d=google.com; s=arc-20160816; b=vNq3nXhJg5ajO90izGbWXxfZH+jqecLsbHmV8ny6Orw/lkY330iQmEyoVNAsl9senQ K/5arOUpZQXzoO6v4SW2C/CuXHpI9isqulPoqWAEmiIduHiS0uG/3fqa+vWpAz1YFB+o gFDeHs2VlMrl0au+r0mXUl65Orhjn3s4a4uPyvWIObPrd5S76KJ+rbtJ5asFpCrItziC pOD16sIuQZQInOZaxUaYhJWvHOnGBPM4YlnPQo1JK7Bn4dyAw+G5JarsevlYudMPgSGi qAuoixo5u5efCO4mbSbeeJfdm8Bymo9mCFPa1cDjUo4KnnRoyj3/HBhFy5/0zxtAsQ6K DuXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=NAFru7ueoNwUsB0qBqpyfMZD9g6GYE4c1M0Ox+9QEBI=; b=tTWbeZntF51ELn6ezK+exgoN09Hm0NfCf2fgpIasODNRPBzWS8EKJtGaDj4L5EhfUy s0oXqz/TG8jDCMDKAjYH1bUqgkuwH+wFCD9Sg1Nweb1ueqXyHrwJcWkYlK48/zYLV8NA F7sZMd4XMhubxqow0kIZjGZivzfkV5vitqkSQRXyHhIX3Lg5xr6gSRlDOo8ZnNrA0WP1 iXkZoLHVy7J04+Xg7+m3b1osNGHOVKNoylYUhCWEBahOesMLxVpSkZIle6Ix93UCinEl cUg3T9mO1Ec08DPnQwnktGFEHGQE+sRA5dpLwZhDB9I50Sc0x0bpADjJWaxIsX762+Yv t//g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id s74si441619wme.0.2021.01.22.02.55.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 02:55:41 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 10MAteiM005749 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Jan 2021 11:55:40 +0100 Received: from [167.87.46.116] ([167.87.46.116]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 10MAteex013728; Fri, 22 Jan 2021 11:55:40 +0100 Subject: Re: [PATCH 3/3] dpkg-gbp: default to "git" patching To: "[ext] Henning Schild" , isar-users References: <20210122084241.10573-1-henning.schild@siemens.com> <20210122084241.10573-4-henning.schild@siemens.com> From: Jan Kiszka Message-ID: <37fed018-d270-a314-99ac-53c05db8323b@siemens.com> Date: Fri, 22 Jan 2021 11:55:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: <20210122084241.10573-4-henning.schild@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: IYZ3Y7HwJlym On 22.01.21 09:42, [ext] Henning Schild wrote: > From: Henning Schild > > That class is about packages coming from git, so that is the natural > choice for the patching tool. > > Signed-off-by: Henning Schild > --- > 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