Removing deprecated stuff and fixing config, build-all

build-all.sh

@@ -12,6 +12,17 @@
 IFS=";"
 START=0
 OLDFAMILY=""
+#BUILD_ALL="demo"
+
+# vaid options for automatic building and menu selection
+#
+# build 0 = don't build
+# build 1 = old kernel
+# build 2 = next kernel
+# build 3 = both kernels
+# build 4 = dev kernel
+# build 5 = next and dev kernels
+# build 6 = legacy and next and dev kernel
 
 distro-list ()
 {
@@ -34,12 +45,12 @@ while [[ $k1 -lt ${#MYARRAY1[@]} ]]
 	if [[ $KERNEL_ONLY == "yes" ]]; then
 		if [[ "$OLDFAMILY" != *"$LINUXFAMILY$BRANCH"* ]]; then
 		echo "$BOARD $RELEASE $BRANCH $BUILD_DESKTOP $LINUXFAMILY"
-		source $SRC/lib/main.sh
+		[[ $BUILD_ALL != "demo" ]] && source $SRC/lib/main.sh
 		OLDFAMILY=$OLDFAMILY"$LINUXFAMILY$BRANCH"
 		fi
 	else
 		echo "$BOARD $RELEASE $BRANCH $BUILD_DESKTOP $LINUXFAMILY"
-		source $SRC/lib/main.sh
+		[[ $BUILD_ALL != "demo" ]] && source $SRC/lib/main.sh
 	fi # kernel only
 
 	    k1=$[$k1+2]
@@ -48,22 +59,22 @@ while [[ $k1 -lt ${#MYARRAY1[@]} ]]
 }
 
 IFS=";"
-MYARRAY=($(cat $SRC/lib/configuration.sh | awk '/)#enabled/ || /#des/ || /#build/' | sed 's/)#enabled//g' | sed 's/#description //g' | sed 's/#build //g' | sed ':a;N;$!ba;s/\n/;/g'))
+
+MYARRAY=($(cat $SRC/lib/configuration.sh | awk '/)#enabled/ || /#des/ || /#build/' | sed -e 's/\t\t//' | sed 's/)#enabled//g' | sed 's/#description //g' | sed -e 's/\t//' | sed 's/#build //g' | sed ':a;N;$!ba;s/\n/;/g'))
 	i1=$[0+$START]
 	j1=$[1+$START]
 	o1=$[2+$START]
 	while [[ $i1 -lt ${#MYARRAY[@]} ]]
 	do
 		
-		if [ "${MYARRAY[$o1]}" == "1" ]; then 
+		if [[ "${MYARRAY[$o1]}" == "1" || "${MYARRAY[$o1]}" == "3" || "${MYARRAY[$o1]}" == "6" ]]; then 
 			distro-list "${MYARRAY[$i1]}" "default"
 		fi
-		if [ "${MYARRAY[$o1]}" == "2" ]; then 
+		if [[ "${MYARRAY[$o1]}" == "2" || "${MYARRAY[$o1]}" == "3" || "${MYARRAY[$o1]}" == "5" || "${MYARRAY[$o1]}" == "6" ]]; then 
 			distro-list "${MYARRAY[$i1]}" "next"
 		fi
-		if [ "${MYARRAY[$o1]}" == "3" ]; then 
+		if [[ "${MYARRAY[$o1]}" == "4" || "${MYARRAY[$o1]}" == "5" || "${MYARRAY[$o1]}" == "6" ]]; then 
-			distro-list "${MYARRAY[$i1]}" "default"
+			distro-list "${MYARRAY[$i1]}" "dev"
-			distro-list "${MYARRAY[$i1]}" "next"
 		fi
 		
         i1=$[$i1+3];j1=$[$j1+3];o1=$[$o1+3]

config/boot-next.cmd

@@ -1,5 +0,0 @@
-setenv bootargs console=tty1 root=/dev/mmcblk0p1 rootwait panic=10 consoleblank=0 
-ext4load mmc 0 0x49000000 /boot/dtb/${fdtfile}
-ext4load mmc 0 0x46000000 /boot/zImage
-env set fdt_high ffffffff
-bootz 0x46000000 - 0x49000000

configuration.sh

@@ -54,7 +54,7 @@
 
 		cubieboard4)#enabled
 			#description A80 octa core 2Gb soc wifi
-			#build 5
+			#build 0
 			LINUXFAMILY="sun9i"		
 			BOOTCONFIG="Cubieboard4_defconfig"
 			CPUMIN="1200000"
@@ -73,7 +73,7 @@
 
 		cubieboard)#enabled
 			#description A10 single core 1Gb SoC
-			#build 6	
+			#build 6
 			LINUXFAMILY="sun4i"		
 			BOOTCONFIG="Cubieboard_config" 
 			MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sunxi"
@@ -82,7 +82,7 @@
 
 		cubieboard2)#enabled
 			#description A20 dual core 1Gb SoC
-			#build 6		
+			#build 6
 			LINUXFAMILY="sun7i"
 			BOOTCONFIG="Cubieboard2_config" 
 			MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i"
@@ -91,7 +91,7 @@
 
 		cubietruck)#enabled
 			#description A20 dual core 2Gb SoC Wifi
-			#build 6	
+			#build 6
 			LINUXFAMILY="sun7i"
 			BOOTCONFIG="Cubietruck_config" 
 			MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i ap6210"
@@ -100,7 +100,7 @@
 
 		lime-a10)#enabled
 			#description A10 single core 512Mb SoC
-			#build 6		
+			#build 6
 			LINUXFAMILY="sun4i"
 			BOOTCONFIG="A10-OLinuXino-Lime_defconfig"
 			MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
@@ -118,7 +118,7 @@
 
 		lime2)#enabled
 			#description A20 dual core 1Gb SoC
-			#build 6	
+			#build 6
 			LINUXFAMILY="sun7i"
 			BOOTCONFIG="A20-OLinuXino-Lime2_defconfig" 
 			MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
@@ -126,7 +126,7 @@
 		;;
 
 		micro)#enabled
-			#description A20 dual core 1Gb SoC	
+			#description A20 dual core 1Gb SoC
 			#build 6
 			LINUXFAMILY="sun7i"
 			BOOTCONFIG="A20-OLinuXino_MICRO_config"
@@ -136,7 +136,7 @@
 
 		pcduino3nano)#enabled
 			#description A20 dual core 1Gb SoC
-			#build 6	
+			#build 6
 			LINUXFAMILY="sun7i"
 			BOOTCONFIG="Linksprite_pcDuino3_Nano_defconfig"
 			MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i"
@@ -150,14 +150,14 @@
 			BOOTLOADER="https://github.com/BPI-SINOVOIP/BPI-Mainline-uboot"
 			BOOTBRANCH="master"
 			BOOTCONFIG="Bananapi_M2_defconfig"
-			BOOTSOURCE="u-boot-bpi-m2"	
+			BOOTSOURCE="u-boot-bpi-m2"
 			MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp"
 			MODULES_NEXT="brcmfmac bonding"
 		;;
 
 		bananapi)#enabled
 			#description A20 dual core 1Gb SoC
