Buildpkg fixes and improvements

chroot-buildpackages.sh

@@ -298,9 +298,9 @@ chroot_installpackages()
 	aptly -config=$conf repo create temp
 	# NOTE: this works recursively
 	aptly -config=$conf repo add temp $DEST/debs/extra/$RELEASE/
-	# -gpg-key="128290AF"
+	# -gpg-key="925644A6"
-	aptly -secret-keyring="$SRC/lib/extras-buildpkgs/buildpkg.gpg" -batch -config=$conf \
+	aptly -keyring="$SRC/lib/extras-buildpkgs/buildpkg-public.gpg" -secret-keyring="$SRC/lib/extras-buildpkgs/buildpkg.gpg" -batch -config=$conf \
-		 -component=temp -distribution=$RELEASE publish repo temp
+		 -gpg-key="925644A6" -passphrase="testkey1234" -component=temp -distribution=$RELEASE publish repo temp
 	aptly -config=$conf -listen=":8189" serve &
 	local aptly_pid=$!
 	cp $SRC/lib/extras-buildpkgs/buildpkg.key $CACHEDIR/sdcard/tmp/buildpkg.key
@@ -331,7 +331,7 @@ chroot_installpackages()
 		-o Acquire::http::Proxy::localhost="DIRECT" \
 		--show-progress -o DPKG::Progress-Fancy=1 install -y $install_list
 	apt-get clean
-	apt-key del 128290AF
+	apt-key del "925644A6"
 	rm /etc/apt/sources.list.d/armbian-temp.list /etc/apt/preferences.d/90-armbian-temp.pref /tmp/buildpkg.key
 	rm -- "\$0"
 	EOF

extras-buildpkgs/README.md

@@ -4,6 +4,12 @@
 
 * Switch from chroot to native multiarch
 
+Progress:
+
+* sunxi-mali: fix pkgconfig files for multiarch
+
+* fbturbo: check xserver plugin search path
+
 ### Installing packages to images:
 
 * Add a function for installing packages - **done**

extras-buildpkgs/buildpkg.key

@@ -1,38 +1,38 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1
 
-mQENBFeCxc0BCADazdDUs6OG4nRR+u2eeGvtfutGRqGPuk7F6iqFzzSnw0/iXwIW
+mQENBFeksLIBCAC1Hy5UwoSKTRhR1r4eoL2/HcyWklmLjVimKooMfHoXv0dHIt45
-tgWAp1bqlXjQXBQ+1qpvnYQAUt9q7tQ06b53gxI+ROG+Wv8nRxdT5xhBVwydtoRf
+2QJ7/qfT7gqVGfEMuo1/iewR3NZqyGCjTk8hGa67E+Lj6j+6VTYOMJDnCJC176rB
-vV8wBTE504eRF9EuOjp2KhIVpGUEkBVXrSEHDk51Tiz9TKKtS3/HSoicNAnFCHix
+XSq3IJIkm1ipQBweYarvNvXq9WOFP/Yv820oyS+1vaWImTZ8eXczwIjPK3XOMnkT
-+XuXcdJ+INcsnnDV9XOfaqCdUdpeaDAjQT1q7YHqrAYShjByryrmw2tE3TSff05y
+RvOetXf9Ngc1m2WKmejoYz33RXcMBxYhSMSWwzNkl42j6cF+bPXpQ8YSmn3mfz9Q
-h8fdWATGlJQBRvNBrlKDSBGlNbMYpnOaKC30F3f3RHq4cPb37RgPlEAZ8EL1U43h
+awzcSE8+HBVfsdjz/yOwbhbieenujbK81y0ZWzqJmpc9NIe7kzu0CNm1u21YmrTc
-cYJHGDI0anIP+G93nUOWNSAMyP9+2nBnG88rABEBAAG0ZkFybWJpYW4gYnVpbGRl
+FjtJ4OuukgZNusO9frcTBalgoMpbeod10+gPABEBAAG0ZkFybWJpYW4gYnVpbGRl
 ciAoVGVtcG9yYXJ5IGtleSBmb3IgaW5zdGFsbGluZyBwYWNrYWdlcyBkdXJpbmcg
 QXJtYmlhbiBpbWFnZSBjcmVhdGlvbikgPHJvb3RAbG9jYWxob3N0PokBOAQTAQIA
-IgUCV4LFzQIbLwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQqDKDcBKCkK+s
+IgUCV6SwsgIbLwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQkrkN4ZJWRKZi
-lQgAmUA3erGtEdzorjbcfF8nvqzaq/oiwYCgz3maMzcOv4QIfd+uUbjPYlkNoAql
+rQgAncDSFDmejfWzRZX43Mz8NAo5di6KxMMg6lDVZHeQMrSP/xYwUbxBykIyyAED
-j4Gamqo/oVDcW91kLk4pScNstQ3CueE+1HuFSLVD9v3x0dU2wo4XmV5d0J7LQo/K
+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
-CVI3ZjpI1eKiqIFBQDbRn92EiTLjy0pv1KtN3PXHOKNHwuz3cD/CQvh0lhgN+mb4
+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
-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
+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
-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
+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
-HVzu3OHeoUjRg1JE+zcj0P4zaLkBDQRXgsXNAQgAuAbsxXys1Ne5jrZF+JyhMnq+
+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
-i0njf75i5Z3rQi2/WjyWNvC8hb866urYFbJ/mcLTcKtqOAMGM7YSmcGnVr+m1jsi
+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
-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
+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
-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
+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
-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
+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
-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
+3D9rNUDtPYHXkPr291DJd/W2oLVaRmvAMJsJzUJpalkndeY91EDhdZLuRH7sAQAR
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-xuszIbokZpro7tW9fYLgATg6VfLRI35S/qegTernFcYs5yz7V94brUYVn9rHwILz
+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
-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
+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
-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
+StiCqKb0eSsKbmGbGERjFAsvNqVrFDw5tfSkqYI+GClYqOu4QK16s8nvllkA3/1F
-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
+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
-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
+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
-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
+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
-BZMm7FCG8WbijGjlGNSjE91gUpPPLLjTTquD8wk4wBkOlrmxVQlGlK9CuF0f4ASH
+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
-c0x2xw==
+MkHaDA==
-=I43U
+=6CjZ
 -----END PGP PUBLIC KEY BLOCK-----

extras-buildpkgs/libUMP/debian/rules

@@ -2,7 +2,6 @@
 
 PACKAGE = libump
 
-
 override_dh_auto_install:
 	dh_auto_install
 	mkdir -p debian/tmp/etc/modules-load.d/