[SCM] Debian Live build scripts branch, master, updated. 1.0.3-1-8-g57ea2c5
Daniel Baumann
daniel at debian.org
Sun Feb 8 09:36:55 UTC 2009
The following commit has been merged in the master branch:
commit 57ea2c5d8738d841fc38d419ea8060005feadbc7
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Feb 8 10:35:25 2009 +0100
Take win32-loader from the target distribution by using the chroot.
diff --git a/helpers/lh_binary_win32-loader b/helpers/lh_binary_win32-loader
index c9f8910..feedaef 100755
--- a/helpers/lh_binary_win32-loader
+++ b/helpers/lh_binary_win32-loader
@@ -37,18 +37,32 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Copying win32-loader
-if [ "${LH_WIN32_LOADER}" = "enabled" ]
+if [ "${LH_WIN32_LOADER}" = "enabled" ] && [ "${LH_DISTRIBUTION}" != "etch" ]
then
case "${LH_ARCHITECTURE}" in
amd64|i386)
- if Find_files /usr/lib/win32-loader/*
- then
- cp /usr/lib/win32-loader/* binary
- else
- Echo_warning "win32-loader inclusion is enabled but not found, ignoring."
- fi
- ;;
+ # Checking depends
+ Check_package chroot/usr/lib/win32-loader/win32-loader.exe win32-loader
+
+ # Restoring cache
+ Restore_cache cache/packages_binary
+
+ # Installing depends
+ Install_package
+
+ # Copying win32-loader
+ cp chroot/usr/lib/win32-loader/* binary
+
+ # Saving cache
+ Save_cache cache/packages_binary
+
+ # Removing depends
+ Remove_package
+ ;;
+
+ *)
+ Echo_warning "win32-loader inclusion is enabled but not compatible with your architecture, ignoring."
+ ;;
esac
fi
--
Debian Live build scripts
More information about the debian-live-changes
mailing list