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

Add local archive keys before configuring local package repository 

In the binary stage, chroot is restored from cache/bootstrap, which contains
neither custom repo lists, nor keys. If local packages are present,
chroot_archives will call 'Apt chroot update' after adding custom repo lists
without adding keys. apt-get will then fail instead of warn as of apt version
1.5.

Closes: #941691
This commit is contained in:
John Estabrook 2019-10-03 14:38:54 +00:00 committed by Raphaël Hertzog
parent 97e8070b72
commit b6ad08c270
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
scripts/build/chroot_archives
View File

@ -212,6 +212,25 @@ EOF
fi
done
# Check local archive keys (chroot)
if Find_files config/archives/*.key || \
Find_files config/archives/*.key.chroot
then
for FILE in config/archives/*.key \
config/archives/*.key.chroot
do
if [ -e "${FILE}" ]
then
if grep -q "PGP PUBLIC KEY BLOCK" "${FILE}"
then
cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
else
cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).gpg
fi
fi
done
fi
# Configure local package repository
if Find_files config/packages.chroot/*.deb || Find_files config/packages/*.deb
then
@ -344,25 +363,6 @@ EOF
Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
fi
else # Get fresh indices
# Check local archive keys
if Find_files config/archives/*.key || \
Find_files config/archives/*.key.chroot
then
for FILE in config/archives/*.key \
config/archives/*.key.chroot
do
if [ -e "${FILE}" ]
then
if grep -q "PGP PUBLIC KEY BLOCK" "${FILE}"
then
cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
else
cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).gpg
fi
fi
done
fi
# Check local keyring packages
if Find_files config/archives/*.deb
then