[oe-commits] org.oe.dev merge of '12a5f73e8b6922f363bf3e18f46fb736deb6f823'
rpurdie commit
openembedded-commits at lists.openembedded.org
Mon Feb 18 15:06:34 UTC 2008
merge of '12a5f73e8b6922f363bf3e18f46fb736deb6f823'
and '7a170f4e49a2a3b05d6855d45d33f79e55f590a0'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 312abdcbb7f1c8b20dcda1dadb8df745c4db060d
ViewMTN: http://monotone.openembedded.org/revision/info/312abdcbb7f1c8b20dcda1dadb8df745c4db060d
Files:
1
packages/gtk-webcore/osb-nrcore.inc
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
Diffs:
#
# mt diff -r12a5f73e8b6922f363bf3e18f46fb736deb6f823 -r312abdcbb7f1c8b20dcda1dadb8df745c4db060d
#
#
#
# patch "packages/gtk-webcore/osb-nrcore.inc"
# from [fcbcebe1996ba7e345c0c82426a17e5ae37ba241]
# to [14b28a3540c2fd2e0aff8ac709b81699cf3cc3e5]
#
============================================================
--- packages/gtk-webcore/osb-nrcore.inc fcbcebe1996ba7e345c0c82426a17e5ae37ba241
+++ packages/gtk-webcore/osb-nrcore.inc 14b28a3540c2fd2e0aff8ac709b81699cf3cc3e5
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "Gtk+ WebCore - rendering engine"
HOMEPAGE = "http://gtk-webcore.sourceforge.net/"
PRIORITY = "optional"
SECTION = "gpe"
LICENSE = "GPL"
-DEPENDS = "glib-2.0 gtk+ pango osb-jscore libxt"
+DEPENDS = "glib-2.0 gtk+ pango osb-jscore libxt gperf-native"
LEAD_SONAME = "libnrcore.so"
#
# mt diff -r7a170f4e49a2a3b05d6855d45d33f79e55f590a0 -r312abdcbb7f1c8b20dcda1dadb8df745c4db060d
#
#
#
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# from [f9f0f5550a035d11532343bcf6adeddd9141aacb]
# to [ec0ab967eff58b5d646241e714a9e0f0ee02b8fa]
#
# patch "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# from [c051c656cccc3f7c4bb15b21010e3e198b2e651d]
# to [c65b7970a1e647bf8a77f9cc13d979ea9215072b]
#
============================================================
--- packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch f9f0f5550a035d11532343bcf6adeddd9141aacb
+++ packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch ec0ab967eff58b5d646241e714a9e0f0ee02b8fa
@@ -20,8 +20,8 @@ diff -urN linux-2.6.23.orig/drivers/leds
@@ -0,0 +1,171 @@
+/*
+ * drivers/leds/leds-mpc8313e-rdb.c
++ * Copyright (C) 2007 Jeremy Laine <jeremy.laine at bolloretelecom.eu>
+ * Copyright (C) 2007 Leon Woestenberg <leon at sidebranch.com>
-+ * Copyright (C) 2007 Jeremy Laine <jeremy.laine at bolloretelecom.eu>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
@@ -99,21 +99,21 @@ diff -urN linux-2.6.23.orig/drivers/leds
+ },
+ {
+ .cdev = {
-+ .name = "mpc8313:green",
++ .name = "mpc8313:led5",
+ .brightness_set = mpc8313leds_set,
+ },
+ .bitmask = 32,
+ },
+ {
+ .cdev = {
-+ .name = "mpc8313:yellow",
++ .name = "mpc8313:led6",
+ .brightness_set = mpc8313leds_set,
+ },
+ .bitmask = 64,
+ },
+ {
+ .cdev = {
-+ .name = "mpc8313:red",
++ .name = "mpc8313:led7",
+ .brightness_set = mpc8313leds_set,
+ },
+ .bitmask = 128,
@@ -186,7 +186,7 @@ diff -urN linux-2.6.23.orig/drivers/leds
+module_init(mpc8313leds_init);
+module_exit(mpc8313leds_exit);
+
-+MODULE_AUTHOR("Leon Woestenberg <leon at sidebranch.com>");
++MODULE_AUTHOR("Jeremy Laine <jeremy.laine at bolloretelecom.eu>");
+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
============================================================
--- packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch c051c656cccc3f7c4bb15b21010e3e198b2e651d
+++ packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch c65b7970a1e647bf8a77f9cc13d979ea9215072b
@@ -20,8 +20,8 @@ diff -urN linux-2.6.24.orig/drivers/leds
@@ -0,0 +1,171 @@
+/*
+ * drivers/leds/leds-mpc8313e-rdb.c
++ * Copyright (C) 2007 Jeremy Laine <jeremy.laine at bolloretelecom.eu>
+ * Copyright (C) 2007 Leon Woestenberg <leon at sidebranch.com>
-+ * Copyright (C) 2007 Jeremy Laine <jeremy.laine at bolloretelecom.eu>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
@@ -99,21 +99,21 @@ diff -urN linux-2.6.24.orig/drivers/leds
+ },
+ {
+ .cdev = {
-+ .name = "mpc8313:green",
++ .name = "mpc8313:led5",
+ .brightness_set = mpc8313leds_set,
+ },
+ .bitmask = 32,
+ },
+ {
+ .cdev = {
-+ .name = "mpc8313:yellow",
++ .name = "mpc8313:led6",
+ .brightness_set = mpc8313leds_set,
+ },
+ .bitmask = 64,
+ },
+ {
+ .cdev = {
-+ .name = "mpc8313:red",
++ .name = "mpc8313:led7",
+ .brightness_set = mpc8313leds_set,
+ },
+ .bitmask = 128,
@@ -186,7 +186,7 @@ diff -urN linux-2.6.24.orig/drivers/leds
+module_init(mpc8313leds_init);
+module_exit(mpc8313leds_exit);
+
-+MODULE_AUTHOR("Leon Woestenberg <leon at sidebranch.com>");
++MODULE_AUTHOR("Jeremy Laine <jeremy.laine at bolloretelecom.eu>");
+MODULE_DESCRIPTION("MPC8313E-RDB LED driver");
+MODULE_LICENSE("GPL");
diff -urN linux-2.6.24.orig/drivers/leds/Makefile linux-2.6.24/drivers/leds/Makefile
More information about the Openembedded-commits
mailing list