[csw-devel] SF.net SVN: gar:[21413] csw/mgar/pkg/samba/branches/samba3/Makefile

lblume at users.sourceforge.net lblume at users.sourceforge.net
Sat Jun 29 15:43:09 CEST 2013


Revision: 21413
          http://gar.svn.sourceforge.net/gar/?rev=21413&view=rev
Author:   lblume
Date:     2013-06-29 13:43:02 +0000 (Sat, 29 Jun 2013)
Log Message:
-----------
samba/branches/samba3: Rename a package to be specialized for Samba NSS modules; Create a package to add them to the system

Modified Paths:
--------------
    csw/mgar/pkg/samba/branches/samba3/Makefile

Modified: csw/mgar/pkg/samba/branches/samba3/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba3/Makefile	2013-06-29 11:53:32 UTC (rev 21412)
+++ csw/mgar/pkg/samba/branches/samba3/Makefile	2013-06-29 13:43:02 UTC (rev 21413)
@@ -150,12 +150,20 @@
 PKGFILES_CSWlibtdb1 += $(call pkgfiles_lib,libtdb.so.1)
 SPKG_DESC_CSWlibtdb1 += Samba client library, libtdb.so.1
 
-PACKAGES += CSWnss-winbind1
-CATALOGNAME_CSWnss-winbind1 = nss_winbind1
-PKGFILES_CSWnss-winbind1 += $(call pkgfiles_lib,nss_winbind.so.1)
-SPKG_DESC_CSWnss-winbind1 += Winbind nss libary,nss_winbind.so.1
-OBSOLETED_BY_CSWnss-winbind1 += CSWlibnss-winbind1
+PACKAGES += CSWsamba-nss
+CATALOGNAME_CSWsamba-nss = samba_nss
+PKGFILES_CSWsamba-nss += $(call pkgfiles_lib,nss_winbind.so.1)
+PKGFILES_CSWsamba-nss += $(call pkgfiles_lib,nss_wins.so.1)
+SPKG_DESC_CSWsamba-nss += Samba nss modules,nss_winbind.so.1,nss_wins.so.1
+OBSOLETED_BY_CSWsamba-nss += CSWlibnss-winbind1
 
+PACKAGES += CSWsamba-nss-system-links
+CATALOGNAME_CSWsamba-nss-system-links = samba_nss_system_links
+PKGFILES_CSWsamba-nss-system-links += $(call baseisadirs,/usr/lib/$(MEMORYMODEL),nss_winbind_csw\.so\.1)
+PKGFILES_CSWsamba-nss-system-links += $(call baseisadirs,/usr/lib/$(MEMORYMODEL),nss_wins_csw\.so\.1)
+SPKG_DESC_CSWsamba-nss-system-links += Samba nss modules links for the system
+RUNTIME_DEP_PKGS_CSWsamba-nss-system-links += CSWsamba-nss
+
 PACKAGES += CSWlibtevent0
 CATALOGNAME_CSWlibtevent0 = libtevent0
 PKGFILES_CSWlibtevent0 += $(call baseisadirs,$(libdir),libtevent\.so\.0(\.\d+)*)
@@ -264,13 +272,13 @@
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWnss-winbind1
+RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWsamba-nss
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibwbclient0
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtdb1
 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibtevent0
 OBSOLETED_BY_CSWsamba-winbind += CSWsambawb
 
-CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWnss-winbind1
+CHECKPKG_OVERRIDES_CSWsamba-winbind += surplus-dependency|CSWsamba-nss
 
 # Needed as the configure script doesn't add it
 EXTRA_LINKER_FLAGS += -lintl 
@@ -354,3 +362,20 @@
 	ginstall -d $(DESTDIR)/etc/opt/csw/samba
 	ginstall $(WORKDIR)/smb.conf $(DESTDIR)/etc/opt/csw/samba/smb.conf
 	ginstall $(WORKSRC)/nsswitch/nss_winbind.so $(DESTDIR)/$(libdir)/nss_winbind.so.1
+	ginstall $(WORKSRC)/nsswitch/nss_wins.so $(DESTDIR)/$(libdir)/nss_wins.so.1
+	# This bit is to install the symlinks to use the NSS modules with the
+	# system's nsswitch.conf
+	if [ "$(MEMORYMODEL)" = "32" ]; then \
+		ginstall -d $(DESTDIR)/usr/lib; \
+		ln -s ../../opt/csw/lib/$(MEMORYMODEL)/nss_winbind.so.1 \
+			$(DESTDIR)/usr/lib/nss_winbind_csw.so.1; \
+		ln -s ../../opt/csw/lib/nss_wins.so.1 \
+			$(DESTDIR)/usr/lib/nss_wins_csw.so.1; \
+	fi
+	if [ "$(MEMORYMODEL)" = "64" ]; then \
+		ginstall -d $(DESTDIR)/usr/lib/$(MEMORYMODEL); \
+		ln -s ../../../opt/csw/lib/$(MEMORYMODEL)/nss_winbind.so.1 \
+			$(DESTDIR)/usr/lib/$(MEMORYMODEL)/nss_winbind_csw.so.1; \
+		ln -s ../../../opt/csw/lib/$(MEMORYMODEL)/nss_wins.so.1 \
+			$(DESTDIR)/usr/lib/$(MEMORYMODEL)/nss_wins_csw.so.1; \
+	fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list