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

Proposed by Leon Liao
Status: Needs review
Proposed branch: ~lihow731/ubuntu/+source/live-build:ubuntu/focal
Merge into: ubuntu/+source/live-build:applied/ubuntu/focal-devel
Diff against target: 40 lines (+9/-1)
3 files modified
debian/changelog (+7/-0)
scripts/build/lb_binary_iso (+1/-1)
scripts/build/lb_config (+1/-0)
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Pending
Canonical Mainstream Pending
Review via email: mp+379723@code.launchpad.net

This proposal supersedes 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.

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..f4f78cc 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+live-build (3.0~a57-1ubuntu39) focal; urgency=medium
7+
8+ * Add GENISOIMAGE_OPTIONS_EXTRA
9+ Make the genisoimage option more flexible.
10+
11+ -- Li-Hao Liao (Leon Liao) <leon.liao@canonical.com> Mon, 24 Feb 2020 17:56:42 +0800
12+
13 live-build (3.0~a57-1ubuntu38) eoan; urgency=medium
14
15 * Stop setting LB_INITRAMFS_COMPRESSION default, and instead fallback to
16diff --git a/scripts/build/lb_binary_iso b/scripts/build/lb_binary_iso
17index d466656..1f6dc8a 100755
18--- a/scripts/build/lb_binary_iso
19+++ b/scripts/build/lb_binary_iso
20@@ -193,7 +193,7 @@ fi
21
22 cat >> binary.sh << EOF
23
24-genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
25+genisoimage ${GENISOIMAGE_OPTIONS} ${GENISOIMAGE_OPTIONS_EXTRA} -o ${IMAGE} binary
26 EOF
27
28 if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
29diff --git a/scripts/build/lb_config b/scripts/build/lb_config
30index ebfa47d..eaeca12 100755
31--- a/scripts/build/lb_config
32+++ b/scripts/build/lb_config
33@@ -1107,6 +1107,7 @@ APT_OPTIONS="${APT_OPTIONS}"
34 APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
35 GZIP_OPTIONS="${GZIP_OPTIONS}"
36 ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
37+GENISOIMAGE_OPTIONS_EXTRA="${GENISOIMAGE_OPTIONS_EXTRA}"
38 EOF
39
40 # Creating lb_bootstrap_* configuration

Subscribers

People subscribed via source and target branches