summaryrefslogtreecommitdiff
path: root/helpers/lh_chroot_linux-image
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-04-16 06:53:34 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:32 +0100
commitae785955db43a135455b50b98807a26b9fb8805a (patch)
tree3e88bd1a09833be3b438f486a5b0671d6595bdc6 /helpers/lh_chroot_linux-image
parent5ea22591ab3aee75c5aa6241aa94a5c5d36c4281 (diff)
downloadlive-build-ae785955db43a135455b50b98807a26b9fb8805a.zip
live-build-ae785955db43a135455b50b98807a26b9fb8805a.tar.gz
Install local packages using a local APT repo instead of using "dpkg -i"
This patch modifies chroot_sources to build a small APT repo of the local-packages and use that for local package installation instead of "dpkg -i". This has a few advantages: * Removes the true ugliness that is "dpkg -i *.deb && apt-get install -f". This not only is slow and brittle, it causes scary "dpkg dependency error" messages to appear in build logs. * We can (ie. not implemented here) move to installing all the packages from: - lh_chroot_packages (ie. ${LH_PACKAGES}) - lh_chroot_local-packages (ie. config/chroot_local-packages/*.deb) - lh_chroot_local-packageslists - lh_chroot_packages-lists - lh_chroot_linux-image .. in one shot. This would primarily improve speed as we would not keep invoking ${LH_APT}, and package installations can share triggers and suchlike -- installing a custom live-initramfs via local packages currently costs an additional "update-initramfs -u" call. It would also fix a number of obscure dependency cases, such as the one documented in #475739, and--if the user is using aptitude--may even result in better resolution choices. * Removes some messy and somewhat brittle code in lh_chroot_linux-image that edgecases a local live-initramfs. The disadvantages are: * If local packages are being used and we are building in a chroot, we must refresh the sources list and rebuild the repo before building the binary images. (However, before this patch, we had to do this anyway if the binary mirrors were different from the chroot ones.) * We must add a little hack to the minimal hook to detect whether we are using local packages and not remove apt-utils (which creates the repository in lh_chroot_sources) if that is the case -- we cannot simply use "Install_package" inside lh_chroot_sources as we are not guaranteed to have working APT data because the minimal hook deliberately removes them!
Diffstat (limited to 'helpers/lh_chroot_linux-image')
-rwxr-xr-xhelpers/lh_chroot_linux-image30
1 files changed, 1 insertions, 29 deletions
diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image
index bc6de54..3d760f9 100755
--- a/helpers/lh_chroot_linux-image
+++ b/helpers/lh_chroot_linux-image
@@ -77,36 +77,8 @@ EOF
done
fi
- if ! ls config/chroot_local-packages/${LH_INITRAMFS}*.deb > /dev/null 2>&1
- then
- PACKAGES="${PACKAGES} ${LH_INITRAMFS}"
- fi
-
# Installing linux-image, modules and ${LH_INITRAMFS}
- Apt install ${PACKAGES}
-
- if ls config/chroot_local-packages/${LH_INITRAMFS}*.deb > /dev/null 2>&1
- then
- cp config/chroot_local-packages/${LH_INITRAMFS}*.deb chroot/root
-
- # Installing package
- Chroot "find /root -name *.deb" > chroot/root/initfs
- Chroot "xargs --arg-file=/root/initfs dpkg -i" || true
-
- # Install dependencies
- case "${LH_APT}" in
- aptitude)
- Apt install ${LH_INITRAMFS}
- ;;
- apt|apt-get)
- Apt install -f
- ;;
- esac
-
- # Removing package files
- rm -f chroot/root/${LH_INITRAMFS}*.deb
- rm -f chroot/root/initfs
- fi
+ Apt install ${PACKAGES} ${LH_INITRAMFS}
# Saving cache
Save_cache cache/packages_linux-image