diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-06-15 02:55:33 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:35 +0100 |
| commit | a26d1c55e1787a982a58fe9aa1e0f3e440577c9b (patch) | |
| tree | ec92d5619009a37e42c2e9e4e55e17740107ec50 /helpers | |
| parent | 5cb3a1a800b0998d1d62997627f165d66fb55405 (diff) | |
| download | live-build-a26d1c55e1787a982a58fe9aa1e0f3e440577c9b.zip live-build-a26d1c55e1787a982a58fe9aa1e0f3e440577c9b.tar.gz | |
Ensure apt-utils is installed in the helpers it is required.
This allows us to remove a hacky test from hooks/minimal to see whether
we need the package.
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 1 | ||||
| -rwxr-xr-x | helpers/lh_binary_local-packageslists | 15 | ||||
| -rwxr-xr-x | helpers/lh_chroot_sources | 15 |
3 files changed, 31 insertions, 0 deletions
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index d0f6d20..7ee6dfd 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -73,6 +73,7 @@ Create_lockfile .lock # Checking depends Check_package chroot/usr/bin/wget wget +Check_package chroot/usr/bin/apt-ftparchive apt-utils # Restoring cache Restore_cache cache/packages_binary diff --git a/helpers/lh_binary_local-packageslists b/helpers/lh_binary_local-packageslists index 5b8927a..2659416 100755 --- a/helpers/lh_binary_local-packageslists +++ b/helpers/lh_binary_local-packageslists @@ -44,6 +44,15 @@ Create_lockfile .lock if ls config/binary_local-packageslists/* > /dev/null 2>&1 then + # Restoring cache + Restore_cache cache/packages_chroot + + # Check depends + Check_package chroot/usr/bin/apt-ftparchive apt-utils + + # Installing depends + Install_package + mkdir -p chroot/binary.deb/archives/partial mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp touch chroot/var/lib/dpkg/status @@ -95,6 +104,12 @@ then rm -rf chroot/binary.deb mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status + # Removing depends + Remove_package + + # Saving cache + Save_cache cache/packages_chroot + # Creating stage file Create_stagefile .stage/binary_local-packageslists fi diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index 677b50f..981692b 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -96,6 +96,15 @@ case "${1}" in if ls chroot/root/local-packages/*.deb > /dev/null 2>&1 then + # Restoring cache + Restore_cache cache/packages_chroot + + # Check depends + Check_package chroot/usr/bin/apt-ftparchive apt-utils + + # Installing depends + Install_package + # Generate Packages.gz echo "cd /root/local-packages && apt-ftparchive packages . > Packages" | Chroot sh gzip -9 chroot/root/local-packages/Packages @@ -104,6 +113,12 @@ case "${1}" in echo "" >> chroot/etc/apt/sources.list echo "# Local packages" >> chroot/etc/apt/sources.list echo "deb file:/root/local-packages ./" >> chroot/etc/apt/sources.list + + # Removing depends + Remove_package + + # Saving cache + Save_cache cache/packages_chroot else Echo_warning "Local packages must be named with suffix '_all.deb' or '_\$architecture.deb'." fi |