diff options
| author | LOLi <[email protected]> | 2018-01-18 19:15:41 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-01-18 10:15:41 -0800 |
| commit | 79c3270476b7140220c7946dd0a709a31bb9ed1b (patch) | |
| tree | 4d58a572dd299a40c2b4d8f78097eb3583256f14 | |
| parent | 51d1b58ef3467c3a9711c65458f93063dd17354f (diff) | |
Fix Debian packaging on ARMv7/ARM64
When building packages on Debian-based systems specify the target
architecture used by 'alien' to convert .rpm packages into .deb: this
avoids detecting an incorrect value which results in the following
errors:
<package>.aarch64.rpm is for architecture aarch64 ; the package cannot be built on this system
<package>.armv7l.rpm is for architecture armel ; the package cannot be built on this system
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #7046
Closes #7058
| -rw-r--r-- | config/deb.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/deb.am b/config/deb.am index 98e98e45f..1b51f9316 100644 --- a/config/deb.am +++ b/config/deb.am @@ -18,8 +18,9 @@ deb-kmod: deb-local rpm-kmod name=${PACKAGE}; \ version=${VERSION}-${RELEASE}; \ 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 $$pkg1; \ + fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1; \ $(RM) $$pkg1 @@ -27,14 +28,16 @@ deb-dkms: deb-local rpm-dkms name=${PACKAGE}; \ version=${VERSION}-${RELEASE}; \ 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 $$pkg1; \ + fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1; \ $(RM) $$pkg1 deb-utils: deb-local rpm-utils name=${PACKAGE}; \ version=${VERSION}-${RELEASE}; \ arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \ + debarch=`$(DPKG) --print-architecture`; \ pkg1=$${name}-$${version}.$${arch}.rpm; \ pkg2=libnvpair1-$${version}.$${arch}.rpm; \ pkg3=libuutil1-$${version}.$${arch}.rpm; \ @@ -57,7 +60,7 @@ deb-utils: deb-local rpm-utils ## which should NOT be mixed with the alien-generated debs created here chmod +x $${path_prepend}/dh_shlibdeps; \ env PATH=$${path_prepend}:$${PATH} \ - fakeroot $(ALIEN) --bump=0 --scripts --to-deb \ + fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch \ $$pkg1 $$pkg2 $$pkg3 $$pkg4 $$pkg5 $$pkg6 $$pkg7 \ $$pkg8 $$pkg9; \ $(RM) $${path_prepend}/dh_shlibdeps; \ |