From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [RFC 1/3] meta-isar: reformat isar.patch for cowsay to properly work with git
Date: Fri, 27 Aug 2021 10:06:59 +0200 [thread overview]
Message-ID: <20210827080701.5099-2-ubely@ilbers.de> (raw)
In-Reply-To: <20210827080701.5099-1-ubely@ilbers.de>
When PATCHTOOL is set to git, GitApplyTree class in oe/patch.py
can't properly handle non-git patches and fallbacks to PatchTree
class.
This makes impossible to reapply the same patch if it was already
done during previous build, with `Patch format detection failed`
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
meta-isar/recipes-app/cowsay/files/isar.patch | 32 +++++++++++++++----
1 file changed, 25 insertions(+), 7 deletions(-)
diff --git a/meta-isar/recipes-app/cowsay/files/isar.patch b/meta-isar/recipes-app/cowsay/files/isar.patch
index 4333d4d..529a93c 100644
--- a/meta-isar/recipes-app/cowsay/files/isar.patch
+++ b/meta-isar/recipes-app/cowsay/files/isar.patch
@@ -1,6 +1,20 @@
-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
+From 8b7944ca60d4bba3644463d39c865de71e9eba05 Mon Sep 17 00:00:00 2001
+From: Henning Schild <henning.schild@siemens.com>
+Date: Fri, 22 Jan 2021 09:42:40 +0100
+Subject: [PATCH] %% original patch: isar.patch
+
+%% original patch: isar.patch
+---
+ debian/patches/isar.patch | 12 ++++++++++++
+ debian/patches/series | 1 +
+ 2 files changed, 13 insertions(+)
+ create mode 100644 debian/patches/isar.patch
+
+diff --git a/debian/patches/isar.patch b/debian/patches/isar.patch
+new file mode 100644
+index 0000000..00dae53
+--- /dev/null
++++ b/debian/patches/isar.patch
@@ -0,0 +1,12 @@
+Index: git/cows/elephant.cow
+===================================================================
@@ -14,11 +28,15 @@ diff -Nru git.old/debian/patches/isar.patch git/debian/patches/isar.patch
+ $the_cow = <<EOC;
+ $thoughts /\\ ___ /\\
+ $thoughts // \\/ \\/ \\\\
-diff -Nru git.old/debian/patches/series git/debian/patches/series
---- git.old/debian/patches/series 2021-01-21 14:20:59.404038258 +0100
-+++ git/debian/patches/series 2021-01-21 14:21:26.440040449 +0100
-@@ -18,3 +18,4 @@
+diff --git a/debian/patches/series b/debian/patches/series
+index 0206ace..dfa29f9 100644
+--- a/debian/patches/series
++++ b/debian/patches/series
+@@ -18,3 +18,4 @@ suse_cow
utf8_width
moofasa-tabs
03-ansi_code_width_color_widechar.patch
+isar.patch
+--
+2.31.1
+
--
2.20.1
next prev parent reply other threads:[~2021-08-27 8:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-27 8:06 [RFC 0/3] Fix gbp patching after configuration change Uladzimir Bely
2021-08-27 8:06 ` Uladzimir Bely [this message]
2021-08-27 8:07 ` [RFC 2/3] ci: Test for rebuild with no cleanup " Uladzimir Bely
2021-08-27 8:07 ` [RFC 3/3] doc: Add a section on gbp-compatible packages Uladzimir Bely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210827080701.5099-2-ubely@ilbers.de \
--to=ubely@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox