Messages in this thread Patch in this message | | | Subject | [PATCH] Fix SELinux build for "make O=..." | From | Stephen Smalley <> | Date | Fri, 19 Dec 2003 09:57:09 -0500 |
| |
This patch against 2.6.0 fixes the SELinux build for "make O=..." by removing the use of -include and eliminating the global.h file, adding appropriate individual #include's to the various files in the security/selinux/ss subdirectory. The compilation error was reported by Sam Ravnborg and again by Adrian Bunk. Please apply, or let me know if you want it resubmitted later. Thanks.
security/selinux/ss/Makefile | 3 +-- security/selinux/ss/avtab.c | 4 ++++ security/selinux/ss/ebitmap.c | 3 +++ security/selinux/ss/global.h | 18 ------------------ security/selinux/ss/hashtab.c | 3 +++ security/selinux/ss/mls.c | 4 ++++ security/selinux/ss/policydb.c | 5 +++++ security/selinux/ss/services.c | 11 +++++++++++ security/selinux/ss/sidtab.c | 6 ++++++ security/selinux/ss/symtab.c | 4 ++++ 10 files changed, 41 insertions(+), 20 deletions(-)
Index: linux-2.6/security/selinux/ss/Makefile diff -u linux-2.6/security/selinux/ss/Makefile:1.1.1.1 linux-2.6/security/selinux/ss/Makefile:1.6 --- linux-2.6/security/selinux/ss/Makefile:1.1.1.1 Tue Aug 12 09:05:06 2003 +++ linux-2.6/security/selinux/ss/Makefile Tue Oct 28 09:08:27 2003 @@ -2,8 +2,7 @@ # Makefile for building the SELinux security server as part of the kernel tree. # -EXTRA_CFLAGS += -Isecurity/selinux/include -include security/selinux/ss/global.h - +EXTRA_CFLAGS += -Isecurity/selinux/include obj-y := ss.o ss-objs := ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o Index: linux-2.6/security/selinux/ss/avtab.c diff -u linux-2.6/security/selinux/ss/avtab.c:1.1.1.2 linux-2.6/security/selinux/ss/avtab.c:1.15 --- linux-2.6/security/selinux/ss/avtab.c:1.1.1.2 Tue Sep 9 08:50:50 2003 +++ linux-2.6/security/selinux/ss/avtab.c Tue Oct 28 09:08:27 2003 @@ -3,6 +3,10 @@ * * Author : Stephen Smalley, <sds@epoch.ncsc.mil> */ +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/vmalloc.h> +#include <linux/errno.h> #include "avtab.h" #include "policydb.h" Index: linux-2.6/security/selinux/ss/ebitmap.c diff -u linux-2.6/security/selinux/ss/ebitmap.c:1.1.1.2 linux-2.6/security/selinux/ss/ebitmap.c:1.13 --- linux-2.6/security/selinux/ss/ebitmap.c:1.1.1.2 Tue Sep 9 08:50:50 2003 +++ linux-2.6/security/selinux/ss/ebitmap.c Tue Oct 28 09:08:27 2003 @@ -3,6 +3,9 @@ * * Author : Stephen Smalley, <sds@epoch.ncsc.mil> */ +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/errno.h> #include "ebitmap.h" #include "policydb.h" Index: linux-2.6/security/selinux/ss/global.h diff -u linux-2.6/security/selinux/ss/global.h:1.1.1.3 linux-2.6/security/selinux/ss/global.h:removed --- linux-2.6/security/selinux/ss/global.h:1.1.1.3 Tue Sep 9 08:50:51 2003 +++ linux-2.6/security/selinux/ss/global.h Tue Oct 28 09:13:31 2003 @@ -1,18 +0,0 @@ -#ifndef _SS_GLOBAL_H_ -#define _SS_GLOBAL_H_ - -#include <linux/kernel.h> -#include <linux/slab.h> -#include <linux/string.h> -#include <linux/ctype.h> -#include <linux/in.h> -#include <linux/spinlock.h> -#include <linux/sched.h> -#include <linux/vmalloc.h> - -#include "flask.h" -#include "avc.h" -#include "avc_ss.h" -#include "security.h" - -#endif /* _SS_GLOBAL_H_ */ Index: linux-2.6/security/selinux/ss/hashtab.c diff -u linux-2.6/security/selinux/ss/hashtab.c:1.1.1.1 linux-2.6/security/selinux/ss/hashtab.c:1.7 --- linux-2.6/security/selinux/ss/hashtab.c:1.1.1.1 Tue Aug 12 09:05:08 2003 +++ linux-2.6/security/selinux/ss/hashtab.c Tue Oct 28 09:08:27 2003 @@ -3,6 +3,9 @@ * * Author : Stephen Smalley, <sds@epoch.ncsc.mil> */ +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/errno.h> #include "hashtab.h" struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, void *key), Index: linux-2.6/security/selinux/ss/mls.c diff -u linux-2.6/security/selinux/ss/mls.c:1.1.1.2 linux-2.6/security/selinux/ss/mls.c:1.18 --- linux-2.6/security/selinux/ss/mls.c:1.1.1.2 Mon Sep 29 09:14:40 2003 +++ linux-2.6/security/selinux/ss/mls.c Tue Oct 28 09:08:27 2003 @@ -3,6 +3,10 @@ * * Author : Stephen Smalley, <sds@epoch.ncsc.mil> */ +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/string.h> +#include <linux/errno.h> #include "mls.h" #include "policydb.h" #include "services.h" Index: linux-2.6/security/selinux/ss/policydb.c diff -u linux-2.6/security/selinux/ss/policydb.c:1.1.1.4 linux-2.6/security/selinux/ss/policydb.c:1.26 --- linux-2.6/security/selinux/ss/policydb.c:1.1.1.4 Mon Sep 29 09:14:41 2003 +++ linux-2.6/security/selinux/ss/policydb.c Tue Oct 28 09:08:27 2003 @@ -3,6 +3,11 @@ * * Author : Stephen Smalley, <sds@epoch.ncsc.mil> */ +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/string.h> +#include <linux/errno.h> +#include "security.h" #include "policydb.h" #include "mls.h" Index: linux-2.6/security/selinux/ss/services.c diff -u linux-2.6/security/selinux/ss/services.c:1.1.1.2 linux-2.6/security/selinux/ss/services.c:1.30 --- linux-2.6/security/selinux/ss/services.c:1.1.1.2 Thu Oct 9 08:48:31 2003 +++ linux-2.6/security/selinux/ss/services.c Tue Oct 28 09:08:27 2003 @@ -10,6 +10,17 @@ * it under the terms of the GNU General Public License version 2, * as published by the Free Software Foundation. */ +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/string.h> +#include <linux/spinlock.h> +#include <linux/errno.h> +#include <linux/in.h> +#include <asm/semaphore.h> +#include "flask.h" +#include "avc.h" +#include "avc_ss.h" +#include "security.h" #include "context.h" #include "policydb.h" #include "sidtab.h" Index: linux-2.6/security/selinux/ss/sidtab.c diff -u linux-2.6/security/selinux/ss/sidtab.c:1.1.1.1 linux-2.6/security/selinux/ss/sidtab.c:1.13 --- linux-2.6/security/selinux/ss/sidtab.c:1.1.1.1 Tue Aug 12 09:05:07 2003 +++ linux-2.6/security/selinux/ss/sidtab.c Tue Oct 28 09:08:27 2003 @@ -3,6 +3,12 @@ * * Author : Stephen Smalley, <sds@epoch.ncsc.mil> */ +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/spinlock.h> +#include <linux/errno.h> +#include "flask.h" +#include "security.h" #include "sidtab.h" #define SIDTAB_HASH(sid) \ Index: linux-2.6/security/selinux/ss/symtab.c diff -u linux-2.6/security/selinux/ss/symtab.c:1.1.1.1 linux-2.6/security/selinux/ss/symtab.c:1.5 --- linux-2.6/security/selinux/ss/symtab.c:1.1.1.1 Tue Aug 12 09:05:08 2003 +++ linux-2.6/security/selinux/ss/symtab.c Tue Oct 28 09:08:27 2003 @@ -3,6 +3,10 @@ * * Author : Stephen Smalley, <sds@epoch.ncsc.mil> */ +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/string.h> +#include <linux/errno.h> #include "symtab.h" static unsigned int symhash(struct hashtab *h, void *key) -- Stephen Smalley <sds@epoch.ncsc.mil> National Security Agency
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |