Convert sunxi-mali to multiarch (needs testing)

chroot-buildpackages.sh

@@ -175,7 +175,7 @@ chroot_build_packages()
 		eval systemd-nspawn -a -q -D $target_dir --tmpfs=/root/build --tmpfs=/tmp --bind-ro $SRC/lib/extras-buildpkgs/:/root/overlay \
 			--bind-ro $SRC/sources/extra/:/root/sources /bin/bash -c "/root/build.sh" 2>&1 \
 			${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/buildpkg.log'}
-		mv $target_dir/root/*.deb $plugin_target_dir
+		mv $target_dir/root/*.deb $plugin_target_dir 2>/dev/null
 	done
 } #############################################################################
 

extras-buildpkgs/sunxi-mali-r3p0/debian/patches/fix-libdir.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile.setup b/Makefile.setup
+index 9b1ef0d..4cf549b 100644
+--- a/Makefile.setup
++++ b/Makefile.setup
+@@ -1,6 +1,7 @@
+ DESTDIR ?= /
+ prefix ?= /usr/
+-libdir ?= $(DESTDIR)$(prefix)lib/
++libsubdir ?= 
++libdir ?= $(DESTDIR)$(prefix)lib/$(libsubdir)/
+ includedir ?= $(DESTDIR)$(prefix)/include
+ 
+ INSTALL ?= install

extras-buildpkgs/sunxi-mali-r3p0/debian/patches/series

@@ -1 +1,2 @@
 pr-8.patch
+fix-libdir.patch

extras-buildpkgs/sunxi-mali-r3p0/debian/rules

@@ -3,6 +3,9 @@
 # output every command that modifies files on the build system.
 #DH_VERBOSE = 1
 
+# Get the architecture triplet:
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ 
 
@@ -13,7 +16,6 @@ override_dh_auto_configure:
 	make config VERSION=r3p0 ABI=armhf EGL_TYPE=x11
 
 override_dh_auto_install:
-	mkdir -p debian/tmp/usr/lib/ debian/tmp/usr/include
-	dh_auto_install
-	mkdir -p debian/tmp/etc/modules-load.d/
-	install -m0644 debian/sunxi-mali.conf debian/tmp/etc/modules-load.d/sunxi-mali.conf
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) debian/tmp/usr/include
+	dh_auto_install -- libsubdir=$(DEB_HOST_MULTIARCH)
+	install -D -m0644 debian/sunxi-mali.conf debian/tmp/etc/modules-load.d/sunxi-mali.conf

extras-buildpkgs/sunxi-mali-r3p0/debian/sunxi-mali-r3p0-dev.dirs

@@ -1,2 +0,0 @@
-usr/lib
-usr/include

extras-buildpkgs/sunxi-mali-r3p0/debian/sunxi-mali-r3p0-dev.install

@@ -1,4 +1,4 @@
-usr/lib/libGLES*.so
-usr/lib/libEGL*.so
+usr/lib/*/libGLES*.so
+usr/lib/*/libEGL*.so
 usr/include/*
-usr/lib/pkgconfig/*
+usr/lib/*/pkgconfig/*

extras-buildpkgs/sunxi-mali-r3p0/debian/sunxi-mali-r3p0.dirs

@@ -1 +0,0 @@
-usr/lib

extras-buildpkgs/sunxi-mali-r3p0/debian/sunxi-mali-r3p0.install

@@ -1,3 +1,3 @@
-usr/lib/lib*.so.*
-usr/lib/libMali.so
+usr/lib/*/lib*.so.*
+usr/lib/*/libMali.so
 etc/modules-load.d/*