[oe-commits] org.oe.dev merge of '0a81de11f045dd65f6ea4c630250337cc8f718b2'

rwhitby commit openembedded-commits at lists.openembedded.org
Fri Nov 30 12:42:57 UTC 2007 

merge of '0a81de11f045dd65f6ea4c630250337cc8f718b2'
     and '0dbb48946ab15c0ee9c232d1a1fc31e5b65037cd'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 226cdcce8c422a3c5d420243a4b26941911b1340
ViewMTN: http://monotone.openembedded.org/revision/info/226cdcce8c422a3c5d420243a4b26941911b1340
Files:
1
packages/gtk+/gdk-pixbuf-csource_2.10.14.bb
packages/gtk+/gdk-pixbuf_2.10.14.bb
packages/wesnoth
packages/gcc/gcc-4.2.1/pr34130.patch
packages/gcc/gcc-4.2.2/pr34130.patch
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
packages/openmoko2/openmoko-sample2_svn.bb
packages/subversion/subversion_1.4.5.bb
packages/wesnoth/wesnoth_svn.bb
conf/distro/include/sane-srcrevs.inc
packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-openmoko/defconfig-2.6.22.5
packages/linux/linux-openmoko_2.6.22.5.bb
packages/linux/linux.inc
packages/linux/linux_2.6.23.bb
packages/tasks/task-toolchain-openmoko-sdk.bb
packages/xorg-driver/xorg-driver-common.inc
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
packages/zaurusd/files/zaurus-hinge.bl-off
packages/zaurusd/files/zaurus-hinge.bl-on
packages/zaurusd/files/zaurus-hinge.matchbox-landscape
packages/zaurusd/files/zaurus-hinge.matchbox-portrait
packages/zaurusd/zaurusd_svn.bb
packages/images/nslu2-minimal-image.bb
Diffs:

