From cfabeb75c97baf4ba16e854217d59ccd56eaf00b Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Tue, 8 Oct 2024 12:30:49 +0200 Subject: [PATCH] Overlay management: somewhere we had OVERLAY_DIR and somewhere OVERLAYDIR --- config/sources/families/include/meson64_common.inc | 2 +- config/sources/families/include/sunxi64_common.inc | 2 +- config/sources/families/include/sunxi_common.inc | 1 + lib/functions/artifacts/artifact-armbian-bsp-cli.sh | 2 +- lib/functions/bsp/armbian-bsp-cli-deb.sh | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc index b4048771e4be..6da0cb2d22fc 100644 --- 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 index 6050522ade8b..67bb75182417 100644 --- 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 index af6fdfb8bffb..6a45d750d916 100644 --- 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 index 25887c5701fc..d3af981e7966 100644 --- 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 index cf6f9774d8b2..d4652042cdde 100644 --- 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"