diff options
| author | Daniel Baumann <daniel@debian.org> | 2013-01-20 08:53:43 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:04 +0200 |
| commit | 09e65e406b04c5e1e10b4e3e8a0eccdf929f4fa8 (patch) | |
| tree | e0142f26102549f6ee9036143933d5461c719aa1 | |
| parent | df797b7cdad2bb82e9f5093a992d5aa182af6d17 (diff) | |
| download | vyos-live-build-09e65e406b04c5e1e10b4e3e8a0eccdf929f4fa8.tar.gz vyos-live-build-09e65e406b04c5e1e10b4e3e8a0eccdf929f4fa8.zip | |
Applying slightly modified patch from Raphaël Hertzog <hertzog@debian.org> to fix automatic firmware inclusion when using debian-installer with live-installer and having firmware packages installed in the live system already.
| -rwxr-xr-x | scripts/build/binary_debian-installer | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer index 6c448686a..685cf86f5 100755 --- a/scripts/build/binary_debian-installer +++ b/scripts/build/binary_debian-installer @@ -472,34 +472,25 @@ then # d-i does not support (for example) re-installing grub from target/ - the grub # .debs must actually exist. - # Modify dpkg status to show the required packages are not installed. - cp chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status - for PACKAGE in ${DI_REQ_PACKAGES} - do - awk -v f=0 ' - f == 1 { print "Status: purge ok not-installed"; f=0; next } - /Package: '"${PACKAGE}"'/ { f=1; } - { print } - ' chroot/var/lib/dpkg/status > chroot/var/lib/dpkg/status.awk - mv chroot/var/lib/dpkg/status.awk chroot/var/lib/dpkg/status - done - - # Download .deb's that we just marked as "purged" which caused broken dependencies - Chroot chroot ${_LB_APT_COMMAND} -f dist-upgrade - - # Revert dpkg status file - mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status - # Download .debs of the required packages Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES} + + # Drop the packages already installed that d-i doesn't explicitely need + _REMAINING_PACKAGES="$(echo ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES} | sed -e 's# #|#g')" + _REMAINING_PACKAGES="$(sed -n -e 's|Package: ||p' chroot/var/lib/dpkg/status.tmp | grep -E -v "^${_REMAINING_PACKAGES}$")" + + for _PACKAGE in ${_REMAINING_PACKAGES} + do + rm -f "chroot/binary.deb/archives/${_PACKAGE}_*.deb" + done else # Download .debs of the required packages Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} - - # Revert dpkg status file - mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status fi + # Revert dpkg status file + mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status + mv chroot/binary.deb ./ for _ARCHIVE_AREA in $(echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} ${LIVE_IMAGE_ARCHIVE_AREAS}) |