This commit is contained in:
Igor Pashev 2013-01-15 01:05:00 +00:00
parent 5d629193ea
commit 730102a24b
14 changed files with 389 additions and 0 deletions

View File

@ -0,0 +1,10 @@
Real sources are in the package illumos-source-X.Y,
where X and Y are numbers. Exact values of X and Y
are set in Build-Depends field of debian/control as
well as in the version string in debian/changelog,
in a form of X.Y-1.
To add a patch you need first to unpack files from
illumos-source-X.Y using ./debian/rules unpack
and, desirably, ./debian/rules patch

View File

@ -0,0 +1,5 @@
libfstyp (2.10-1) unstable; urgency=low
* Initial release.
-- Igor Pashev <pashev.igor@gmail.com> Tue, 15 Jan 2013 01:01:16 +0000

1
libfstyp/debian/compat Normal file
View File

@ -0,0 +1 @@
9

69
libfstyp/debian/control Normal file
View File

@ -0,0 +1,69 @@
Source: libfstyp
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: libfstyp1
Section: libs
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Architecture: illumos-any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: file system type identification library
This package contains libfstyp shared library.
.
The libfstyp library exports a set of functions to identify the file system
type of an unmounted file system using heuristic modules. Internally, the
library is comprised of interfaces exported by file system-specific modules.
Package: libfstyp1-dev
Section: libdevel
Priority: optional
Architecture: illumos-any
Provides: libfstyp-dev
Depends: libfstyp1 (= ${binary:Version}), ${misc:Depends}, libnvpair-dev,
Description: file system type identification library (development files)
This package contains the header files and symlinks needed
to compile applications that use libfstyp.
.
The libfstyp library exports a set of functions to identify the file system
type of an unmounted file system using heuristic modules. Internally, the
library is comprised of interfaces exported by file system-specific modules.
Package: lib32fstyp1
Section: libs
Priority: standard
Architecture: illumos-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: file system type identification library (32 bit)
This package contains libfstyp shared library.
.
The libfstyp library exports a set of functions to identify the file system
type of an unmounted file system using heuristic modules. Internally, the
library is comprised of interfaces exported by file system-specific modules.
.
This is a 32-bit version of the library.
Package: lib32fstyp1-dev
Section: libdevel
Priority: optional
Architecture: illumos-amd64
Provides: lib32fstyp-dev
Depends: lib32fstyp1 (= ${binary:Version}), libfstyp1-dev (= ${binary:Version}),
${misc:Depends}
Description: file system type identification library (32-bit development files)
This package contains files needed to compile
32-bit applications that use libfstyp.
.
The libfstyp library exports a set of functions to identify the file system
type of an unmounted file system using heuristic modules. Internally, the
library is comprised of interfaces exported by file system-specific modules.

62
libfstyp/debian/copyright Normal file
View File

@ -0,0 +1,62 @@
Files: debian/*
Copyright: 2012, Igor Pashev <pashev.igor@gmail.com>
License: WTFPL-2
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
Version 2, December 2004
.
Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
.
Everyone is permitted to copy and distribute verbatim or modified
copies of this license document, and changing it is allowed as long
as the name is changed.
.
DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
.
0. You just DO WHAT THE FUCK YOU WANT TO.
Files: usr/src/lib/libinetutil/common/ifaddrlist.c
Copyright: 1997, The Regents of the University of California.
2009 Sun Microsystems, Inc.
License: 4-clause BSD
Copyright (c) 1997
The Regents of the University of California. All rights reserved.
.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
This product includes software developed by the Computer Systems
Engineering Group at Lawrence Berkeley Laboratory.
4. Neither the name of the University nor of the Laboratory may be used
to endorse or promote products derived from this software without
specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
Files: *
License: CDDL
Note that sources are not in this package but in the package
illumos-source-X.Y. Those sources are covered by Common Development
and Distribution License (CDDL).
.
On Dyson system, the full text of the CDDL license
can be found in the file `/usr/share/common-licenses/CDDL-1.0'.

View File

@ -0,0 +1 @@
usr/lib32/libfstyp.so

View File

@ -0,0 +1 @@
usr/lib32/libfstyp.so.1

View File

@ -0,0 +1,2 @@
usr/lib/*/libfstyp.so
usr/include/libfstyp*.h

View File

