Overlay management: somewhere we had OVERLAY_DIR and somewhere OVERLA…

…YDIR
armbian · Oct 8, 2024 · 9697c17 · 9697c17
1 parent d828485
commit 9697c17
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc
@@ -16,7 +16,7 @@ SRC_LOADADDR='LOADADDR=0x1080000'
 BOOTBRANCH="${BOOTBRANCH_BOARD:-"tag:v2022.07"}"
 BOOTPATCHDIR="${BOOTPATCHDIR:-"v2022.07"}"
 OVERLAY_PREFIX='meson'
-OVERLAYDIR="/boot/dtb/amlogic/overlay"
+OVERLAY_DIR="/boot/dtb/amlogic/overlay"
 
 # This is an extension method, put directly in meson64_common. A "built-in" extension if you will.
 # Bring in LibreELEC's amlogic-boot-fip repo, which is the authoritative source for FIP blobs.

diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc
@@ -16,7 +16,7 @@ declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2024.01"}"
 declare -g BOOTENV_FILE='sunxi.txt'
 declare -g UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP:-BINMAN_ALLOW_MISSING=1;;u-boot-sunxi-with-spl.bin}"
 declare -g BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
-declare -g OVERLAYDIR="/boot/dtb/allwinner/overlay"
+declare -g OVERLAY_DIR="/boot/dtb/allwinner/overlay"
 declare -g LINUXFAMILY=sunxi64
 
 # shellcheck source=config/sources/families/include/crust_firmware.inc

diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc
@@ -16,6 +16,7 @@ declare -g BOOTSCRIPT="boot-sunxi.cmd:boot.cmd"
 declare -g BOOTENV_FILE='sunxi.txt'
 declare -g LINUXFAMILY=sunxi
 declare -g UBOOT_FW_ENV='0x88000,0x20000' # /etc/fw_env.config offset and env size
+declare -g OVERLAY_DIR="/boot/dtb/allwinner/overlay"
 declare -g ASOUND_STATE='asound.state.sunxi-next'
 declare -g GOVERNOR=ondemand
 

diff --git a/lib/functions/artifacts/artifact-armbian-bsp-cli.sh b/lib/functions/artifacts/artifact-armbian-bsp-cli.sh
@@ -60,7 +60,7 @@ function artifact_armbian-bsp-cli_prepare_version() {
  "INITRD_ARCH: ${INITRD_ARCH}" # /etc/armbian-release
  "KERNEL_IMAGE_TYPE: ${KERNEL_IMAGE_TYPE}" # /etc/armbian-release
  "VENDOR: ${VENDOR}" # /etc/armbian-release
- "OVERLAYDIR: ${OVERLAYDIR}" # /etc/armbian-release
+ "OVERLAY_DIR: ${OVERLAY_DIR}" # /etc/armbian-release
  "KERNEL_TARGET: ${KERNEL_TARGET}" # /etc/armbian-release
  "KERNEL_TEST_TARGET: ${KERNEL_TEST_TARGET}" # /etc/armbian-release
  "BOOT_SOC: ${BOOT_SOC}" # /etc/armbian-release # See https://github.com/armbian/build/pull/6411

diff --git a/lib/functions/bsp/armbian-bsp-cli-deb.sh b/lib/functions/bsp/armbian-bsp-cli-deb.sh
@@ -108,7 +108,7 @@ function compile_armbian-bsp-cli() {
  KERNEL_TEST_TARGET=$KERNEL_TEST_TARGET
  FORCE_BOOTSCRIPT_UPDATE=$FORCE_BOOTSCRIPT_UPDATE
  FORCE_UBOOT_UPDATE=$FORCE_UBOOT_UPDATE
- OVERLAYDIR="$OVERLAYDIR"
+ OVERLAY_DIR="$OVERLAY_DIR"
  VENDOR="$VENDOR"
  VENDORDOCS="$VENDORDOCS"
  VENDORURL="$VENDORURL"