Skip to content

Commit

Permalink
sync armbian env
Browse files Browse the repository at this point in the history
  • Loading branch information
BPI-SINOVOIP committed Oct 14, 2024
1 parent 1135355 commit d318f0b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/functions/rootfs/apt-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function install_deb_chroot() {
declare -g if_error_detail_message="Installation of $install_target failed ${BOARD} ${RELEASE} ${BUILD_DESKTOP} ${LINUXFAMILY}"
declare -a extra_apt_envs=()
extra_apt_envs+=("ARMBIAN_IMAGE_BUILD_BOOTFS_TYPE=${BOOTFS_TYPE:-"unset"}") # used by package postinst scripts to bevahe
DONT_MAINTAIN_APT_CACHE="yes" chroot_sdcard_apt_get --no-install-recommends install "${install_target}" # don't auto-maintain apt cache when installing from packages.
DONT_MAINTAIN_APT_CACHE="yes" chroot_sdcard_apt_get --allow-downgrades --no-install-recommends install "${install_target}" # don't auto-maintain apt cache when installing from packages.
unset extra_apt_envs

# IMPORTANT! Do not use short-circuit above as last statement in a function, since it determines the result of the function.
Expand Down
9 changes: 6 additions & 3 deletions lib/functions/rootfs/rootfs-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,12 @@ function create_new_rootfs_cache_via_debootstrap() {
fi

# stage: check md5 sum of installed packages. Just in case. @TODO: rpardini: this should also be done when a cache is used, not only when it is created
display_alert "Checking MD5 sum of installed packages" "debsums" "info"
declare -g if_error_detail_message="Check MD5 sum of installed packages failed"
chroot_sdcard debsums --silent
# lets check only for supported targets only unless forced
if [[ "x${DISTRIBUTION_STATUS}" == "supported" || "${FORCE_CHECK_MD5_PACKAGES:-"no"}" == "yes" ]]; then
display_alert "Checking MD5 sum of installed packages" "debsums" "info"
declare -g if_error_detail_message="Check MD5 sum of installed packages failed"
chroot_sdcard debsums --silent
fi

# # Remove packages from packages.uninstall
# # @TODO: aggregation.py handling of this... if we wanted it removed in rootfs cache, why did we install it in the first place?
Expand Down

0 comments on commit d318f0b

Please sign in to comment.