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

Renaming binary.packages list files (that contain what package is installed in the chroot) to chroot as they are build during chroot stage, this fixes some rebuild issues.

This commit is contained in:
Daniel Baumann 2011-09-07 15:08:14 +02:00
parent ed5212022c
commit fa0ba13de6
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build/lb_binary_manifest
View File

@ -61,8 +61,8 @@ case "${LB_INITRAMFS}" in
esac
# Add filesystem.packages
cp binary.packages.live "binary/${INITFS}/filesystem.${SUFFIX}"
echo "$(diff binary.packages.live binary.packages.install | awk '/^< / { print $2 }')" \
cp chroot.packages.live "binary/${INITFS}/filesystem.${SUFFIX}"
echo "$(diff chroot.packages.live chroot.packages.install | awk '/^< / { print $2 }')" \
> "binary/${INITFS}/filesystem.${SUFFIX}-remove"
# Creating stage file

4
scripts/build/lb_chroot
View File

@ -64,7 +64,7 @@ do
if [ "${_PASS}" = install ]
then
Chroot chroot "dpkg-query -W" > binary.packages.install
Chroot chroot "dpkg-query -W" > chroot.packages.install
fi
done
@ -75,7 +75,7 @@ lb chroot_hooks ${*}
lb chroot_hacks ${*}
lb chroot_interactive ${*}
Chroot chroot "dpkg-query -W" > binary.packages.live
Chroot chroot "dpkg-query -W" > chroot.packages.live
# Deconfiguring chroot
lb chroot_archives chroot remove ${*}

4
scripts/build/lb_clean
View File

@ -86,6 +86,8 @@ do
${LB_ROOT_COMMAND} rm -rf chroot chroot.tmp
rm -f chroot.packages.live chroot.packages.install
rm -f .stage/chroot*
;;
@ -96,7 +98,7 @@ do
rm -f binary*.img
rm -f binary*.tar.gz
rm -f binary.sh
rm -f binary.list binary.packages binary.packages.install binary.packages.live md5sum.txt
rm -f binary.list md5sum.txt
rm -rf binary
rm -rf tftpboot