#
# mt diff -r0a81de11f045dd65f6ea4c630250337cc8f718b2 -r226cdcce8c422a3c5d420243a4b26941911b1340
#
# 
# 
# rename "packages/gtk+/gdk-pixbuf-csource_2.10.14.bb"
#     to "packages/gtk+/gdk-pixbuf_2.10.14.bb"
# 
# add_dir "packages/wesnoth"
# 
# add_file "packages/gcc/gcc-4.2.1/pr34130.patch"
#  content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
# 
# add_file "packages/gcc/gcc-4.2.2/pr34130.patch"
#  content [23564cf74db7c5330d103f2b44e167ad2ef97eba]
# 
# add_file "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch"
#  content [953bccbd5cef5767c0a922ebc7eeae4691dbfb65]
# 
# add_file "packages/openmoko2/openmoko-sample2_svn.bb"
#  content [8dfb2ad71843cf6a80cb46f17623565dbd5a95fa]
# 
# add_file "packages/subversion/subversion_1.4.5.bb"
#  content [680bf01cbd49adaec6a24e728327d7aec6fbaa94]
# 
# add_file "packages/wesnoth/wesnoth_svn.bb"
#  content [de8bbc9e99d99055231c5edc26d756f2d06012dc]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [9f3cdfb4521c1a35261f43b7b2016b5f26a65a26]
#    to [bc40688afe191b0c44901104e4d5b033cfbd00b7]
# 
# patch "packages/gtk+/gdk-pixbuf_2.10.14.bb"
#  from [a2ef39d2f5b1d4cfee0c652d063ffca9ebded3d9]
#    to [3c53647f0df0c1e147fdccf3679a22bc6128bc18]
# 
# patch "packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
#  from [73675fe25a8fbdb8b9a32f1405498f94fbdd6c12]
#    to [17503c55f830f3a3deb1876d7d390a42edb3bc6b]
# 
# patch "packages/linux/linux-openmoko/defconfig-2.6.22.5"
#  from [0ad0a08d6c357e7ddb1c404f4d28dfc5841533ba]
#    to [e99fa0ba97f837d12336a38d842736efbb729f6e]
# 
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
#  from [d9fa586ff6b631d3fe9d2a2c351310abc09112b3]
#    to [cf4bec2bd369c8bb8d1c434003bd0947e4520cfa]
# 
# patch "packages/linux/linux.inc"
#  from [12ee7627f507a1eb127802f7268674f901a357fc]
#    to [d6f662d0c2c24eea3b90b2d9c4fcc01f9ab6779f]
# 
# patch "packages/linux/linux_2.6.23.bb"
#  from [24ff32f454e2986756b191f3d2024191467b032b]
#    to [1ad744b33520a65188c10577d6ef70a69a3554aa]
# 
# patch "packages/tasks/task-toolchain-openmoko-sdk.bb"
#  from [7af4fab2e6a807dcffa21e3e435c72702f5f2e0f]
#    to [5baf630d26e6cc447d9e9ced5601370e57f768af]
# 
# patch "packages/xorg-driver/xorg-driver-common.inc"
#  from [8e3a17d5b86c5abdc417ad03bdbc969ebf7a9ada]
#    to [0049aa3e6a36c971cf59d2d82363f7970bec5e5f]
# 
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
#  from [0d69c6f61a6ca360fcd4b18edbfa62de23b5e7f2]
#    to [646528aff2b8e45f44e9fc625cfb5816473ad872]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
#  from [681fb7690ba32eb5b1f8d88e2b4c67162ffea064]
#    to [90ab10be4b7894e29fabbe78fccead9685ff87ac]
# 
# patch "packages/zaurusd/files/zaurus-hinge.bl-off"
#  from [6b5b6c2065f8cbf3dd7bc5b7a072b9a764a11ee0]
#    to [87e4a1fb6db37f2ea10378ad5f16b108e4d776ae]
# 
# patch "packages/zaurusd/files/zaurus-hinge.bl-on"
#  from [1ee2f2e97eb96e6dbedfc4f6932cc72538219b6b]
#    to [a404c868701b2d3e35654159015ae6d17b9e7a9d]
# 
# patch "packages/zaurusd/files/zaurus-hinge.matchbox-landscape"
#  from [e8f23204b8c84cf6729bc660e08557b142b9a44f]
#    to [6286ae2f378c8f1957380d5d7de3685230da505a]
# 
# patch "packages/zaurusd/files/zaurus-hinge.matchbox-portrait"
#  from [9b9c517d633741164770bdcc173cafb2d78ed0fe]
#    to [96a2bedfd5c53f713a461c275b147293229eb629]
# 
# patch "packages/zaurusd/zaurusd_svn.bb"
#  from [fd7e6ab176fd80995c6a4aa697765dd21900decd]
#    to [1c6948752ce366ab73d19f934f67c028b61ebc87]
# 
============================================================
--- packages/gcc/gcc-4.2.1/pr34130.patch	23564cf74db7c5330d103f2b44e167ad2ef97eba
+++ packages/gcc/gcc-4.2.1/pr34130.patch	23564cf74db7c5330d103f2b44e167ad2ef97eba
@@ -0,0 +1,16 @@
+Index: gcc-4.1.2/gcc/fold-const.c
+===================================================================
+--- gcc-4.1.2.orig/gcc/fold-const.c	2007-11-21 18:53:42.000000000 +0100
++++ gcc-4.1.2/gcc/fold-const.c	2007-11-21 18:56:26.000000000 +0100
+@@ -5339,7 +5339,10 @@
+             }
+           break;
+         }
+-      /* FALLTHROUGH */
++   /* If the constant is negative, we cannot simplify this.  */
++   if (tree_int_cst_sgn (c) == -1)
++     break;
++   /* FALLTHROUGH */
+     case NEGATE_EXPR:
+       if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0)
+ 	return fold_build1 (tcode, ctype, fold_convert (ctype, t1));
============================================================
--- packages/gcc/gcc-4.2.2/pr34130.patch	23564cf74db7c5330d103f2b44e167ad2ef97eba
+++ packages/gcc/gcc-4.2.2/pr34130.patch	23564cf74db7c5330d103f2b44e167ad2ef97eba
@@ -0,0 +1,16 @@
+Index: gcc-4.1.2/gcc/fold-const.c
+===================================================================
+--- gcc-4.1.2.orig/gcc/fold-const.c	2007-11-21 18:53:42.000000000 +0100
++++ gcc-4.1.2/gcc/fold-const.c	2007-11-21 18:56:26.000000000 +0100
+@@ -5339,7 +5339,10 @@
+             }
+           break;
+         }
+-      /* FALLTHROUGH */
++   /* If the constant is negative, we cannot simplify this.  */
++   if (tree_int_cst_sgn (c) == -1)
++     break;
++   /* FALLTHROUGH */
+     case NEGATE_EXPR:
+       if ((t1 = extract_muldiv (op0, c, code, wide_type)) != 0)
+ 	return fold_build1 (tcode, ctype, fold_convert (ctype, t1));
============================================================
--- packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch	953bccbd5cef5767c0a922ebc7eeae4691dbfb65
+++ packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-rtc.patch	953bccbd5cef5767c0a922ebc7eeae4691dbfb65
@@ -0,0 +1,32 @@
+diff -urN linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts
+--- linux-2.6.23.orig/arch/powerpc/boot/dts/mpc8313erdb.dts	2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/arch/powerpc/boot/dts/mpc8313erdb.dts	2007-11-29 19:32:21.000000000 +0100
+@@ -60,6 +60,12 @@
+ 			interrupts = <e 8>;
+ 			interrupt-parent = < &ipic >;
+ 			dfsrr;
++
++			rtc at 68 {
++				device_type = "rtc";
++				compatible = "dallas,ds1339";
++				reg = <68>;
++			};
+ 		};
+ 
+ 		i2c at 3100 {
+diff -urN linux-2.6.23.orig/arch/powerpc/sysdev/fsl_soc.c linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c
+--- linux-2.6.23.orig/arch/powerpc/sysdev/fsl_soc.c	2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/arch/powerpc/sysdev/fsl_soc.c	2007-11-29 19:31:58.000000000 +0100
+@@ -319,6 +319,12 @@
+ 	{"ricoh,rs5c372b", "rtc-rs5c372", "rs5c372b",},
+ 	{"ricoh,rv5c386",  "rtc-rs5c372", "rv5c386",},
+ 	{"ricoh,rv5c387a", "rtc-rs5c372", "rv5c387a",},
++	{"dallas,ds1307",  "rtc-ds1307",  "ds1307",},
++	{"dallas,ds1337",  "rtc-ds1307",  "ds1337",},
++	{"dallas,ds1338",  "rtc-ds1307",  "ds1338",},
++	{"dallas,ds1339",  "rtc-ds1307",  "ds1339",},
++	{"dallas,ds1340",  "rtc-ds1307",  "ds1340",},
++	{"stm,m41t00",     "rtc-ds1307",  "m41t00"},
+ };
+ 
+ static int __init of_find_i2c_driver(struct device_node *node, struct i2c_board_info *info)
============================================================
--- packages/openmoko2/openmoko-sample2_svn.bb	8dfb2ad71843cf6a80cb46f17623565dbd5a95fa
+++ packages/openmoko2/openmoko-sample2_svn.bb	8dfb2ad71843cf6a80cb46f17623565dbd5a95fa
@@ -0,0 +1,24 @@
+DESCRIPTION = "The OpenMoko Sample Project"
+SECTION = "openmoko/applications"
+DEPENDS = "libmokoui2 intltool gconf"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
+
+PACKAGES += "${PN}-src"
+# path should match the toolchain path
+FILES_${PN}-src = "/usr/local/openmoko"
+PACKAGE_ARCH_${PN}-src = "all"
+
+do_configure_prepend() {
+	install -d ${WORKDIR}/source
+	cp -a ${S} ${WORKDIR}/source/
+	find ${WORKDIR}/source -name ".svn"|xargs rm -rf
+}
+
+do_install_append() {
+	install -d ${D}/usr/local/openmoko/source/
+	cp -a ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/
+}
+
============================================================
--- packages/subversion/subversion_1.4.5.bb	680bf01cbd49adaec6a24e728327d7aec6fbaa94
+++ packages/subversion/subversion_1.4.5.bb	680bf01cbd49adaec6a24e728327d7aec6fbaa94
@@ -0,0 +1,33 @@
+DESCRIPTION = "The Subversion (svn) client"
+SECTION = "console/network"
+DEPENDS = "apr-util neon"
+RDEPENDS = "neon"
+LICENSE = "Apache BSD"
+HOMEPAGE = "http://subversion.tigris.org"
+
+PR = "r0"
+
+SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
+           file://disable-revision-install.patch;patch=1 \
+	   file://neon-detection.patch;patch=1"
+
+EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+                --without-berkeley-db --without-apxs --without-apache \
+                --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+                --with-apr-util=${STAGING_BINDIR_CROSS}"
+
+
+inherit autotools
+
+export LDFLAGS += " -L${STAGING_LIBDIR} "
+
+do_configure() {
+	gnu-configize
+	libtoolize --force
+	aclocal -I build/ -I build/ac-macros/ && autoconf
+	oe_runconf
+}
+
+do_stage() {
+	autotools_stage_all
+}
============================================================
--- packages/wesnoth/wesnoth_svn.bb	de8bbc9e99d99055231c5edc26d756f2d06012dc
+++ packages/wesnoth/wesnoth_svn.bb	de8bbc9e99d99055231c5edc26d756f2d06012dc
@@ -0,0 +1,19 @@
+DESCRIPTION = "fantasy turn-based strategy game"
+PV = "0.01+svnr${SRCREV}"
+PR = "r1"
+SECTION = "games"
+LICENSE = "GPL"
+DEPENDS += "libsdl-image libsdl-mixer libsdl-net"
+SRC_URI = "svn://svn.gna.org/svn/wesnoth;module=trunk;proto=http"
+
+EXTRA_OECONF += " --enable-tinygui --disable-python --enable-lite --enable-lowmem"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+addtask autogen after do_patch before do_configure
+
+do_autogen() {
+        cd ${WORKDIR}/trunk/ && ./autogen.sh --host=armv4t-angstrom-linux-gnueabi
+}
============================================================
--- conf/distro/include/sane-srcrevs.inc	9f3cdfb4521c1a35261f43b7b2016b5f26a65a26
+++ conf/distro/include/sane-srcrevs.inc	bc40688afe191b0c44901104e4d5b033cfbd00b7
@@ -15,9 +15,9 @@ SRCREV_pn-eds-dbus ?= "628"
 SRCREV_pn-dfu-util ?= "2866"
 SRCREV_pn-dfu-util-native ?= "2866"
 SRCREV_pn-eds-dbus ?= "628"
-SRCREV_pn-eglibc ?= "3531"
-SRCREV_pn-eglibc-initial ?= "3531"
-SRCREV_pn-eglibc-intermediate ?= "3531"
+SRCREV_pn-eglibc ?= "4355"
+SRCREV_pn-eglibc-initial ?= "4355"
+SRCREV_pn-eglibc-intermediate ?= "4355"
 SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7650"
@@ -123,6 +123,7 @@ SRCREV_pn-webkit-qtopia ?= "27222"
 SRCREV_pn-webkit-gtk ?= "27222"
 SRCREV_pn-webkit-qt ?= "27222"
 SRCREV_pn-webkit-qtopia ?= "27222"
+SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1623"
 SRCREV_pn-mplayer ?= "24587"
 SRCREV_pn-networkmanager ?= "2887"
============================================================
--- packages/gtk+/gdk-pixbuf-csource_2.10.14.bb	a2ef39d2f5b1d4cfee0c652d063ffca9ebded3d9
+++ packages/gtk+/gdk-pixbuf_2.10.14.bb	3c53647f0df0c1e147fdccf3679a22bc6128bc18
@@ -1,14 +1,60 @@
-require gtk+_${PV}.bb
+DESCRIPTION = "GDK PixBuf is a pixelmap image support library from the GTK+ \
+multi-platform toolkit for creating graphical user interfaces."
+HOMEPAGE = "http://www.gtk.org/"
+SECTION = "libs"
+LICENSE = "LGPL"
+PRIORITY = "optional"
 DEPENDS = "jpeg libpng gettext glib-2.0"
