Merge ~lihow731/ubuntu/+source/live-build:focal-devel into ubuntu/+source/live-build:applied/ubuntu/focal-devel

[Leon Liao]

Add GENISOIMAGE_OPTIONS_EXTRA

Make the genisoimage option more flexible.

LP: 1864426

When we want to build a uefi bootable image, the mkisoimage needs extra options.
But, in live-build 3, the option of mkisoimage is fixed and can not be customized.

Unmerged commits

c866a19... by Leon Liao on 2020-02-21

Add GENISOIMAGE_OPTIONS_EXTRA

Make the genisoimage option more flexible.
LP: 1864426

diff --git a/debian/changelog b/debian/changelog
index c604dbd..3bb10d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 live-build (3.0~a57-1ubuntu38) eoan; urgency=medium
 
   * Stop setting LB_INITRAMFS_COMPRESSION default, and instead fallback to
@@ -6,6 +7,14 @@ live-build (3.0~a57-1ubuntu38) eoan; urgency=medium
     makes live-build default to lz4. LP: #1831736
 
  -- Dimitri John Ledkov <[e-mail]>  Wed, 05 Jun 2019 13:34:29 +0100
+=======
+live-build (3.0~a57-1ubuntu39) focal; urgency=medium
+
+  * Add GENISOIMAGE_OPTIONS_EXTRA
+    Make the genisoimage option more flexible.
+
+ -- Li-Hao Liao (Leon Liao) <[e-mail]>  Fri, 21 Feb 2020 17:57:54 +0800
+>>>>>>> debian/changelog
 
 live-build (3.0~a57-1ubuntu37) disco; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 525fa1f..334900c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,4 +39,8 @@ no-apt-key.patch
 late-resolv.conf-symlink.patch
 ubuntu-initramfs-handling.patch
 0001-Handle-includes.chroot-files-installed-over-symlinke.patch
+<<<<<<< debian/patches/series
 drop-default-initramfs-compression-override.patch
+=======
+ubuntu-make-genisoimage-more-flexible.patch
+>>>>>>> debian/patches/series
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..ccf861c
--- /dev/null
+++ b/debian/patches/ubuntu-make-genisoimage-more-flexible.patch
@@ -0,0 +1,31 @@
+Description: Make genisoimage more flexible.
+ Originally, we can not customize the opiton of the genisoimage. Now, the "GENISOIMAGE_OPTIONS_EXTRA" will be genisoimage option and make more flexible. This modification come from "live-build 2.0.12-2cesg34", but I can not find the git repository.
+Author: Li-Hao Liao (Leon Liao)
+Last-Update: 2020-02-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: live-build/scripts/build/lb_binary_iso
+===================================================================
+--- live-build.orig/scripts/build/lb_binary_iso
++++ live-build/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/scripts/build/lb_config
+===================================================================
+--- live-build.orig/scripts/build/lb_config
++++ live-build/scripts/build/lb_config
+@@ -1089,6 +1089,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