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: cleanup, kill and add to-do's, remove dead code, turn down logging, squash future shortcircuit bugs

Browse Source 
- killed `[[ $ROOTFS_TYPE != ext4 ]] && display_alert "Assuming ${BOARD} ${BRANCH} kernel supports ${ROOTFS_TYPE}" "" "wrn"`
  - which definitely didn't belong in rootfs
- disable usage of run_host_command_logged_long_running for kernel-make
- stop lying about long_running stuff being any different from non-long_running versions
- stop lying about 'set -e' when there's still a bunch of pipes for "pv" and stuff all around
This commit is contained in:
Ricardo Pardini
2023-01-22 00:46:38 +01:00
parent a9a3c3fe0b
commit 78dcf01c92
11 changed files with 47 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,14 +120,6 @@ function main_default_build_packages() {
LOG_SECTION="create_bsp_desktop_package" do_with_logging create_bsp_desktop_package
fi
# @TODO: dead code, remove
## DEAD CODE IN ARMBIAN-NEXT ## # build additional packages
## DEAD CODE IN ARMBIAN-NEXT ## if [[ $EXTERNAL_NEW == compile ]]; then
## DEAD CODE IN ARMBIAN-NEXT ## display_alert "Building external packages" "$EXTERNAL - WARNING: this has not been armbian-nextifed yet and will fail." "warn"
## DEAD CODE IN ARMBIAN-NEXT ## exit_with_error "buildpkg chroot_build_packages() nas not been ported to armbian-next yet, rpardini is a bum"
## DEAD CODE IN ARMBIAN-NEXT ## LOG_SECTION="chroot_build_packages" do_with_logging chroot_build_packages
## DEAD CODE IN ARMBIAN-NEXT ## fi
# Reset owner of DEB_STORAGE, if needed. Might be a lot of packages there, but such is life.
# @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}"

2
lib/functions/main/config-prepare.sh
View File

@@ -31,7 +31,7 @@ function prep_conf_main_build_single() {
display_alert "Configuration prepared for BOARD build" "${BOARD}.${BOARD_TYPE}" "info"
}
# Lean version, for building stuff that doesn't need BOARD/BOARDFAMILY; never interactive.
# Lean version, for building rootfs, that doesn't need BOARD/BOARDFAMILY; never interactive.
function prep_conf_main_only_rootfs() {
LOG_SECTION="config_early_init" do_with_conditional_logging config_early_init

1
lib/functions/main/rootfs-image.sh
View File

@@ -2,7 +2,6 @@
function build_rootfs_and_image() {
display_alert "Checking for rootfs cache" "$(echo "${BRANCH} ${BOARD} ${RELEASE} ${DESKTOP_APPGROUPS_SELECTED} ${DESKTOP_ENVIRONMENT} ${BUILD_MINIMAL}" | tr -s " ")" "info"
[[ $ROOTFS_TYPE != ext4 ]] && display_alert "Assuming ${BOARD} ${BRANCH} kernel supports ${ROOTFS_TYPE}" "" "wrn"
LOG_SECTION="prepare_rootfs_build_params_and_trap" do_with_logging prepare_rootfs_build_params_and_trap