diff options
| author | Michal Marek <mmarek@suse.cz> | 2015-01-09 08:36:27 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2015-04-07 15:27:45 -0400 |
| commit | bf7a9ab43c2f692bce4ee3ed1456f42c77eb1346 (patch) | |
| tree | ce26f199c1b32a207cbb925748b49b1f3f50a786 /security | |
| parent | 7e114bbf51fbb015dc25d8123e090afcce5b5048 (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>
Diffstat (limited to 'security')
| -rw-r--r-- | security/tomoyo/Makefile | 29 |
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: | |||
| 26 | @echo Creating an empty policy/stat.conf | 26 | @echo Creating an empty policy/stat.conf |
| 27 | @touch $@ | 27 | @touch $@ |
| 28 | 28 | ||
| 29 | $(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 | 29 | targets += builtin-policy.h |
| 30 | @echo Generating built-in policy for TOMOYO 2.5.x. | 30 | define do_policy |
| 31 | @echo "static char tomoyo_builtin_profile[] __initdata =" > $@.tmp | 31 | echo "static char tomoyo_builtin_$(1)[] __initdata ="; \ |
| 32 | @$(objtree)/scripts/basic/bin2c < $(obj)/policy/profile.conf >> $@.tmp | 32 | $(objtree)/scripts/basic/bin2c <$(obj)/policy/$(1).conf; \ |
| 33 | @echo ";" >> $@.tmp | 33 | echo ";" |
| 34 | @echo "static char tomoyo_builtin_exception_policy[] __initdata =" >> $@.tmp | 34 | endef |
| 35 | @$(objtree)/scripts/basic/bin2c < $(obj)/policy/exception_policy.conf >> $@.tmp | 35 | quiet_cmd_policy = POLICY $@ |
| 36 | @echo ";" >> $@.tmp | 36 | cmd_policy = ($(call do_policy,profile); $(call do_policy,exception_policy); $(call do_policy,domain_policy); $(call do_policy,manager); $(call do_policy,stat)) >$@ |
| 37 | @echo "static char tomoyo_builtin_domain_policy[] __initdata =" >> $@.tmp | 37 | |
| 38 | @$(objtree)/scripts/basic/bin2c < $(obj)/policy/domain_policy.conf >> $@.tmp | 38 | $(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 |
| 39 | @echo ";" >> $@.tmp | 39 | $(call if_changed,policy) |
| 40 | @echo "static char tomoyo_builtin_manager[] __initdata =" >> $@.tmp | ||
| 41 | @$(objtree)/scripts/basic/bin2c < $(obj)/policy/manager.conf >> $@.tmp | ||
| 42 | @echo ";" >> $@.tmp | ||
| 43 | @echo "static char tomoyo_builtin_stat[] __initdata =" >> $@.tmp | ||
| 44 | @$(objtree)/scripts/basic/bin2c < $(obj)/policy/stat.conf >> $@.tmp | ||
| 45 | @echo ";" >> $@.tmp | ||
| 46 | @mv $@.tmp $@ | ||
| 47 | 40 | ||
| 48 | $(obj)/common.o: $(obj)/builtin-policy.h | 41 | $(obj)/common.o: $(obj)/builtin-policy.h |