Changeset 2082 for trunk


Ignore:
Timestamp:
Nov 26, 2011, 8:09:20 PM (11 years ago)
Author:
ezyang
Message:
Adjust Makefile for Fedora 17.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/Makefile

    r2066 r2082  
    146146        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    147147        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    148         /usr/bin/mock -r scripts-fc15-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     148        /usr/bin/mock -r scripts-fc17-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    149149
    150150$(filter-out %.i686,$(oursrc)): %: setup
    151151        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    152152        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    153         /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     153        /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    154154
    155155$(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
     
    157157$(filter %.i686,$(upstream)): %.i686: setup patch-specs
    158158        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    159         /usr/bin/mock -r scripts-fc15-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     159        /usr/bin/mock -r scripts-fc17-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    160160
    161161$(filter-out %.i686,$(upstream)): %: setup patch-specs
    162162        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    163         /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     163        /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    164164
    165165openafs-kernel: setup
    166166        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    167167        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec
    168         /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
     168        /usr/bin/mock -r scripts-fc17-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
    169169
    170170#sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong
Note: See TracChangeset for help on using the changeset viewer.