mirror/asteroid
1
0
Fork 0
mirror of https://github.com/AsteroidOS/asteroid.git synced 2026-01-19 20:48:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not generate an empty bblayers.conf file upon update

Browse Source 
46339cad31
introduced behaviour such that the 'current' state of `bblayers.conf` is copied to
a temporary file layers are updated and this bblayers.conf is overwritten with
the temporary file generated by `mktemp`.

However, this introduces an issue where an empty `bblayers.conf` is created if
the user decides to update layers perior to building (i.e. do
`./prepare-build.sh update` first) as the temporary file (created with `mktemp`)
is copied without any contents because `bblayers.conf` doesn't exist yet.

This empty file doesn't contain the `layer_line` pattern, so nothing will be
appended.

To fix this issue, do not generate an empty `bblayers.conf` file upon update if
it doesn't exist.

Signed-off-by: Darrel Griët <dgriet@gmail.com>
This commit is contained in:
Darrel Griët
2025-01-18 19:23:24 +01:00
committed by MagneFire
parent 160d0679cb
commit 8cc3be7300
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
prepare-build.sh
View File

@@ -94,6 +94,9 @@ function clone_dir {
}
function update_layer_config() {
if [ -e build/conf/bblayers.conf ]; then
return
fi
# Find all layers under src/meta-smartwatch, remove the src/ prefix, sort alphabetically, and store it in an array.
layers_smartwatch=($(find src/meta-smartwatch -mindepth 1 -name "*meta-*" -type d | sed -e 's|src/||' | sort))
layers=("${layers_conf[@]}" "${layers_smartwatch[@]}")