[oe-commits] org.oe.dev merge of '0425e652c6eebc54317f6dcfa596f669e0e8b24f'

oe commit openembedded-commits at lists.openembedded.org
Tue Feb 26 20:37:52 UTC 2008


merge of '0425e652c6eebc54317f6dcfa596f669e0e8b24f'
     and '4f9025ffec7033b44bb7e17c4198f016102c0b09'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: c50825ba187c292f591cf43c91216cebffb5e290
ViewMTN: http://monotone.openembedded.org/revision/info/c50825ba187c292f591cf43c91216cebffb5e290
Files:
1
packages/libzvbi/libzvbi_0.2.22.bb
packages/libzvbi/libzvbi_0.2.25.bb
packages/s3c2410-utils
packages/s3c24xx-utils
packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
classes/base.bbclass
classes/rm_work.bbclass
classes/seppuku.bbclass
classes/tinderclient.bbclass
conf/distro/include/sane-srcrevs.inc
packages/gsm/files/default
packages/gsm/files/gsmd
packages/gsm/gsmd.inc
packages/kexec/kexec-tools-static_1.101.bb
packages/klibc/klibc-common.inc
packages/klibc/klibc-utils-static_1.5.bb
packages/klibc/klibc_1.5.bb
packages/pulseaudio/pulse.inc
packages/pulseaudio/pulseaudio_0.9.6.bb
packages/pulseaudio/pulseaudio_0.9.9.bb
packages/python/python-dbus_0.82.4.bb
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
packages/udev/files/network.sh
Diffs:

#
# mt diff -r0425e652c6eebc54317f6dcfa596f669e0e8b24f -rc50825ba187c292f591cf43c91216cebffb5e290
#
# 
# 
# patch "packages/libzvbi/libzvbi_0.2.22.bb"
#  from [9c952feb57916c91c8d23c2e8f95a20ea5457240]
#    to [e42ca9d49986bd3006748f7561e2486104e2bad1]
# 
# patch "packages/libzvbi/libzvbi_0.2.25.bb"
#  from [d5f52c428ec52e1f0ed458b8d55b29079e09a376]
#    to [c6bcb0ed47482d578910438fe74d8e6cac0bb982]
# 
============================================================
--- packages/libzvbi/libzvbi_0.2.22.bb	9c952feb57916c91c8d23c2e8f95a20ea5457240
+++ packages/libzvbi/libzvbi_0.2.22.bb	e42ca9d49986bd3006748f7561e2486104e2bad1
@@ -5,11 +5,12 @@ DEPENDS = "libpng"
 LICENSE = "GPL"
 SECTION = "libs/multimedia"
 DEPENDS = "libpng"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/zapping/zvbi-${PV}.tar.bz2"
 S = "${WORKDIR}/zvbi-${PV}"
 
