From 479c17d917d505a8d2adba376fd48ba1ffe28641 Mon Sep 17 00:00:00 2001
From: Philipp Kern <pkern@debian.org>
Date: Thu, 12 Nov 2015 01:22:17 +0100
Subject: [PATCH] Drop the d390oco* files.

Object code only modules date back to 2.2 and 2.4 kernel times, when
IBM did not release the source to certain kernel modules. Since many
years everything needed to boot and run the machine is actually
open source. It also got broken due to the kernel growing larger and
adding the oco.bin would overwrite parts of the kernel.

It's safe to say that nobody is actually using this.
---
 data/jessie/s390x/README.boot  | 3 ---
 data/jessie/s390x/d390oco.ins  | 7 -------
 data/jessie/s390x/d390oco.tdf  | 8 --------
 data/stretch/s390x/README.boot | 3 ---
 data/stretch/s390x/d390oco.ins | 7 -------
 data/stretch/s390x/d390oco.tdf | 8 --------
 debian/changelog               | 1 +
 tools/boot/jessie/boot-s390x   | 3 +--
 8 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 data/jessie/s390x/d390oco.ins
 delete mode 100644 data/jessie/s390x/d390oco.tdf
 delete mode 100644 data/stretch/s390x/d390oco.ins
 delete mode 100644 data/stretch/s390x/d390oco.tdf

diff --git a/data/jessie/s390x/README.boot b/data/jessie/s390x/README.boot
index 5b6ae15c..56857aa4 100644
--- a/data/jessie/s390x/README.boot
+++ b/data/jessie/s390x/README.boot
@@ -4,9 +4,6 @@ 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
diff --git a/data/jessie/s390x/d390oco.ins b/data/jessie/s390x/d390oco.ins
deleted file mode 100644
index b3f11dd1..00000000
--- a/data/jessie/s390x/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/s390x/d390oco.tdf b/data/jessie/s390x/d390oco.tdf
deleted file mode 100644
index 5fdade21..00000000
--- a/data/jessie/s390x/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/s390x/README.boot b/data/stretch/s390x/README.boot
index 5b6ae15c..56857aa4 100644
--- a/data/stretch/s390x/README.boot
+++ b/data/stretch/s390x/README.boot
@@ -4,9 +4,6 @@ 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
diff --git a/data/stretch/s390x/d390oco.ins b/data/stretch/s390x/d390oco.ins
deleted file mode 100644
index b3f11dd1..00000000
--- a/data/stretch/s390x/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/s390x/d390oco.tdf b/data/stretch/s390x/d390oco.tdf
deleted file mode 100644
index 5fdade21..00000000
--- a/data/stretch/s390x/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/debian/changelog b/debian/changelog
index 3759a521..d2f92209 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ debian-cd (3.1.18) UNRELEASED; urgency=medium
 
   [ Philipp Kern ]
   * Drop the remaining s390 bits from stretch and jessie. (s390x remains.)
+  * Drop the d390oco loader from stretch and jessie.
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 20 Apr 2015 12:36:57 +0100
 
diff --git a/tools/boot/jessie/boot-s390x b/tools/boot/jessie/boot-s390x
index 92dc73bf..1f5f7508 100644
--- a/tools/boot/jessie/boot-s390x
+++ b/tools/boot/jessie/boot-s390x
@@ -77,9 +77,8 @@ for image in $images_S390; do
 	fi
 done
 
-# Copy the different boot files
+# Copy the boot file
 # - 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"