@ -0,0 +1 @@
usr/lib/*/libfstyp.so.1

View File

@ -0,0 +1,29 @@
libfstyp.so.1 libfstyp1 #MINVER#
SUNW_1.1@SUNW_1.1 2.10-1
SUNWprivate_1.1@SUNWprivate_1.1 2.10-1
fstyp_add_logical_drive@SUNWprivate_1.1 2.10-1
fstyp_change_logical_drive_id@SUNWprivate_1.1 2.10-1
fstyp_commit_ext_part@SUNWprivate_1.1 2.10-1
fstyp_delete_ext_part@SUNWprivate_1.1 2.10-1
fstyp_delete_logical_drive@SUNWprivate_1.1 2.10-1
fstyp_dump@SUNW_1.1 2.10-1
fstyp_ext_find_first_free_sec@SUNWprivate_1.1 2.10-1
fstyp_ext_find_last_free_sec@SUNWprivate_1.1 2.10-1
fstyp_ext_part_exists@SUNWprivate_1.1 2.10-1
fstyp_ext_validate_part_start@SUNWprivate_1.1 2.10-1
fstyp_fini@SUNW_1.1 2.10-1
fstyp_get_attr@SUNW_1.1 2.10-1
fstyp_get_disk_geom@SUNWprivate_1.1 2.10-1
fstyp_get_part_info@SUNWprivate_1.1 2.10-1
fstyp_get_solaris_part@SUNWprivate_1.1 2.10-1
fstyp_ident@SUNW_1.1 2.10-1
fstyp_init@SUNW_1.1 2.10-1
fstyp_init_ext_part@SUNWprivate_1.1 2.10-1
fstyp_invalid_bb_sig@SUNWprivate_1.1 2.10-1
fstyp_is_linux_swap@SUNWprivate_1.1 2.10-1
fstyp_mounted_logical_drives@SUNWprivate_1.1 2.10-1
fstyp_strerror@SUNW_1.1 2.10-1
fstyp_validate_logical_drive@SUNWprivate_1.1 2.10-1
libfstyp_fini@SUNWprivate_1.1 2.10-1
libfstyp_init@SUNWprivate_1.1 2.10-1
libfstyp_reset@SUNWprivate_1.1 2.10-1

View File

@ -0,0 +1,110 @@
From f5c2e7ea56aaa46a9976476fb0cb1f02b9426f07 Mon Sep 17 00:00:00 2001
From: Theo Schlossnagle <jesus@omniti.com>
Date: Thu, 6 Dec 2012 16:29:54 -0800
Subject: [PATCH] 3352 would like 64bit install libraries Reviewed by: Garrett
D'Amore <garrett@damore.org> Reviewed by: Richard Lowe
<richlowe@richlowe.net> Reviewed by: Igor Kozhukhov
<ikozhukhov@gmail.com> Reviewed by: Christopher Siden
<chris.siden@delphix.com> Approved by: Garrett D'Amore
<garrett@damore.org>
---
usr/src/lib/libfstyp/Makefile | 4 ++--
usr/src/lib/libfstyp/amd64/Makefile | 28 ++++++++++++++++++++++++++++
usr/src/lib/libfstyp/sparcv9/Makefile | 27 +++++++++++++++++++++++++++
3 files changed, 57 insertions(+), 2 deletions(-)
create mode 100644 usr/src/lib/libfstyp/amd64/Makefile
create mode 100644 usr/src/lib/libfstyp/sparcv9/Makefile
diff --git a/usr/src/lib/libfstyp/Makefile b/usr/src/lib/libfstyp/Makefile
index b9cf46e..1878db3 100644
--- a/usr/src/lib/libfstyp/Makefile
+++ b/usr/src/lib/libfstyp/Makefile
@@ -21,8 +21,7 @@
#
# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
-#
-# ident "%Z%%M% %I% %E% SMI"
+# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved.
#
include ../Makefile.lib
@@ -32,6 +31,7 @@ HDRS= libfstyp.h libfstyp_module.h
HDRDIR= common
SUBDIRS= $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
all := TARGET= all
install := TARGET= install
diff --git a/usr/src/lib/libfstyp/amd64/Makefile b/usr/src/lib/libfstyp/amd64/Makefile
new file mode 100644
index 0000000..3df0cea
--- /dev/null
+++ b/usr/src/lib/libfstyp/amd64/Makefile
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved.
+#
+
+include ../Makefile.com
+include ../../Makefile.lib.64
+
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/libfstyp/sparcv9/Makefile b/usr/src/lib/libfstyp/sparcv9/Makefile
new file mode 100644
index 0000000..1f55b03
--- /dev/null
+++ b/usr/src/lib/libfstyp/sparcv9/Makefile
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2012 OmniTI Computer Consulting, Inc. All rights reserved.
+#
+
+include ../Makefile.com
+include ../../Makefile.lib.64
+
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
--
1.7.8.6

View File

@ -0,0 +1 @@
libfstyp-illumos-3352-would-like-64bit-install-libraries.patch

96
libfstyp/debian/rules Executable file
View File

@ -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 := \
libfstyp \
# All libraries to build and to package.
# Order is important:
libs := $(libs_headers) \
unpack: unpack-stamp
unpack-stamp:
dh_testdir
dh_illumos_gate --build \
$(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
touch $@
headers-stamp: patch-stamp dirs-stamp
dh_illumos_make $(libs_headers:%=usr/src/lib/%) -t install_h
touch $@
install: install-stamp
install-stamp: build-stamp
# 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 $@
build build-arch build-indep: build-stamp
build-stamp: patch-stamp dirs-stamp headers-stamp
dh_illumos_make $(libs:%=usr/src/lib/%)
touch $@
binary binary-arch binary-indep: binary-stamp
binary-stamp: install-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 .pc

View File

@ -0,0 +1 @@
3.0 (native)