Merge branch 'next'

.gitignore

@@ -1,3 +1,4 @@
+gcc
 dist
 tmp
 PASSING

CONTRIBUTORS.md

@@ -0,0 +1,4 @@
+Thank you very much for your help and advices!
+
+- Ivaylo Dimitrov <freemangordon@abv.bg>
+- Merlijn Wajer <http://wizzup.org>

TODO.md

@@ -2,4 +2,5 @@ things needed doing
 ===================
 
 * remove systemd from raspi-config and include it in builds
+* figure out which firmware will never be used for each device
 * documentation

boards/bananapi.sh

@@ -53,6 +53,7 @@ prebuild() {
 	enablessh
 	write-fstab
 	copy-zram-init
+	install-custom-packages
 
 	mkdir -p $R/tmp/kernels/$device_name
 
@@ -119,9 +120,9 @@ build_kernel_armhf() {
 			make INSTALL_MOD_PATH=$strapdir modules_install || zerr
 	popd
 
-	sudo rm -rf $strapdir/lib/firmware
-	get-kernel-firmware
-	sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
+	#sudo rm -rf $strapdir/lib/firmware
+	#get-kernel-firmware
+	#sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
 		sudo -E PATH="$PATH" \

boards/bananapro.sh

@@ -53,6 +53,7 @@ prebuild() {
 	enablessh
 	write-fstab
 	copy-zram-init
+	install-custom-packages
 
 	mkdir -p $R/tmp/kernels/$device_name
 
@@ -119,9 +120,9 @@ build_kernel_armhf() {
 			make INSTALL_MOD_PATH=$strapdir modules_install || zerr
 	popd
 
-	sudo rm -rf $strapdir/lib/firmware
-	get-kernel-firmware
-	sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
+	#sudo rm -rf $strapdir/lib/firmware
+	#get-kernel-firmware
+	#sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
 		sudo -E PATH="$PATH" \

boards/beaglebone-black.sh

@@ -50,7 +50,7 @@ prebuild() {
 	enablessh
 	write-fstab
 	copy-zram-init
-	rdate-to-rclocal
+	install-custom-packages
 
 	mkdir -p $R/tmp/kernels/$device_name
 }
@@ -153,9 +153,9 @@ build_kernel_armhf() {
 			make INSTALL_MOD_PATH=$strapdir modules_install || zerr
 	popd
 
-	sudo rm -rf $strapdir/lib/firmware
-	get-kernel-firmware
-	sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
+	#sudo rm -rf $strapdir/lib/firmware
+	#get-kernel-firmware
+	#sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
 		sudo -E PATH="$PATH" \

boards/chromebook-acer.sh

@@ -28,7 +28,7 @@ arrs+=(gpt_root gpt_boot)
 device_name="chromeacer"
 arch="armhf"
 size=1730
-inittab=""
+#inittab=""
 
 parted_type="gpt"
 gpt_boot=(8192 32768)
@@ -53,6 +53,7 @@ prebuild() {
 	enablessh
 	write-fstab
 	copy-zram-init
+	install-custom-packages
 
 	mkdir -p $R/tmp/kernels/$device_name
 }
@@ -158,9 +159,9 @@ build_kernel_armhf() {
 			make INSTALL_MOD_PATH=$strapdir modules_install || zerr
 	popd
 
-	sudo rm -rf $strapdir/lib/firmware
-	get-kernel-firmware
-	sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
+	#sudo rm -rf $strapdir/lib/firmware
+	#get-kernel-firmware
+	#sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux/arch/arm/boot
 	## {{{ kernel-nyan.its

boards/chromebook-veyron.sh

@@ -53,6 +53,7 @@ prebuild() {
 	enablessh
 	write-fstab
 	copy-zram-init
+	install-custom-packages
 
 	mkdir -p $R/tmp/kernels/$device_name
 }

boards/cubieboard2.sh

@@ -53,6 +53,7 @@ prebuild() {
 	enablessh
 	write-fstab
 	copy-zram-init
+	install-custom-packages
 
 	mkdir -p $R/tmp/kernels/$device_name
 
@@ -119,9 +120,9 @@ build_kernel_armhf() {
 			make INSTALL_MOD_PATH=$strapdir modules_install || zerr
 	popd
 
-	sudo rm -rf $strapdir/lib/firmware
-	get-kernel-firmware
-	sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
+	#sudo rm -rf $strapdir/lib/firmware
+	#get-kernel-firmware
+	#sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
 		sudo -E PATH="$PATH" \

boards/cubietruck.sh

@@ -53,6 +53,7 @@ prebuild() {
 	enablessh
 	write-fstab
 	copy-zram-init
+	install-custom-packages
 
 	mkdir -p $R/tmp/kernels/$device_name
 
@@ -119,9 +120,9 @@ build_kernel_armhf() {
 			make INSTALL_MOD_PATH=$strapdir modules_install || zerr
 	popd
 
-	sudo rm -rf $strapdir/lib/firmware
-	get-kernel-firmware
-	sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
+	#sudo rm -rf $strapdir/lib/firmware
+	#get-kernel-firmware
+	#sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
 		sudo -E PATH="$PATH" \

boards/nokia-n900.sh

@@ -33,11 +33,11 @@ parted_type="dos"
 parted_boot="fat32 2048s 264191s"
 parted_root="ext4 264192s 100%"
 
-extra_packages=()
+extra_packages+=()
 custmodules=()
 
-gitkernel="https://github.com/pali/linux-n900.git"
-gitbranch="v4.6-rc1-n900"
+gitkernel="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
+gitbranch="linux-4.8.y"
 
 
 prebuild() {
@@ -47,19 +47,27 @@ prebuild() {
 
 	notice "executing $device_name prebuild"
 
-	#enablessh
+	enablessh
 	write-fstab
 	copy-zram-init
+	install-custom-packages
 
 	mkdir -p $R/tmp/kernels/$device_name
 
-	print 1 | sudo tee $strapdir/boot/keep
+	## the wl1251 driver generates a random MAC address on every boot
+	## this "fixes" udev so it does not autoincrement the interface number each
+	## time the device boots
+	print "#" | sudo tee $strapdir/etc/udev/rules.d/75-persistent-net-generator.rules
 }
 
 postbuild() {
 	fn postbuild
 
 	notice "executing $device_name postbuild"
+
+	sudo mkdir -p $strapdir/usr/share/keymaps/
+	sudo cp $CPVERBOSE $R/extra/n900/nokia-n900.kmap $strapdir/etc/
+	sudo cp $CPVERBOSE $R/extra/n900/nokia-n900-keymap.sh $strapdir/etc/profile.d/
 }
 
 build_kernel_armhf() {
@@ -75,14 +83,14 @@ build_kernel_armhf() {
 
 	get-kernel-sources
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
-	make rx51_defconfig
-	make $MAKEOPTS zImage modules || zerr
-	cat arch/arm/boot/zImage arch/arm/boot/dts/omap3-n900.dtb > zImage
+	copy-kernel-config
+	make $MAKEOPTS zImage modules omap3-n900.dtb || zerr
+	cat arch/arm/boot/zImage arch/arm/boot/dts/omap3-n900.dtb > zImage || zerr
 	sudo -E PATH="$PATH" \
-		make INSTALL_MOD_PATH=$strapdir modules_install || zerr
+		make INSTALL_MOD_PATH=$strapdir INSTALL_MOD_STRIP=1 modules_install || zerr
 
 	mkimage -A arm -O linux -T kernel -C none -a 80008000 -e 80008000 -n zImage -d zImage uImage
-	sudo cp $CPVERBOSE uImage $strapdir/root/
+	sudo cp $CPVERBOSE uImage $strapdir/boot/
 	popd
 
 	#sudo rm -rf $strapdir/lib/firmware
@@ -92,7 +100,6 @@ build_kernel_armhf() {
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
 	sudo -E PATH="$PATH" \
 		make INSTALL_MOD_PATH=$strapdir firmware_install
-	make rx51_defconfig
 	sudo -E PATH="$PATH" \
 		make modules_prepare || zerr
 	popd

boards/odroid-xu.sh

@@ -54,6 +54,7 @@ prebuild() {
 	enablessh
 	write-fstab
 	copy-zram-init
+	install-custom-packages
 
 	mkdir -p $R/tmp/kernels/$device_name
 
@@ -144,9 +145,9 @@ build_kernel_armhf() {
 		's:^exit 0:exynos5-hwcomposer > /dev/null 2\&1 \&\nexit 0:' \
 		$strapdir/etc/rc.local
 
-	sudo rm -rf $strapdir/lib/firmware
-	get-kernel-firmware
-	sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
+	#sudo rm -rf $strapdir/lib/firmware
+	#get-kernel-firmware
+	#sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
 		sudo -E PATH="$PATH" \

boards/ouya.sh

@@ -48,6 +48,7 @@ prebuild() {
 	enablessh
 	#write-fstab
 	copy-zram-init
+	install-custom-packages
 
 	cat <<EOF | sudo tee ${strapdir}/etc/fstab
 # <file system> <mount point> <type> <options> <dump> <pass>

boards/raspberry-pi2.sh

@@ -51,7 +51,7 @@ prebuild() {
 	enablessh
 	write-fstab
 	copy-zram-init
-	rdate-to-rclocal
+	install-custom-packages
 
 	mkdir -p $R/tmp/kernels/$device_name
 }
@@ -144,9 +144,9 @@ build_kernel_armhf() {
 	sudo cp $CPVERBOSE arch/arm/boot/dts/overlays/README $strapdir/boot/overlays/
 	popd
 
-	sudo rm -rf $strapdir/lib/firmware
-	get-kernel-firmware
-	sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
+	#sudo rm -rf $strapdir/lib/firmware
+	#get-kernel-firmware
+	#sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
 		sudo -E PATH="$PATH" \

boards/raspberry-pi3.sh

@@ -52,7 +52,7 @@ prebuild() {
 	enablessh
 	write-fstab
 	copy-zram-init
-	rdate-to-rclocal
+	install-custom-packages
 
 	mkdir -p $R/tmp/kernels/$device_name
 }
@@ -123,9 +123,9 @@ build_kernel_arm64() {
 	sudo cp $CPVERBOSE arch/arm64/boot/dts/overlays/README $strapdir/boot/overlays/
 	popd
 
-	sudo rm -rf $strapdir/lib/firmware
-	get-kernel-firmware
-	sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
+	#sudo rm -rf $strapdir/lib/firmware
+	#get-kernel-firmware
+	#sudo cp $CPVERBOSE -ra $R/tmp/linux-firmware $strapdir/lib/firmware
 
 	pushd $R/tmp/kernels/$device_name/${device_name}-linux
 		sudo -E PATH="$PATH" \

doc/quirks.md

@@ -30,7 +30,6 @@ adb reboot-bootloader
 fastboot boot zImage-3.1.10-tk*
 ```
 ## Nokia N900
+* To boot, dd the image to a microSD card, and in the uboot console, type: `run sdboot`
 * [http://pub.parazyd.cf/N900/merlijnsdocs.txt](http://pub.parazyd.cf/N900/merlijnsdocs.txt)
 * [http://talk.maemo.org/showthread.php?t=81613](http://talk.maemo.org/showthread.php?t=81613)
-* The `uImage` can be found in the `/root/` directory in the image.
-

extra/n900/nokia-n900-keymap.sh

@@ -0,0 +1 @@
+/bin/busybox loadkmap < /etc/nokia-n900.kmap

lib/helpers

@@ -19,10 +19,33 @@
 
 ## helper functions for arm-sdk
 
-build-image() {
-	fn build-image "$@"
+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/*.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
 
-	bootstrap $arch
 }
 
 get-kernel-sources() {

lib/libdevuansdk

@@ -1 +1 @@
-Subproject commit d2089d9a203f79bb5514488dfe6e4dfe26bbb889
+Subproject commit d28e0a93f4561099adc6c270027ed3331ce44489

sdk

@@ -34,7 +34,7 @@ QUIET=0
 }
 
 
-source lib/zuper/zuper
+source $R/lib/zuper/zuper
 
 ## global vars
 vars+=(armsdk_version)