diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-09-07 15:08:14 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-09-07 15:08:14 +0200 |
| commit | fa0ba13de67fdba694cf733a7c50529a79cc851c (patch) | |
| tree | 24cea97cb7d74bd1f39fe4327acb3daf20361c12 /scripts | |
| parent | ed5212022c335ae6d18eefa8a40bbee2709ac34c (diff) | |
| download | vyos-live-build-fa0ba13de67fdba694cf733a7c50529a79cc851c.tar.gz vyos-live-build-fa0ba13de67fdba694cf733a7c50529a79cc851c.zip | |
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.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/lb_binary_manifest | 4 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot | 4 | ||||
| -rwxr-xr-x | scripts/build/lb_clean | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/scripts/build/lb_binary_manifest b/scripts/build/lb_binary_manifest index e80d7808b..373e005e6 100755 --- a/scripts/build/lb_binary_manifest +++ b/scripts/build/lb_binary_manifest @@ -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 diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot index 7aacdfd07..e459c6cb9 100755 --- a/scripts/build/lb_chroot +++ b/scripts/build/lb_chroot @@ -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 ${*} diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean index 666ffc966..d4864425b 100755 --- a/scripts/build/lb_clean +++ b/scripts/build/lb_clean @@ -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 |