From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 83CE51582EF for ; Sat, 08 Mar 2025 23:55:34 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 7037E3430B6 for ; Sat, 08 Mar 2025 23:55:34 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D452F110474; Sat, 08 Mar 2025 23:55:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id C7080110476 for ; Sat, 08 Mar 2025 23:55:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80F83335D6D for ; Sat, 08 Mar 2025 23:55:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0CD028B3 for ; Sat, 08 Mar 2025 23:55:04 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1741476403.16e6bc254d280a3ffa7befe65f272507d01c2a8b.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: / X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 16e6bc254d280a3ffa7befe65f272507d01c2a8b X-VCS-Branch: master Date: Sat, 08 Mar 2025 23:55:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4080d15d-86b5-4919-a6f9-8e7953f80e93 X-Archives-Hash: 500ecb02ae57f3e83cb45dcc9108b491 commit: 16e6bc254d280a3ffa7befe65f272507d01c2a8b Author: Daniel Burgener linux microsoft com> AuthorDate: Fri Feb 14 21:05:23 2025 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sat Mar 8 23:26:43 2025 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=16e6bc25 Don't build the fc subs dist install path in the builtappfiles target The appfiles target is for installing appfiles and also includes the fcsubsdist path. The builtappfiles target only builds locally. This didn't previously cause problems because both appfiles and builtappfiles were built on install only, but 2df7a71b changed the all target to include builtappfiles. Fixes #862 Signed-off-by: Daniel Burgener linux.microsoft.com> Signed-off-by: Jason Zaman gentoo.org> Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a89169946..cf28ca66a 100644 --- a/Makefile +++ b/Makefile @@ -286,7 +286,7 @@ user_default_contexts_names := $(addprefix $(contextpath)/users/,$(subst _defaul appfiles_names := default_contexts default_type initrc_context failsafe_context userhelper_context removable_context dbus_contexts sepgsql_contexts x_contexts customizable_types securetty_types lxc_contexts openrc_contexts virtual_domain_context virtual_image_context appfiles := $(addprefix $(appdir)/,$(appfiles_names)) $(contextpath)/files/media $(fcsubspath) $(user_default_contexts_names) builtappconf := $(tmpdir)/appconfig -builtappfiles := $(addprefix $(builtappconf)/,$(appfiles_names) $(notdir $(user_default_contexts)) media) $(fcsubspath) +builtappfiles := $(addprefix $(builtappconf)/,$(appfiles_names) $(notdir $(user_default_contexts)) media) net_contexts := $(builddir)net_contexts net_contexts_nft := $(builddir)net_contexts.nft docfiles += $(net_contexts) $(net_contexts_nft)