From 4337d4ff7e5794b3bfc1e17c1f48b6b746ecd898 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 2 Feb 2023 14:02:19 +0100 Subject: [PATCH] bcm2835-bootloader: support multiple distroconfig files in update/release Signed-off-by: Matthias Reichl --- packages/tools/bcm2835-bootloader/files/update.sh | 10 ++++++---- packages/tools/bcm2835-bootloader/release | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/tools/bcm2835-bootloader/files/update.sh b/packages/tools/bcm2835-bootloader/files/update.sh index cf645523a8..1d07b7fe93 100755 --- a/packages/tools/bcm2835-bootloader/files/update.sh +++ b/packages/tools/bcm2835-bootloader/files/update.sh @@ -47,10 +47,12 @@ else fi fi -# Add distro config file -if [ -f $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt ]; then - cp -p $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt $BOOT_ROOT -fi +# Add distro config files +for distro in "$SYSTEM_ROOT/usr/share/bootloader/distroconfig"*.txt ; do + if [ -f "${distro}" ]; then + cp -p "${distro}" $BOOT_ROOT + fi +done # mount $BOOT_ROOT r/o sync diff --git a/packages/tools/bcm2835-bootloader/release b/packages/tools/bcm2835-bootloader/release index f3cc290c9d..7ec99fd3a2 100755 --- a/packages/tools/bcm2835-bootloader/release +++ b/packages/tools/bcm2835-bootloader/release @@ -15,6 +15,8 @@ mkdir -p $RELEASE_DIR/3rdparty/bootloader if [ -f $INSTALL/usr/share/bootloader/config.txt ]; then cp -PR $INSTALL/usr/share/bootloader/config.txt $RELEASE_DIR/3rdparty/bootloader/ fi - if [ -f $INSTALL/usr/share/bootloader/distroconfig.txt ]; then - cp -PR $INSTALL/usr/share/bootloader/distroconfig.txt $RELEASE_DIR/3rdparty/bootloader/ - fi + for distro in "$INSTALL/usr/share/bootloader/distroconfig"*.txt ; do + if [ -f "${distro}" ]; then + cp -PR "${distro}" $RELEASE_DIR/3rdparty/bootloader/ + fi + done