Merge ~lihow731/ubuntu/+source/live-build:ubuntu/focal 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

34cd9a0... by Leon Liao on 2020-02-24

Add GENISOIMAGE_OPTIONS_EXTRA

Make the genisoimage option more flexible.

9d36b57... by Dimitri John Ledkov on 2019-06-05

Import patches-applied version 3.0~a57-1ubuntu38 to applied/ubuntu/eoan-proposed

Imported using git-ubuntu import.

Changelog parent: 45e2efdbc1d947019bcfcebab81b550f7a705c96
Unapplied parent: 27926ed23f5fcafd24bf6989b1d32c7691873417

New changelog entries:
  * Stop setting LB_INITRAMFS_COMPRESSION default, and instead fallback to
    using initramfs-tools default. LB_INITRAMFS_COMPRESSION is now only to
    override whatever initramfs-tools' default compression is. This thus
    makes live-build default to lz4. LP: #1831736

27926ed... by Dimitri John Ledkov on 2019-06-05

* Stop setting LB_INITRAMFS_COMPRESSION default, and instead fallback to

Gbp-Pq: drop-default-initramfs-compression-override.patch.

b72521c... by Dimitri John Ledkov on 2019-06-05

[PATCH] Handle includes.chroot files installed over symlinked

Gbp-Pq: 0001-Handle-includes.chroot-files-installed-over-symlinke.patch.

9d12091... by Dimitri John Ledkov on 2019-06-05

Use initramfs-tools to work with initrds instead of being silly.

Gbp-Pq: ubuntu-initramfs-handling.patch.

d969ea5... by Dimitri John Ledkov on 2019-06-05

Handle late installation of systemd/resolvconf gracefully, by not

Gbp-Pq: late-resolv.conf-symlink.patch.

e61dc04... by Dimitri John Ledkov on 2019-06-05

Stop using apt-key to setup secure apt, and instead copy the gpg key snippet.

Gbp-Pq: no-apt-key.patch.

96fbf54... by Dimitri John Ledkov on 2019-06-05

Don't force inclusion of gnupg in debootstrap

Gbp-Pq: ubuntu-no-gnupg-hardcode.patch.

42c721f... by Dimitri John Ledkov on 2019-06-05

Skip installing missing initrd

Gbp-Pq: skip-missing-initrd.patch.

b1d007f... by Dimitri John Ledkov on 2019-06-05

Drop fix-up code for sysvinit

Gbp-Pq: ubuntu-no-sysvinit-fixups.patch.

diff --git a/debian/changelog b/debian/changelog
index c604dbd..f4f78cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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]>  Mon, 24 Feb 2020 17:56:42 +0800
+
 live-build (3.0~a57-1ubuntu38) eoan; urgency=medium
 
   * Stop setting LB_INITRAMFS_COMPRESSION default, and instead fallback to
diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
index d466656..1f6dc8a 100755
--- a/scripts/build/lb_binary_iso
+++ b/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" ]
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index ebfa47d..eaeca12 100755
--- a/scripts/build/lb_config
+++ b/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