[2/2] meta-isar: make sure to quilt patch a debian package

Message ID 20200728203153.792-2-henning.schild@siemens.com
State Superseded, archived
Headers show
Series [1/2] patch: special-case quilt in debian | expand

Commit Message

Henning Schild July 28, 2020, 12:31 p.m. UTC
From: Henning Schild <henning.schild@siemens.com>

We have special debian quilt support, test it somewhere.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta-isar/recipes-app/cowsay/cowsay_git.bb    |  1 +
 meta-isar/recipes-app/cowsay/files/isar.patch | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 meta-isar/recipes-app/cowsay/files/isar.patch

Comments

Henning Schild July 28, 2020, 12:40 p.m. UTC | #1
On Tue, 28 Jul 2020 22:31:53 +0200
Henning Schild <henning.schild@siemens.com> wrote:

> From: Henning Schild <henning.schild@siemens.com>
> 
> We have special debian quilt support, test it somewhere.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  meta-isar/recipes-app/cowsay/cowsay_git.bb    |  1 +
>  meta-isar/recipes-app/cowsay/files/isar.patch | 12 ++++++++++++
>  2 files changed, 13 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..c3a1f4942a 100644 ---
> a/meta-isar/recipes-app/cowsay/cowsay_git.bb +++
> b/meta-isar/recipes-app/cowsay/cowsay_git.bb @@ -6,4 +6,5 @@
>  inherit dpkg-gbp
>  
>  SRC_URI = "git://salsa.debian.org/debian/cowsay.git;protocol=https"
> +SRC_URI += "file://isar.patch"
>  SRCREV = "756f0c41fbf582093c0c1dff9ff77734716cb26f"

Patching this actually means we need to change CHANGELOG_V, i will do
that. But for now let us focus on p1.

Henning

> 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..00dae536ac
> --- /dev/null
> +++ b/meta-isar/recipes-app/cowsay/files/isar.patch
> @@ -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 = <<EOC;
> +  $thoughts     /\\  ___  /\\
> +   $thoughts   // \\/   \\/ \\\\

Patch

diff --git a/meta-isar/recipes-app/cowsay/cowsay_git.bb b/meta-isar/recipes-app/cowsay/cowsay_git.bb
index 7aca1b4560..c3a1f4942a 100644
--- a/meta-isar/recipes-app/cowsay/cowsay_git.bb
+++ b/meta-isar/recipes-app/cowsay/cowsay_git.bb
@@ -6,4 +6,5 @@ 
 inherit dpkg-gbp
 
 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..00dae536ac
--- /dev/null
+++ b/meta-isar/recipes-app/cowsay/files/isar.patch
@@ -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 = <<EOC;
+  $thoughts     /\\  ___  /\\
+   $thoughts   // \\/   \\/ \\\\