Ignore:
Timestamp:
Nov 22, 2011, 12:45:17 AM (11 years ago)
Author:
achernya
Message:
Merge branches/fc15-dev to trunk
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/server/fedora/Makefile

    r2001 r2066  
    1919# See /COPYRIGHT in this repository for more information.
    2020
    21 upstream_yum    = krb5 krb5.i686 httpd openssh curl redland-bindings
    22 hackage         = MonadCatchIO-mtl-0.3.0.1 cgi-3001.1.8.1 unix-handle-0.0.0
     21upstream_yum    = krb5 krb5.i686 httpd openssh redland-bindings rubygems
     22hackage         = MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0
    2323upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
    24 upstream        = openafs $(upstream_yum) $(upstream_hackage) moira cluster-glue heartbeat pacemaker zephyr zephyr.i686 python-zephyr athena-aclocal discuss
     24upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr athena-aclocal discuss
    2525oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat
    2626allsrc          = $(upstream) $(oursrc)
     
    4040server_url      = "http://web.mit.edu/scripts/src"
    4141server_arch     = "fedora.stable"
    42 #openafs_url    = "http://dl.openafs.org/dl/openafs/1.4.12/openafs-1.4.12-1.1.2.src.rpm"
    43 openafs_url     = "http://web.mit.edu/~scripts/yum-repos/rpm-fc13/openafs-1.4.12.1-1.0.pre3.src.rpm"
    44 clusterglue_url = "http://kojipkgs.fedoraproject.org/packages/cluster-glue/1.0/0.11.b79635605337.hg.fc12/src/cluster-glue-1.0-0.11.b79635605337.hg.fc12.src.rpm"
    45 heartbeat_url   = "http://kojipkgs.fedoraproject.org/packages/heartbeat/3.0.0/0.5.0daab7da36a8.hg.fc12/src/heartbeat-3.0.0-0.5.0daab7da36a8.hg.fc12.src.rpm"
    46 pacemaker_url   = "http://kojipkgs.fedoraproject.org/packages/pacemaker/1.0.5/5.fc12/src/pacemaker-1.0.5-5.fc12.src.rpm"
    47 zephyr_url      = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.tar.gz"
     42openafs_url     = "http://dl.openafs.org/dl/openafs/1.6.0/openafs-1.6.0-1.src.rpm"
     43zephyr_url      = "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.1.tar.gz"
    4844
    4945PKG             = $(patsubst %.i686,%,$@)
     
    7470        cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum)
    7571        wget -P $(dload) $(openafs_url)
    76         wget -P $(dload) $(clusterglue_url)
    77         wget -P $(dload) $(heartbeat_url)
    78         wget -P $(dload) $(pacemaker_url)
    7972        wget -P $(dload) $(zephyr_url)
    8073        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
    81         cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
    82         cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
    83         cp $(oursrcdir)/discuss/* $(tmp_src)
    8474        cabal update
    8575        cabal fetch $(hackage)
     
    8878        touch download_stamp
    8979
     80        cd $(tmp_src) && wget -nd -r -l1 -np -A.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-aclocal/
     81        cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
     82        cp $(oursrcdir)/discuss/* $(tmp_src)
    9083%.src.rpm:
    9184        wget -q -nv -N -B $(server_url) -nd -nH -P $(dload) $(server_url)/$*.src.rpm
     
    10194        cp ${specs}/*.spec $(tmp_specs)
    10295
     96# Remove old .orig files so we're not mislead
    10397patch-specs: install-srpms
    10498        @cd ${tmp_specs}; \
    10599        list=`ls ${specs}/*.spec.patch`; \
     100        rm -f *.orig; \
     101        rm -f *.spec.~*~; \
    106102        for i in $$list; do \
    107                 patch < $$i; \
     103                patch -bV numbered < $$i; \
    108104        done; \
    109105        list2=`svn ls ${oursrcdir}`; \
     
    150146        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    151147        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    152         /usr/bin/mock -r scripts-fc13-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-fc15-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    153149
    154150$(filter-out %.i686,$(oursrc)): %: setup
    155151        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    156152        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    157         /usr/bin/mock -r scripts-fc13-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     153        /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    158154
    159155$(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
     
    161157$(filter %.i686,$(upstream)): %.i686: setup patch-specs
    162158        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    163         /usr/bin/mock -r scripts-fc13-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     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`
    164160
    165161$(filter-out %.i686,$(upstream)): %: setup patch-specs
    166162        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
    167         /usr/bin/mock -r scripts-fc13-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
     163        /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
    168164
    169165openafs-kernel: setup
    170166        PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
    171167        rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec
    172         /usr/bin/mock -r scripts-fc13-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
     168        /usr/bin/mock -r scripts-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
    173169
    174170#sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong
     
    188184        fi
    189185
    190 # The following packages are needed for our packages
    191 basic-deps      = kernel-devel rpm-build rpmdevtools mock gcc autoconf patch krb5-workstation glibc-devel.i686 glibc-devel libtool libgcc.i686
    192 oursrc-deps     = hesinfo openldap-clients openldap-devel.i686 php-devel
    193 httpdmods-deps  = httpd-devel
    194 httpd-deps      = xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel
    195 krb5-deps       = bison ncurses-devel texinfo keyutils-libs-devel texinfo-tex texlive-latex libss-devel rsh
    196 openafs-deps    = pam-devel automake
    197 moira-deps      = e2fsprogs-devel
    198 zephyr-deps     = hesiod-devel libss-devel krb5-devel readline-devel
    199 openssh-deps    = gtk2-devel libX11-devel autoconf automake openssl-devel perl zlib-devel audit-libs-devel util-linux groff man pam-devel tcp_wrappers-devel krb5-devel libselinux-devel audit-libs xauth pango-devel cairo-devel libedit-devel nss-devel fipscheck-devel
    200 php-deps        = bzip2-devel curl-devel gmp-devel libstdc++-devel sqlite-devel gcc-c++ libc-client-devel mysql-devel postgresql-devel unixODBC-devel libxml2-devel net-snmp-devel libxslt-devel libxml2-devel libXpm-devel libjpeg-devel t1lib-devel libmcrypt-devel mhash-devel libtidy-devel freetds-devel aspell-devel recode-devel
    201 haskell-deps    = cabal-install
    202 install-deps:
    203         yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(moira-deps) $(zephyr-deps) $(openssh-deps) $(php-deps) $(haskell-deps)
    204186# XXX: We need to figure out what's going on with compat-readline43
    205187#       rpm -ivh http://kojipkgs.fedoraproject.org/packages/compat-readline43/4.3/3/i386/compat-readline43-4.3-3.i386.rpm
     
    207189
    208190fedora:
    209         make install-deps
    210191        make upstream
    211192        rpm -ivh $(out_rpms)/`uname -m`/openafs-devel*.rpm
Note: See TracChangeset for help on using the changeset viewer.