diff --git a/chroot-buildpackages.sh b/chroot-buildpackages.sh
index 428472ded4..da9bf8e51a 100644
--- a/chroot-buildpackages.sh
+++ b/chroot-buildpackages.sh
@@ -283,10 +283,10 @@ chroot_installpackages()
 	mkdir -p /tmp/aptly-temp/
 	aptly -config=$conf repo create temp
 	# NOTE: this works recursively
-	aptly -config=$conf -force-replace=true repo add temp $DEST/debs/extra/$RELEASE/
+	aptly -config=$conf repo add temp $DEST/debs/extra/$RELEASE/
 	# -gpg-key="128290AF"
 	aptly -secret-keyring="$SRC/lib/extras-buildpkgs/buildpkg.gpg" -batch -config=$conf \
-		 -force-overwrite=true -component=temp -distribution=$RELEASE publish repo temp
+		 -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
@@ -309,10 +309,12 @@ chroot_installpackages()
 	cat <<-EOF > $CACHEDIR/sdcard/tmp/install.sh
 	#!/bin/bash
 	apt-key add /tmp/buildpkg.key
-	apt-get -q update
+	apt-get -o Acquire::http::Proxy=\"http://${APT_PROXY_ADDR:-localhost:3142}\" \
+		-o Acquire::http::Proxy::localhost="DIRECT" -q update
 	# uncomment to debug
 	# /bin/bash
 	apt-get -q -o Acquire::http::Proxy=\"http://${APT_PROXY_ADDR:-localhost:3142}\" \
+		-o Acquire::http::Proxy::localhost="DIRECT" \
 		--show-progress -o DPKG::Progress-Fancy=1 install -y $install_list
 	apt-get clean
 	apt-key del 128290AF
diff --git a/extras-buildpkgs/libcedrus/debian/libcedrus1.postinst b/extras-buildpkgs/libcedrus/debian/libcedrus1.postinst
index eead4ac989..1086ced93c 100644
--- a/extras-buildpkgs/libcedrus/debian/libcedrus1.postinst
+++ b/extras-buildpkgs/libcedrus/debian/libcedrus1.postinst
@@ -3,6 +3,7 @@
 case "$1" in
 	install)
 		which udevadm > /dev/null && udevadm trigger --action=add --sysname-match=cedar_dev || true
+		which udevadm > /dev/null && udevadm trigger --action=add --sysname-match=ion || true
 		;;
 esac
 
diff --git a/extras-buildpkgs/libcedrus/debian/libcedrus1.udev b/extras-buildpkgs/libcedrus/debian/libcedrus1.udev
index aaf4ac8231..255a53b9a6 100644
--- a/extras-buildpkgs/libcedrus/debian/libcedrus1.udev
+++ b/extras-buildpkgs/libcedrus/debian/libcedrus1.udev
@@ -1 +1,2 @@
 KERNEL=="cedar_dev", MODE="0660", GROUP="video"
+KERNEL=="ion", MODE="0660", GROUP="video"
diff --git a/extras-buildpkgs/libcedrus/debian/rules b/extras-buildpkgs/libcedrus/debian/rules
index 9de249b469..c4bd033ef2 100644
--- a/extras-buildpkgs/libcedrus/debian/rules
+++ b/extras-buildpkgs/libcedrus/debian/rules
@@ -2,8 +2,8 @@
 
 PACKAGE = libcedrus
 
-override_dh_auto_build:
-	dh_auto_build -- USE_UMP=1
+#override_dh_auto_build:
+#	dh_auto_build -- USE_UMP=1
 
 override_dh_auto_install:
 	dh_auto_install -- prefix=/usr libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
diff --git a/extras-buildpkgs/sunxi-mali-r3p0/debian/control b/extras-buildpkgs/sunxi-mali-r3p0/debian/control
index 7bbb0d91ac..8a02f6dab1 100644
--- a/extras-buildpkgs/sunxi-mali-r3p0/debian/control
+++ b/extras-buildpkgs/sunxi-mali-r3p0/debian/control
@@ -13,7 +13,6 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: libegl1-mesa, libgles1-mesa, libgles2-mesa
 Provides: libegl1-mesa, libgles1-mesa, libgles2-mesa
-Conflicts: libegl1-mesa, libgles1-mesa, libgles2-mesa
 Description: Mali userspace binary driver version r3p0
  This package contains a complete set of Mali userspace drivers,
  including proprietary OpenGLESv2/EGL binaries.
@@ -24,7 +23,6 @@ Architecture: any
 Depends: sunxi-mali-r3p0 (= ${binary:Version}), ${misc:Depends}
 Replaces: libegl1-mesa-dev, libgles1-mesa-dev, libgles2-mesa-dev
 Provides: libegl1-mesa-dev, libgles1-mesa-dev, libgles2-mesa-dev
-Conflicts: libegl1-mesa-dev, libgles1-mesa-dev, libgles2-mesa-dev
 Description: Mali userspace binary driver version r3p0
  This package contains a complete set of Mali userspace drivers,
  including proprietary OpenGLESv2/EGL binaries.