CoreOSMakefiles-64.tar.gz

diff --git a/Makefile b/Makefile
index 35ecb3bd293520783d2c0ea395647e13f7c96186..c2abae545a698c53d757f084d13357e01d8c6fee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ installhdrs:
 
 installsrc:
        install -d "$(SRCROOT)"
 
 installsrc:
        install -d "$(SRCROOT)"

-       rsync -a --exclude=.svn ./ "$(SRCROOT)"
+       rsync -a --exclude=.svn --exclude=.git ./ "$(SRCROOT)"

 
 clean:
        $(_v) echo Nothing to clean
 
 clean:
        $(_v) echo Nothing to clean

diff --git a/ReleaseControl/Common.make b/ReleaseControl/Common.make
index 0c5fda20e757bd6ca92d9d7487a0356bd59dbcd8..73745fef2af9340b8e2634f462fb036523a5488d 100644 (file)
--- a/ReleaseControl/Common.make
+++ b/ReleaseControl/Common.make
@@ -130,12 +130,7 @@ install_source::
 ifneq ($(CommonNoInstallSource),YES)
        @echo "Installing source for $(Project)..."
        $(_v) $(MKDIR) "$(SRCROOT)"
 ifneq ($(CommonNoInstallSource),YES)
        @echo "Installing source for $(Project)..."
        $(_v) $(MKDIR) "$(SRCROOT)"

-ifneq ($(wildcard $(PAX)),)
-       $(_v) $(PAX) -rw . "$(SRCROOT)"
-else
-       $(_v) $(TAR) cf - . | (cd "$(SRCROOT)" ; $(TAR) xfp -)
-endif
-       $(_v) $(FIND) "$(SRCROOT)" $(Find_Cruft) -depth -exec $(RMDIR) "{}" \;
+       $(_v) $(TAR) -cp $(Tar_Cruft) . | $(TAR) -pox -C "$(SRCROOT)"

 endif
 
 ifndef ShadowTestFile
 endif
 
 ifndef ShadowTestFile

diff --git a/Standard/Variables.in b/Standard/Variables.in
index 1bad30524bc3749db8de39ea55d02bfb6f5b53ef..3cff612d63a03fd3bef4fa355fd84da1538e03db 100644 (file)
--- a/Standard/Variables.in
+++ b/Standard/Variables.in
@@ -139,8 +139,9 @@ endif
 ##
 # Find Garbage
 ##
 ##
 # Find Garbage
 ##

-Cruft      = CVS RCS SCCS *~ .*~ .nfs\* .*.wmd .svn .DS_Store
+Cruft      = CVS RCS SCCS *~ .*~ .nfs\* .*.wmd .svn .DS_Store .git

 Find_Cruft = '(' $(Cruft:%=-name '%' -or) -name '' ')' -print
 Find_Cruft = '(' $(Cruft:%=-name '%' -or) -name '' ')' -print

+Tar_Cruft  = $(Cruft:%=--exclude '%')

 
 ##
 # Install
 
 ##
 # Install