diff --git a/config/boot.cmd b/config/boot.cmd index 03972a59e9..a8993ec5b5 100644 --- a/config/boot.cmd +++ b/config/boot.cmd @@ -1,6 +1,4 @@ -# if you want to boot jessie with systemd: setenv bootargs init=/bin/systemd console=tty1 ... -# remember to disable ramlog prior switching to systemd -setenv bootargs "console=tty1 root=/dev/mmcblk0p1 rootwait rootfstype=ext4 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 hdmi.audio=EDID:0 disp.screen0_output_mode=1920x1080p60 panic=10 consoleblank=0 enforcing=0 loglevel=1" +setenv bootargs "console=tty1 root=/dev/mmcblk0p1 rootwait sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 hdmi.audio=EDID:0 disp.screen0_output_mode=1920x1080p60 panic=10 consoleblank=0 enforcing=0 loglevel=1" #-------------------------------------------------------------------------------------------------------------------------------- # Boot loader script to boot with different boot methods for old and new kernel #-------------------------------------------------------------------------------------------------------------------------------- diff --git a/general.sh b/general.sh index d15a933023..5f88a217e3 100644 --- a/general.sh +++ b/general.sh @@ -43,7 +43,7 @@ cleaning() ;; "cache") # delete output/cache - [ -d "$DEST/cache" ] && display_alert "Cleaning" "$DEST/cache" "info" && rm -rf $DEST/cache/* + [ -d "$DEST/cache" ] && display_alert "Cleaning" "$DEST/cache" "info" && find $DEST/cache/ -type f -delete ;; "images") # delete output/images @@ -102,6 +102,9 @@ display_alert() # Let's have unique way of displaying alerts #-------------------------------------------------------------------------------------------------------------------------------- { +# log function parameters to install.log +echo "Displaying message: $@" >> $DEST/debug/install.log + if [[ $2 != "" ]]; then TMPARA="[\e[0;33m $2 \x1B[0m]"; else unset TMPARA; fi if [ $3 == "err" ]; then echo -e "[\e[0;31m error \x1B[0m] $1 $TMPARA" @@ -294,7 +297,7 @@ prepare_host() { # packages list for host PAK="aptly ca-certificates device-tree-compiler pv bc lzop zip binfmt-support build-essential ccache debootstrap ntpdate pigz \ gawk gcc-arm-linux-gnueabihf qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev ntpdate \ - parted pkg-config libncurses5-dev whiptail debian-keyring debian-archive-keyring" + parted pkg-config libncurses5-dev whiptail debian-keyring debian-archive-keyring f2fs-tools" # warning: apt-cacher-ng will fail if installed and used both on host and in container/chroot environment with shared network # set NO_APT_CACHER=yes to prevent installation errors in such case diff --git a/main.sh b/main.sh index a475a512b4..681b8cd880 100644 --- a/main.sh +++ b/main.sh @@ -16,6 +16,10 @@ # Include here to make "display_alert" and "prepare_host" available source $SRC/lib/general.sh # General functions +# compress and remove old logs +(cd $DEST/debug && tar -czf logs-$(date +"%d_%m_%Y-%H_%M_%S").tgz *.log) > /dev/null 2>&1 +rm -f $DEST/debug/*.log > /dev/null 2>&1 + # Script parameters handling for i in "$@"; do if [[ "$i" == *"="* ]]; then @@ -188,11 +192,7 @@ source $SRC/lib/makeboarddeb.sh # Create board support package # The name of the job VERSION="Armbian $REVISION ${BOARD^} $DISTRIBUTION $RELEASE $BRANCH" -# compress and remove old logs -(cd $DEST/debug; tar -czf logs-$(date +"%d_%m_%Y-%H_%M_%S").tgz *.log) -rm -f $DEST/debug/*.log - -echo `date +"%d.%m.%Y %H:%M:%S"` $VERSION > $DEST/debug/install.log +echo `date +"%d.%m.%Y %H:%M:%S"` $VERSION >> $DEST/debug/install.log # needed if process failed in the middle umount_image @@ -231,7 +231,6 @@ fi start=`date +%s` # fetch_from_github [repository, sub directory] -mkdir -p $DEST -p $SOURCES if [ "$FORCE_CHECKOUT" = "yes" ]; then FORCE="-f"; else FORCE=""; fi