On 10/14/2016 12:29 PM, Thomas Schneider wrote:
> When using a strictly POSIX-compliant shell, "-n #define ..." gets
> written into the file.  Use "printf '%s'" to avoid this.
> 
> Signed-off-by: Thomas Schneider <q...@qsx.re>
Acked-by: John Johansen <john.johan...@canonical.com>

> ---
>  security/apparmor/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
> index d693df8..8f575d1 100644
> --- a/security/apparmor/Makefile
> +++ b/security/apparmor/Makefile
> @@ -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/' >> $@
>  
> 


-- 
AppArmor mailing list
AppArmor@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/apparmor

Reply via email to