Plugin names are *.so

3 files changed, 87 insertions, 5 deletions

diff --git a/cfgadm/debian/patches/libcfgadm-plugin-path.patch b/cfgadm/debian/patches/libcfgadm-plugin-path.patch
index dfabfc5..12ae1f2 100644
--- a/cfgadm/debian/patches/libcfgadm-plugin-path.patch
+++ b/cfgadm/debian/patches/libcfgadm-plugin-path.patch
@@ -2,8 +2,8 @@ Description: search plugins only in /usr/lib/<multiarch>/cfgadm
 Index: cfgadm/usr/src/lib/libcfgadm/common/config_admin.c
 ===================================================================
 --- cfgadm.orig/usr/src/lib/libcfgadm/common/config_admin.c	2012-10-08 04:25:38.000000000 +0400
-+++ cfgadm/usr/src/lib/libcfgadm/common/config_admin.c	2013-01-10 06:02:20.865832953 +0400
-@@ -287,18 +287,15 @@
++++ cfgadm/usr/src/lib/libcfgadm/common/config_admin.c	2013-05-09 17:10:20.564913401 +0400
+@@ -287,19 +287,16 @@
  static int default_ap_id_cmp(const char *ap_id1, const char *ap_id2);
  static void destroy_cache();
  
@@ -25,10 +25,12 @@ Index: cfgadm/usr/src/lib/libcfgadm/common/config_admin.c
 -#define	LIB_PATH_MIDDLE	"/lib/cfgadm/"
 +# error DEB_HOST_ARCH_BITS is not set or has a wrong value
  #endif
+-#define	LIB_PATH_TAIL	".so.1"
 +
- #define	LIB_PATH_TAIL	".so.1"
++#define	LIB_PATH_TAIL	".so"
  
  
+ #if !defined(TEXT_DOMAIN)
 @@ -1746,77 +1743,12 @@
  	char lib[MAXPATHLEN];
  	struct stat lib_stat;
@@ -112,7 +114,7 @@ Index: cfgadm/usr/src/lib/libcfgadm/common/config_admin.c
 Index: cfgadm/usr/src/lib/libcfgadm/Makefile.com
 ===================================================================
 --- cfgadm.orig/usr/src/lib/libcfgadm/Makefile.com	2012-10-08 04:25:38.000000000 +0400
-+++ cfgadm/usr/src/lib/libcfgadm/Makefile.com	2013-01-10 06:06:06.516998264 +0400
++++ cfgadm/usr/src/lib/libcfgadm/Makefile.com	2013-05-09 17:10:20.566972230 +0400
 @@ -36,6 +36,9 @@
  $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
  
@@ -123,3 +125,78 @@ Index: cfgadm/usr/src/lib/libcfgadm/Makefile.com
  CERRWARN +=	-_gcc=-Wno-type-limits
  CERRWARN +=	-_gcc=-Wno-unused-label
  
