Fix dracut Debian/Ubuntu packaging

This commit ensures make(1) targets that build .deb packages fail if
alien(1) can't convert all .rpm files; additionally it also updates
the zfs-dracut package name which was changed to "noarch" in ca4e5a7.

Reviewed-by: Neal Gompa <ngompa@datto.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #8990
Closes #8991

diff --git a/config/deb.am b/config/deb.am
index e405547aa9493b7bd7972a4561016c1fdb94d2c3..83059a92349343c44e2f408c022b14e9a7f92d84 100644 (file)
--- a/config/deb.am
+++ b/config/deb.am
@@ -20,7 +20,7 @@ deb-kmod: deb-local rpm-kmod
        arch=`$(RPM) -qp $${name}-kmod-$${version}.src.rpm --qf %{arch} | tail -1`; \
        debarch=`$(DPKG) --print-architecture`; \
        pkg1=kmod-$${name}*$${version}.$${arch}.rpm; \
-       fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1; \
+       fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1 || exit 1; \
        $(RM) $$pkg1
 
 
@@ -30,7 +30,7 @@ deb-dkms: deb-local rpm-dkms
        arch=`$(RPM) -qp $${name}-dkms-$${version}.src.rpm --qf %{arch} | tail -1`; \
        debarch=`$(DPKG) --print-architecture`; \
        pkg1=$${name}-dkms-$${version}.$${arch}.rpm; \
-       fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1; \
+       fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1 || exit 1; \
        $(RM) $$pkg1
 
 deb-utils: deb-local rpm-utils
@@ -45,7 +45,7 @@ deb-utils: deb-local rpm-utils
        pkg5=libzpool2-$${version}.$${arch}.rpm; \
        pkg6=libzfs2-devel-$${version}.$${arch}.rpm; \
        pkg7=$${name}-test-$${version}.$${arch}.rpm; \
-       pkg8=$${name}-dracut-$${version}.$${arch}.rpm; \
+       pkg8=$${name}-dracut-$${version}.noarch.rpm; \
        pkg9=$${name}-initramfs-$${version}.$${arch}.rpm; \
        pkg10=`ls python*-pyzfs-$${version}* | tail -1`; \
 ## Arguments need to be passed to dh_shlibdeps. Alien provides no mechanism
@@ -63,7 +63,7 @@ deb-utils: deb-local rpm-utils
        env PATH=$${path_prepend}:$${PATH} \
        fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch \
            $$pkg1 $$pkg2 $$pkg3 $$pkg4 $$pkg5 $$pkg6 $$pkg7 \
-           $$pkg8 $$pkg9 $$pkg10; \
+           $$pkg8 $$pkg9 $$pkg10 || exit 1; \
        $(RM) $${path_prepend}/dh_shlibdeps; \
        rmdir $${path_prepend}; \
        $(RM) $$pkg1 $$pkg2 $$pkg3 $$pkg4 $$pkg5 $$pkg6 $$pkg7 \