Merge pull request #2 from igorpecovnik/master

add igor updates

Author: golfromeo-fr

boards.sh

@@ -18,6 +18,13 @@ from=0
 RELEASE_LIST=("trusty" "xenial" "wheezy" "jessie")
 BRANCH_LIST=("default" "next" "dev")
 
+# add dependencies for converting .md to .pdf
+if [[ ! -f /etc/apt/sources.list.d/nodesource.list ]]; then
+	curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
+	apt-get install -y libfontconfig1 nodejs 
+	npm install -g markdown-pdf
+fi
+
 create_images_list()
 {
 	for board in $SRC/lib/config/boards/*.conf; do
@@ -93,6 +100,15 @@ for line in "${buildlist[@]}"; do
 done
 echo -e "\n${#buildlist[@]} total\n"
 
+# create PDF from files inside lib/documentation
+mkdir -p $DEST/cache/documentation
+markdown-pdf $SRC/lib/documentation/header*.md -o "$DEST/cache/documentation/header.pdf"
+markdown-pdf $SRC/lib/documentation/main*.md -o "$DEST/cache/documentation/main.pdf"
+markdown-pdf $SRC/lib/documentation/footer*.md -o "$DEST/cache/documentation/footer.pdf"
+# merge header - main - footer
+temprevision=$(cat $SRC/lib/configuration.sh | grep REVISION | grep -o '".*"' | sed 's/"//g' | cut -f1 -d"$")
+pdftk "$DEST/cache/documentation/header.pdf" "$DEST/cache/documentation/main.pdf" "$DEST/cache/documentation/footer.pdf" cat output "$DEST/images/Armbian_"$temprevision"_documentations.pdf"
+
 [[ $BUILD_ALL == demo ]] && exit 0
 
 buildall_start=`date +%s`

build-all.sh

@@ -70,6 +70,7 @@ chroot_build_packages()
 		#!/bin/bash
 		export PATH="/usr/lib/ccache:$PATH"
 		export HOME="/root"
+		export DEBIAN_FRONTEND="noninteractive"
 		# for display_alert logging
 		export DEST="/tmp"
 		mkdir -p /tmp/debug

chroot-buildpackages.sh

@@ -12,20 +12,18 @@ if ext4load mmc 0 0x00000000 /boot/.next || fatload mmc 0 0x00000000 .next || ex
 then
 # sunxi mainline kernel
 #--------------------------------------------------------------------------------------------------------------------------------
-ext4load mmc 0 0x49000000 /boot/dtb/${fdtfile} || fatload mmc 0 0x49000000 /dtb/${fdtfile} || ext4load mmc 0 0x49000000 /dtb/${fdtfile}
-ext4load mmc 0 0x42000000 /boot/uInitrd || fatload mmc 0 0x42000000 uInitrd || ext4load mmc 0 0x42000000 uInitrd
-ext4load mmc 0 0x46000000 /boot/zImage || fatload mmc 0 0x46000000 zImage || ext4load mmc 0 0x46000000 zImage
-bootz 0x46000000 0x42000000 0x49000000
-#bootz 0x46000000 - 0x49000000
+ext4load mmc 0 ${fdt_addr_r} /boot/dtb/${fdtfile} || fatload mmc 0 ${fdt_addr_r} /dtb/${fdtfile} || ext4load mmc 0 ${fdt_addr_r} /dtb/${fdtfile}
+ext4load mmc 0 ${ramdisk_addr_r} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr_r} uInitrd || ext4load mmc 0 ${ramdisk_addr_r} uInitrd || setenv ramdisk_addr_r "-"
+ext4load mmc 0 ${kernel_addr_r} /boot/zImage || fatload mmc 0 ${kernel_addr_r} zImage || ext4load mmc 0 ${kernel_addr_r} zImage
+bootz ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
 #--------------------------------------------------------------------------------------------------------------------------------
 else
 # sunxi android kernel
 #--------------------------------------------------------------------------------------------------------------------------------
-ext4load mmc 0 0x43000000 /boot/script.bin || fatload mmc 0 0x43000000 script.bin || ext4load mmc 0 0x43000000 script.bin
-ext4load mmc 0 0x42000000 /boot/uInitrd || fatload mmc 0 0x42000000 uInitrd || ext4load mmc 0 0x42000000 uInitrd
-ext4load mmc 0 0x48000000 /boot/zImage || fatload mmc 0 0x48000000 zImage || ext4load mmc 0 0x48000000 zImage
-bootz 0x48000000 0x42000000
-#bootz 0x48000000
+ext4load mmc 0 ${fdt_addr_r} /boot/script.bin || fatload mmc 0 ${fdt_addr_r} script.bin || ext4load mmc 0 ${fdt_addr_r} script.bin
+ext4load mmc 0 ${ramdisk_addr_r} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr_r} uInitrd || ext4load mmc 0 ${ramdisk_addr_r} uInitrd || setenv ramdisk_addr_r "-"
+ext4load mmc 0 ${kernel_addr_r} /boot/zImage || fatload mmc 0 ${kernel_addr_r} zImage || ext4load mmc 0 ${kernel_addr_r} zImage
+bootz ${kernel_addr_r} ${ramdisk_addr_r}
 #--------------------------------------------------------------------------------------------------------------------------------
 fi
 # Recompile with:

config/bootscripts/boot-sunxi.cmd

@@ -2150,6 +2150,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y
+CONFIG_RTL8189FS=m
 CONFIG_RTL_CARDS=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m

config/kernel/linux-sun8i-dev.config

@@ -70,8 +70,7 @@ debootstrap_ng()
 	mount --bind $DEST/debs/ $CACHEDIR/sdcard/tmp
 
 	install_distribution_specific
-	install_kernel
-	install_board_specific
+	install_common
 
 	# install additional applications
 	[[ $EXTERNAL == yes ]] && install_external_applications

debootstrap-ng.sh

@@ -178,6 +178,16 @@ mount -t proc chproc $CACHEDIR/sdcard/proc
 mount -t sysfs chsys $CACHEDIR/sdcard/sys
 mount -t devtmpfs chdev $CACHEDIR/sdcard/dev || mount --bind /dev $CACHEDIR/sdcard/dev
 mount -t devpts chpts $CACHEDIR/sdcard/dev/pts
+
+# create proper fstab
+if [[ $BOOTSIZE -eq 0 ]]; then
+	local device="/dev/mmcblk0p1	/           ext4    defaults,noatime,nodiratime,data=writeback,commit=600,errors=remount-ro"
+else
+	local device="/dev/mmcblk0p2	/           ext4    defaults,noatime,nodiratime,data=writeback,commit=600,errors=remount-ro"
+	echo "/dev/mmcblk0p1        /boot   vfat    defaults        0       0" >> $CACHEDIR/sdcard/etc/fstab
+fi
+echo "$device        0       0" >> $CACHEDIR/sdcard/etc/fstab
+
 }
 
 shrinking_raw_image (){ # Parameter: RAW image with full path
@@ -237,6 +247,15 @@ closing_image (){
 #--------------------------------------------------------------------------------------------------------------------------------
 # Closing image and clean-up
 #--------------------------------------------------------------------------------------------------------------------------------
+# if we have a special fat boot partition, alter rootfs=
+if [[ $BOOTSIZE -gt 0 ]]; then
+	display_alert "Adjusting boot scripts" "$BOARD" "info"
+	[[ -f $CACHEDIR/sdcard/boot/boot.cmd ]] && sed -e 's/p1 /p2 /g' -i $CACHEDIR/sdcard/boot/boot.cmd
+fi
+# convert to uboot compatible script
+[[ -f $CACHEDIR/sdcard/boot/boot.cmd ]] && \
+	mkimage -C none -A arm -T script -d $CACHEDIR/sdcard/boot/boot.cmd $CACHEDIR/sdcard/boot/boot.scr >> /dev/null
+
 customize_image
 chroot $CACHEDIR/sdcard /bin/bash -c "sync"
 sync