AppArmor: Fix location of const qualifier on generated string tables
authorTetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Thu, 15 Mar 2012 06:41:17 +0000 (23:41 -0700)
committerJohn Johansen <john.johansen@canonical.com>
Tue, 20 Mar 2012 01:22:46 +0000 (18:22 -0700)
Signed-off-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Signed-off-by: John Johansen <john.johansen@canonical.com>
security/apparmor/Makefile

index 7e14edd9ec609c33326bcc51ce8ab41a6067315a..806bd19af7f22b2b2397ed97303b9ca71c3e1c88 100644 (file)
@@ -15,7 +15,7 @@ clean-files := capability_names.h rlim_names.h
 # to
 #    [1] = "dac_override",
 quiet_cmd_make-caps = GEN     $@
-cmd_make-caps = echo "static const char const *capability_names[] = {" > $@ ;\
+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 "};" >> $@
@@ -43,7 +43,7 @@ cmd_make-caps = echo "static const char const *capability_names[] = {" > $@ ;\
 # to
 # #define AA_FS_RLIMIT_MASK "fsize stack"
 quiet_cmd_make-rlim = GEN     $@
-cmd_make-rlim = echo "static const char const *rlim_names[RLIM_NLIMITS] = {" \
+cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \
        > $@ ;\
        sed $< >> $@ -r -n \
            -e 's/^\# ?define[ \t]+(RLIMIT_([A-Z0-9_]+)).*/[\1] = "\L\2",/p';\