Changeset 796 for server/fedora/Makefile


Ignore:
Timestamp:
Aug 6, 2008, 4:53:24 AM (14 years ago)
Author:
geofft
Message:
oh hai, i fixed ur maekfile
File:
1 edited

Legend:

Unmodified
Added
Removed
  • server/fedora/Makefile

    r788 r796  
    1919# See /COPYRIGHT in this repository for more information.
    2020
    21 upstream        = openafs krb5 httpd openssh
     21upstream_yum    = krb5 httpd openssh
     22upstream        = openafs $(upstream_yum)
    2223oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i386 whoisd mit-zephyr
    2324allsrc          = $(upstream) $(oursrc)
    2425oursrcdir       = ${PWD}/../common/oursrc
    2526patches         = ${PWD}/../common/patches
    26 metapatches     = ${PWD}/meta-patches
    2727specs           = ${PWD}/specs
    2828
     
    3838server_url      = "http://web.mit.edu/scripts/src"
    3939server_arch     = "fedora.stable"
     40openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.7/openafs-1.4.7-1.1.1.src.rpm"
    4041
    4142.PHONY: minimal-clean
     
    5758        ln -sTf $(topdir) rpmbuild
    5859
    59 download:
     60download: download_stamp
     61download_stamp:
    6062        @mkdir -p $(dload); \
    61         wget -qO- -nv $(server_url)/$(server_arch) | xargs make
     63        #wget -qO- -nv $(server_url)/$(server_arch) | xargs make
     64        cd $(dload) && yumdownloader --source $(upstream_yum)
     65        wget -P $(dload) $(openafs_url)
     66        touch download_stamp
    6267
    6368%.src.rpm:
     
    6671copy-patches: mkdir-tree
    6772        @cp $(patches)/*.patch $(tmp_src); \
    68         cd $(tmp_src); \
    69         list=`ls $(metapatches)/*.patch`; \
    70         for i in $$list; do \
    71                 patch < $$i; \
    72         done;
     73        cd $(tmp_src);
    7374
    7475install-srpms: mkdir-tree download
     
    121122
    122123$(upstream):
    123         rpmbuild $(rpmbuild_args) --rebuild $(dload)/$@*.src.rpm
     124        rpmbuild $(rpmbuild_args) -ba ${tmp_specs}/$@.spec
    124125
    125126openafs-kernel: setup
     
    127128        rpmbuild $(rpmbuild_args) -bb ${tmp_specs}/openafs*.spec
    128129
    129 kernvers = $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)
     130#sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong
     131#kernvers = $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)
     132kernvers = $(shell uname -r | sed "s/\(.*\)[.].*/\1/")
    130133kvariants = ''
    131134openafs_rpmbuild_args = --define "fedorakmod 1" --define "kvariants $(kvariants)" --define "kernvers $(kernvers)" --nodeps
     
    163166httpdmods-deps  = httpd-devel
    164167httpd-deps      = xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel
    165 krb5-deps       = bison ncurses-devel texinfo keyutils-libs-devel
     168krb5-deps       = bison ncurses-devel texinfo keyutils-libs-devel texinfo-tex
    166169openafs-deps    = pam-devel automake
    167170mit-zephyr-deps = readline-devel hesiod-devel hesiod-devel.i386 hesiod.i386 libXt.i386 #compat-readline43
Note: See TracChangeset for help on using the changeset viewer.