Revision: 6378
http://gar.svn.sourceforge.net/gar/?rev=6378&view=rev
Author: skayser
Date: 2009-09-22 09:41:00 +0000 (Tue, 22 Sep 2009)
Log Message:
-----------
gar/v2: rolled back naive r6374, cswusergroup and ugfiles need to be handled
BOTH by GAR
Modified Paths:
--------------
csw/mgar/gar/v2/gar.pkg.mk
Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk 2009-09-22 09:38:37 UTC (rev 6377)
+++ csw/mgar/gar/v2/gar.pkg.mk 2009-09-22 09:41:00 UTC (rev 6378)
@@ -160,12 +160,11 @@
SPKG_PKGFILE ?=
%{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-%{arch}-$(or $(filter
$(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),CSW).pkg
# Handle cswclassutils
-# - append csw* classes if they are used and not already contained in
SPKG_CLASSES
-# - exception: prepend cswusergroup so that required accounts are setup first
+# - prepend cswpreserveconf if it is not already in SPKG_CLASSES
SPKG_CLASSES := $(SPKG_CLASSES) $(if $(SAMPLECONF),$(if $(filter
cswcpsampleconf,$(SPKG_CLASSES)),,cswcpsampleconf))
SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PRESERVECONF),$(if $(filter
cswpreserveconf,$(SPKG_CLASSES)),,cswpreserveconf))
SPKG_CLASSES := $(SPKG_CLASSES) $(if $(INITSMF),$(if $(filter
cswinitsmf,$(SPKG_CLASSES)),,cswinitsmf))
-SPKG_CLASSES := $(if $(USERGROUP),$(if $(filter
cswusergroup,$(SPKG_CLASSES)),,cswusergroup)) $(SPKG_CLASSES)
+SPKG_CLASSES := $(SPKG_CLASSES) $(if $(USERGROUP),$(if $(filter
cswusergroup,$(SPKG_CLASSES)),,cswusergroup))
SPKG_CLASSES := $(SPKG_CLASSES) $(if $(PYCOMPILE),$(if $(filter
cswpycompile,$(SPKG_CLASSES)),,cswpycompile))
# - set class for all config files
ifneq ($(SAMPLECONF)$(PRESERVECONF)$(INITSMF)$(USERGROUP)$(PYCOMPILE),)
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
