BSP: store overlay folder definition to /etc/armbian-release to be used in armbian-config#7198
BSP: store overlay folder definition to /etc/armbian-release to be used in armbian-config#7198igorpecovnik merged 1 commit intomainfrom
Conversation
- keep window clean of not needed informations - fix wront title / backtitle settings
- keep window clean of not needed informations - fix wront title / backtitle settings
This way we don't need to calculate yet again
1592200 to
c1a8598
Compare
|
@igorpecovnik It might be useful though to create a variable where you can take the overlays for created for each individual board, since at the moment armbian configuration on the environment through armbian-config only takes overlays called rockchip-rk3588-* and this would not make sense "I think" since the boards have different PINs, what do you think? |
|
You mean listing overlays in board file, like BOARD_OVERLAYS="overlay1,overlay2, ..." ? There are some common, some specific ... perhaps it would be best to apply logic to overlay files itself: rk3588-uart8-m1 = common, always there |
Exactly, I don't know if already present such logic, as I'm working in moving the type code to enable dsi0 for display on overlay, and that's why I was wondering if it's already possible to do that by enabling like the youyeetoo-r1-v3-lcd-dsi0.dts overlay within the armbianEnv.txt environment or via armbian-config (which from what I understand will be replaced) |
|
It is currently handled like this: overlay_prefix=rockchip-rk3588 Any overlay added in overlays is rewritten with the prefix rockchip-rk3588 and in turn is searched with the name rockchip-rk3588-opp-oc-24ghz where it actually exists, but what if we need to activate an overlay called something else? Also because I see that not all of them start with rockchip-rk3588 as a prefix, but usually have the name board-type-overlay.dts here https://github.com/armbian/linux-rockchip/tree/rk-6.1-rkr3/arch/arm64/boot/dts/rockchip/overlay |
We could change "usually" into "mandatory" there. As I don't want to have yet another property to be maintained at armbian framework level. This PR only replaces calculation that used to be done at armbian-config. Also this information is not getting changed just like that, while new overlays are keep coming. |
|
This ended up adding stuff to bsp-cli. To avoid disappointments in the future, I suggest adding it; otherwise when changes are made to OVERLAYDIR the bsp-cli won't be rebuilt automatically. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <[email protected]>
Date: Sun, 15 Sep 2024 20:28:53 +0200
Subject: bsp-cli: hash OVERLAYDIR as it is now included in
/etc/armbian-release
Fixes: 4a1e10219c6f6a0f417ba1a45abe276a675dd85b
---
lib/functions/artifacts/artifact-armbian-bsp-cli.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/functions/artifacts/artifact-armbian-bsp-cli.sh b/lib/functions/artifacts/artifact-armbian-bsp-cli.sh
index ee028d52f..c5020ee29 100644
--- a/lib/functions/artifacts/artifact-armbian-bsp-cli.sh
+++ b/lib/functions/artifacts/artifact-armbian-bsp-cli.sh
@@ -53,20 +53,21 @@ function artifact_armbian-bsp-cli_prepare_version() {
"has_extlinux: ${bootscript_info[has_extlinux]}"
"UBOOT_FW_ENV: ${UBOOT_FW_ENV}" # not included in bootscript
"KEEP_ORIGINAL_OS_RELEASE: ${KEEP_ORIGINAL_OS_RELEASE:-"no"}" # /etc/os-release
"BOARDFAMILY: ${BOARDFAMILY}" # /etc/armbian-release
"LINUXFAMILY: ${LINUXFAMILY}" # /etc/armbian-release
"IMAGE_TYPE: ${IMAGE_TYPE}" # /etc/armbian-release
"BOARD_TYPE: ${BOARD_TYPE}" # /etc/armbian-release
"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
"BOOT_SOC: ${BOOT_SOC}" # /etc/armbian-release # See https://github.com/armbian/build/pull/6411
"hash_vars_no_normalize: ${hash_vars_no_normalize}" # The non-normalized part, above
)
declare hash_variables="undetermined" # will be set by calculate_hash_for_variables(), which normalizes the input
calculate_hash_for_variables "${vars_to_hash[@]}"
declare vars_config_hash="${hash_variables}"
declare var_config_hash_short="${vars_config_hash:0:${short_hash_size}}"
declare -a dirs_to_hash=(
"${SRC}/packages/bsp/common" # common stuff
--
Armbian
|
Description
This way we don't need to calculate yet again. Before merging, we need to figure out which other are used.
Does not add any functionality to build framework.
Checklist: