summaryrefslogtreecommitdiff
path: root/helpers/lh_chroot_local-packages
diff options
context:
space:
mode:
Diffstat (limited to 'helpers/lh_chroot_local-packages')
-rwxr-xr-xhelpers/lh_chroot_local-packages30
1 files changed, 2 insertions, 28 deletions
diff --git a/helpers/lh_chroot_local-packages b/helpers/lh_chroot_local-packages
index 9c7ed36..15ce988 100755
--- a/helpers/lh_chroot_local-packages
+++ b/helpers/lh_chroot_local-packages
@@ -42,38 +42,12 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-if ls config/chroot_local-packages/*.deb > /dev/null 2>&1
+if ls chroot/root/local-packages/*.deb > /dev/null 2>&1
then
# Restoring cache
Restore_cache cache/packages_local-packages
- # Copying packages
- if ls config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb > /dev/null 2>&1
- then
- cp config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb chroot/root
- fi
-
- if ls config/chroot_local-packages/*_all.deb > /dev/null 2>&1
- then
- cp config/chroot_local-packages/*_all.deb chroot/root
- fi
-
- # Installing packages
- Chroot "find /root -name \\*.deb" > chroot/root/local-packages
-
- if [ -s chroot/root/local-packages ]
- then
- Chroot "xargs --arg-file=/root/local-packages dpkg -i" || true
- else
- Echo_warning "Local packages must be named with suffix '_all.deb' or '_\$architecture.deb'."
- fi
-
- # Cleaning dependencies
- Apt install -f
-
- # Removing package files
- rm -f chroot/root/*.deb
- rm -f chroot/root/local-packages
+ Apt install $(gunzip < chroot/root/local-packages/Packages.gz | awk '/^Package: / { print $2 }')
# Saving cache
Save_cache cache/packages_local-packages