summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2015-01-09 14:36:27 +0100
committerMichal Marek <mmarek@suse.cz>2015-04-07 21:27:45 +0200
commitbf7a9ab43c2f692bce4ee3ed1456f42c77eb1346 (patch)
treece26f199c1b32a207cbb925748b49b1f3f50a786
parent7e114bbf51fbb015dc25d8123e090afcce5b5048 (diff)
tomoyo: Use if_changed when generating builtin-policy.h
Combine the generation of builtin-policy.h into a single command and use if_changed, so that the file is regenerated each time the command changes. The next patch will make use of this. Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--security/tomoyo/Makefile29
1 files changed, 11 insertions, 18 deletions
diff --git a/security/tomoyo/Makefile b/security/tomoyo/Makefile
index a6c02a5948b6..ecdefb583fcf 100644
--- a/security/tomoyo/Makefile
+++ b/security/tomoyo/Makefile
@@ -26,23 +26,16 @@ $(obj)/policy/stat.conf:
@echo Creating an empty policy/stat.conf
@touch $@
-$(obj)/builtin-policy.h: $(obj)/policy/profile.conf $(obj)/policy/exception_policy.conf $(obj)/policy/domain_policy.conf $(obj)/policy/manager.conf $(obj)/policy/stat.conf
- @echo Generating built-in policy for TOMOYO 2.5.x.
- @echo "static char tomoyo_builtin_profile[] __initdata =" > $@.tmp
- @$(objtree)/scripts/basic/bin2c < $(obj)/policy/profile.conf >> $@.tmp
- @echo ";" >> $@.tmp
- @echo "static char tomoyo_builtin_exception_policy[] __initdata =" >> $@.tmp
- @$(objtree)/scripts/basic/bin2c < $(obj)/policy/exception_policy.conf >> $@.tmp
- @echo ";" >> $@.tmp
- @echo "static char tomoyo_builtin_domain_policy[] __initdata =" >> $@.tmp
- @$(objtree)/scripts/basic/bin2c < $(obj)/policy/domain_policy.conf >> $@.tmp
- @echo ";" >> $@.tmp
- @echo "static char tomoyo_builtin_manager[] __initdata =" >> $@.tmp
- @$(objtree)/scripts/basic/bin2c < $(obj)/policy/manager.conf >> $@.tmp
- @echo ";" >> $@.tmp
- @echo "static char tomoyo_builtin_stat[] __initdata =" >> $@.tmp
- @$(objtree)/scripts/basic/bin2c < $(obj)/policy/stat.conf >> $@.tmp
- @echo ";" >> $@.tmp
- @mv $@.tmp $@
+targets += builtin-policy.h
+define do_policy
+echo "static char tomoyo_builtin_$(1)[] __initdata ="; \
+$(objtree)/scripts/basic/bin2c <$(obj)/policy/$(1).conf; \
+echo ";"
+endef
+quiet_cmd_policy = POLICY $@
+ cmd_policy = ($(call do_policy,profile); $(call do_policy,exception_policy); $(call do_policy,domain_policy); $(call do_policy,manager); $(call do_policy,stat)) >$@
+
+$(obj)/builtin-policy.h: $(obj)/policy/profile.conf $(obj)/policy/exception_policy.conf $(obj)/policy/domain_policy.conf $(obj)/policy/manager.conf $(obj)/policy/stat.conf FORCE
+ $(call if_changed,policy)
$(obj)/common.o: $(obj)/builtin-policy.h