enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

armbian-next: fix: for the 1000th time had broken KERNEL_ONLY=yes; curb some warnings

Browse Source
This commit is contained in:
Ricardo Pardini 2023-01-29 21:40:29 +01:00
parent b4df4b83c3
commit 956ef9ac7d
No known key found for this signature in database
GPG Key ID: 3D38CA12A66C5D02
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/functions/host/docker.sh
View File

@ -36,7 +36,7 @@ function get_docker_info_once() {
# if "docker" is in the PATH...
if [[ -n "$(command -v docker)" ]]; then
display_alert "Docker is in the path" "Docker in PATH" "warn"
display_alert "Docker is in the path" "Docker in PATH" "debug"
DOCKER_IN_PATH="yes"
fi

18
lib/functions/main/build-packages.sh
View File

@ -106,6 +106,17 @@ function main_default_build_packages() {
fi
overlayfs_wrapper "cleanup"
reset_uid_owner "${DEB_STORAGE}"
# end of kernel-only, so display what was built.
if [[ "${KERNEL_ONLY}" != "yes" ]]; then
display_alert "Kernel build done" "@host" "target-reached"
display_alert "Target directory" "${DEB_STORAGE}/" "info"
display_alert "File name" "${CHOSEN_KERNEL}_${REVISION}_${ARCH}.deb" "info"
elif [[ "${KERNEL_ONLY}" == "yes" ]]; then
display_alert "using legacy option" "KERNEL_ONLY=yes; stopping build mid-packages" "warn"
return 0
fi
# Further packages require aggregation (BSPs use aggregated stuff, etc)
assert_requires_aggregation # Bombs if aggregation has not run
@ -127,13 +138,6 @@ function main_default_build_packages() {
# @TODO: might be needed also during 'cleanup': if some package fails, the previous package might be left owned by root.
reset_uid_owner "${DEB_STORAGE}"
# end of kernel-only, so display what was built.
if [[ "${KERNEL_ONLY}" != "yes" ]]; then
display_alert "Kernel build done" "@host" "target-reached"
display_alert "Target directory" "${DEB_STORAGE}/" "info"
display_alert "File name" "${CHOSEN_KERNEL}_${REVISION}_${ARCH}.deb" "info"
fi
# At this point, the WORKDIR should be clean. Add debug info.
debug_tmpfs_show_usage "AFTER ALL PKGS BUILT"
}