diff --git a/boards/raspberry-pi2.sh b/boards/raspberry-pi2.sh
index 8e9e9bb..6e89ca0 100644
--- a/boards/raspberry-pi2.sh
+++ b/boards/raspberry-pi2.sh
@@ -40,7 +40,7 @@ gitkernel="https://github.com/raspberrypi/linux.git"
 gitbranch="rpi-4.9.y"
 rpifirmware="https://github.com/raspberrypi/firmware.git"
 
-MAKEOPTS="$MAKEOPTS ARCH=arm CROSS_COMPILE=$compiler"
+makeopts="ARCH=arm CROSS_COMPILE=$compiler"
 
 prebuild() {
 	fn prebuild
@@ -80,9 +80,9 @@ build_kernel_armhf() {
 
 	get-kernel-sources || zerr
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
-		make $MAKEOPTS bcm2709_defconfig || zerr
-		make $MAKEOPTS || zerr
-		sudo make $MAKEOPTS INSTALL_MOD_PATH=$strapdir modules_install || zerr
+		make $makeopts bcm2709_defconfig || zerr
+		make -j$(nproc) $makeopts || zerr
+		sudo -E make $makeopts INSTALL_MOD_PATH=$strapdir modules_install || zerr
 	popd
 
 	clone-git "$rpifirmware" "$R/tmp/kernels/$device_name/${device_name}-firmware"
@@ -96,10 +96,10 @@ build_kernel_armhf() {
 	popd
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
-		sudo $MAKEOPTS INSTALL_MOD_PATH=$strapdir firmware_install || zerr
-		make $MAKEOPTS mrproper
-		make $MAKEOPTS bcm2709_defconfig
-		sudo make $MAKEOPTS modules_prepare || zerr
+		sudo -E make $makeopts INSTALL_MOD_PATH=$strapdir firmware_install || zerr
+		make $makeopts mrproper
+		make $makeopts bcm2709_defconfig
+		sudo -E make $makeopts modules_prepare || zerr
 	popd
 
 	postbuild || zerr
diff --git a/lib/helpers b/lib/helpers
index 36de2df..e650fe0 100644
--- a/lib/helpers
+++ b/lib/helpers
@@ -19,36 +19,6 @@
 
 ## helper functions for arm-sdk
 
-install-custom-packages() {
-	fn install-custom-packages
-	req=(R os device_name strapdir)
-	ckreq || return 1
-
-	#case $os in
-	#	devuan)
-	#		notice "checking for custom debs"
-	#		mkdir -p $R/extra/custom-packages
-	#		pushd $R/extra/custom-packages
-	#		local pkgs="$(find ../$device_name -name '*.deb')"
-	#		[[ -n $pkgs ]] && {
-	#			notice "found!"
-	#			for deb in $pkgs; do
-	#				act "installing $deb"
-	#				ln -sf $deb .
-	#			done
-	#			install-custdebs
-	#		}
-	#		popd
-	#		rm -rf $R/extra/custom-packages
-	#		;;
-	#	*)
-	#		warn "skipping custom packages. os unsupported."
-	#		;;
-	#esac
-
-	return 0
-}
-
 get-kernel-sources() {
 	fn get-kernel-sources
 	req=(R device_name gitkernel gitbranch)
@@ -88,8 +58,8 @@ clone-git() {
 			git pull
 		popd
 	else
-		[[ -n $gitbr ]] && gitbr="-b $gitbr"
-		git clone --depth 1 "$giturl" ${gitbr} "$clonepath"
+		[[ -n $gitbr ]] && gitbr="$gitbr" || gitbr="master"
+		git clone --depth 1 -b "$gitbr" "$giturl" "$clonepath"
 	fi
 }
 
@@ -109,9 +79,9 @@ copy-root-overlay() {
 	ckreq || return 1
 
 	[[ -d $R/extra/generic-root ]] && \
-		sudo cp -rfl $R/extra/generic-root/* $strapdir
+		sudo cp -rf $R/extra/generic-root/* $strapdir
 	[[ -d $R/extra/$device_name ]] && \
-		sudo cp -rfL $R/extra/$device_name/* $strapdir
+		sudo cp -rf $R/extra/$device_name/* $strapdir
 }
 
 postbuild-clean() {
diff --git a/lib/libdevuansdk b/lib/libdevuansdk
index 1aaa06c..4ac417a 160000
--- a/lib/libdevuansdk
+++ b/lib/libdevuansdk
@@ -1 +1 @@
-Subproject commit 1aaa06c09f676f267f42a92e209d11166ecc78c6
+Subproject commit 4ac417a4a9137e851c8e8790e2fa7cf2aecf2807