+
 S = "${WORKDIR}/gtk+-${PV}"
 FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
-SRC_URI += "file://reduce-dependencies.patch;patch=1"
+PR = "r0"
 
-#clear recommends for uclibc builds
-RRECOMMENDS = " "
-RRECOMMENDS_${PN}_linux = "  "
-RRECOMMENDS_${PN}_linux-gnueabi = " "
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
+           file://automake-lossage.patch;patch=1 \
+           file://reduce-dependencies.patch;patch=1"
 
+#           file://no-xwc.patch;patch=1 \
+#           file://disable-tooltips.patch;patch=1 \
+#           file://gtklabel-resize-patch;patch=1 \
+#           file://menu-deactivate.patch;patch=1 \
+#           file://xsettings.patch;patch=1 \
+#           file://scroll-timings.patch;patch=1 \
+#           file://small-gtkfilesel.patch;patch=1 \
+#           file://migration.patch;patch=1;pnum=0 \
+#           file://run-iconcache.patch;patch=1 \
+#           file://hardcoded_libtool.patch;patch=1 \
+#           file://no-demos.patch;patch=1 \
+#           file://single-click.patch;patch=1 \
+#           file://spinbutton.patch;patch=1 \
+#           file://gtk+-handhelds.patch;patch=1 \
+#           file://filesel-fix-segfault.patch;patch=1 \
+#           file://combo-arrow-size.patch;patch=1;pnum=0 \
+#           file://range-no-redraw.patch;patch=1;pnum=0 \
+#           file://scrolled-placement.patch;patch=1;pnum=0 \
+#           file://treeview-checkbox-size.patch;patch=1;pnum=0 \
+#           file://cell-renderer-edit-focus.patch;patch=1;pnum=0 \
+
+# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+require gtk-fpu.inc
+EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}"
+
+inherit autotools pkgconfig
+
+FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
+	${bindir}/gtk-update-icon-cache \
+	${libdir}/lib*.so.*"
+
+FILES_${PN}-dev += " \
+        ${datadir}/gtk-2.0/include \
+	${libdir}/gtk-2.0/include \
+	${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
+	${bindir}/gdk-pixbuf-csource \
+	${bindir}/gtk-builder-convert"
+
+FILES_${PN}-dbg += " \
+        ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/*"
+
 EXTRA_OECONF = "\
   --without-x \
   --with-gdktarget=linux-fb \
@@ -17,12 +63,14 @@ EXTRA_OECONF = "\
   --with-libpng \
 "
 
