linux: update to linux-2.6.35-rc6, add backported lirc drivers from upcoming 2.6.36

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2010-07-29 19:34:44 +02:00
parent a2322e1537
commit b632d1b397
9 changed files with 7114 additions and 9236 deletions

View File

@ -2,9 +2,6 @@
. config/options $1 . config/options $1
$SCRIPTS/build toolchain
$SCRIPTS/build busybox-hosttools
export INSTALL=$(kernel_path) export INSTALL=$(kernel_path)
$SCRIPTS/install busybox-initramfs $SCRIPTS/install busybox-initramfs

View File

@ -2,9 +2,6 @@
. config/options $1 . config/options $1
$SCRIPTS/build busybox-hosttools
$SCRIPTS/install busybox
RAMFS_DRV_SUBSYSTEMS="ata ide scsi" RAMFS_DRV_SUBSYSTEMS="ata ide scsi"
VER=`ls $PKG_BUILD/modules/lib/modules` VER=`ls $PKG_BUILD/modules/lib/modules`
@ -28,5 +25,3 @@ mkdir -p $INSTALL/etc
cp $PKG_DIR/config/modules $INSTALL/etc cp $PKG_DIR/config/modules $INSTALL/etc
mkdir -p $INSTALL/etc/modprobe.d mkdir -p $INSTALL/etc/modprobe.d
$SCRIPTS/install linux-firmware

14
packages/linux/meta Normal file
View File

@ -0,0 +1,14 @@
PKG_NAME="linux"
PKG_VERSION="2.6.35-rc6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kernel.org"
PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="busybox linux-firmware"
PKG_BUILD_DEPENDS="toolchain busybox-hosttools"
PKG_PRIORITY="optional"
PKG_SECTION="linux"
PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and modules"
PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
PKG_IS_ADDON="no"

View File

