diff --git a/kernel-patches/2.6.27/fix-config-builtin.diff b/kernel-patches/2.6.27/fix-config-builtin.diff new file mode 100644 index 000000000..37d997477 --- /dev/null +++ b/kernel-patches/2.6.27/fix-config-builtin.diff @@ -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 diff --git a/kernel-patches/2.6.27/series b/kernel-patches/2.6.27/series index 1cae793d9..09a79a8ea 100644 --- a/kernel-patches/2.6.27/series +++ b/kernel-patches/2.6.27/series @@ -61,3 +61,4 @@ mount-capability.diff fix-config.diff AppArmor-checkpatch.diff AppArmor-misc-cleanups.diff +fix-config-builtin.diff