<!DOCTYPE html> <html> <head> </head> <body> <dl style="line-height: 1.5; margin-left: 2em"> <dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt> <dd style="margin-left: 8.5em">Kouhei Sutou <kou****@clear*****></dd> <dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt> <dd style="margin-left: 8.5em">2012-07-28 17:51:25 +0900 (Sat, 28 Jul 2012)</dd> <dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt> <dd style="margin-left: 8.5em"><a href="https://github.com/mroonga/mroonga/commit/55108279b7e4d3242dfe6fafe4be6d5ddbd62cdc">55108279b7e4d3242dfe6fafe4be6d5ddbd62cdc</a></dd> <dt style="clear: both; float: left; font-weight: bold; width: 8em">Log</dt> <dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em">yum: use rpmdev-setuptree</pre></dd> <dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt> <dd style="margin-left: 8.5em"> <ul> <li>packages/yum/build-in-chroot.sh</li> <li>packages/yum/build-rpm.sh</li> </ul> </dd> </dl> <div class="diff-section" style="clear: both"> <div class="diff" style="margin-left: 1em; margin-right: 1em"> <pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; white-space: normal"> Modified: packages/yum/build-in-chroot.sh (+10 -2) =================================================================== --- packages/yum/build-in-chroot.sh 2012-07-28 12:32:11 +0900 (9f10c8c) +++ packages/yum/build-in-chroot.sh 2012-07-28 17:51:25 +0900 (c4708e1) @@ -77,6 +77,12 @@ 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" @@ -99,7 +105,7 @@ build() build_user=${PACKAGE}-build build_user_dir=${base_dir}/home/${build_user} - rpm_base_dir=${build_user_dir}/rpm + rpm_base_dir=${build_user_dir}/rpmbuild rpm_dir=${rpm_base_dir}/RPMS/${architecture} srpm_dir=${rpm_base_dir}/SRPMS pool_base_dir=${DESTINATION}${distribution}/${distribution_version} @@ -175,7 +181,9 @@ for architecture in $ARCHITECTURES; do if test "$parallel" = "yes"; then build $architecture $distribution $distribution_version & else - build $architecture $distribution $distribution_version + mkdir -p tmp + build_log=tmp/build-$distribution-$distribution_version-$architecture.log + build $architecture $distribution $distribution_version 2>&1 | tee $build_log fi; done; done; </pre> </div> <div class="diff" style="margin-left: 1em; margin-right: 1em"> <pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; white-space: normal"> Modified: packages/yum/build-rpm.sh (+9 -22) =================================================================== --- packages/yum/build-rpm.sh 2012-07-28 12:32:11 +0900 (1799fa9) +++ packages/yum/build-rpm.sh 2012-07-28 17:51:25 +0900 (3c1a324) @@ -26,6 +26,7 @@ if ! id $USER_NAME >/dev/null 2>&1; then fi yum_options= + distribution=$(cut -d ' ' -f 1 /etc/redhat-release | tr 'A-Z' 'a-z') if grep -q Linux /etc/redhat-release; then distribution_version=$(cut -d ' ' -f 4 /etc/redhat-release) @@ -101,35 +102,21 @@ case $distribution in esac run yum update ${yum_options} -y -run yum install ${yum_options} -y rpm-build tar ${DEPENDED_PACKAGES} +run yum install ${yum_options} -y rpm-build rpmdevtools tar ${DEPENDED_PACKAGES} run yum clean ${yum_options} packages -if ! id $USER_NAME >/dev/null 2>&1; then - run useradd -m $USER_NAME -fi - # for debug # rpmbuild_options="$rpmbuild_options --define 'optflags -O0 -ggdb3'" cat <<EOF > $BUILD_SCRIPT #!/bin/sh -if [ ! -f ~/.rpmmacros ]; then - cat <<EOM > ~/.rpmmacros -%_topdir \$HOME/rpm -EOM -fi - -# rm -rf rpm -mkdir -p rpm/SOURCES -mkdir -p rpm/SPECS -mkdir -p rpm/BUILD -mkdir -p rpm/RPMS -mkdir -p rpm/SRPMS +rm -rf .rpmmacros +rpmdev-setuptree if test -f /tmp/${SOURCE_BASE_NAME}-$VERSION-*.src.rpm; then if ! rpm -Uvh /tmp/${SOURCE_BASE_NAME}-$VERSION-*.src.rpm; then - cd rpm/SOURCES + cd rpmbuild/SOURCES rpm2cpio /tmp/${SOURCE_BASE_NAME}-$VERSION-*.src.rpm | cpio -id if ! yum info tcp_wrappers-devel >/dev/null 2>&1; then sed -i'' -e 's/tcp_wrappers-devel/tcp_wrappers/g' ${PACKAGE}.spec @@ -142,13 +129,13 @@ if test -f /tmp/${SOURCE_BASE_NAME}-$VERSION-*.src.rpm; then cd fi else - cp /tmp/${SOURCE_BASE_NAME}-$VERSION.* rpm/SOURCES/ - cp /tmp/${PACKAGE}.spec rpm/SPECS/ + cp /tmp/${SOURCE_BASE_NAME}-$VERSION.* rpmbuild/SOURCES/ + cp /tmp/${PACKAGE}.spec rpmbuild/SPECS/ fi -chmod o+rx . rpm rpm/RPMS rpm/SRPMS +chmod o+rx . rpmbuild rpmbuild/RPMS rpmbuild/SRPMS -rpmbuild -ba ${rpmbuild_options} rpm/SPECS/${PACKAGE}.spec +rpmbuild -ba ${rpmbuild_options} rpmbuild/SPECS/${PACKAGE}.spec EOF run chmod +x $BUILD_SCRIPT </pre> </div> </div> </body> </html>