Build all rework and added new internal variable for desktop building

This commit is contained in:
Igor Pecovnik 2016-02-10 20:01:02 +01:00
parent 789d8d09bf
commit d3cdac7000
2 changed files with 64 additions and 36 deletions

View file

@ -25,11 +25,15 @@ OLDFAMILY=""
# build 6 = legacy and next and dev kernel
# Include here to make "display_alert" and "prepare_host" available
source $SRC/lib/general.sh # General functions
source $SRC/lib/general.sh
# Function display and runs compilation with desired parameters
#
# Two parameters: $1 = BOARD $2 = BRANCH
#
distro-list ()
{
declare -a MYARRAY1=('wheezy' 'Debian 7 Wheezy | oldstable' 'jessie' 'Debian 8 Jessie | stable' 'trusty' 'Ubuntu Trusty Tahr 14.04.x LTS');
declare -a MYARRAY1=('wheezy' '' 'jessie' '' 'trusty' '');
k1=0
l1=1
while [[ $k1 -lt ${#MYARRAY1[@]} ]]
@ -38,41 +42,51 @@ while [[ $k1 -lt ${#MYARRAY1[@]} ]]
BOARD=$1
RELEASE=${MYARRAY1[$k1]}
BRANCH=$2
if [[ $2 == "default" && "$RELEASE" == "trusty" ]]; then
BUILD_DESKTOP="yes"
else
BUILD_DESKTOP="no"
fi
unset IFS LINUXFAMILY LINUXCONFIG LINUXKERNEL LINUXSOURCE KERNELBRANCH BOOTLOADER BOOTSOURCE BOOTBRANCH CPUMIN GOVERNOR needs_uboot needs_kernel
unset IFS array DESKTOP_TARGET LINUXFAMILY LINUXCONFIG LINUXKERNEL LINUXSOURCE KERNELBRANCH \
BOOTLOADER BOOTSOURCE BOOTBRANCH CPUMIN GOVERNOR needs_uboot needs_kernel
source $SRC/lib/configuration.sh
display_alert "$BOARD" "$RELEASE $BRANCH $BUILD_DESKTOP $LINUXFAMILY" "ext"
array=(${DESKTOP_TARGET//,/ })
# % means all BRANCH / DISTRIBUTION
[[ ${array[0]} == "%" ]] && array[0]=$RELEASE
[[ ${array[1]} == "%" ]] && array[1]=$2
# we define desktop building in config
if [[ "$RELEASE" == "${array[0]}" && $2 == "${array[1]}" ]]; then
display_alert "$BOARD desktop" "$RELEASE - $BRANCH - $LINUXFAMILY" "ext"
BUILD_DESKTOP="yes"
else
display_alert "$BOARD" "$RELEASE - $BRANCH - $LINUXFAMILY" "info"
BUILD_DESKTOP="no"
fi
# demo - for debugging purposes
[[ $BUILD_ALL != "demo" ]] && source $SRC/lib/main.sh
IFS=";"
k1=$[$k1+2]
l1=$[$l1+2]
k1=$[$k1+2]
l1=$[$l1+2]
done
}
IFS=";"
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" || "${MYARRAY[$o1]}" == "3" || "${MYARRAY[$o1]}" == "6" ]]; then
distro-list "${MYARRAY[$i1]}" "default"
fi
if [[ "${MYARRAY[$o1]}" == "2" || "${MYARRAY[$o1]}" == "3" || "${MYARRAY[$o1]}" == "5" || "${MYARRAY[$o1]}" == "6" ]]; then
distro-list "${MYARRAY[$i1]}" "next"
fi
if [[ "${MYARRAY[$o1]}" == "4" || "${MYARRAY[$o1]}" == "5" || "${MYARRAY[$o1]}" == "6" ]]; then
distro-list "${MYARRAY[$i1]}" "dev"
fi
i1=$[$i1+3];j1=$[$j1+3];o1=$[$o1+3]
done
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" || "${MYARRAY[$o1]}" == "3" || "${MYARRAY[$o1]}" == "6" ]]; then
distro-list "${MYARRAY[$i1]}" "default"
fi
if [[ "${MYARRAY[$o1]}" == "2" || "${MYARRAY[$o1]}" == "3" || "${MYARRAY[$o1]}" == "5" || "${MYARRAY[$o1]}" == "6" ]]; then
distro-list "${MYARRAY[$i1]}" "next"
fi
if [[ "${MYARRAY[$o1]}" == "4" || "${MYARRAY[$o1]}" == "5" || "${MYARRAY[$o1]}" == "6" ]]; then
distro-list "${MYARRAY[$i1]}" "dev"
fi
i1=$[$i1+3];j1=$[$j1+3];o1=$[$o1+3]
done

View file

@ -85,10 +85,11 @@
cubieboard)#enabled
#description A10 single core 1Gb SoC
#build 6
LINUXFAMILY="sun4i"
BOOTCONFIG="Cubieboard_config"
LINUXFAMILY="sun4i"
BOOTCONFIG="Cubieboard_config"
MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sunxi"
MODULES_NEXT="bonding"
DESKTOP_TARGET="trusty,default"
;;
cubieboard2)#enabled
@ -98,6 +99,7 @@
BOOTCONFIG="Cubieboard2_config"
MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i"
MODULES_NEXT="bonding"
DESKTOP_TARGET="trusty,default"
;;
cubietruck)#enabled
@ -107,6 +109,7 @@
BOOTCONFIG="Cubietruck_config"
MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i ap6210"
MODULES_NEXT="brcmfmac rfcomm hidp bonding"
DESKTOP_TARGET="trusty,%"
;;
lime-a10)#enabled
@ -116,6 +119,7 @@
BOOTCONFIG="A10-OLinuXino-Lime_defconfig"
MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
MODULES_NEXT="bonding"
DESKTOP_TARGET="trusty,next"
;;
lime)#enabled
@ -125,6 +129,7 @@
BOOTCONFIG="A20-OLinuXino-Lime_defconfig"
MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
MODULES_NEXT="bonding"
DESKTOP_TARGET="trusty,default"
;;
lime2)#enabled
@ -134,6 +139,7 @@
BOOTCONFIG="A20-OLinuXino-Lime2_defconfig"
MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
MODULES_NEXT="bonding"
DESKTOP_TARGET="trusty,default"
;;
micro)#enabled
@ -143,6 +149,7 @@
BOOTCONFIG="A20-OLinuXino_MICRO_config"
MODULES="hci_uart gpio_sunxi rfcomm hidp bonding spi_sun7i 8021q a20_tp"
MODULES_NEXT="bonding"
DESKTOP_TARGET="trusty,default"
;;
pcduino3nano)#enabled
@ -152,6 +159,7 @@
BOOTCONFIG="Linksprite_pcDuino3_Nano_defconfig"
MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i"
MODULES_NEXT="bonding"
DESKTOP_TARGET="trusty,default"
;;
bananapim2)#enabled
@ -161,6 +169,7 @@
BOOTCONFIG="Sinovoip_BPI_M2_defconfig"
MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp"
MODULES_NEXT="brcmfmac bonding"
DESKTOP_TARGET="trusty,next"
;;
bananapi)#enabled
@ -170,6 +179,7 @@
BOOTCONFIG="Bananapi_defconfig"
MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp ap6210"
MODULES_NEXT="brcmfmac bonding"
DESKTOP_TARGET="trusty,%"
;;
lamobo-r1)#enabled
@ -178,7 +188,7 @@
LINUXFAMILY="sun7i"
BOOTCONFIG="Lamobo_R1_defconfig"
MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q"
MODULES_NEXT="brcmfmac bonding"
MODULES_NEXT="brcmfmac bonding"
;;
orangepi)#enabled
@ -188,6 +198,7 @@
BOOTCONFIG="Orangepi_defconfig"
MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp"
MODULES_NEXT="bonding"
DESKTOP_TARGET="trusty,%"
;;
orangepimini)#enabled
@ -205,7 +216,7 @@
LINUXFAMILY="sun8i"
BOOTCONFIG="orangepi_plus_defconfig"
MODULES="8189es"
MODULES_NEXT=""
MODULES_NEXT=""
;;
cubox-i)#enabled
@ -216,6 +227,7 @@
MODULES="bonding"
MODULES_NEXT="bonding"
SERIALCON="ttymxc0"
DESKTOP_TARGET="jessie,default"
;;
udoo)#enabled
@ -226,6 +238,7 @@
MODULES="bonding"
MODULES_NEXT=""
SERIALCON="ttymxc1"
DESKTOP_TARGET="jessie,%"
;;
udoo-neo)#enabled
@ -260,6 +273,7 @@
MODULES="bonding"
MODULES_NEXT=""
SERIALCON="ttySAC2"
DESKTOP_TARGET="jessie,default"
;;
toradex)#disabled
@ -485,4 +499,4 @@
echo -e "Config: $LINUXCONFIG\nKernel source: $LINUXKERNEL\nBranch: $KERNELBRANCH" >> $DEST/debug/install.log
echo -e "linuxsource: $LINUXSOURCE\nOffset: $OFFSET\nbootsize: $BOOTSIZE" >> $DEST/debug/install.log
echo -e "bootloader: $BOOTLOADER\nbootsource: $BOOTSOURCE\nbootbranch: $BOOTBRANCH" >> $DEST/debug/install.log
echo -e "CPU $CPUMIN / $CPUMAX with $GOVERNOR" >> $DEST/debug/install.log
echo -e "CPU $CPUMIN / $CPUMAX with $GOVERNOR" >> $DEST/debug/install.log