projects / zfsonlinux.git / blame
| Commit | Line | Data |
|---|---|---|
| c43065ce FG |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: LOLi <loli10K@users.noreply.github.com> | |
| 3 | Date: Thu, 18 Jan 2018 19:14:18 +0100 | |
| 4 | Subject: [PATCH] Fix Debian packaging on ARMv7/ARM64 | |
| 5 | MIME-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ||
| 9 | When building packages on Debian-based systems specify the target | |
| 10 | architecture used by 'alien' to convert .rpm packages into .deb: this | |
| 11 | avoids detecting an incorrect value which results in the following | |
| 12 | errors: | |
| 13 | ||
| 14 | <package>.aarch64.rpm is for architecture aarch64 ; the package cannot be built on this system | |
| 15 | <package>.armv7l.rpm is for architecture armel ; the package cannot be built on this system | |
| 16 | ||
| 17 | Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> | |
| 18 | Reviewed-by: George Melikov <mail@gmelikov.ru> | |
| 19 | Signed-off-by: loli10K <ezomori.nozomu@gmail.com> | |
| 20 | Closes zfsonlinux/zfs#7046 | |
| 21 | Closes #678 | |
| 22 | (cherry picked from commit 9ee1fc8b4cb7fdcda88e161d9fc2bbe50427972c) | |
| 23 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
| 24 | --- | |
| 25 | config/deb.am | 9 ++++++--- | |
| 26 | 1 file changed, 6 insertions(+), 3 deletions(-) | |
| 27 | ||
| 28 | diff --git a/config/deb.am b/config/deb.am | |
| 29 | index e05a175..f745c91 100644 | |
| 30 | --- a/config/deb.am | |
| 31 | +++ b/config/deb.am | |
| 32 | @@ -32,24 +32,27 @@ deb-kmod: deb-local rpm-kmod | |
| 33 | name=${PACKAGE}; \ | |
| 34 | version=${VERSION}-${RELEASE}; \ | |
| 35 | arch=`$(RPM) -qp $${name}-kmod-$${version}.src.rpm --qf %{arch} | tail -1`; \ | |
| 36 | + debarch=`$(DPKG) --print-architecture`; \ | |
| 37 | pkg1=kmod-$${name}*$${version}.$${arch}.rpm; \ | |
| 38 | - fakeroot $(ALIEN) --bump=0 --scripts --to-deb $$pkg1; \ | |
| 39 | + fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1; \ | |
| 40 | $(RM) $$pkg1 | |
| 41 | ||
| 42 | deb-dkms: deb-local rpm-dkms | |
| 43 | name=${PACKAGE}; \ | |
| 44 | version=${VERSION}-${RELEASE}; \ | |
| 45 | arch=`$(RPM) -qp $${name}-dkms-$${version}.src.rpm --qf %{arch} | tail -1`; \ | |
| 46 | + debarch=`$(DPKG) --print-architecture`; \ | |
| 47 | pkg1=$${name}-dkms-$${version}.$${arch}.rpm; \ | |
| 48 | - fakeroot $(ALIEN) --bump=0 --scripts --to-deb $$pkg1; \ | |
| 49 | + fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1; \ | |
| 50 | $(RM) $$pkg1 | |
| 51 | ||
| 52 | deb-utils: deb-local rpm-utils | |
| 53 | name=${PACKAGE}; \ | |
| 54 | version=${VERSION}-${RELEASE}; \ | |
| 55 | arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \ | |
| 56 | + debarch=`$(DPKG) --print-architecture`; \ | |
| 57 | pkg1=$${name}-$${version}.$${arch}.rpm; \ | |
| 58 | - fakeroot $(ALIEN) --bump=0 --scripts --to-deb $$pkg1; \ | |
| 59 | + fakeroot $(ALIEN) --bump=0 --scripts --to-deb --target=$$debarch $$pkg1; \ | |
| 60 | $(RM) $$pkg1 | |
| 61 | ||
| 62 | deb: deb-kmod deb-dkms deb-utils | |
| 63 | -- | |
| 64 | 2.14.2 | |
| 65 |