-			#build 6		
+			#build 6
 			LINUXFAMILY="sun7i"
 			BOOTCONFIG="Bananapi_defconfig"
 			MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp"
@@ -166,7 +166,7 @@
 
 		bananapipro)#enabled
 			#description A20 dual core 1Gb SoC Wifi
-			#build 0	
+			#build 0
 			LINUXFAMILY="sun7i"
 			BOOTCONFIG="Bananapro_defconfig"
 			MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp ap6210"
@@ -175,7 +175,7 @@
 
 		lamobo-r1)#enabled
 			#description A20 dual core 1Gb SoC Switch
-			#build 6	
+			#build 6
 			LINUXFAMILY="sun7i"
 			BOOTCONFIG="Lamobo_R1_defconfig"
 			MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q"
@@ -203,7 +203,7 @@
 		orangepiplus)#enabled
 			#description H3 quad core 1Gb SoC Wifi USB hub
 			#build 4wip
-			LINUXFAMILY="sun8i"		
+			LINUXFAMILY="sun8i"
 			BOOTCONFIG="orangepi_plus_defconfig"
 			LINUXKERNEL="https://github.com/jwrdegoede/linux-sunxi"
 			LINUXSOURCE="hans"
@@ -213,7 +213,7 @@
 		cubox-i)#enabled
 			#description Freescale iMx dual/quad core Wifi
 			#build 3
