diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-03-19 21:52:17 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-03-19 21:52:17 -0400 |
| commit | 09f61cdbb32a9d812c618d3922db533542736bb0 (patch) | |
| tree | 90d8e9163e269d0ed9e01f0dac500316014b88c5 /security | |
| parent | 7d7473dbdb9121dd1b5939566660d51130ecda3a (diff) | |
| parent | 7e570145cb022beeb58e3f691e0418477b670223 (diff) | |
Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor into next
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile index 7e14edd9ec60..806bd19af7f2 100644 --- a/security/apparmor/Makefile +++ b/security/apparmor/Makefile | |||
| @@ -15,7 +15,7 @@ clean-files := capability_names.h rlim_names.h | |||
| 15 | # to | 15 | # to |
| 16 | # [1] = "dac_override", | 16 | # [1] = "dac_override", |
| 17 | quiet_cmd_make-caps = GEN $@ | 17 | quiet_cmd_make-caps = GEN $@ |
| 18 | cmd_make-caps = echo "static const char const *capability_names[] = {" > $@ ;\ | 18 | cmd_make-caps = echo "static const char *const capability_names[] = {" > $@ ;\ |
| 19 | sed $< >>$@ -r -n -e '/CAP_FS_MASK/d' \ | 19 | sed $< >>$@ -r -n -e '/CAP_FS_MASK/d' \ |
| 20 | -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\ | 20 | -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\ |
| 21 | echo "};" >> $@ | 21 | echo "};" >> $@ |
| @@ -43,7 +43,7 @@ cmd_make-caps = echo "static const char const *capability_names[] = {" > $@ ;\ | |||
| 43 | # to | 43 | # to |
| 44 | # #define AA_FS_RLIMIT_MASK "fsize stack" | 44 | # #define AA_FS_RLIMIT_MASK "fsize stack" |
| 45 | quiet_cmd_make-rlim = GEN $@ | 45 | quiet_cmd_make-rlim = GEN $@ |
| 46 | cmd_make-rlim = echo "static const char const *rlim_names[RLIM_NLIMITS] = {" \ | 46 | cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \ |
| 47 | > $@ ;\ | 47 | > $@ ;\ |
| 48 | sed $< >> $@ -r -n \ | 48 | sed $< >> $@ -r -n \ |
| 49 | -e 's/^\# ?define[ \t]+(RLIMIT_([A-Z0-9_]+)).*/[\1] = "\L\2",/p';\ | 49 | -e 's/^\# ?define[ \t]+(RLIMIT_([A-Z0-9_]+)).*/[\1] = "\L\2",/p';\ |