debian-cd

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

  1. hwe-s390x
  2. Merge into ubun3
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 1961
Proposed branch: lp:~xnox/debian-cd/hwe-s390x
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
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 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
=== modified file 'data/xenial/s390x/README.boot'
--- data/xenial/s390x/README.boot 2016-01-18 18:13:39 +0000
+++ data/xenial/s390x/README.boot 2017-02-09 14:49:22 +0000
@@ -4,6 +4,10 @@
4It is possible to "boot" the installation system off this CD using4It is possible to "boot" the installation system off this CD using
5the files provided in the /boot directory.5the files provided in the /boot directory.
66
7It is also possible to use "/boot-hwe" directory to install using a
8rolling hardware enablement kernel, based on a kernel from a later
9Ubuntu release.
10
7Although you can boot the installer from this CD, the installation11Although you can boot the installer from this CD, the installation
8itself is *not* actually done from the CD. Once the initrd is loaded,12itself is *not* actually done from the CD. Once the initrd is loaded,
9the installer will ask you to configure your network connection and13the installer will ask you to configure your network connection and
1014
=== removed file 'data/xenial/s390x/ubuntu.ins'
--- data/xenial/s390x/ubuntu.ins 2016-01-18 18:06:53 +0000
+++ data/xenial/s390x/ubuntu.ins 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1* Ubuntu for z Series (boot from CD-ROM or FTP-Server)
2kernel.ubuntu 0x00000000
3initrd.off 0x0001040c
4initrd.siz 0x00010414
5parmfile.ubuntu 0x00010480
6initrd.ubuntu 0x01000000
70
=== removed file 'data/yakkety/s390x/ubuntu.ins'
--- data/yakkety/s390x/ubuntu.ins 2016-04-22 11:40:33 +0000
+++ data/yakkety/s390x/ubuntu.ins 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1* Ubuntu for z Series (boot from CD-ROM or FTP-Server)
2kernel.ubuntu 0x00000000
3initrd.off 0x0001040c
4initrd.siz 0x00010414
5parmfile.ubuntu 0x00010480
6initrd.ubuntu 0x01000000
70
=== removed file 'data/zesty/s390x/ubuntu.ins'
--- data/zesty/s390x/ubuntu.ins 2016-10-25 19:09:23 +0000
+++ data/zesty/s390x/ubuntu.ins 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
1* Ubuntu for z Series (boot from CD-ROM or FTP-Server)
2kernel.ubuntu 0x00000000
3initrd.off 0x0001040c
4initrd.siz 0x00010414
5parmfile.ubuntu 0x00010480
6initrd.ubuntu 0x01000000
70
=== modified file 'tools/boot/xenial/boot-s390x'
--- tools/boot/xenial/boot-s390x 2016-01-27 14:55:12 +0000
+++ tools/boot/xenial/boot-s390x 2017-02-09 14:49:22 +0000
@@ -45,16 +45,28 @@
45DI_DIR="$DI_PATH/current/images"45DI_DIR="$DI_PATH/current/images"
4646
47cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir47cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir
48cp -lf "$DI_DIR/generic/ubuntu.ins" $imagedir
48cp -lf "$DI_DIR/generic/parmfile.ubuntu" $imagedir49cp -lf "$DI_DIR/generic/parmfile.ubuntu" $imagedir
49cp -lf "$DI_DIR/generic/initrd.ubuntu" $imagedir50cp -lf "$DI_DIR/generic/initrd.ubuntu" $imagedir
50cp -lf "$DI_DIR/generic/kernel.ubuntu" $imagedir51cp -lf "$DI_DIR/generic/kernel.ubuntu" $imagedir
52cp -lf "$DI_DIR/generic/initrd.off" $imagedir
53cp -lf "$DI_DIR/generic/initrd.siz" $imagedir
54
55hwedir="boot$N/boot-hwe"
56if [ -d "$DI_DIR/hwe-generic" ]
57then
58 mkdir -p $hwedir
59 cp -lf "$DI_DIR/hwe-generic/ubuntu.exec" $hwedir
60 cp -lf "$DI_DIR/hwe-generic/ubuntu.ins" $hwedir
61 cp -lf "$DI_DIR/hwe-generic/parmfile.ubuntu" $hwedir
62 cp -lf "$DI_DIR/hwe-generic/initrd.ubuntu" $hwedir
63 cp -lf "$DI_DIR/hwe-generic/kernel.ubuntu" $hwedir
64 cp -lf "$DI_DIR/hwe-generic/initrd.off" $hwedir
65 cp -lf "$DI_DIR/hwe-generic/initrd.siz" $hwedir
66fi
5167
52$BASEDIR/tools/gen-s390-cd-kernel.pl --initrd=$imagedir/initrd.ubuntu --kernel=$imagedir/kernel.ubuntu --outfile=$imagedir/ubuntu.ikr68$BASEDIR/tools/gen-s390-cd-kernel.pl --initrd=$imagedir/initrd.ubuntu --kernel=$imagedir/kernel.ubuntu --outfile=$imagedir/ubuntu.ikr
5369
54# Create the files specifying offset and size of the initrd
55perl -e "print pack('N', 0x1000000)" >"$imagedir/initrd.off"
56perl -e "print pack('N', -s '$imagedir/initrd.ubuntu')" >"$imagedir/initrd.siz"
57
58cp "$DI_DIR/MANIFEST.udebs" .70cp "$DI_DIR/MANIFEST.udebs" .
59list_kernel_abis $images_S390 | check_kernel_sync71list_kernel_abis $images_S390 | check_kernel_sync
6072
@@ -62,10 +74,18 @@
62# - ubuntu.ins : for booting from CD-ROM or FTP-Server74# - ubuntu.ins : for booting from CD-ROM or FTP-Server
63# - README75# - README
64cp $BASEDIR/data/$CODENAME/$ARCH/* $imagedir76cp $BASEDIR/data/$CODENAME/$ARCH/* $imagedir
77if [ -d $hwedir ]
78then
79 cp $BASEDIR/data/$CODENAME/$ARCH/* $hwedir
80fi
6581
66# secondary top-level ubuntu.ins file was requested in82# secondary top-level ubuntu.ins file was requested in
67# https://bugs.launchpad.net/ubuntu-cdimage/+bug/1536981/comments/683# https://bugs.launchpad.net/ubuntu-cdimage/+bug/1536981/comments/6
68sed -e 's,^[^*],boot/&,g' < $imagedir/ubuntu.ins > $imagedir/../ubuntu.ins84sed -e 's,^[^*],boot/&,g' < $imagedir/ubuntu.ins > $imagedir/../ubuntu.ins
85if [ -d $hwedir ]
86then
87 sed -e 's,^[^*],boot-hwe/&,g' < $hwedir/ubuntu.ins > $hwedir/../ubuntu-hwe.ins
88fi
6989
70# add_mkisofs_opt is buggy, it thinks "-b" was already "specified" in90# add_mkisofs_opt is buggy, it thinks "-b" was already "specified" in
71# "-no-emul-boot"91# "-no-emul-boot"
7292
=== modified file 'tools/boot/yakkety/boot-s390x'
--- tools/boot/yakkety/boot-s390x 2016-04-22 11:40:33 +0000
+++ tools/boot/yakkety/boot-s390x 2017-02-09 14:49:22 +0000
@@ -45,16 +45,28 @@
45DI_DIR="$DI_PATH/current/images"45DI_DIR="$DI_PATH/current/images"
4646
47cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir47cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir
48cp -lf "$DI_DIR/generic/ubuntu.ins" $imagedir
48cp -lf "$DI_DIR/generic/parmfile.ubuntu" $imagedir49cp -lf "$DI_DIR/generic/parmfile.ubuntu" $imagedir
49cp -lf "$DI_DIR/generic/initrd.ubuntu" $imagedir50cp -lf "$DI_DIR/generic/initrd.ubuntu" $imagedir
50cp -lf "$DI_DIR/generic/kernel.ubuntu" $imagedir51cp -lf "$DI_DIR/generic/kernel.ubuntu" $imagedir
52cp -lf "$DI_DIR/generic/initrd.off" $imagedir
53cp -lf "$DI_DIR/generic/initrd.siz" $imagedir
54
55hwedir="boot$N/boot-hwe"
56if [ -d "$DI_DIR/hwe-generic" ]
57then
58 mkdir -p $hwedir
59 cp -lf "$DI_DIR/hwe-generic/ubuntu.exec" $hwedir
60 cp -lf "$DI_DIR/hwe-generic/ubuntu.ins" $hwedir
61 cp -lf "$DI_DIR/hwe-generic/parmfile.ubuntu" $hwedir
62 cp -lf "$DI_DIR/hwe-generic/initrd.ubuntu" $hwedir
63 cp -lf "$DI_DIR/hwe-generic/kernel.ubuntu" $hwedir
64 cp -lf "$DI_DIR/hwe-generic/initrd.off" $hwedir
65 cp -lf "$DI_DIR/hwe-generic/initrd.siz" $hwedir
66fi
5167
52$BASEDIR/tools/gen-s390-cd-kernel.pl --initrd=$imagedir/initrd.ubuntu --kernel=$imagedir/kernel.ubuntu --outfile=$imagedir/ubuntu.ikr68$BASEDIR/tools/gen-s390-cd-kernel.pl --initrd=$imagedir/initrd.ubuntu --kernel=$imagedir/kernel.ubuntu --outfile=$imagedir/ubuntu.ikr
5369
54# Create the files specifying offset and size of the initrd
55perl -e "print pack('N', 0x1000000)" >"$imagedir/initrd.off"
56perl -e "print pack('N', -s '$imagedir/initrd.ubuntu')" >"$imagedir/initrd.siz"
57
58cp "$DI_DIR/MANIFEST.udebs" .70cp "$DI_DIR/MANIFEST.udebs" .
59list_kernel_abis $images_S390 | check_kernel_sync71list_kernel_abis $images_S390 | check_kernel_sync
6072
@@ -62,10 +74,18 @@
62# - ubuntu.ins : for booting from CD-ROM or FTP-Server74# - ubuntu.ins : for booting from CD-ROM or FTP-Server
63# - README75# - README
64cp $BASEDIR/data/$CODENAME/$ARCH/* $imagedir76cp $BASEDIR/data/$CODENAME/$ARCH/* $imagedir
77if [ -d $hwedir ]
78then
79 cp $BASEDIR/data/$CODENAME/$ARCH/* $hwedir
80fi
6581
66# secondary top-level ubuntu.ins file was requested in82# secondary top-level ubuntu.ins file was requested in
67# https://bugs.launchpad.net/ubuntu-cdimage/+bug/1536981/comments/683# https://bugs.launchpad.net/ubuntu-cdimage/+bug/1536981/comments/6
68sed -e 's,^[^*],boot/&,g' < $imagedir/ubuntu.ins > $imagedir/../ubuntu.ins84sed -e 's,^[^*],boot/&,g' < $imagedir/ubuntu.ins > $imagedir/../ubuntu.ins
85if [ -d $hwedir ]
86then
87 sed -e 's,^[^*],boot-hwe/&,g' < $hwedir/ubuntu.ins > $hwedir/../ubuntu-hwe.ins
88fi
6989
70# add_mkisofs_opt is buggy, it thinks "-b" was already "specified" in90# add_mkisofs_opt is buggy, it thinks "-b" was already "specified" in
71# "-no-emul-boot"91# "-no-emul-boot"
7292
=== modified file 'tools/boot/zesty/boot-s390x'
--- tools/boot/zesty/boot-s390x 2016-10-25 19:09:23 +0000
+++ tools/boot/zesty/boot-s390x 2017-02-09 14:49:22 +0000
@@ -45,16 +45,28 @@
45DI_DIR="$DI_PATH/current/images"45DI_DIR="$DI_PATH/current/images"
4646
47cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir47cp -lf "$DI_DIR/generic/ubuntu.exec" $imagedir
48cp -lf "$DI_DIR/generic/ubuntu.ins" $imagedir
48cp -lf "$DI_DIR/generic/parmfile.ubuntu" $imagedir49cp -lf "$DI_DIR/generic/parmfile.ubuntu" $imagedir
49cp -lf "$DI_DIR/generic/initrd.ubuntu" $imagedir50cp -lf "$DI_DIR/generic/initrd.ubuntu" $imagedir
50cp -lf "$DI_DIR/generic/kernel.ubuntu" $imagedir51cp -lf "$DI_DIR/generic/kernel.ubuntu" $imagedir
52cp -lf "$DI_DIR/generic/initrd.off" $imagedir
53cp -lf "$DI_DIR/generic/initrd.siz" $imagedir
54
55hwedir="boot$N/boot-hwe"
56if [ -d "$DI_DIR/hwe-generic" ]
57then
58 mkdir -p $hwedir
59 cp -lf "$DI_DIR/hwe-generic/ubuntu.exec" $hwedir
60 cp -lf "$DI_DIR/hwe-generic/ubuntu.ins" $hwedir
61 cp -lf "$DI_DIR/hwe-generic/parmfile.ubuntu" $hwedir
62 cp -lf "$DI_DIR/hwe-generic/initrd.ubuntu" $hwedir
63 cp -lf "$DI_DIR/hwe-generic/kernel.ubuntu" $hwedir
64 cp -lf "$DI_DIR/hwe-generic/initrd.off" $hwedir
65 cp -lf "$DI_DIR/hwe-generic/initrd.siz" $hwedir
66fi
5167
52$BASEDIR/tools/gen-s390-cd-kernel.pl --initrd=$imagedir/initrd.ubuntu --kernel=$imagedir/kernel.ubuntu --outfile=$imagedir/ubuntu.ikr68$BASEDIR/tools/gen-s390-cd-kernel.pl --initrd=$imagedir/initrd.ubuntu --kernel=$imagedir/kernel.ubuntu --outfile=$imagedir/ubuntu.ikr
5369
54# Create the files specifying offset and size of the initrd
55perl -e "print pack('N', 0x1000000)" >"$imagedir/initrd.off"
56perl -e "print pack('N', -s '$imagedir/initrd.ubuntu')" >"$imagedir/initrd.siz"
57
58cp "$DI_DIR/MANIFEST.udebs" .70cp "$DI_DIR/MANIFEST.udebs" .
59list_kernel_abis $images_S390 | check_kernel_sync71list_kernel_abis $images_S390 | check_kernel_sync
6072
@@ -62,10 +74,18 @@
62# - ubuntu.ins : for booting from CD-ROM or FTP-Server74# - ubuntu.ins : for booting from CD-ROM or FTP-Server
63# - README75# - README
64cp $BASEDIR/data/$CODENAME/$ARCH/* $imagedir76cp $BASEDIR/data/$CODENAME/$ARCH/* $imagedir
77if [ -d $hwedir ]
78then
79 cp $BASEDIR/data/$CODENAME/$ARCH/* $hwedir
80fi
6581
66# secondary top-level ubuntu.ins file was requested in82# secondary top-level ubuntu.ins file was requested in
67# https://bugs.launchpad.net/ubuntu-cdimage/+bug/1536981/comments/683# https://bugs.launchpad.net/ubuntu-cdimage/+bug/1536981/comments/6
68sed -e 's,^[^*],boot/&,g' < $imagedir/ubuntu.ins > $imagedir/../ubuntu.ins84sed -e 's,^[^*],boot/&,g' < $imagedir/ubuntu.ins > $imagedir/../ubuntu.ins
85if [ -d $hwedir ]
86then
87 sed -e 's,^[^*],boot-hwe/&,g' < $hwedir/ubuntu.ins > $hwedir/../ubuntu-hwe.ins
88fi
6989
70# add_mkisofs_opt is buggy, it thinks "-b" was already "specified" in90# add_mkisofs_opt is buggy, it thinks "-b" was already "specified" in
71# "-no-emul-boot"91# "-no-emul-boot"

Subscribers

People subscribed via source and target branches