Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/etc/mtree openssl compat: Try this again!



details:   https://anonhg.NetBSD.org/src/rev/ed72fe20cb1a
branches:  trunk
changeset: 375304:ed72fe20cb1a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun May 14 11:04:56 2023 +0000

description:
openssl compat: Try this again!

compatdir appears to be for things like /usr/lib that have
/usr/lib/eabi as a subdirectory, so for /usr/lib/openssl it would
mean we have /usr/lib/openssl/eabi as a subdirectory.  But that's not
what we have; we have /usr/lib/eabi/openssl.

Let's try using NetBSD.dist.compat.in instead, which appears to be
intended for this purpose, from what I can gather.

diffstat:

 distrib/sets/lists/base/mi      |  6 +++---
 etc/mtree/NetBSD.dist.compat.in |  4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r f27bac4edc5b -r ed72fe20cb1a distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Sun May 14 11:02:53 2023 +0000
+++ b/distrib/sets/lists/base/mi        Sun May 14 11:04:56 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1318 2023/05/14 07:07:23 mrg Exp $
+# $NetBSD: mi,v 1.1319 2023/05/14 11:04:56 riastradh Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -1210,9 +1210,9 @@
 ./usr/lib/lua/5.4                              base-sys-usr            compatfile
 ./usr/lib/named                                        base-sys-usr
 ./usr/lib/npf                                  base-obsolete           obsolete
-./usr/lib/openssl                              base-crypto-usr         compatdir
+./usr/lib/openssl                              base-crypto-usr
 ./usr/lib/openssl/engines                      base-crypto-usr
-./usr/lib/openssl/modules                      base-crypto-usr         compatdir
+./usr/lib/openssl/modules                      base-crypto-usr
 ./usr/lib/openssl/modules/legacy.so            base-crypto-usr         pic,openssl=30
 ./usr/lib/postfix                              base-postfix-usr
 ./usr/lib/runemodule                           base-obsolete           obsolete
diff -r f27bac4edc5b -r ed72fe20cb1a etc/mtree/NetBSD.dist.compat.in
--- a/etc/mtree/NetBSD.dist.compat.in   Sun May 14 11:02:53 2023 +0000
+++ b/etc/mtree/NetBSD.dist.compat.in   Sun May 14 11:04:56 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.compat.in,v 1.2 2023/04/16 20:46:17 nikita Exp $
+#      $NetBSD: NetBSD.dist.compat.in,v 1.3 2023/05/14 11:04:57 riastradh Exp $
 
 ./lib/@ARCH_SUBDIR@
 ./lib/@ARCH_SUBDIR@/npf
@@ -6,6 +6,8 @@
 ./usr/lib/@ARCH_SUBDIR@/i18n
 ./usr/lib/@ARCH_SUBDIR@/lua
 ./usr/lib/@ARCH_SUBDIR@/lua/5.4
+./usr/lib/@ARCH_SUBDIR@/openssl
+./usr/lib/@ARCH_SUBDIR@/openssl/modules
 ./usr/lib/@ARCH_SUBDIR@/security
 ./usr/libdata/debug/lib/@ARCH_SUBDIR@
 ./usr/libdata/debug/lib/@ARCH_SUBDIR@/npf



Home | Main Index | Thread Index | Old Index