+LIBV = "2.10.0"
+
 do_compile() {
 	cd gdk-pixbuf && oe_runmake
 }
 
 do_stage() {
-#	oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
 	cd gdk-pixbuf && oe_runmake install DESTDIR=${STAGING_DIR}/usr
 	autotools_stage_includes
 #	install -d -m 0755 ${STAGING_LIBDIR}/gtk-2.0/include
@@ -30,10 +78,26 @@ do_install() {
 }
 
 do_install() {
-	:
+	oe_libinstall -C gdk-pixbuf -so libgdk_pixbuf-2.0 ${D}/${libdir}
+	cd gdk-pixbuf && oe_runmake install DESTDIR=${D}
 }
 
-# override the function in gtk-*.inc (included by gtk+*.bb)
-populate_packages_prepend () {
+postinst_prologue() {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+}
 
+PACKAGES_DYNAMIC = "gdk-pixbuf-loader-*"
+
+python populate_packages_prepend () {
+	import os.path
+
+	prologue = bb.data.getVar("postinst_prologue", d, 1)
+
+	gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
+	loaders_root = os.path.join(gtk_libdir, 'loaders')
+	do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
+        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+                bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
 }
============================================================
--- packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch	73675fe25a8fbdb8b9a32f1405498f94fbdd6c12
+++ packages/linux/linux-2.6.23/mpc8313e-rdb/mpc8313e-rdb-leds.patch	17503c55f830f3a3deb1876d7d390a42edb3bc6b
@@ -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
@@ -147,16 +145,15 @@ Index: linux-2.6.23/drivers/leds/leds-mp
 +
 +MODULE_AUTHOR("Leon Woestenberg <leon at sidebranch.com>");
 +MODULE_DESCRIPTION("MPC8313E-RDB LED driver");
-+
-Index: linux-2.6.23/driver%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r0dbb48946ab15c0ee9c232d1a1fc31e5b65037cd -r226cdcce8c422a3c5d420243a4b26941911b1340
#
# 
# 
# add_file "packages/images/nslu2-minimal-image.bb"
#  content [b79cc878de38e428c269688f55fbd183cf6081c6]
# 
============================================================
--- packages/images/nslu2-minimal-image.bb	b79cc878de38e428c269688f55fbd183cf6081c6
+++ packages/images/nslu2-minimal-image.bb	b79cc878de38e428c269688f55fbd183cf6081c6
@@ -0,0 +1,3 @@
+require minimal-image.bb
+
+INHERIT += nslu2-image

More information about the Openembedded-commits mailing list