Revision: 2830
http://gar.svn.sourceforge.net/gar/?rev=2830&view=rev
Author: dmichelsen
Date: 2009-01-14 16:25:19 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
mGAR v2: Temporary fix for smf_enabled, general solution as for
WORKSRC_FIRSTMOD pending
Modified Paths:
--------------
csw/mgar/gar/v2/gar.pkg.mk
csw/mgar/gar/v2/pkglib/smf_enabled.gspec
Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk 2009-01-14 15:59:00 UTC (rev 2829)
+++ csw/mgar/gar/v2/gar.pkg.mk 2009-01-14 16:25:19 UTC (rev 2830)
@@ -233,6 +233,7 @@
--workdir $(SPKG_WORKDIR) \
--pkgbase $(SPKG_PKGBASE) \
--pkgroot $(SPKG_PKGROOT) \
+ -v
WORKDIR_FIRSTMOD=../build-$(firstword $(MODULATIONS)) \
--compress \
$(MKPACKAGE_ARGS) ) || exit 2
@$(MAKECOOKIE)
Modified: csw/mgar/gar/v2/pkglib/smf_enabled.gspec
===================================================================
--- csw/mgar/gar/v2/pkglib/smf_enabled.gspec 2009-01-14 15:59:00 UTC (rev
2829)
+++ csw/mgar/gar/v2/pkglib/smf_enabled.gspec 2009-01-14 16:25:19 UTC (rev
2830)
@@ -13,7 +13,7 @@
i r.smf=%{PKGLIB}/smf/r.smf
d init /etc ? ? ?
d init /etc/init.d ? ? ?
-f init /etc/init.d/%{RC_INIT_SCRIPT}=%{RC_INIT_SCRIPT} 0755 root bin
+f init /etc/init.d/%{RC_INIT_SCRIPT}=$WORKDIR_FIRSTMOD/%{RC_INIT_SCRIPT} 0755
root bin
d init /etc/rc0.d ? ? ?
s init
/etc/rc0.d/%{INIT_RC0}%{INIT_KILL_PRIO}%{RC_INIT_SCRIPT}=../init.d/%{RC_INIT_SCRIPT}
d init /etc/rc1.d ? ? ?
@@ -27,11 +27,11 @@
d smf /opt/csw/var/svc 0755 root bin
d smf /opt/csw/var/svc/manifest 0755 root bin
d smf /opt/csw/var/svc/manifest/site 0755 root bin
-v smf /opt/csw/var/svc/manifest/site/%{SMF_MANIFEST}=%{SMF_MANIFEST} 0644 root
bin
+v smf
/opt/csw/var/svc/manifest/site/%{SMF_MANIFEST}=$WORKDIR_FIRSTMOD/%{SMF_MANIFEST}
0644 root bin
d smf /opt/csw/lib 0755 root bin
d smf /opt/csw/lib/svc 0755 root bin
d smf /opt/csw/lib/svc/method 0755 root bin
-f smf /opt/csw/lib/svc/method/%{SMF_SCRIPT}=%{SMF_SCRIPT} 0755 root bin
+f smf /opt/csw/lib/svc/method/%{SMF_SCRIPT}=$WORKDIR_FIRSTMOD/%{SMF_SCRIPT}
0755 root bin
%pkginfo:merge
MANIFEST_FILES="/opt/csw/var/svc/manifest/site/%{SMF_MANIFEST}"
INIT_FILES="/etc/init.d/%{RC_INIT_SCRIPT}"
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
