* Re-add commit d8ef3f7 reverted in 978ef6d.

  + Do NOT include partman-zfs on some architecturs (hurd-i386, i386, mips*, powerpc)
  + Because Debian GNU/Linux isn't allowed to distribute binary modules
    of ZoL, we instead use zfs-fuse in the installer to create the
    pool and root filesystem(s).
* HACKs
  + Exclude *.gz from mklibs and use --ignore-depends=libslang2
  + Downgrade the kernel api to 3.2.0-4.
  + Remove fonts-lohit-guru-udeb - doesn't exist on Wheezy.

Signed-off-by: Turbo Fredriksson <turbo@bayour.com>

build/Makefile

@@ -519,7 +519,7 @@ ifndef ONLY_KLIBC
 		-L $(TREE)/usr/lib/cdebconf/frontend \
 		$(addprefix -l,$(notdir $(wildcard $(TREE)/usr/lib/cdebconf/frontend/*.so))) \
 		`find $(TEMP) -type f -a \( -perm /0111 -o -name '*.so' -o -name '*.so.*' \) | \
-		 grep -v udeblibs | grep -v 'usr/lib/xorg/modules/.*\.so'`
+		 egrep -v 'udeblibs|usr/lib/xorg/modules/.*\.so|\.gz'`
 
 ifeq ($(DEB_HOST_ARCH),armhf)
 	# armhf has two linkers for now, while the world gets sorted

build/config/common

@@ -11,7 +11,7 @@
 
 # Default kernel ABI version to use. Append a kernel flavour to
 # produce KERNELVERSION.
-LINUX_KERNEL_ABI ?= 3.16.0-4
+LINUX_KERNEL_ABI ?= 3.2.0-4
 
 # Always "di" these days
 KERNEL_FLAVOUR ?= di
@@ -41,7 +41,7 @@ MKLIBS = mklibs
 # Options to pass to dpkg when it is unpacking the udebs to create the
 # image. None should be needed, but --force-overwrite might need to be
 # enabled from time to time if udebs have conflicting files.
-DPKG_UNPACK_OPTIONS = --force-overwrite
+DPKG_UNPACK_OPTIONS = --force-overwrite --ignore-depends=libslang2
 
 # The codename of the Debian release that should be installed by default.
 DEBIAN_RELEASE = jessie

build/pkg-lists/cdrom/amd64.cfg

@@ -10,6 +10,9 @@ serial-modules-${kernel:Version}
 usb-serial-modules-${kernel:Version} ?
 uinput-modules-${kernel:Version} ?
 
+partman-zfs ?
+zfs-fuse-udeb ?
+
 # Support for firewire cdroms (and disks, I think)
 firewire-core-modules-${kernel:Version}
 # Support for usb cdroms

build/pkg-lists/gtk-common

@@ -24,4 +24,3 @@ fonts-lklug-sinhala-udeb
 fonts-lao-udeb
 fonts-ukij-uyghur-udeb
 fonts-sil-padauk-udeb
-fonts-lohit-guru-udeb

build/pkg-lists/hd-media/amd64.cfg

@@ -15,6 +15,9 @@ usb-serial-modules-${kernel:Version} ?
 uinput-modules-${kernel:Version} ?
 sata-modules-${kernel:Version}
 
+partman-zfs ?
+zfs-fuse-udeb ?
+
 # also support MMC/SD cards
 mmc-modules-${kernel:Version} ?
 

build/pkg-lists/monolithic/amd64.cfg

@@ -6,3 +6,8 @@ pcmciautils-udeb
 
 acpi-modules-${kernel:Version}
 
+partman-zfs ?
+zfs-fuse-udeb ?
+
+# These are broken and/or irrelevant
+partman-ufs -

build/pkg-lists/monolithic/hurd-i386.cfg

@@ -4,5 +4,6 @@ partman-ext3 -
 partman-jfs -
 partman-md -
 partman-xfs -
+partman-zfs -
 partman-btrfs -
 console-setup-udeb

build/pkg-lists/monolithic/i386.cfg

@@ -3,6 +3,7 @@ bogl-bterm-udeb
 console-setup-udeb
 kbd-udeb
 pcmciautils-udeb
+partman-zfs -
 
 acpi-modules-${kernel:Version}
 

build/pkg-lists/monolithic/mips.cfg

@@ -1,2 +1,3 @@
 bogl-bterm-udeb
 pcmciautils-udeb
+partman-zfs -

build/pkg-lists/monolithic/powerpc.cfg

@@ -4,6 +4,7 @@ console-setup-udeb
 kbd-udeb
 pcmciautils-udeb
 eject-udeb
+partman-zfs -
 # Used by yaboot-installer
 parted-udeb
 os-prober-udeb

build/pkg-lists/netboot/amd64.cfg

@@ -12,6 +12,9 @@ input-modules-${kernel:Version}
 console-setup-udeb
 kbd-udeb
 
+partman-zfs ?
+zfs-fuse-udeb ?
+
 # This is needed for proper display of utf-8.
 fb-modules-${kernel:Version}
 

debian/changelog

@@ -1,3 +1,14 @@
+debian-installer (201410XX.ZOL2) UNRELEASED; urgency=medium
+
+  * Support ZFS (ZFS On Linux) for amd64.
+    Because Debian GNU/Linux isn't allowed to distribute binary modules
+    of ZoL, we instead use zfs-fuse in the installer to create the
+    pool and root filesystem(s).
+  *  Downgrade the kernel api to 3.2.0-4.
+  * Remove fonts-lohit-guru-udeb - doesn't exist on Wheezy.
+
+ -- Turbo Fredriksson <turbo@bayour.com>  Fri, 17 Apr 2015 18:33:53 +0200
+
 debian-installer (201410XX) UNRELEASED; urgency=medium
 
   [ Karsten Merker ]