From caec8486190d5d176d6524c5c95983c9cb8a14e5 Mon Sep 17 00:00:00 2001
From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
Date: Sat, 2 Jun 2018 17:49:57 +0300
Subject: [PATCH] Drop HAS_UUID_SUPPORT variable

---
 config/sources/cubox.conf         | 2 --
 config/sources/meson64.conf       | 2 --
 config/sources/mvebu.conf         | 2 --
 config/sources/mvebu64.conf       | 1 -
 config/sources/odroidc1.conf      | 2 --
 config/sources/odroidc2.conf      | 1 -
 config/sources/odroidxu4.conf     | 1 -
 config/sources/rda8810.conf       | 2 --
 config/sources/rk3328.conf        | 1 -
 config/sources/rk3399.conf        | 1 -
 config/sources/rockchip.conf      | 1 -
 config/sources/s5p6818.conf       | 2 --
 config/sources/sunxi64_common.inc | 1 -
 config/sources/sunxi_common.inc   | 1 -
 config/sources/udoo-neo.conf      | 1 -
 config/sources/udoo.conf          | 1 -
 lib/build-all.sh                  | 2 +-
 lib/debootstrap-ng.sh             | 8 ++------
 18 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/config/sources/cubox.conf b/config/sources/cubox.conf
index 50bd646a86..8f3b16da3c 100644
--- a/config/sources/cubox.conf
+++ b/config/sources/cubox.conf
@@ -5,7 +5,6 @@ BOOTSCRIPT='boot-cubox.cmd:boot.cmd'
 BOOTENV_FILE='cubox-default.txt'
 
 UBOOT_TARGET_MAP=';;SPL u-boot.img'
-HAS_UUID_SUPPORT=yes
 UBOOT_USE_GCC='< 5.0'
 
 case $BRANCH in
@@ -63,7 +62,6 @@ if [[ $BOARD == wandboard-quad ]]; then
 	KERNEL_USE_GCC='> 6.3'
 	CPUMAX=1008000
 	GOVERNOR=ondemand
-	HAS_UUID_SUPPORT=yes
 	BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
 	BOOTDIR=$MAINLINE_UBOOT_DIR
 	BOOTBRANCH="branch:v2017.03"
diff --git a/config/sources/meson64.conf b/config/sources/meson64.conf
index 1cf2b4ebda..cf58edbfd0 100644
--- a/config/sources/meson64.conf
+++ b/config/sources/meson64.conf
@@ -6,8 +6,6 @@ UBOOT_USE_GCC='> 7.0'
 UBOOT_TARGET_MAP="u-boot-dtb.img;;$SRC/packages/blobs/meson/u-boot-${BOARD}.bin:u-boot.bin u-boot-dtb.img"
 BOOTSCRIPT="boot-meson64-${BOARD}.cmd:boot.cmd"
 
-HAS_UUID_SUPPORT=yes
-
 ARCH=arm64
 KERNEL_IMAGE_TYPE=Image
 
diff --git a/config/sources/mvebu.conf b/config/sources/mvebu.conf
index 700c3742f4..4fb91ef020 100644
--- a/config/sources/mvebu.conf
+++ b/config/sources/mvebu.conf
@@ -1,5 +1,3 @@
-HAS_UUID_SUPPORT=yes
-
 if [[ $BOARD == helios4 ]]; then
 	source "${BASH_SOURCE%/*}/mvebu-helios4.inc"
 	BOOTENV_FILE='helios4-default.txt'
diff --git a/config/sources/mvebu64.conf b/config/sources/mvebu64.conf
index 5b592a722e..57ac2fca8a 100644
--- a/config/sources/mvebu64.conf
+++ b/config/sources/mvebu64.conf
@@ -11,7 +11,6 @@ BOOTBRANCH='branch:u-boot-2017.03-armada-17.10'
 UBOOT_USE_GCC='< 7.0'
 
 BOOTENV_FILE='clearfog-default.txt'
-HAS_UUID_SUPPORT=yes
 
 ATFSOURCE='https://github.com/MarvellEmbeddedProcessors/atf-marvell'
 ATFDIR='arm-trusted-firmware-espressobin'
diff --git a/config/sources/odroidc1.conf b/config/sources/odroidc1.conf
index d0129dc183..b56daf49c4 100644
--- a/config/sources/odroidc1.conf
+++ b/config/sources/odroidc1.conf
@@ -6,8 +6,6 @@ BOOTSCRIPT="boot-odroid-c1.ini:boot.ini"
 
 UBOOT_TARGET_MAP=';;sd_fuse/bl1.bin.hardkernel sd_fuse/u-boot.bin'
 
-HAS_UUID_SUPPORT=yes
-
 KERNEL_IMAGE_TYPE=uImage
 
 case $BRANCH in
diff --git a/config/sources/odroidc2.conf b/config/sources/odroidc2.conf
index 3243bbd127..ebbeef7c4a 100644
--- a/config/sources/odroidc2.conf
+++ b/config/sources/odroidc2.conf
@@ -1,6 +1,5 @@
 ARCH=arm64
 KERNEL_IMAGE_TYPE=Image
