From 4a7eb86edd3821cf51af52b4f83ec0910f42256a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 8 Mar 2010 08:24:03 +0100 Subject: Only remove auxilliary packages in rootfs when not using pre-cached chroot (Closes: #572976). --- helpers/binary_rootfs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/helpers/binary_rootfs b/helpers/binary_rootfs index 8e0ebe1..635adbb 100755 --- a/helpers/binary_rootfs +++ b/helpers/binary_rootfs @@ -183,6 +183,9 @@ case "${LH_CHROOT_FILESYSTEM}" in touch .lock else rm -rf chroot/chroot + + # Removing depends + Remove_package fi ;; @@ -193,9 +196,6 @@ case "${LH_CHROOT_FILESYSTEM}" in # Saving cache Save_cache cache/packages_binary - - # Removing depends - Remove_package ;; jffs2) @@ -267,6 +267,9 @@ case "${LH_CHROOT_FILESYSTEM}" in touch .lock else rm -rf chroot/chroot + + # Removing depends + Remove_package fi ;; @@ -277,9 +280,6 @@ case "${LH_CHROOT_FILESYSTEM}" in # Saving cache Save_cache cache/packages_binary - - # Removing depends - Remove_package ;; plain) @@ -384,6 +384,9 @@ case "${LH_CHROOT_FILESYSTEM}" in touch .lock else rm -rf chroot/chroot + + # Removing depends + Remove_package fi ${LH_ROOT_COMMAND} chmod 0644 binary/${INITFS}/filesystem.squashfs @@ -410,9 +413,6 @@ case "${LH_CHROOT_FILESYSTEM}" in # Saving cache Save_cache cache/packages_binary - - # Removing depends - Remove_package ;; none) -- cgit v1.0