null+****@clear*****
null+****@clear*****
2012年 4月 25日 (水) 15:21:44 JST
Kouhei Sutou 2012-04-25 15:21:44 +0900 (Wed, 25 Apr 2012)
New Revision: 0f76d807e022b04d8fa01722069550cf7a214942
Log:
apt: move deb directory under packages/
Modified files:
.gitignore
packages/apt/Makefile.am
packages/apt/build-in-chroot.sh
packages/apt/sign-repository.sh
Modified: .gitignore (+18 -18)
===================================================================
--- .gitignore 2012-04-25 15:02:12 +0900 (cb4b069)
+++ .gitignore 2012-04-25 15:21:44 +0900 (4bcf90c)
@@ -74,24 +74,24 @@ cmake_install.cmake
/test/benchmark/fixtures/geo-select/load.grn
/test/benchmark/bench-geo-select
/test/benchmark/bench-normalize
-/packages/apt/debian/pool/*/*/*/*/*.diff.gz
-/packages/apt/debian/pool/*/*/*/*/*.tar.gz
-/packages/apt/debian/pool/*/*/*/*/*.build
-/packages/apt/debian/pool/*/*/*/*/*.changes
-/packages/apt/debian/pool/*/*/*/*/*.deb
-/packages/apt/debian/pool/*/*/*/*/*.dsc
-/packages/apt/debian/dists/
-/packages/apt/debian/*.db
-/packages/apt/debian/*.conf
-/packages/apt/ubuntu/pool/*/*/*/*/*.diff.gz
-/packages/apt/ubuntu/pool/*/*/*/*/*.tar.gz
-/packages/apt/ubuntu/pool/*/*/*/*/*.build
-/packages/apt/ubuntu/pool/*/*/*/*/*.changes
-/packages/apt/ubuntu/pool/*/*/*/*/*.deb
-/packages/apt/ubuntu/pool/*/*/*/*/*.dsc
-/packages/apt/ubuntu/dists/
-/packages/apt/ubuntu/*.db
-/packages/apt/ubuntu/*.conf
+/packages/apt/packages/debian/pool/*/*/*/*/*.diff.gz
+/packages/apt/packages/debian/pool/*/*/*/*/*.tar.gz
+/packages/apt/packages/debian/pool/*/*/*/*/*.build
+/packages/apt/packages/debian/pool/*/*/*/*/*.changes
+/packages/apt/packages/debian/pool/*/*/*/*/*.deb
+/packages/apt/packages/debian/pool/*/*/*/*/*.dsc
+/packages/apt/packages/debian/dists/
+/packages/apt/packages/debian/*.db
+/packages/apt/packages/debian/*.conf
+/packages/apt/packages/ubuntu/pool/*/*/*/*/*.diff.gz
+/packages/apt/packages/ubuntu/pool/*/*/*/*/*.tar.gz
+/packages/apt/packages/ubuntu/pool/*/*/*/*/*.build
+/packages/apt/packages/ubuntu/pool/*/*/*/*/*.changes
+/packages/apt/packages/ubuntu/pool/*/*/*/*/*.deb
+/packages/apt/packages/ubuntu/pool/*/*/*/*/*.dsc
+/packages/apt/packages/ubuntu/dists/
+/packages/apt/packages/ubuntu/*.db
+/packages/apt/packages/ubuntu/*.conf
/configure.lineno
/packages/rpm/*/*.spec
/packages/yum/groonga.repo
Modified: packages/apt/Makefile.am (+6 -6)
===================================================================
--- packages/apt/Makefile.am 2012-04-25 15:02:12 +0900 (24f4f73)
+++ packages/apt/Makefile.am 2012-04-25 15:21:44 +0900 (9c8640e)
@@ -8,8 +8,8 @@ all:
release: build update sign upload
remove-existing-packages:
- for distribution in $(DISTRIBUTIONS); do \
- find $${distribution}/pool -type f -delete; \
+ for distribution in $(DISTRIBUTIONS); do \
+ find packages/$${distribution}/pool -type f -delete; \
done
ensure-rsync-path:
@@ -19,9 +19,9 @@ ensure-rsync-path:
fi
download: ensure-rsync-path
- for distribution in $(DISTRIBUTIONS); do \
- rsync -avz --delete \
- $(RSYNC_PATH)/$${distribution}/ $${distribution}; \
+ for distribution in $(DISTRIBUTIONS); do \
+ rsync -avz --delete \
+ $(RSYNC_PATH)/$${distribution} packages/; \
done
update:
@@ -32,7 +32,7 @@ sign:
upload: ensure-rsync-path
for distribution in $(DISTRIBUTIONS); do \
- (cd $${distribution}; \
+ (cd packages/$${distribution}; \
rsync -avz --delete \
dists pool $(RSYNC_PATH)/$${distribution}); \
done
Modified: packages/apt/build-in-chroot.sh (+1 -1)
===================================================================
--- packages/apt/build-in-chroot.sh 2012-04-25 15:02:12 +0900 (7a1fca9)
+++ packages/apt/build-in-chroot.sh 2012-04-25 15:21:44 +0900 (adf0162)
@@ -93,7 +93,7 @@ build()
build_user=${PACKAGE}-build
build_user_dir=${base_dir}/home/$build_user
build_dir=${build_user_dir}/build
- pool_base_dir=${script_base_dir}/${distribution}/pool/${code_name}/${component}
+ pool_base_dir=${script_base_dir}/packages/${distribution}/pool/${code_name}/${component}
package_initial=$(echo ${PACKAGE} | sed -e 's/\(.\).*/\1/')
pool_dir=${pool_base_dir}/${package_initial}/${PACKAGE}
run cp $source_dir/${PACKAGE}-${VERSION}.tar.gz \
Modified: packages/apt/sign-repository.sh (+1 -1)
===================================================================
--- packages/apt/sign-repository.sh 2012-04-25 15:02:12 +0900 (6393556)
+++ packages/apt/sign-repository.sh 2012-04-25 15:21:44 +0900 (05457f1)
@@ -30,7 +30,7 @@ for code_name in ${CODES}; do
;;
esac
- release=${distribution}/dists/${code_name}/Release
+ release=packages/${distribution}/dists/${code_name}/Release
rm -f ${release}.gpg
gpg2 --sign --detach-sign --armor \
--local-user ${GPG_UID} \