null+****@clear*****
null+****@clear*****
2012年 4月 29日 (日) 09:32:33 JST
Kouhei Sutou 2012-04-29 09:32:33 +0900 (Sun, 29 Apr 2012)
New Revision: 462b777a218847b67b262196cf68aadf37a4bcde
Log:
apt: sign Release with the old and new keys
Modified files:
packages/apt/Makefile.am
packages/apt/sign-repository.sh
Modified: packages/apt/Makefile.am (+1 -1)
===================================================================
--- packages/apt/Makefile.am 2012-04-29 09:31:49 +0900 (1347e80)
+++ packages/apt/Makefile.am 2012-04-29 09:32:33 +0900 (e903c69)
@@ -25,7 +25,7 @@ update-repository:
./update-repository.sh '$(PACKAGE_NAME)' '$(ARCHITECTURES)' '$(CODES)'
sign-repository:
- ./sign-repository.sh '$(CODES)'
+ ./sign-repository.sh '$(GPG_UID)' '$(CODES)'
ensure-rsync-path:
@if test -z "$(RSYNC_PATH)"; then \
Modified: packages/apt/sign-repository.sh (+17 -6)
===================================================================
--- packages/apt/sign-repository.sh 2012-04-29 09:31:49 +0900 (ef85c79)
+++ packages/apt/sign-repository.sh 2012-04-29 09:32:33 +0900 (def752d)
@@ -2,13 +2,14 @@
script_base_dir=`dirname $0`
-if [ $# != 1 ]; then
- echo "Usage: $0 CODES"
- echo " e.g.: $0 'lenny unstable hardy karmic'"
+if [ $# != 2 ]; then
+ echo "Usage: $0 GPG_UID CODES"
+ echo " e.g.: $0 'F10399C0' 'lenny unstable hardy karmic'"
exit 1
fi
-CODES=$1
+GPG_UID=$1
+CODES=$2
run()
{
@@ -29,7 +30,17 @@ for code_name in ${CODES}; do
;;
esac
- release=${distribution}/dists/${code_name}/Release
+ release=packages/${distribution}/dists/${code_name}/Release
rm -f ${release}.gpg
- gpg --sign -ba -o ${release}.gpg ${release}
+ gpg2 --sign --detach-sign --armor \
+ --local-user ${GPG_UID} \
+ --local-user 1C837F31 \
+ --output ${release}.gpg \
+ ${release} &
+
+ if [ "${PARALLEL}" != "yes" ]; then
+ wait
+ fi
done
+
+wait