Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/sets/lists Fix sets files for MKZFS enabled builds m...
details: https://anonhg.NetBSD.org/src/rev/51e3b71a8453
branches: trunk
changeset: 748006:51e3b71a8453
user: haad <haad%NetBSD.org@localhost>
date: Fri Oct 09 00:48:33 2009 +0000
description:
Fix sets files for MKZFS enabled builds move debuging libs to proper place
and add html flags for html manpages.
Patch received from Pierre Allegraud and reviewed by me.
diffstat:
distrib/sets/lists/base/shl.elf | 14 +++++++++++++-
distrib/sets/lists/base/shl.mi | 31 +------------------------------
distrib/sets/lists/comp/mi | 13 ++++++++++++-
distrib/sets/lists/comp/shl.mi | 7 ++++++-
distrib/sets/lists/man/mi | 8 ++++----
5 files changed, 36 insertions(+), 37 deletions(-)
diffs (230 lines):
diff -r 03e9dd8c9ede -r 51e3b71a8453 distrib/sets/lists/base/shl.elf
--- a/distrib/sets/lists/base/shl.elf Fri Oct 09 00:26:53 2009 +0000
+++ b/distrib/sets/lists/base/shl.elf Fri Oct 09 00:48:33 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.187 2009/09/30 03:41:12 tsarna Exp $
+# $NetBSD: shl.elf,v 1.188 2009/10/09 00:48:33 haad Exp $
#
# Note: Do not mark "old" major and major.minor shared libraries as
# "obsolete"; just remove the entry, as third-party applications
@@ -94,6 +94,8 @@
./usr/lib/libarchive.so.3 base-sys-shlib
./usr/lib/libasn1.so base-krb5-shlib kerberos
./usr/lib/libasn1.so.8 base-krb5-shlib kerberos
+./usr/lib/libavl.so base-zfs-shlib dynamicroot,zfs
+./usr/lib/libavl.so.0 base-zfs-shlib dynamicroot,zfs
./usr/lib/libbfd.so.10 base-sys-shlib binutils=216
./usr/lib/libbfd.so.11 base-sys-shlib binutils=219
./usr/lib/libbind9.so base-bind-shlib
@@ -187,6 +189,8 @@
./usr/lib/libmenu.so.6 base-sys-shlib
./usr/lib/libnetpgp.so base-crypto-shlib crypto
./usr/lib/libnetpgp.so.2 base-crypto-shlib crypto
+./usr/lib/libnvpair.so base-zfs-shlib dynamicroot,zfs
+./usr/lib/libnvpair.so.0 base-zfs-shlib dynamicroot,zfs
./usr/lib/libobjc.so base-sys-shlib gcc
./usr/lib/libobjc.so.3 base-sys-shlib gcc
./usr/lib/libopenpgpsdk.so base-obsolete obsolete
@@ -309,12 +313,20 @@
./usr/lib/libtermlib.so.0 base-sys-shlib
./usr/lib/libukfs.so base-sys-shlib
./usr/lib/libukfs.so.1 base-sys-shlib
+./usr/lib/libumem.so base-zfs-shlib dynamicroot,zfs
+./usr/lib/libumem.so.0 base-zfs-shlib dynamicroot,zfs
./usr/lib/libusbhid.so base-sys-shlib
./usr/lib/libusbhid.so.1 base-sys-shlib
./usr/lib/libutil.so base-sys-shlib
./usr/lib/libutil.so.7 base-sys-shlib
+./usr/lib/libuutil.so base-zfs-shlib dynamicroot,zfs
+./usr/lib/libuutil.so.0 base-zfs-shlib dynamicroot,zfs
./usr/lib/libwrap.so base-net-shlib
./usr/lib/libwrap.so.1 base-net-shlib
./usr/lib/libz.so base-sys-shlib
./usr/lib/libz.so.1 base-sys-shlib
+./usr/lib/libzfs.so base-zfs-shlib dynamicroot,zfs
+./usr/lib/libzfs.so.0 base-zfs-shlib dynamicroot,zfs
+./usr/lib/libzpool.so base-zfs-shlib dynamicroot,zfs
+./usr/lib/libzpool.so.0 base-zfs-shlib dynamicroot,zfs
./usr/libexec/ld.elf_so base-sys-shlib
diff -r 03e9dd8c9ede -r 51e3b71a8453 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi Fri Oct 09 00:26:53 2009 +0000
+++ b/distrib/sets/lists/base/shl.mi Fri Oct 09 00:48:33 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.497 2009/10/05 22:32:58 haad Exp $
+# $NetBSD: shl.mi,v 1.498 2009/10/09 00:48:34 haad Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -55,12 +55,7 @@
./usr/lib/libamu.so.4.0 base-amd-shlib
./usr/lib/libarchive.so.3.0 base-sys-shlib
./usr/lib/libasn1.so.8.0 base-krb5-shlib kerberos
-./usr/lib/libavl.so base-zfs-shlib zfs,dynamicroot
-./usr/lib/libavl.so.0 base-zfs-shlib zfs,dynamicroot
./usr/lib/libavl.so.0.0 base-zfs-shlib zfs,dynamicroot
-./usr/lib/libavl.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/libavl_p.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/libavl_pic.a base-zfs-shlib zfs,dynamicroot
./usr/lib/libbfd.so.10.0 base-sys-shlib binutils=216
./usr/lib/libbfd.so.11.0 base-sys-shlib binutils=219
./usr/lib/libbind9.so.4.0 base-bind-shlib
@@ -106,12 +101,7 @@
./usr/lib/libmagic.so.3.0 base-sys-shlib
./usr/lib/libmenu.so.6.0 base-sys-shlib
./usr/lib/libnetpgp.so.2.0 base-crypto-shlib crypto
-./usr/lib/libnvpair.so base-zfs-shlib zfs,dynamicroot
-./usr/lib/libnvpair.so.0 base-zfs-shlib zfs,dynamicroot
./usr/lib/libnvpair.so.0.0 base-zfs-shlib zfs,dynamicroot
-./usr/lib/libnvpair.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/libnvpair_p.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/libnvpair_pic.a base-zfs-shlib zfs,dynamicroot
./usr/lib/libobjc.so.2.0 base-sys-shlib gcc=3
./usr/lib/libobjc.so.3.0 base-sys-shlib gcc=4
./usr/lib/libopenpgpsdk.so.0.9 base-obsolete obsolete
@@ -174,33 +164,14 @@
./usr/lib/libtermcap.so.0.6 base-sys-shlib
./usr/lib/libtermlib.so.0.6 base-sys-shlib
./usr/lib/libukfs.so.1.0 base-sys-shlib
-./usr/lib/libumem.so base-zfs-shlib zfs,dynamicroot
-./usr/lib/libumem.so.0 base-zfs-shlib zfs,dynamicroot
./usr/lib/libumem.so.0.0 base-zfs-shlib zfs,dynamicroot
-./usr/lib/libumem.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/libumem_p.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/libumem_pic.a base-zfs-shlib zfs,dynamicroot
./usr/lib/libusbhid.so.1.0 base-sys-shlib
./usr/lib/libutil.so.7.17 base-sys-shlib
-./usr/lib/libuutil.so base-zfs-shlib zfs,dynamicroot
-./usr/lib/libuutil.so.0 base-zfs-shlib zfs,dynamicroot
./usr/lib/libuutil.so.0.0 base-zfs-shlib zfs,dynamicroot
-./usr/lib/libuutil.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/libuutil_p.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/libuutil_pic.a base-zfs-shlib zfs,dynamicroot
./usr/lib/libwrap.so.1.0 base-net-shlib
./usr/lib/libz.so.1.0 base-sys-shlib
-./usr/lib/libzfs.so base-zfs-shlib zfs,dynamicroot
-./usr/lib/libzfs.so.0 base-zfs-shlib zfs,dynamicroot
./usr/lib/libzfs.so.0.0 base-zfs-shlib zfs,dynamicroot
-./usr/lib/libzfs.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/libzfs_p.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/libzfs_pic.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/libzpool.so base-zfs-shlib zfs,dynamicroot
-./usr/lib/libzpool.so.0 base-zfs-shlib zfs,dynamicroot
./usr/lib/libzpool.so.0.0 base-zfs-shlib zfs,dynamicroot
-./usr/lib/libzpool.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/libzpool_p.a base-zfs-shlib zfs,dynamicroot
./usr/lib/libzpool_pic.a base-zfs-shlib zfs,dynamicroot
./usr/lib/nss_mdns.so.0 base-mdns-shlib mdns
./usr/lib/security/pam_afslog.so.3 base-sys-shlib kerberos,pam
diff -r 03e9dd8c9ede -r 51e3b71a8453 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Fri Oct 09 00:26:53 2009 +0000
+++ b/distrib/sets/lists/comp/mi Fri Oct 09 00:48:33 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1319 2009/10/05 23:44:10 rmind Exp $
+# $NetBSD: mi,v 1.1320 2009/10/09 00:48:34 haad Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2298,6 +2298,8 @@
./usr/lib/libatf-c_p.a comp-atf-lib profile
./usr/lib/libatf.a comp-obsolete obsolete
./usr/lib/libatf_p.a comp-obsolete obsolete
+./usr/lib/libavl.a comp-zfs-lib zfs
+./usr/lib/libavl_p.a comp-zfs-proflib profile,zfs
./usr/lib/libbfd.a comp-obsolete obsolete
./usr/lib/libbfd_g.a -unknown- debuglib
./usr/lib/libbind9.a comp-bind-lib
@@ -2474,6 +2476,8 @@
./usr/lib/libntp.a comp-obsolete obsolete
./usr/lib/libntp_p.a comp-obsolete obsolete
./usr/lib/libntp_pic.a comp-obsolete obsolete
+./usr/lib/libnvpair.a comp-zfs-lib zfs
+./usr/lib/libnvpair_p.a comp-zfs-proflib profile,zfs
./usr/lib/libobjc.a comp-objc-lib
./usr/lib/libobjc_g.a -unknown- debuglib
./usr/lib/libobjc_p.a comp-objc-proflib profile
@@ -2668,6 +2672,8 @@
./usr/lib/libukfs.a comp-c-lib
./usr/lib/libukfs_g.a -unknown- debuglib
./usr/lib/libukfs_p.a comp-c-proflib profile
+./usr/lib/libumem.a comp-zfs-lib zfs
+./usr/lib/libumem_p.a comp-zfs-proflib profile,zfs
./usr/lib/libusb.a comp-obsolete obsolete
./usr/lib/libusb_p.a comp-obsolete obsolete
./usr/lib/libusb_pic.a comp-obsolete obsolete
@@ -2677,6 +2683,8 @@
./usr/lib/libutil.a comp-c-lib
./usr/lib/libutil_g.a -unknown- debuglib
./usr/lib/libutil_p.a comp-c-proflib profile
+./usr/lib/libuutil.a comp-zfs-lib zfs
+./usr/lib/libuutil_p.a comp-zfs-proflib profile,zfs
./usr/lib/libvers_g.a -unknown- debuglib
./usr/lib/libwrap.a comp-c-lib
./usr/lib/libwrap_g.a -unknown- debuglib
@@ -2687,6 +2695,9 @@
./usr/lib/libz.a comp-c-lib
./usr/lib/libz_g.a -unknown- debuglib
./usr/lib/libz_p.a comp-c-proflib profile
+./usr/lib/libzfs.a comp-zfs-lib zfs
+./usr/lib/libzfs_p.a comp-zfs-proflib profile,zfs
+./usr/lib/libzpool.a comp-zfs-lib zfs
./usr/lib/pkgconfig comp-c-lib
./usr/lib/pkgconfig/atf-c++.pc comp-atf-lib
./usr/lib/pkgconfig/atf-c.pc comp-atf-lib
diff -r 03e9dd8c9ede -r 51e3b71a8453 distrib/sets/lists/comp/shl.mi
--- a/distrib/sets/lists/comp/shl.mi Fri Oct 09 00:26:53 2009 +0000
+++ b/distrib/sets/lists/comp/shl.mi Fri Oct 09 00:48:33 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.89 2009/09/29 23:56:26 tsarna Exp $
+# $NetBSD: shl.mi,v 1.90 2009/10/09 00:48:35 haad Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -8,6 +8,7 @@
./usr/lib/libatf_pic.a comp-obsolete obsolete
./usr/lib/libatf-c_pic.a comp-atf-piclib
./usr/lib/libatf-c++_pic.a comp-atf-piclib
+./usr/lib/libavl_pic.a comp-zfs-piclib zfs
./usr/lib/libbind9_pic.a comp-bind-piclib
./usr/lib/libbluetooth_pic.a comp-c-piclib
./usr/lib/libbsdmalloc_pic.a comp-c-piclib
@@ -61,6 +62,7 @@
./usr/lib/libmagic_pic.a comp-c-piclib
./usr/lib/libmenu_pic.a comp-c-piclib
./usr/lib/libnetpgp_pic.a comp-c-piclib crypto
+./usr/lib/libnvpair_pic.a comp-zfs-piclib zfs
./usr/lib/libobjc_pic.a comp-objc-piclib
./usr/lib/libopcodes.so.3 comp-c-shlib binutils=216
./usr/lib/libopcodes.so.3.0 comp-c-shlib binutils=216
@@ -127,7 +129,10 @@
./usr/lib/libtermcap_pic.a comp-c-piclib
./usr/lib/libtermlib_pic.a comp-c-piclib
./usr/lib/libukfs_pic.a comp-c-piclib
+./usr/lib/libumem_pic.a comp-zfs-piclib zfs
./usr/lib/libusbhid_pic.a comp-c-piclib
./usr/lib/libutil_pic.a comp-c-piclib
+./usr/lib/libuutil_pic.a comp-zfs-piclib zfs
./usr/lib/libwrap_pic.a comp-c-piclib
./usr/lib/libz_pic.a comp-c-piclib
+./usr/lib/libzfs_pic.a comp-zfs-piclib zfs
diff -r 03e9dd8c9ede -r 51e3b71a8453 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Fri Oct 09 00:26:53 2009 +0000
+++ b/distrib/sets/lists/man/mi Fri Oct 09 00:48:33 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1162 2009/10/05 22:32:58 haad Exp $
+# $NetBSD: mi,v 1.1163 2009/10/09 00:48:35 haad Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5061,9 +5061,9 @@
./usr/share/man/html8/zdump.html man-sysutil-htmlman html
./usr/share/man/html8/zic.html man-sysutil-htmlman html
./usr/share/man/html8/zzz.html man-sysutil-htmlman html
-./usr/share/man/html8/zdb.html man-zfs-man zfs
-./usr/share/man/html8/zfs.html man-zfs-man zfs
-./usr/share/man/html8/zpool.html man-zfs-man zfs
+./usr/share/man/html8/zdb.html man-zfs-man zfs,html
+./usr/share/man/html8/zfs.html man-zfs-man zfs,html
+./usr/share/man/html8/zpool.html man-zfs-man zfs,html
./usr/share/man/man1/Mail.1 man-mail-man .man
./usr/share/man/man1/[.1 man-util-man .man
./usr/share/man/man1/alias.1 man-util-man .man
Home |
Main Index |
Thread Index |
Old Index