From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6920502129401528320 X-Received: by 2002:a1c:20cb:: with SMTP id g194mr2857544wmg.51.1611304966121; 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-Google-Smtp-Source: ABdhPJzqgF8dDovEEJQcDPmW8USCRCwObkEO/cFS5nT7lXxYmPbyHVR46ujeKP7b9/+YvAdrErgx 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 Return-Path: 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; 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 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 Content-Transfer-Encoding: 8bit X-TUID: 8TcxjJGY3eU/ 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 = <