null+****@clear*****
null+****@clear*****
2012年 7月 29日 (日) 00:05:27 JST
Kouhei Sutou 2012-07-29 00:05:27 +0900 (Sun, 29 Jul 2012) New Revision: f08ff611b8eaaf3e5e630b7fe49e0bda1733aaf7 https://github.com/mroonga/mroonga/commit/f08ff611b8eaaf3e5e630b7fe49e0bda1733aaf7 Log: yum: remove needless ad-hook Fedora >= 16 support Use Fedora 17 supportted rinse. See https://www.gitorious.org/rinse/rinse/merge_requests/1 Modified files: packages/yum/build-in-chroot.sh Modified: packages/yum/build-in-chroot.sh (+1 -23) =================================================================== --- packages/yum/build-in-chroot.sh 2012-07-29 00:02:02 +0900 (466170a) +++ packages/yum/build-in-chroot.sh 2012-07-29 00:05:27 +0900 (406d08c) @@ -60,19 +60,12 @@ 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-$rinse_distribution_version \ + --distribution $distribution_name-$distribution_version \ --directory $base_dir run_sudo rinse --arch $rinse_architecture --clean-cache @@ -83,21 +76,6 @@ build_chroot() run_sudo mount ${base_dir}/dev run_sudo mount ${base_dir}/dev/pts run_sudo mount ${base_dir}/proc - - 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 } build() -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download