From 4f9eb09b612a67eddaad8905c9352bcc53e44c62 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Tue, 14 Aug 2018 19:12:51 +0200
Subject: [PATCH] Remove Odroid N1 conf, adjust few board configs, remove
 deprecated command, bump with version

---
 config/boards/bananapi.conf    |  4 ++--
 config/boards/bananapipro.conf |  4 ++--
 config/boards/odroidn1.wip     | 14 --------------
 lib/configuration.sh           |  2 +-
 lib/desktop.sh                 |  1 -
 5 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 config/boards/odroidn1.wip

diff --git a/config/boards/bananapi.conf b/config/boards/bananapi.conf
index 02547db7f..b89cc754f 100644
--- a/config/boards/bananapi.conf
+++ b/config/boards/bananapi.conf
@@ -6,8 +6,8 @@ MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp
 MODULES_NEXT="brcmfmac bonding"
 #
 KERNEL_TARGET="default,next,dev"
-CLI_TARGET="stretch,xenial:next"
+CLI_TARGET="stretch,bionic:next"
 DESKTOP_TARGET="xenial:default,next"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
diff --git a/config/boards/bananapipro.conf b/config/boards/bananapipro.conf
index 6679aecb3..ab6f3cfc8 100644
--- a/config/boards/bananapipro.conf
+++ b/config/boards/bananapipro.conf
@@ -6,8 +6,8 @@ MODULES="hci_uart gpio_sunxi rfcomm hidp sunxi-ir bonding spi_sun7i 8021q a20_tp
 MODULES_NEXT="brcmfmac bonding"
 #
 KERNEL_TARGET="default,next,dev"
-CLI_TARGET="stretch,xenial:next"
+CLI_TARGET="stretch,bionic:next"
 DESKTOP_TARGET="xenial:default,next"
 #
-CLI_BETA_TARGET="bionic:next"
+CLI_BETA_TARGET=""
 DESKTOP_BETA_TARGET=""
diff --git a/config/boards/odroidn1.wip b/config/boards/odroidn1.wip
deleted file mode 100644
index e1c4f125e..000000000
--- a/config/boards/odroidn1.wip
+++ /dev/null
@@ -1,14 +0,0 @@
-# RK3399 N1 hexa core 4GB SoC eMMC GBE SATA USB3 WiFi
-BOARD_NAME="Odroid N1"
-BOARDFAMILY="rk3399"
-BOOTCONFIG="odroidn1_defconfig"
-#
-MODULES=""
-MODULES_NEXT=""
-#
-KERNEL_TARGET="default"
-CLI_TARGET=""
-DESKTOP_TARGET=""
-#
-CLI_BETA_TARGET=""
-DESKTOP_BETA_TARGET=""
\ No newline at end of file
diff --git a/lib/configuration.sh b/lib/configuration.sh
index d9d887ca9..fb9a4e700 100644
--- a/lib/configuration.sh
+++ b/lib/configuration.sh
@@ -10,7 +10,7 @@
 # common options
 # daily beta build contains date in subrevision
 if [[ $BETA == yes && -z $SUBREVISION ]]; then SUBREVISION="."$(date --date="tomorrow" +"%y%m%d"); fi
-REVISION="5.58$SUBREVISION" # all boards have same revision
+REVISION="5.59$SUBREVISION" # all boards have same revision
 ROOTPWD="1234" # Must be changed @first login
 MAINTAINER="Igor Pecovnik" # deb signature
 MAINTAINERMAIL="igor.pecovnik@****l.com" # deb signature
diff --git a/lib/desktop.sh b/lib/desktop.sh
index de01625fd..73ac08a62 100644
--- a/lib/desktop.sh
+++ b/lib/desktop.sh
@@ -117,7 +117,6 @@ desktop_postinstall ()
 	# Compile Turbo Frame buffer for sunxi
 	if [[ $LINUXFAMILY == sun* && $BRANCH == default ]]; then
 		sed 's/name="use_compositing" type="bool" value="true"/name="use_compositing" type="bool" value="false"/' -i $SDCARD/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
-		sed 's/name="use_compositing" type="bool" value="true"/name="use_compositing" type="bool" value="false"/' -i $SDCARD/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
 
 		# enable memory reservations
 		echo "disp_mem_reserves=on" >> $SDCARD/boot/armbianEnv.txt