-HAS_UUID_SUPPORT=yes
 
 case $BRANCH in
 	default)
diff --git a/config/sources/odroidxu4.conf b/config/sources/odroidxu4.conf
index cab6f85083..c2541a8aa8 100644
--- a/config/sources/odroidxu4.conf
+++ b/config/sources/odroidxu4.conf
@@ -2,7 +2,6 @@ BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
 BOOTSCRIPT='boot-odroid-xu4-default.ini:boot.ini'
 BOOTDIR='u-boot-odroidxu'
 BOOTENV_FILE='odroidxu4-default.txt'
-HAS_UUID_SUPPORT=yes
 
 case $BRANCH in
 	default)
diff --git a/config/sources/rda8810.conf b/config/sources/rda8810.conf
index d27d661918..7f2025dc3f 100644
--- a/config/sources/rda8810.conf
+++ b/config/sources/rda8810.conf
@@ -20,8 +20,6 @@ KERNEL_USE_GCC='< 5.0'
 
 CAN_BUILD_STRETCH=no
 
-HAS_UUID_SUPPORT=yes
-
 CPUMIN=329333
 CPUMAX=988000
 
diff --git a/config/sources/rk3328.conf b/config/sources/rk3328.conf
index 3d6785dc62..8fd4a08bac 100644
--- a/config/sources/rk3328.conf
+++ b/config/sources/rk3328.conf
@@ -12,7 +12,6 @@ BOOTSOURCE='https://github.com/ayufan-rock64/linux-u-boot'
 BOOTDIR='u-boot-rk3328'
 BOOTPATCHDIR="u-boot-rk3328-${BRANCH}"
 
-HAS_UUID_SUPPORT=yes
 BOOTDELAY=0
 OVERLAY_PREFIX='rk3328'
 
diff --git a/config/sources/rk3399.conf b/config/sources/rk3399.conf
index 8ef505d4c4..cfd7d31bd4 100644
--- a/config/sources/rk3399.conf
+++ b/config/sources/rk3399.conf
@@ -13,7 +13,6 @@ BOOTBRANCH='branch:odroidn1-v2017.07'
 BOOTDIR='u-boot-rk3399'
 BOOTPATCHDIR="u-boot-rk3399-${BRANCH}"
 
-HAS_UUID_SUPPORT=yes
 BOOTDELAY=0
 OVERLAY_PREFIX='rk3328'
 
diff --git a/config/sources/rockchip.conf b/config/sources/rockchip.conf
index fc9e222d5f..1f4f68e6fa 100644
--- a/config/sources/rockchip.conf
+++ b/config/sources/rockchip.conf
@@ -5,7 +5,6 @@ UBOOT_TARGET_MAP=";;$SRC/packages/blobs/rockchip/rk3288_boot.bin u-boot-rockchip
 
 UBOOT_USE_GCC='> 6.3'
 
-HAS_UUID_SUPPORT=yes
 BOOTDELAY=0
 
 BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
diff --git a/config/sources/s5p6818.conf b/config/sources/s5p6818.conf
index c78b73a580..f3ee64ba06 100644
--- a/config/sources/s5p6818.conf
+++ b/config/sources/s5p6818.conf
@@ -47,8 +47,6 @@ KERNEL_USE_GCC='< 5.0'
 
 CAN_BUILD_STRETCH=yes
 
-HAS_UUID_SUPPORT=yes
-
 GOVERNOR=ondemand
 
 write_uboot_platform()
diff --git a/config/sources/sunxi64_common.inc b/config/sources/sunxi64_common.inc
index 979f5043e1..5551b8acdb 100644
--- a/config/sources/sunxi64_common.inc
+++ b/config/sources/sunxi64_common.inc
@@ -1,6 +1,5 @@
 ARCH=arm64
 KERNEL_IMAGE_TYPE=Image
-HAS_UUID_SUPPORT=yes
 BOOTDELAY=1
 
 # Here we want to rename LINUXFAMILY from sun50iw1, sun50iw2, etc for next and dev branches
diff --git a/config/sources/sunxi_common.inc b/config/sources/sunxi_common.inc
index 9077cb823a..061ad7a74e 100644
--- a/config/sources/sunxi_common.inc
+++ b/config/sources/sunxi_common.inc
@@ -10,7 +10,6 @@ UBOOT_TARGET_MAP=';;u-boot-sunxi-with-spl.bin'
 UBOOT_USE_GCC='> 7.0'
 UBOOT_FW_ENV='0x88000,0x20000' # /etc/fw_env.config offset and env size
 
-HAS_UUID_SUPPORT=yes
 BOOTDELAY=1
 
 # Here we want to rename LINUXFAMILY from sun4i, sun5i, etc for next and dev branches
diff --git a/config/sources/udoo-neo.conf b/config/sources/udoo-neo.conf
index d353fa81eb..c18faa7649 100644
--- a/config/sources/udoo-neo.conf
+++ b/config/sources/udoo-neo.conf
@@ -3,7 +3,6 @@ BOOTDIR='u-boot-udoo'
 BOOTPATCHDIR='u-boot-udoo'
 BOOTSCRIPT="boot-$BOARD.cmd:boot.cmd"
 BOOTENV_FILE='udoo-neo-default.txt'
