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
Canonical Mainstream Pending
Dimitri John Ledkov 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
1diff --git a/debian/changelog b/debian/changelog
2index c604dbd..3bb10d0 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,4 @@
6+<<<<<<< debian/changelog
7 live-build (3.0~a57-1ubuntu38) eoan; urgency=medium
8
9 * Stop setting LB_INITRAMFS_COMPRESSION default, and instead fallback to
10@@ -6,6 +7,14 @@ live-build (3.0~a57-1ubuntu38) eoan; urgency=medium
11 makes live-build default to lz4. LP: #1831736
12
13 -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 05 Jun 2019 13:34:29 +0100
14+=======
15+live-build (3.0~a57-1ubuntu39) focal; urgency=medium
16+
17+ * Add GENISOIMAGE_OPTIONS_EXTRA
18+ Make the genisoimage option more flexible.
19+
20+ -- Li-Hao Liao (Leon Liao) <leon.liao@canonical.com> Fri, 21 Feb 2020 17:57:54 +0800
21+>>>>>>> debian/changelog
22
23 live-build (3.0~a57-1ubuntu37) disco; urgency=medium
24
25diff --git a/debian/patches/series b/debian/patches/series
26index 525fa1f..334900c 100644
27--- a/debian/patches/series
28+++ b/debian/patches/series
29@@ -39,4 +39,8 @@ no-apt-key.patch
30 late-resolv.conf-symlink.patch
31 ubuntu-initramfs-handling.patch
32 0001-Handle-includes.chroot-files-installed-over-symlinke.patch
33+<<<<<<< debian/patches/series
34 drop-default-initramfs-compression-override.patch
35+=======
36+ubuntu-make-genisoimage-more-flexible.patch
37+>>>>>>> debian/patches/series
38diff --git a/debian/patches/ubuntu-make-genisoimage-more-flexible.patch b/debian/patches/ubuntu-make-genisoimage-more-flexible.patch
39new file mode 100644
40index 0000000..ccf861c
41--- /dev/null
42+++ b/debian/patches/ubuntu-make-genisoimage-more-flexible.patch
43@@ -0,0 +1,31 @@
44+Description: Make genisoimage more flexible.
45+ 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.
46+Author: Li-Hao Liao (Leon Liao)
47+Last-Update: 2020-02-21
48+---
49+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
50+Index: live-build/scripts/build/lb_binary_iso
51+===================================================================
52+--- live-build.orig/scripts/build/lb_binary_iso
53++++ live-build/scripts/build/lb_binary_iso
54+@@ -193,7 +193,7 @@ fi
55+
56+ cat >> binary.sh << EOF
57+
58+-genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
59++genisoimage ${GENISOIMAGE_OPTIONS} ${GENISOIMAGE_OPTIONS_EXTRA} -o ${IMAGE} binary
60+ EOF
61+
62+ if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
63+Index: live-build/scripts/build/lb_config
64+===================================================================
65+--- live-build.orig/scripts/build/lb_config
66++++ live-build/scripts/build/lb_config
67+@@ -1089,6 +1089,7 @@ APT_OPTIONS="${APT_OPTIONS}"
68+ APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
69+ GZIP_OPTIONS="${GZIP_OPTIONS}"
70+ ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
71++GENISOIMAGE_OPTIONS_EXTRA="${GENISOIMAGE_OPTIONS_EXTRA}"
72+ EOF
73+
74+ # Creating lb_bootstrap_* configuration

Subscribers

People subscribed via source and target branches