From patchwork Thu Jan 21 22:42:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 284 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:94eb:0:0:0:0:0 with SMTP id l40csp1123783ooi; Fri, 22 Jan 2021 00:42:46 -0800 (PST) X-Received: by 2002:a5d:54cc:: with SMTP id x12mr3392755wrv.132.1611304966621; Fri, 22 Jan 2021 00:42:46 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611304966; cv=pass; d=google.com; s=arc-20160816; b=e7rA5WbwB/1yNkZQSB8X7eqX5rbQjcY9P28khnBgDVogVnjLSwzh4ieuL4yHEw815v 7gqiTKTXbaiOznXQywGVuqC4PcAgsfonoR7kNUChJz/R7YCw2c1MEqG+T/mBnC7+hDcC 6nvD2CuaL8PUidvyOHgEzg8x92tAzso+pjFVkZLafXyie9BfMwXe/xyef+M7A5r0Df0I NQ+VCyR+k+gNWnqFuD9AsrPQxMJSWTig3wdkGmjG+MevgHG9MUlYywh3jDcuin86Y6Yt xPtnC+FAFNretxVramWy9hYbbcoM4RTETCLNumYoWANFLhXsqh/KWhXVcnNR8ys1dvmH mi1Q== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=KX5YJa211QvkwOUoGZYvDkc4S3orR3YGaMsAnECFIJ4=; b=oqHEBcJ3jHXaAwMettWP6z6rtZKAFnyIjcjRa6YHusUWOiKWA4HyNFeCV9T0pPxPJ5 JU1jz6Mhbr3Eflpaq7/IuyYkfT/RTd2LeA/9vV3E5LvQZePhhPpzC+zMr5bq7U6T3azL qPfqNGJGwgBKB8sjNMQW+dwaOkWquqO35rB5vxEigLYliYa6dxaEi6lgXRq2bZ6tcZzT gObYwkQ1gB3Jz43tLqgZMcs+BrZHtuM6EalMKzvBIrTrl0eDAXqBnrPpEHTQOo4VTxJU AnthPWJsNLQYhmC992I555fkS9GYPNAP9bwb7Hu0WPbaKn03iWiMztTqcr0mW2B3DXEg iEEw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="GTQfAE/r"; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbbvavkaamgqedjmjp6a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBBVAVKAAMGQEDJMJP6A@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id s69sor2291013wme.29.2021.01.22.00.42.46 (Google Transport Security); Fri, 22 Jan 2021 00:42:46 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbbvavkaamgqedjmjp6a@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="GTQfAE/r"; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbbvavkaamgqedjmjp6a@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBBVAVKAAMGQEDJMJP6A@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1611304966; cv=pass; d=google.com; s=arc-20160816; b=RDR+3UAim78Kg+jZNuk3k9QiXaZrKuKbEVBXThtTWz0jSsNaLn9K2egIfoGfiLYtVD deyghPj4TRs2ETazRxRYrk8muXdlRZeghzFNGfYLW8xqDIuPH5ct/ymcUI/klvk2aN6B 0eZs029KJu0vqnXamGnuwAKTqOEV29gFWUwHvUaCIRKkCakmePuquz2hhohOm7kr1EHZ YmqMAlVFEcVyHxErbddcANLYvatXLwR4sUblobOn3keeywt+nQ4W3T3UefkhcDaVeG0O Zfb5ukX67CZTNuLruKk8tqsV+iM8+5hnxErG3T96iQEvZ8z0HfXFmQ0OHu3B//Y7SxkZ Nu9g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=KX5YJa211QvkwOUoGZYvDkc4S3orR3YGaMsAnECFIJ4=; b=lg9VLN8ryivlmQOTAdLvEd9vcA5aZz25Fcsu71YtcooXKz7fRtHcqAvqj/ZaVKJSL6 V9p8ZEoSIzsdQeI6jonmtmOuKoBaDsJFyNTdGifvJqqaxWjuEbKecktxNPI14v8p3SLi ppA3RC30QToaVk3Jm0DdX9hH9I5ueLhRhW4TuLGZ4q0ufpST5UUkmG9QcNGJuKAapL2X dBnpaIoFYmS83a8KkIcXNGTb91lRR1DPcmYJ5q09uYuX9c6wHSW6f+0ZXk1hgIfZwJ3k XKaDGiFDFm19a+NrYbVO62UeCmMarGN37a37kh1/aRfUNdw+2Ht7q5uAxp18cTs5wlII 3qEQ== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=KX5YJa211QvkwOUoGZYvDkc4S3orR3YGaMsAnECFIJ4=; b=GTQfAE/r15tk6+3EwMhIdSlJRDS8rrbReumkeKJsHGbyChPO7wfgTufptQ4RP4v4rj jYGJtkq6Bc2piRq5TF3tlicbJBE2qEYbrPBkxQo47MxAxZDYDrm6LYYupXbWIkzID7QH j0Pwzfzh4e62mZ7HhdJjV9LzLLaz8RhExZ6djFJ8i0y0r8cz4364FAnUa7m832U1EA+z 6m6kjF85GXuo+rwVtNtxIoPFqf83bayekcwUZ64eYqfwJ11/KzhX0fUMSbIhPzEvoVA1 KtreKX5k5o4ZG41AsaDFCDTw/C6MgFKWxIkx/o/RzdFh24FXN45I2dkwKCSJnbyDyoot eyQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=KX5YJa211QvkwOUoGZYvDkc4S3orR3YGaMsAnECFIJ4=; b=WOnff/PgqrIkDahsibhlmPzpctpyP9O0deuWNtKX5G0bAC0aFbrHMukKz0ObfQF7t0 CH3BweNqZc+d6rdOCi+P+ZYybUPSiuF7qZgqeCmJ0NIe6pEJTndTLOrQ+FTGr3aLqWF3 LCmlvg5gM+uuRakFO8lkVjetaVG8VNN5bN90nPBenzgINNJjrjc5L2iFQ4xqgTTEyJN8 em5rDjWDHAzH1d61HGfsVuF38as8ZX7xOXsfVfnXTpRyxei9wxCLT51cXYvXxjyVR++f LcnVdaSEr1iq0ibsti+A7ex0PvNh1ne2x9jySyOjid5BlqC4KMezGqqlI1I2DuxKzAWy 2gZQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530IN8F721JKAJe498agJkvt/ROpx01hIaR+BqN1ofHVgpjKuj0/ gIlHqq6R775Cy9AW3lQ/Rsw= X-Google-Smtp-Source: ABdhPJxq3RZG+RvoPv8riFLP/+8vrBXOhQWStg438cTrRwzdWLnyLHzRAdNCWmB9fhL68GCE9K2NQQ== X-Received: by 2002:a1c:356:: with SMTP id 83mr2950952wmd.31.1611304966298; 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-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 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; 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 X-Original-Sender: henning.schild@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1689575716282613236?= X-GMAIL-MSGID: =?utf-8?q?1689575716282613236?= 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"