From nobody Wed Dec 13 21:44:20 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 4Sr8Bs0SvBz54MVC; Wed, 13 Dec 2023 21:44: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 4Sr8Br6wFZz3Mtj; Wed, 13 Dec 2023 21:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702503861; 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=OXLAk1wCeyU7n5Blkr5LVInjxMc+XlC2bYqSJsk5JI8=; b=IAMpSN14hxUEHtnsdlphFizH1Hv8z8zMyn1iVuciiWUkdk/p46Sq27ri5r3syII5Y9DdOf 7mr/+PQISw/nae0kAE/0CEnDothqEM496MQjW+0ebVBth1d96KV2GNHIisXXNzBrlwdFzf Sv+YezUKscVg5NvXmtWpvk+JL8jEcoSZ+3JGemLrYFwFiX3xB1DajcwuqRa+wSQLYD7Wxd SYGN0DtSQew/FP59rKhhF3qDzt+7IiZvPdryKDiVWI8/zVctUIKbkhPtehgm7hkMJVdI2c or3/Q7Ep5dVqYyVGi/xya2O80waZ5Pgf8o81V18G1FlZSGnRhSxlTbijOGQbvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702503861; a=rsa-sha256; cv=none; b=Oz8FDkfoKUnzkdo3yIlcaKVhdtrELnG3zkBheNN8KJG+fhSFpPhv4KpZfkew1kCCA1x8Qu G56VTZqnfSrFdqcRyzGx8u1f1T5DdCq8o7Dfk2e4PNmqm10UB8gi6nnXEmvbgK5d7Me1kr g80Zxeg55z1/PeTuldp6Tq0gcA/zK+8IPksO12+Z6obLBRnd301NwD3ec+yrWI2H5dQoqO /UA/mofM0/tJCKDS/9mV3KohN8aqyI+bDhCuJHK9O8KFZlo3bf/dIcs3aGomS+C+HdfQb6 Mut7U8u/R76nZ1ExNrzH0GFA2pgOF2CwQ47QpsozvWL+EDCnoIbNtyR40admwg== 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=1702503861; 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=OXLAk1wCeyU7n5Blkr5LVInjxMc+XlC2bYqSJsk5JI8=; b=QNs0ghtbzzjNmVohABGMkF7Ek5GlIROUQ/wkYr/LnrwZ/DciZXFG1cLPFvOskWZhYRq5ff ecisJTKU+d7C+Rv186U0tnKDPkKszpuPH+dIg2RzHAfEGneJm9Z1pSvrt+NcF2ZHSDVaAb r3FtwnUxXAOYS5i+6EUjCm5oReEqiqfZqEFkzkqvOu+dARteI13l0MjfuNwhB6FG5uUupG qPL9IofbTPW4MyxX6jK7yX566t78IPPowgz0KPjbjNPnymrFo66LhspXs/Yww3yjZxAOov 0DMGxWVx4olDbXeKITF4UR0GXPwlM2/3YOkKtf2u+yQ3zBBMcua8jefEKPf0hg== 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 4Sr8Br5thrz1FWS; Wed, 13 Dec 2023 21:44:20 +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 3BDLiKYa056064; Wed, 13 Dec 2023 21:44:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDLiKOg056061; Wed, 13 Dec 2023 21:44:20 GMT (envelope-from git) Date: Wed, 13 Dec 2023 21:44:20 GMT Message-Id: <202312132144.3BDLiKOg056061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ff7c12c1f17e - main - Make kldxref a bootstrap tool and use unconditionally 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff7c12c1f17e52337169d8ce48433fae96a9c9db Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ff7c12c1f17e52337169d8ce48433fae96a9c9db commit ff7c12c1f17e52337169d8ce48433fae96a9c9db Author: Jessica Clarke AuthorDate: 2023-12-13 21:43:10 +0000 Commit: Jessica Clarke CommitDate: 2023-12-13 21:43:10 +0000 Make kldxref a bootstrap tool and use unconditionally Now that kldxref is a generic cross tool and can be built on non-FreeBSD we can bootstrap it during the build and thus remove the condition for whether it exists. We also need to make sure to add it to the METALOG for -DNO_ROOT builds. Reviewed by: brooks, imp Differential Revision: https://reviews.freebsd.org/D43051 --- Makefile.inc1 | 5 +++++ sys/conf/kmod.mk | 9 +++++---- sys/modules/Makefile | 9 +++++---- tools/build/Makefile | 2 ++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 7b5e7e048a72..e6a6e9d479d3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2410,8 +2410,12 @@ _bootstrap_tools_links+=m4 lex _elftoolchain_libs= lib/libelf lib/libdwarf lib/libzstd ${_bt}-lib/libelf: ${_bt_m4_depend} ${_bt}-lib/libdwarf: ${_bt_m4_depend} +_bt_libelf_depend=${_bt}-lib/libelf .endif +_kldxref= usr.sbin/kldxref +${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend} + # flua is required to regenerate syscall files. It first appeared during the # 13.0-CURRENT cycle, thus needs to be built on -older releases and stable # branches. @@ -2673,6 +2677,7 @@ bootstrap-tools: ${_bt}-links .PHONY ${_cat} \ ${_kbdcontrol} \ ${_elftoolchain_libs} \ + ${_kldxref} \ lib/libopenbsd \ usr.bin/mandoc \ usr.bin/rpcgen \ diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 526872d95dd0..5d4dcd4371bc 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -359,10 +359,11 @@ afterinstall: _kldxref .ORDER: realinstall _kldxref .ORDER: _installlinks _kldxref _kldxref: .PHONY - @if type kldxref >/dev/null 2>&1; then \ - ${ECHO} ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \ - ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \ - fi + ${KLDXREF_CMD} ${DESTDIR}${KMODDIR} +.if defined(NO_ROOT) && defined(METALOG) + echo ".${DISTBASE}${KMODDIR}/linker.hints type=file mode=0644 uname=root gname=wheel" | \ + cat -l >> ${METALOG} +.endif .endif .endif # !target(realinstall) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 112a2f345c94..c14933eebda4 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -911,10 +911,11 @@ SUBDIR:= ${SUBDIR:N${reject}} .if !defined(NO_XREF) .MAKEFLAGS+= -DNO_XREF afterinstall: .PHONY - @if type kldxref >/dev/null 2>&1; then \ - ${ECHO} ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \ - ${KLDXREF_CMD} ${DESTDIR}${KMODDIR}; \ - fi + ${KLDXREF_CMD} ${DESTDIR}${KMODDIR} +.if defined(NO_ROOT) && defined(METALOG) + echo ".${DISTBASE}${KMODDIR}/linker.hints type=file mode=0644 uname=root gname=wheel" | \ + cat -l >> ${METALOG} +.endif .endif SUBDIR:= ${SUBDIR:u:O} diff --git a/tools/build/Makefile b/tools/build/Makefile index 78c46dfeacbc..187d5593564d 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -303,6 +303,8 @@ SYSINCS+= ${SRCTOP}/sys/sys/elf.h SYSINCS+= ${SRCTOP}/sys/sys/ctf.h # for kbdcontrol: SYSINCS+= ${SRCTOP}/sys/sys/kbio.h +# for kldxref: +SYSINCS+= ${SRCTOP}/sys/sys/module.h # We want to run the build with only ${WORLDTMP} in $PATH to ensure we don't # accidentally run tools that are incompatible but happen to be in $PATH.