From nobody Wed May 10 00:20:37 2023 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 4QGFzn4rZzz49lNX; Wed, 10 May 2023 00:20:37 +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 4QGFzn4R2mz3pCV; Wed, 10 May 2023 00:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683678037; 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=037Mpi3xixoe5hy6pJdKvniNh0laAD8pj5gc2z1jSXQ=; b=bMX0zvbAuuVpEuRlZ0wLyyfIvqVEcSZFw557fK1Ksq72FDDqFFlSuXPa+MCEiY/PED2RoL +6a7tiENux8+qcwZR5APJLbQOfaZEAURcUMWmmQ+hZN2KYcvNqM4YcfK0TpssPrXAPaloy 6yfN9ENeBJlgrJgWoArlrHrM+CbBlmiR9LnAsiTPnv7HcX1a6LQSxZRp+qVri/QQAVk3Fq 7j5P3bDdvgmpR6O0GrYvlhDNGs44hitppXKhtKHMEljNhZhhdyDSyjW40vk6N8Jx3Q4srR 3aEbeA2wAjicPeJqrfcob0pGtXNM0mDYeuI88m4udPNIpKD22Yy8dtiXtM4OyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683678037; 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=037Mpi3xixoe5hy6pJdKvniNh0laAD8pj5gc2z1jSXQ=; b=Sjzy89dfW6DWSfsMnXpfiXLBb1aPG7o0tBP/BQEn4YNoGciFJ6v9N22po5tglYzSHrBzBH NjK+Hc21hbyJosKvQw5oc63hlXrBEBtMu0Xfgt/vdjklAemMdcbtWalXiSp2Y1emBSPRgJ RfNLe+NOZwGB1Dudtn55ua4OtrBl3T84BcU6x+O5ZEIa39pPPK1jXFs6GzeTW2M9jeWClN dxXSSOdtvGj2UY1/2741m+DUQuDmv7acs7LgOvK/YXdFEP2iRdjZENIk0uhFvUlVm9za// FXWYg3NjWx7lFjFqUap0qPp7yfLWt7LYFPcaaER4gR0QsPhq2eqXdZCQw/lGbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683678037; a=rsa-sha256; cv=none; b=aZ4Y5BOHLHsRgDF4MG5GapCKN9JPK+Juk/iQFU88iQIfiBZMjT7yjS764eNhuIFWOyBgMU vnslU8MUgIpD4IBfl4gzvE7GgJL0LaKFfZOLIXMU+KJiNehptAwra7FbxiEUHXpdIotwfF xMsHrlJkv0dTpkhApKY9DI9QtUfd73SU01w3qWkpcOrgRwDkC5dWTQnBtRKMxxFlDqGP9f NAM4xW9OsZfBpYnzCtCAdmDwJvbEwuHRewi8TOFYasn9SZ7nY6b3ia7w+8flvZDKcbnSDv B1rpxp2CVO1M/hYb2QGRd9EPhFq3RidiUOh4M7pAoBa6SIDaAWZaseXDsaiTQg== 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 4QGFzn3W4Zzp7v; Wed, 10 May 2023 00:20:37 +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 34A0KbKX097795; Wed, 10 May 2023 00:20:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A0Kbd0097794; Wed, 10 May 2023 00:20:37 GMT (envelope-from git) Date: Wed, 10 May 2023 00:20:37 GMT Message-Id: <202305100020.34A0Kbd0097794@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e32fecd0c2c3 - main - loader: install help files only once 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e32fecd0c2c3ee37c47ee100f169e7eb0282a873 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e32fecd0c2c3ee37c47ee100f169e7eb0282a873 commit e32fecd0c2c3ee37c47ee100f169e7eb0282a873 Author: Ed Maste AuthorDate: 2023-05-05 17:43:33 +0000 Commit: Ed Maste CommitDate: 2023-05-10 00:18:19 +0000 loader: install help files only once Every file should be installed exactly once by `make installworld`. This is especially important for pkgbase. Loader help files were being installed by each loader variant (e.g., the simp, lua, and 4th EFI loaders). Add a (slightly hacky) mechanism to skip installing help files for all but one variant. PR: 271178 Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40021 --- stand/efi/loader_4th/Makefile | 1 + stand/efi/loader_lua/Makefile | 1 + stand/i386/loader_4th/Makefile | 1 + stand/i386/loader_lua/Makefile | 1 + stand/loader.mk | 2 ++ stand/userboot/userboot_4th/Makefile | 1 + stand/userboot/userboot_lua/Makefile | 1 + 7 files changed, 8 insertions(+) diff --git a/stand/efi/loader_4th/Makefile b/stand/efi/loader_4th/Makefile index 3659f7efe673..a85fcdbb70b9 100644 --- a/stand/efi/loader_4th/Makefile +++ b/stand/efi/loader_4th/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ LOADER_INTERP=4th +INSTALL_LOADER_HELP_FILE=no .include "../loader/Makefile" diff --git a/stand/efi/loader_lua/Makefile b/stand/efi/loader_lua/Makefile index 3a4268440cf6..3766588015ad 100644 --- a/stand/efi/loader_lua/Makefile +++ b/stand/efi/loader_lua/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ LOADER_INTERP=lua +INSTALL_LOADER_HELP_FILE=no .include "../loader/Makefile" diff --git a/stand/i386/loader_4th/Makefile b/stand/i386/loader_4th/Makefile index 3659f7efe673..a85fcdbb70b9 100644 --- a/stand/i386/loader_4th/Makefile +++ b/stand/i386/loader_4th/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ LOADER_INTERP=4th +INSTALL_LOADER_HELP_FILE=no .include "../loader/Makefile" diff --git a/stand/i386/loader_lua/Makefile b/stand/i386/loader_lua/Makefile index 3a4268440cf6..3766588015ad 100644 --- a/stand/i386/loader_lua/Makefile +++ b/stand/i386/loader_lua/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ LOADER_INTERP=lua +INSTALL_LOADER_HELP_FILE=no .include "../loader/Makefile" diff --git a/stand/loader.mk b/stand/loader.mk index b30e9f4e66b7..2048fec750e4 100644 --- a/stand/loader.mk +++ b/stand/loader.mk @@ -171,8 +171,10 @@ CFLAGS+= -DELF_VERBOSE HELP_FILES+= ${LDRSRC}/help.common CFLAGS+= -DHELP_FILENAME=\"${HELP_FILENAME}\" +.if ${INSTALL_LOADER_HELP_FILE:Uyes} == "yes" CLEANFILES+= ${HELP_FILENAME} FILES+= ${HELP_FILENAME} +.endif ${HELP_FILENAME}: ${HELP_FILES} cat ${HELP_FILES} | awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} diff --git a/stand/userboot/userboot_4th/Makefile b/stand/userboot/userboot_4th/Makefile index a96efa8a52ba..b4b4b895e29b 100644 --- a/stand/userboot/userboot_4th/Makefile +++ b/stand/userboot/userboot_4th/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ LOADER_INTERP=4th +INSTALL_LOADER_HELP_FILE=no .include "../userboot/Makefile" diff --git a/stand/userboot/userboot_lua/Makefile b/stand/userboot/userboot_lua/Makefile index d5b95c53641b..bba0f4a3fd71 100644 --- a/stand/userboot/userboot_lua/Makefile +++ b/stand/userboot/userboot_lua/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ LOADER_INTERP=lua +INSTALL_LOADER_HELP_FILE=no .include "../userboot/Makefile"