osdyson
/
illumos-packaging
mirror of https://git.osdyson.ru/illumos/illumos-packaging.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cfgadm (2.10-3) unstable; urgency=low 

* Build fp (only native) and sbd plugins
  * Install man pages for plugins in the cfgadm package
This commit is contained in:
Igor Pashev 2013-05-09 20:09:37 +04:00
parent c82be195b4
commit 65e034caee
8 changed files with 239 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cfgadm/debian/cfgadm.manpages
View File

@ -1 +1,12 @@
#usr/src/man/man1m/cfgadm_ac.1m
#usr/src/man/man1m/cfgadm_cardbus.1m
#usr/src/man/man1m/cfgadm_sdcard.1m
#usr/src/man/man1m/cfgadm_sysctrl.1m
usr/src/man/man1m/cfgadm.1m
usr/src/man/man1m/cfgadm_fp.1m
usr/src/man/man1m/cfgadm_ib.1m
usr/src/man/man1m/cfgadm_pci.1m
usr/src/man/man1m/cfgadm_sata.1m
usr/src/man/man1m/cfgadm_sbd.1m
usr/src/man/man1m/cfgadm_scsi.1m
usr/src/man/man1m/cfgadm_usb.1m

7
cfgadm/debian/changelog
View File

@ -1,3 +1,10 @@
cfgadm (2.10-3) unstable; urgency=low
* Build fp (only native) and sbd plugins
* Install man pages for plugins in the cfgadm package
-- Igor Pashev <pashev.igor@gmail.com> Thu, 09 May 2013 20:02:51 +0400
cfgadm (2.10-2) unstable; urgency=low
* Build usb, pci, sata, scsi and ib plugins (in libcfgadm-plugins and

8
cfgadm/debian/control
View File

@ -7,8 +7,10 @@ Build-Depends:
illumos-source-2.10,
libdevice-dev , lib32device-dev [illumos-amd64 kopensolaris-amd64] ,
libdevinfo-dev , lib32devinfo1-dev [illumos-amd64 kopensolaris-amd64] ,
librcm-dev , lib32rcm-dev [illumos-amd64 kopensolaris-amd64] ,
libkstat-dev , lib32kstat-dev [illumos-amd64 kopensolaris-amd64] ,
libnvpair-dev , lib32nvpair-dev [illumos-amd64 kopensolaris-amd64] ,
librcm-dev , lib32rcm-dev [illumos-amd64 kopensolaris-amd64] ,
libhbaapi-dev,
gcc-multilib [illumos-amd64 kopensolaris-amd64],
quilt,
Standards-Version: 3.9.3
@ -81,7 +83,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Description: configuration administration library plugins
This package contains plugins used by libcfgadm shared library.
.
These plugins are: usb, pci, sata, scsi, and ib.
These plugins are: usb, pci, sata, scsi, fp, sbd, and ib.
Package: lib32cfgadm-plugins
Section: libs
@ -93,6 +95,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Description: configuration administration library plugins (32 bit)
This package contains plugins used by 32-bit libcfgadm shared library.
.
These plugins are: usb, pci, sata, scsi, and ib.
These plugins are: usb, pci, sata, scsi, sbd, and ib.
.
This plugins are for 32-bit version of libcfgadm.

52
cfgadm/debian/patches/cfgadm_plugins-fp-pointers.patch Normal file
View File

@ -0,0 +1,52 @@
Index: cfgadm/usr/src/lib/cfgadm_plugins/fp/common/cfga_cs.c
===================================================================
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/fp/common/cfga_cs.c 2012-10-08 04:25:37.000000000 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/fp/common/cfga_cs.c 2013-05-09 19:41:46.631806193 +0400
@@ -71,7 +71,7 @@
char *drvr_name = "dummy";
la_wwn_t pwwn;
- *dev_path = NULL;
+ *dev_path = '\0';
if ((ddef_hdl = devctl_ddef_alloc(drvr_name, 0)) == NULL) {
cfga_err(errstring, errno, ERRARG_DC_DDEF_ALLOC, drvr_name, 0);
return (FPCFGA_LIB_ERR);
Index: cfgadm/usr/src/lib/cfgadm_plugins/fp/common/cfga_list.c
===================================================================
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/fp/common/cfga_list.c 2012-10-08 04:25:37.000000000 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/fp/common/cfga_list.c 2013-05-09 19:42:38.140256929 +0400
@@ -3087,7 +3087,7 @@
S_FREE(inq_buf);
continue;
}
- *dtype = NULL;
+ *dtype = '\0';
for (j = 0; j < N_DEVICE_TYPES; j++) {
if ((inq_buf->inq_dtype & DTYPE_MASK)
== device_list[j].itype) {
@@ -3096,7 +3096,7 @@
break;
}
}
- if (*dtype == NULL) {
+ if (*dtype == '\0') {
(void) strlcpy(dtype,
(char *)device_list[DTYPE_UNKNOWN_INDEX].name,
CFGA_TYPE_LEN);
Index: cfgadm/usr/src/lib/cfgadm_plugins/fp/common/cfga_rep.c
===================================================================
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/fp/common/cfga_rep.c 2012-10-08 04:25:37.000000000 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/fp/common/cfga_rep.c 2013-05-09 19:43:13.701390729 +0400
@@ -82,10 +82,10 @@
*bytes_left = buflen;
*write_offset = 0;
- if (buf == NULL || *buf == NULL || buflen <= 0)
+ if (buf == NULL || *buf == '\0' || buflen <= 0)
return (-2); /* Arbitrary -ve val. srch_str not found */
- if (srch_str == NULL || *srch_str == NULL || slen <= 0)
+ if (srch_str == NULL || *srch_str == '\0' || slen <= 0)
return (0); /* This says srch_str was found */
sol = cur_pos = buf;

121
cfgadm/debian/patches/cfgadm_plugins-sbd.patch Normal file
View File

@ -0,0 +1,121 @@
Index: cfgadm/usr/src/lib/cfgadm_plugins/sbd/common/ap.c
===================================================================
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/sbd/common/ap.c 2012-10-08 04:25:37.000000000 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/sbd/common/ap.c 2013-05-09 19:34:14.734796178 +0400
@@ -29,7 +29,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <macros.h>
#include <dirent.h>
#include <libgen.h>
#include <libdevinfo.h>
@@ -339,7 +338,7 @@
char *
ap_cmd_name(int i)
{
- return (ap_cmd_names[min(i, CMD_NONE)]);
+ return (ap_cmd_names[MIN(i, CMD_NONE)]);
}
static char *
Index: cfgadm/usr/src/lib/cfgadm_plugins/sbd/common/ap_msg.c
===================================================================
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/sbd/common/ap_msg.c 2012-10-08 04:25:37.000000000 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/sbd/common/ap_msg.c 2013-05-09 19:34:14.736928398 +0400
@@ -29,7 +29,6 @@
#include <stdarg.h>
#include <string.h>
#include <unistd.h>
-#include <macros.h>
#include <errno.h>
#include <locale.h>
#include <libdevinfo.h>
@@ -107,7 +106,7 @@
NULL
};
-#define ap_err_fmt(i) ap_err_fmts[min((uint_t)(i), ERR_NONE)]
+#define ap_err_fmt(i) ap_err_fmts[MIN((uint_t)(i), ERR_NONE)]
static char *
ap_msg_fmts[] = {
@@ -122,7 +121,7 @@
NULL
};
-#define ap_msg_fmt(i) ap_msg_fmts[min((uint_t)(i), MSG_NONE)]
+#define ap_msg_fmt(i) ap_msg_fmts[MIN((uint_t)(i), MSG_NONE)]
#define STR_BD "board"
#define STR_SEP ": "
Index: cfgadm/usr/src/lib/cfgadm_plugins/sbd/common/ap_rcm.c
===================================================================
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/sbd/common/ap_rcm.c 2012-10-08 04:25:37.000000000 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/sbd/common/ap_rcm.c 2013-05-09 19:34:14.740675117 +0400
@@ -29,10 +29,10 @@
#include <stdarg.h>
#include <string.h>
#include <unistd.h>
-#include <macros.h>
#include <errno.h>
#include <kstat.h>
#include <sys/kmem.h>
+#include <sys/stat.h>
#include <dlfcn.h>
#include <libdevinfo.h>
#include <librcm.h>
Index: cfgadm/usr/src/lib/cfgadm_plugins/sbd/common/ap_seq.c
===================================================================
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/sbd/common/ap_seq.c 2012-10-08 04:25:37.000000000 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/sbd/common/ap_seq.c 2013-05-09 19:34:52.785966036 +0400
@@ -29,7 +29,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <macros.h>
#include <dirent.h>
#include <libgen.h>
#include <libdevinfo.h>
Index: cfgadm/usr/src/lib/cfgadm_plugins/sbd/common/cfga.c
===================================================================
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/sbd/common/cfga.c 2012-10-08 04:25:37.000000000 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/sbd/common/cfga.c 2013-05-09 19:35:14.064539011 +0400
@@ -28,7 +28,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <macros.h>
#include <libdevinfo.h>
#define CFGA_PLUGIN_LIB
#include <config_admin.h>
Index: cfgadm/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
===================================================================
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/sbd/Makefile.com 2012-10-08 04:25:37.000000000 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/sbd/Makefile.com 2013-05-09 19:37:29.315127080 +0400
@@ -31,14 +31,9 @@
# include library definitions
include ../../../Makefile.lib
-USR_PLAT_DIR = $(ROOT)/usr/platform
-USR_PSM_DIR = $(USR_PLAT_DIR)/$(PLATFORM)
-USR_PSM_LIB_DIR = $(USR_PSM_DIR)/lib
-USR_PSM_LIB_CFG_DIR = $(USR_PSM_LIB_DIR)/cfgadm
-USR_PSM_LIB_CFG_DIR_64 = $(USR_PSM_LIB_CFG_DIR)/$(MACH64)
-ROOTLIBDIR= $(USR_PSM_LIB_CFG_DIR)
-ROOTLIBDIR64= $(USR_PSM_LIB_CFG_DIR_64)
+ROOTLIBDIR= $(ROOT)$(DEB_USRLIBDIR_32)/cfgadm
+ROOTLIBDIR64= $(ROOT)$(DEB_USRLIBDIR_64)/cfgadm
SRCDIR = ../common
@@ -57,7 +52,7 @@
#
GENERRDIR= $(SRC)/lib/cfgadm_plugins/sbd
GENERR= $(GENERRDIR)/sbdgenerr
-ERRSRC= $(ROOT)/usr/platform/$(PLATFORM)/include/sys/sbd_ioctl.h
+ERRSRC= /usr/include/sys/sbd_ioctl.h
.KEEP_STATE:

43
cfgadm/debian/patches/libcfgadm-plugin-path.patch
View File

@ -1,8 +1,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-05-09 17:10:20.564913401 +0400
--- cfgadm.orig/usr/src/lib/libcfgadm/common/config_admin.c 2013-05-09 19:44:47.395932211 +0400
+++ cfgadm/usr/src/lib/libcfgadm/common/config_admin.c 2013-05-09 19:45:12.697639635 +0400
@@ -287,19 +287,16 @@
static int default_ap_id_cmp(const char *ap_id1, const char *ap_id2);
static void destroy_cache();
@ -113,8 +113,8 @@ Index: cfgadm/usr/src/lib/libcfgadm/common/config_admin.c
/* file exists, is it a lib */
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-05-09 17:10:20.566972230 +0400
--- cfgadm.orig/usr/src/lib/libcfgadm/Makefile.com 2013-05-09 19:44:47.395982445 +0400
+++ cfgadm/usr/src/lib/libcfgadm/Makefile.com 2013-05-09 19:45:12.700259223 +0400
@@ -36,6 +36,9 @@
$(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC)
@ -127,8 +127,8 @@ Index: cfgadm/usr/src/lib/libcfgadm/Makefile.com
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
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/ib/Makefile.com 2013-05-09 19:44:47.395835544 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/ib/Makefile.com 2013-05-09 19:45:12.702937304 +0400
@@ -32,8 +32,8 @@
include ../../../Makefile.lib
@ -142,8 +142,8 @@ Index: cfgadm/usr/src/lib/cfgadm_plugins/ib/Makefile.com
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
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/pci/Makefile.com 2013-05-09 19:44:47.395754490 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/pci/Makefile.com 2013-05-09 19:45:12.705415859 +0400
@@ -36,8 +36,8 @@
USR_LIB_DIR_CFGADM = $(USR_LIB_DIR)/cfgadm
USR_LIB_DIR_CFGADM_64 = $(USR_LIB_DIR_CFGADM)/$(MACH64)
@ -157,8 +157,8 @@ Index: cfgadm/usr/src/lib/cfgadm_plugins/pci/Makefile.com
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
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/sata/Makefile.com 2013-05-09 19:44:47.395389651 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/sata/Makefile.com 2013-05-09 19:45:12.707768655 +0400
@@ -32,8 +32,8 @@
include ../../../Makefile.lib
@ -172,8 +172,8 @@ Index: cfgadm/usr/src/lib/cfgadm_plugins/sata/Makefile.com
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
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/scsi/Makefile.com 2013-05-09 19:44:47.395865768 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/scsi/Makefile.com 2013-05-09 19:45:12.711614510 +0400
@@ -32,8 +32,8 @@
include ../../../Makefile.lib
@ -187,8 +187,8 @@ Index: cfgadm/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
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
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/usb/Makefile.com 2013-05-09 19:44:47.395707618 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/usb/Makefile.com 2013-05-09 19:45:12.713783842 +0400
@@ -32,8 +32,8 @@
include ../../../Makefile.lib
@ -200,3 +200,18 @@ Index: cfgadm/usr/src/lib/cfgadm_plugins/usb/Makefile.com
LIBS= $(DYNLIB)
Index: cfgadm/usr/src/lib/cfgadm_plugins/fp/Makefile.com
===================================================================
--- cfgadm.orig/usr/src/lib/cfgadm_plugins/fp/Makefile.com 2012-10-08 04:25:37.000000000 +0400
+++ cfgadm/usr/src/lib/cfgadm_plugins/fp/Makefile.com 2013-05-09 19:46:02.428369775 +0400
@@ -34,8 +34,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)

2
cfgadm/debian/patches/series
View File

@ -1,4 +1,6 @@
cfgadm-make.patch
cfgadm_plugins-fp-pointers.patch
cfgadm_plugins-pci-cfga.c-pointers.patch
cfgadm_plugins-sbd.patch
cfgadm_plugins-usb-MAX.patch
libcfgadm-plugin-path.patch

14
cfgadm/debian/rules
View File

@ -3,18 +3,27 @@
include /usr/share/dpkg/architecture.mk
export DH_VERBOSE = 1
plugins := usb scsi sata pci ib
# Only single arch plugins
# (need libhbaapi, which is only native)
plugins_native := fp
# Both 32 and 64 bit plugins:
plugins := usb scsi sata pci ib sbd
# Until it is i386 or amd64 it is ok
# arch is the name of a subdiretory
arch := $(DEB_HOST_ARCH_CPU)
unpack: unpack-stamp
unpack-stamp:
dh_testdir
dh_illumos_gate --build \
usr/src/man/man1m/cfgadm\* \
usr/src/common/pci \
usr/src/lib/cfgadm_plugins \
usr/src/head/config_admin.h \
usr/src/cmd/cfgadm \
usr/src/lib/libcfgadm \
usr/src/man/man1m/cfgadm.1m \
# Buggy and unused:
echo > usr/src/Makefile.msg.targ
@ -49,6 +58,7 @@ headers-stamp: dirs-stamp
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_native:%=usr/src/lib/cfgadm_plugins/%/$(arch))
dh_illumos_make $(plugins:%=usr/src/lib/cfgadm_plugins/%)
: # mv *.so.1 to *.so:
for l in `find debian/tmp/usr/lib/*/cfgadm \