-			LINUXFAMILY="cubox"	
+			LINUXFAMILY="cubox"
 			BOOTCONFIG="mx6_cubox-i_config"
 			MODULES="bonding"
 			MODULES_NEXT="bonding"
@@ -226,13 +226,13 @@
 			LINUXFAMILY="udoo"
 			BOOTCONFIG="udoo_qdl_config"
 			MODULES="bonding"
-			MODULES_NEXT=""	
+			MODULES_NEXT=""
 			SERIALCON="ttymxc1"
 		;;
 
 		udoo-neo)#enabled
 			#description Freescale iMx singe core Wifi
-			#build 1wip	
+			#build 1wip
 			#BOOTSIZE="32"
 			LINUXFAMILY="neo"
 			BOOTCONFIG="udoo_neo_config"
@@ -243,11 +243,11 @@
 
 		guitar)#enabled
 			#description S500 Lemaker Guitar Action quad core
-			#build 1wip	
+			#build 1wip
-			LINUXFAMILY="s500"	
+			LINUXFAMILY="s500"
-			OFFSET="16" 
+			OFFSET="16"
 			BOOTSIZE="16"
-			BOOTCONFIG="s500_defconfig"		
+			BOOTCONFIG="s500_defconfig"
 			MODULES="ethernet wlan_8723bs bonding"
 			MODULES_NEXT=""
 			SERIALCON="ttyS3"
@@ -255,10 +255,10 @@
 		
 		odroidxu)#enabled
 			#description Exynos5422 XU3/XU4 octa core
-			#build 3	
+			#build 1
-			LINUXFAMILY="odroidxu"				
+			LINUXFAMILY="odroidxu"
 			BOOTSIZE="16"
-			BOOTCONFIG="odroid_config"		
+			BOOTCONFIG="odroid_config"
 			MODULES="bonding"
 			MODULES_NEXT=""
 			SERIALCON="ttySAC2"
@@ -410,7 +410,7 @@
 	
 	# For user override	
 	if [[ -f "$SRC/userpatches/lib.config" ]]; then 
-		display_alert "Using user configuration override" "$SRC/userpatches/lib.config" "info"
+		#display_alert "Using user configuration override" "$SRC/userpatches/lib.config" "info"
 		source $SRC/userpatches/lib.config
 	fi
 	

patch/kernel/sunxi-default/debian_packaging-fix.patch

