From nobody Fri Jan 07 05:46:53 2022 X-Original-To: dev-commits-src-main@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 F3C491935BAE; Fri, 7 Jan 2022 05:46:54 +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 4JVXKT5SjYz3tB6; Fri, 7 Jan 2022 05:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 86B4A2D974; Fri, 7 Jan 2022 05:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2075krik007356; Fri, 7 Jan 2022 05:46:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2075krZW007355; Fri, 7 Jan 2022 05:46:53 GMT (envelope-from git) Date: Fri, 7 Jan 2022 05:46:53 GMT Message-Id: <202201070546.2075krZW007355@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d418bc27e601 - main - libsoft: Remove runtime ldconfig support for libsoft List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d418bc27e601ec6bba0506d0efb62eca5eda5ab8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641534414; 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=j77ekvMjPG/51m5HzTZAfYQmTBGqcKwiw8tFFoJ6DIQ=; b=OvfDJLgj6X1pkzvKCZtQcuBYcbIhjGFucHv8dTQ7EdJPodL2XcX5n9uTpVuHTL1Hrdo4uO 7jsfsN+ZFP/x5UOc0wasBGV57Q3iRZ334NEDoObnl7qTwBWrbHePKf8SsCUU8XS2dPthta mvZoeLCOScyvo5t4UcS79wV5mz7sbWkC6CT3FCXnqkmGkHUx83N8wjI9ix1XiNYjerk6Zh lo3iFSmK702xCxRBzO8E6tcaU2Vi6LAhbxToffCJTvBZNzFCqX3IyJ0VfGEUMULIHqEWm7 wx4n0kOIHzzfQ2gDbPSCC8CP9c/39Tus9utRTIFjBeXyDA1LR2vkFpn5URynaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641534414; a=rsa-sha256; cv=none; b=Q7BFOiWJjmSdCd06rG9W3JgPFaEZ9wB7SXitGwobzVwXcDQgcf+g98fa6g8EgUjjT0Y6UA k3OfOXdwkyt1ED7jMJhCs0oIo0HPXUaYP9YovUUpoiN7cU7PI5jq/M4Dqpq9bp9mnojceM EKQ+I1KVvUg6oZXG8vhU6d/GOQL0u/LjJrWMeusNIDMiY51D4yB0Sm8YBpmlmTozYMuwRM OgUioA9RZ6tew3oJo2S9yc86Jvf52rIrU+z1m/dxQXmGWGL/UrPXXWYXzW1AwUhzwQmDt0 0TWxvxbx32UtvhiI+e3lZch0WI9PHrtV8BzNXmjMe4sKASiOIg5xidtzGZ+gEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d418bc27e601ec6bba0506d0efb62eca5eda5ab8 commit d418bc27e601ec6bba0506d0efb62eca5eda5ab8 Author: Warner Losh AuthorDate: 2022-01-07 05:34:18 +0000 Commit: Warner Losh CommitDate: 2022-01-07 05:34:18 +0000 libsoft: Remove runtime ldconfig support for libsoft Remove the runtime support for running ldconfig at boot to cache lists of libsoft libbraries. Sponsored by: Netflix --- libexec/rc/rc.conf | 6 ------ libexec/rc/rc.d/ldconfig | 21 --------------------- 2 files changed, 27 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index c6f1218ed98d..c2941c770b56 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -652,17 +652,11 @@ ldconfig_paths="/usr/lib/compat ${_localbase}/lib ${_localbase}/lib/compat/pkg" # shared library search paths ldconfig32_paths="/usr/lib32 /usr/lib32/compat" # 32-bit compatibility shared library search paths -ldconfigsoft_paths="/usr/libsoft /usr/libsoft/compat ${_localbase}/libsoft" - # soft float compatibility shared library search paths - # Note: temporarily with extra stuff for transition ldconfig_local_dirs="${_localbase}/libdata/ldconfig" # Local directories with ldconfig configuration files. ldconfig_local32_dirs="${_localbase}/libdata/ldconfig32" # Local directories with 32-bit compatibility ldconfig # configuration files. -ldconfig_localsoft_dirs="${_localbase}/libdata/ldconfigsoft" - # Local directories with soft float compatibility ldconfig - # configuration files. kern_securelevel_enable="NO" # kernel security level (see security(7)) kern_securelevel="-1" # range: -1..3 ; `-1' is the most insecure # Note that setting securelevel to 0 will result diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index 03627df6da06..39c5f0f2a46d 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -64,27 +64,6 @@ ldconfig_start() ;; esac - case ${machine_arch} in - armv[67]) - for i in ${ldconfig_localsoft_dirs}; do - if [ -d "${i}" ]; then - _files=`find ${i} -type f` - if [ -n "${_files}" ]; then - ldconfigsoft_paths="${ldconfigsoft_paths} `cat ${_files} | sort -u`" - fi - fi - done - _LDC="" - for i in ${ldconfigsoft_paths}; do - if [ -r "${i}" ]; then - _LDC="${_LDC} ${i}" - fi - done - check_startmsgs && - echo 'Soft Float compatibility ldconfig path:' ${_LDC} - ${ldconfig} -soft ${_ins} ${_LDC} - ;; - esac fi }