From a744ec62e0cdb8757f7a1146ff43659449a8b04e Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Tue, 6 Jun 2017 00:16:56 +0200 Subject: [PATCH 1/8] [m68k] udeb: Build affs-modules package --- debian/changelog | 3 +++ debian/installer/m68k/modules/m68k/affs-modules | 1 + 2 files changed, 4 insertions(+) create mode 100644 debian/installer/m68k/modules/m68k/affs-modules diff --git a/debian/changelog b/debian/changelog index b9df03bbb..1b31adbda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ linux (4.11.3-1~exp1) experimental; urgency=medium * [m68k] Update 'Revert "m68k: move exports to definitions"' for 4.11 (fixes FTBFS) (Closes: #862393) + [ John Paul Adrian Glaubitz ] + * [m68k] udeb: Build affs-modules package + -- Ben Hutchings Mon, 05 Jun 2017 14:13:41 +0100 linux (4.11-1~exp2) experimental; urgency=medium diff --git a/debian/installer/m68k/modules/m68k/affs-modules b/debian/installer/m68k/modules/m68k/affs-modules new file mode 100644 index 000000000..21d616a1c --- /dev/null +++ b/debian/installer/m68k/modules/m68k/affs-modules @@ -0,0 +1 @@ +#include From 3a28456c157662eb0a5538e4735ef9591491259c Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Tue, 6 Jun 2017 00:17:56 +0200 Subject: [PATCH 2/8] [m68k] udeb: Build hfs-modules package --- debian/changelog | 1 + debian/installer/m68k/modules/m68k/hfs-modules | 1 + 2 files changed, 2 insertions(+) create mode 100644 debian/installer/m68k/modules/m68k/hfs-modules diff --git a/debian/changelog b/debian/changelog index 1b31adbda..8f621e853 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ linux (4.11.3-1~exp1) experimental; urgency=medium [ John Paul Adrian Glaubitz ] * [m68k] udeb: Build affs-modules package + * [m68k] udeb: Build hfs-modules package -- Ben Hutchings Mon, 05 Jun 2017 14:13:41 +0100 diff --git a/debian/installer/m68k/modules/m68k/hfs-modules b/debian/installer/m68k/modules/m68k/hfs-modules new file mode 100644 index 000000000..57d12f649 --- /dev/null +++ b/debian/installer/m68k/modules/m68k/hfs-modules @@ -0,0 +1 @@ +#include From 8a4fb2b8334993079f54c04d5c627f36965f0e3d Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Tue, 6 Jun 2017 00:19:15 +0200 Subject: [PATCH 3/8] [m68k] udeb: Build nic-modules package --- debian/changelog | 1 + debian/installer/m68k/modules/m68k/nic-modules | 1 + 2 files changed, 2 insertions(+) create mode 100644 debian/installer/m68k/modules/m68k/nic-modules diff --git a/debian/changelog b/debian/changelog index 8f621e853..8f6db36aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ linux (4.11.3-1~exp1) experimental; urgency=medium [ John Paul Adrian Glaubitz ] * [m68k] udeb: Build affs-modules package * [m68k] udeb: Build hfs-modules package + * [m68k] udeb: Build nic-modules package -- Ben Hutchings Mon, 05 Jun 2017 14:13:41 +0100 diff --git a/debian/installer/m68k/modules/m68k/nic-modules b/debian/installer/m68k/modules/m68k/nic-modules new file mode 100644 index 000000000..2512e8395 --- /dev/null +++ b/debian/installer/m68k/modules/m68k/nic-modules @@ -0,0 +1 @@ +#include From 0f75b878c92e7c28f0e6fed349e59c37cac862a2 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Tue, 6 Jun 2017 00:21:33 +0200 Subject: [PATCH 4/8] [m68k] udeb: Build pata-modules package --- debian/changelog | 1 + debian/installer/m68k/modules/m68k/pata-modules | 1 + 2 files changed, 2 insertions(+) create mode 100644 debian/installer/m68k/modules/m68k/pata-modules diff --git a/debian/changelog b/debian/changelog index 8f6db36aa..51bd9f59f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ linux (4.11.3-1~exp1) experimental; urgency=medium * [m68k] udeb: Build affs-modules package * [m68k] udeb: Build hfs-modules package * [m68k] udeb: Build nic-modules package + * [m68k] udeb: Build pata-modules package -- Ben Hutchings Mon, 05 Jun 2017 14:13:41 +0100 diff --git a/debian/installer/m68k/modules/m68k/pata-modules b/debian/installer/m68k/modules/m68k/pata-modules new file mode 100644 index 000000000..b0cd6337a --- /dev/null +++ b/debian/installer/m68k/modules/m68k/pata-modules @@ -0,0 +1 @@ +#include From 2ae0e6b97a7daacfe157e1779b063e427a15c1a7 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Tue, 6 Jun 2017 00:22:45 +0200 Subject: [PATCH 5/8] [m68k] udeb: Build scsi-core-modules package --- debian/changelog | 1 + debian/installer/m68k/modules/m68k/scsi-core-modules | 1 + 2 files changed, 2 insertions(+) create mode 100644 debian/installer/m68k/modules/m68k/scsi-core-modules diff --git a/debian/changelog b/debian/changelog index 51bd9f59f..655084e3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ linux (4.11.3-1~exp1) experimental; urgency=medium * [m68k] udeb: Build hfs-modules package * [m68k] udeb: Build nic-modules package * [m68k] udeb: Build pata-modules package + * [m68k] udeb: Build scsi-core-modules package -- Ben Hutchings Mon, 05 Jun 2017 14:13:41 +0100 diff --git a/debian/installer/m68k/modules/m68k/scsi-core-modules b/debian/installer/m68k/modules/m68k/scsi-core-modules new file mode 100644 index 000000000..dd65d6614 --- /dev/null +++ b/debian/installer/m68k/modules/m68k/scsi-core-modules @@ -0,0 +1 @@ +#include From 8af4425509a996eda7b0c24fda1eda5d7249fe6e Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Tue, 6 Jun 2017 00:24:40 +0200 Subject: [PATCH 6/8] [m68k] udeb: Move non-shared modules from nic-shared-modules to nic-modules --- debian/changelog | 1 + debian/installer/m68k/modules/m68k/nic-modules | 14 ++++++++++++++ .../installer/m68k/modules/m68k/nic-shared-modules | 14 +------------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 655084e3a..3aef74f4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ linux (4.11.3-1~exp1) experimental; urgency=medium * [m68k] udeb: Build nic-modules package * [m68k] udeb: Build pata-modules package * [m68k] udeb: Build scsi-core-modules package + * [m68k] udeb: Move non-shared modules from nic-shared-modules to nic-modules -- Ben Hutchings Mon, 05 Jun 2017 14:13:41 +0100 diff --git a/debian/installer/m68k/modules/m68k/nic-modules b/debian/installer/m68k/modules/m68k/nic-modules index 2512e8395..d17bfb788 100644 --- a/debian/installer/m68k/modules/m68k/nic-modules +++ b/debian/installer/m68k/modules/m68k/nic-modules @@ -1 +1,15 @@ #include + +a2065 ? +apne ? +ariadne ? +ariadne2 ? +atari_ethernec ? +atarilance ? +hydra ? +mac8390 ? +mac89x0 ? +macsonic ? +ne ? +smc91x ? +zorro8390 ? diff --git a/debian/installer/m68k/modules/m68k/nic-shared-modules b/debian/installer/m68k/modules/m68k/nic-shared-modules index 5bff60c2d..d6bb0f96d 100644 --- a/debian/installer/m68k/modules/m68k/nic-shared-modules +++ b/debian/installer/m68k/modules/m68k/nic-shared-modules @@ -1,20 +1,8 @@ #include + 82596 ? 8390 ? 8390p ? 7990 ? -a2065 ? -apne ? -ariadne ? -ariadne2 ? -atarilance ? dummy -hydra ? -mac8390 ? -mac89x0 ? -macsonic ? -zorro8390 ? -ne ? -atari_ethernec ? -smc91x ? libphy From dbe60feb5b48a61df8765fdbc52791322e93ed5b Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Tue, 6 Jun 2017 00:25:47 +0200 Subject: [PATCH 7/8] [m68k] udeb: Add buddha, falconide, gayle, macide, q40ide to pata-modules --- debian/changelog | 1 + debian/installer/m68k/modules/m68k/pata-modules | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3aef74f4e..28b4a0512 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ linux (4.11.3-1~exp1) experimental; urgency=medium * [m68k] udeb: Build pata-modules package * [m68k] udeb: Build scsi-core-modules package * [m68k] udeb: Move non-shared modules from nic-shared-modules to nic-modules + * [m68k] udeb: Add buddha, falconide, gayle, macide, q40ide to pata-modules -- Ben Hutchings Mon, 05 Jun 2017 14:13:41 +0100 diff --git a/debian/installer/m68k/modules/m68k/pata-modules b/debian/installer/m68k/modules/m68k/pata-modules index b0cd6337a..b366588c7 100644 --- a/debian/installer/m68k/modules/m68k/pata-modules +++ b/debian/installer/m68k/modules/m68k/pata-modules @@ -1 +1,7 @@ #include + +buddha +falconide +gayle +macide +q40ide From 18a83ebe4cc2cfaf1340966e5b068926e92c7f7e Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Tue, 6 Jun 2017 00:27:44 +0200 Subject: [PATCH 8/8] [m68k] udeb: Add atari_scsi, mac_esp, mac_scsi to scsi-modules --- debian/changelog | 1 + debian/installer/m68k/modules/m68k/scsi-modules | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 28b4a0512..25351c6d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ linux (4.11.3-1~exp1) experimental; urgency=medium * [m68k] udeb: Build scsi-core-modules package * [m68k] udeb: Move non-shared modules from nic-shared-modules to nic-modules * [m68k] udeb: Add buddha, falconide, gayle, macide, q40ide to pata-modules + * [m68k] udeb: Add atari_scsi, mac_esp, mac_scsi to scsi-modules -- Ben Hutchings Mon, 05 Jun 2017 14:13:41 +0100 diff --git a/debian/installer/m68k/modules/m68k/scsi-modules b/debian/installer/m68k/modules/m68k/scsi-modules index 3a411a322..6cbb16b96 100644 --- a/debian/installer/m68k/modules/m68k/scsi-modules +++ b/debian/installer/m68k/modules/m68k/scsi-modules @@ -1 +1,5 @@ sg + +atari_scsi +mac_esp +mac_scsi