Source: linux
Version: 3.16.7-ckt4-3
Severity: wishlist
Tags: d-i patch
User: debian-...@lists.debian.org
Usertags: port-x32 di-x32
Hi! Long ago, when the x32 port started, the "linux" package on that
architecture got limited to just kernel-derived libc headers. That made
sense when neither grub nor the installer were ported. However, that's the
case no more and we need actual kernels. X32-capable grub is in the
archive, well-tested on crossgraded systems using self-built kernels.
Debian-installer, however, needs udebs that come from the src:linux build
machinery.
Please apply the attached patch.
If you want to see it in action, you can use d-i images available at
http://debian-x32.org/#debian-installer; these have been tested so far on
qemu-kvm (BIOS, EFI), virtualbox (BIOS) and one real box (BIOS).
-- System Information:
Debian Release: 8.0
APT prefers unstable
APT policy: (600, 'unstable'), (500, 'unreleased'), (50, 'experimental')
Architecture: x32 (x86_64)
Kernel: Linux 3.19.0-x32 (SMP w/6 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)
diff -Nru linux-3.16.7-ckt2/debian/config/x32/config linux-3.16.7-ckt2/debian/config/x32/config
--- linux-3.16.7-ckt2/debian/config/x32/config 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/config/x32/config 2014-12-13 14:41:06.000000000 +0100
@@ -0,0 +1,2 @@
+CONFIG_X86_X32=y
+CONFIG_X86_X32_DISABLED=n
diff -Nru linux-3.16.7-ckt2/debian/config/x32/defines linux-3.16.7-ckt2/debian/config/x32/defines
--- linux-3.16.7-ckt2/debian/config/x32/defines 2014-09-08 06:58:04.000000000 +0200
+++ linux-3.16.7-ckt2/debian/config/x32/defines 2014-12-13 14:43:54.000000000 +0100
@@ -1,4 +1,26 @@
[base]
-kernel-arch: x86
featuresets:
-# empty; x32 must be part of a multiarch installation with an amd64 kernel
+ none
+ rt
+kernel-arch: x86
+
+[build]
+debug-info: true
+image-file: arch/x86/boot/bzImage
+
+[image]
+bootloaders: grub-pc grub-efi extlinux
+configs:
+install-stem: vmlinuz
+
+[relations]
+headers%gcc-4.8: linux-compiler-gcc-4.8-x86
+
+[amd64_description]
+hardware: 64-bit PCs
+hardware-long: PCs with AMD64, Intel 64 or VIA Nano processors
+
+[amd64_image]
+configs:
+ kernelarch-x86/config-arch-64
+ x32/config
diff -Nru linux-3.16.7-ckt2/debian/config/x32/none/defines linux-3.16.7-ckt2/debian/config/x32/none/defines
--- linux-3.16.7-ckt2/debian/config/x32/none/defines 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/config/x32/none/defines 2014-09-08 06:58:03.000000000 +0200
@@ -0,0 +1,10 @@
+[base]
+flavours:
+ amd64
+
+[amd64_description]
+parts: xen
+
+[amd64_xen]
+flavours:
+ amd64
diff -Nru linux-3.16.7-ckt2/debian/config/x32/rt/defines linux-3.16.7-ckt2/debian/config/x32/rt/defines
--- linux-3.16.7-ckt2/debian/config/x32/rt/defines 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/config/x32/rt/defines 2014-09-08 06:58:03.000000000 +0200
@@ -0,0 +1,3 @@
+[base]
+flavours:
+ amd64
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/kernel-versions linux-3.16.7-ckt2/debian/installer/x32/kernel-versions
--- linux-3.16.7-ckt2/debian/installer/x32/kernel-versions 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/kernel-versions 2014-12-13 18:43:59.000000000 +0100
@@ -0,0 +1,2 @@
+# arch version flavour installedname suffix build-depends
+x32 - amd64 - - -
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/acpi-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/acpi-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/acpi-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/acpi-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,2 @@
+#include <acpi-modules>
+
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ata-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ata-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ata-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ata-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,2 @@
+#include <ata-modules>
+
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/btrfs-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/btrfs-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/btrfs-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/btrfs-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/cdrom-core-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/cdrom-core-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/cdrom-core-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/cdrom-core-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/core-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/core-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/core-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/core-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <core-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/crc-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/crc-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/crc-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/crc-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <crc-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/crypto-dm-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/crypto-dm-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/crypto-dm-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/crypto-dm-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/crypto-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/crypto-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/crypto-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/crypto-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <crypto-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/efi-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/efi-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/efi-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/efi-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <efi-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/event-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/event-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/event-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/event-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <event-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ext4-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ext4-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ext4-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ext4-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <ext4-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/fat-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/fat-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/fat-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/fat-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,2 @@
+#include <fat-modules>
+
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/fb-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/fb-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/fb-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/fb-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,3 @@
+fbcon ?
+vesafb ?
+vga16fb
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/firewire-core-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/firewire-core-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/firewire-core-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/firewire-core-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <firewire-core-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/fuse-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/fuse-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/fuse-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/fuse-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <fuse-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/hyperv-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/hyperv-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/hyperv-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/hyperv-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <hyperv-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/i2c-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/i2c-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/i2c-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/i2c-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <i2c-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/input-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/input-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/input-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/input-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <input-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/isofs-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/isofs-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/isofs-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/isofs-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <isofs-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/jfs-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/jfs-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/jfs-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/jfs-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <jfs-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/kernel-image linux-3.16.7-ckt2/debian/installer/x32/modules/x32/kernel-image
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/kernel-image 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/kernel-image 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+# empty
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/loop-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/loop-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/loop-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/loop-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,2 @@
+#include <loop-modules>
+
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/md-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/md-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/md-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/md-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,2 @@
+#include <md-modules>
+
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/mmc-core-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/mmc-core-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/mmc-core-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/mmc-core-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <mmc-core-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/mmc-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/mmc-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/mmc-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/mmc-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <mmc-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/mouse-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/mouse-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/mouse-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/mouse-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <mouse-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/multipath-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/multipath-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/multipath-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/multipath-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <multipath-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nbd-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nbd-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nbd-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nbd-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <nbd-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <nic-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-pcmcia-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-pcmcia-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-pcmcia-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-pcmcia-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <nic-pcmcia-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-shared-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-shared-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-shared-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-shared-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <nic-shared-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-usb-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-usb-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-usb-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-usb-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <nic-usb-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-wireless-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-wireless-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-wireless-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/nic-wireless-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <nic-wireless-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ntfs-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ntfs-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ntfs-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ntfs-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+ntfs
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/pata-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/pata-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/pata-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/pata-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,2 @@
+#include <pata-modules>
+
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/pcmcia-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/pcmcia-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/pcmcia-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/pcmcia-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <pcmcia-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/pcmcia-storage-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/pcmcia-storage-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/pcmcia-storage-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/pcmcia-storage-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <pcmcia-storage-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ppp-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ppp-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ppp-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/ppp-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,2 @@
+#include <ppp-modules>
+
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/sata-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/sata-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/sata-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/sata-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <sata-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-common-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-common-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-common-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-common-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <scsi-common-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-core-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-core-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-core-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-core-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <scsi-core-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-extra-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-extra-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-extra-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-extra-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,4 @@
+#include <scsi-extra-modules>
+dpt_i2o -
+i2o_block
+i2o_scsi
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/scsi-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <scsi-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/serial-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/serial-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/serial-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/serial-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <serial-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/sound-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/sound-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/sound-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/sound-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <sound-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/speakup-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/speakup-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/speakup-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/speakup-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <speakup-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/squashfs-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/squashfs-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/squashfs-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/squashfs-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/udf-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/udf-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/udf-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/udf-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <udf-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/uinput-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/uinput-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/uinput-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/uinput-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <uinput-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/usb-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/usb-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/usb-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/usb-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <usb-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/usb-serial-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/usb-serial-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/usb-serial-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/usb-serial-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/usb-storage-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/usb-storage-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/usb-storage-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/usb-storage-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,2 @@
+#include <usb-storage-modules>
+
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/virtio-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/virtio-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/virtio-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/virtio-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1 @@
+#include <virtio-modules>
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/modules/x32/xfs-modules linux-3.16.7-ckt2/debian/installer/x32/modules/x32/xfs-modules
--- linux-3.16.7-ckt2/debian/installer/x32/modules/x32/xfs-modules 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/modules/x32/xfs-modules 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,2 @@
+#include <xfs-modules>
+
diff -Nru linux-3.16.7-ckt2/debian/installer/x32/package-list linux-3.16.7-ckt2/debian/installer/x32/package-list
--- linux-3.16.7-ckt2/debian/installer/x32/package-list 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.16.7-ckt2/debian/installer/x32/package-list 2014-09-08 06:58:01.000000000 +0200
@@ -0,0 +1,14 @@
+# This file is used to build up the control file. The kernel version and
+# "-di" are appended to the package names. Section can be left out. So can
+# architecture, which is derived from the files in the modules directory.
+# It overwrites specifications from /usr/share/kernel-wedge/package-list.
+#
+
+Package: fat-modules
+Priority: standard
+
+Package: scsi-modules
+Depends: kernel-image, scsi-core-modules, scsi-common-modules, cdrom-core-modules, core-modules, ata-modules
+
+Package: kernel-image
+Provides: zlib-modules
