From 311d20b12b01a04e96f156e17eefddec9260844c Mon Sep 17 00:00:00 2001 From: Mark Walker Date: Fri, 3 Jun 2016 11:40:42 +0200 Subject: [PATCH 1/3] Add distroconfig.txt to enable distribution specific config.txt overrides, without compromising custom edits in the config.txt file. --- .../files/3rdparty/bootloader/config.txt | 7 +++++++ packages/tools/bcm2835-bootloader/package.mk | 5 ++++- packages/tools/bcm2835-bootloader/scripts/update.sh | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt index 7bf5c43869..83b586a610 100644 --- a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt +++ b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/config.txt @@ -108,3 +108,10 @@ # all values below this line were inserted from config.txt.bk (your old config) # and can be merged with the above values ################################################################################ + +################################################################################ +# Include distribution specific config file if it exists. +################################################################################ + +[all] +include distroconfig.txt diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 909e3cd25c..4feaf62284 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -48,7 +48,10 @@ makeinstall_target() { [ -f dt-blob.bin ] && cp -PRv dt-blob.bin $INSTALL/usr/share/bootloader/dt-blob.bin cp -PRv $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader - + + if [ -f $DISTRO_DIR/$DISTRO/config/distroconfig.txt ]; then + cp -PRv $DISTRO_DIR/$DISTRO/config/distroconfig.txt $INSTALL/usr/share/bootloader + fi if [ -f $DISTRO_DIR/$DISTRO/config/config.txt ]; then cp -PRv $DISTRO_DIR/$DISTRO/config/config.txt $INSTALL/usr/share/bootloader else diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/packages/tools/bcm2835-bootloader/scripts/update.sh index 4af59eea22..e75b45b688 100755 --- a/packages/tools/bcm2835-bootloader/scripts/update.sh +++ b/packages/tools/bcm2835-bootloader/scripts/update.sh @@ -53,6 +53,9 @@ # sed -e "s,gpu_mem=100,gpu_mem=128,g" -i $BOOT_ROOT/config.txt # sed -e "s,gpu_mem_256=100,# gpu_mem_256=128,g" -i $BOOT_ROOT/config.txt # sed -e "s,gpu_mem_512=128,# gpu_mem_512=128,g" -i $BOOT_ROOT/config.txt + # Add distribution specific extra configuration file for the bootloader + elif [ -f $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt ]; then + cp $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt $BOOT_ROOT fi # mount $BOOT_ROOT r/o From b81c15c24195a5561fded3a59fc1091b70269426 Mon Sep 17 00:00:00 2001 From: Mark Walker Date: Fri, 10 Jun 2016 12:47:57 +0200 Subject: [PATCH 2/3] Make suggested changes for PR. --- .../files/3rdparty/bootloader/distroconfig.txt | 0 packages/tools/bcm2835-bootloader/package.mk | 3 +++ packages/tools/bcm2835-bootloader/scripts/update.sh | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/distroconfig.txt diff --git a/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/distroconfig.txt b/packages/tools/bcm2835-bootloader/files/3rdparty/bootloader/distroconfig.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 4feaf62284..257ecb0cd5 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -51,7 +51,10 @@ makeinstall_target() { if [ -f $DISTRO_DIR/$DISTRO/config/distroconfig.txt ]; then cp -PRv $DISTRO_DIR/$DISTRO/config/distroconfig.txt $INSTALL/usr/share/bootloader + else + cp -PRv $PKG_DIR/files/3rdparty/bootloader/distroconfig.txt $INSTALL/usr/share/bootloader fi + if [ -f $DISTRO_DIR/$DISTRO/config/config.txt ]; then cp -PRv $DISTRO_DIR/$DISTRO/config/config.txt $INSTALL/usr/share/bootloader else diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/packages/tools/bcm2835-bootloader/scripts/update.sh index e75b45b688..7e77cc3a8d 100755 --- a/packages/tools/bcm2835-bootloader/scripts/update.sh +++ b/packages/tools/bcm2835-bootloader/scripts/update.sh @@ -54,7 +54,10 @@ # sed -e "s,gpu_mem_256=100,# gpu_mem_256=128,g" -i $BOOT_ROOT/config.txt # sed -e "s,gpu_mem_512=128,# gpu_mem_512=128,g" -i $BOOT_ROOT/config.txt # Add distribution specific extra configuration file for the bootloader - elif [ -f $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt ]; then + fi + +# Add distro config file. + if [ -f $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt ]; then cp $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt $BOOT_ROOT fi From 4ba69492b417fec01d01aa9296fee270ad7b2e16 Mon Sep 17 00:00:00 2001 From: Mark Walker Date: Fri, 10 Jun 2016 13:28:59 +0200 Subject: [PATCH 3/3] Adding -p to copy --- packages/tools/bcm2835-bootloader/scripts/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/packages/tools/bcm2835-bootloader/scripts/update.sh index 7e77cc3a8d..6ee3917146 100755 --- a/packages/tools/bcm2835-bootloader/scripts/update.sh +++ b/packages/tools/bcm2835-bootloader/scripts/update.sh @@ -58,7 +58,7 @@ # Add distro config file. if [ -f $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt ]; then - cp $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt $BOOT_ROOT + cp -p $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt $BOOT_ROOT fi # mount $BOOT_ROOT r/o