From a93d8ffadcf3fd44487a6a5ebdf289540efb16d7 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Sat, 30 Nov 2019 12:31:03 +0100
Subject: [PATCH] image: clean up bootloader/release files

All required bootloader files are already copied by the u-boot package
(using the corresponding bootloader/install script) to the system's
/usr/share/bootloader directory. The dtb files are copied by the linux
package to the same spot.

Use that single source for the release tarballs instead of various
build directories.
---
 projects/Allwinner/bootloader/release         | 12 +++++++++
 .../Allwinner/devices/A20/bootloader/release  |  9 -------
 .../Allwinner/devices/A64/bootloader/release  |  9 -------
 .../Allwinner/devices/H3/bootloader/release   |  9 -------
 .../Allwinner/devices/H6/bootloader/release   |  9 -------
 projects/Amlogic/bootloader/release           | 25 ++++++++++--------
 projects/NXP/devices/iMX6/bootloader/release  | 11 +++++---
 .../devices/Dragonboard/bootloader/release    |  9 ++++---
 projects/Rockchip/bootloader/release          | 26 ++++++++-----------
 9 files changed, 50 insertions(+), 69 deletions(-)
 create mode 100644 projects/Allwinner/bootloader/release
 delete mode 100644 projects/Allwinner/devices/A20/bootloader/release
 delete mode 100644 projects/Allwinner/devices/A64/bootloader/release
 delete mode 100644 projects/Allwinner/devices/H3/bootloader/release
 delete mode 100644 projects/Allwinner/devices/H6/bootloader/release

