[oe-commits] Andreas Oberritter : linux-dm800: sync with dm8000

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dreambox
Commit: 113ae0c373f418932207153b4a8c0b80e918ef03
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=113ae0c373f418932207153b4a8c0b80e918ef03

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Thu Nov  6 23:39:41 2008 +0100

linux-dm800: sync with dm8000

- apply linux-2.6.12-fix-bcmemac-ioctl.patch
- minimize diff by fixing whitespace, using $MACHINE and moving patches
  around

---

 packages/linux/linux-dm800.bb                      |   29 ++++++++++---------
 .../linux-2.6.12-fix-bcmemac-ioctl.patch           |   12 ++++++++
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/packages/linux/linux-dm800.bb b/packages/linux/linux-dm800.bb
index 5e94c46..c2defdc 100644
--- a/packages/linux/linux-dm800.bb
+++ b/packages/linux/linux-dm800.bb
@@ -1,33 +1,34 @@
-DESCRIPTION = "Linux kernel for Dreambox DM8000"
+DESCRIPTION = "Linux kernel for Dreambox DM800"
 LICENSE = "GPL"
-PN = "linux-dm800"
+PN = "linux-${MACHINE}"
 KV = "2.6.12"
 PV = "2.6.12"
-PR = "r9"
+PR = "r10"
 
 # note, the rX in the filename is *NOT* the packet revision - it's the patch revision.
 SRC_URI += "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
-	file://dm800_defconfig \
+	file://${MACHINE}_defconfig \
 	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-brcm-5.1.patch.bz2;patch=1;pnum=1 \
 	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-update_dvbapi-r1.patch.bz2;patch=1;pnum=1 \
 	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvb-multipid-r4.patch.bz2;patch=1;pnum=1 \
 	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvb-core-fix-several-locking-problems.patch.bz2;patch=1;pnum=1 \
-	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvbapi-pilot-rolloff-extension-r0.patch.bz2;patch=1;pnum=1\
-	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-update-wireless.patch.bz2;patch=1;pnum=1\
+	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvbapi-pilot-rolloff-extension-r0.patch.bz2;patch=1;pnum=1 \
+	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-update-wireless.patch.bz2;patch=1;pnum=1 \
 	http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-add-ioprio.patch.bz2;patch=1;pnum=1 \
 	file://linux-2.6.12-dream-misc.patch;patch=1;pnum=1 \
 	file://linux-2.6.12-fix-serial.patch;patch=1;pnum=1 \
-	file://linux-2.6.12-dm800-flash-layout.patch;patch=1;pnum=1 \
+	file://linux-2.6.12-${MACHINE}-flash-layout.patch;patch=1;pnum=1 \
 	file://linux-2.6.12-dream-temp.patch;patch=1;pnum=1 \
 	file://linux-2.6.12-brcm-mtd-blkdevfs-fix.diff;patch=1;pnum=1 \
 	file://linux-2.6.12-set-custom-extraversion.patch;patch=1;pnum=1 \
-	file://linux-2.6.12-7401C0-enable-llsc.patch;patch=1;pnum=1 \
 	file://linux-2.6.12-fixup-prom-args.patch;patch=1;pnum=1 \
-	file://linux-2.6.12-fixup-memsize.patch;patch=1;pnum=1 \
+	file://linux-2.6.12-7401C0-enable-llsc.patch;patch=1;pnum=1 \
 	file://linuxmips-2.6.12-fix-fadvise.patch;patch=1;pnum=1 \
 	file://linuxmips-2.6.12-fix-futex.patch;patch=1;pnum=1 \
 	file://linuxmips-2.6.12-gcc4-compile-fix.patch;patch=1;pnum=1 \
 	file://linuxmips-2.6.12-gdb-fix.patch;patch=1;pnum=1 \
+	file://linux-2.6.12-fix-bcmemac-ioctl.patch;patch=1;pnum=1 \
+	file://linux-2.6.12-fixup-memsize.patch;patch=1;pnum=1 \
 	http://trappist.elis.ugent.be/~mronsse/cdfs/download/cdfs-2.6.12.tar.bz2"
 
 S = "${WORKDIR}/stblinux-2.6.12"
@@ -51,11 +52,11 @@ do_munge() {
 addtask munge before do_patch after do_unpack
 
 do_configure_prepend() {
-	oe_machinstall -m 0644 ${WORKDIR}/dm800_defconfig ${S}/.config
-        if [ -d ${WORKDIR}/cdfs-${PV} ]; then
-                mv ${WORKDIR}/cdfs-${PV} ${S}/fs/cdfs
-                cd ${S} & patch -p0 < ${S}/fs/cdfs/patch.cdfs
-        fi;
+	oe_machinstall -m 0644 ${WORKDIR}/${MACHINE}_defconfig ${S}/.config
+	if [ -d ${WORKDIR}/cdfs-${PV} ]; then
+		mv ${WORKDIR}/cdfs-${PV} ${S}/fs/cdfs
+		cd ${S} & patch -p0 < ${S}/fs/cdfs/patch.cdfs
+	fi;
 	oe_runmake oldconfig
 }
 
diff --git a/packages/linux/linux-dm800/linux-2.6.12-fix-bcmemac-ioctl.patch b/packages/linux/linux-dm800/linux-2.6.12-fix-bcmemac-ioctl.patch
new file mode 100644
index 0000000..f7bc83f
--- /dev/null
+++ b/packages/linux/linux-dm800/linux-2.6.12-fix-bcmemac-ioctl.patch
@@ -0,0 +1,12 @@
+--- stblinux-2.6.12/drivers/net/brcmint7038/bcmemac.c.orig	2008-10-22 23:28:30.544913466 +0200
++++ stblinux-2.6.12/drivers/net/brcmint7038/bcmemac.c	2008-10-22 23:36:12.149950139 +0200
+@@ -3368,6 +3368,9 @@
+         ASSERT(pDevCtrl != NULL);
+         memset(&pDevCtrl->stats, 0, sizeof(struct net_device_stats));
+         break;
++
++    default:
++	return -EOPNOTSUPP;
+     }
+     return 0;
+ }