Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	package/freeradius-server/Makefile
	package/nss/patches/patch-mozilla_security_coreconf_Linux_mk

10 files changed, 73 insertions, 240 deletions

diff --git a/toolchain/kernel-headers/patches/2.6.34/etrax-header.patch b/toolchain/kernel-headers/patches/2.6.34/etrax-header.patch
deleted file mode 100644
index 3672cf60b..000000000
--- a/toolchain/kernel-headers/patches/2.6.34/etrax-header.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Nur linux-2.6.31.4.orig/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.31.4/arch/cris/include/arch-v10/arch/Kbuild
---- linux-2.6.31.4.orig/arch/cris/include/arch-v10/arch/Kbuild	2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/arch/cris/include/arch-v10/arch/Kbuild	2009-10-25 09:57:06.167232146 +0100
-@@ -1,4 +1,9 @@
-+header-y += dma.h
-+header-y += io_interface_mux.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
- header-y += sv_addr.agh
-+header-y += elf.h
-+header-y += page.h
-+header-y += ptrace.h
-diff -Nur linux-2.6.31.4.orig/arch/cris/include/arch-v32/arch/Kbuild linux-2.6.31.4/arch/cris/include/arch-v32/arch/Kbuild
---- linux-2.6.31.4.orig/arch/cris/include/arch-v32/arch/Kbuild	2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/arch/cris/include/arch-v32/arch/Kbuild	2009-10-25 09:57:06.167232146 +0100
-@@ -1,2 +1,6 @@
- header-y += user.h
- header-y += cryptocop.h
-+header-y += elf.h
-+header-y += page.h
-+header-y += ptrace.h
-+
-diff -Nur linux-2.6.31.4.orig/arch/cris/include/asm/Kbuild linux-2.6.31.4/arch/cris/include/asm/Kbuild
---- linux-2.6.31.4.orig/arch/cris/include/asm/Kbuild	2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/arch/cris/include/asm/Kbuild	2009-10-25 09:57:06.167232146 +0100
-@@ -1,11 +1,14 @@
- include include/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- 
-+header-y += elf.h
- header-y += ethernet.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += page.h
-+header-y += user.h
- 
- unifdef-y += etraxgpio.h
- unifdef-y += rs485.h
-diff -Nur linux-2.6.31.4.orig/include/asm-generic/Kbuild linux-2.6.31.4/include/asm-generic/Kbuild
---- linux-2.6.31.4.orig/include/asm-generic/Kbuild	2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/include/asm-generic/Kbuild	2009-10-25 10:00:20.743354404 +0100
-@@ -3,12 +3,15 @@
- header-y += errno-base.h
- header-y += errno.h
- header-y += fcntl.h
-+header-y += getorder.h
- header-y += ioctl.h
- header-y += ioctls.h
- header-y += ipcbuf.h
-+header-y += memory_model.h
- header-y += mman-common.h
- header-y += mman.h
- header-y += msgbuf.h
-+header-y += page.h
- header-y += param.h
- header-y += poll.h
- header-y += posix_types.h
-diff -Nur linux-2.6.31.4.orig/include/linux/Kbuild linux-2.6.31.4/include/linux/Kbuild
---- linux-2.6.31.4.orig/include/linux/Kbuild	2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/include/linux/Kbuild	2009-10-25 09:57:06.207234174 +0100
-@@ -160,6 +160,7 @@
- header-y += udf_fs_i.h
- header-y += ultrasound.h
- header-y += un.h
-+header-y += user.h
- header-y += utime.h
- header-y += veth.h
- header-y += videotext.h
diff --git a/toolchain/kernel-headers/patches/2.6.34/scsi-header.patch b/toolchain/kernel-headers/patches/2.6.34/scsi-header.patch
deleted file mode 100644
index 9173b242d..000000000
--- a/toolchain/kernel-headers/patches/2.6.34/scsi-header.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Nur linux-2.6.32.orig/include/scsi/Kbuild linux-2.6.32/include/scsi/Kbuild
---- linux-2.6.32.orig/include/scsi/Kbuild	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/include/scsi/Kbuild	2009-12-03 19:46:03.000000000 +0100
-@@ -1,3 +1,5 @@
-+header-y += sg.h
-+header-y += scsi_ioctl.h
- header-y += scsi.h
- header-y += scsi_netlink.h
- header-y += scsi_netlink_fc.h
-diff -Nur linux-2.6.32.orig/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h
---- linux-2.6.32.orig/include/scsi/scsi.h	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/include/scsi/scsi.h	2009-12-03 19:47:49.000000000 +0100
-@@ -143,6 +143,8 @@
- 
- #define SCSI_MAX_VARLEN_CDB_SIZE 260
- 
-+#ifdef __KERNEL__
-+
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
- 	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-@@ -169,6 +171,8 @@
- 		scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
- }
- 
-+#endif
-+
- /*
-  *  SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
-  *  T10/1561-D Revision 4 Draft dated 7th November 2002.
-@@ -284,8 +288,10 @@
- 	SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
- };
- 
-+#ifdef __KERNEL__
- /* Returns a human-readable name for the device */
- extern const char * scsi_device_type(unsigned type);
-+#endif
- 
- /*
-  * standard mode-select header prepended to all mode-select commands
diff --git a/toolchain/kernel-headers/patches/2.6.34/cleankernel.patch b/toolchain/kernel-headers/patches/2.6.35.7/cleankernel.patch
index f8d5448ee..f8d5448ee 100644
--- a/toolchain/kernel-headers/patches/2.6.34/cleankernel.patch
+++ b/toolchain/kernel-headers/patches/2.6.35.7/cleankernel.patch
diff --git a/toolchain/kernel-headers/patches/2.6.35.7/etrax-header.patch b/toolchain/kernel-headers/patches/2.6.35.7/etrax-header.patch
new file mode 100644
index 000000000..4c2befb9d
--- /dev/null
+++ b/toolchain/kernel-headers/patches/2.6.35.7/etrax-header.patch
@@ -0,0 +1,73 @@
+diff -Nur linux-2.6.35.7.orig/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.35.7/arch/cris/include/arch-v10/arch/Kbuild
+--- linux-2.6.35.7.orig/arch/cris/include/arch-v10/arch/Kbuild	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/include/arch-v10/arch/Kbuild	2010-10-14 15:23:32.185601489 +0200
+@@ -1,4 +1,9 @@
++header-y += dma.h
++header-y += io_interface_mux.h
+ header-y += user.h
+ header-y += svinto.h
+ header-y += sv_addr_ag.h
+ header-y += sv_addr.agh
++header-y += elf.h
++header-y += page.h
++header-y += ptrace.h
+diff -Nur linux-2.6.35.7.orig/arch/cris/include/arch-v32/arch/Kbuild linux-2.6.35.7/arch/cris/include/arch-v32/arch/Kbuild
+--- linux-2.6.35.7.orig/arch/cris/include/arch-v32/arch/Kbuild	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/include/arch-v32/arch/Kbuild	2010-10-14 15:23:32.205601290 +0200
+@@ -1,2 +1,6 @@
+ header-y += user.h
+ header-y += cryptocop.h
++header-y += elf.h
++header-y += page.h
++header-y += ptrace.h
++
+diff -Nur linux-2.6.35.7.orig/arch/cris/include/asm/Kbuild linux-2.6.35.7/arch/cris/include/asm/Kbuild
+--- linux-2.6.35.7.orig/arch/cris/include/asm/Kbuild	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/include/asm/Kbuild	2010-10-14 15:23:32.896778639 +0200
+@@ -1,11 +1,14 @@
+ include include/asm-generic/Kbuild.asm
+ 
+-header-y += arch-v10/
+-header-y += arch-v32/
++header-y += ../arch-v10/arch/
++header-y += ../arch-v32/arch/
+ 
++header-y += elf.h
+ header-y += ethernet.h
+ header-y += rtc.h
+ header-y += sync_serial.h
++header-y += page.h
++header-y += user.h
+ 
+ unifdef-y += etraxgpio.h
+ unifdef-y += rs485.h
+diff -Nur linux-2.6.35.7.orig/include/asm-generic/Kbuild linux-2.6.35.7/include/asm-generic/Kbuild
+--- linux-2.6.35.7.orig/include/asm-generic/Kbuild	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/include/asm-generic/Kbuild	2010-10-14 15:23:32.938101398 +0200
+@@ -3,12 +3,15 @@
+ header-y += errno-base.h
+ header-y += errno.h
+ header-y += fcntl.h
++header-y += getorder.h
+ header-y += ioctl.h
+ header-y += ioctls.h
+ header-y += ipcbuf.h
++header-y += memory_model.h
+ header-y += mman-common.h
+ header-y += mman.h
+ header-y += msgbuf.h
++header-y += page.h
+ header-y += param.h
+ header-y += poll.h
+ header-y += posix_types.h
+diff -Nur linux-2.6.35.7.orig/include/linux/Kbuild linux-2.6.35.7/include/linux/Kbuild
+--- linux-2.6.35.7.orig/include/linux/Kbuild	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/include/linux/Kbuild	2010-10-14 15:23:32.978101250 +0200
+@@ -165,6 +165,7 @@
+ header-y += udf_fs_i.h
+ header-y += ultrasound.h
+ header-y += un.h
++header-y += user.h
+ header-y += utime.h
+ header-y += veth.h
+ header-y += videotext.h
diff --git a/toolchain/kernel-headers/patches/2.6.34/linux-gcc-check.patch b/toolchain/kernel-headers/patches/2.6.35.7/linux-gcc-check.patch
index 7cc381845..7cc381845 100644
--- a/toolchain/kernel-headers/patches/2.6.34/linux-gcc-check.patch
+++ b/toolchain/kernel-headers/patches/2.6.35.7/linux-gcc-check.patch
diff --git a/toolchain/kernel-headers/patches/2.6.34/microperl.patch b/toolchain/kernel-headers/patches/2.6.35.7/microperl.patch
index 2955b7421..2955b7421 100644
--- a/toolchain/kernel-headers/patches/2.6.34/microperl.patch
+++ b/toolchain/kernel-headers/patches/2.6.35.7/microperl.patch
diff --git a/toolchain/kernel-headers/patches/2.6.35/cleankernel.patch b/toolchain/kernel-headers/patches/2.6.35/cleankernel.patch
deleted file mode 100644
index f8d5448ee..000000000
--- a/toolchain/kernel-headers/patches/2.6.35/cleankernel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur linux-2.6.29.1.orig/scripts/Makefile.headersinst linux-2.6.29.1/scripts/Makefile.headersinst
---- linux-2.6.29.1.orig/scripts/Makefile.headersinst	2009-04-02 22:55:27.000000000 +0200
-+++ linux-2.6.29.1/scripts/Makefile.headersinst	2009-04-17 20:56:09.143476927 +0200
-@@ -65,7 +65,6 @@
- 
- targets += $(install-file)
- $(install-file): scripts/headers_install.pl $(input-files) FORCE
--	$(if $(unwanted),$(call cmd,remove),)
- 	$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
- 	$(call if_changed,install)
- 
diff --git a/toolchain/kernel-headers/patches/2.6.35/etrax-header.patch b/toolchain/kernel-headers/patches/2.6.35/etrax-header.patch
deleted file mode 100644
index 3672cf60b..000000000
--- a/toolchain/kernel-headers/patches/2.6.35/etrax-header.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Nur linux-2.6.31.4.orig/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.31.4/arch/cris/include/arch-v10/arch/Kbuild
---- linux-2.6.31.4.orig/arch/cris/include/arch-v10/arch/Kbuild	2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/arch/cris/include/arch-v10/arch/Kbuild	2009-10-25 09:57:06.167232146 +0100
-@@ -1,4 +1,9 @@
-+header-y += dma.h
-+header-y += io_interface_mux.h
- header-y += user.h
- header-y += svinto.h
- header-y += sv_addr_ag.h
- header-y += sv_addr.agh
-+header-y += elf.h
-+header-y += page.h
-+header-y += ptrace.h
-diff -Nur linux-2.6.31.4.orig/arch/cris/include/arch-v32/arch/Kbuild linux-2.6.31.4/arch/cris/include/arch-v32/arch/Kbuild
---- linux-2.6.31.4.orig/arch/cris/include/arch-v32/arch/Kbuild	2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/arch/cris/include/arch-v32/arch/Kbuild	2009-10-25 09:57:06.167232146 +0100
-@@ -1,2 +1,6 @@
- header-y += user.h
- header-y += cryptocop.h
-+header-y += elf.h
-+header-y += page.h
-+header-y += ptrace.h
-+
-diff -Nur linux-2.6.31.4.orig/arch/cris/include/asm/Kbuild linux-2.6.31.4/arch/cris/include/asm/Kbuild
---- linux-2.6.31.4.orig/arch/cris/include/asm/Kbuild	2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/arch/cris/include/asm/Kbuild	2009-10-25 09:57:06.167232146 +0100
-@@ -1,11 +1,14 @@
- include include/asm-generic/Kbuild.asm
- 
--header-y += arch-v10/
--header-y += arch-v32/
-+header-y += ../arch-v10/arch/
-+header-y += ../arch-v32/arch/
- 
-+header-y += elf.h
- header-y += ethernet.h
- header-y += rtc.h
- header-y += sync_serial.h
-+header-y += page.h
-+header-y += user.h
- 
- unifdef-y += etraxgpio.h
- unifdef-y += rs485.h
-diff -Nur linux-2.6.31.4.orig/include/asm-generic/Kbuild linux-2.6.31.4/include/asm-generic/Kbuild
---- linux-2.6.31.4.orig/include/asm-generic/Kbuild	2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/include/asm-generic/Kbuild	2009-10-25 10:00:20.743354404 +0100
-@@ -3,12 +3,15 @@
- header-y += errno-base.h
- header-y += errno.h
- header-y += fcntl.h
-+header-y += getorder.h
- header-y += ioctl.h
- header-y += ioctls.h
- header-y += ipcbuf.h
-+header-y += memory_model.h
- header-y += mman-common.h
- header-y += mman.h
- header-y += msgbuf.h
-+header-y += page.h
- header-y += param.h
- header-y += poll.h
- header-y += posix_types.h
-diff -Nur linux-2.6.31.4.orig/include/linux/Kbuild linux-2.6.31.4/include/linux/Kbuild
---- linux-2.6.31.4.orig/include/linux/Kbuild	2009-10-12 22:15:40.000000000 +0200
-+++ linux-2.6.31.4/include/linux/Kbuild	2009-10-25 09:57:06.207234174 +0100
-@@ -160,6 +160,7 @@
- header-y += udf_fs_i.h
- header-y += ultrasound.h
- header-y += un.h
-+header-y += user.h
- header-y += utime.h
- header-y += veth.h
- header-y += videotext.h
diff --git a/toolchain/kernel-headers/patches/2.6.35/linux-gcc-check.patch b/toolchain/kernel-headers/patches/2.6.35/linux-gcc-check.patch
deleted file mode 100644
index 7cc381845..000000000
--- a/toolchain/kernel-headers/patches/2.6.35/linux-gcc-check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur linux-2.6.32.orig/arch/mips/include/asm/sgidefs.h linux-2.6.32/arch/mips/include/asm/sgidefs.h
---- linux-2.6.32.orig/arch/mips/include/asm/sgidefs.h	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/arch/mips/include/asm/sgidefs.h	2010-02-14 11:49:21.000000000 +0100
-@@ -11,14 +11,6 @@
- #define __ASM_SGIDEFS_H
-
- /*
-- * Using a Linux compiler for building Linux seems logic but not to
-- * everybody.
-- */
--#ifndef __linux__
--#error Use a Linux compiler or give up.
--#endif
--
--/*
-  * Definitions for the ISA levels
-  *
-  * With the introduction of MIPS32 / MIPS64 instruction sets definitions
diff --git a/toolchain/kernel-headers/patches/2.6.35/microperl.patch b/toolchain/kernel-headers/patches/2.6.35/microperl.patch
deleted file mode 100644
index 2955b7421..000000000
--- a/toolchain/kernel-headers/patches/2.6.35/microperl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur linux-2.6.30.5.orig/scripts/headers_check.pl linux-2.6.30.5/scripts/headers_check.pl
---- linux-2.6.30.5.orig/scripts/headers_check.pl	2009-08-16 23:19:38.000000000 +0200
-+++ linux-2.6.30.5/scripts/headers_check.pl	2009-09-14 21:16:21.000000000 +0200
-@@ -18,7 +18,7 @@
- #
- # 3) Check for leaked CONFIG_ symbols
- 
--use strict;
-+#use strict;
- 
- my ($dir, $arch, @files) = @ARGV;
- 
-diff -Nur linux-2.6.30.5.orig/scripts/headers_install.pl linux-2.6.30.5/scripts/headers_install.pl
---- linux-2.6.30.5.orig/scripts/headers_install.pl	2009-08-16 23:19:38.000000000 +0200
-+++ linux-2.6.30.5/scripts/headers_install.pl	2009-09-14 21:16:11.000000000 +0200
-@@ -16,7 +16,7 @@
- # 2) Drop include of compiler.h
- # 3) Drop all sections defined out by __KERNEL__ (using unifdef)
- 
--use strict;
-+#use strict;
- 
- my ($readdir, $installdir, $arch, @files) = @ARGV;
-