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 = <