diff --git a/projects/Allwinner/bootloader/release b/projects/Allwinner/bootloader/release
new file mode 100644
index 0000000000..8b0b39a9ae
--- /dev/null
+++ b/projects/Allwinner/bootloader/release
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+SRCDIR="$BUILD/image/system/usr/share/bootloader"
+DSTDIR="$RELEASE_DIR/3rdparty/bootloader"
+
+mkdir -p "$DSTDIR"
+  if [ -n "$UBOOT_SYSTEM" ]; then
+    cp -a "$SRCDIR/u-boot-sunxi-with-spl.bin" "$DSTDIR"
+  fi
+
+  cp -a "$SRCDIR"/sun*-${DEVICE,,}-*.dtb "$DSTDIR"
diff --git a/projects/Allwinner/devices/A20/bootloader/release b/projects/Allwinner/devices/A20/bootloader/release
deleted file mode 100644
index 21ea999ef5..0000000000
--- a/projects/Allwinner/devices/A20/bootloader/release
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
-
-mkdir -p $RELEASE_DIR/3rdparty/bootloader
-  if [ -n "$UBOOT_SYSTEM" ]; then
-    cp -a $(get_build_dir $BOOTLOADER)/u-boot-sunxi-with-spl.bin $RELEASE_DIR/3rdparty/bootloader
-  fi
-
-  cp -a $(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts/sun7i-a20-*.dtb $RELEASE_DIR/3rdparty/bootloader
diff --git a/projects/Allwinner/devices/A64/bootloader/release b/projects/Allwinner/devices/A64/bootloader/release
deleted file mode 100644
index 682f6d2ae4..0000000000
--- a/projects/Allwinner/devices/A64/bootloader/release
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-mkdir -p $RELEASE_DIR/3rdparty/bootloader
-  if [ -n "$UBOOT_SYSTEM" ]; then
-    cp -a $(get_build_dir $BOOTLOADER)/u-boot-sunxi-with-spl.bin $RELEASE_DIR/3rdparty/bootloader
-  fi
-
-  cp -a $(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts/allwinner/sun50i-a64-*.dtb $RELEASE_DIR/3rdparty/bootloader
diff --git a/projects/Allwinner/devices/H3/bootloader/release b/projects/Allwinner/devices/H3/bootloader/release
deleted file mode 100644
index fadd618a05..0000000000
--- a/projects/Allwinner/devices/H3/bootloader/release
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-mkdir -p $RELEASE_DIR/3rdparty/bootloader
-  if [ -n "$UBOOT_SYSTEM" ]; then
-    cp -a $(get_build_dir $BOOTLOADER)/u-boot-sunxi-with-spl.bin $RELEASE_DIR/3rdparty/bootloader
-  fi
-
-  cp -a $(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts/sun8i-h3-*.dtb $RELEASE_DIR/3rdparty/bootloader
diff --git a/projects/Allwinner/devices/H6/bootloader/release b/projects/Allwinner/devices/H6/bootloader/release
deleted file mode 100644
index 30058f2207..0000000000
--- a/projects/Allwinner/devices/H6/bootloader/release
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
-
-mkdir -p $RELEASE_DIR/3rdparty/bootloader
-  if [ -n "$UBOOT_SYSTEM" ]; then
-    cp -a $(get_build_dir $BOOTLOADER)/u-boot-sunxi-with-spl.bin $RELEASE_DIR/3rdparty/bootloader
-  fi
-
-  cp -a $(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts/allwinner/sun50i-h6-*.dtb $RELEASE_DIR/3rdparty/bootloader
diff --git a/projects/Amlogic/bootloader/release b/projects/Amlogic/bootloader/release
index 3e9646b00c..af0bd402f0 100644
--- a/projects/Amlogic/bootloader/release
+++ b/projects/Amlogic/bootloader/release
@@ -1,25 +1,28 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
-mkdir -p "$RELEASE_DIR/3rdparty/bootloader"
-  cp -a $(get_build_dir u-boot-script)/* $RELEASE_DIR/3rdparty/bootloader
+SRCDIR="$BUILD/image/system/usr/share/bootloader"
+DSTDIR="$RELEASE_DIR/3rdparty/bootloader"
 
-  if find_file_path bootloader/${UBOOT_SYSTEM}.ini; then
-    cp -av ${FOUND_PATH} $RELEASE_DIR/3rdparty/bootloader/boot.ini
+mkdir -p "$DSTDIR"
+  cp -a "$SRCDIR"/*.scr "$SRCDIR"/*script "$DSTDIR"
+
+  if find_file_path "bootloader/${UBOOT_SYSTEM}.ini"; then
+    cp -av "${FOUND_PATH}" "$DSTDIR/boot.ini"
   fi
 
-mkdir -p "$RELEASE_DIR/3rdparty/bootloader/dtb"
+mkdir -p "$DSTDIR/dtb"
   case ${DEVICE:-$PROJECT} in
     AMLGX)
-      cp -a $(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts/amlogic/*gxbb*.dtb $RELEASE_DIR/3rdparty/bootloader/dtb
-      cp -a $(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts/amlogic/*gxl*.dtb $RELEASE_DIR/3rdparty/bootloader/dtb
-      cp -a $(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts/amlogic/*gxm*.dtb $RELEASE_DIR/3rdparty/bootloader/dtb
+      cp -a "$SRCDIR"/*gxbb*.dtb "$DSTDIR/dtb"
+      cp -a "$SRCDIR"/*gxl*.dtb "$DSTDIR/dtb"
+      cp -a "$SRCDIR"/*gxm*.dtb "$DSTDIR/dtb"
       ;;
     AMLG12)
-      cp -a $(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts/amlogic/*g12a*.dtb $RELEASE_DIR/3rdparty/bootloader/dtb
-      cp -a $(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts/amlogic/*g12b*.dtb $RELEASE_DIR/3rdparty/bootloader/dtb
+      cp -a "$SRCDIR"/*g12a*.dtb "$DSTDIR/dtb"
+      cp -a "$SRCDIR"/*g12b*.dtb "$DSTDIR/dtb"
       ;;
     *)
-      cp -a $(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts/amlogic/*.dtb $RELEASE_DIR/3rdparty/bootloader/dtb
+      cp -a "$SRCDIR"/*.dtb "$DSTDIR/dtb"
       ;;
   esac
diff --git a/projects/NXP/devices/iMX6/bootloader/release b/projects/NXP/devices/iMX6/bootloader/release
index 32cc788b14..898ed95da2 100644
--- a/projects/NXP/devices/iMX6/bootloader/release
+++ b/projects/NXP/devices/iMX6/bootloader/release
@@ -1,10 +1,13 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
-mkdir -p $RELEASE_DIR/3rdparty/bootloader
+SRCDIR="$BUILD/image/system/usr/share/bootloader"
+DSTDIR="$RELEASE_DIR/3rdparty/bootloader"
+
+mkdir -p "$DSTDIR"
   if [ -n "$UBOOT_SYSTEM" ]; then
-    cp -a $(get_build_dir $BOOTLOADER)/u-boot.img $RELEASE_DIR/3rdparty/bootloader
-    cp -a $(get_build_dir $BOOTLOADER)/SPL $RELEASE_DIR/3rdparty/bootloader
+    cp -a "$SRCDIR/u-boot.img" "$DSTDIR"
+    cp -a "$SRCDIR/SPL" "$DSTDIR"
   fi
 
-  cp -a $(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts/*.dtb $RELEASE_DIR/3rdparty/bootloader
+  cp -a "$SRCDIR"/*.dtb "$DSTDIR"
diff --git a/projects/Qualcomm/devices/Dragonboard/bootloader/release b/projects/Qualcomm/devices/Dragonboard/bootloader/release
index a90f7506cb..320b6bea0b 100644
--- a/projects/Qualcomm/devices/Dragonboard/bootloader/release
+++ b/projects/Qualcomm/devices/Dragonboard/bootloader/release
@@ -1,9 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
-mkdir -p $RELEASE_DIR/3rdparty/bootloader
+SRCDIR="$BUILD/image/system/usr/share/bootloader"
+DSTDIR="$RELEASE_DIR/3rdparty/bootloader"
+
+mkdir -p "$DSTDIR"
   if [ -n "$UBOOT_SYSTEM" ]; then
-    cp -a $(get_build_dir $BOOTLOADER)/u-boot.img $RELEASE_DIR/3rdparty/bootloader
+    cp -a "$SRCDIR/u-boot.img" "$DSTDIR"
   fi
 
-  cp -a $(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts/qcom/* $RELEASE_DIR/3rdparty/bootloader
+  cp -a "$SRCDIR"/*.dtb "$DSTDIR"
diff --git a/projects/Rockchip/bootloader/release b/projects/Rockchip/bootloader/release
index 31ec591c14..25a3210c67 100644
--- a/projects/Rockchip/bootloader/release
+++ b/projects/Rockchip/bootloader/release
@@ -1,24 +1,20 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
-mkdir -p $RELEASE_DIR/3rdparty/bootloader
+SRCDIR="$BUILD/image/system/usr/share/bootloader"
+DSTDIR="$RELEASE_DIR/3rdparty/bootloader"
+
+mkdir -p "$DSTDIR"
   if [ -n "$UBOOT_SYSTEM" ]; then
-    BOOTLOADER_DIR=$(get_build_dir $BOOTLOADER)
-    if [ -f $BOOTLOADER_DIR/idbloader.img ]; then
-      cp -a $BOOTLOADER_DIR/idbloader.img $RELEASE_DIR/3rdparty/bootloader
+    if [ -f "$SRCDIR/idbloader.img" ]; then
+      cp -a "$SRCDIR/idbloader.img" "$DSTDIR"
     fi
-    if [ -f $BOOTLOADER_DIR/uboot.img ]; then
-      cp -a $BOOTLOADER_DIR/uboot.img $RELEASE_DIR/3rdparty/bootloader
+    if [ -f "$SRCDIR/uboot.img" ]; then
+      cp -a "$SRCDIR/uboot.img" "$DSTDIR"
     fi
-    if [ -f $BOOTLOADER_DIR/trust.img ]; then
-      cp -a $BOOTLOADER_DIR/trust.img $RELEASE_DIR/3rdparty/bootloader
+    if [ -f "$SRCDIR/trust.img" ]; then
+      cp -a "$SRCDIR/trust.img" "$DSTDIR"
     fi
   fi
 
-  DTB_PREFIX="${DEVICE/RK/rk}-"
-  LINUX_DTS_DIR=$(get_build_dir linux)/arch/$TARGET_KERNEL_ARCH/boot/dts
-  for dtb in $LINUX_DTS_DIR/$DTB_PREFIX*.dtb $LINUX_DTS_DIR/rockchip/$DTB_PREFIX*.dtb; do
-    if [ -f $dtb ]; then
-      cp -a $dtb $RELEASE_DIR/3rdparty/bootloader
-    fi
-  done
+  cp -a "$SRCDIR"/${DEVICE,,}-*.dtb "$DSTDIR"