git: f006023b2281 - main - librt: Chase 315ee00fa961, fixing boot

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Mon, 28 Aug 2023 13:31:38 UTC
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=f006023b2281e179374b56db196d03911fad3680

commit f006023b2281e179374b56db196d03911fad3680
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-08-28 03:02:17 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-08-28 13:31:02 +0000

    librt: Chase 315ee00fa961, fixing boot
    
    libzfs uses librt as a dependency. Following 315ee00fa961 systems with
    a separate / and /usr will fail to load the libzfs.so library because
    librt.so is not available due to the fact that /usr is not mounted yet.
    Install librt in /lib making it available to libzfs.
    
    Reported by:            emaste, imp
    Fixes:                  315ee00fa961
    Differential Revision:  https://reviews.freebsd.org/D41612
---
 ObsoleteFiles.inc  | 3 +++
 lib/librt/Makefile | 1 +
 2 files changed, 4 insertions(+)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index c2780a84eb6d..b901dd2874c1 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20230828
+MOVED_LIBS+=usr/lib/librt.so.1
+
 # 20230826:
 OLD_FILES+=usr/share/man/man9/knlist_remove_inevent.9.gz
 
diff --git a/lib/librt/Makefile b/lib/librt/Makefile
index 9a54c3ea2812..8b880c41ec44 100644
--- a/lib/librt/Makefile
+++ b/lib/librt/Makefile
@@ -3,6 +3,7 @@
 
 PACKAGE=clibs
 LIB=rt
+SHLIBDIR=/lib
 SHLIB_MAJOR= 1
 CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}
 .ifndef NO_THREAD_STACK_UNWIND