lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1420816134-12758-3-git-send-email-mmarek@suse.cz>
Date:	Fri,  9 Jan 2015 16:08:53 +0100
From:	Michal Marek <mmarek@...e.cz>
To:	Tetsuo Handa <penguin-kernel@...ove.SAKURA.ne.jp>,
	tomoyo-dev-en@...ts.sourceforge.jp
Cc:	linux-kernel@...r.kernel.org
Subject: [PATCH 2/3] tomoyo: Use if_changed when generating builtin-policy.h

Signed-off-by: Michal Marek <mmarek@...e.cz>
---
 security/tomoyo/Makefile | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/security/tomoyo/Makefile b/security/tomoyo/Makefile
index a6c02a5..ccca034 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 $@
 
+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
-	@echo Generating built-in policy for TOMOYO 2.5.x.
-	@echo "static char tomoyo_builtin_profile[] __initdata =" > $@...p
-	@$(objtree)/scripts/basic/bin2c < $(obj)/policy/profile.conf >> $@...p
-	@echo ";" >> $@...p
-	@echo "static char tomoyo_builtin_exception_policy[] __initdata =" >> $@...p
-	@$(objtree)/scripts/basic/bin2c < $(obj)/policy/exception_policy.conf >> $@...p
-	@echo ";" >> $@...p
-	@echo "static char tomoyo_builtin_domain_policy[] __initdata =" >> $@...p
-	@$(objtree)/scripts/basic/bin2c < $(obj)/policy/domain_policy.conf >> $@...p
-	@echo ";" >> $@...p
-	@echo "static char tomoyo_builtin_manager[] __initdata =" >> $@...p
-	@$(objtree)/scripts/basic/bin2c < $(obj)/policy/manager.conf >> $@...p
-	@echo ";" >> $@...p
-	@echo "static char tomoyo_builtin_stat[] __initdata =" >> $@...p
-	@$(objtree)/scripts/basic/bin2c < $(obj)/policy/stat.conf >> $@...p
-	@echo ";" >> $@...p
-	@mv $@...p $@
+	$(call if_changed,policy)
 
 $(obj)/common.o: $(obj)/builtin-policy.h
-- 
2.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