live-build

Merge lp:~oem-solutions-group/live-build/live-helper into lp:~oem-solutions-releng/live-build/live-helper

  1. live-helper
  2. Merge into live-helper
Proposed by Debbie Beliveau
Status: Merged
Approved by: Cody A.W. Somerville
Approved revision: 1049
Merged at revision: 1050
Proposed branch: lp:~oem-solutions-group/live-build/live-helper
Merge into: lp:~oem-solutions-releng/live-build/live-helper
Diff against target: 153 lines (+51/-0)
14 files modified
data/debian-cd/jaunty/arm_businesscard_udeb_include (+3/-0)
data/debian-cd/jaunty/arm_netinst_udeb_include (+2/-0)
data/debian-cd/jaunty/arm_udeb_include (+2/-0)
data/debian-cd/karmic/arm_businesscard_udeb_include (+3/-0)
data/debian-cd/karmic/arm_netinst_udeb_include (+2/-0)
data/debian-cd/karmic/arm_udeb_include (+2/-0)
data/debian-cd/lucid/arm_businesscard_udeb_include (+3/-0)
data/debian-cd/lucid/arm_netinst_udeb_include (+2/-0)
data/debian-cd/lucid/arm_udeb_include (+2/-0)
data/debian-cd/maverick/arm_businesscard_udeb_include (+3/-0)
data/debian-cd/maverick/arm_netinst_udeb_include (+2/-0)
data/debian-cd/maverick/arm_udeb_include (+2/-0)
debian/changelog (+9/-0)
helpers/lh_binary_debian-installer (+14/-0)
To merge this branch: bzr merge lp:~oem-solutions-group/live-build/live-helper
Reviewer Review Type Date Requested Status
Cody A.W. Somerville (community) Approve
Steve Magoun Pending
Review via email: mp+30994@code.launchpad.net

Description of the change

Changes to support using debian-installer for an armel image.

To post a comment you must log in.
Revision history for this message
Cody A.W. Somerville (cody-somerville) wrote :

LH_LINUX_FLAVOURS can contain multiple different flavors separated by whitespace so like with Sparc we'll have to use awk to select the first flavor and use that. I'll merge your branch and make this change. Good work. :)

review: Approve
Revision history for this message
Cody A.W. Somerville (cody-somerville) wrote :

