Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+11 -18
+11 -18
security/tomoyo/Makefile
··· 26 26 @echo Creating an empty policy/stat.conf 27 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 30 - @echo Generating built-in policy for TOMOYO 2.5.x. 31 - @echo "static char tomoyo_builtin_profile[] __initdata =" > $@.tmp 32 - @$(objtree)/scripts/basic/bin2c < $(obj)/policy/profile.conf >> $@.tmp 33 - @echo ";" >> $@.tmp 34 - @echo "static char tomoyo_builtin_exception_policy[] __initdata =" >> $@.tmp 35 - @$(objtree)/scripts/basic/bin2c < $(obj)/policy/exception_policy.conf >> $@.tmp 36 - @echo ";" >> $@.tmp 37 - @echo "static char tomoyo_builtin_domain_policy[] __initdata =" >> $@.tmp 38 - @$(objtree)/scripts/basic/bin2c < $(obj)/policy/domain_policy.conf >> $@.tmp 39 - @echo ";" >> $@.tmp 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 $@ 29 + targets += builtin-policy.h 30 + define do_policy 31 + echo "static char tomoyo_builtin_$(1)[] __initdata ="; \ 32 + $(objtree)/scripts/basic/bin2c <$(obj)/policy/$(1).conf; \ 33 + echo ";" 34 + endef 35 + quiet_cmd_policy = POLICY $@ 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 + 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 + $(call if_changed,policy) 47 40 48 41 $(obj)/common.o: $(obj)/builtin-policy.h