From patchwork Thu Jan 21 22:42:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 285 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:94eb:0:0:0:0:0 with SMTP id l40csp1123790ooi; Fri, 22 Jan 2021 00:42:47 -0800 (PST) X-Received: by 2002:a2e:884b:: with SMTP id z11mr1934581ljj.25.1611304967114; Fri, 22 Jan 2021 00:42:47 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1611304967; cv=pass; d=google.com; s=arc-20160816; b=wqqt2n0SN6rk6WZwAH+x6vgVL/frauEBKXZDakPvPjovj0WwV1HteJK2sHL/1Q/dAQ EczHlPQeMC99ABQqE/Lhy8tny2JG+KVl4/VzsQw4qr4CoefR0lHnplhcdqX5uKI1Trer V3DYV4r2gtMGvFAZ79O6ERRCZckrKbl4EvyGxvWMTGn+5KevcavrBmzyatfsDwGMKiHv kTOPWClBGZTgyfwP0SOlxcQWiQustHmejb9eP5zH28CkD7rvcCFIAThgw/XPnX6a+WlG JUKPupwWpp06Gd0S9jWR8smIeTlPLm+5E4WjolPn5YIk6ea4eleic3SbU/MAQ3U8zMSo P0fg== 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=iPhMwb/gPAVWr0UNolRYdC/WN6ywtItszk9hvBOUMaM=; b=G+bMt67lE1RYDjopFBsmHnqu8zzPerIq1bR/ezU+gXa5XJzbeoB53vmV8A5ZIEXEnv IAECkvLbsRARZhZcZdEf9k4rRnI7KSQ6D8sdw3pBiKee9TjW4OWqVSTBXsAUfbpKC5Jt vzcrNB2BGhVw/g/zHrLgvKLhciGMCvDiR+9Z98WdTMAG5bv27GRnu0pKgT11AdUiTA4t s0na313gKgLJmNrx7MeHl6+H6HHtE2pJLBsceD8qfo+tCfmk3kLzlypoGNCGQXOyWCYO NMlih36qJd4BJzdDoSI+zLjr6BrVxz0UKxYvk9PerpYfmM2oeEa/F1wmhsSBbzk87Dt+ GYBQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=PWfBocma; 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 w15sor1876822lfk.77.2021.01.22.00.42.46 (Google Transport Security); Fri, 22 Jan 2021 00:42:47 -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=PWfBocma; 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=hcKUkMszrEKQgl2XZdgFAUitxcXb/R4AoOMBiXTtRUHf30M7hscI8P2JGLdGWsl8Bm bgQh66Qx5vlhhTYX8g4A270DLHyKGx7VCkMjSiJ68WW/xWlF/3BtNYmun6+vv/J+y45O 89HVv9qZfQqZWFRMRBXh7ruOY+zGccfXibrXmRF2AjBON2IapxFL1+4bxyIVISQwoBrB Z+HhWZYW0Md7VCNNA7DcDBCLYIGNJaYJS0ViptxSLUhUqiW+pr4MsiAI6+1dhuXvzsn6 pLNROpKj2GAN2EYoMzUnIwUDlL0pUiRm88JG30CGgQvlD5g/oCknCq9qVUzHHrtGHTsq 8Clg== 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=iPhMwb/gPAVWr0UNolRYdC/WN6ywtItszk9hvBOUMaM=; b=bxNAe/mo4wbWD8T3H92m0xX/GJ/jeVPrQBM+NecQsY0esfwnWpt+kqJ8kfPFQD2Jmw EQZrJ25IUch3YmhqeLdureHFu95wZ0CeJlGeCzfTOBBtgb+v+eyA48rXAOpAmngka4/n 2zxRftspboYfleNtxgi8IyEqlYzNg/YqHAceCDKzfxQG08K/Xr7mWsdAAFKon9YSPdNE ukSKt0x4cyMir4iOPKKAjX2OhTXOI+SKE0RPk+HqLY8hV13i8B2Gro2y3Sd1fImLAQJh wCgAXd3fV9b//nnQRTTdMJNbKjegIdA5L3wMmMw4SVXX/3WuBX5E83NNcl31uOvyNehJ 6tqw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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=iPhMwb/gPAVWr0UNolRYdC/WN6ywtItszk9hvBOUMaM=; b=PWfBocmaF7tLRa0Ogljgmcg3ubIB3W+Kxp2EfSv5/nRjoSIgxwZoWNtTFEH+AQhH1F amXIdbbVQJShv06Qz4HKjnp0Q8C2LQYBL3rvld1I7/OFAQ6w9adXBR3LzxJd4YOJoIoi piS320u5RK1fI4tpLfMt6wmKxrSzpdSTMd+e+Vk2StI7/wm9vl6QRXRHgZ2Vy3YH35dV NvFFLPvoRtZZA+uRdB37CBZwx7Z2+L45tpIYhSLpn6aXtvSNZdNOxATlQm9VUGSUB8my W4brA7yEq3F+P+rH8qPGpNPgk6WRs2mCRgK01mDFisY2Tf65bAhmPrIeXVQJfFSRYKWf jJtg== 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=iPhMwb/gPAVWr0UNolRYdC/WN6ywtItszk9hvBOUMaM=; b=GQCvnuWSPCiZNq/l9BNFLkRpsyj6xaUv6WEgcABZ9s/Puol+fHXYU9kyvOwomJxIJs yrCfy00neeCe1tbPR62kzfdLTcMokzpNpjVT27phYXXZRdxWA7gYmwV919ok/r6MtsvW bq/ZiDyBwW5VZ9YFBzDIwggogeRdhHKt0Tytuv3X/ULHCf3xBDR4jy66Av8vGX8Bji6/ cUKabiVKfuUctwsMzMG1Ya7peINjp4A55f1z/kbkSXTtTYCBmKPKWJ89WbrOlvx5TgUV 7w2+FyM5uNbaN91Z4z4zKa5PFdvCXxWuyr8SDfIrtddLYyN1z1ODtOarLtfcG2sDgDX3 3SlA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531HPUw25NEERiPTAt6qetV2sQg/PUwQ0D/yCG+v9YMtK7kwk7ql j+OF67guOxGD1Rk8QXUxm7o= X-Google-Smtp-Source: ABdhPJxdFzCVElzeSo4vOhM8B7XOzTLVEEWm38S6Jw+ctN2yrSheO9/9wNbIpVVSeJkXk3PImKXVog== X-Received: by 2002:a19:d611:: with SMTP id n17mr1766587lfg.494.1611304966662; Fri, 22 Jan 2021 00:42:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:6145:: with SMTP id m5ls1766504lfk.2.gmail; Fri, 22 Jan 2021 00:42:45 -0800 (PST) X-Received: by 2002:a19:8584:: with SMTP id h126mr1439749lfd.152.1611304965696; 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=VwPXzLMVMb7cQaZEVfpfXshXjMzbirIPYyX3RV7yayzKwKfkh11tcv/qTzpWIyAfVH BURggrj0/HbjxU77dzGNN4sDg/GZlGDXrzqrttnLfdOeo1KypdD7Lzqxsb6v6/hWdldP ah51ShI0GmMsZ+JhEHMLc/zpTYup7Yqh0puN4ZC0J1JLTJd8gTjpYbsXd9WsHQwvfoPq 0wTLM+CO6dPrUnvlVfuh3sUJ402H5mBuDH60mzztpe1TSoBrbZSBtjmLsPWaJSlh0B9O x7GTXnCrgtNsRwiQkqSqnYc3G8/Ug4VZoEfVnFhpO4V48eiyotaUp+0Tgj1RCl2/007s JBTQ== 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=jsD69zm9jvZY2Zj0/QoGdnSA8jHtslLTLOcg0Pq19jI=; b=C86Cd+fg8LHh89fMQEsgUs2EsCZUEbPLz4t48gXQeViqe/Dv4CZIn6LX3OikOPZtox soRJQTv6vLLQdyKal1lP5+vcLVS1K99Na0b9jzyOZd6Rnqvoy99RJiBcpEsTiqZABsn9 pZ/xGyXJTsieusX2eMS5tJgtoj4jr3c0FuxAxYerOY3k0OmdThOMEmA3kePklnr/1tLn L8C7/qbNjoJMkE6CPsGQB8E1KSp5w1xH9TURIEj0La3PM1yMTZA/Cwz8aep3r6dZIXSB LKK4mVKzJKMWB3rOVviB8cxH1lkwm6rTz0ARX+IuZ6P7XbA81hFuDffG9VMLNoiKy9oN 9gKQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id c15si429569ljn.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.14 as permitted sender) client-ip=192.35.17.14; Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 10M8giLF005901 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Jan 2021 09:42:44 +0100 Received: from localhost.localdomain ([167.87.28.222]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 10M8ghKp004484; Fri, 22 Jan 2021 09:42:44 +0100 From: Henning Schild To: isar-users Cc: Henning Schild Subject: [PATCH 1/3] dpkg: adjust task order to allow using "git" for patching Date: Fri, 22 Jan 2021 09:42:39 +0100 Message-Id: <20210122084241.10573-2-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.14 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?1689575716734260390?= X-GMAIL-MSGID: =?utf-8?q?1689575716734260390?= From: Henning Schild The adjust_git task breaks the git tree for use outside the buildchroot. And our patch implementation supports using "git am" when setting PATCHTOOL = "git". In order to actually apply git patches we have to adjust after patching. Signed-off-by: Henning Schild --- meta/classes/dpkg-base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 01c6eb658e..5c7bddc9ba 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -47,10 +47,10 @@ python do_adjust_git() { bb.fatal(str(e)) } -addtask adjust_git after do_unpack before do_patch +addtask adjust_git before do_dpkg_build inherit patch -addtask patch after do_adjust_git before do_dpkg_build +addtask patch before do_adjust_git SRC_APT ?= "" From patchwork Thu Jan 21 22:42:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 283 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:94eb:0:0:0:0:0 with SMTP id l40csp1123780ooi; Fri, 22 Jan 2021 00:42:46 -0800 (PST) X-Received: by 2002:a5d:69cf:: with SMTP id s15mr3327732wrw.372.1611304966430; 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=Rh+/Dj1yKI4okb38NfZ0AvWMWHNSyhtAikBpZJtm7zJaiDFkV118tCi1LBoKxTM8fC TTmtUSE0zSvTXphSP11yNLttNkDuMNsPb0YOineYTs51nkiPqJra2aLmEbQYIVn+Ghzs VJ1/UPqXCmALhvPgyltQnK4WYNU/CPOqR2R3+kVQJzdvUhVr7W0omTwZzuqsurBY0L5q uoJEDVM6wsVUmkq9MbWiQMyeyNVV4SAVYQGxr5+XCLIxspWdTC8WRAIdpDYG5PbXWZWI lvpi5va/iCDLhMN3VD/FRx6JO3zOJ07BZYCJODztBTzVZoeRWigki6epaJKzCXc7x05U gCMQ== 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=9J6OY+V7b1p0mo8a0l4VIQSGXX0Pl1r29nKk2gxMJY4=; b=1DtbkbC2ith84WJK/gU4bErCs5z9usbXF4e1nI27qIIaWIzCT/5FL3WLB5LtqolbSC y4D60bz3EkSqZGR9CTNWzMnSclUCrFV10BUU1NOQMVvlgq9ghTB7kjjwDHZ8s683xTww mYO7lRA5DhFaPSuLxxY88IFzRFyAa0E7zVSmRddeN/URtH47kqgim00TLYrfLZ4BPDvx DntgM+Ym9ne4DWx5d7MxHmTw4mI5309YV3B9lYXggmZ9wmhIM98B0rqmf5QHr4EEzGFW 7PAd4HWsGf8RdFAt02hNK8UQPseUYDyvkqtS8h4NMKk2DTiHrmRegY3LZ8KuE7i3siT5 2cjg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=li74+HSS; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbbnavkaamgqepgcfppa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBBNAVKAAMGQEPGCFPPA@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 q10sor4002867wru.42.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+bncbdjmjpgy2mgrbbnavkaamgqepgcfppa@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=li74+HSS; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbbnavkaamgqepgcfppa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBBNAVKAAMGQEPGCFPPA@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=nFyfwQncFMHn/mc3UArqAaIQZbKvaLqwz3In/ihDKVtF7e4Dkd5qgUW9kxtXvx4UhP cMTwlOWcHnfLWU+6K89l3ADrDtA7zXh19fBq4NMfItUPfOenTm58bFPHgWEGjykhnV1Q oZCJ9Csien28xzo0djmnrkbNR3xlFaVN6ysoaQ/0btDwciKs/kZm463K9g25rP74zv9u ZwxDe+UF50JMgeQLJu8qXannf353DjDKajvycx3NJfvrRzXV/nWbJCCyyaiV9BX4DUod wErGrSt0cqDQHHZAai4xK4EdTSNW6FbMPWDKIx59rs0F+aibrLBDFJ4jgCtr6ImLQVIG srEA== 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=9J6OY+V7b1p0mo8a0l4VIQSGXX0Pl1r29nKk2gxMJY4=; b=an0xxeXYf1Pcq8LBn/5YU45kbfBXib6wXoUM+7vpe4/8BavNcNzIBL03Yod+pDygbo bwHYeNqKUcdA4wA/88pA1uy4DRCbfmpSiUd0lRu0JNC0G5Xs6D9GvSWWEE2s2e58J1EG oZ3SF2yytMiIijHsRnKtCb9kUsZSm2euvQdVJAcek+i99ViasJIqa2dw600yXsTidHBd QZBTSa8SqHm81KIcmBX5C5/2ciLwP2QOnahUcuFpTIZotBrR3h8FUu9RyPYHV6oZz/JQ PoXYuGnkX3t52SJfe0etxNNhXAyWnaHbWs8A4SOA4NsaEa9r0YuhhJrqyrJsoiPI3Av6 DR/w== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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=9J6OY+V7b1p0mo8a0l4VIQSGXX0Pl1r29nKk2gxMJY4=; b=li74+HSS5/rvTQtr0NY9+yOL6HAa1SMs1utuVwTGRl5b7qBnCOBXt3BttgEtWr2FR4 ADWuU6VrC4nuvnxHq8EPPDHPr1PydTMDeCqlPG0KeGWfDqLeeogNClSaG07IT+ECiUC6 Elx4rrSp1zL/LGEhU5T3EE5rtrZcO8nzuv1Sqju3T7S6l5hKRjHGgvgk9JII4g4p88hx xV95KXD4gqGdi2wTD4Lu7nSZi5+8nlfSzrSa2wM7FAwgom4IyncoJF0EiHTj0GzerOTh zUIOEpePafh5ejUjKtxFqTTWT7hBU7aOIewYXGmZhYekrhCL/mYRasA0zRHwWqBKg50t qI5w== 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=9J6OY+V7b1p0mo8a0l4VIQSGXX0Pl1r29nKk2gxMJY4=; b=jrwgrNH7m67FFmAu9Cnq7xXdH1MbZK7+rwDtjV0WcyIZG0lB46DdRMwSgtW6Mx4SeU EYkxi5ChtOBXIKGMIOHOct7fK/eNcs+K3benjoobcONLzaglsV0RT8D0P0uk6v4/NMjT LkVfUyXxJBJqsu0hZ/hq5cWZ8MyrJPVbfEGnFC9pZNpiW8MMVX5BOpMTPLL/MY0YHBJ0 DAC52SvLKvdqbjIcZ2DL2u8P7LGjIXQtOld4nEQVs1neieKwg467uSNFGmKEpXbHY77w RzSguLJdXwjNhn7/RPL0iOPoFn2DRHQ7mW1ab6pPjtRN7dQ+YjL49bD0UK0bXTMsdZrF 7ZHA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531S8WTPE8yxZZdxOgcglmhFrCmKxP9aKp5V9G4X3OVpdWQDYCut xQPFzjX1HZDO4Wjb5CHa8Hc= X-Google-Smtp-Source: ABdhPJy+5elm9pMBvGFZRKwPX97J+qCjVXFIx423BkLX7wbfPeGIGSPVFuC059lrg3KctgsM7ptQ4w== X-Received: by 2002:a5d:6191:: with SMTP id j17mr3300851wru.281.1611304966026; Fri, 22 Jan 2021 00:42:46 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a54b:: with SMTP id j11ls5026115wrb.3.gmail; Fri, 22 Jan 2021 00:42:45 -0800 (PST) X-Received: by 2002:a5d:4f82:: with SMTP id d2mr3319504wru.87.1611304965214; 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=RP1+SCJZrBzrvgxhk38jWxnr7EGaxmmGf6DzNna1yewpjS1GyufWm71xXM6ElbtkY0 ZD02J7ipJLJfPVwI6ENuGiFtTmsJ92el5r5PmNf+pmQWINqBQnSDY8HP1l+p0Nv5aDRZ c5WOZF5q5PiOtY29jEt8BTXniwg0TeeP3oSneHpGGKVh5zxk3h4hbcF6k1z6bA2z5ABA WmLBpob1IIX/vGb5LXfCifJ7oTcAm2l+w2H0NMMG7fgb+EGj33GRsX6olYwTk+2ffnql RbkbX+9K5GIoLl/M1RkQr9Saa2GCVzvt7JolL9sX1q1WleFcbP21AdsYOMK/e4+Ina7K bD4g== 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=yIq/WrsU6feG5O78hq4OJXx/EmNtg2LD82l+rLMM95w=; b=zTdZd75x3a6NAzTKCNJlooxyJZwbm8rHbzwP+KUjt3qEB8RD2hCKAOyiVTvDTE5y/w k0ifFnXFUGbRnf7/wxxkwiSh62hasc7HcGmoQDfFad1MRo1XidNqepSaS1KSkgKIpoA7 Vk3cYGpu8956Gahc3pbz0mpjEMvPA4VcncX68JWts+v1//ODevprMKrKCisiXsY4Zwsy fv5cSYqoKH2EXQuQtzMmso5IIPQP6nZIU3wAMaGHn0UGG1U/XhR3tpTvKn8L2ZTavltw iDk1u7AV4NbN4p+jlyFt/qGONP9nXdPGEc8662sFPOKO1YxR06oKw8Gjb6CT7eMkWTiQ S7Lw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id h10si256214wmq.4.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 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 10M8gik4012685 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Jan 2021 09:42:44 +0100 Received: from localhost.localdomain ([167.87.28.222]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 10M8ghKq004484; Fri, 22 Jan 2021 09:42:44 +0100 From: Henning Schild To: isar-users Cc: Henning Schild Subject: [PATCH 2/3] meta-isar: apply a "git" patch in cowsay Date: Fri, 22 Jan 2021 09:42:40 +0100 Message-Id: <20210122084241.10573-3-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 194.138.37.39 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?1689575716398941854?= X-GMAIL-MSGID: =?utf-8?q?1689575716398941854?= From: Henning Schild Doing that will make sure we cover "git" patching in CI, it also shows how to use it. Signed-off-by: Henning Schild --- meta-isar/recipes-app/cowsay/cowsay_git.bb | 2 ++ meta-isar/recipes-app/cowsay/files/isar.patch | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 meta-isar/recipes-app/cowsay/files/isar.patch diff --git a/meta-isar/recipes-app/cowsay/cowsay_git.bb b/meta-isar/recipes-app/cowsay/cowsay_git.bb index 7aca1b4560..2e885a8aa3 100644 --- a/meta-isar/recipes-app/cowsay/cowsay_git.bb +++ b/meta-isar/recipes-app/cowsay/cowsay_git.bb @@ -5,5 +5,7 @@ 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-isar/recipes-app/cowsay/files/isar.patch b/meta-isar/recipes-app/cowsay/files/isar.patch new file mode 100644 index 0000000000..4333d4d635 --- /dev/null +++ b/meta-isar/recipes-app/cowsay/files/isar.patch @@ -0,0 +1,24 @@ +diff -Nru git.old/debian/patches/isar.patch git/debian/patches/isar.patch +--- git.old/debian/patches/isar.patch 1970-01-01 01:00:00.000000000 +0100 ++++ git/debian/patches/isar.patch 2021-01-21 14:21:26.439040449 +0100 +@@ -0,0 +1,12 @@ ++Index: git/cows/elephant.cow ++=================================================================== ++--- git.orig/cows/elephant.cow +++++ git/cows/elephant.cow ++@@ -1,6 +1,7 @@ ++ ## ++ ## An elephant out and about ++ ## +++## ++ $the_cow = < 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"