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

tomoyo: Use bin2c to generate builtin-policy.h

Simplify the Makefile by using a readily available tool instead of a
custom sed script. The downside is that builtin-policy.h becomes
unreadable for humans, but it is only a generated file.

Acked-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Michal Marek <mmarek@suse.cz>

Michal Marek 7e114bbf c517d838

+11 -10
+1
security/tomoyo/Kconfig
··· 6 6 select SECURITY_PATH 7 7 select SECURITY_NETWORK 8 8 select SRCU 9 + select BUILD_BIN2C 9 10 default n 10 11 help 11 12 This selects TOMOYO Linux, pathname-based access control.
+10 -10
security/tomoyo/Makefile
··· 29 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 30 @echo Generating built-in policy for TOMOYO 2.5.x. 31 31 @echo "static char tomoyo_builtin_profile[] __initdata =" > $@.tmp 32 - @sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/profile.conf >> $@.tmp 33 - @echo "\"\";" >> $@.tmp 32 + @$(objtree)/scripts/basic/bin2c < $(obj)/policy/profile.conf >> $@.tmp 33 + @echo ";" >> $@.tmp 34 34 @echo "static char tomoyo_builtin_exception_policy[] __initdata =" >> $@.tmp 35 - @sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/exception_policy.conf >> $@.tmp 36 - @echo "\"\";" >> $@.tmp 35 + @$(objtree)/scripts/basic/bin2c < $(obj)/policy/exception_policy.conf >> $@.tmp 36 + @echo ";" >> $@.tmp 37 37 @echo "static char tomoyo_builtin_domain_policy[] __initdata =" >> $@.tmp 38 - @sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/domain_policy.conf >> $@.tmp 39 - @echo "\"\";" >> $@.tmp 38 + @$(objtree)/scripts/basic/bin2c < $(obj)/policy/domain_policy.conf >> $@.tmp 39 + @echo ";" >> $@.tmp 40 40 @echo "static char tomoyo_builtin_manager[] __initdata =" >> $@.tmp 41 - @sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/manager.conf >> $@.tmp 42 - @echo "\"\";" >> $@.tmp 41 + @$(objtree)/scripts/basic/bin2c < $(obj)/policy/manager.conf >> $@.tmp 42 + @echo ";" >> $@.tmp 43 43 @echo "static char tomoyo_builtin_stat[] __initdata =" >> $@.tmp 44 - @sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/stat.conf >> $@.tmp 45 - @echo "\"\";" >> $@.tmp 44 + @$(objtree)/scripts/basic/bin2c < $(obj)/policy/stat.conf >> $@.tmp 45 + @echo ";" >> $@.tmp 46 46 @mv $@.tmp $@ 47 47 48 48 $(obj)/common.o: $(obj)/builtin-policy.h