null+****@clear*****
null+****@clear*****
2012年 4月 29日 (日) 10:37:49 JST
Kouhei Sutou 2012-04-29 10:37:49 +0900 (Sun, 29 Apr 2012)
New Revision: 79958f8255a97cce59d5704e219f17e2e1e55cb9
Log:
yum: don't download MySQL RPMs twice
Modified files:
packages/yum/build-in-chroot.sh
Modified: packages/yum/build-in-chroot.sh (+6 -3)
===================================================================
--- packages/yum/build-in-chroot.sh 2012-04-29 10:37:29 +0900 (53a0c74)
+++ packages/yum/build-in-chroot.sh 2012-04-29 10:37:49 +0900 (74dac0a)
@@ -139,15 +139,18 @@ build()
run cp ${script_base_dir}/${PACKAGE}-build-options \
${CHROOT_BASE}/$target/tmp/build-options
run cp ${script_base_dir}/build-rpm.sh ${CHROOT_BASE}/$target/tmp/
- run_sudo rm -rf $rpm_dir $srpm_dir
run_sudo su -c "chroot ${CHROOT_BASE}/$target /tmp/build-rpm.sh"
run mkdir -p $binary_pool_dir
run mkdir -p $source_pool_dir
run cp -p $rpm_dir/*-${VERSION}* $binary_pool_dir
run cp -p $srpm_dir/*-${VERSION}* $source_pool_dir
if [ $distribution = "centos" -a $distribution_version -eq 5 ]; then
- run cp -p $rpm_dir/MySQL-* $binary_pool_dir
- run cp -p $srpm_dir/MySQL-* $source_pool_dir
+ mysql_version=$(grep '%define mysql_version' \
+ ${CHROOT_BASE}/$target/tmp/${PACKAGE}.spec | \
+ sed -e 's/%define mysql_version //g' | \
+ tail -1)
+ run cp -p $rpm_dir/MySQL-*-${mysql_version}* $binary_pool_dir
+ run cp -p $srpm_dir/MySQL-${mysql_version}* $source_pool_dir
fi
dependencies_dir=${build_user_dir}/dependencies