@@ -1,65 +0,0 @@
---- a/scripts/package/builddeb
-+++ b/scripts/package/builddeb
-@@ -81,10 +81,10 @@ fwdir="$objtree/debian/fwtmp"
- kernel_headers_dir="$objtree/debian/hdrtmp"
- libc_headers_dir="$objtree/debian/headertmp"
- dbg_dir="$objtree/debian/dbgtmp"
--packagename=linux-image-$version
--fwpackagename=linux-firmware-image-$version
--kernel_headers_packagename=linux-headers-$version
--libc_headers_packagename=linux-libc-dev
-+packagename=linux-image"$LOCALVERSION"
-+fwpackagename=linux-firmware-image"$LOCALVERSION"
-+kernel_headers_packagename=linux-headers"$LOCALVERSION"
-+libc_headers_packagename=linux-libc-dev"$LOCALVERSION"
- dbg_packagename=$packagename-dbg
- 
- if [ "$ARCH" = "um" ] ; then
-@@ -177,7 +177,7 @@ fi
- 
- if [ "$ARCH" != "um" ]; then
- 	$MAKE headers_check KBUILD_SRC=
--	$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
-+	#$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
- fi
- 
- # Install the maintainer scripts
-@@ -213,10 +213,25 @@ done
- ##
- ## Create sym link to kernel image
- ##
--kernel_tmp_version="${installed_image_path////\\/}"
--sed -e "s/exit 0/ln -sf \/$kernel_tmp_version \/boot\/zImage/g" -i $tmpdir/DEBIAN/postinst
--echo "rm -f /boot/.next" >> $tmpdir/DEBIAN/postinst
--echo "exit 0" >> $tmpdir/DEBIAN/postinst 
-+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
-+cat >> $tmpdir/DEBIAN/postinst <<EOT 
-+if [ "\$(grep nand /proc/partitions)" != "" ] && [ "\$(grep mmc /proc/partitions)" = "" ]; then
-+mkimage -A arm -O linux -T kernel -C none -a "0x40008000" -e "0x40008000" -n "Linux kernel" -d /$installed_image_path /boot/uImage  > /dev/null 2>&1
-+rm -f /$installed_image_path /boot/zImage
-+else
-+ln -sf /$installed_image_path /boot/zImage > /dev/null 2>&1 || mv /$installed_image_path /boot/zImage
-+fi
-+rm -f /boot/.next
-+exit 0
-+EOT
-+##
-+## FAT install workaround
-+##
-+sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
-+cat >> $tmpdir/DEBIAN/preinst <<EOT 
-+rm -f /boot/System.map* /boot/config* /$installed_image_path /boot/zImage
-+EOT
-+echo "exit 0" >> $tmpdir/DEBIAN/preinst 
- 
- # Try to determine maintainer and email values
- if [ -n "$DEBEMAIL" ]; then
-@@ -359,7 +374,7 @@ EOF
- 
- if [ "$ARCH" != "um" ]; then
- 	create_package "$kernel_headers_packagename" "$kernel_headers_dir"
--	create_package "$libc_headers_packagename" "$libc_headers_dir"
-+	#create_package "$libc_headers_packagename" "$libc_headers_dir"
- fi
- 
- create_package "$packagename" "$tmpdir"

patch/kernel/sunxi-default/headers-packing.patch

@@ -1,13 +0,0 @@
-diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 6c3b038..616aa9b 100755
---- a/scripts/package/builddeb
-+++ b/scripts/package/builddeb
-@@ -334,6 +334,8 @@ mkdir -p "$destdir"
- ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
- rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
- 
-+olddir="$(pwd)"; cd "$destdir"; make M=scripts clean; cd $olddir
-+
- cat <<EOF >> debian/control
- 
- Package: $kernel_headers_packagename

patch/kernel/sunxi-default/rt8192cu_driver_missing_case_fix.patch

@@ -1,20 +0,0 @@
-diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
-index 25db369..34ce064 100644
---- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
-+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
-@@ -1946,6 +1946,14 @@  void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
- 		rtl_write_word(rtlpriv, REG_RXFLTMAP2, *(u16 *)val);
- 		mac->rx_data_filter = *(u16 *)val;
- 		break;
-+	case HW_VAR_KEEP_ALIVE:{
-+			u8 array[2];
-+			array[0] = 0xff;
-+			array[1] = *((u8 *)val);
-+			rtl92c_fill_h2c_cmd(hw, H2C_92C_KEEP_ALIVE_CTRL, 2,
-+					    array);
-+			break;
-+		}
- 	default:
- 		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
- 			 "switch case not processed\n");
-

patch/kernel/sunxi-dev/banana-otg2host.patch

@@ -1,15 +0,0 @@
-diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
-old mode 100644
-new mode 100755
-index fd7594f..817a942
---- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
-+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
-@@ -269,7 +269,7 @@
- };
- 
- &usb_otg {
--	dr_mode = "otg";
-+	dr_mode = "host";
- 	status = "okay";
- };
-