Skip to content

Commit a54f92b

Browse files
loli10Kbehlendorf
authored andcommitted
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 <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Olaf Faaland <[email protected]> Signed-off-by: loli10K <[email protected]> Closes #8990 Closes #8991
1 parent 1d20b76 commit a54f92b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

config/deb.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ deb-kmod: deb-local rpm-kmod
2020
arch=`$(RPM) -qp $${name}-kmod-$${version}.src.rpm --qf %{arch} | tail -1`; \
2121
debarch=`$(DPKG) --print-architecture`; \
2222
pkg1=kmod-$${name}*$${version}.$${arch}.rpm; \
23-
fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1; \
23+
fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1 || exit 1; \
2424
$(RM) $$pkg1
2525

2626

@@ -30,7 +30,7 @@ deb-dkms: deb-local rpm-dkms
3030
arch=`$(RPM) -qp $${name}-dkms-$${version}.src.rpm --qf %{arch} | tail -1`; \
3131
debarch=`$(DPKG) --print-architecture`; \
3232
pkg1=$${name}-dkms-$${version}.$${arch}.rpm; \
33-
fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1; \
33+
fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1 || exit 1; \
3434
$(RM) $$pkg1
3535

3636
deb-utils: deb-local rpm-utils
@@ -45,7 +45,7 @@ deb-utils: deb-local rpm-utils
4545
pkg5=libzpool2-$${version}.$${arch}.rpm; \
4646
pkg6=libzfs2-devel-$${version}.$${arch}.rpm; \
4747
pkg7=$${name}-test-$${version}.$${arch}.rpm; \
48-
pkg8=$${name}-dracut-$${version}.$${arch}.rpm; \
48+
pkg8=$${name}-dracut-$${version}.noarch.rpm; \
4949
pkg9=$${name}-initramfs-$${version}.$${arch}.rpm; \
5050
pkg10=`ls python*-pyzfs-$${version}* | tail -1`; \
5151
## Arguments need to be passed to dh_shlibdeps. Alien provides no mechanism
@@ -63,7 +63,7 @@ deb-utils: deb-local rpm-utils
6363
env PATH=$${path_prepend}:$${PATH} \
6464
fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch \
6565
$$pkg1 $$pkg2 $$pkg3 $$pkg4 $$pkg5 $$pkg6 $$pkg7 \
66-
$$pkg8 $$pkg9 $$pkg10; \
66+
$$pkg8 $$pkg9 $$pkg10 || exit 1; \
6767
$(RM) $${path_prepend}/dh_shlibdeps; \
6868
rmdir $${path_prepend}; \
6969
$(RM) $$pkg1 $$pkg2 $$pkg3 $$pkg4 $$pkg5 $$pkg6 $$pkg7 \

0 commit comments

Comments
 (0)