diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-08-10 07:03:27 +0100 |
|---|---|---|
| committer | Chris Lamb <chris@chris-lamb.co.uk> | 2008-08-10 07:03:27 +0100 |
| commit | f7da00a816180689c5add1dbb818d9fc16f6e5b0 (patch) | |
| tree | 5e722c6444ada1e03489cfd6774ccf95746b5f81 /helpers | |
| parent | 14d1191d9057ad260de99de4ca06994cc64ab9e9 (diff) | |
| download | vyos-live-build-f7da00a816180689c5add1dbb818d9fc16f6e5b0.tar.gz vyos-live-build-f7da00a816180689c5add1dbb818d9fc16f6e5b0.zip | |
Fix a bug in chroot_local-packages where packages were upgraded with themselves during lh_binary stages.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_chroot_apt | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index 1f8741ee9..1e6ab563f 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -112,6 +112,15 @@ case "${1}" in cp config/chroot_apt/preferences chroot/etc/apt/preferences fi + if Find_files config/chroot_local-packages/*.deb + then + # Ensure local packages have priority + echo >> chroot/etc/apt/preferences + echo "Package: *" >> chroot/etc/apt/preferences + echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences + echo "Pin-Priority: 1001" >> chroot/etc/apt/preferences + fi + # Creating stage file Create_stagefile .stage/chroot_apt ;; @@ -151,6 +160,20 @@ case "${1}" in rm -f chroot/etc/apt/preferences fi + if Find_files config/chroot_local-packages/*.deb + then + # Ensure local packages are not re-installed during lh_binary + echo >> chroot/etc/apt/preferences + echo "Package: *" >> chroot/etc/apt/preferences + echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences + echo "Pin-Priority: 99" >> chroot/etc/apt/preferences + + echo >> chroot/etc/apt/preferences + echo "Package: *" >> chroot/etc/apt/preferences + echo "Pin: release o=debian" >> chroot/etc/apt/preferences + echo "Pin-Priority: 99" >> chroot/etc/apt/preferences + fi + # Removing stage file rm -f .stage/chroot_apt ;; @@ -159,13 +182,3 @@ case "${1}" in Usage ;; esac - -if ls config/chroot_local-packages/*.deb > /dev/null 2>&1 -then - cat >>chroot/etc/apt/preferences <<EOF - -Package: * -Pin: release o=chroot_local-packages -Pin-Priority: 1001 -EOF -fi |