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

Proposed by Leon Liao
Status: Superseded
Proposed branch: ~lihow731/ubuntu/+source/live-build:focal-devel
Merge into: ubuntu/+source/live-build:applied/ubuntu/focal-devel
Diff against target: 74 lines (+44/-0) (has conflicts)
3 files modified
debian/changelog (+9/-0)
debian/patches/series (+4/-0)
debian/patches/ubuntu-make-genisoimage-more-flexible.patch (+31/-0)
Conflict in debian/changelog
Conflict in debian/patches/series
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Pending
Canonical Mainstream Pending
Review via email: mp+379718@code.launchpad.net

This proposal supersedes a proposal from 2020-02-24.

This proposal has been superseded by a proposal from 2020-02-24.

Commit message

Add GENISOIMAGE_OPTIONS_EXTRA

Make the genisoimage option more flexible.

LP: 1864426

Description of the change

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.

To post a comment you must log in.

Unmerged commits

c866a19... by Leon Liao

Add GENISOIMAGE_OPTIONS_EXTRA

Make the genisoimage option more flexible.
LP: 1864426

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index c604dbd..3bb10d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
1<<<<<<< debian/changelog
1live-build (3.0~a57-1ubuntu38) eoan; urgency=medium2live-build (3.0~a57-1ubuntu38) eoan; urgency=medium
23
3 * Stop setting LB_INITRAMFS_COMPRESSION default, and instead fallback to4 * Stop setting LB_INITRAMFS_COMPRESSION default, and instead fallback to
@@ -6,6 +7,14 @@ live-build (3.0~a57-1ubuntu38) eoan; urgency=medium
6 makes live-build default to lz4. LP: #18317367 makes live-build default to lz4. LP: #1831736
78
8 -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 05 Jun 2019 13:34:29 +01009 -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 05 Jun 2019 13:34:29 +0100
10=======
11live-build (3.0~a57-1ubuntu39) focal; urgency=medium
12
13 * Add GENISOIMAGE_OPTIONS_EXTRA
14 Make the genisoimage option more flexible.
15
16 -- Li-Hao Liao (Leon Liao) <leon.liao@canonical.com> Fri, 21 Feb 2020 17:57:54 +0800
17>>>>>>> debian/changelog
918
10live-build (3.0~a57-1ubuntu37) disco; urgency=medium19live-build (3.0~a57-1ubuntu37) disco; urgency=medium
1120
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
39late-resolv.conf-symlink.patch39late-resolv.conf-symlink.patch
40ubuntu-initramfs-handling.patch40ubuntu-initramfs-handling.patch
410001-Handle-includes.chroot-files-installed-over-symlinke.patch410001-Handle-includes.chroot-files-installed-over-symlinke.patch
42<<<<<<< debian/patches/series
42drop-default-initramfs-compression-override.patch43drop-default-initramfs-compression-override.patch
44=======
45ubuntu-make-genisoimage-more-flexible.patch
46>>>>>>> debian/patches/series
diff --git a/debian/patches/ubuntu-make-genisoimage-more-flexible.patch b/debian/patches/ubuntu-make-genisoimage-more-flexible.patch
43new file mode 10064447new file mode 100644
index 0000000..ccf861c
--- /dev/null
+++ b/debian/patches/ubuntu-make-genisoimage-more-flexible.patch
@@ -0,0 +1,31 @@
1Description: Make genisoimage more flexible.
2 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.
3Author: Li-Hao Liao (Leon Liao)
4Last-Update: 2020-02-21
5---
6This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
7Index: live-build/scripts/build/lb_binary_iso
8===================================================================
9--- live-build.orig/scripts/build/lb_binary_iso
10+++ live-build/scripts/build/lb_binary_iso
11@@ -193,7 +193,7 @@ fi
12
13 cat >> binary.sh << EOF
14
15-genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
16+genisoimage ${GENISOIMAGE_OPTIONS} ${GENISOIMAGE_OPTIONS_EXTRA} -o ${IMAGE} binary
17 EOF
18
19 if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
20Index: live-build/scripts/build/lb_config
21===================================================================
22--- live-build.orig/scripts/build/lb_config
23+++ live-build/scripts/build/lb_config
24@@ -1089,6 +1089,7 @@ APT_OPTIONS="${APT_OPTIONS}"
25 APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
26 GZIP_OPTIONS="${GZIP_OPTIONS}"
27 ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
28+GENISOIMAGE_OPTIONS_EXTRA="${GENISOIMAGE_OPTIONS_EXTRA}"
29 EOF
30
31 # Creating lb_bootstrap_* configuration

Subscribers

People subscribed via source and target branches