Module Name: src Committed By: spz Date: Sun Dec 9 22:06:21 UTC 2012
Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 src/etc/mtree: NetBSD.dist.mips64eb NetBSD.dist.mips64el NetBSD.dist.sparc64 NetBSD.dist.x86_64 src/lib/npf/ext_log: Makefile src/lib/npf/ext_normalise: Makefile Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/lists/base/ad.mips64eb \ src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.180 -r1.181 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.169 -r1.170 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.3 -r1.4 src/etc/mtree/NetBSD.dist.mips64eb \ src/etc/mtree/NetBSD.dist.sparc64 src/etc/mtree/NetBSD.dist.x86_64 cvs rdiff -u -r1.4 -r1.5 src/etc/mtree/NetBSD.dist.mips64el cvs rdiff -u -r1.1 -r1.2 src/lib/npf/ext_log/Makefile cvs rdiff -u -r1.1 -r1.2 src/lib/npf/ext_normalise/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.104 src/distrib/sets/lists/base/ad.mips64eb:1.105 --- src/distrib/sets/lists/base/ad.mips64eb:1.104 Tue Dec 4 23:38:57 2012 +++ src/distrib/sets/lists/base/ad.mips64eb Sun Dec 9 22:06:21 2012 @@ -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 Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.104 src/distrib/sets/lists/base/ad.mips64el:1.105 --- src/distrib/sets/lists/base/ad.mips64el:1.104 Tue Dec 4 23:38:57 2012 +++ src/distrib/sets/lists/base/ad.mips64el Sun Dec 9 22:06:21 2012 @@ -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 Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.180 src/distrib/sets/lists/base/md.amd64:1.181 --- src/distrib/sets/lists/base/md.amd64:1.180 Tue Dec 4 23:38:57 2012 +++ src/distrib/sets/lists/base/md.amd64 Sun Dec 9 22:06:21 2012 @@ -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 Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.169 src/distrib/sets/lists/base/md.sparc64:1.170 --- src/distrib/sets/lists/base/md.sparc64:1.169 Tue Dec 4 23:38:57 2012 +++ src/distrib/sets/lists/base/md.sparc64 Sun Dec 9 22:06:21 2012 @@ -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 Index: src/etc/mtree/NetBSD.dist.mips64eb diff -u src/etc/mtree/NetBSD.dist.mips64eb:1.3 src/etc/mtree/NetBSD.dist.mips64eb:1.4 --- src/etc/mtree/NetBSD.dist.mips64eb:1.3 Sat Oct 8 13:14:03 2011 +++ src/etc/mtree/NetBSD.dist.mips64eb Sun Dec 9 22:06:21 2012 @@ -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 Index: src/etc/mtree/NetBSD.dist.sparc64 diff -u src/etc/mtree/NetBSD.dist.sparc64:1.3 src/etc/mtree/NetBSD.dist.sparc64:1.4 --- src/etc/mtree/NetBSD.dist.sparc64:1.3 Sat Oct 8 13:14:03 2011 +++ src/etc/mtree/NetBSD.dist.sparc64 Sun Dec 9 22:06:21 2012 @@ -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 Index: src/etc/mtree/NetBSD.dist.x86_64 diff -u src/etc/mtree/NetBSD.dist.x86_64:1.3 src/etc/mtree/NetBSD.dist.x86_64:1.4 --- src/etc/mtree/NetBSD.dist.x86_64:1.3 Sat Oct 8 13:14:03 2011 +++ src/etc/mtree/NetBSD.dist.x86_64 Sun Dec 9 22:06:21 2012 @@ -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 Index: src/etc/mtree/NetBSD.dist.mips64el diff -u src/etc/mtree/NetBSD.dist.mips64el:1.4 src/etc/mtree/NetBSD.dist.mips64el:1.5 --- src/etc/mtree/NetBSD.dist.mips64el:1.4 Sat Oct 8 13:14:03 2011 +++ src/etc/mtree/NetBSD.dist.mips64el Sun Dec 9 22:06:21 2012 @@ -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 Index: src/lib/npf/ext_log/Makefile diff -u src/lib/npf/ext_log/Makefile:1.1 src/lib/npf/ext_log/Makefile:1.2 --- src/lib/npf/ext_log/Makefile:1.1 Sun Sep 16 13:47:42 2012 +++ src/lib/npf/ext_log/Makefile Sun Dec 9 22:06:21 2012 @@ -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 Index: src/lib/npf/ext_normalise/Makefile diff -u src/lib/npf/ext_normalise/Makefile:1.1 src/lib/npf/ext_normalise/Makefile:1.2 --- src/lib/npf/ext_normalise/Makefile:1.1 Sun Sep 16 13:47:42 2012 +++ src/lib/npf/ext_normalise/Makefile Sun Dec 9 22:06:21 2012 @@ -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