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

armbian-next: move aggregation-had-run check to more strategic places (pre-bsp, pre-rootfs) instead of at the beginning of full_build_packages_rootfs_and_image()

Browse Source
This commit is contained in:
Ricardo Pardini
2023-01-28 20:03:06 +01:00
parent fa666aa3d4
commit a011de8476
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,6 +107,9 @@ function main_default_build_packages() {
overlayfs_wrapper "cleanup" overlayfs_wrapper "cleanup"
# Further packages require aggregation (BSPs use aggregated stuff, etc)
assert_requires_aggregation # Bombs if aggregation has not run
# create board support package # create board support package
if [[ -n "${RELEASE}" && ! -f "${DEB_STORAGE}/${BSP_CLI_PACKAGE_FULLNAME}.deb" && "${REPOSITORY_INSTALL}" != *armbian-bsp-cli* ]]; then if [[ -n "${RELEASE}" && ! -f "${DEB_STORAGE}/${BSP_CLI_PACKAGE_FULLNAME}.deb" && "${REPOSITORY_INSTALL}" != *armbian-bsp-cli* ]]; then
LOG_SECTION="create_board_package" do_with_logging create_board_package LOG_SECTION="create_board_package" do_with_logging create_board_package

5
lib/functions/main/default-build.sh
View File

@@ -1,14 +1,13 @@
# This does NOT run under the logging manager. # This does NOT run under the logging manager.
function full_build_packages_rootfs_and_image() { function full_build_packages_rootfs_and_image() {
assert_requires_aggregation # Bombs if aggregation has not run
main_default_build_packages # has its own logging sections # requires aggregation main_default_build_packages # has its own logging sections # requires aggregation
# build rootfs, if not only kernel. Again, read "KERNEL_ONLY" as if it was "PACKAGES_ONLY" # build rootfs, if not only kernel. Again, read "KERNEL_ONLY" as if it was "PACKAGES_ONLY"
if [[ "${KERNEL_ONLY}" != "yes" ]]; then if [[ "${KERNEL_ONLY}" != "yes" ]]; then
display_alert "Building image" "${BOARD}" "target-started" display_alert "Building image" "${BOARD}" "target-started"
build_rootfs_and_image # old "debootstrap-ng"; has its own logging sections. assert_requires_aggregation # Bombs if aggregation has not run
build_rootfs_and_image # old "debootstrap-ng"; has its own logging sections.
display_alert "Done building image" "${BOARD}" "target-reached" display_alert "Done building image" "${BOARD}" "target-reached"
fi fi
} }