common Makefile.common,1.59,1.60

Mike Bonnet (mikeb) fedora-extras-commits at redhat.com
Thu May 31 19:15:55 UTC 2007


Author: mikeb

Update of /cvs/pkgs/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009

Modified Files:
	Makefile.common 
Log Message:
- always do a fresh checkout of the chain modules, to avoid up-to-date-ness problems
- quiet cvs output, and use compression


Index: Makefile.common
===================================================================
RCS file: /cvs/pkgs/common/Makefile.common,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- Makefile.common	31 May 2007 19:01:14 -0000	1.59
+++ Makefile.common	31 May 2007 19:15:25 -0000	1.60
@@ -403,23 +403,20 @@
                 echo "chain build.  For example:  make chain-build CHAIN='foo bar'" ; \
                 exit 1 ; \
         fi ; \
+        set -e ; \
         subdir=`basename $$(pwd)` ; \
         urls="" ; \
         for component in $(CHAIN) ; do \
                 if [ -n "$$urls" ]; then \
                         urls="$$urls :" ; \
                 fi ; \
-                if [ -d ../../$$component/$$subdir ]; then \
-                        urls="$$urls `make -s -C ../../$$component/$$subdir cvsurl`" ; \
-                else \
-                        rm -rf .tmp-$$$$ ; \
-                        mkdir -p .tmp-$$$$ ; \
-                        pushd .tmp-$$$$ > /dev/null ; \
-                        cvs -d $(CVS_ROOT) co $$component ; \
-                        urls="$$urls `make -s -C $$component/$$subdir cvsurl`" ; \
-                        popd > /dev/null ; \
-                        rm -rf .tmp-$$$$ ; \
-                fi ; \
+                rm -rf .tmp-$$$$ ; \
+                mkdir -p .tmp-$$$$ ; \
+                pushd .tmp-$$$$ > /dev/null ; \
+                cvs -f -Q -z 3 -d $(CVS_ROOT) co $$component ; \
+                urls="$$urls `make -s -C $$component/$$subdir cvsurl`" ; \
+                popd > /dev/null ; \
+                rm -rf .tmp-$$$$ ; \
         done ; \
         urls="$$urls : `make -s cvsurl`" ; \
         $(BUILD_CLIENT) chain-build $(BUILD_FLAGS) $(TARGET) $$urls




More information about the fedora-extras-commits mailing list