make-linux-hwe: corrected zfs removal

helpers/make-linux-hwe

 #!/bin/sh
 #
-#    Copyright (C) 2008-2017  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2018  Ruben Rodriguez <ruben@trisquel.info>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-
 VERSION=1
 
 . ./config
@@ -42,10 +41,10 @@ cp /tmp/preserve/* . -av
 
 # Remove ZFS
 rm zfs spl debian/scripts/misc/update-zfs.sh -rf
-#sed '/zfs/d; /spl/d' -i debian.master/reconstruct
 /bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control debian.master/control.d/vars.generic debian.master/control.d/vars.*
-/bin/sed  '/zfs/d' -i debian.master/rules.d/* debian.master/d-i/modules/fs-core-modules debian.master/control.d/generic.inclusion-list debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.*
 /bin/sed '/^define build_zfs/,/^endef/d; /^define install_zfs/,/^endef/d; /zfs/d' -i debian/rules.d/2-binary-arch.mk
+/bin/sed '/ifeq ($(do_zfs),false)/,/endif/d' -i debian/rules
+/bin/sed  '/zfs/d' -i debian.master/rules.d/* debian.master/d-i/modules/fs-core-modules debian.master/control.d/generic.inclusion-list debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.*
 
 # Remove VBox
 rm ubuntu/vbox* -rf