Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Make the compat libs of npf extension shared libraries go to...
details: https://anonhg.NetBSD.org/src/rev/05b459550fee
branches: trunk
changeset: 783172:05b459550fee
user: spz <spz%NetBSD.org@localhost>
date: Sun Dec 09 22:06:21 2012 +0000
description:
Make the compat libs of npf extension shared libraries go to the
compat directories instead of overwriting the arch native libs.
Also, make sure the compat directories get created. Tested on amd64.
diffstat:
distrib/sets/lists/base/ad.mips64eb | 16 +++++++++++++++-
distrib/sets/lists/base/ad.mips64el | 16 +++++++++++++++-
distrib/sets/lists/base/md.amd64 | 9 ++++++++-
distrib/sets/lists/base/md.sparc64 | 9 ++++++++-
etc/mtree/NetBSD.dist.mips64eb | 4 +++-
etc/mtree/NetBSD.dist.mips64el | 4 +++-
etc/mtree/NetBSD.dist.sparc64 | 3 ++-
etc/mtree/NetBSD.dist.x86_64 | 3 ++-
lib/npf/ext_log/Makefile | 12 ++++++++++--
lib/npf/ext_normalise/Makefile | 12 ++++++++++--
10 files changed, 76 insertions(+), 12 deletions(-)
diffs (238 lines):
diff -r 7cf51ec830dd -r 05b459550fee distrib/sets/lists/base/ad.mips64eb
--- a/distrib/sets/lists/base/ad.mips64eb Sun Dec 09 21:48:04 2012 +0000
+++ b/distrib/sets/lists/base/ad.mips64eb Sun Dec 09 22:06:21 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.104 2012/12/04 23:38:57 spz Exp $
+# $NetBSD: ad.mips64eb,v 1.105 2012/12/09 22:06:21 spz Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -290,6 +290,13 @@
./usr/lib/64/lua/5.1 base-compat-shlib compat
./usr/lib/64/lua/5.1/gpio.so base-compat-shlib compat,pic
./usr/lib/64/lua/5.1/sqlite.so base-compat-shlib compat,pic
+./usr/lib/64/npf base-npf-shlib compat
+./usr/lib/64/npf/ext_log.so base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_log.so.0 base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_log.so.0.0 base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_normalise.so base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_normalise.so.0 base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_normalise.so.0.0 base-npf-shlib compat,pic
./usr/lib/64/security base-compat-shlib
./usr/lib/64/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam
./usr/lib/64/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam
@@ -596,6 +603,13 @@
./usr/lib/o32/lua/5.1 base-compat-shlib compat
./usr/lib/o32/lua/5.1/gpio.so base-compat-shlib compat,pic
./usr/lib/o32/lua/5.1/sqlite.so base-compat-shlib compat,pic
+./usr/lib/o32/npf base-npf-shlib compat
+./usr/lib/o32/npf/ext_log.so base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_log.so.0 base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_log.so.0.0 base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_normalise.so base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_normalise.so.0 base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_normalise.so.0.0 base-npf-shlib compat,pic
./usr/lib/o32/security base-compat-shlib
./usr/lib/o32/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam
./usr/lib/o32/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam
diff -r 7cf51ec830dd -r 05b459550fee distrib/sets/lists/base/ad.mips64el
--- a/distrib/sets/lists/base/ad.mips64el Sun Dec 09 21:48:04 2012 +0000
+++ b/distrib/sets/lists/base/ad.mips64el Sun Dec 09 22:06:21 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.104 2012/12/04 23:38:57 spz Exp $
+# $NetBSD: ad.mips64el,v 1.105 2012/12/09 22:06:21 spz Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -290,6 +290,13 @@
./usr/lib/64/lua/5.1 base-compat-shlib compat
./usr/lib/64/lua/5.1/gpio.so base-compat-shlib compat,pic
./usr/lib/64/lua/5.1/sqlite.so base-compat-shlib compat,pic
+./usr/lib/64/npf base-npf-shlib compat
+./usr/lib/64/npf/ext_log.so base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_log.so.0 base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_log.so.0.0 base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_normalise.so base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_normalise.so.0 base-npf-shlib compat,pic
+./usr/lib/64/npf/ext_normalise.so.0.0 base-npf-shlib compat,pic
./usr/lib/64/security base-compat-shlib
./usr/lib/64/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam
./usr/lib/64/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam
@@ -596,6 +603,13 @@
./usr/lib/o32/lua/5.1 base-compat-shlib compat
./usr/lib/o32/lua/5.1/gpio.so base-compat-shlib compat,pic
./usr/lib/o32/lua/5.1/sqlite.so base-compat-shlib compat,pic
+./usr/lib/o32/npf base-npf-shlib compat
+./usr/lib/o32/npf/ext_log.so base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_log.so.0 base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_log.so.0.0 base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_normalise.so base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_normalise.so.0 base-npf-shlib compat,pic
+./usr/lib/o32/npf/ext_normalise.so.0.0 base-npf-shlib compat,pic
./usr/lib/o32/security base-compat-shlib
./usr/lib/o32/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam
./usr/lib/o32/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam
diff -r 7cf51ec830dd -r 05b459550fee distrib/sets/lists/base/md.amd64
--- a/distrib/sets/lists/base/md.amd64 Sun Dec 09 21:48:04 2012 +0000
+++ b/distrib/sets/lists/base/md.amd64 Sun Dec 09 22:06:21 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.180 2012/12/04 23:38:57 spz Exp $
+# $NetBSD: md.amd64,v 1.181 2012/12/09 22:06:21 spz Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -293,6 +293,13 @@
./usr/lib/i386/lua/5.1 base-compat-shlib compat
./usr/lib/i386/lua/5.1/gpio.so base-compat-shlib compat,pic
./usr/lib/i386/lua/5.1/sqlite.so base-compat-shlib compat,pic
+./usr/lib/i386/npf base-npf-shlib compat
+./usr/lib/i386/npf/ext_log.so base-npf-shlib compat,pic
+./usr/lib/i386/npf/ext_log.so.0 base-npf-shlib compat,pic
+./usr/lib/i386/npf/ext_log.so.0.0 base-npf-shlib compat,pic
+./usr/lib/i386/npf/ext_normalise.so base-npf-shlib compat,pic
+./usr/lib/i386/npf/ext_normalise.so.0 base-npf-shlib compat,pic
+./usr/lib/i386/npf/ext_normalise.so.0.0 base-npf-shlib compat,pic
./usr/lib/i386/security base-compat-shlib compat
./usr/lib/i386/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos,pam
./usr/lib/i386/security/pam_chroot.so.3 base-compat-shlib compat,pic,pam
diff -r 7cf51ec830dd -r 05b459550fee distrib/sets/lists/base/md.sparc64
--- a/distrib/sets/lists/base/md.sparc64 Sun Dec 09 21:48:04 2012 +0000
+++ b/distrib/sets/lists/base/md.sparc64 Sun Dec 09 22:06:21 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.169 2012/12/04 23:38:57 spz Exp $
+# $NetBSD: md.sparc64,v 1.170 2012/12/09 22:06:21 spz Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
@@ -291,6 +291,13 @@
./usr/lib/sparc/lua/5.1 base-compat-shlib compat
./usr/lib/sparc/lua/5.1/gpio.so base-compat-shlib compat,pic
./usr/lib/sparc/lua/5.1/sqlite.so base-compat-shlib compat,pic
+./usr/lib/sparc/npf base-npf-shlib compat
+./usr/lib/sparc/npf/ext_log.so base-npf-shlib compat,pic
+./usr/lib/sparc/npf/ext_log.so.0 base-npf-shlib compat,pic
+./usr/lib/sparc/npf/ext_log.so.0.0 base-npf-shlib compat,pic
+./usr/lib/sparc/npf/ext_normalise.so base-npf-shlib compat,pic
+./usr/lib/sparc/npf/ext_normalise.so.0 base-npf-shlib compat,pic
+./usr/lib/sparc/npf/ext_normalise.so.0.0 base-npf-shlib compat,pic
./usr/lib/sparc/security base-compat-shlib compat
./usr/lib/sparc/security/pam_afslog.so.3 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/security/pam_chroot.so.3 base-compat-shlib compat,pic
diff -r 7cf51ec830dd -r 05b459550fee etc/mtree/NetBSD.dist.mips64eb
--- a/etc/mtree/NetBSD.dist.mips64eb Sun Dec 09 21:48:04 2012 +0000
+++ b/etc/mtree/NetBSD.dist.mips64eb Sun Dec 09 22:06:21 2012 +0000
@@ -1,14 +1,16 @@
-# $NetBSD: NetBSD.dist.mips64eb,v 1.3 2011/10/08 13:14:03 mbalmer Exp $
+# $NetBSD: NetBSD.dist.mips64eb,v 1.4 2012/12/09 22:06:21 spz Exp $
./usr/lib/o32
./usr/lib/o32/i18n
./usr/lib/o32/lua
./usr/lib/o32/lua/5.1
+./usr/lib/o32/npf
./usr/lib/o32/security
./usr/lib/64
./usr/lib/64/i18n
./usr/lib/64/lua
./usr/lib/64/lua/5.1
+./usr/lib/64/npf
./usr/lib/64/security
./usr/libdata/debug/usr/lib/o32
./usr/libdata/debug/usr/lib/o32/i18n
diff -r 7cf51ec830dd -r 05b459550fee etc/mtree/NetBSD.dist.mips64el
--- a/etc/mtree/NetBSD.dist.mips64el Sun Dec 09 21:48:04 2012 +0000
+++ b/etc/mtree/NetBSD.dist.mips64el Sun Dec 09 22:06:21 2012 +0000
@@ -1,14 +1,16 @@
-# $NetBSD: NetBSD.dist.mips64el,v 1.4 2011/10/08 13:14:03 mbalmer Exp $
+# $NetBSD: NetBSD.dist.mips64el,v 1.5 2012/12/09 22:06:21 spz Exp $
./usr/lib/o32
./usr/lib/o32/i18n
./usr/lib/o32/lua
./usr/lib/o32/lua/5.1
+./usr/lib/o32/npf
./usr/lib/o32/security
./usr/lib/64
./usr/lib/64/i18n
./usr/lib/64/lua
./usr/lib/64/lua/5.1
+./usr/lib/64/npf
./usr/lib/64/security
./usr/libdata/debug/usr/lib/o32
./usr/libdata/debug/usr/lib/o32/i18n
diff -r 7cf51ec830dd -r 05b459550fee etc/mtree/NetBSD.dist.sparc64
--- a/etc/mtree/NetBSD.dist.sparc64 Sun Dec 09 21:48:04 2012 +0000
+++ b/etc/mtree/NetBSD.dist.sparc64 Sun Dec 09 22:06:21 2012 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: NetBSD.dist.sparc64,v 1.3 2011/10/08 13:14:03 mbalmer Exp $
+# $NetBSD: NetBSD.dist.sparc64,v 1.4 2012/12/09 22:06:21 spz Exp $
./usr/lib/sparc
./usr/lib/sparc/i18n
./usr/lib/sparc/lua
./usr/lib/sparc/lua/5.1
+./usr/lib/sparc/npf
./usr/lib/sparc/security
./usr/libdata/debug/usr/lib/sparc
./usr/libdata/debug/usr/lib/sparc/i18n
diff -r 7cf51ec830dd -r 05b459550fee etc/mtree/NetBSD.dist.x86_64
--- a/etc/mtree/NetBSD.dist.x86_64 Sun Dec 09 21:48:04 2012 +0000
+++ b/etc/mtree/NetBSD.dist.x86_64 Sun Dec 09 22:06:21 2012 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: NetBSD.dist.x86_64,v 1.3 2011/10/08 13:14:03 mbalmer Exp $
+# $NetBSD: NetBSD.dist.x86_64,v 1.4 2012/12/09 22:06:21 spz Exp $
./usr/lib/i386
./usr/lib/i386/i18n
./usr/lib/i386/lua
./usr/lib/i386/lua/5.1
+./usr/lib/i386/npf
./usr/lib/i386/security
./usr/libdata/debug/usr/lib/i386
./usr/libdata/debug/usr/lib/i386/i18n
diff -r 7cf51ec830dd -r 05b459550fee lib/npf/ext_log/Makefile
--- a/lib/npf/ext_log/Makefile Sun Dec 09 21:48:04 2012 +0000
+++ b/lib/npf/ext_log/Makefile Sun Dec 09 22:06:21 2012 +0000
@@ -1,9 +1,17 @@
-# $NetBSD: Makefile,v 1.1 2012/09/16 13:47:42 rmind Exp $
+# $NetBSD: Makefile,v 1.2 2012/12/09 22:06:21 spz Exp $
.include <bsd.own.mk>
LIBISMODULE= yes
-LIBDIR= /usr/lib/npf
+.if defined(MLIBDIR)
+LIBDIR= /usr/lib/${MLIBDIR}/npf
+SHLIBDIR= /usr/lib/${MLIBDIR}/npf
+SHLIBINSTALLDIR=/usr/lib/${MLIBDIR}/npf
+.else
+LIBDIR= /usr/lib/npf
+SHLIBDIR= /usr/lib/npf
+SHLIBINSTALLDIR=/usr/lib/npf
+.endif
LIB= ext_log
diff -r 7cf51ec830dd -r 05b459550fee lib/npf/ext_normalise/Makefile
--- a/lib/npf/ext_normalise/Makefile Sun Dec 09 21:48:04 2012 +0000
+++ b/lib/npf/ext_normalise/Makefile Sun Dec 09 22:06:21 2012 +0000
@@ -1,9 +1,17 @@
-# $NetBSD: Makefile,v 1.1 2012/09/16 13:47:42 rmind Exp $
+# $NetBSD: Makefile,v 1.2 2012/12/09 22:06:21 spz Exp $
.include <bsd.own.mk>
LIBISMODULE= yes
-LIBDIR= /usr/lib/npf
+.if defined(MLIBDIR)
+LIBDIR= /usr/lib/${MLIBDIR}/npf
+SHLIBDIR= /usr/lib/${MLIBDIR}/npf
+SHLIBINSTALLDIR=/usr/lib/${MLIBDIR}/npf
+.else
+LIBDIR= /usr/lib/npf
+SHLIBDIR= /usr/lib/npf
+SHLIBINSTALLDIR=/usr/lib/npf
+.endif
LIB= ext_normalise
Home |
Main Index |
Thread Index |
Old Index