[SCM] live-build branch, debian-next, updated. debian/3.0_a21-1-7-g8323b47
Daniel Baumann
daniel at debian.org
Wed Jun 15 19:21:15 UTC 2011
The following commit has been merged in the debian-next branch:
commit 8323b47859615e69e4068e5e6679cba05b155dc8
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jun 15 21:21:41 2011 +0200
Changing archives key suffix from .gpg to .key.
diff --git a/archives/live.debian.net.gpg b/archives/live.debian.net.key
similarity index 100%
rename from archives/live.debian.net.gpg
rename to archives/live.debian.net.key
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index d06581d..69ceae4 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -236,9 +236,9 @@ EOF
if [ "${LB_APT_SECURE}" != false ]
then
# Adding archive signing keys (chroot)
- if [ -e "${LB_BASE}/archives/${REPOSITORY}.chroot.gpg" ]
+ if [ -e "${LB_BASE}/archives/${REPOSITORY}.chroot.key" ]
then
- cat "${LB_BASE}/archives/${REPOSITORY}.chroot.gpg" | Chroot chroot "apt-key add -"
+ cat "${LB_BASE}/archives/${REPOSITORY}.chroot.key" | Chroot chroot "apt-key add -"
elif [ -e "${LB_BASE}/archives/${REPOSITORY}.gpg" ]
then
cat "${LB_BASE}/archives/${REPOSITORY}.gpg" | Chroot chroot "apt-key add -"
@@ -458,9 +458,9 @@ EOF
fi
else # Get fresh indices
# Check local gpg keys
- if Find_files config/archives/*.chroot.gpg
+ if Find_files config/archives/*.chroot.key
then
- for FILE in config/archives/*.chroot.gpg
+ for FILE in config/archives/*.chroot.key
do
cp ${FILE} chroot/root
Chroot chroot "apt-key add /root/$(basename ${FILE})"
@@ -755,9 +755,9 @@ EOF
if [ "${LB_APT_SECURE}" != false ]
then
# Adding archive signing keys (binary)
- if [ -e "${LB_BASE}/archives/${REPOSITORY}.binary.gpg" ]
+ if [ -e "${LB_BASE}/archives/${REPOSITORY}.binary.key" ]
then
- cat "${LB_BASE}/archives/${REPOSITORY}.binary.gpg" | Chroot chroot "apt-key add -"
+ cat "${LB_BASE}/archives/${REPOSITORY}.binary.key" | Chroot chroot "apt-key add -"
elif [ -e "${LB_BASE}/archives/${REPOSITORY}.gpg" ]
then
cat "${LB_BASE}/archives/${REPOSITORY}.gpg" | Chroot chroot "apt-key add -"
@@ -780,9 +780,9 @@ EOF
fi
# Check local gpg keys
- if Find_files config/archives/*.binary.gpg
+ if Find_files config/archives/*.binary.key
then
- for FILE in config/archives/*.binary.gpg
+ for FILE in config/archives/*.binary.key
do
cp ${FILE} chroot/root
Chroot chroot "apt-key add /root/$(basename ${FILE})"
--
live-build
More information about the debian-live-changes
mailing list