mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 00:14:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply patch from mario.fetka@gmail.com which fixes the config file for

Browse source 
the module being builtin in 2.6.27, 2.6.28
This commit is contained in:
John Johansen 2008-12-13 10:16:05 +00:00
parent 1910575215
commit 458a6c0418
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
kernel-patches/2.6.28/fix-config-builtin.diff Normal file
View file

@ -0,0 +1,23 @@
---
security/Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/security/Makefile
+++ b/security/Makefile
@@ -5,6 +5,7 @@
obj-$(CONFIG_KEYS) += keys/
subdir-$(CONFIG_SECURITY_SELINUX) += selinux
subdir-$(CONFIG_SECURITY_SMACK) += smack
+subdir-$(CONFIG_SECURITY_APPARMOR) += apparmor
# always enable default capabilities
obj-y += commoncap.o
@@ -14,6 +15,6 @@ obj-$(CONFIG_SECURITY) += security.o c
# Must precede capability.o in order to stack properly.
obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o
obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o
-obj-$(CONFIG_SECURITY_APPARMOR) += commoncap.o apparmor/
- obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o
+obj-$(CONFIG_SECURITY_APPARMOR) += apparmor/built-in.o
+obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o
obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o

1
kernel-patches/2.6.28/series
View file

@ -61,3 +61,4 @@ mount-capability.diff
fix-config.diff
AppArmor-checkpatch.diff
AppArmor-misc-cleanups.diff
fix-config-builtin.diff