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.
This commit is contained in:
Andre Heider 2019-11-30 12:31:03 +01:00
parent 7d13537525
commit a93d8ffadc
9 changed files with 50 additions and 69 deletions

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -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"