null+****@clear*****
null+****@clear*****
2012年 5月 25日 (金) 16:49:48 JST
Kouhei Sutou 2012-05-25 16:49:48 +0900 (Fri, 25 May 2012)
New Revision: 5b364744f53eb50c26da5baa76103b3cda079a1d
Log:
yum: follow repositories path change
Modified files:
packages/yum/Makefile.am
packages/yum/sign-rpm.sh
packages/yum/update-repository.sh
Modified: packages/yum/Makefile.am (+4 -2)
===================================================================
--- packages/yum/Makefile.am 2012-05-25 16:43:32 +0900 (d85b058)
+++ packages/yum/Makefile.am 2012-05-25 16:49:48 +0900 (100750c)
@@ -16,10 +16,12 @@ ensure-rsync-path:
fi
sign:
- ./sign-rpm.sh '$(GPG_UID)' '$(DISTRIBUTIONS)'
+ ./sign-rpm.sh '$(GPG_UID)' '$(REPOSITORIES_PATH)/' \
+ '$(DISTRIBUTIONS)'
update:
- ./update-repository.sh $(PACKAGE) '$(DISTRIBUTIONS)'
+ ./update-repository.sh $(PACKAGE) '$(REPOSITORIES_PATH)/' \
+ '$(DISTRIBUTIONS)'
upload: ensure-rsync-path
for distribution in $(DISTRIBUTIONS); do \
Modified: packages/yum/sign-rpm.sh (+6 -5)
===================================================================
--- packages/yum/sign-rpm.sh 2012-05-25 16:43:32 +0900 (6dd4a02)
+++ packages/yum/sign-rpm.sh 2012-05-25 16:49:48 +0900 (8c09efa)
@@ -2,14 +2,15 @@
script_base_dir=`dirname $0`
-if [ $# != 2 ]; then
- echo "Usage: $0 GPG_UID DISTRIBUTIONS"
- echo " e.g.: $0 'F10399C0' 'fedora centos'"
+if [ $# != 3 ]; then
+ echo "Usage: $0 GPG_UID DESTINATION DISTRIBUTIONS"
+ echo " e.g.: $0 'F10399C0' repositories/ 'fedora centos'"
exit 1
fi
GPG_UID=$1
-DISTRIBUTIONS=$2
+DESTINATION=$2
+DISTRIBUTIONS=$3
run()
{
@@ -21,7 +22,7 @@ run()
}
rpms=""
-for distribution in ${DISTRIBUTIONS}; do
+for distribution in ${DESTINATION}${DISTRIBUTIONS}; do
rpms="${rpms} $(echo $script_base_dir/${distribution}/*/*/*/*.rpm)"
done
Modified: packages/yum/update-repository.sh (+2 -2)
===================================================================
--- packages/yum/update-repository.sh 2012-05-25 16:43:32 +0900 (33c5fdc)
+++ packages/yum/update-repository.sh 2012-05-25 16:49:48 +0900 (015d4a1)
@@ -2,8 +2,8 @@
script_base_dir=`dirname $0`
-if [ $# != 2 ]; then
- echo "Usage: $0 GPG_KEY_NAME DISTRIBUTIONS"
+if [ $# != 3 ]; then
+ echo "Usage: $0 GPG_KEY_NAME DESTINATION DISTRIBUTIONS"
echo " e.g.: $0 mitler-manager 'fedora centos'"
exit 1
fi