Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e114bbf authored by Michal Marek's avatar Michal Marek
Browse files

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: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent c517d838

security/tomoyo/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ config SECURITY_TOMOYO 
	select SECURITY_PATH

	select SECURITY_PATH

	select SECURITY_NETWORK

	select SECURITY_NETWORK

	select SRCU

	select SRCU

	select BUILD_BIN2C

	default n

	default n

	help

	help

	  This selects TOMOYO Linux, pathname-based access control.

	  This selects TOMOYO Linux, pathname-based access control.

security/tomoyo/Makefile

+10 −10
Original line number Original line Diff line number Diff line
@@ -29,20 +29,20 @@ $(obj)/policy/stat.conf: 
$(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

$(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 Generating built-in policy for TOMOYO 2.5.x.

	@echo "static char tomoyo_builtin_profile[] __initdata =" > $@.tmp

	@echo "static char tomoyo_builtin_profile[] __initdata =" > $@.tmp

	@sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/profile.conf >> $@.tmp

	@$(objtree)/scripts/basic/bin2c < $(obj)/policy/profile.conf >> $@.tmp

	@echo "\"\";" >> $@.tmp

	@echo ";" >> $@.tmp

	@echo "static char tomoyo_builtin_exception_policy[] __initdata =" >> $@.tmp

	@echo "static char tomoyo_builtin_exception_policy[] __initdata =" >> $@.tmp

	@sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/exception_policy.conf >> $@.tmp

	@$(objtree)/scripts/basic/bin2c < $(obj)/policy/exception_policy.conf >> $@.tmp

	@echo "\"\";" >> $@.tmp

	@echo ";" >> $@.tmp

	@echo "static char tomoyo_builtin_domain_policy[] __initdata =" >> $@.tmp

	@echo "static char tomoyo_builtin_domain_policy[] __initdata =" >> $@.tmp

	@sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/domain_policy.conf >> $@.tmp

	@$(objtree)/scripts/basic/bin2c < $(obj)/policy/domain_policy.conf >> $@.tmp

	@echo "\"\";" >> $@.tmp

	@echo ";" >> $@.tmp

	@echo "static char tomoyo_builtin_manager[] __initdata =" >> $@.tmp

	@echo "static char tomoyo_builtin_manager[] __initdata =" >> $@.tmp

	@sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/manager.conf >> $@.tmp

	@$(objtree)/scripts/basic/bin2c < $(obj)/policy/manager.conf >> $@.tmp

	@echo "\"\";" >> $@.tmp

	@echo ";" >> $@.tmp

	@echo "static char tomoyo_builtin_stat[] __initdata =" >> $@.tmp

	@echo "static char tomoyo_builtin_stat[] __initdata =" >> $@.tmp

	@sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/stat.conf >> $@.tmp

	@$(objtree)/scripts/basic/bin2c < $(obj)/policy/stat.conf >> $@.tmp

	@echo "\"\";" >> $@.tmp

	@echo ";" >> $@.tmp

	@mv $@.tmp $@

	@mv $@.tmp $@





$(obj)/common.o: $(obj)/builtin-policy.h
 
$(obj)/common.o: $(obj)/builtin-policy.h