[neon/forks/live-build/Neon/release] debian: manually patch to match ubuntu jammy

Thu May 26 10:29:12 BST 2022

Git commit b33eb963899ec3ffb8573b05716ffac18cbe25df by Jonathan Esk-Riddell.
Committed on 26/05/2022 at 09:28.
Pushed by jriddell into branch 'Neon/release'.

manually patch to match ubuntu jammy

M  +19   -0    debian/changelog
A  +38   -0    debian/patches/add-riscv64.patch
M  +3    -0    debian/patches/series
A  +30   -0    debian/patches/ubuntu-make-genisoimage-more-flexible.patch
A  +18   -0    debian/patches/ubuntu-no-bzip2-bootstrap.patch

https://invent.kde.org/neon/forks/live-build/commit/b33eb963899ec3ffb8573b05716ffac18cbe25df

diff --git a/debian/changelog b/debian/changelog
index c604dbd..0c01bec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+live-build (3.0~a57-1ubuntu41) groovy; urgency=medium
+
+  * Drop bzip2 from bootstrap package set, this is a long-obsolete
+    workaround for Debian bug #657560.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com>  Thu, 08 Oct 2020 10:09:20 -0700
+
+live-build (3.0~a57-1ubuntu40) groovy; urgency=medium
+
+  * Add GENISOIMAGE_OPTIONS_EXTRA. Make the genisoimage option more flexible.
+
+ -- hugh chao <hugh.chao at canonical.com>  Mon, 18 May 2020 22:49:31 +0800
+
+live-build (3.0~a57-1ubuntu39) groovy; urgency=medium
+
+  * Add riscv64 support.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com>  Thu, 30 Apr 2020 16:10:34 +0100
+
 live-build (3.0~a57-1ubuntu38) eoan; urgency=medium
 
   * Stop setting LB_INITRAMFS_COMPRESSION default, and instead fallback to
diff --git a/debian/patches/add-riscv64.patch b/debian/patches/add-riscv64.patch
new file mode 100644
index 0000000..bc51a5f
--- /dev/null
+++ b/debian/patches/add-riscv64.patch
@@ -0,0 +1,38 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ live-build (3.0~a57-1ubuntu39) groovy; urgency=medium
+ .
+   * Add riscv64 support.
+Author: Dimitri John Ledkov <xnox at ubuntu.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2020-04-30
+
+--- live-build-3.0~a57.orig/functions/defaults.sh
++++ live-build-3.0~a57/functions/defaults.sh
+@@ -824,6 +824,10 @@ Set_defaults ()
+ 			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+ 			;;
+ 
++		riscv64)
++			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
++			;;
++
+ 		s390x)
+ 			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+ 			;;
diff --git a/debian/patches/series b/debian/patches/series
index 525fa1f..58d4c79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,3 +40,6 @@ late-resolv.conf-symlink.patch
 ubuntu-initramfs-handling.patch
 0001-Handle-includes.chroot-files-installed-over-symlinke.patch
 drop-default-initramfs-compression-override.patch
+add-riscv64.patch
+ubuntu-make-genisoimage-more-flexible.patch
+ubuntu-no-bzip2-bootstrap.patch
diff --git a/debian/patches/ubuntu-make-genisoimage-more-flexible.patch b/debian/patches/ubuntu-make-genisoimage-more-flexible.patch
new file mode 100644
index 0000000..1174312
--- /dev/null
+++ b/debian/patches/ubuntu-make-genisoimage-more-flexible.patch
@@ -0,0 +1,30 @@
+## Description: Make genisoimage more flexible.
+##   For currently version of live build, the image has been built without the support of uefi boot,
+##   so I will like to upstream a patch which using by OEM team which extended an extra option for mkisoimage.
+## Origin/Author: Hugh Chao (hugh.chao at canonical.com)
+## Bug: https://bugs.launchpad.net/oem-priority/+bug/1864426
+Index: live-build-3.0~a57/scripts/build/lb_binary_iso
+===================================================================
+--- live-build-3.0~a57.orig/scripts/build/lb_binary_iso
++++ live-build-3.0~a57/scripts/build/lb_binary_iso
+@@ -193,7 +193,7 @@ fi
+ 
+ cat >> binary.sh << EOF
+ 
+-genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
++genisoimage ${GENISOIMAGE_OPTIONS} ${GENISOIMAGE_OPTIONS_EXTRA} -o ${IMAGE} binary
+ EOF
+ 
+ if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
+Index: live-build-3.0~a57/scripts/build/lb_config
+===================================================================
+--- live-build-3.0~a57.orig/scripts/build/lb_config
++++ live-build-3.0~a57/scripts/build/lb_config
+@@ -1107,6 +1107,7 @@ APT_OPTIONS="${APT_OPTIONS}"
+ APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
+ GZIP_OPTIONS="${GZIP_OPTIONS}"
+ ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
++GENISOIMAGE_OPTIONS_EXTRA="${GENISOIMAGE_OPTIONS_EXTRA}"
+ EOF
+ 
+ # Creating lb_bootstrap_* configuration
diff --git a/debian/patches/ubuntu-no-bzip2-bootstrap.patch b/debian/patches/ubuntu-no-bzip2-bootstrap.patch
new file mode 100644
index 0000000..35a3167
--- /dev/null
+++ b/debian/patches/ubuntu-no-bzip2-bootstrap.patch
@@ -0,0 +1,18 @@
+Description: Don't special-case bzip2 in bootstrap.
+ Fixed upstream in live-build 3.0~a67-1 (in 2012).
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Forwarded: not-needed
+Last-Update: 2020-10-08
+
+--- live-build-3.0~a57.orig/scripts/build/lb_bootstrap_debootstrap
++++ live-build-3.0~a57/scripts/build/lb_bootstrap_debootstrap
+@@ -52,9 +52,6 @@ Create_lockfile .lock
+ # Creating chroot directory
+ mkdir -p chroot
+ 
+-# Temporarily including bzip2 manually until #657560 has been fixed in unstable
+-DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=bzip2"
+-
+ # Setting debootstrap options
+ if [ -n "${LB_ARCHITECTURES}" ]
+ then