Also, FYI, live-helper's coding style requires a space before and after case statements.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/debian-cd/jaunty/arm_businesscard_udeb_include'
2--- data/debian-cd/jaunty/arm_businesscard_udeb_include 1970-01-01 00:00:00 +0000
3+++ data/debian-cd/jaunty/arm_businesscard_udeb_include 2010-07-26 21:36:54 +0000
4@@ -0,0 +1,3 @@
5+choose-mirror
6+netcfg
7+ethdetect
8
9=== added file 'data/debian-cd/jaunty/arm_netinst_udeb_include'
10--- data/debian-cd/jaunty/arm_netinst_udeb_include 1970-01-01 00:00:00 +0000
11+++ data/debian-cd/jaunty/arm_netinst_udeb_include 2010-07-26 21:36:54 +0000
12@@ -0,0 +1,2 @@
13+netcfg
14+ethdetect
15
16=== added file 'data/debian-cd/jaunty/arm_udeb_include'
17--- data/debian-cd/jaunty/arm_udeb_include 1970-01-01 00:00:00 +0000
18+++ data/debian-cd/jaunty/arm_udeb_include 2010-07-26 21:36:54 +0000
19@@ -0,0 +1,2 @@
20+netcfg
21+ethdetect
22
23=== added symlink 'data/debian-cd/jaunty/armel_businesscard_udeb_include'
24=== target is u'arm_businesscard_udeb_include'
25=== added symlink 'data/debian-cd/jaunty/armel_netinst_udeb_include'
26=== target is u'arm_netinst_udeb_include'
27=== added symlink 'data/debian-cd/jaunty/armel_udeb_include'
28=== target is u'arm_udeb_include'
29=== added file 'data/debian-cd/karmic/arm_businesscard_udeb_include'
30--- data/debian-cd/karmic/arm_businesscard_udeb_include 1970-01-01 00:00:00 +0000
31+++ data/debian-cd/karmic/arm_businesscard_udeb_include 2010-07-26 21:36:54 +0000
32@@ -0,0 +1,3 @@
33+choose-mirror
34+netcfg
35+ethdetect
36
37=== added file 'data/debian-cd/karmic/arm_netinst_udeb_include'
38--- data/debian-cd/karmic/arm_netinst_udeb_include 1970-01-01 00:00:00 +0000
39+++ data/debian-cd/karmic/arm_netinst_udeb_include 2010-07-26 21:36:54 +0000
40@@ -0,0 +1,2 @@
41+netcfg
42+ethdetect
43
44=== added file 'data/debian-cd/karmic/arm_udeb_include'
45--- data/debian-cd/karmic/arm_udeb_include 1970-01-01 00:00:00 +0000
46+++ data/debian-cd/karmic/arm_udeb_include 2010-07-26 21:36:54 +0000
47@@ -0,0 +1,2 @@
48+netcfg
49+ethdetect
50
51=== added symlink 'data/debian-cd/karmic/armel_businesscard_udeb_include'
52=== target is u'arm_businesscard_udeb_include'
53=== added symlink 'data/debian-cd/karmic/armel_netinst_udeb_include'
54=== target is u'arm_netinst_udeb_include'
55=== added symlink 'data/debian-cd/karmic/armel_udeb_include'
56=== target is u'arm_udeb_include'
57=== added file 'data/debian-cd/lucid/arm_businesscard_udeb_include'
58--- data/debian-cd/lucid/arm_businesscard_udeb_include 1970-01-01 00:00:00 +0000
59+++ data/debian-cd/lucid/arm_businesscard_udeb_include 2010-07-26 21:36:54 +0000
60@@ -0,0 +1,3 @@
61+choose-mirror
62+netcfg
63+ethdetect
64
65=== added file 'data/debian-cd/lucid/arm_netinst_udeb_include'
66--- data/debian-cd/lucid/arm_netinst_udeb_include 1970-01-01 00:00:00 +0000
67+++ data/debian-cd/lucid/arm_netinst_udeb_include 2010-07-26 21:36:54 +0000
68@@ -0,0 +1,2 @@
69+netcfg
70+ethdetect
71
72=== added file 'data/debian-cd/lucid/arm_udeb_include'
73--- data/debian-cd/lucid/arm_udeb_include 1970-01-01 00:00:00 +0000
74+++ data/debian-cd/lucid/arm_udeb_include 2010-07-26 21:36:54 +0000
75@@ -0,0 +1,2 @@
76+netcfg
77+ethdetect
78
79=== added symlink 'data/debian-cd/lucid/armel_businesscard_udeb_include'
80=== target is u'arm_businesscard_udeb_include'
81=== added symlink 'data/debian-cd/lucid/armel_netinst_udeb_include'
82=== target is u'arm_netinst_udeb_include'
83=== added symlink 'data/debian-cd/lucid/armel_udeb_include'
84=== target is u'arm_udeb_include'
85=== added file 'data/debian-cd/maverick/arm_businesscard_udeb_include'
86--- data/debian-cd/maverick/arm_businesscard_udeb_include 1970-01-01 00:00:00 +0000
87+++ data/debian-cd/maverick/arm_businesscard_udeb_include 2010-07-26 21:36:54 +0000
88@@ -0,0 +1,3 @@
89+choose-mirror
90+netcfg
91+ethdetect
92
93=== added file 'data/debian-cd/maverick/arm_netinst_udeb_include'
94--- data/debian-cd/maverick/arm_netinst_udeb_include 1970-01-01 00:00:00 +0000
95+++ data/debian-cd/maverick/arm_netinst_udeb_include 2010-07-26 21:36:54 +0000
96@@ -0,0 +1,2 @@
97+netcfg
98+ethdetect
99
100=== added file 'data/debian-cd/maverick/arm_udeb_include'
101--- data/debian-cd/maverick/arm_udeb_include 1970-01-01 00:00:00 +0000
102+++ data/debian-cd/maverick/arm_udeb_include 2010-07-26 21:36:54 +0000
103@@ -0,0 +1,2 @@
104+netcfg
105+ethdetect
106
107=== added symlink 'data/debian-cd/maverick/armel_businesscard_udeb_include'
108=== target is u'arm_businesscard_udeb_include'
109=== added symlink 'data/debian-cd/maverick/armel_netinst_udeb_include'
110=== target is u'arm_netinst_udeb_include'
111=== added symlink 'data/debian-cd/maverick/armel_udeb_include'
112=== target is u'arm_udeb_include'
113=== modified file 'debian/changelog'
114--- debian/changelog 2010-07-20 14:07:59 +0000
115+++ debian/changelog 2010-07-26 21:36:54 +0000
116@@ -1,3 +1,12 @@
117+live-helper (1.0.6-1ubuntu0cesg13) UNRELEASED; urgency=low
118+
119+ * helpers/lh_binary_debian-installer: Use a download path that includes the
120+ subarch when working with armel
121+ * data/debian-cd/<ubuntu distro>: Add arm data files from v. 2.0~a16-1.
122+ Create armel links to these files.
123+
124+ -- Debbie Beliveau <debbie.beliveau@canonical.com> Mon, 26 Jul 2010 10:21:41 -0400
125+
126 live-helper (1.0.6-1ubuntu0cesg12) hardy; urgency=low
127
128 * functions/losetup.sh: Add 'sleep 1' before removing loop device, possible
129
130=== modified file 'helpers/lh_binary_debian-installer'
131--- helpers/lh_binary_debian-installer 2009-09-09 18:17:51 +0000
132+++ helpers/lh_binary_debian-installer 2010-07-26 21:36:54 +0000
133@@ -153,6 +153,20 @@
134 DI_REMOTE_BASE="cdrom"
135 fi
136 ;;
137+ armel)
138+ case "${DI_IMAGE_TYPE}" in
139+ cdrom)
140+ DI_REMOTE_BASE="${LH_LINUX_FLAVOURS}/cdrom"
141+ ;;
142+
143+ netboot)
144+ DI_REMOTE_BASE="${LH_LINUX_FLAVOURS}/netboot"
145+ ;;
146+ esac
147+
148+ DI_REMOTE_KERNEL="vmlinuz"
149+ DI_REMOTE_BASE_GTK="${DI_REMOTE_BASE}/gtk"
150+ ;;
151 *)
152 case "${DI_IMAGE_TYPE}" in
153 netboot)

Subscribers

People subscribed via source and target branches