-HAS_UUID_SUPPORT=yes
 UBOOT_TARGET_MAP=';;SPL u-boot.img'
 UBOOT_USE_GCC='> 5.0'
 
diff --git a/config/sources/udoo.conf b/config/sources/udoo.conf
index c94a7ed12a..ed60887a6a 100644
--- a/config/sources/udoo.conf
+++ b/config/sources/udoo.conf
@@ -2,7 +2,6 @@ BOOTSOURCE='https://github.com/UDOOboard/uboot-imx'
 BOOTDIR='u-boot-udoo'
 BOOTSCRIPT="boot-$BOARD.cmd:boot.cmd"
 BOOTENV_FILE='udoo-default.txt'
-HAS_UUID_SUPPORT=yes
 UBOOT_TARGET_MAP=';;SPL u-boot.img'
 UBOOT_USE_GCC='> 5.0'
 
diff --git a/lib/build-all.sh b/lib/build-all.sh
index 533edb713e..770bc2a1b8 100644
--- a/lib/build-all.sh
+++ b/lib/build-all.sh
@@ -207,7 +207,7 @@ for line in "${buildlist[@]}"; do
 		CPUMIN CPUMAX UBOOT_VER KERNEL_VER GOVERNOR BOOTSIZE BOOTFS_TYPE UBOOT_TOOLCHAIN KERNEL_TOOLCHAIN PACKAGE_LIST_EXCLUDE KERNEL_IMAGE_TYPE \
 		write_uboot_platform family_tweaks family_tweaks_bsp setup_write_uboot_platform uboot_custom_postprocess atf_custom_postprocess family_tweaks_s \
 		BOOTSCRIPT UBOOT_TARGET_MAP LOCALVERSION UBOOT_COMPILER KERNEL_COMPILER BOOTCONFIG BOOTCONFIG_VAR_NAME BOOTCONFIG_DEFAULT BOOTCONFIG_NEXT BOOTCONFIG_DEV \
-		MODULES MODULES_NEXT MODULES_DEV INITRD_ARCH HAS_UUID_SUPPORT BOOTENV_FILE BOOTDELAY MODULES_BLACKLIST MODULES_BLACKLIST_NEXT \
+		MODULES MODULES_NEXT MODULES_DEV INITRD_ARCH BOOTENV_FILE BOOTDELAY MODULES_BLACKLIST MODULES_BLACKLIST_NEXT \
 		MODULES_BLACKLIST_DEV MOUNT SDCARD BOOTPATCHDIR KERNELPATCHDIR buildtext RELEASE IMAGE_TYPE OVERLAY_PREFIX ASOUND_STATE \
 		ATF_COMPILER ATF_USE_GCC ATFSOURCE ATFDIR ATFBRANCH ATFSOURCEDIR PACKAGE_LIST_RM NM_IGNORE_DEVICES DISPLAY_MANAGER family_tweaks_bsp_s
 
diff --git a/lib/debootstrap-ng.sh b/lib/debootstrap-ng.sh
index f8307c5e0e..4cfbbbbe6c 100644
--- a/lib/debootstrap-ng.sh
+++ b/lib/debootstrap-ng.sh
@@ -417,11 +417,7 @@ prepare_partitions()
 
 	# stage: adjust boot script or boot environment
 	if [[ -f $SDCARD/boot/armbianEnv.txt ]]; then
-		if [[ $HAS_UUID_SUPPORT == yes ]]; then
-			echo "rootdev=$rootfs" >> $SDCARD/boot/armbianEnv.txt
-		elif [[ $rootpart != 1 ]]; then
-			echo "rootdev=/dev/mmcblk0p${rootpart}" >> $SDCARD/boot/armbianEnv.txt
-		fi
+		echo "rootdev=$rootfs" >> $SDCARD/boot/armbianEnv.txt
 		echo "rootfstype=$ROOTFS_TYPE" >> $SDCARD/boot/armbianEnv.txt
 	elif [[ $rootpart != 1 ]]; then
 		local bootscript_dst=${BOOTSCRIPT##*:}
@@ -433,7 +429,7 @@ prepare_partitions()
 	# if we have boot.ini = remove armbianEnv.txt and add UUID there if enabled
 	if [[ -f $SDCARD/boot/boot.ini ]]; then
 		sed -i -e "s/rootfstype \"ext4\"/rootfstype \"$ROOTFS_TYPE\"/" $SDCARD/boot/boot.ini
-		[[ $HAS_UUID_SUPPORT == yes ]] && sed -i 's/^setenv rootdev .*/setenv rootdev "'$rootfs'"/' $SDCARD/boot/boot.ini
+		sed -i 's/^setenv rootdev .*/setenv rootdev "'$rootfs'"/' $SDCARD/boot/boot.ini
 		[[ -f $SDCARD/boot/armbianEnv.txt ]] && rm $SDCARD/boot/armbianEnv.txt
 	fi