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

Unconditional Remove_packages calls in binary_rootfs (Closes: #994982) 

That prevents potential errors during future Remove_packages calls without APT indices available. In such cases, APT tries to remove packages with unrecognized names, which results in an error and fails the script execution. An example of this would be installing apt-utils in chroot_archives with --apt-indices option set to false.
This commit is contained in:
Michał Prochera 2022-01-18 22:30:47 +01:00 committed by Luca Boccassi
parent b9b32ad41f
commit e420c83e4c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/build/binary_rootfs
View File

@ -135,6 +135,9 @@ case "${LB_CHROOT_FILESYSTEM}" in
du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
# Removing depends
Remove_packages
if [ -e chroot/chroot.cache ]
then
Remove_lockfile
@ -150,9 +153,6 @@ case "${LB_CHROOT_FILESYSTEM}" in
touch .lock
else
rm -rf chroot/chroot
# Removing depends
Remove_packages
fi
;;
@ -201,6 +201,9 @@ case "${LB_CHROOT_FILESYSTEM}" in
# Move image
mv chroot/filesystem.jffs2 binary/${INITFS}
# Removing depends
Remove_packages
if [ -e chroot/chroot.cache ]
then
Remove_lockfile
@ -216,9 +219,6 @@ case "${LB_CHROOT_FILESYSTEM}" in
touch .lock
else
rm -rf chroot/chroot
# Removing depends
Remove_packages
fi
;;
@ -341,6 +341,9 @@ case "${LB_CHROOT_FILESYSTEM}" in
mv chroot/filesystem.squashfs binary/${INITFS}
rm -f chroot/squashfs.sort
# Removing depends
Remove_packages
if [ -e chroot/chroot.cache ]
then
Remove_lockfile
@ -356,9 +359,6 @@ case "${LB_CHROOT_FILESYSTEM}" in
touch .lock
else
rm -rf chroot/chroot
# Removing depends
Remove_packages
fi
;;