From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6920502129401528320 X-Received: by 2002:a1c:18d:: with SMTP id 135mr2830064wmb.33.1611304966396; Fri, 22 Jan 2021 00:42:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a54b:: with SMTP id j11ls5026146wrb.3.gmail; Fri, 22 Jan 2021 00:42:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJzRNeu7VIPJHfkVIs2E4K/3IodH6yiV2DxIZjPUBjQROfilUbr5QwpGvWydnD1Yiai6asVA X-Received: by 2002:a05:6000:108b:: with SMTP id y11mr3247537wrw.379.1611304965592; Fri, 22 Jan 2021 00:42:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611304965; cv=none; d=google.com; s=arc-20160816; b=l+6t6f+0SrG/sA+EMrgypRNx+kEihQKvtuzhM0hlbS/Ecy1N1sRB2BwFSmzgx4v0+a I+bFtyor4sfs9OSWwYPW7AsYbcuirVaLr+sgwBv3cFa2/ZWj8qTkuQVv6spsXkloU8mE /vQdOZs2rySTjJOJp41cFYcFeox1r4mSjJ2BcP6sB/eS51h6JMachMJiRBAFeQIY6yXH 6cRMbPP3oxMmKy3RemC+jcpPA7SmILgm9UGahD5P2EVvJXw5ac1fpLipnFwgMD0pDIqd ZyZV9aXHQGA+WAaWra136MMyruN5IdCAP1e+CxpCnlbalAdCktaNls0fiLPCXHlSZDnh Fhaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=bFz5+ng/7A9etHUPSG1RbBVhSBsy7MBjmwAU/S8BqR8=; b=J67NlAQybVCDhdDPWQHkzmERpZvf27jGuRFiv328dBdNxcLBX4oO1WEktmeAmb2wIy bqNuoPLqo2ARuqagEjE/EIFH8JDX+JjZKI3Wt9m0Otk6q1lX4Wi885FKlRV02NZW19H2 fCMN36Ox5kUhWCSsWNq7z2FAaUUSNa6RcGkCdEHOuYcgfxRSfWn/+bfqboQbGkWPi8QA W7+gW2nW6AGug3HIXearBxrBW8XY/IUgo6A0wbPHXJpUorXhT3MYME3GWLczAY2hTsMk 0dc781o7wp3XT0Gw5dEO7t75Hy7HdS2jceEb8aefUT0emDC+Xxje6L96RBm8X9IO5OaW FM/g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id w11si376088wrv.0.2021.01.22.00.42.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 00:42:45 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 10M8gjvX011012 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Jan 2021 09:42:45 +0100 Received: from localhost.localdomain ([167.87.28.222]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 10M8ghKr004484; Fri, 22 Jan 2021 09:42:44 +0100 From: Henning Schild To: isar-users Cc: Henning Schild Subject: [PATCH 3/3] dpkg-gbp: default to "git" patching Date: Fri, 22 Jan 2021 09:42:41 +0100 Message-Id: <20210122084241.10573-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122084241.10573-1-henning.schild@siemens.com> References: <20210122084241.10573-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: w8XSONCfIS9o 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" -- 2.26.2