[oe-commits] org.oe.dev merge of '4688c77d9f496fd36f6b1845f37bc3c42af85968'

coredump2 commit openembedded-commits at lists.openembedded.org
Thu Nov 29 18:08:00 UTC 2007 

merge of '4688c77d9f496fd36f6b1845f37bc3c42af85968'
     and 'dd83c0ba4e83a6207462418b614431ce061d9481'

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 805d2f01c6463550c4d0dd1f943fc6f32ae13613
ViewMTN: http://monotone.openembedded.org/revision/info/805d2f01c6463550c4d0dd1f943fc6f32ae13613
Files:
1
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/xorg-driver/xorg-driver-common.inc
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
packages/subversion/subversion_1.4.5.bb
packages/zaurusd/zaurusd_svn.bb
Diffs:

#
# mt diff -r4688c77d9f496fd36f6b1845f37bc3c42af85968 -r805d2f01c6463550c4d0dd1f943fc6f32ae13613
#
# 
# 
# 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/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]
# 
============================================================
--- 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/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
++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
 @@ -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
============================================================
--- packages/linux/linux-openmoko/defconfig-2.6.22.5	0ad0a08d6c357e7ddb1c404f4d28dfc5841533ba
+++ packages/linux/linux-openmoko/defconfig-2.6.22.5	e99fa0ba97f837d12336a38d842736efbb729f6e
@@ -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_HWECC=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
============================================================
--- packages/linux/linux-openmoko_2.6.22.5.bb	d9fa586ff6b631d3fe9d2a2c351310abc09112b3
+++ packages/linux/linux-openmoko_2.6.22.5.bb	cf4bec2bd369c8bb8d1c434003bd0947e4520cfa
@@ -9,7 +9,7 @@ PV = "${KERNEL_RELEASE}-moko11+svnr${SRC
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
 
 PV = "${KERNEL_RELEASE}-moko11+svnr${SRCREV}"
-PR = "r9"
+PR = "r10"
 
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"
============================================================
--- packages/xorg-driver/xorg-driver-common.inc	8e3a17d5b86c5abdc417ad03bdbc969ebf7a9ada
+++ packages/xorg-driver/xorg-driver-common.inc	0049aa3e6a36c971cf59d2d82363f7970bec5e5f
@@ -1,8 +1,8 @@ LICENSE = "MIT-X"
 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_configure_prepend() {
 
 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'`
============================================================
--- packages/xorg-xserver/xorg-xserver-common.inc	0d69c6f61a6ca360fcd4b18edbfa62de23b5e7f2
+++ packages/xorg-xserver/xorg-xserver-common.inc	646528aff2b8e45f44e9fc625cfb5816473ad872
@@ -31,9 +31,9 @@ FILES_${PN}-doc += "${libdir}/X11/doc /u
 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() {
============================================================
--- packages/xorg-xserver/xserver-xorg_1.3.0.0.bb	681fb7690ba32eb5b1f8d88e2b4c67162ffea064
+++ packages/xorg-xserver/xserver-xorg_1.3.0.0.bb	90ab10be4b7894e29fabbe78fccead9685ff87ac
@@ -1,8 +1,8 @@ PE = "1"
 MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://drmfix.patch;patch=1"
 


#
# mt diff -rdd83c0ba4e83a6207462418b614431ce061d9481 -r805d2f01c6463550c4d0dd1f943fc6f32ae13613
#
# 
# 
# add_file "packages/subversion/subversion_1.4.5.bb"
#  content [680bf01cbd49adaec6a24e728327d7aec6fbaa94]
# 
# patch "packages/zaurusd/zaurusd_svn.bb"
#  from [fd7e6ab176fd80995c6a4aa697765dd21900decd]
#    to [f709b2aca8b8c4c78926edcec52fc48ed0c06540]
# 
============================================================
--- 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/zaurusd/zaurusd_svn.bb	fd7e6ab176fd80995c6a4aa697765dd21900decd
+++ packages/zaurusd/zaurusd_svn.bb	f709b2aca8b8c4c78926edcec52fc48ed0c06540
@@ -1,10 +1,10 @@ LICENSE = "GPL"
 DESCRIPTION = "Daemon to handle device specifc features."
 SECTION = "base"
 LICENSE = "GPL"
-DEPENDS = "tslib gpe-conf"
-RDEPENDS = "procps gpe-conf"
+DEPENDS = "tslib"
+RDEPENDS = "procps"
 PV = "0.0+svn${SRCDATE}"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \

More information about the Openembedded-commits mailing list