live-build

Merge lp:~timchen119/live-build/lb-sg-2.x.lp1247763 into lp:~ce-infrastructure/live-build/lb-sg-2.x

  1. lb-sg-2.x.lp1247763
  2. Merge into lb-sg-2.x
Proposed by Tim Chen
Status: Merged
Merged at revision: 1618
Proposed branch: lp:~timchen119/live-build/lb-sg-2.x.lp1247763
Merge into: lp:~ce-infrastructure/live-build/lb-sg-2.x
Diff against target: 88 lines (+13/-6)
6 files modified
debian/changelog (+7/-0)
scripts/build/lb_binary_grub (+1/-1)
scripts/build/lb_binary_grub2 (+1/-1)
scripts/build/lb_binary_silo (+1/-1)
scripts/build/lb_binary_syslinux (+2/-2)
scripts/build/lb_binary_yaboot (+1/-1)
To merge this branch: bzr merge lp:~timchen119/live-build/lb-sg-2.x.lp1247763
Reviewer Review Type Date Requested Status
Timothy R. Chavez Pending
Review via email: mp+193742@code.launchpad.net

Description of the change

the current live-build on OEM-IBS can not build a correct image for lts saucy kernel,
the image built on OEM-IBS has several files with wrong suffix

./casper/initrd.img-3.11.0-13-generic
./casper/vmlinuz-3.11.0-13-generic
./.disk/casper-uuid-3.11.0-13-generic

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
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-10-16 21:24:55 +0000
3+++ debian/changelog 2013-11-04 09:28:58 +0000
4@@ -1,3 +1,10 @@
5+live-build (2.0.12-2cesg24) precise; urgency=low
6+
7+ * Fix wrong kernel and casper filename suffix issue
8+ for linux-generic-lts-saucy kernel. (LP: #1247763)
9+
10+ -- Jian-Ding Chen (timchen119) <tim.chen119@canonical.com> Mon, 04 Nov 2013 17:22:40 +0800
11+
12 live-build (2.0.12-2cesg23) precise; urgency=low
13
14 * Add support for pxz.
15
16=== modified file 'scripts/build/lb_binary_grub'
17--- scripts/build/lb_binary_grub 2012-11-29 06:05:00 +0000
18+++ scripts/build/lb_binary_grub 2013-11-04 09:28:58 +0000
19@@ -223,7 +223,7 @@
20 DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
21 if [ "$LB_MODE" = "ubuntu" ]; then
22 case "${DEFAULT_FLAVOUR}" in
23- (generic-lts-quantal|generic-lts-raring)
24+ (generic-lts-*)
25 SUFFIX="generic"
26 ;;
27 (*)
28
29=== modified file 'scripts/build/lb_binary_grub2'
30--- scripts/build/lb_binary_grub2 2012-11-29 06:05:00 +0000
31+++ scripts/build/lb_binary_grub2 2013-11-04 09:28:58 +0000
32@@ -197,7 +197,7 @@
33 DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
34 if [ "$LB_MODE" = "ubuntu" ]; then
35 case "${DEFAULT_FLAVOUR}" in
36- (generic-lts-quantal|generic-lts-raring)
37+ (generic-lts-*)
38 SUFFIX="generic"
39 ;;
40 (*)
41
42=== modified file 'scripts/build/lb_binary_silo'
43--- scripts/build/lb_binary_silo 2012-11-29 06:05:00 +0000
44+++ scripts/build/lb_binary_silo 2013-11-04 09:28:58 +0000
45@@ -190,7 +190,7 @@
46 DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
47 if [ "$LB_MODE" = "ubuntu" ]; then
48 case "${DEFAULT_FLAVOUR}" in
49- (generic-lts-quantal|generic-lts-raring)
50+ (generic-lts-*)
51 SUFFIX="generic"
52 ;;
53 (*)
54
55=== modified file 'scripts/build/lb_binary_syslinux'
56--- scripts/build/lb_binary_syslinux 2012-11-29 06:05:00 +0000
57+++ scripts/build/lb_binary_syslinux 2013-11-04 09:28:58 +0000
58@@ -525,7 +525,7 @@
59 DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
60 if [ "$LB_MODE" = "ubuntu" ]; then
61 case "${DEFAULT_FLAVOUR}" in
62- (generic-lts-quantal|generic-lts-raring)
63+ (generic-lts-*)
64 SUFFIX="generic"
65 ;;
66 (*)
67@@ -548,7 +548,7 @@
68 then
69 if [ "$LB_MODE" = "ubuntu" ]; then
70 case "${FLAVOUR}" in
71- (generic-lts-quantal|generic-lts-raring)
72+ (generic-lts-*)
73 SUFFIX="generic"
74 ;;
75 (*)
76
77=== modified file 'scripts/build/lb_binary_yaboot'
78--- scripts/build/lb_binary_yaboot 2012-11-29 06:05:00 +0000
79+++ scripts/build/lb_binary_yaboot 2013-11-04 09:28:58 +0000
80@@ -229,7 +229,7 @@
81 DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
82 if [ "$LB_MODE" = "ubuntu" ]; then
83 case "${DEFAULT_FLAVOUR}" in
84- (generic-lts-quantal|generic-lts-raring)
85+ (generic-lts-*)
86 SUFFIX="generic"
87 ;;
88 (*)

Subscribers

People subscribed via source and target branches