From nobody Tue Nov 28 11:40:53 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 4SfgWV2Hj9z531Jx; Tue, 28 Nov 2023 11:40: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 4SfgWT54f8z3LpZ; Tue, 28 Nov 2023 11:40:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171653; 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=z53zmCbIyBrnCSih7vGx8MsykkSv/CA4eWHgifCkN3Y=; b=lMaSY3gEHkdfLZ0Ggz635FD+uONOhqwS5pn0QQPZt+sOdQ5/aVjsMA81htOJtrgi/HgQsS VqtOg9gidfM5IG6WnJ8bgPanI2cihPx+3lX0lFvlj1Rw9PfKe9tpAbh7NlrnIeSe9NfTxz tWmihXDfQ0IzNJc0DiwaOuBiJjwija5bOzbn4meFWdK1qi2aisYc2AUpc6/598O3/EGvxz CPfg/r5NMbWQ8hMUlgMQ/P6Wpd2AC7qnMebsJ3izfJmG983fR8lljR+o6EgWhbFfw9r0XP RafOH9yusAtrPi3UeqCSjdkNS8OrFcvSBzZEUhn77hvZKbLvSvoXU+3yE60DNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701171653; 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=z53zmCbIyBrnCSih7vGx8MsykkSv/CA4eWHgifCkN3Y=; b=Ydq9+J3mAicr6nLMDKu5kacyuwTdmey6XrzCgMtnaMzENHJMqyHigWlFtwWx19OZCNu5r/ 24eRVnd5SFfKkdEemfvugsmgie/CRkl5ckA75fHdXourOz/rZtZzgRzf80Qk351+7yRVO7 MjDkthymTUnZs2kj8yA/xVzqewxwrfUpDv97IMfyAk1JU7R3SbJjJTD+20pevMu4QiFcRt RwWXY9GudPFW2EIQL08kitfCJXS/A98fz8c6xzPPgo80RujBbbaJF9C14uM7btu20nEZBU B+O4RL3s+s7yhrs1VuNlwT7AOIzHEooJedeVPQKbENXGAzONCVkFqKpcbVhTbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701171653; a=rsa-sha256; cv=none; b=OYnprCsb8k1DhLE0+JDUC8WGh3nZtFuw6xLL6q2++oU8K5W60sm4M15fzGvnhGg+HvDPZ4 PryTosCjgLzD6rEit/PVtXMrjVb+tYJ3miaRAqLt0mcPuyHRDOHXgDV84hAKg5HynHhxUz Z6x5g2KwPloPnfT2YZmv5GsieB0DgtChS7vtEYgoCjuwc8NKWef8rF7WpOQMPZh3fXG6t7 TGlD9XQ4mnaAlCCgtgcZJJylBKd/hH0TagI+V/emyHDzFO4UH6JWvrOUh1xIO8j3G+dq/M U11tLhkYZPM+D2sEegX1lUraSagHZBKXBIvG0HrMqiTdFWOcNaG1NCe53Mu61A== 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 4SfgWT3xYtz571; Tue, 28 Nov 2023 11:40:53 +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 3ASBerVi033275; Tue, 28 Nov 2023 11:40:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASBerkH033272; Tue, 28 Nov 2023 11:40:53 GMT (envelope-from git) Date: Tue, 28 Nov 2023 11:40:53 GMT Message-Id: <202311281140.3ASBerkH033272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 98f8057eaac3 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 98f8057eaac39c56f049f1f6cebddf8c3860046b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=98f8057eaac39c56f049f1f6cebddf8c3860046b commit 98f8057eaac39c56f049f1f6cebddf8c3860046b Author: Konstantin Belousov AuthorDate: 2023-11-18 13:09:30 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-28 11:40:07 +0000 ldconfig: only configure compat32 when kernel supports it (cherry picked from commit 73902ed85ab73d455d4be8c77336c88a07512230) --- 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 }