Skip to content

Commit 3b70b66

Browse files
masahir0ypcmoore
authored andcommitted
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 <[email protected]> Signed-off-by: Paul Moore <[email protected]>
1 parent 541b57e commit 3b70b66

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

scripts/remove-stale-files

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ set -e
2020
# yard. Stale files stay in this file for a while (for some release cycles?),
2121
# then will be really dead and removed from the code base entirely.
2222

23+
# moved to security/selinux/genheaders
24+
rm -f scripts/selinux/genheaders/genheaders
25+
2326
rm -f *.spec
2427

2528
rm -f lib/test_fortify.log

scripts/selinux/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
subdir-y := mdp genheaders
2+
subdir-y := mdp

scripts/selinux/genheaders/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/selinux/genheaders/Makefile

Lines changed: 0 additions & 3 deletions
This file was deleted.

security/selinux/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
av_permissions.h
33
flask.h
4+
/genheaders

security/selinux/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ quiet_cmd_genhdrs = GEN $(addprefix $(obj)/,$(genhdrs))
3636
# see the note above, replace the $targets and 'flask.h' rule with the lines
3737
# below:
3838
# targets += $(genhdrs)
39-
# $(addprefix $(obj)/,$(genhdrs)) &: scripts/selinux/...
39+
# $(addprefix $(obj)/,$(genhdrs)) &: $(obj)/genheaders FORCE
4040
targets += flask.h
41-
$(obj)/flask.h: scripts/selinux/genheaders/genheaders FORCE
41+
$(obj)/flask.h: $(obj)/genheaders FORCE
4242
$(call if_changed,genhdrs)
43+
44+
hostprogs := genheaders
45+
HOST_EXTRACFLAGS += -I$(srctree)/security/selinux/include

0 commit comments

Comments
 (0)