+Index: cfgadm/usr/src/lib/cfgadm_plugins/ib/Makefile.com
+===================================================================
+--- cfgadm.orig/usr/src/lib/cfgadm_plugins/ib/Makefile.com	2012-10-08 04:25:37.000000000 +0400
++++ cfgadm/usr/src/lib/cfgadm_plugins/ib/Makefile.com	2013-05-09 17:18:19.152208245 +0400
+@@ -32,8 +32,8 @@
+ include ../../../Makefile.lib
+ 
+ SRCDIR =	../common
+-ROOTLIBDIR=	$(ROOT)/usr/lib/cfgadm
+-ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
++ROOTLIBDIR=$(ROOT)$(DEB_USRLIBDIR_32)/cfgadm
++ROOTLIBDIR64=$(ROOT)$(DEB_USRLIBDIR_64)/cfgadm
+ 
+ LIBS=	$(DYNLIB)
+ 
+Index: cfgadm/usr/src/lib/cfgadm_plugins/pci/Makefile.com
+===================================================================
+--- cfgadm.orig/usr/src/lib/cfgadm_plugins/pci/Makefile.com	2012-10-08 04:25:37.000000000 +0400
++++ cfgadm/usr/src/lib/cfgadm_plugins/pci/Makefile.com	2013-05-09 17:18:19.154926548 +0400
+@@ -36,8 +36,8 @@
+ USR_LIB_DIR_CFGADM	= $(USR_LIB_DIR)/cfgadm
+ USR_LIB_DIR_CFGADM_64	= $(USR_LIB_DIR_CFGADM)/$(MACH64)
+ 
+-ROOTLIBDIR= $(USR_LIB_DIR_CFGADM)
+-ROOTLIBDIR64= $(USR_LIB_DIR_CFGADM_64)
++ROOTLIBDIR=$(ROOT)$(DEB_USRLIBDIR_32)/cfgadm
++ROOTLIBDIR64=$(ROOT)$(DEB_USRLIBDIR_64)/cfgadm
+ 
+ SRCS=		../common/cfga.c $(SRC)/common/pci/pci_strings.c
+ 
+Index: cfgadm/usr/src/lib/cfgadm_plugins/sata/Makefile.com
+===================================================================
+--- cfgadm.orig/usr/src/lib/cfgadm_plugins/sata/Makefile.com	2012-10-08 04:25:37.000000000 +0400
++++ cfgadm/usr/src/lib/cfgadm_plugins/sata/Makefile.com	2013-05-09 17:18:19.156820238 +0400
+@@ -32,8 +32,8 @@
+ include ../../../Makefile.lib
+ 
+ SRCDIR =	../common
+-ROOTLIBDIR=	$(ROOT)/usr/lib/cfgadm
+-ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
++ROOTLIBDIR=$(ROOT)$(DEB_USRLIBDIR_32)/cfgadm
++ROOTLIBDIR64=$(ROOT)$(DEB_USRLIBDIR_64)/cfgadm
+ 
+ LIBS=	$(DYNLIB)
+ 
+Index: cfgadm/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
+===================================================================
+--- cfgadm.orig/usr/src/lib/cfgadm_plugins/scsi/Makefile.com	2012-10-08 04:25:37.000000000 +0400
++++ cfgadm/usr/src/lib/cfgadm_plugins/scsi/Makefile.com	2013-05-09 17:18:19.158557233 +0400
+@@ -32,8 +32,8 @@
+ include ../../../Makefile.lib
+ 
+ SRCDIR =	../common
+-ROOTLIBDIR=	$(ROOT)/usr/lib/cfgadm
+-ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
++ROOTLIBDIR=$(ROOT)$(DEB_USRLIBDIR_32)/cfgadm
++ROOTLIBDIR64=$(ROOT)$(DEB_USRLIBDIR_64)/cfgadm
+ 
+ LIBS=	$(DYNLIB)
+ 
+Index: cfgadm/usr/src/lib/cfgadm_plugins/usb/Makefile.com
+===================================================================
+--- cfgadm.orig/usr/src/lib/cfgadm_plugins/usb/Makefile.com	2012-10-08 04:25:37.000000000 +0400
++++ cfgadm/usr/src/lib/cfgadm_plugins/usb/Makefile.com	2013-05-09 17:18:19.160312075 +0400
+@@ -32,8 +32,8 @@
+ include ../../../Makefile.lib
+ 
+ SRCDIR =	../common
+-ROOTLIBDIR=	$(ROOT)/usr/lib/cfgadm
+-ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
++ROOTLIBDIR=$(ROOT)$(DEB_USRLIBDIR_32)/cfgadm
++ROOTLIBDIR64=$(ROOT)$(DEB_USRLIBDIR_64)/cfgadm
+ 
+ LIBS=	$(DYNLIB)
+ 
diff --git a/cfgadm/debian/patches/series b/cfgadm/debian/patches/series
index b99272b..f9349df 100644
--- a/cfgadm/debian/patches/series
+++ b/cfgadm/debian/patches/series
@@ -1,4 +1,4 @@
 cfgadm-make.patch
-libcfgadm-plugin-path.patch
 cfgadm_plugins-pci-cfga.c-pointers.patch
 cfgadm_plugins-usb-MAX.patch
+libcfgadm-plugin-path.patch
diff --git a/cfgadm/debian/rules b/cfgadm/debian/rules
index c2743c2..a97ff73 100755
--- a/cfgadm/debian/rules
+++ b/cfgadm/debian/rules
@@ -50,6 +50,11 @@ build-stamp: dirs-stamp patch-stamp headers-stamp
 	dh_illumos_make usr/src/lib/libcfgadm
 	dh_illumos_make --native usr/src/cmd/cfgadm
 	dh_illumos_make $(plugins:%=usr/src/lib/cfgadm_plugins/%)
+	: # mv *.so.1 to *.so:
+	for l in `find debian/tmp/usr/lib/*/cfgadm \
+		debian/tmp/usr/lib*/cfgadm -type l -name \*.so`; do \
+		rm $$l; mv $$l.1 $$l; \
+	done
 	touch $@
 
 binary binary-arch binary-indep: binary-stamp