Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:44:48 JST 2012
Kouhei Sutou 2012-07-28 18:15:18 +0900 (Sat, 28 Jul 2012) New Revision: b72e45ec52c529518d1721211d51c13d27fd707a https://github.com/mroonga/mroonga/commit/b72e45ec52c529518d1721211d51c13d27fd707a Merged 7874035: Merge branch 'master' of github.com:mroonga/mroonga Log: yum: support creating Fedora 17 environment Modified files: packages/yum/build-in-chroot.sh Modified: packages/yum/build-in-chroot.sh (+21 -12) =================================================================== --- packages/yum/build-in-chroot.sh 2012-07-28 18:13:36 +0900 (c4708e1) +++ packages/yum/build-in-chroot.sh 2012-07-28 18:15:18 +0900 (466170a) @@ -60,12 +60,19 @@ build_chroot() fi fi + rinse_distribution_version=$distribution_version + if [ "$distribution_name" = "fedora" ]; then + if [ $distribution_version -gt 16 ]; then + rinse_distribution_version=16 + fi + fi + run_sudo mkdir -p ${base_dir}/etc/rpm rpm_platform=${distribution_architecture}-${distribution}-linux run_sudo sh -c "echo ${rpm_platform} > ${base_dir}/etc/rpm/platform" run_sudo rinse \ --arch $rinse_architecture \ - --distribution $distribution_name-$distribution_version \ + --distribution $distribution_name-$rinse_distribution_version \ --directory $base_dir run_sudo rinse --arch $rinse_architecture --clean-cache @@ -77,17 +84,19 @@ build_chroot() run_sudo mount ${base_dir}/dev/pts run_sudo mount ${base_dir}/proc - if [ "$distribution_name-$distribution_version" = "fedora-16" ]; then - yes | run_sudo su -c "chroot ${base_dir} rpm --import https://fedoraproject.org/static/A82BA4B7.txt" - run_sudo su -c "chroot ${base_dir} yum -y update yum" - run_sudo su -c "chroot ${base_dir} yum -y clean all" - run_sudo su -c "chroot ${base_dir} yum -y --releasever=16 --disableplugin=presto distro-sync" - fi - if [ "$distribution_name-$distribution_version" = "fedora-17" ]; then - yes | run_sudo su -c "chroot ${base_dir} rpm --import https://fedoraproject.org/static/1ACA3465.txt" - run_sudo su -c "chroot ${base_dir} yum -y update yum" - run_sudo su -c "chroot ${base_dir} yum -y clean all" - run_sudo su -c "chroot ${base_dir} yum -y --releasever=17 --disableplugin=presto distro-sync" + if [ "$distribution_name" = "fedora" ]; then + if [ $distribution_version -ge 16 ]; then + yes | run_sudo su -c "chroot ${base_dir} rpm --import https://fedoraproject.org/static/A82BA4B7.txt" + run_sudo su -c "chroot ${base_dir} yum -y update yum" + run_sudo su -c "chroot ${base_dir} yum -y clean all" + run_sudo su -c "chroot ${base_dir} yum -y --releasever=16 --disableplugin=presto distro-sync" + fi + if [ $distribution_version -ge 17 ]; then + yes | run_sudo su -c "chroot ${base_dir} rpm --import https://fedoraproject.org/static/1ACA3465.txt" + run_sudo su -c "chroot ${base_dir} yum -y update yum" + run_sudo su -c "chroot ${base_dir} yum -y clean all" + run_sudo su -c "chroot ${base_dir} yum -y --releasever=17 --disableplugin=presto distro-sync" + fi fi } -------------- next part -------------- HTML����������������������������...Download
