From nobody Mon Aug 28 13:31:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RZBKk30M5z4rYhL; Mon, 28 Aug 2023 13:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RZBKk2TTpz4KH2; Mon, 28 Aug 2023 13:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693229498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0EILsmz8sn9Q7+i2aGqMimfZ8fESIRWqOh05TBdKgdw=; b=RxpxycyVFpvRt3dSn3TRDokuzzrVSQEaoagihYhLqGWe3tE5HjbtvKEQiFX/kz8dvHrziW Owuv+UQKz2jvBib7Dzphdy/qAy1P7G3rhkIT0k6i1Pow51ELTcNvtb7NYjHx+7SpIqMlTN ZKe2d9FW6RM7tohQkx2iuPoHBkaznTG+FOZw2DE5aNnD/E+phN0EVxIz0bEBKevCxlr4ZL qzIBLevzlG0c43puQSU4lVCQ0chgKyi4a01XatYrwzwjjg+U+3ZuihaFn2SW/IoU4qPoD6 npPrmeiTAkKUgM8w9s4guGYjChBZ/0lZHsLRPtHUZ4EjAjiB/Ohbn1LlqPxPOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693229498; a=rsa-sha256; cv=none; b=r12Cit4G8ewbMTBySfwzsLwQTM1lQ1JZEkRzRHspl6jNjs6RqbVHYPZLq955tt7R/9XEhQ 5vJSZWd9yEwMuSq5nkv+Cd32vKjZ5y6YIP/It8xK1qfSHHkcglcAlg325VJTqCTPQ1jK9b MRx78MCcz34QkZK0CSDS4Y6+3pAn9Aw4DC++MTZOfQBay0EuQ8dw93TkBd3U8Apg3Nu2RA AX/GXXDBU2+CLBZy9Kstik/c5CuhSZ3vcBrIxRYjX5o4F/7BE2siQVZrtUO7DauhoAqzkd QZ6+JBesi3Op8w9cA1sMg/x7Q1ACdvHiwwhjg7mhrXAnqIRnsu/aoPvAIDcFTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693229498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0EILsmz8sn9Q7+i2aGqMimfZ8fESIRWqOh05TBdKgdw=; b=Eh0X0PhSzgGnTBrw5IQbEdU6xjfN4ti6Lj/cEa2s6dzvNuT/0zUsnciibUEArJwdtkHdt0 dhnCRXluE6AbkkYGD3UZ6YJta2RDd95IkhAoU1ZXSYQZIp30nFygv7ag+Z4m3vCvcqvTzk j4oeEryeh3JnNCCNdn7d+x4GJ8x/FxnEsgiZssIKH41bGINbrk5WgjkW8GYMCik6HYBKmY 3NmtRMZ1LOV1lPAhMCRIVq+AhY7O36YmSW5tIB07TunJGxc0POHkvfEt6+hQZ3/GmxinB9 G3YddKD3PpdCzqU1nSk7p1ECmXP25yaBgGf29Afkrhu+ORVHgJ8toRMRnWwSNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RZBKk1VJZz19Kr; Mon, 28 Aug 2023 13:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37SDVcDV073644; Mon, 28 Aug 2023 13:31:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37SDVcKW073639; Mon, 28 Aug 2023 13:31:38 GMT (envelope-from git) Date: Mon, 28 Aug 2023 13:31:38 GMT Message-Id: <202308281331.37SDVcKW073639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: f006023b2281 - main - librt: Chase 315ee00fa961, fixing boot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f006023b2281e179374b56db196d03911fad3680 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=f006023b2281e179374b56db196d03911fad3680 commit f006023b2281e179374b56db196d03911fad3680 Author: Cy Schubert AuthorDate: 2023-08-28 03:02:17 +0000 Commit: Cy Schubert 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