From 9867935e7c606fb53823e5e63de0b8994cbd0d05 Mon Sep 17 00:00:00 2001 From: Apaczer <94932128+Apaczer@users.noreply.github.com> Date: Fri, 14 Jul 2023 22:45:15 +0200 Subject: [PATCH] [BOARD] rely on `manifest` when copying *.conf files genimage omit hidden files when using `mountpoint` directive --- board/miyoo/{main => boot/configs}/.batterylow.conf | 0 board/miyoo/{main => boot/configs}/.buttons.conf | 0 board/miyoo/boot/configs/manifest | 2 ++ board/miyoo/genimage-sdcard.cfg | 6 ++++++ board/miyoo/main/.backlight.conf | 1 - board/miyoo/main/.volume.conf | 1 - 6 files changed, 8 insertions(+), 2 deletions(-) rename board/miyoo/{main => boot/configs}/.batterylow.conf (100%) rename board/miyoo/{main => boot/configs}/.buttons.conf (100%) delete mode 100644 board/miyoo/main/.backlight.conf delete mode 100644 board/miyoo/main/.volume.conf diff --git a/board/miyoo/main/.batterylow.conf b/board/miyoo/boot/configs/.batterylow.conf similarity index 100% rename from board/miyoo/main/.batterylow.conf rename to board/miyoo/boot/configs/.batterylow.conf diff --git a/board/miyoo/main/.buttons.conf b/board/miyoo/boot/configs/.buttons.conf similarity index 100% rename from board/miyoo/main/.buttons.conf rename to board/miyoo/boot/configs/.buttons.conf diff --git a/board/miyoo/boot/configs/manifest b/board/miyoo/boot/configs/manifest index d259ab35d..19f7997b3 100644 --- a/board/miyoo/boot/configs/manifest +++ b/board/miyoo/boot/configs/manifest @@ -4,6 +4,8 @@ ! to_file is optional; if missing will use from_file .backlight.conf .volume.conf +.buttons.conf +.batterylow.conf gmenu2x.conf gmenu2x/gmenu2x.conf input.conf gmenu2x/input.conf ! leave this last line here diff --git a/board/miyoo/genimage-sdcard.cfg b/board/miyoo/genimage-sdcard.cfg index 857d218be..6748fef74 100644 --- a/board/miyoo/genimage-sdcard.cfg +++ b/board/miyoo/genimage-sdcard.cfg @@ -20,6 +20,12 @@ image bootfs.vfat { file configs/.volume.conf { image = "boot/configs/.volume.conf" } + file configs/.backlight.conf { + image = "boot/configs/.buttons.conf" + } + file configs/.backlight.conf { + image = "boot/configs/.batterylow.conf" + } file configs/.backlight.conf { image = "boot/configs/.backlight.conf" } diff --git a/board/miyoo/main/.backlight.conf b/board/miyoo/main/.backlight.conf deleted file mode 100644 index f11c82a4c..000000000 --- a/board/miyoo/main/.backlight.conf +++ /dev/null @@ -1 +0,0 @@ -9 \ No newline at end of file diff --git a/board/miyoo/main/.volume.conf b/board/miyoo/main/.volume.conf deleted file mode 100644 index c7930257d..000000000 --- a/board/miyoo/main/.volume.conf +++ /dev/null @@ -1 +0,0 @@ -7 \ No newline at end of file