From 5c0de96fc41ea8a72d56e5489a2dc0bd11429ab3 Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Thu, 29 Nov 2007 08:16:33 +0000 Subject: linux-2.6.23: fix mpc8313e-rdb LEDs patch (didn't apply cleanly) --- .../mpc8313e-rdb/mpc8313e-rdb-leds.patch | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch index 7eadfc61fe..d8a477af2a 100644 --- a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch +++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch @@ -1,7 +1,6 @@ -Index: linux-2.6.23/drivers/leds/Kconfig -=================================================================== +diff -urN linux-2.6.23.orig/drivers/leds/Kconfig linux-2.6.23/drivers/leds/Kconfig --- linux-2.6.23.orig/drivers/leds/Kconfig 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/drivers/leds/Kconfig 2007-11-28 23:16:05.000000000 +0100 ++++ linux-2.6.23/drivers/leds/Kconfig 2007-11-29 09:02:42.000000000 +0100 @@ -101,6 +101,12 @@ outputs. To be useful the particular board must have LEDs and they must be connected to the GPIO lines. @@ -15,10 +14,9 @@ Index: linux-2.6.23/drivers/leds/Kconfig comment "LED Triggers" config LEDS_TRIGGERS -Index: linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c 2007-11-29 00:45:42.000000000 +0100 +diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c +--- linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c 2007-11-29 09:02:42.000000000 +0100 @@ -0,0 +1,128 @@ +/* + * drivers/leds/leds-mpc8313e-rdb.c @@ -148,15 +146,14 @@ Index: linux-2.6.23/drivers/leds/leds-mpc8313e-rdb.c +MODULE_AUTHOR("Leon Woestenberg "); +MODULE_DESCRIPTION("MPC8313E-RDB LED driver"); + -Index: linux-2.6.23/drivers/leds/Makefile -=================================================================== ---- linux-2.6.23.orig/drivers/leds/Makefile 2007-11-28 23:17:29.000000000 +0100 -+++ linux-2.6.23/drivers/leds/Makefile 2007-11-28 23:35:32.000000000 +0100 +diff -urN linux-2.6.23.orig/drivers/leds/Makefile linux-2.6.23/drivers/leds/Makefile +--- linux-2.6.23.orig/drivers/leds/Makefile 2007-10-09 22:31:38.000000000 +0200 ++++ linux-2.6.23/drivers/leds/Makefile 2007-11-29 09:03:09.000000000 +0100 @@ -17,6 +17,7 @@ obj-$(CONFIG_LEDS_H1940) += leds-h1940.o obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o +obj-$(CONFIG_LEDS_MPC8313E_RDB) += leds-mpc8313e-rdb.o - + # LED Triggers - obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o + obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o -- cgit v1.2.3 From 73124219f1f2e33c4e78150549c55c636adc86b6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Nov 2007 09:09:05 +0000 Subject: xserver-xorg: fix debug packaging --- packages/xorg-xserver/xorg-xserver-common.inc | 4 ++-- packages/xorg-xserver/xserver-xorg_1.3.0.0.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 8ee6c3e04e..2e8535ef30 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -31,9 +31,9 @@ FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bin FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/modules ${libdir}/xorg/modules /etc/X11 " FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" -FILES_${PN}-dbg += "${libdir}//xorg/modules/.debug \ +FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ ${libdir}/xorg/modules/*/.debug \ - ${libdir}//xorg/modules/*/*/.debug \ + ${libdir}/xorg/modules/*/*/.debug \ " do_stage() { diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb index 37ed418144..c8a3c42ed5 100644 --- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -2,7 +2,7 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -PR = "r3" +PR = "r4" SRC_URI += "file://drmfix.patch;patch=1" -- cgit v1.2.3 From 8e9f30a35aa444d7329b7bccdf34f8f6c3e52849 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Nov 2007 10:52:59 +0000 Subject: xorg-driver-common: attempt to fix #3386 --- packages/xorg-driver/xorg-driver-common.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc index 8053e6c236..3b3c205e9e 100644 --- a/packages/xorg-driver/xorg-driver-common.inc +++ b/packages/xorg-driver/xorg-driver-common.inc @@ -2,7 +2,7 @@ DESCRIPTION = "X driver" HOMEPAGE = "http://www.x.org" SECTION = "x11/drivers" LICENSE = "MIT-X" -PR = "r1" +PR = "r2" DEPENDS = "randrproto xorg-server xproto" @@ -27,7 +27,7 @@ do_stage() { do_configure_prepend() { incdir=${STAGING_INCDIR}/xorg - for f in dri.h sarea.h dristruct.h exa.h; do + for f in dri.h sarea.h dristruct.h exa.h damage.h; do path="$incdir/$f" if [ -f "$path" ]; then p=`echo "$path" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'` -- cgit v1.2.3 From 82ef14e73032b4364c7ef2b372f9868f5ceed793 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 29 Nov 2007 12:18:45 +0000 Subject: linux-openmoko_2.6.22.5.bb : CONFIG_MTD_NAND_S3C2410_CLKSTOP breaks accessing the mtd partitions from usespace so disable for now. --- packages/linux/linux-openmoko/defconfig-2.6.22.5 | 4 ++-- packages/linux/linux-openmoko_2.6.22.5.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/linux/linux-openmoko/defconfig-2.6.22.5 b/packages/linux/linux-openmoko/defconfig-2.6.22.5 index 62a61935f6..e9e40fed38 100644 --- a/packages/linux/linux-openmoko/defconfig-2.6.22.5 +++ b/packages/linux/linux-openmoko/defconfig-2.6.22.5 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.22.5 -# Wed Nov 21 11:45:19 2007 +# Tue Nov 27 09:09:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -705,7 +705,7 @@ CONFIG_MTD_NAND_S3C2410=y CONFIG_MTD_NAND_S3C2410_BBT=y # CONFIG_MTD_NAND_S3C2410_DEBUG is not set CONFIG_MTD_NAND_S3C2410_HWECC=y -CONFIG_MTD_NAND_S3C2410_CLKSTOP=y +# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_PLATFORM is not set diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb index 1af9ed58a7..c623504c73 100644 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ b/packages/linux/linux-openmoko_2.6.22.5.bb @@ -9,7 +9,7 @@ KERNEL_RELEASE = "2.6.22.5" #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}" PV = "${KERNEL_RELEASE}-moko11+svnr${SRCREV}" -PR = "r9" +PR = "r10" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" -- cgit v1.2.3 From 86ac2421b3bb0fc7d8b38c7fa43477db1f389b14 Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Thu, 29 Nov 2007 16:35:55 +0000 Subject: linux-2.6.23: add license for mpc8313e-rdb LEDs module, fixes module loading --- packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch index d8a477af2a..0310746dfe 100644 --- a/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch +++ b/packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch @@ -145,7 +145,7 @@ diff -urN linux-2.6.23.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.23/driver + +MODULE_AUTHOR("Leon Woestenberg "); +MODULE_DESCRIPTION("MPC8313E-RDB LED driver"); -+ ++MODULE_LICENSE("GPL"); diff -urN linux-2.6.23.orig/drivers/leds/Makefile linux-2.6.23/drivers/leds/Makefile --- linux-2.6.23.orig/drivers/leds/Makefile 2007-10-09 22:31:38.000000000 +0200 +++ linux-2.6.23/drivers/leds/Makefile 2007-11-29 09:03:09.000000000 +0100 -- cgit v1.2.3