manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

installer: tidy package lists 

`DI_PACKAGES` does not need to include `DI_REQ_PACKAGES` so long as
we pass the latter to apt in the one case where it was not already
being given it.

in fact with it including that sub-list meant that in the other
case where it was being given to apt, it actually just resulted in
duplication.

Gbp-Dch: Short
This commit is contained in:
Lyndon Brown 2020-03-15 22:18:01 +00:00
parent 9a878350d3
commit 3fb0bb235d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/build/installer_debian-installer
View File

@ -307,17 +307,17 @@ then
case "${LB_ARCHITECTURES}" in case "${LB_ARCHITECTURES}" in
amd64) amd64)
DI_REQ_PACKAGES="lilo grub-pc" DI_REQ_PACKAGES="lilo grub-pc"
DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-amd64" DI_PACKAGES="linux-image-amd64"
;; ;;
i386) i386)
DI_REQ_PACKAGES="lilo grub-pc" DI_REQ_PACKAGES="lilo grub-pc"
DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-686-pae" DI_PACKAGES="linux-image-686-pae"
;; ;;
powerpc) powerpc)
DI_REQ_PACKAGES="yaboot" DI_REQ_PACKAGES="yaboot"
DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp" DI_PACKAGES="linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp"
;; ;;
esac esac
@ -326,7 +326,6 @@ then
case "${LB_MODE}" in case "${LB_MODE}" in
debian) debian)
DI_REQ_PACKAGES="${DI_REQ_PACKAGES} console-setup keyboard-configuration kbd" DI_REQ_PACKAGES="${DI_REQ_PACKAGES} console-setup keyboard-configuration kbd"
DI_PACKAGES="${DI_PACKAGES} console-setup keyboard-configuration kbd"
;; ;;
esac esac
@ -413,7 +412,7 @@ then
done done
else else
# Download .debs of the required packages # Download .debs of the required packages
Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES}
fi fi
mv chroot/binary.deb ./ mv chroot/binary.deb ./