Revision: 16768
http://gar.svn.sourceforge.net/gar/?rev=16768&view=rev
Author: guengel
Date: 2012-01-15 18:43:00 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
cfengine3/trunk: Renamed CSWcfengine3rt to CSWcfengine3utils. libpromises now
lives in a private directory $(libdir)/cfengine3.
Modified Paths:
--------------
csw/mgar/pkg/cfengine3/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3utils.postinstall
Removed Paths:
-------------
csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3rt.postinstall
Modified: csw/mgar/pkg/cfengine3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/Makefile 2012-01-15 15:21:57 UTC (rev
16767)
+++ csw/mgar/pkg/cfengine3/trunk/Makefile 2012-01-15 18:43:00 UTC (rev
16768)
@@ -16,7 +16,7 @@
MASTER_SITES = http://www.cfengine.com/source-code/download?file=
DISTFILES = $(DISTNAME).tar.gz
DISTFILES += $(NAME)rc
-DISTFILES += CSW$(NAME)rt.postinstall
+DISTFILES += CSW$(NAME)utils.postinstall
DISTFILES += csw$(NAME)-cfexecd
DISTFILES += csw$(NAME)-cfmonitord
DISTFILES += csw$(NAME)-cfserverd
@@ -26,6 +26,8 @@
UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz
+# Cfengine probes for Solaris 10 specific functionality (i.e. zones),
+# so a we build it for Sol9 and Sol10
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris9-sparc
solaris9-i386
# File name regex to get notifications about upstream software releases
@@ -44,27 +46,25 @@
cfengine_workdir_bin = $(cfengine_workdir)/bin
initddir = $(sysconfdir)/init.d
-PACKAGES = CSW$(NAME)rt
+PACKAGES = CSW$(NAME)utils
# Catch all
-CATALOGNAME_CSW$(NAME)rt = $(NAME)_rt
-SPKG_DESC_CSW$(NAME)rt = CFEngine 3 runtime and documentation
-RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWbdb48
-RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWosslrt
-RUNTIME_DEP_PKGS_CSW$(NAME)rt += CSWlibpcre0
-CHECKPKG_OVERRIDES_CSW$(NAME)rt +=
catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)rt|catalogname=$(NAME)_rt|expected-catalogname=$(NAME)rt
-# Moved to runtime, since there are no header files for this library.
-CHECKPKG_OVERRIDES_CSW$(NAMES)rt += shared-lib-pkgname-mismatch
-OBSOLETED_BY_CSW$(NAME)rt = CSWlibpromises1
+CATALOGNAME_CSW$(NAME)utils = $(NAME)_utils
+SPKG_DESC_CSW$(NAME)utils = CFEngine 3 utilities and documentation
+RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWbdb48
+RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWosslrt
+RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibpcre0
+CHECKPKG_OVERRIDES_CSW$(NAME)utils +=
catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)utils|catalogname=$(NAME)_utils|expected-catalogname=$(NAME)utils
+OBSOLETED_BY_CSW$(NAME)utils = CSWlibpromises1 CSW$(NAME)rt
CATALOGNAME_CSWlibpromises1 = libpromises1_stub
+CATALOGNAME_CSW$(NAME)rt = $(NAME)_rt_stub
-
PACKAGES += CSW$(NAME)server
CATALOGNAME_CSW$(NAME)server = $(NAME)_server
SPKG_DESC_CSW$(NAME)server = CFEngine 3 server binary
RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWbdb48
RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWosslrt
RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibpcre0
-RUNTIME_DEP_PKGS_CSW$(NAME)server += CSW$(NAME)rt
+RUNTIME_DEP_PKGS_CSW$(NAME)server += CSW$(NAME)utils
PKGFILES_CSW$(NAME)server += $(sbindir)/cf-serverd
PKGFILES_CSW$(NAME)server += $(sbindir)/cf-runagent
PKGFILES_CSW$(NAME)server += $(mandir)/.*/cf-serverd.*
@@ -79,7 +79,7 @@
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWbdb48
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt
RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre0
-RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)rt
+RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)utils
PKGFILES_CSW$(NAME)client += $(sbindir)/cf-agent
PKGFILES_CSW$(NAME)client += $(sbindir)/cf-execd
PKGFILES_CSW$(NAME)client += $(sbindir)/cf-monitord
@@ -102,7 +102,7 @@
LICENSE = LICENSE
-# This file gets installed by CSW$(NAME)rt since it is used by
+# This file gets installed by CSW$(NAME)util since it is used by
# the server and client component
PRESERVECONF = $(sysconfdir)/$(NAME)rc
@@ -130,13 +130,16 @@
EXTRA_RUNPATH_DIRS = $(prefix)/bdb48/lib
EXTRA_RUNPATH_ISALIST = $(EXTRA_RUNPATH_DIRS)
EXTRA_LDFLAGS = -L$(prefix)/bdb48/lib/$(MM_LIBDIR)
+# We use this because libpromises will be moved to this private
+# directory (see also move-libpromises:)
+EXTRA_LDFLAGS += -R$(libdir)/$(NAME)
# Those libs are used by configure to detect getaddrinfo()
EXTRA_CONFIGURE_ENV = LIBS="-lsocket -lnsl"
include gar/category.mk
-post-install-modulated: rename-cfengine-dir make-cfengine-workdir
install-cfengine-links install-smf-manifests install-cfengine3rc
install-cfengine3-csw-doc fix-paths-in-files
+post-install-modulated: rename-cfengine-dir make-cfengine-workdir
install-cfengine-links install-smf-manifests install-cfengine3rc
install-cfengine3-csw-doc fix-paths-in-files move-libpromises
@$(MAKECOOKIE)
rename-cfengine-dir:
@@ -188,7 +191,13 @@
fi ; \
done
+# We move libpromises to a prive directory, since there is no publicly
+# available API. Please note, the rpath has to be set appropriately
+move-libpromises:
+ ginstall -d $(DESTDIR)$(libdir)/$(NAME)
+ mv $(DESTDIR)$(libdir)/libpromises.* $(DESTDIR)$(libdir)/$(NAME)/
+
post-merge:
# Get rid of the .so files. Since there are no header files provided,
# .so files are pretty much useless
- find $(PKGROOT)$(libdir) -name libpromises.so -exec rm \{\} \;
\ No newline at end of file
+ find $(PKGROOT)$(libdir) -name libpromises.so -exec rm \{\} \;
Deleted: csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3rt.postinstall
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3rt.postinstall
2012-01-15 15:21:57 UTC (rev 16767)
+++ csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3rt.postinstall
2012-01-15 18:43:00 UTC (rev 16768)
@@ -1,31 +0,0 @@
-# Takes care of creating the CFEngine 3 public/private keys
-
-CFEWORKDIR=${PKG_INSTALL_ROOT}/var/opt/csw/cfengine3
-CFEKEYDIR=${CFEWORKDIR}/ppkeys
-CF_KEYS=${PKG_INSTALL_ROOT}/opt/csw/sbin/cf-key
-
-if [ \! -d ${CFEWORKDIR} ]
-then
- # Hmm, this is strange, since the prototype should have
- # created this directory
- echo "Creating ${CFEWORKDIR}"
- mkdir -p ${CFEWORKDIR}
-fi
-
-if [ \! -d ${CFEKEYDIR} ]
-then
- echo "Creating ${CFEKEYDIR}"
- mkdir ${CFEKEYDIR}
-fi
-
-chmod 700 ${CFEKEYDIR}
-
-if [ -r ${CFEKEYDIR}/localhost.priv -a -r ${CFEKEYDIR}/localhost.pub ]
-then
- echo "Keys for CFEngine exist."
- exit 0
-else
- ${CF_KEYS} -f ${CFEKEYDIR}/localhost
-fi
-
-exit 0
Copied: csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3utils.postinstall (from
rev 16737, csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3rt.postinstall)
===================================================================
--- csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3utils.postinstall
(rev 0)
+++ csw/mgar/pkg/cfengine3/trunk/files/CSWcfengine3utils.postinstall
2012-01-15 18:43:00 UTC (rev 16768)
@@ -0,0 +1,31 @@
+# Takes care of creating the CFEngine 3 public/private keys
+
+CFEWORKDIR=${PKG_INSTALL_ROOT}/var/opt/csw/cfengine3
+CFEKEYDIR=${CFEWORKDIR}/ppkeys
+CF_KEYS=${PKG_INSTALL_ROOT}/opt/csw/sbin/cf-key
+
+if [ \! -d ${CFEWORKDIR} ]
+then
+ # Hmm, this is strange, since the prototype should have
+ # created this directory
+ echo "Creating ${CFEWORKDIR}"
+ mkdir -p ${CFEWORKDIR}
+fi
+
+if [ \! -d ${CFEKEYDIR} ]
+then
+ echo "Creating ${CFEKEYDIR}"
+ mkdir ${CFEKEYDIR}
+fi
+
+chmod 700 ${CFEKEYDIR}
+
+if [ -r ${CFEKEYDIR}/localhost.priv -a -r ${CFEKEYDIR}/localhost.pub ]
+then
+ echo "Keys for CFEngine exist."
+ exit 0
+else
+ ${CF_KEYS} -f ${CFEKEYDIR}/localhost
+fi
+
+exit 0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
