diff options
| author |   Masahiro Yamada <masahiroy@kernel.org> | 2024-09-07 02:29:14 +0900 |
|---|---|---|
| committer |   Paul Moore <paul@paul-moore.com> | 2024-10-03 16:07:51 -0400 |
| commit | 3b70b66e03b54428d45c3fe9b8693cffcde45bf6 (patch) | |
| tree | 5260796010b865531a07c8acdcba5483921028c5 | |
| parent | selinux: do not include <linux/*.h> headers from host programs (diff) | |
| download | linux-rng-3b70b66e03b54428d45c3fe9b8693cffcde45bf6.tar.xz linux-rng-3b70b66e03b54428d45c3fe9b8693cffcde45bf6.zip | |
selinux: move genheaders to security/selinux/
This tool is only used in security/selinux/Makefile.
Move it to security/selinux/ so that 'make clean' can clean it up.
Please note 'make clean' does not clean scripts/ because tools under
scripts/ are often used for external module builds. Obviously, genheaders
is not the case here.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Paul Moore <paul@paul-moore.com>
| -rwxr-xr-x | scripts/remove-stale-files | 3 | ||||
| -rw-r--r-- | scripts/selinux/Makefile | 2 | ||||
| -rw-r--r-- | scripts/selinux/genheaders/.gitignore | 2 | ||||
| -rw-r--r-- | scripts/selinux/genheaders/Makefile | 3 | ||||
| -rw-r--r-- | security/selinux/.gitignore | 1 | ||||
| -rw-r--r-- | security/selinux/Makefile | 7 | ||||
| -rw-r--r-- | security/selinux/genheaders.c (renamed from scripts/selinux/genheaders/genheaders.c) | 0 |
7 files changed, 10 insertions, 8 deletions
diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files index 8fc55a749ccc..6e39fa8540df 100755 --- a/scripts/remove-stale-files +++ b/scripts/remove-stale-files @@ -20,6 +20,9 @@ set -e # yard. Stale files stay in this file for a while (for some release cycles?), # then will be really dead and removed from the code base entirely. +# moved to security/selinux/genheaders +rm -f scripts/selinux/genheaders/genheaders + rm -f *.spec rm -f lib/test_fortify.log diff --git a/scripts/selinux/Makefile b/scripts/selinux/Makefile index 59494e14989b..4b1308fa5732 100644 --- a/scripts/selinux/Makefile +++ b/scripts/selinux/Makefile @@ -1,2 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -subdir-y := mdp genheaders +subdir-y := mdp diff --git a/scripts/selinux/genheaders/.gitignore b/scripts/selinux/genheaders/.gitignore deleted file mode 100644 index 5fcadd307908..000000000000 --- a/scripts/selinux/genheaders/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -genheaders diff --git a/scripts/selinux/genheaders/Makefile b/scripts/selinux/genheaders/Makefile deleted file mode 100644 index 866f60e78882..000000000000 --- a/scripts/selinux/genheaders/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -hostprogs-always-y += genheaders -HOST_EXTRACFLAGS += -I$(srctree)/security/selinux/include diff --git a/security/selinux/.gitignore b/security/selinux/.gitignore index 168fae13ca5a..01c0df8ab009 100644 --- a/security/selinux/.gitignore +++ b/security/selinux/.gitignore @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only av_permissions.h flask.h +/genheaders diff --git a/security/selinux/Makefile b/security/selinux/Makefile index c47519ed8156..86f0575f670d 100644 --- a/security/selinux/Makefile +++ b/security/selinux/Makefile @@ -36,7 +36,10 @@ quiet_cmd_genhdrs = GEN $(addprefix $(obj)/,$(genhdrs)) # see the note above, replace the $targets and 'flask.h' rule with the lines # below: # targets += $(genhdrs) -# $(addprefix $(obj)/,$(genhdrs)) &: scripts/selinux/... +# $(addprefix $(obj)/,$(genhdrs)) &: $(obj)/genheaders FORCE targets += flask.h -$(obj)/flask.h: scripts/selinux/genheaders/genheaders FORCE +$(obj)/flask.h: $(obj)/genheaders FORCE $(call if_changed,genhdrs) + +hostprogs := genheaders +HOST_EXTRACFLAGS += -I$(srctree)/security/selinux/include diff --git a/scripts/selinux/genheaders/genheaders.c b/security/selinux/genheaders.c index 3834d7eb0af6..3834d7eb0af6 100644 --- a/scripts/selinux/genheaders/genheaders.c +++ b/security/selinux/genheaders.c |