Changeset 2195 for branches/fc17-dev/server/fedora/Makefile

Timestamp:

May 22, 2012, 10:52:35 PM (12 years ago)

Author:

ezyang

Message:

Merge changes from trunk.

Location:

branches/fc17-dev

Files:

• . (modified) (1 prop)
• server/fedora/Makefile (modified) (11 diffs)

branches/fc17-dev/server/fedora/Makefile

@@ -19 +19 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum    = krb5 krb5.i686 httpd openssh redland-bindings rubygems
+upstream_yum    = krb5 krb5.i686 httpd openssh redland-bindings rubygems php
 hackage         = MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0
 upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
-upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr athena-aclocal discuss
-oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat
+upstream        = openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr python-afs athena-aclocal discuss
+oursrc          = execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat fuse-better-mousetrapfs
 allsrc          = $(upstream) $(oursrc)
 oursrcdir       = ${PWD}/../common/oursrc
@@ -48 +48 @@
 
 info:
-        @echo "The following packages are available:"; \
-        echo "$(allsrc)"; \
-        echo "Run 'make all' to build all packages."
+        @echo "The following packages are available:"
+        @echo "$(allsrc)"
+        @echo "Run 'make all' to build all packages."
 
 minimal-clean:
@@ -60 +60 @@
 
 mkdir-tree:
-        @rpmdev-setuptree
+        rpmdev-setuptree
         mkdir -p $(out_sbin)
         ln -sTf $(topdir) rpmbuild
@@ -66 +66 @@
 download: download_stamp
 download_stamp:
-        @mkdir -p $(dload); \
+        mkdir -p $(dload)
         #wget -qO- -nv $(server_url)/$(server_arch) | xargs make
         cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum)
@@ -76 +76 @@
         cp -a $(hackage:%=~/.cabal/packages/*/*/*/%.tar.gz) $(tmp_src)
         spectool -g -R $(specs)/python-zephyr.spec
+        spectool -g -R $(specs)/python-afs.spec
         touch download_stamp
 
@@ -85 +86 @@
 
 copy-patches: mkdir-tree
-        @cp $(patches)/*.patch $(tmp_src); \
-        cd $(tmp_src);
+        cp $(patches)/*.patch $(tmp_src)
 
 install-srpms: mkdir-tree download
-        rpm $(rpm_args) -i $(dload)/*.src.rpm 2>/dev/null;
+        rpm $(rpm_args) -i $(dload)/*.src.rpm 2>/dev/null
 
 copy-specs: mkdir-tree
@@ -96 +96 @@
 # Remove old .orig files so we're not mislead
 patch-specs: install-srpms
-        @cd ${tmp_specs}; \
+        @set -ex; \
+        cd ${tmp_specs}; \
         list=`ls ${specs}/*.spec.patch`; \
         rm -f *.orig; \
@@ -106 +107 @@
         for i in $$list2; do \
                 base=`basename $$i`; \
+                [ -e ${tmp_specs}/$$base.spec ] || continue; \
                 version=`svnversion ${oursrcdir}/$$i`; \
                 version=$${version//:/_}; \
@@ -112 +114 @@
                         -e "s/SVNVERSION_TO_UPDATE/$${version}/" \
                 ${tmp_specs}/$$base.spec; \
-        done;
+        done
 
 # 1. use the package's Makefile to delete leftover files and run autoconf
 # 2. create a tarball (we want it to contain the autoconf output)
 tarballs: mkdir-tree
-        @cd ${oursrcdir}; \
+        @set -ex; \
+        cd ${oursrcdir}; \
         list=`find -mindepth 1 -maxdepth 1 -type d | grep -v ".svn"`; \
         for i in $$list; do \
@@ -123 +126 @@
                 if [ -x ./mrproper ]; then \
                         ./mrproper; \
-                        autoconf; \
+                        if [ -e configure.in ] || [ -e configure.ac ]; then \
+                                autoconf; \
+                        fi; \
                 fi; \
                 popd; \
                 tar -czf $(tmp_src)/$$i.tar.gz $$i; \
-        done;
+        done
 
 #setup: install-srpms copy-patches copy-specs patch-specs tarballs
@@ -177 +182 @@
 
 frob-openafs:
-        @if [ ! -d "/etc/openafs/" ]; then \
+        @set -ex; \
+        if [ ! -d "/etc/openafs/" ]; then \
         echo "/etc/openafs does not exist"; \
         exit 1; \