From nobody Fri Nov 24 16:39:21 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 4ScLKj417lz52QH8; Fri, 24 Nov 2023 16:39:21 +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 4ScLKj3Z2Yz3YCZ; Fri, 24 Nov 2023 16:39:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700843961; 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=NuZutdHbyEpAvoCtIo1VhmWwcK3DB9pmg6ghiNWTzH0=; b=jPOkFXCPqz9mX3mItNbNvA53whnezK0wQo8ozorZJhjORidAHrfHEB5PycpdWt94Hjy/pe 2Wyf7Fiyx1+4S7+8qgzTQknCxblgEyMM3RYS9YG8a31JbWwc1XzRFexHS9wDmw2fQnOFkq SIgkdJdAmaDG0oCSbFL6mt2CAoD4tSu+qOuzUW+T1p/T5BamWatW5YHg3BGvehwPgu/L3C 0H8IGMyiu1+YIN+1HNHVZjN27sEf6Ja08Ee162Z8p3seLp2QwtjlVXXmB3QeKsOeeKfj7e EZK2ar8xYg+s4zItwFvuCBUNQQqdS5dma4MGwhNaiBfG4EfRpbQJ7ckrKK4/Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700843961; 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=NuZutdHbyEpAvoCtIo1VhmWwcK3DB9pmg6ghiNWTzH0=; b=hmO9r8PEAKmcJmUrXWfdCuSrlrCksvt83h54tKR33b3F99I4oXJp/S3jo1GFgsaZtnD//G vRn/SoH941YPQk7f0qXWkOi6QQbTBYtDu2EsekSUiwM6Iu0ALV2duHcEHUqcrqj2Qnkc2F VAolQphydmfnSFRpgLQjtVIrKW+IgmNLNws9NGouZgHJySHD/CwGogJL4woRZh3xSsnc3s 34Lw0FpnkBNX8NnA1aejKzj8likaq94gjpYgbJzCaU6B7VnvT2pzJvOyXYEeU8H1rJ+bxh BEOSNfv3wREXBtNdP6Gdpf+VrOnLwX+040n2HU34Xmj9Pbs6PBZsKh7OllopcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700843961; a=rsa-sha256; cv=none; b=EN5edROXcUIHI8FiIKUD70lheORAUFKlVYXfVknHd4KCXsIsSUDGo/ngDqfv8XdwCYHPnf LrIQZN9YBiqFaUfQ8ns30numFxWdOrvl9pA+VrQ+SglujMbr9NOP5hja/6f3+ca8dPZPFN vucahHiVUNozth/23lFGe2OFNA7vaJbrLnvKsJ/RY+nlRqBZ9WlawVi1RamwnCITb9q34Y RfXAEof0NSieZl4upKIXgZtv2bhFBQjK7hUBNZH/WYR/hSNbQbcVkXX/cQWWLWBwbwO+ZC 4uVA347b0mAtGhr8PmSrWCzvVXfZbHZuz+j55OvoVtTiiZIp0LTegYbHSyxJ1Q== 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 4ScLKj2dqjzsLC; Fri, 24 Nov 2023 16:39:21 +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 3AOGdLZw068159; Fri, 24 Nov 2023 16:39:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AOGdLJn068156; Fri, 24 Nov 2023 16:39:21 GMT (envelope-from git) Date: Fri, 24 Nov 2023 16:39:21 GMT Message-Id: <202311241639.3AOGdLJn068156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 73902ed85ab7 - main - ldconfig: only configure compat32 when kernel supports it 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73902ed85ab73d455d4be8c77336c88a07512230 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=73902ed85ab73d455d4be8c77336c88a07512230 commit 73902ed85ab73d455d4be8c77336c88a07512230 Author: Konstantin Belousov AuthorDate: 2023-11-18 13:09:30 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-24 16:38:42 +0000 ldconfig: only configure compat32 when kernel supports it and eliminate hard-coded arch list. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42669 --- libexec/rc/rc.d/ldconfig | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index ed3484017d84..beb79ba95b84 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -39,10 +39,7 @@ ldconfig_start() startmsg 'ELF ldconfig path:' ${_LDC} ${ldconfig} -elf ${_ins} ${_LDC} - machine_arch=$(sysctl -n hw.machine_arch) - - case ${machine_arch} in - aarch64|amd64|powerpc64) + if check_kern_features compat_freebsd32; then for i in ${ldconfig_local32_dirs}; do if [ -d "${i}" ]; then _files=`find ${i} -type f` @@ -67,7 +64,7 @@ ldconfig_start() startmsg '32-bit compatibility ldconfig path:' ${_LDC} ${ldconfig} -32 ${_ins} ${_LDC} ;; - esac + fi fi }