-inherit autotools
+inherit autotools pkgconfig 
 
 do_stage() {
 	autotools_stage_all
============================================================
--- packages/libzvbi/libzvbi_0.2.25.bb	d5f52c428ec52e1f0ed458b8d55b29079e09a376
+++ packages/libzvbi/libzvbi_0.2.25.bb	c6bcb0ed47482d578910438fe74d8e6cac0bb982
@@ -5,17 +5,16 @@ DEPENDS = "libpng"
 LICENSE = "GPL"
 SECTION = "libs/multimedia"
 DEPENDS = "libpng"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/zapping/zvbi-${PV}.tar.bz2"
 S = "${WORKDIR}/zvbi-${PV}"
 
 EXTRA_OECONF = "--without-x"
 
-inherit autotools
+inherit autotools pkgconfig 
 
 do_stage() {
 	autotools_stage_all
 }
 
-


#
# mt diff -r4f9025ffec7033b44bb7e17c4198f016102c0b09 -rc50825ba187c292f591cf43c91216cebffb5e290
#
# 
# 
# rename "packages/s3c2410-utils"
#     to "packages/s3c24xx-utils"
# 
# add_file "packages/s3c24xx-utils/s3c24xx-gpio_svn.bb"
#  content [e4d0ff4d3de3a71c5b5cd12a3d21e3b2d861c1ff]
# 
# patch "classes/base.bbclass"
#  from [1a4cea219c6fbdcac157bc9e75d192ac0d8ff7fc]
#    to [cb47f4951ca60041e077ae00509c54961b54d573]
# 
# patch "classes/rm_work.bbclass"
#  from [d5a7e76ed08a44739262da8cae8929a858775dfc]
#    to [37e569d9d18711a27e5823cb5e00f79377d3d92b]
# 
# patch "classes/seppuku.bbclass"
#  from [aa7c1e4b25e78a6657bbd1981530497920099520]
#    to [5ccb6b3ee62481e1ee237df90ec2f4a399801311]
# 
# patch "classes/tinderclient.bbclass"
#  from [dfb5637c7f39403fb14f5bcb72775bc48bab0393]
#    to [5228467af99962e39ee66df2bb9bd27b44416e13]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [1d34856d9ca6012cc763ecd617e7b2c5f48adb51]
#    to [3d1f11953c85fa6e00e10bea32052499d684600c]
# 
# patch "packages/gsm/files/default"
#  from [d981c451d500ec2d0079c4622536ebe440f68480]
#    to [00f5ac22d28dfa633906527cb0a62c72b37660a7]
# 
# patch "packages/gsm/files/gsmd"
#  from [a0382c9880f568f23f6fb0fb4ad912ceaab45cc5]
#    to [e5dbf3447ec499f1ef19adeb6230fe87e713ad8f]
# 
# patch "packages/gsm/gsmd.inc"
#  from [69249920053eb5816872a237e49b8a365ceac6e5]
#    to [458030ab86c43118e7b10e86a51f62df510fd307]
# 
# patch "packages/kexec/kexec-tools-static_1.101.bb"
#  from [5c7677ba0e8d8e43af7045696503b09ba7f8aab6]
#    to [631b2a5ebad7343ec05c584ae17b033dec44c0f7]
# 
# patch "packages/klibc/klibc-common.inc"
#  from [e31a6c551a6ead6e8029e2b0f4cb5117dcf1677f]
#    to [d9cdde96fbe760ebc175aebd4671ee242e8abda3]
# 
# patch "packages/klibc/klibc-utils-static_1.5.bb"
#  from [b5447c8999eb05a38a9dc43898f7b18b130f8f28]
#    to [916360409c4a5217a7e3e90b9db1cd0c130af357]
# 
# patch "packages/klibc/klibc_1.5.bb"
#  from [643abab68d99c185d9d7b361de44cd819352e425]
#    to [db997233fef8b6147bfeef57ccb19e974a588240]
# 
# patch "packages/pulseaudio/pulse.inc"
#  from [21cfea996a2da42f5d28bdf518cec74f51f8454a]
#    to [e0b40b31f99b5d34fb4d1e760418348db31be6bf]
# 
# patch "packages/pulseaudio/pulseaudio_0.9.6.bb"
#  from [b3802cedceb5a7186c47d292a6f3f50b420be551]
#    to [a4bbd8173a5406983182473a583d0439a4ed919e]
# 
# patch "packages/pulseaudio/pulseaudio_0.9.9.bb"
#  from [a076f2143bcd4c95f958a442f117d983aef69d9c]
#    to [a42f8d95ac47cb47a5e26144cc42a01d219a00e4]
# 
# patch "packages/python/python-dbus_0.82.4.bb"
#  from [265ecdc8752ede90876f5c5e513aa9a60ff60100]
#    to [0b72f74fcfa2cc0079dab2bfdcb2fac470905f05]
# 
# patch "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb"
#  from [5906c2607fc6aca5a48fa0b21942c425013f9722]
#    to [de2a6e1fced0d942ccf99957f28a7b6df646c687]
# 
# patch "packages/udev/files/network.sh"
#  from [a083d5cd7833b8ff451f248b0dbcd1587b7a13bc]
#    to [7caaec3edf7207bf5e4af707b1612fe7708d596a]
# 
============================================================
--- packages/s3c24xx-utils/s3c24xx-gpio_svn.bb	e4d0ff4d3de3a71c5b5cd12a3d21e3b2d861c1ff
+++ packages/s3c24xx-utils/s3c24xx-gpio_svn.bb	e4d0ff4d3de3a71c5b5cd12a3d21e3b2d861c1ff
@@ -0,0 +1,17 @@
+DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform"
+SECTION = "console/utils"
+LICENSE = "GPL"
+PV = "1.0+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http"
+S = "${WORKDIR}/gpio"
+
+do_compile() {
+	${CC} ${CFLAGS} ${LDFLAGS} -static -o ${PN} gpio.c
+}
+
+do_install() {
+	install -d ${D}${sbindir}
+	install -m 0755 ${PN} ${D}${sbindir}
+}
============================================================
--- classes/base.bbclass	1a4cea219c6fbdcac157bc9e75d192ac0d8ff7fc
+++ classes/base.bbclass	cb47f4951ca60041e077ae00509c54961b54d573
@@ -424,13 +424,21 @@ python base_do_clean() {
 	os.system('rm -f '+ dir)
 }
 
+#Uncomment this for bitbake 1.8.12
+#addtask rebuild after do_${BB_DEFAULT_TASK}
 addtask rebuild
 do_rebuild[dirs] = "${TOPDIR}"
 do_rebuild[nostamp] = "1"
 python base_do_rebuild() {
 	"""rebuild a package"""
-	bb.build.exec_task('do_clean', d)
-	bb.build.exec_task('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1), d)
+	from bb import __version__
+	try:
+		from distutils.version import LooseVersion
+	except ImportError:
+		def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
+	if (LooseVersion(__version__) < LooseVersion('1.8.11')):
+		bb.build.exec_func('do_clean', d)
+		bb.build.exec_task('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1), d)
 }
 
 addtask mrproper
@@ -442,7 +450,7 @@ python base_do_mrproper() {
 	if dir == '/': bb.build.FuncFailed("wrong DATADIR")
 	bb.debug(2, "removing " + dir)
 	os.system('rm -rf ' + dir)
-	bb.build.exec_task('do_clean', d)
+	bb.build.exec_func('do_clean', d)
 }
 
 addtask fetch
@@ -663,6 +671,17 @@ python base_eventhandler() {
 		if pesteruser:
 			bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser))
 
+	#
+	# Handle removing stamps for 'rebuild' task
+	#
+	if name.startswith("StampUpdate"):
+		for (fn, task) in e.targets:
+			#print "%s %s" % (task, fn)         
+			if task == "do_rebuild":
+				dir = "%s.*" % e.stampPrefix[fn]
+				bb.note("Removing stamps: " + dir)
+				os.system('rm -f '+ dir)
+
 	if not data in e.__dict__:
 		return NotHandled
 
@@ -900,7 +919,19 @@ python () {
                 return
 
 python () {
+    import bb
+    from bb import __version__
     base_after_parse(d)
+
+    # Remove this for bitbake 1.8.12
+    try:
+        from distutils.version import LooseVersion
+    except ImportError:
+        def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
+    if (LooseVersion(__version__) >= LooseVersion('1.8.11')):
+        deps = bb.data.getVarFlag('do_rebuild', 'deps', d) or []
+        deps.append('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1))
+        bb.data.setVarFlag('do_rebuild', 'deps', deps, d)
 }
 
 def check_app_exists(app, d):
============================================================
--- classes/rm_work.bbclass	d5a7e76ed08a44739262da8cae8929a858775dfc
+++ classes/rm_work.bbclass	37e569d9d18711a27e5823cb5e00f79377d3d92b
@@ -25,3 +25,23 @@ addtask rm_work_all after do_rm_work
 }
 do_rm_work_all[recrdeptask] = "do_rm_work"
 addtask rm_work_all after do_rm_work
+
+
+addhandler rmwork_stampfixing_eventhandler
+python rmwork_stampfixing_eventhandler() {
+    from bb.event import getName
+    import os
+
+    if getName(e) == "StampUpdate":
+        for (fn, task) in e.targets:
+            if task == 'rm_work_all':
+                continue
+            stamp = "%s.do_rm_work" % e.stampPrefix[fn]
+            if os.path.exists(stamp):
+                dir = "%s.*" % e.stampPrefix[fn]
+                bb.note("Removing stamps: " + dir)
+                os.system('rm -f '+ dir)
+
+    return NotHandled
+}
+
============================================================
--- classes/seppuku.bbclass	aa7c1e4b25e78a6657bbd1981530497920099520
+++ classes/seppuku.bbclass	5ccb6b3ee62481e1ee237df90ec2f4a399801311
@@ -303,7 +303,7 @@ python seppuku_eventhandler() {
 
     if name == "PkgFailed":
         if not bb.data.getVar('SEPPUKU_AUTOBUILD', data, True) == "0":
-            build.exec_task('do_clean', data)
+            build.exec_func('do_clean', data)
     elif name == "TaskFailed":
         cj = cookielib.CookieJar()
         opener  = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
============================================================
--- classes/tinderclient.bbclass	dfb5637c7f39403fb14f5bcb72775bc48bab0393
+++ classes/tinderclient.bbclass	5228467af99962e39ee66df2bb9bd27b44416e13
@@ -328,7 +328,7 @@ def tinder_do_tinder_report(event):
         log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('PF', event.data, True)
     elif name == "PkgFailed":
         if not data.getVar('TINDER_AUTOBUILD', event.data, True) == "0":
-            build.exec_task('do_clean', event.data)
+            build.exec_func('do_clean', event.data)
         log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('PF', event.data, True)
         status = 200
         # remember the failure for the -k case
============================================================
--- conf/distro/include/sane-srcrevs.inc	1d34856d9ca6012cc763ecd617e7b2c5f48adb51
+++ conf/distro/include/sane-srcrevs.inc	3d1f11953c85fa6e00e10bea32052499d684600c
@@ -30,6 +30,7 @@ SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
+SRCREV_pn-gpio ?= "4112"
 SRCREV_pn-gsm0710muxd ?= "77"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "56"
============================================================
--- packages/gsm/files/default	d981c451d500ec2d0079c4622536ebe440f68480
+++ packages/gsm/files/default	00f5ac22d28dfa633906527cb0a62c72b37660a7
@@ -13,6 +13,7 @@ case `machine_id` in
 		GSM_RES="/sys/bus/platform/devices/neo1973-pm-gsm.0/reset"
 		fi
 		GSM_DEV="/dev/ttySAC0"
+		GSM_DL="/sys/devices/platform/neo1973-pm-gsm.0/download"
 		;;
 	"htc_apache"|"htc_blueangel"|"htc_universal")
 		GSMD_OPTS="-s 115200 -F"
============================================================
--- packages/gsm/files/gsmd	a0382c9880f568f23f6fb0fb4ad912ceaab45cc5
+++ packages/gsm/files/gsmd	e5dbf3447ec499f1ef19adeb6230fe87e713ad8f
@@ -13,6 +13,8 @@ case "$1" in
 
 case "$1" in
     start)
+        [ -n "$GSM_DL" ] && echo "1" >$GSM_DL;
+
         [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
         [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
         [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
============================================================
--- packages/gsm/gsmd.inc	69249920053eb5816872a237e49b8a365ceac6e5
+++ packages/gsm/gsmd.inc	458030ab86c43118e7b10e86a51f62df510fd307
@@ -5,7 +5,7 @@ PV = "0.1+svnr${SRCREV}"
 PROVIDES += "gsmd"
 RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
 PV = "0.1+svnr${SRCREV}"
-PR = "r41"
+PR = "r42"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
============================================================
--- packages/kexec/kexec-tools-static_1.101.bb	5c7677ba0e8d8e43af7045696503b09ba7f8aab6
+++ packages/kexec/kexec-tools-static_1.101.bb	631b2a5ebad7343ec05c584ae17b033dec44c0f7
@@ -1,7 +1,7 @@ require kexec-tools.inc
 # the binaries are statical linked against klibc
 require kexec-tools.inc
 
-PR = "r2"
+PR = "r3"
 DEPENDS = "klibc"
 
 SRC_URI += "file://kexec-klibc.patch;patch=1"
@@ -18,6 +18,6 @@ PACKAGES =+ "kexec-static kdump-static"
 
 PACKAGES =+ "kexec-static kdump-static"
 
-FILES_kexec-klibc = "${sbindir}/kexec"
-FILES_kdump-klibc = "${sbindir}/kdump"
+FILES_kexec-static = "${sbindir}/kexec"
+FILES_kdump-static = "${sbindir}/kdump"
 
============================================================
--- packages/klibc/klibc-common.inc	e31a6c551a6ead6e8029e2b0f4cb5117dcf1677f
+++ packages/klibc/klibc-common.inc	d9cdde96fbe760ebc175aebd4671ee242e8abda3
@@ -16,8 +16,8 @@ ARM_INSTRUCTION_SET = "arm"
 # could be fixed, but for the moment:
 ARM_INSTRUCTION_SET = "arm"
 
-SRC_URI_append_linux-gnueabi = "\
-			       	file://klibc-config-eabi.patch;patch=1"
+SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1"
+SRC_URI_append_linux-uclibcgnueabi = "file://klibc-config-eabi.patch;patch=1"
 
 EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \
                 'CROSS_COMPILE=${TARGET_PREFIX}' \
============================================================
--- packages/klibc/klibc-utils-static_1.5.bb	b5447c8999eb05a38a9dc43898f7b18b130f8f28
+++ packages/klibc/klibc-utils-static_1.5.bb	916360409c4a5217a7e3e90b9db1cd0c130af357
@@ -1,6 +1,6 @@ require klibc-common.inc
 require klibc-common.inc
 
-PR = "r5"
+PR = "r6"
 
 
 # We only want the static utils. klibc build both. So we install only what we want.				
============================================================
--- packages/klibc/klibc_1.5.bb	643abab68d99c185d9d7b361de44cd819352e425
+++ packages/klibc/klibc_1.5.bb	db997233fef8b6147bfeef57ccb19e974a588240
@@ -1,2 +1,2 @@ require klibc.inc
 require klibc.inc
+PR = "r4"
-PR = "r3"
============================================================
--- packages/pulseaudio/pulse.inc	21cfea996a2da42f5d28bdf518cec74f51f8454a
+++ packages/pulseaudio/pulse.inc	e0b40b31f99b5d34fb4d1e760418348db31be6bf
@@ -84,7 +84,7 @@ pkg_postinst_${PN}-server() {
         grep -q pulse: /etc/passwd || \
             adduser --disabled-password --home=/var/run/pulse --system \
                     --ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
-        adduser pulse audio
+        addgroup pulse audio
         /etc/init.d/populate-volatile.sh update
 }
 
============================================================
--- packages/pulseaudio/pulseaudio_0.9.6.bb	b3802cedceb5a7186c47d292a6f3f50b420be551
+++ packages/pulseaudio/pulseaudio_0.9.6.bb	a4bbd8173a5406983182473a583d0439a4ed919e
@@ -1,4 +1,4 @@ require pulse.inc
 require pulse.inc
 
-PR = "r6"
+PR = "r7"
 
============================================================
--- packages/pulseaudio/pulseaudio_0.9.9.bb	a076f2143bcd4c95f958a442f117d983aef69d9c
+++ packages/pulseaudio/pulseaudio_0.9.9.bb	a42f8d95ac47cb47a5e26144cc42a01d219a00e4
@@ -8,7 +8,7 @@ SRC_URI += "\
   file://fix-dbus-without-hal.patch;patch=1 \
 "            
 
-PR = "r2"
+PR = "r3"
 
 # problems w/ pulseaudio 0.9.9 atm:
 # 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
============================================================
--- packages/python/python-dbus_0.82.4.bb	265ecdc8752ede90876f5c5e513aa9a60ff60100
+++ packages/python/python-dbus_0.82.4.bb	0b72f74fcfa2cc0079dab2bfdcb2fac470905f05
@@ -1,10 +1,10 @@ LICENSE = "MIT"
 DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
 SECTION = "devel/python"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "MIT"
-DEPENDS = "expat glib-2.0 virtual/libintl python-pyrex-native python"
-RDEPENDS = "dbus python-threading python-io python-stringold python-logging"
-PR = "ml0"
+DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
+RDEPENDS = "python-threading python-io python-stringold python-logging"
+PR = "ml1"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
 S = "${WORKDIR}/dbus-python-${PV}"
============================================================
--- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb	5906c2607fc6aca5a48fa0b21942c425013f9722
+++ packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb	de2a6e1fced0d942ccf99957f28a7b6df646c687
@@ -1,15 +1,15 @@ PRIORITY = "optional"
 DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
 AUTHOR = "Harald Welte <laforge at openmoko.org>, OpenMoko <openmoko-kernel at lists.openmoko.org>"
 LICENSE = "GPL"
 SECTION = "bootloader"
 PRIORITY = "optional"
 
-UBOOT_UPSTREAM_REV = "0ec595243dc99edcd248bbcfbfd5a1dc860bde89"
-UBOOT_OPENMOKO_REV = "3817"
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4"
+UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e"
+UBOOT_OPENMOKO_REV = "4118"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5"
 LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
 PV = "1.3.1${LOCALVERSION}"
-PR = "r1"
+PR = "r3"
 
 PROVIDES = "virtual/bootloader"
 S = "${WORKDIR}/git"
@@ -18,11 +18,11 @@ SRC_URI = "\
   git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \
   svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
-  file://makefile-no-dirafter.patch;patch=1 \
-  file://fix-data-abort-from-sd-ombug799.patch;patch=1 \
+#  file://makefile-no-dirafter.patch;patch=1 \
+#  file://fix-data-abort-from-sd-ombug799.patch;patch=1 \
 "
 
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
 TARGET_LDFLAGS = ""
 
 do_quilt() {
============================================================
--- packages/udev/files/network.sh	a083d5cd7833b8ff451f248b0dbcd1587b7a13bc
%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list