UBUNTU: SAUCE: apparmor: Fix FTBFS due to bad include path

When header files in security/apparmor/includes/ pull in other header
files in that directory, they should only include the file name. This
fixes a build failure reported by Tycho when using `make bindeb-pkg` to
build the Ubuntu kernel tree but, confusingly, isn't seen when building
with `fakeroot debian/rules binary-generic`.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Reported-by: Tycho Andersen <tycho.andersen@canonical.com>
Cc: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/security/apparmor/include/domain.h b/security/apparmor/include/domain.h
index 89cfa757c42efe9c201d47b350c9677a8ac43ea3..b5896558c213bd875a758d5c1c8c0bdc1a468da5 100644 (file)
--- a/security/apparmor/include/domain.h
+++ b/security/apparmor/include/domain.h
@@ -15,7 +15,7 @@
 #include <linux/binfmts.h>
 #include <linux/types.h>
 
-#include "include/label.h"
+#include "label.h"
 
 #ifndef __AA_DOMAIN_H
 #define __AA_DOMAIN_H