diff options
23 files changed, 485 insertions, 0 deletions
diff --git a/libnvpair/debian/changelog b/libnvpair/debian/changelog new file mode 100644 index 0000000..01a4870 --- /dev/null +++ b/libnvpair/debian/changelog @@ -0,0 +1,5 @@ +libnvpair (2.10-1) unstable; urgency=low + + * Initial release. + + -- Igor Pashev <pashev.igor@gmail.com> Tue, 23 Oct 2012 03:02:05 +0400 diff --git a/libnvpair/debian/compat b/libnvpair/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/libnvpair/debian/compat @@ -0,0 +1 @@ +9 diff --git a/libnvpair/debian/control b/libnvpair/debian/control new file mode 100644 index 0000000..4022d07 --- /dev/null +++ b/libnvpair/debian/control @@ -0,0 +1,56 @@ +Source: libnvpair +Section: libs +Priority: optional +Maintainer: Igor Pashev <pashev.igor@gmail.com> +Build-Depends: + dh-illumos, + gcc-multilib, + illumos-source-2.10, + quilt, + symlinks, +Standards-Version: 3.9.3 +Homepage: https://www.illumos.org + + +Package: libnvpair1 +Section: libs +Priority: standard +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Architecture: illumos-any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: name-value pair library + This package contains the illumos libnvpair shared + library for managing name-value pairs. + +Package: libnvpair1-dev +Section: libdevel +Priority: optional +Architecture: illumos-any +Provides: libnvpair-dev +Depends: libnvpair1 (= ${binary:Version}), ${misc:Depends}, libc-dev, + unix-libc-dev +Description: name-value pair library (development files) + This package contains the header files and symlinks needed + to compile applications that use libnvpair. + +Package: lib32nvpair1 +Section: libs +Priority: standard +Architecture: illumos-amd64 +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: name-value pair library (32 bit) + This package contains 32-bit version of the illumos + libnvpair shared library for managing name-value pairs. + +Package: lib32nvpair1-dev +Section: libdevel +Priority: optional +Architecture: illumos-amd64 +Provides: lib32nvpair-dev +Depends: lib32nvpair1 (= ${binary:Version}), libnvpair1-dev (= ${binary:Version}), + ${misc:Depends} +Description: name-value pair library (32-bit development files) + This package contains files needed to compile + 32-bit applications that use libnvpair. + diff --git a/libnvpair/debian/lib32nvpair1-dev.install b/libnvpair/debian/lib32nvpair1-dev.install new file mode 100644 index 0000000..961de82 --- /dev/null +++ b/libnvpair/debian/lib32nvpair1-dev.install @@ -0,0 +1 @@ +usr/lib32/libnvpair.so diff --git a/libnvpair/debian/lib32nvpair1.install b/libnvpair/debian/lib32nvpair1.install new file mode 100644 index 0000000..af875fa --- /dev/null +++ b/libnvpair/debian/lib32nvpair1.install @@ -0,0 +1 @@ +lib32/libnvpair.so.1 diff --git a/libnvpair/debian/libnvpair1-dev.install b/libnvpair/debian/libnvpair1-dev.install new file mode 100644 index 0000000..13ab707 --- /dev/null +++ b/libnvpair/debian/libnvpair1-dev.install @@ -0,0 +1,3 @@ +usr/include/libnvpair.h +usr/include/libnvpair/*.h +usr/lib/*/libnvpair.so diff --git a/libnvpair/debian/libnvpair1.install b/libnvpair/debian/libnvpair1.install new file mode 100644 index 0000000..6be9cb7 --- /dev/null +++ b/libnvpair/debian/libnvpair1.install @@ -0,0 +1 @@ +lib/*/libnvpair.so.1 diff --git a/libnvpair/debian/patches/libnvpair-headers.patch b/libnvpair/debian/patches/libnvpair-headers.patch new file mode 100644 index 0000000..ada66ea --- /dev/null +++ b/libnvpair/debian/patches/libnvpair-headers.patch @@ -0,0 +1,116 @@ +Description: Separate from kernel headers. +Index: libnvpair/usr/src/common/nvpair/fnvpair.c +=================================================================== +--- libnvpair.orig/usr/src/common/nvpair/fnvpair.c 2012-10-08 04:25:34.000000000 +0400 ++++ libnvpair/usr/src/common/nvpair/fnvpair.c 2012-10-27 09:30:01.163989865 +0400 +@@ -23,7 +23,7 @@ + * Copyright (c) 2012 by Delphix. All rights reserved. + */ + +-#include <sys/nvpair.h> ++#include <libnvpair/nvpair.h> + #include <sys/kmem.h> + #include <sys/debug.h> + #ifndef _KERNEL +Index: libnvpair/usr/src/common/nvpair/nvpair.c +=================================================================== +--- libnvpair.orig/usr/src/common/nvpair/nvpair.c 2012-10-08 04:25:34.000000000 +0400 ++++ libnvpair/usr/src/common/nvpair/nvpair.c 2012-10-27 09:30:58.258403457 +0400 +@@ -27,8 +27,6 @@ + #include <sys/debug.h> + #include <sys/isa_defs.h> + #include <sys/int_limits.h> +-#include <sys/nvpair.h> +-#include <sys/nvpair_impl.h> + #include <rpc/types.h> + #include <rpc/xdr.h> + +@@ -37,6 +35,8 @@ + #include <sys/ddi.h> + #include <sys/sunddi.h> + #else ++#include <libnvpair/nvpair.h> ++#include <libnvpair/nvpair_impl.h> + #include <stdarg.h> + #include <stdlib.h> + #include <string.h> +Index: libnvpair/usr/src/common/nvpair/nvpair_alloc_fixed.c +=================================================================== +--- libnvpair.orig/usr/src/common/nvpair/nvpair_alloc_fixed.c 2012-10-08 04:25:34.000000000 +0400 ++++ libnvpair/usr/src/common/nvpair/nvpair_alloc_fixed.c 2012-10-27 09:30:32.031636184 +0400 +@@ -28,11 +28,11 @@ + + #include <sys/stropts.h> + #include <sys/isa_defs.h> +-#include <sys/nvpair.h> + #include <sys/sysmacros.h> + #if defined(_KERNEL) && !defined(_BOOT) + #include <sys/varargs.h> + #else ++#include <libnvpair/nvpair.h> + #include <stdarg.h> + #include <strings.h> + #endif +Index: libnvpair/usr/src/lib/libnvpair/libnvpair.h +=================================================================== +--- libnvpair.orig/usr/src/lib/libnvpair/libnvpair.h 2012-10-08 04:25:41.000000000 +0400 ++++ libnvpair/usr/src/lib/libnvpair/libnvpair.h 2012-10-27 09:29:05.395057323 +0400 +@@ -25,7 +25,7 @@ + #ifndef _LIBNVPAIR_H + #define _LIBNVPAIR_H + +-#include <sys/nvpair.h> ++#include <libnvpair/nvpair.h> + #include <stdlib.h> + #include <stdio.h> + #include <regex.h> +@@ -38,7 +38,7 @@ + * All interfaces described in this file are private to Solaris, and + * are subject to change at any time and without notice. The public + * nvlist/nvpair interfaces, as documented in manpage sections 3NVPAIR, +- * are all imported from <sys/nvpair.h> included above. ++ * are all imported from <libnvpair/nvpair.h> included above. + */ + + extern int nvpair_value_match(nvpair_t *, int, char *, char **); +Index: libnvpair/usr/src/lib/libnvpair/nvpair_alloc_system.c +=================================================================== +--- libnvpair.orig/usr/src/lib/libnvpair/nvpair_alloc_system.c 2012-10-08 04:25:41.000000000 +0400 ++++ libnvpair/usr/src/lib/libnvpair/nvpair_alloc_system.c 2012-10-27 09:29:35.569311694 +0400 +@@ -26,7 +26,7 @@ + + #pragma ident "%Z%%M% %I% %E% SMI" + +-#include <sys/nvpair.h> ++#include <libnvpair/nvpair.h> + #include <stdlib.h> + + /*ARGSUSED*/ +Index: libnvpair/usr/src/uts/common/sys/nvpair.h +=================================================================== +--- libnvpair.orig/usr/src/uts/common/sys/nvpair.h 2012-10-08 04:26:00.000000000 +0400 ++++ libnvpair/usr/src/uts/common/sys/nvpair.h 2012-10-27 09:32:44.283223806 +0400 +@@ -31,10 +31,6 @@ + #include <sys/errno.h> + #include <sys/va_list.h> + +-#if defined(_KERNEL) && !defined(_BOOT) +-#include <sys/kmem.h> +-#endif +- + #ifdef __cplusplus + extern "C" { + #endif +Index: libnvpair/usr/src/uts/common/sys/nvpair_impl.h +=================================================================== +--- libnvpair.orig/usr/src/uts/common/sys/nvpair_impl.h 2012-10-08 04:26:00.000000000 +0400 ++++ libnvpair/usr/src/uts/common/sys/nvpair_impl.h 2012-10-27 09:33:05.795609594 +0400 +@@ -33,7 +33,7 @@ + extern "C" { + #endif + +-#include <sys/nvpair.h> ++#include <libnvpair/nvpair.h> + + /* + * The structures here provided for information and debugging purposes only diff --git a/libnvpair/debian/patches/libnvpair-no-note.h.patch b/libnvpair/debian/patches/libnvpair-no-note.h.patch new file mode 100644 index 0000000..619f4ba --- /dev/null +++ b/libnvpair/debian/patches/libnvpair-no-note.h.patch @@ -0,0 +1,15 @@ +Index: illumos-corelibs/usr/src/lib/libnvpair/libnvpair.c +=================================================================== +--- illumos-corelibs.orig/usr/src/lib/libnvpair/libnvpair.c 2012-10-08 04:25:41.000000000 +0400 ++++ illumos-corelibs/usr/src/lib/libnvpair/libnvpair.c 2012-10-23 03:24:08.075034334 +0400 +@@ -29,7 +29,9 @@ + #include <sys/types.h> + #include <sys/inttypes.h> + #include <stdarg.h> +-#include <note.h> ++#ifndef NOTE ++#define NOTE(s) ++#endif + #include "libnvpair.h" + + /* diff --git a/libnvpair/debian/patches/series b/libnvpair/debian/patches/series new file mode 100644 index 0000000..b4757e5 --- /dev/null +++ b/libnvpair/debian/patches/series @@ -0,0 +1,2 @@ +libnvpair-no-note.h.patch +libnvpair-headers.patch diff --git a/libnvpair/debian/rules b/libnvpair/debian/rules new file mode 100755 index 0000000..58d590b --- /dev/null +++ b/libnvpair/debian/rules @@ -0,0 +1,96 @@ +#!/usr/bin/make -f + +include /usr/share/dpkg/architecture.mk +export DH_VERBOSE = 1 + +# libs having "install_h" target to install headers: +libs_headers := \ +libnvpair \ + +# All libraries to build and to package. +# Order is important: +libs := $(libs_headers) \ + + +unpack: unpack-stamp +unpack-stamp: + dh_testdir + dh_illumos_gate --build \ + usr/src/lib/Makefile\* \ + $(libs:%=usr/src/lib/%) \ + usr/src/common/nvpair \ + usr/src/uts/common/sys/nvpair\*.h + + # Not used and buggy: + echo > usr/src/Makefile.msg.targ + touch $@ + +patch: patch-stamp +patch-stamp: unpack-stamp + dh_testdir + [ ! -f debian/patches/series ] || QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + touch $@ + +unpatch: + dh_testdir + [ ! -f debian/patches/series ] || QUILT_PATCHES=debian/patches quilt pop -a -f || test $$? = 2 + rm -f patch-stamp + +dirs-stamp: + . usr/env.sh; mkdir -p \ + debian/tmp/usr/include \ + debian/tmp/usr/include/libnvpair \ + debian/tmp$$DEB_LIBDIR_32 \ + debian/tmp$$DEB_LIBDIR_64 \ + debian/tmp$$DEB_USRLIBDIR_32 \ + debian/tmp$$DEB_USRLIBDIR_64 \ + +headers-stamp: patch-stamp dirs-stamp + dh_illumos_make $(libs_headers:%=usr/src/lib/%) -t install_h + cp usr/src/uts/common/sys/nvpair*.h debian/tmp/usr/include/libnvpair/ + touch $@ + +install build build-arch build-indep: build-stamp +build-stamp: patch-stamp dirs-stamp headers-stamp + dh_illumos_make $(libs:%=usr/src/lib/%) + # Move dev symlink from /lib into /usr/lib: + for l in `find debian/tmp/lib32 -maxdepth 1 -type l -name \*.so`; do \ + ln -sf `readlink -f $$l` debian/tmp/usr/lib32/`basename $$l`; \ + rm $$l; \ + done + for l in `find debian/tmp/lib/$(DEB_HOST_MULTIARCH) -maxdepth 1 -type l -name \*.so`; do \ + ln -sf `readlink -f $$l` debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/`basename $$l`; \ + rm $$l; \ + done + # Make symlinks relative: + symlinks -c debian/tmp/usr/lib32 + symlinks -c debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) + touch $@ + +binary binary-arch binary-indep: binary-stamp +binary-stamp: build-stamp + dh_testdir + dh_testroot + dh_installdirs + dh_install + dh_installman + dh_installdocs + dh_installexamples + dh_installchangelogs + dh_link + dh_compress + dh_fixperms + dh_makeshlibs -- -c4 + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + dh_clean + rm -rf usr + diff --git a/libnvpair/debian/source/format b/libnvpair/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/libnvpair/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/libuutil/debian/changelog b/libuutil/debian/changelog new file mode 100644 index 0000000..b6bc8b8 --- /dev/null +++ b/libuutil/debian/changelog @@ -0,0 +1,5 @@ +libuutil (2.10-1) unstable; urgency=low + + * Initial release. + + -- Igor Pashev <pashev.igor@gmail.com> Tue, 23 Oct 2012 03:02:05 +0400 diff --git a/libuutil/debian/compat b/libuutil/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/libuutil/debian/compat @@ -0,0 +1 @@ +9 diff --git a/libuutil/debian/control b/libuutil/debian/control new file mode 100644 index 0000000..3406bc6 --- /dev/null +++ b/libuutil/debian/control @@ -0,0 +1,52 @@ +Source: libuutil +Section: libs +Priority: optional +Maintainer: Igor Pashev <pashev.igor@gmail.com> +Build-Depends: + dh-illumos, + gcc-multilib, + illumos-source-2.10, + lib32sunavl1-dev, libsunavl1-dev, + quilt, + symlinks, +Standards-Version: 3.9.3 +Homepage: https://www.illumos.org + + +Package: libuutil1 +Section: libs +Priority: standard +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Architecture: illumos-any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: userland utility library + +Package: libuutil1-dev +Section: libdevel +Priority: optional +Architecture: illumos-any +Provides: libuutil-dev +Depends: libuutil1 (= ${binary:Version}), ${misc:Depends}, libc-dev +Description: userland utility library (development files) + This package contains the header files and symlinks needed + to compile applications that use libuutil. + +Package: lib32uutil1 +Section: libs +Priority: standard +Architecture: illumos-amd64 +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: userland utility library (32 bit) + +Package: lib32uutil1-dev +Section: libdevel +Priority: optional +Architecture: illumos-amd64 +Provides: lib32uutil-dev +Depends: lib32uutil1 (= ${binary:Version}), libuutil1-dev (= ${binary:Version}), + ${misc:Depends} +Description: userland utility library (32-bit development files) + This package contains files needed to compile + 32-bit applications that use libuutil. + diff --git a/libuutil/debian/lib32uutil1-dev.install b/libuutil/debian/lib32uutil1-dev.install new file mode 100644 index 0000000..d6d086b --- /dev/null +++ b/libuutil/debian/lib32uutil1-dev.install @@ -0,0 +1 @@ +usr/lib32/libuutil.so diff --git a/libuutil/debian/lib32uutil1.install b/libuutil/debian/lib32uutil1.install new file mode 100644 index 0000000..ba8377a --- /dev/null +++ b/libuutil/debian/lib32uutil1.install @@ -0,0 +1 @@ +lib32/libuutil.so.1 diff --git a/libuutil/debian/libuutil1-dev.install b/libuutil/debian/libuutil1-dev.install new file mode 100644 index 0000000..cfab0d3 --- /dev/null +++ b/libuutil/debian/libuutil1-dev.install @@ -0,0 +1,3 @@ +usr/lib/*/libuutil.so +usr/include/libuutil.h +usr/include/libuutil_impl.h diff --git a/libuutil/debian/libuutil1.install b/libuutil/debian/libuutil1.install new file mode 100644 index 0000000..dc4fa19 --- /dev/null +++ b/libuutil/debian/libuutil1.install @@ -0,0 +1 @@ +lib/*/libuutil.so.1 diff --git a/libuutil/debian/patches/libuutil-use-libsunavl.patch b/libuutil/debian/patches/libuutil-use-libsunavl.patch new file mode 100644 index 0000000..1a2ba0e --- /dev/null +++ b/libuutil/debian/patches/libuutil-use-libsunavl.patch @@ -0,0 +1,29 @@ +Index: illumos-corelibs/usr/src/lib/libuutil/Makefile.com +=================================================================== +--- illumos-corelibs.orig/usr/src/lib/libuutil/Makefile.com 2012-10-08 04:25:42.000000000 +0400 ++++ illumos-corelibs/usr/src/lib/libuutil/Makefile.com 2012-10-24 00:38:45.302329088 +0400 +@@ -26,7 +26,6 @@ + VERS = .1 + + OBJECTS = \ +- avl.o \ + uu_alloc.o \ + uu_avl.o \ + uu_dprintf.o \ +@@ -48,7 +47,6 @@ + $(NATIVE_BUILD)LIBS = $(DYNLIB) + + SRCS = \ +- ../../../common/avl/avl.c \ + ../common/uu_alloc.c \ + ../common/uu_avl.c \ + ../common/uu_dprintf.c \ +@@ -63,7 +61,7 @@ + + SRCDIR = ../common + $(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) +-LDLIBS += -lc ++LDLIBS += -lc -lsunavl + + AVLDIR = ../../../common/avl + diff --git a/libuutil/debian/patches/series b/libuutil/debian/patches/series new file mode 100644 index 0000000..fbcebda --- /dev/null +++ b/libuutil/debian/patches/series @@ -0,0 +1 @@ +libuutil-use-libsunavl.patch diff --git a/libuutil/debian/rules b/libuutil/debian/rules new file mode 100755 index 0000000..31ae8d3 --- /dev/null +++ b/libuutil/debian/rules @@ -0,0 +1,92 @@ +#!/usr/bin/make -f + +include /usr/share/dpkg/architecture.mk +export DH_VERBOSE = 1 + +# libs having "install_h" target to install headers: +libs_headers := \ +libuutil \ + +# All libraries to build and to package. +# Order is important: +libs := $(libs_headers) \ + + +unpack: unpack-stamp +unpack-stamp: + dh_testdir + dh_illumos_gate --build \ + usr/src/lib/Makefile\* \ + $(libs:%=usr/src/lib/%) \ + + # Not used and buggy: + echo > usr/src/Makefile.msg.targ + touch $@ + +patch: patch-stamp +patch-stamp: unpack-stamp + dh_testdir + [ ! -f debian/patches/series ] || QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + touch $@ + +unpatch: + dh_testdir + [ ! -f debian/patches/series ] || QUILT_PATCHES=debian/patches quilt pop -a -f || test $$? = 2 + rm -f patch-stamp + +dirs-stamp: + . usr/env.sh; mkdir -p \ + debian/tmp/usr/include \ + debian/tmp$$DEB_LIBDIR_32 \ + debian/tmp$$DEB_LIBDIR_64 \ + debian/tmp$$DEB_USRLIBDIR_32 \ + debian/tmp$$DEB_USRLIBDIR_64 \ + +headers-stamp: patch-stamp dirs-stamp + dh_illumos_make $(libs_headers:%=usr/src/lib/%) -t install_h + touch $@ + +install build build-arch build-indep: build-stamp +build-stamp: patch-stamp dirs-stamp headers-stamp + dh_illumos_make $(libs:%=usr/src/lib/%) + # Move dev symlink from /lib into /usr/lib: + for l in `find debian/tmp/lib32 -maxdepth 1 -type l -name \*.so`; do \ + ln -sf `readlink -f $$l` debian/tmp/usr/lib32/`basename $$l`; \ + rm $$l; \ + done + for l in `find debian/tmp/lib/$(DEB_HOST_MULTIARCH) -maxdepth 1 -type l -name \*.so`; do \ + ln -sf `readlink -f $$l` debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/`basename $$l`; \ + rm $$l; \ + done + # Make symlinks relative: + symlinks -c debian/tmp/usr/lib32 + symlinks -c debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) + touch $@ + +binary binary-arch binary-indep: binary-stamp +binary-stamp: build-stamp + dh_testdir + dh_testroot + dh_installdirs + dh_install + dh_installman + dh_installdocs + dh_installexamples + dh_installchangelogs + dh_link + dh_compress + dh_fixperms + dh_makeshlibs -- -c4 + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + dh_clean + rm -rf usr + diff --git a/libuutil/debian/source/format b/libuutil/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/libuutil/debian/source/format @@ -0,0 +1 @@ +3.0 (native) |