Merge lp:~xnox/debian-cd/hwe-s390x into lp:~ubuntu-cdimage/debian-cd/ubuntu

Proposed by Dimitri John Ledkov on 2017-02-09
Status: Merged
Merged at revision: 1961
Proposed branch: lp:~xnox/debian-cd/hwe-s390x
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 215 lines (+76/-30)
7 files modified
data/xenial/s390x/README.boot (+4/-0)
data/xenial/s390x/ubuntu.ins (+0/-6)
data/yakkety/s390x/ubuntu.ins (+0/-6)
data/zesty/s390x/ubuntu.ins (+0/-6)
tools/boot/xenial/boot-s390x (+24/-4)
tools/boot/yakkety/boot-s390x (+24/-4)
tools/boot/zesty/boot-s390x (+24/-4)
To merge this branch: bzr merge lp:~xnox/debian-cd/hwe-s390x
Reviewer Review Type Date Requested Status
Adam Conrad 2017-02-09 Pending
Review via email: mp+316858@code.launchpad.net

Description of the change

boot-hwe support for s390x

there is a slight refactor to use more artifacts generated in the d-i build.
syncs all releases to use the same code path.

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 'data/xenial/s390x/README.boot'
2--- data/xenial/s390x/README.boot 2016-01-18 18:13:39 +0000
3+++ data/xenial/s390x/README.boot 2017-02-09 14:49:22 +0000
4@@ -4,6 +4,10 @@
5 It is possible to "boot" the installation system off this CD using
6 the files provided in the /boot directory.
7
8+It is also possible to use "/boot-hwe" directory to install using a
9+rolling hardware enablement kernel, based on a kernel from a later
10+Ubuntu release.
11+
12 Although you can boot the installer from this CD, the installation
13 itself is *not* actually done from the CD. Once the initrd is loaded,
14 the installer will ask you to configure your network connection and
15
16=== removed file 'data/xenial/s390x/ubuntu.ins'
17--- data/xenial/s390x/ubuntu.ins 2016-01-18 18:06:53 +0000
18+++ data/xenial/s390x/ubuntu.ins 1970-01-01 00:00:00 +0000
19@@ -1,6 +0,0 @@
20-* Ubuntu for z Series (boot from CD-ROM or FTP-Server)
21-kernel.ubuntu 0x00000000
22-initrd.off 0x0001040c
23-initrd.siz 0x00010414
24-parmfile.ubuntu 0x00010480
25-initrd.ubuntu 0x01000000
26
27=== removed file 'data/yakkety/s390x/ubuntu.ins'
28--- data/yakkety/s390x/ubuntu.ins 2016-04-22 11:40:33 +0000
29+++ data/yakkety/s390x/ubuntu.ins 1970-01-01 00:00:00 +0000
30@@ -1,6 +0,0 @@
31-* Ubuntu for z Series (boot from CD-ROM or FTP-Server)
32-kernel.ubuntu 0x00000000
33-initrd.off 0x0001040c
34-initrd.siz 0x00010414
35-parmfile.ubuntu 0x00010480
36-initrd.ubuntu 0x01000000
37
38=== removed file 'data/zesty/s390x/ubuntu.ins'
39--- data/zesty/s390x/ubuntu.ins 2016-10-25 19:09:23 +0000
40+++ data/zesty/s390x/ubuntu.ins 1970-01-01 00:00:00 +0000
41@@ -1,6 +0,0 @@
42-* Ubuntu for z Series (boot from CD-ROM or FTP-Server)
43-kernel.ubuntu 0x00000000
44-initrd.off 0x0001040c
45-initrd.siz 0x00010414
46-parmfile.ubuntu 0x00010480
47-initrd.ubuntu 0x01000000
48
49=== modified file 'tools/boot/xenial/boot-s390x'
50--- tools/boot/xenial/boot-s390x 2016-01-27 14:55:12 +0000
51+++ tools/boot/xenial/boot-s390x 2017-02-09 14:49:22 +0000
52@@ -45,16 +45,28 @@
53 DI_DIR="$DI_PATH/current/images"
54
55 cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir
56+cp -lf "$DI_DIR/generic/ubuntu.ins" $imagedir
57 cp -lf "$DI_DIR/generic/parmfile.ubuntu" $imagedir
58 cp -lf "$DI_DIR/generic/initrd.ubuntu" $imagedir
59 cp -lf "$DI_DIR/generic/kernel.ubuntu" $imagedir
60+cp -lf "$DI_DIR/generic/initrd.off" $imagedir
61+cp -lf "$DI_DIR/generic/initrd.siz" $imagedir
62+
63+hwedir="boot$N/boot-hwe"
64+if [ -d "$DI_DIR/hwe-generic" ]
65+then
66+ mkdir -p $hwedir
67+ cp -lf "$DI_DIR/hwe-generic/ubuntu.exec" $hwedir
68+ cp -lf "$DI_DIR/hwe-generic/ubuntu.ins" $hwedir
69+ cp -lf "$DI_DIR/hwe-generic/parmfile.ubuntu" $hwedir
70+ cp -lf "$DI_DIR/hwe-generic/initrd.ubuntu" $hwedir
71+ cp -lf "$DI_DIR/hwe-generic/kernel.ubuntu" $hwedir
72+ cp -lf "$DI_DIR/hwe-generic/initrd.off" $hwedir
73+ cp -lf "$DI_DIR/hwe-generic/initrd.siz" $hwedir
74+fi
75
76 $BASEDIR/tools/gen-s390-cd-kernel.pl --initrd=$imagedir/initrd.ubuntu --kernel=$imagedir/kernel.ubuntu --outfile=$imagedir/ubuntu.ikr
77
78-# Create the files specifying offset and size of the initrd
79-perl -e "print pack('N', 0x1000000)" >"$imagedir/initrd.off"
80-perl -e "print pack('N', -s '$imagedir/initrd.ubuntu')" >"$imagedir/initrd.siz"
81-
82 cp "$DI_DIR/MANIFEST.udebs" .
83 list_kernel_abis $images_S390 | check_kernel_sync
84
85@@ -62,10 +74,18 @@
86 # - ubuntu.ins : for booting from CD-ROM or FTP-Server
87 # - README
88 cp $BASEDIR/data/$CODENAME/$ARCH/* $imagedir
89+if [ -d $hwedir ]
90+then
91+ cp $BASEDIR/data/$CODENAME/$ARCH/* $hwedir
92+fi
93
94 # secondary top-level ubuntu.ins file was requested in
95 # https://bugs.launchpad.net/ubuntu-cdimage/+bug/1536981/comments/6
96 sed -e 's,^[^*],boot/&,g' < $imagedir/ubuntu.ins > $imagedir/../ubuntu.ins
97+if [ -d $hwedir ]
98+then
99+ sed -e 's,^[^*],boot-hwe/&,g' < $hwedir/ubuntu.ins > $hwedir/../ubuntu-hwe.ins
100+fi
101
102 # add_mkisofs_opt is buggy, it thinks "-b" was already "specified" in
103 # "-no-emul-boot"
104
105=== modified file 'tools/boot/yakkety/boot-s390x'
106--- tools/boot/yakkety/boot-s390x 2016-04-22 11:40:33 +0000
107+++ tools/boot/yakkety/boot-s390x 2017-02-09 14:49:22 +0000
108@@ -45,16 +45,28 @@
109 DI_DIR="$DI_PATH/current/images"
110
111 cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir
112+cp -lf "$DI_DIR/generic/ubuntu.ins" $imagedir
113 cp -lf "$DI_DIR/generic/parmfile.ubuntu" $imagedir
114 cp -lf "$DI_DIR/generic/initrd.ubuntu" $imagedir
115 cp -lf "$DI_DIR/generic/kernel.ubuntu" $imagedir
116+cp -lf "$DI_DIR/generic/initrd.off" $imagedir
117+cp -lf "$DI_DIR/generic/initrd.siz" $imagedir
118+
119+hwedir="boot$N/boot-hwe"
120+if [ -d "$DI_DIR/hwe-generic" ]
121+then
122+ mkdir -p $hwedir
123+ cp -lf "$DI_DIR/hwe-generic/ubuntu.exec" $hwedir
124+ cp -lf "$DI_DIR/hwe-generic/ubuntu.ins" $hwedir
125+ cp -lf "$DI_DIR/hwe-generic/parmfile.ubuntu" $hwedir
126+ cp -lf "$DI_DIR/hwe-generic/initrd.ubuntu" $hwedir
127+ cp -lf "$DI_DIR/hwe-generic/kernel.ubuntu" $hwedir
128+ cp -lf "$DI_DIR/hwe-generic/initrd.off" $hwedir
129+ cp -lf "$DI_DIR/hwe-generic/initrd.siz" $hwedir
130+fi
131
132 $BASEDIR/tools/gen-s390-cd-kernel.pl --initrd=$imagedir/initrd.ubuntu --kernel=$imagedir/kernel.ubuntu --outfile=$imagedir/ubuntu.ikr
133
134-# Create the files specifying offset and size of the initrd
135-perl -e "print pack('N', 0x1000000)" >"$imagedir/initrd.off"
136-perl -e "print pack('N', -s '$imagedir/initrd.ubuntu')" >"$imagedir/initrd.siz"
137-
138 cp "$DI_DIR/MANIFEST.udebs" .
139 list_kernel_abis $images_S390 | check_kernel_sync
140
141@@ -62,10 +74,18 @@
142 # - ubuntu.ins : for booting from CD-ROM or FTP-Server
143 # - README
144 cp $BASEDIR/data/$CODENAME/$ARCH/* $imagedir
145+if [ -d $hwedir ]
146+then
147+ cp $BASEDIR/data/$CODENAME/$ARCH/* $hwedir
148+fi
149
150 # secondary top-level ubuntu.ins file was requested in
151 # https://bugs.launchpad.net/ubuntu-cdimage/+bug/1536981/comments/6
152 sed -e 's,^[^*],boot/&,g' < $imagedir/ubuntu.ins > $imagedir/../ubuntu.ins
153+if [ -d $hwedir ]
154+then
155+ sed -e 's,^[^*],boot-hwe/&,g' < $hwedir/ubuntu.ins > $hwedir/../ubuntu-hwe.ins
156+fi
157
158 # add_mkisofs_opt is buggy, it thinks "-b" was already "specified" in
159 # "-no-emul-boot"
160
161=== modified file 'tools/boot/zesty/boot-s390x'
162--- tools/boot/zesty/boot-s390x 2016-10-25 19:09:23 +0000
163+++ tools/boot/zesty/boot-s390x 2017-02-09 14:49:22 +0000
164@@ -45,16 +45,28 @@
165 DI_DIR="$DI_PATH/current/images"
166
167 cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir
168+cp -lf "$DI_DIR/generic/ubuntu.ins" $imagedir
169 cp -lf "$DI_DIR/generic/parmfile.ubuntu" $imagedir
170 cp -lf "$DI_DIR/generic/initrd.ubuntu" $imagedir
171 cp -lf "$DI_DIR/generic/kernel.ubuntu" $imagedir
172+cp -lf "$DI_DIR/generic/initrd.off" $imagedir
173+cp -lf "$DI_DIR/generic/initrd.siz" $imagedir
174+
175+hwedir="boot$N/boot-hwe"
176+if [ -d "$DI_DIR/hwe-generic" ]
177+then
178+ mkdir -p $hwedir
179+ cp -lf "$DI_DIR/hwe-generic/ubuntu.exec" $hwedir
180+ cp -lf "$DI_DIR/hwe-generic/ubuntu.ins" $hwedir
181+ cp -lf "$DI_DIR/hwe-generic/parmfile.ubuntu" $hwedir
182+ cp -lf "$DI_DIR/hwe-generic/initrd.ubuntu" $hwedir
183+ cp -lf "$DI_DIR/hwe-generic/kernel.ubuntu" $hwedir
184+ cp -lf "$DI_DIR/hwe-generic/initrd.off" $hwedir
185+ cp -lf "$DI_DIR/hwe-generic/initrd.siz" $hwedir
186+fi
187
188 $BASEDIR/tools/gen-s390-cd-kernel.pl --initrd=$imagedir/initrd.ubuntu --kernel=$imagedir/kernel.ubuntu --outfile=$imagedir/ubuntu.ikr
189
190-# Create the files specifying offset and size of the initrd
191-perl -e "print pack('N', 0x1000000)" >"$imagedir/initrd.off"
192-perl -e "print pack('N', -s '$imagedir/initrd.ubuntu')" >"$imagedir/initrd.siz"
193-
194 cp "$DI_DIR/MANIFEST.udebs" .
195 list_kernel_abis $images_S390 | check_kernel_sync
196
197@@ -62,10 +74,18 @@
198 # - ubuntu.ins : for booting from CD-ROM or FTP-Server
199 # - README
200 cp $BASEDIR/data/$CODENAME/$ARCH/* $imagedir
201+if [ -d $hwedir ]
202+then
203+ cp $BASEDIR/data/$CODENAME/$ARCH/* $hwedir
204+fi
205
206 # secondary top-level ubuntu.ins file was requested in
207 # https://bugs.launchpad.net/ubuntu-cdimage/+bug/1536981/comments/6
208 sed -e 's,^[^*],boot/&,g' < $imagedir/ubuntu.ins > $imagedir/../ubuntu.ins
209+if [ -d $hwedir ]
210+then
211+ sed -e 's,^[^*],boot-hwe/&,g' < $hwedir/ubuntu.ins > $hwedir/../ubuntu-hwe.ins
212+fi
213
214 # add_mkisofs_opt is buggy, it thinks "-b" was already "specified" in
215 # "-no-emul-boot"

Subscribers

People subscribed via source and target branches