@ -1,6 +1,6 @@
diff -Naur linux-2.6.34-old/fs/squashfs/decompressor.c linux-2.6.34-new/fs/squashfs/decompressor.c diff -Naur linux-2.6.35-rc6/fs/squashfs/decompressor.c linux-2.6.35-rc6.patch/fs/squashfs/decompressor.c
--- linux-2.6.34-old/fs/squashfs/decompressor.c 2010-05-16 14:17:36.000000000 -0700 --- linux-2.6.35-rc6/fs/squashfs/decompressor.c 2010-07-22 21:13:38.000000000 +0200
+++ linux-2.6.34-new/fs/squashfs/decompressor.c 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/fs/squashfs/decompressor.c 2010-07-29 06:51:11.797408264 +0200
@@ -50,7 +50,11 @@ @@ -50,7 +50,11 @@
static const struct squashfs_decompressor *decompressor[] = { static const struct squashfs_decompressor *decompressor[] = {
@ -13,10 +13,10 @@ diff -Naur linux-2.6.34-old/fs/squashfs/decompressor.c linux-2.6.34-new/fs/squas
&squashfs_lzo_unsupported_comp_ops, &squashfs_lzo_unsupported_comp_ops,
&squashfs_unknown_comp_ops &squashfs_unknown_comp_ops
}; };
diff -Naur linux-2.6.34-old/fs/squashfs/Kconfig linux-2.6.34-new/fs/squashfs/Kconfig diff -Naur linux-2.6.35-rc6/fs/squashfs/Kconfig linux-2.6.35-rc6.patch/fs/squashfs/Kconfig
--- linux-2.6.34-old/fs/squashfs/Kconfig 2010-05-16 14:17:36.000000000 -0700 --- linux-2.6.35-rc6/fs/squashfs/Kconfig 2010-07-22 21:13:38.000000000 +0200
+++ linux-2.6.34-new/fs/squashfs/Kconfig 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/fs/squashfs/Kconfig 2010-07-29 06:51:11.798406430 +0200
@@ -26,6 +26,12 @@ @@ -37,6 +37,12 @@
If unsure, say N. If unsure, say N.
@ -29,9 +29,9 @@ diff -Naur linux-2.6.34-old/fs/squashfs/Kconfig linux-2.6.34-new/fs/squashfs/Kco
config SQUASHFS_EMBEDDED config SQUASHFS_EMBEDDED
bool "Additional option for memory-constrained systems" bool "Additional option for memory-constrained systems"
diff -Naur linux-2.6.34-old/fs/squashfs/lzma_wrapper.c linux-2.6.34-new/fs/squashfs/lzma_wrapper.c diff -Naur linux-2.6.35-rc6/fs/squashfs/lzma_wrapper.c linux-2.6.35-rc6.patch/fs/squashfs/lzma_wrapper.c
--- linux-2.6.34-old/fs/squashfs/lzma_wrapper.c 1969-12-31 16:00:00.000000000 -0800 --- linux-2.6.35-rc6/fs/squashfs/lzma_wrapper.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.34-new/fs/squashfs/lzma_wrapper.c 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/fs/squashfs/lzma_wrapper.c 2010-07-29 06:51:12.257251312 +0200
@@ -0,0 +1,152 @@ @@ -0,0 +1,152 @@
+/* +/*
+ * Squashfs - a compressed read only filesystem for Linux + * Squashfs - a compressed read only filesystem for Linux
@ -185,27 +185,29 @@ diff -Naur linux-2.6.34-old/fs/squashfs/lzma_wrapper.c linux-2.6.34-new/fs/squas
+ .supported = 1 + .supported = 1
+}; +};
+ +
diff -Naur linux-2.6.34-old/fs/squashfs/Makefile linux-2.6.34-new/fs/squashfs/Makefile diff -Naur linux-2.6.35-rc6/fs/squashfs/Makefile linux-2.6.35-rc6.patch/fs/squashfs/Makefile
--- linux-2.6.34-old/fs/squashfs/Makefile 2010-05-16 14:17:36.000000000 -0700 --- linux-2.6.35-rc6/fs/squashfs/Makefile 2010-07-22 21:13:38.000000000 +0200
+++ linux-2.6.34-new/fs/squashfs/Makefile 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/fs/squashfs/Makefile 2010-07-29 06:52:22.842250915 +0200
@@ -5,3 +5,4 @@ @@ -5,5 +5,6 @@
obj-$(CONFIG_SQUASHFS) += squashfs.o obj-$(CONFIG_SQUASHFS) += squashfs.o
squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o squashfs-y += block.o cache.o dir.o export.o file.o fragment.o id.o inode.o
squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o squashfs-y += namei.o super.o symlink.o zlib_wrapper.o decompressor.o
+squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o +squashfs-$(CONFIG_SQUASHFS_LZMA) += lzma_wrapper.o
diff -Naur linux-2.6.34-old/fs/squashfs/squashfs.h linux-2.6.34-new/fs/squashfs/squashfs.h squashfs-$(CONFIG_SQUASHFS_XATTRS) += xattr.o xattr_id.o
--- linux-2.6.34-old/fs/squashfs/squashfs.h 2010-05-16 14:17:36.000000000 -0700
+++ linux-2.6.34-new/fs/squashfs/squashfs.h 2010-05-17 13:11:22.000000000 -0700 diff -Naur linux-2.6.35-rc6/fs/squashfs/squashfs.h linux-2.6.35-rc6.patch/fs/squashfs/squashfs.h
@@ -94,3 +94,6 @@ --- linux-2.6.35-rc6/fs/squashfs/squashfs.h 2010-07-22 21:13:38.000000000 +0200
+++ linux-2.6.35-rc6.patch/fs/squashfs/squashfs.h 2010-07-29 06:51:12.273377004 +0200
@@ -104,3 +104,6 @@
/* zlib_wrapper.c */ /* zlib_wrapper.c */
extern const struct squashfs_decompressor squashfs_zlib_comp_ops; extern const struct squashfs_decompressor squashfs_zlib_comp_ops;
+ +
+/* lzma wrapper.c */ +/* lzma wrapper.c */
+extern const struct squashfs_decompressor squashfs_lzma_comp_ops; +extern const struct squashfs_decompressor squashfs_lzma_comp_ops;
diff -Naur linux-2.6.34-old/include/linux/decompress/bunzip2_mm.h linux-2.6.34-new/include/linux/decompress/bunzip2_mm.h diff -Naur linux-2.6.35-rc6/include/linux/decompress/bunzip2_mm.h linux-2.6.35-rc6.patch/include/linux/decompress/bunzip2_mm.h
--- linux-2.6.34-old/include/linux/decompress/bunzip2_mm.h 1969-12-31 16:00:00.000000000 -0800 --- linux-2.6.35-rc6/include/linux/decompress/bunzip2_mm.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.34-new/include/linux/decompress/bunzip2_mm.h 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/include/linux/decompress/bunzip2_mm.h 2010-07-29 06:51:12.274376635 +0200
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+#ifndef BUNZIP2_MM_H +#ifndef BUNZIP2_MM_H
+#define BUNZIP2_MM_H +#define BUNZIP2_MM_H
@ -220,9 +222,9 @@ diff -Naur linux-2.6.34-old/include/linux/decompress/bunzip2_mm.h linux-2.6.34-n
+#endif +#endif
+ +
+#endif +#endif
diff -Naur linux-2.6.34-old/include/linux/decompress/inflate_mm.h linux-2.6.34-new/include/linux/decompress/inflate_mm.h diff -Naur linux-2.6.35-rc6/include/linux/decompress/inflate_mm.h linux-2.6.35-rc6.patch/include/linux/decompress/inflate_mm.h
--- linux-2.6.34-old/include/linux/decompress/inflate_mm.h 1969-12-31 16:00:00.000000000 -0800 --- linux-2.6.35-rc6/include/linux/decompress/inflate_mm.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.34-new/include/linux/decompress/inflate_mm.h 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/include/linux/decompress/inflate_mm.h 2010-07-29 06:51:12.275376896 +0200
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+#ifndef INFLATE_MM_H +#ifndef INFLATE_MM_H
+#define INFLATE_MM_H +#define INFLATE_MM_H
@ -237,9 +239,9 @@ diff -Naur linux-2.6.34-old/include/linux/decompress/inflate_mm.h linux-2.6.34-n
+#endif +#endif
+ +
+#endif +#endif
diff -Naur linux-2.6.34-old/include/linux/decompress/mm.h linux-2.6.34-new/include/linux/decompress/mm.h diff -Naur linux-2.6.35-rc6/include/linux/decompress/mm.h linux-2.6.35-rc6.patch/include/linux/decompress/mm.h
--- linux-2.6.34-old/include/linux/decompress/mm.h 2010-05-16 14:17:36.000000000 -0700 --- linux-2.6.35-rc6/include/linux/decompress/mm.h 2010-07-22 21:13:38.000000000 +0200
+++ linux-2.6.34-new/include/linux/decompress/mm.h 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/include/linux/decompress/mm.h 2010-07-29 06:51:12.276375899 +0200
@@ -63,8 +63,6 @@ @@ -63,8 +63,6 @@
#define set_error_fn(x) #define set_error_fn(x)
@ -260,9 +262,9 @@ diff -Naur linux-2.6.34-old/include/linux/decompress/mm.h linux-2.6.34-new/inclu
#define STATIC #define STATIC
#include <linux/init.h> #include <linux/init.h>
diff -Naur linux-2.6.34-old/include/linux/decompress/unlzma_mm.h linux-2.6.34-new/include/linux/decompress/unlzma_mm.h diff -Naur linux-2.6.35-rc6/include/linux/decompress/unlzma_mm.h linux-2.6.35-rc6.patch/include/linux/decompress/unlzma_mm.h
--- linux-2.6.34-old/include/linux/decompress/unlzma_mm.h 1969-12-31 16:00:00.000000000 -0800 --- linux-2.6.35-rc6/include/linux/decompress/unlzma_mm.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.34-new/include/linux/decompress/unlzma_mm.h 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/include/linux/decompress/unlzma_mm.h 2010-07-29 06:51:12.277376579 +0200
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
+#ifndef UNLZMA_MM_H +#ifndef UNLZMA_MM_H
+#define UNLZMA_MM_H +#define UNLZMA_MM_H
@ -284,9 +286,9 @@ diff -Naur linux-2.6.34-old/include/linux/decompress/unlzma_mm.h linux-2.6.34-ne
+#endif +#endif
+ +
+#endif +#endif
diff -Naur linux-2.6.34-old/include/linux/decompress/unlzo_mm.h linux-2.6.34-new/include/linux/decompress/unlzo_mm.h diff -Naur linux-2.6.35-rc6/include/linux/decompress/unlzo_mm.h linux-2.6.35-rc6.patch/include/linux/decompress/unlzo_mm.h
--- linux-2.6.34-old/include/linux/decompress/unlzo_mm.h 1969-12-31 16:00:00.000000000 -0800 --- linux-2.6.35-rc6/include/linux/decompress/unlzo_mm.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.34-new/include/linux/decompress/unlzo_mm.h 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/include/linux/decompress/unlzo_mm.h 2010-07-29 06:51:12.278376490 +0200
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+#ifndef UNLZO_MM_H +#ifndef UNLZO_MM_H
+#define UNLZO_MM_H +#define UNLZO_MM_H
@ -301,9 +303,9 @@ diff -Naur linux-2.6.34-old/include/linux/decompress/unlzo_mm.h linux-2.6.34-new
+#endif +#endif
+ +
+#endif +#endif
diff -Naur linux-2.6.34-old/lib/decompress_bunzip2.c linux-2.6.34-new/lib/decompress_bunzip2.c diff -Naur linux-2.6.35-rc6/lib/decompress_bunzip2.c linux-2.6.35-rc6.patch/lib/decompress_bunzip2.c
--- linux-2.6.34-old/lib/decompress_bunzip2.c 2010-05-16 14:17:36.000000000 -0700 --- linux-2.6.35-rc6/lib/decompress_bunzip2.c 2010-07-22 21:13:38.000000000 +0200
+++ linux-2.6.34-new/lib/decompress_bunzip2.c 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/lib/decompress_bunzip2.c 2010-07-29 06:51:12.315251128 +0200
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#endif /* STATIC */ #endif /* STATIC */
@ -312,9 +314,9 @@ diff -Naur linux-2.6.34-old/lib/decompress_bunzip2.c linux-2.6.34-new/lib/decomp
#include <linux/decompress/mm.h> #include <linux/decompress/mm.h>
#ifndef INT_MAX #ifndef INT_MAX
diff -Naur linux-2.6.34-old/lib/decompress_inflate.c linux-2.6.34-new/lib/decompress_inflate.c diff -Naur linux-2.6.35-rc6/lib/decompress_inflate.c linux-2.6.35-rc6.patch/lib/decompress_inflate.c
--- linux-2.6.34-old/lib/decompress_inflate.c 2010-05-16 14:17:36.000000000 -0700 --- linux-2.6.35-rc6/lib/decompress_inflate.c 2010-07-22 21:13:38.000000000 +0200
+++ linux-2.6.34-new/lib/decompress_inflate.c 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/lib/decompress_inflate.c 2010-07-29 06:51:12.321251434 +0200
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#endif /* STATIC */ #endif /* STATIC */
@ -323,9 +325,9 @@ diff -Naur linux-2.6.34-old/lib/decompress_inflate.c linux-2.6.34-new/lib/decomp
#include <linux/decompress/mm.h> #include <linux/decompress/mm.h>
#define GZIP_IOBUF_SIZE (16*1024) #define GZIP_IOBUF_SIZE (16*1024)
diff -Naur linux-2.6.34-old/lib/decompress_unlzma.c linux-2.6.34-new/lib/decompress_unlzma.c diff -Naur linux-2.6.35-rc6/lib/decompress_unlzma.c linux-2.6.35-rc6.patch/lib/decompress_unlzma.c
--- linux-2.6.34-old/lib/decompress_unlzma.c 2010-05-16 14:17:36.000000000 -0700 --- linux-2.6.35-rc6/lib/decompress_unlzma.c 2010-07-22 21:13:38.000000000 +0200
+++ linux-2.6.34-new/lib/decompress_unlzma.c 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/lib/decompress_unlzma.c 2010-07-29 06:51:12.334286250 +0200
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#endif /* STATIC */ #endif /* STATIC */
@ -640,9 +642,9 @@ diff -Naur linux-2.6.34-old/lib/decompress_unlzma.c linux-2.6.34-new/lib/decompr
#ifdef PREBOOT #ifdef PREBOOT
STATIC int INIT decompress(unsigned char *buf, int in_len, STATIC int INIT decompress(unsigned char *buf, int in_len,
diff -Naur linux-2.6.34-old/lib/decompress_unlzo.c linux-2.6.34-new/lib/decompress_unlzo.c diff -Naur linux-2.6.35-rc6/lib/decompress_unlzo.c linux-2.6.35-rc6.patch/lib/decompress_unlzo.c
--- linux-2.6.34-old/lib/decompress_unlzo.c 2010-05-16 14:17:36.000000000 -0700 --- linux-2.6.35-rc6/lib/decompress_unlzo.c 2010-07-22 21:13:38.000000000 +0200
+++ linux-2.6.34-new/lib/decompress_unlzo.c 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/lib/decompress_unlzo.c 2010-07-29 06:51:12.340249191 +0200
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
#include <linux/types.h> #include <linux/types.h>
@ -651,9 +653,9 @@ diff -Naur linux-2.6.34-old/lib/decompress_unlzo.c linux-2.6.34-new/lib/decompre
#include <linux/decompress/mm.h> #include <linux/decompress/mm.h>
#include <linux/compiler.h> #include <linux/compiler.h>
diff -Naur linux-2.6.34-old/lib/Kconfig linux-2.6.34-new/lib/Kconfig diff -Naur linux-2.6.35-rc6/lib/Kconfig linux-2.6.35-rc6.patch/lib/Kconfig
--- linux-2.6.34-old/lib/Kconfig 2010-05-16 14:17:36.000000000 -0700 --- linux-2.6.35-rc6/lib/Kconfig 2010-07-22 21:13:38.000000000 +0200
+++ linux-2.6.34-new/lib/Kconfig 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/lib/Kconfig 2010-07-29 06:51:12.340249191 +0200
@@ -121,6 +121,9 @@ @@ -121,6 +121,9 @@
select LZO_DECOMPRESS select LZO_DECOMPRESS
tristate tristate
@ -664,10 +666,10 @@ diff -Naur linux-2.6.34-old/lib/Kconfig linux-2.6.34-new/lib/Kconfig
# #
# Generic allocator support is selected if needed # Generic allocator support is selected if needed
# #
diff -Naur linux-2.6.34-old/lib/Makefile linux-2.6.34-new/lib/Makefile diff -Naur linux-2.6.35-rc6/lib/Makefile linux-2.6.35-rc6.patch/lib/Makefile
--- linux-2.6.34-old/lib/Makefile 2010-05-16 14:17:36.000000000 -0700 --- linux-2.6.35-rc6/lib/Makefile 2010-07-22 21:13:38.000000000 +0200
+++ linux-2.6.34-new/lib/Makefile 2010-05-17 13:11:22.000000000 -0700 +++ linux-2.6.35-rc6.patch/lib/Makefile 2010-07-29 06:51:12.341249940 +0200
@@ -69,7 +69,7 @@ @@ -72,7 +72,7 @@
lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o
lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o
@ -676,3 +678,4 @@ diff -Naur linux-2.6.34-old/lib/Makefile linux-2.6.34-new/lib/Makefile
lib-$(CONFIG_DECOMPRESS_LZO) += decompress_unlzo.o lib-$(CONFIG_DECOMPRESS_LZO) += decompress_unlzo.o
obj-$(CONFIG_TEXTSEARCH) += textsearch.o obj-$(CONFIG_TEXTSEARCH) += textsearch.o
diff -Naur linux-2.6.35-rc6/lib/Makefile.orig linux-2.6.35-rc6.patch/lib/Makefile.orig

View File

@ -1,26 +0,0 @@
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 4173125..baa32a0 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -340,7 +340,7 @@ int dmar_disabled = 0;
int dmar_disabled = 1;
#endif /*CONFIG_DMAR_DEFAULT_ON*/
-static int __initdata dmar_map_gfx = 1;
+static int dmar_map_gfx = 1;
static int dmar_forcedac;
static int intel_iommu_strict;
@@ -3728,6 +3728,12 @@ static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
*/
printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n");
rwbf_quirk = 1;
+
+ /* https://bugzilla.redhat.com/show_bug.cgi?id=538163 */
+ if (dev->revision == 0x07) {
+ printk(KERN_INFO "DMAR: Disabling IOMMU for graphics on this chipset\n");
+ dmar_map_gfx = 0;
+ }
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);

File diff suppressed because it is too large Load Diff

View File

@ -1 +0,0 @@
http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.34.1.tar.bz2