Revision: 6943
http://gar.svn.sourceforge.net/gar/?rev=6943&view=rev
Author: dmichelsen
Date: 2009-10-22 15:21:34 +0000 (Thu, 22 Oct 2009)
Log Message:
-----------
mGAR v2: Explicitly set umask instead of pax-arg, as it bails out on symlinks
Modified Paths:
--------------
csw/mgar/gar/v2/gar.mk
csw/mgar/gar/v2/gar.pkg.mk
Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk 2009-10-21 22:12:21 UTC (rev 6942)
+++ csw/mgar/gar/v2/gar.mk 2009-10-22 15:21:34 UTC (rev 6943)
@@ -692,14 +692,14 @@
# Copy the whole tree verbatim
merge-copy-all: $(PKGROOT) $(INSTALLISADIR)
- $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \
+ $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v
$(_PAX_ARGS) \
$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call
mergebase,$(DIR))/,p") \
. $(PKGROOT))
@$(MAKECOOKIE)
# Copy only the merge directories
merge-copy-only: $(PKGROOT)
- $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \
+ $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v
$(_PAX_ARGS) \
$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call
mergebase,$(DIR))/,p") -s ",.*,," \
. $(PKGROOT) \
)
@@ -707,7 +707,7 @@
# Copy the whole tree and relocate the directories in $(MERGE_DIRS)
merge-copy-relocate: $(PKGROOT) $(INSTALLISADIR)
- $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \
+ $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v
$(_PAX_ARGS) \
$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call
mergebase,$(DIR))/$(ISA)/,p") \
. $(PKGROOT) \
)
@@ -715,7 +715,7 @@
# Copy only the relocated directories
merge-copy-relocated-only: $(PKGROOT) $(INSTALLISADIR)
- $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \
+ $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v
$(_PAX_ARGS) \
$(foreach DIR,$(MERGE_DIRS),-s ",^\(\.$(DIR)/\),.$(call
mergebase,$(DIR))/$(ISA)/,p") -s ",.*,," \
. $(PKGROOT) \
)
@@ -723,7 +723,7 @@
# Copy
merge-copy-config-only:
- $(_DBG_MERGE)(cd $(INSTALLISADIR); pax -r -w -p e -v $(_PAX_ARGS) \
+ $(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 & pax -r -w -v
$(_PAX_ARGS) \
-s ",^\(\.$(bindir)/.*-config\)\$$,\1,p" \
-s ",.*,," \
. $(PKGROOT) \
Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk 2009-10-21 22:12:21 UTC (rev 6942)
+++ csw/mgar/gar/v2/gar.pkg.mk 2009-10-22 15:21:34 UTC (rev 6943)
@@ -547,7 +547,7 @@
if [ -f "$$LICENSEFILE" ]; then cp $$LICENSEFILE
$(WORKDIR)/$*.copyright; fi;, \
echo "Please see $$LICENSEDIR/license for license
information." > $(WORKDIR)/$*.copyright; \
) \
- mkdir -p $(PKGROOT)$$LICENSEDIR && \
+ umask 022 && mkdir -p $(PKGROOT)$$LICENSEDIR && \
rm -f $(PKGROOT)$$LICENSEDIR/license && \
cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \
fi \
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
