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

Commit 651e5495 authored by Thomas Schneider's avatar Thomas Schneider Committed by John Johansen
Browse files

security/apparmor: Use POSIX-compatible "printf '%s'" 



When using a strictly POSIX-compliant shell, "-n #define ..." gets
written into the file.  Use "printf '%s'" to avoid this.

Signed-off-by: default avatarThomas Schneider <qsx@qsx.re>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent ffac1de6

security/apparmor/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ cmd_make-caps = echo "static const char *const capability_names[] = {" > $@ ;\ 
	sed $< >>$@ -r -n -e '/CAP_FS_MASK/d' \

	-e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\

	echo "};" >> $@ ;\

	echo -n '\#define AA_FS_CAPS_MASK "' >> $@ ;\

	printf '%s' '\#define AA_FS_CAPS_MASK "' >> $@ ;\

	sed $< -r -n -e '/CAP_FS_MASK/d' \

	    -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/\L\1/p' | \

	     tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
@@ -56,7 +56,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \ 
	echo "static const int rlim_map[RLIM_NLIMITS] = {" >> $@ ;\

	sed -r -n "s/^\# ?define[ \t]+(RLIMIT_[A-Z0-9_]+).*/\1,/p" $< >> $@ ;\

	echo "};" >> $@ ; \

	echo -n '\#define AA_FS_RLIMIT_MASK "' >> $@ ;\

	printf '%s' '\#define AA_FS_RLIMIT_MASK "' >> $@ ;\

	sed -r -n 's/^\# ?define[ \t]+RLIMIT_([A-Z0-9_]+).*/\L\1/p' $< | \

	    tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@