Re: [PATCH] Drop the remaining s390 bits from stretch and jessie.
Hey Phil,
Thanks for your patches. They don't quite apply to current head, but I
can fix that up OK. Two questions:
* Would you like commit rights directly for debian-cd? You know muich
more about s390 stuff than me!
* Would these changes want backporting for Jessie too for the next
point release?
On Thu, Nov 12, 2015 at 12:43:38AM +0100, Philipp Kern wrote:
>Signed-off-by: Philipp Kern <pkern@debian.org>
>---
> data/jessie/s390/README.boot | 24 --------
> data/jessie/s390/d390.ins | 6 --
> data/jessie/s390/d390.tdf | 7 ---
> data/jessie/s390/d390oco.ins | 7 ---
> data/jessie/s390/d390oco.tdf | 8 ---
> data/jessie/s390_businesscard_udeb_include | 3 -
> data/jessie/s390_netinst_udeb_include | 2 -
> data/jessie/s390_udeb_include | 2 -
> data/stretch/s390/README.boot | 24 --------
> data/stretch/s390/d390.ins | 6 --
> data/stretch/s390/d390.tdf | 7 ---
> data/stretch/s390/d390oco.ins | 7 ---
> data/stretch/s390/d390oco.tdf | 8 ---
> data/stretch/s390_businesscard_udeb_include | 3 -
> data/stretch/s390_netinst_udeb_include | 2 -
> data/stretch/s390_udeb_include | 2 -
> debian/changelog | 3 +
> tools/boot/jessie/boot-s390 | 2 -
> tools/boot/jessie/boot-s390-common | 95 -----------------------------
> tools/boot/jessie/boot-s390x | 95 ++++++++++++++++++++++++++++-
> tools/boot/stretch/boot-s390 | 2 -
> tools/boot/stretch/boot-s390-common | 95 -----------------------------
> tools/boot/stretch/boot-s390x | 95 ++++++++++++++++++++++++++++-
> 23 files changed, 191 insertions(+), 314 deletions(-)
> delete mode 100644 data/jessie/s390/README.boot
> delete mode 100644 data/jessie/s390/d390.ins
> delete mode 100644 data/jessie/s390/d390.tdf
> delete mode 100644 data/jessie/s390/d390oco.ins
> delete mode 100644 data/jessie/s390/d390oco.tdf
> delete mode 100644 data/jessie/s390_businesscard_udeb_include
> delete mode 100644 data/jessie/s390_netinst_udeb_include
> delete mode 100644 data/jessie/s390_udeb_include
> delete mode 100644 data/stretch/s390/README.boot
> delete mode 100644 data/stretch/s390/d390.ins
> delete mode 100644 data/stretch/s390/d390.tdf
> delete mode 100644 data/stretch/s390/d390oco.ins
> delete mode 100644 data/stretch/s390/d390oco.tdf
> delete mode 100644 data/stretch/s390_businesscard_udeb_include
> delete mode 100644 data/stretch/s390_netinst_udeb_include
> delete mode 100644 data/stretch/s390_udeb_include
> delete mode 100755 tools/boot/jessie/boot-s390
> delete mode 100644 tools/boot/jessie/boot-s390-common
> mode change 100755 => 100644 tools/boot/jessie/boot-s390x
> delete mode 100755 tools/boot/stretch/boot-s390
> delete mode 100644 tools/boot/stretch/boot-s390-common
> mode change 100755 => 100644 tools/boot/stretch/boot-s390x
>
>diff --git a/data/jessie/s390/README.boot b/data/jessie/s390/README.boot
>deleted file mode 100644
>index 5b6ae15..0000000
>--- a/data/jessie/s390/README.boot
>+++ /dev/null
>@@ -1,24 +0,0 @@
>-About the S/390 installation CD
>-===============================
>-
>-It is possible to "boot" the installation system off this CD using
>-the files provided in the /boot directory.
>-
>-Note that the /boot/d390oco.* files are only provided as an example
>-as Debian cannot ship the object-code-only-modules-ramdisk (oco.bin).
>-
>-Although you can boot the installer from this CD, the installation
>-itself is *not* actually done from the CD. Once the initrd is loaded,
>-the installer will ask you to configure your network connection and
>-uses the network-console component to allow you to continue the
>-installation over SSH. The rest of the installation is done over the
>-network: all installer components and Debian packages are retrieved
>-from a mirror.
>-
>-
>-Tip for users of the Hercules emulator
>---------------------------------------
>-If you want to ipl the installer off this CD, mount it on the host
>-system (e.g. on /media/cdrom) and enter the following in the Hercules
>-management console:
>- ipl /media/cdrom/boot/d390.ins
>diff --git a/data/jessie/s390/d390.ins b/data/jessie/s390/d390.ins
>deleted file mode 100644
>index 78c5f11..0000000
>--- a/data/jessie/s390/d390.ins
>+++ /dev/null
>@@ -1,6 +0,0 @@
>-* Debian GNU/Linux for S/390 (boot from CD-ROM or FTP-Server)
>-linux_vm 0x00000000
>-root.off 0x0001040c
>-root.siz 0x00010414
>-parmfile 0x00010480
>-root.bin 0x00800000
>diff --git a/data/jessie/s390/d390.tdf b/data/jessie/s390/d390.tdf
>deleted file mode 100644
>index ed993be..0000000
>--- a/data/jessie/s390/d390.tdf
>+++ /dev/null
>@@ -1,7 +0,0 @@
>-@TDF
>-H:\BOOT\LINUX_TP UNDEFINED RECSIZE 1024
>-H:\BOOT\PARMFILE UNDEFINED RECSIZE 1024
>-H:\BOOT\ROOT.BIN UNDEFINED RECSIZE 1024
>-TM
>-TM
>-EOT
>diff --git a/data/jessie/s390/d390oco.ins b/data/jessie/s390/d390oco.ins
>deleted file mode 100644
>index b3f11dd..0000000
>--- a/data/jessie/s390/d390oco.ins
>+++ /dev/null
>@@ -1,7 +0,0 @@
>-* Debian GNU/Linux for S/390 (boot from CD-ROM or FTP-Server with OCO-Modules)
>-linux_vm 0x00000000
>-root.off 0x0001040c
>-root.siz 0x00010414
>-parmfile 0x00010480
>-root.bin 0x00800000
>-oco.bin 0x00c00000
>diff --git a/data/jessie/s390/d390oco.tdf b/data/jessie/s390/d390oco.tdf
>deleted file mode 100644
>index 5fdade2..0000000
>--- a/data/jessie/s390/d390oco.tdf
>+++ /dev/null
>@@ -1,8 +0,0 @@
>-@TDF
>-H:\BOOT\LINUX_TP UNDEFINED RECSIZE 1024
>-H:\BOOT\PARMFILE UNDEFINED RECSIZE 1024
>-H:\BOOT\ROOT.BIN UNDEFINED RECSIZE 1024
>-H:\BOOT\OCO.BIN UNDEFINED RECSIZE 1024
>-TM
>-TM
>-EOT
>diff --git a/data/jessie/s390_businesscard_udeb_include b/data/jessie/s390_businesscard_udeb_include
>deleted file mode 100644
>index 6326d6c..0000000
>--- a/data/jessie/s390_businesscard_udeb_include
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-choose-mirror
>-netcfg
>-ethdetect
>diff --git a/data/jessie/s390_netinst_udeb_include b/data/jessie/s390_netinst_udeb_include
>deleted file mode 100644
>index 6f1c801..0000000
>--- a/data/jessie/s390_netinst_udeb_include
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-netcfg
>-ethdetect
>diff --git a/data/jessie/s390_udeb_include b/data/jessie/s390_udeb_include
>deleted file mode 100644
>index 6f1c801..0000000
>--- a/data/jessie/s390_udeb_include
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-netcfg
>-ethdetect
>diff --git a/data/stretch/s390/README.boot b/data/stretch/s390/README.boot
>deleted file mode 100644
>index 5b6ae15..0000000
>--- a/data/stretch/s390/README.boot
>+++ /dev/null
>@@ -1,24 +0,0 @@
>-About the S/390 installation CD
>-===============================
>-
>-It is possible to "boot" the installation system off this CD using
>-the files provided in the /boot directory.
>-
>-Note that the /boot/d390oco.* files are only provided as an example
>-as Debian cannot ship the object-code-only-modules-ramdisk (oco.bin).
>-
>-Although you can boot the installer from this CD, the installation
>-itself is *not* actually done from the CD. Once the initrd is loaded,
>-the installer will ask you to configure your network connection and
>-uses the network-console component to allow you to continue the
>-installation over SSH. The rest of the installation is done over the
>-network: all installer components and Debian packages are retrieved
>-from a mirror.
>-
>-
>-Tip for users of the Hercules emulator
>---------------------------------------
>-If you want to ipl the installer off this CD, mount it on the host
>-system (e.g. on /media/cdrom) and enter the following in the Hercules
>-management console:
>- ipl /media/cdrom/boot/d390.ins
>diff --git a/data/stretch/s390/d390.ins b/data/stretch/s390/d390.ins
>deleted file mode 100644
>index 78c5f11..0000000
>--- a/data/stretch/s390/d390.ins
>+++ /dev/null
>@@ -1,6 +0,0 @@
>-* Debian GNU/Linux for S/390 (boot from CD-ROM or FTP-Server)
>-linux_vm 0x00000000
>-root.off 0x0001040c
>-root.siz 0x00010414
>-parmfile 0x00010480
>-root.bin 0x00800000
>diff --git a/data/stretch/s390/d390.tdf b/data/stretch/s390/d390.tdf
>deleted file mode 100644
>index ed993be..0000000
>--- a/data/stretch/s390/d390.tdf
>+++ /dev/null
>@@ -1,7 +0,0 @@
>-@TDF
>-H:\BOOT\LINUX_TP UNDEFINED RECSIZE 1024
>-H:\BOOT\PARMFILE UNDEFINED RECSIZE 1024
>-H:\BOOT\ROOT.BIN UNDEFINED RECSIZE 1024
>-TM
>-TM
>-EOT
>diff --git a/data/stretch/s390/d390oco.ins b/data/stretch/s390/d390oco.ins
>deleted file mode 100644
>index b3f11dd..0000000
>--- a/data/stretch/s390/d390oco.ins
>+++ /dev/null
>@@ -1,7 +0,0 @@
>-* Debian GNU/Linux for S/390 (boot from CD-ROM or FTP-Server with OCO-Modules)
>-linux_vm 0x00000000
>-root.off 0x0001040c
>-root.siz 0x00010414
>-parmfile 0x00010480
>-root.bin 0x00800000
>-oco.bin 0x00c00000
>diff --git a/data/stretch/s390/d390oco.tdf b/data/stretch/s390/d390oco.tdf
>deleted file mode 100644
>index 5fdade2..0000000
>--- a/data/stretch/s390/d390oco.tdf
>+++ /dev/null
>@@ -1,8 +0,0 @@
>-@TDF
>-H:\BOOT\LINUX_TP UNDEFINED RECSIZE 1024
>-H:\BOOT\PARMFILE UNDEFINED RECSIZE 1024
>-H:\BOOT\ROOT.BIN UNDEFINED RECSIZE 1024
>-H:\BOOT\OCO.BIN UNDEFINED RECSIZE 1024
>-TM
>-TM
>-EOT
>diff --git a/data/stretch/s390_businesscard_udeb_include b/data/stretch/s390_businesscard_udeb_include
>deleted file mode 100644
>index 6326d6c..0000000
>--- a/data/stretch/s390_businesscard_udeb_include
>+++ /dev/null
>@@ -1,3 +0,0 @@
>-choose-mirror
>-netcfg
>-ethdetect
>diff --git a/data/stretch/s390_netinst_udeb_include b/data/stretch/s390_netinst_udeb_include
>deleted file mode 100644
>index 6f1c801..0000000
>--- a/data/stretch/s390_netinst_udeb_include
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-netcfg
>-ethdetect
>diff --git a/data/stretch/s390_udeb_include b/data/stretch/s390_udeb_include
>deleted file mode 100644
>index 6f1c801..0000000
>--- a/data/stretch/s390_udeb_include
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-netcfg
>-ethdetect
>diff --git a/debian/changelog b/debian/changelog
>index 9d9cdce..3759a52 100644
>--- a/debian/changelog
>+++ b/debian/changelog
>@@ -34,6 +34,9 @@ debian-cd (3.1.18) UNRELEASED; urgency=medium
> * Make amd64 the default arch in the easy-build.sh script.
> * Make stretch the default suite in the easy-build.sh script.
>
>+ [ Philipp Kern ]
>+ * Drop the remaining s390 bits from stretch and jessie. (s390x remains.)
>+
> -- Steve McIntyre <93sam@debian.org> Mon, 20 Apr 2015 12:36:57 +0100
>
> debian-cd (3.1.17) unstable; urgency=medium
>diff --git a/tools/boot/jessie/boot-s390 b/tools/boot/jessie/boot-s390
>deleted file mode 100755
>index e43a9d9..0000000
>--- a/tools/boot/jessie/boot-s390
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-#!/bin/bash
>-. $BASEDIR/tools/boot/$DI_CODENAME/boot-s390-common
>diff --git a/tools/boot/jessie/boot-s390-common b/tools/boot/jessie/boot-s390-common
>deleted file mode 100644
>index 92dc73b..0000000
>--- a/tools/boot/jessie/boot-s390-common
>+++ /dev/null
>@@ -1,95 +0,0 @@
>-#!/bin/bash
>-#
>-# boot-s390-common
>-#
>-# Common code for s390 and s390x
>-#
>-# (C) 2001 Jochen R?hrig <jr@debian.org>
>-# 2005 Frans Pop <fjp@debian.org>
>-#
>-# Released under the GNU general Public License.
>-# See the copyright file for license details.
>-# Released as part of the debian_cd package, not much use stand alone.
>-#
>-# Install stuff for booting an s390 system from VM-reader,
>-# FTP-server, CD-ROM or emulated tape.
>-#
>-# $1 is the CD number
>-# $2 is the temporary CD build dir
>-
>-. $BASEDIR/tools/boot/$CODENAME/common.sh
>-
>-set -e
>-
>-N=$1
>-CDDIR=$2
>-
>-cd $CDDIR/..
>-
>-if [ $N != "1" ] && [ $N != "1_NONUS" ] ; then
>- add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
>- exit 0
>-fi
>-
>-if [ "$DI_WWW_HOME" = "default" ];then
>- # Tempting as it might be to merge these two definitions using $ARCH,
>- # do *not* do that - these defs are parsed out by other scripts that
>- # won't cope with that
>- if [ "$ARCH" = s390x ]; then
>- DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily";
>- fi
>- try_di_image_cache
>-fi
>-
>-imagedir="boot$N/boot"
>-mkdir -p $imagedir
>-
>-# Install the two kernel images, the ramdisk and the parameter file
>-# The following files need to be included:
>-# - generic/parmfile.debian : parameter file
>-# - generic/initrd.debian : initrd; to be used for both VM-reader and tape
>-# - generic/kernel.debian : kernel for WM-reader
>-# - tape/kernel.debian : kernel for tape
>-# - tape/kernel.debian-nolabel : kernel for tape (nolabel)
>-
>-images_S390="generic/parmfile.debian generic/initrd.debian generic/kernel.debian"
>-
>-for image in $images_S390; do
>- case $image in
>- generic/parmfile.debian)
>- imagedest=parmfile ;;
>- generic/initrd.debian)
>- imagedest=root.bin ;;
>- generic/kernel.debian)
>- imagedest=linux_vm ;;
>- esac
>- imagedest="$imagedir/$imagedest"
>-
>- if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
>- cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$imagedest"
>- elif [ ! "$DI_WWW_HOME" ];then
>- if [ ! "$DI_DIR" ];then
>- DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
>- fi
>- cp "$DI_DIR/$image" "$imagedest"
>- else
>- wget "$DI_WWW_HOME/$image" -O "$imagedest"
>- fi
>-done
>-
>-# Copy the different boot files
>-# - d390.ins : for booting from CD-ROM or FTP-Server
>-# - d390oco.ins : same, using object-code-only-modules-ramdisk (example)
>-cp $BASEDIR/data/$CODENAME/$ARCH/d390* "$imagedir/"
>-sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/$ARCH/d390.ins > "boot$N/d390.ins"
>-
>-# Create the files specifying offset and size of the initrd
>-perl -e "print pack('N', 0x800000)" >"$imagedir/root.off"
>-perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
>-
>-# Copy the README file
>-cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/"
>-
>-# Include the boot$N/-tree into the iso-image
>-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
>-add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
>diff --git a/tools/boot/jessie/boot-s390x b/tools/boot/jessie/boot-s390x
>old mode 100755
>new mode 100644
>index e43a9d9..92dc73b
>--- a/tools/boot/jessie/boot-s390x
>+++ b/tools/boot/jessie/boot-s390x
>@@ -1,2 +1,95 @@
> #!/bin/bash
>-. $BASEDIR/tools/boot/$DI_CODENAME/boot-s390-common
>+#
>+# boot-s390-common
>+#
>+# Common code for s390 and s390x
>+#
>+# (C) 2001 Jochen R?hrig <jr@debian.org>
>+# 2005 Frans Pop <fjp@debian.org>
>+#
>+# Released under the GNU general Public License.
>+# See the copyright file for license details.
>+# Released as part of the debian_cd package, not much use stand alone.
>+#
>+# Install stuff for booting an s390 system from VM-reader,
>+# FTP-server, CD-ROM or emulated tape.
>+#
>+# $1 is the CD number
>+# $2 is the temporary CD build dir
>+
>+. $BASEDIR/tools/boot/$CODENAME/common.sh
>+
>+set -e
>+
>+N=$1
>+CDDIR=$2
>+
>+cd $CDDIR/..
>+
>+if [ $N != "1" ] && [ $N != "1_NONUS" ] ; then
>+ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
>+ exit 0
>+fi
>+
>+if [ "$DI_WWW_HOME" = "default" ];then
>+ # Tempting as it might be to merge these two definitions using $ARCH,
>+ # do *not* do that - these defs are parsed out by other scripts that
>+ # won't cope with that
>+ if [ "$ARCH" = s390x ]; then
>+ DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily";
>+ fi
>+ try_di_image_cache
>+fi
>+
>+imagedir="boot$N/boot"
>+mkdir -p $imagedir
>+
>+# Install the two kernel images, the ramdisk and the parameter file
>+# The following files need to be included:
>+# - generic/parmfile.debian : parameter file
>+# - generic/initrd.debian : initrd; to be used for both VM-reader and tape
>+# - generic/kernel.debian : kernel for WM-reader
>+# - tape/kernel.debian : kernel for tape
>+# - tape/kernel.debian-nolabel : kernel for tape (nolabel)
>+
>+images_S390="generic/parmfile.debian generic/initrd.debian generic/kernel.debian"
>+
>+for image in $images_S390; do
>+ case $image in
>+ generic/parmfile.debian)
>+ imagedest=parmfile ;;
>+ generic/initrd.debian)
>+ imagedest=root.bin ;;
>+ generic/kernel.debian)
>+ imagedest=linux_vm ;;
>+ esac
>+ imagedest="$imagedir/$imagedest"
>+
>+ if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
>+ cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$imagedest"
>+ elif [ ! "$DI_WWW_HOME" ];then
>+ if [ ! "$DI_DIR" ];then
>+ DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
>+ fi
>+ cp "$DI_DIR/$image" "$imagedest"
>+ else
>+ wget "$DI_WWW_HOME/$image" -O "$imagedest"
>+ fi
>+done
>+
>+# Copy the different boot files
>+# - d390.ins : for booting from CD-ROM or FTP-Server
>+# - d390oco.ins : same, using object-code-only-modules-ramdisk (example)
>+cp $BASEDIR/data/$CODENAME/$ARCH/d390* "$imagedir/"
>+sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/$ARCH/d390.ins > "boot$N/d390.ins"
>+
>+# Create the files specifying offset and size of the initrd
>+perl -e "print pack('N', 0x800000)" >"$imagedir/root.off"
>+perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
>+
>+# Copy the README file
>+cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/"
>+
>+# Include the boot$N/-tree into the iso-image
>+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
>+add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
>diff --git a/tools/boot/stretch/boot-s390 b/tools/boot/stretch/boot-s390
>deleted file mode 100755
>index e43a9d9..0000000
>--- a/tools/boot/stretch/boot-s390
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-#!/bin/bash
>-. $BASEDIR/tools/boot/$DI_CODENAME/boot-s390-common
>diff --git a/tools/boot/stretch/boot-s390-common b/tools/boot/stretch/boot-s390-common
>deleted file mode 100644
>index 92dc73b..0000000
>--- a/tools/boot/stretch/boot-s390-common
>+++ /dev/null
>@@ -1,95 +0,0 @@
>-#!/bin/bash
>-#
>-# boot-s390-common
>-#
>-# Common code for s390 and s390x
>-#
>-# (C) 2001 Jochen R?hrig <jr@debian.org>
>-# 2005 Frans Pop <fjp@debian.org>
>-#
>-# Released under the GNU general Public License.
>-# See the copyright file for license details.
>-# Released as part of the debian_cd package, not much use stand alone.
>-#
>-# Install stuff for booting an s390 system from VM-reader,
>-# FTP-server, CD-ROM or emulated tape.
>-#
>-# $1 is the CD number
>-# $2 is the temporary CD build dir
>-
>-. $BASEDIR/tools/boot/$CODENAME/common.sh
>-
>-set -e
>-
>-N=$1
>-CDDIR=$2
>-
>-cd $CDDIR/..
>-
>-if [ $N != "1" ] && [ $N != "1_NONUS" ] ; then
>- add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
>- exit 0
>-fi
>-
>-if [ "$DI_WWW_HOME" = "default" ];then
>- # Tempting as it might be to merge these two definitions using $ARCH,
>- # do *not* do that - these defs are parsed out by other scripts that
>- # won't cope with that
>- if [ "$ARCH" = s390x ]; then
>- DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily";
>- fi
>- try_di_image_cache
>-fi
>-
>-imagedir="boot$N/boot"
>-mkdir -p $imagedir
>-
>-# Install the two kernel images, the ramdisk and the parameter file
>-# The following files need to be included:
>-# - generic/parmfile.debian : parameter file
>-# - generic/initrd.debian : initrd; to be used for both VM-reader and tape
>-# - generic/kernel.debian : kernel for WM-reader
>-# - tape/kernel.debian : kernel for tape
>-# - tape/kernel.debian-nolabel : kernel for tape (nolabel)
>-
>-images_S390="generic/parmfile.debian generic/initrd.debian generic/kernel.debian"
>-
>-for image in $images_S390; do
>- case $image in
>- generic/parmfile.debian)
>- imagedest=parmfile ;;
>- generic/initrd.debian)
>- imagedest=root.bin ;;
>- generic/kernel.debian)
>- imagedest=linux_vm ;;
>- esac
>- imagedest="$imagedir/$imagedest"
>-
>- if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
>- cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$imagedest"
>- elif [ ! "$DI_WWW_HOME" ];then
>- if [ ! "$DI_DIR" ];then
>- DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
>- fi
>- cp "$DI_DIR/$image" "$imagedest"
>- else
>- wget "$DI_WWW_HOME/$image" -O "$imagedest"
>- fi
>-done
>-
>-# Copy the different boot files
>-# - d390.ins : for booting from CD-ROM or FTP-Server
>-# - d390oco.ins : same, using object-code-only-modules-ramdisk (example)
>-cp $BASEDIR/data/$CODENAME/$ARCH/d390* "$imagedir/"
>-sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/$ARCH/d390.ins > "boot$N/d390.ins"
>-
>-# Create the files specifying offset and size of the initrd
>-perl -e "print pack('N', 0x800000)" >"$imagedir/root.off"
>-perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
>-
>-# Copy the README file
>-cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/"
>-
>-# Include the boot$N/-tree into the iso-image
>-add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
>-add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
>diff --git a/tools/boot/stretch/boot-s390x b/tools/boot/stretch/boot-s390x
>old mode 100755
>new mode 100644
>index e43a9d9..92dc73b
>--- a/tools/boot/stretch/boot-s390x
>+++ b/tools/boot/stretch/boot-s390x
>@@ -1,2 +1,95 @@
> #!/bin/bash
>-. $BASEDIR/tools/boot/$DI_CODENAME/boot-s390-common
>+#
>+# boot-s390-common
>+#
>+# Common code for s390 and s390x
>+#
>+# (C) 2001 Jochen R?hrig <jr@debian.org>
>+# 2005 Frans Pop <fjp@debian.org>
>+#
>+# Released under the GNU general Public License.
>+# See the copyright file for license details.
>+# Released as part of the debian_cd package, not much use stand alone.
>+#
>+# Install stuff for booting an s390 system from VM-reader,
>+# FTP-server, CD-ROM or emulated tape.
>+#
>+# $1 is the CD number
>+# $2 is the temporary CD build dir
>+
>+. $BASEDIR/tools/boot/$CODENAME/common.sh
>+
>+set -e
>+
>+N=$1
>+CDDIR=$2
>+
>+cd $CDDIR/..
>+
>+if [ $N != "1" ] && [ $N != "1_NONUS" ] ; then
>+ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
>+ exit 0
>+fi
>+
>+if [ "$DI_WWW_HOME" = "default" ];then
>+ # Tempting as it might be to merge these two definitions using $ARCH,
>+ # do *not* do that - these defs are parsed out by other scripts that
>+ # won't cope with that
>+ if [ "$ARCH" = s390x ]; then
>+ DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily";
>+ fi
>+ try_di_image_cache
>+fi
>+
>+imagedir="boot$N/boot"
>+mkdir -p $imagedir
>+
>+# Install the two kernel images, the ramdisk and the parameter file
>+# The following files need to be included:
>+# - generic/parmfile.debian : parameter file
>+# - generic/initrd.debian : initrd; to be used for both VM-reader and tape
>+# - generic/kernel.debian : kernel for WM-reader
>+# - tape/kernel.debian : kernel for tape
>+# - tape/kernel.debian-nolabel : kernel for tape (nolabel)
>+
>+images_S390="generic/parmfile.debian generic/initrd.debian generic/kernel.debian"
>+
>+for image in $images_S390; do
>+ case $image in
>+ generic/parmfile.debian)
>+ imagedest=parmfile ;;
>+ generic/initrd.debian)
>+ imagedest=root.bin ;;
>+ generic/kernel.debian)
>+ imagedest=linux_vm ;;
>+ esac
>+ imagedest="$imagedir/$imagedest"
>+
>+ if [ -n "$LOCAL" -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
>+ cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$imagedest"
>+ elif [ ! "$DI_WWW_HOME" ];then
>+ if [ ! "$DI_DIR" ];then
>+ DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
>+ fi
>+ cp "$DI_DIR/$image" "$imagedest"
>+ else
>+ wget "$DI_WWW_HOME/$image" -O "$imagedest"
>+ fi
>+done
>+
>+# Copy the different boot files
>+# - d390.ins : for booting from CD-ROM or FTP-Server
>+# - d390oco.ins : same, using object-code-only-modules-ramdisk (example)
>+cp $BASEDIR/data/$CODENAME/$ARCH/d390* "$imagedir/"
>+sed -e 's,^[^*],boot/&,g' < $BASEDIR/data/$CODENAME/$ARCH/d390.ins > "boot$N/d390.ins"
>+
>+# Create the files specifying offset and size of the initrd
>+perl -e "print pack('N', 0x800000)" >"$imagedir/root.off"
>+perl -e "print pack('N', -s '$imagedir/root.bin')" >"$imagedir/root.siz"
>+
>+# Copy the README file
>+cp $BASEDIR/data/$CODENAME/$ARCH/README.boot "boot$N/"
>+
>+# Include the boot$N/-tree into the iso-image
>+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
>+add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
>--
>2.1.4
>
>
--
Steve McIntyre, Cambridge, UK. steve@einval.com
"This dress doesn't reverse." -- Alden Spiess
Reply to: