JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Overlay management: somewhere we had OVERLAY_DIR and somewhere OVERLAYDIR

Browse Source
This commit is contained in:
Igor Pecovnik
2024-10-08 12:30:49 +02:00
committed by Igor
parent d8284855c8
commit 9697c17fbd
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/sources/families/include/meson64_common.inc
View File

@@ -16,7 +16,7 @@ SRC_LOADADDR='LOADADDR=0x1080000'
BOOTBRANCH="${BOOTBRANCH_BOARD:-"tag:v2022.07"}" BOOTBRANCH="${BOOTBRANCH_BOARD:-"tag:v2022.07"}"
BOOTPATCHDIR="${BOOTPATCHDIR:-"v2022.07"}" BOOTPATCHDIR="${BOOTPATCHDIR:-"v2022.07"}"
OVERLAY_PREFIX='meson' 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. # 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. # Bring in LibreELEC's amlogic-boot-fip repo, which is the authoritative source for FIP blobs.

2
config/sources/families/include/sunxi64_common.inc
View File

@@ -16,7 +16,7 @@ declare -g BOOTBRANCH="${BOOTBRANCH:-"tag:v2024.01"}"
declare -g BOOTENV_FILE='sunxi.txt' 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 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 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 declare -g LINUXFAMILY=sunxi64
# shellcheck source=config/sources/families/include/crust_firmware.inc # shellcheck source=config/sources/families/include/crust_firmware.inc

1
config/sources/families/include/sunxi_common.inc
View File

@@ -16,6 +16,7 @@ declare -g BOOTSCRIPT="boot-sunxi.cmd:boot.cmd"
declare -g BOOTENV_FILE='sunxi.txt' declare -g BOOTENV_FILE='sunxi.txt'
declare -g LINUXFAMILY=sunxi declare -g LINUXFAMILY=sunxi
declare -g UBOOT_FW_ENV='0x88000,0x20000' # /etc/fw_env.config offset and env size 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 ASOUND_STATE='asound.state.sunxi-next'
declare -g GOVERNOR=ondemand declare -g GOVERNOR=ondemand

2
lib/functions/artifacts/artifact-armbian-bsp-cli.sh
View File

@@ -60,7 +60,7 @@ function artifact_armbian-bsp-cli_prepare_version() {
"INITRD_ARCH: ${INITRD_ARCH}" # /etc/armbian-release "INITRD_ARCH: ${INITRD_ARCH}" # /etc/armbian-release
"KERNEL_IMAGE_TYPE: ${KERNEL_IMAGE_TYPE}" # /etc/armbian-release "KERNEL_IMAGE_TYPE: ${KERNEL_IMAGE_TYPE}" # /etc/armbian-release
"VENDOR: ${VENDOR}" # /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_TARGET: ${KERNEL_TARGET}" # /etc/armbian-release
"KERNEL_TEST_TARGET: ${KERNEL_TEST_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 "BOOT_SOC: ${BOOT_SOC}" # /etc/armbian-release # See https://github.com/armbian/build/pull/6411

2
lib/functions/bsp/armbian-bsp-cli-deb.sh
View File

@@ -108,7 +108,7 @@ function compile_armbian-bsp-cli() {
KERNEL_TEST_TARGET=$KERNEL_TEST_TARGET KERNEL_TEST_TARGET=$KERNEL_TEST_TARGET
FORCE_BOOTSCRIPT_UPDATE=$FORCE_BOOTSCRIPT_UPDATE FORCE_BOOTSCRIPT_UPDATE=$FORCE_BOOTSCRIPT_UPDATE
FORCE_UBOOT_UPDATE=$FORCE_UBOOT_UPDATE FORCE_UBOOT_UPDATE=$FORCE_UBOOT_UPDATE
OVERLAYDIR="$OVERLAYDIR" OVERLAY_DIR="$OVERLAY_DIR"
VENDOR="$VENDOR" VENDOR="$VENDOR"
VENDORDOCS="$VENDORDOCS" VENDORDOCS="$VENDORDOCS"
VENDORURL="$VENDORURL" VENDORURL="$VENDORURL"