[oe-commits] org.oe.dev merge of '4ea5a9aef34545de02877a14b307a17a78e03939'

[cbrake commit]

merge of '4ea5a9aef34545de02877a14b307a17a78e03939'
     and '886aada8adfc803f178de9d934a313ed503451e9'

Author: cbrake at openembedded.org
Branch: org.openembedded.dev
Revision: 1e575ee19c4be65ddd942d560d34650b51e32422
ViewMTN: http://monotone.openembedded.org/revision/info/1e575ee19c4be65ddd942d560d34650b51e32422
Files:
1
packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch
packages/linux/linux-openmoko_2.6.22.5.bb
packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
packages/mono/mono-native_1.2.2.1.bb
packages/mono/mono-native_1.2.4.bb
packages/mono/mono.inc
packages/mono/mono_1.2.2.1.bb
packages/mono/mono_1.2.4.bb
packages/mono/mono_1.2.4.inc
packages/mono/mono-mcs-intermediate_1.2.5.1.bb
packages/mono/mono-native_1.2.5.1.bb
Diffs:

#
# mt diff -r4ea5a9aef34545de02877a14b307a17a78e03939 -r1e575ee19c4be65ddd942d560d34650b51e32422
#
# 
# 
# add_file "packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch"
#  content [d1e9c06ce4952ff0a7dabcde128cdf5e40cb4a95]
# 
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
#  from [f3b1d99f1b43cbae85ff7d9ceb04575f5f70393c]
#    to [74cf9545f327bec956585be1f56bb8cf83366097]
# 
# patch "packages/uboot/u-boot-mkimage-openmoko-native_oe.bb"
#  from [811efcb68b9e1157d7d80f7525f1c0fe7506a91e]
#    to [c01c65b1498babb2fc3be4730cb705493ee6c823]
# 
============================================================
--- packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch	d1e9c06ce4952ff0a7dabcde128cdf5e40cb4a95
+++ packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch	d1e9c06ce4952ff0a7dabcde128cdf5e40cb4a95
@@ -0,0 +1,17 @@
+Index: git/tools/Makefile
+===================================================================
+--- git.orig/tools/Makefile	2007-10-03 16:51:38.000000000 +0100
++++ git/tools/Makefile	2007-10-03 16:52:03.000000000 +0100
+@@ -114,9 +114,9 @@
+ #
+ # Use native tools and options
+ #
+-CPPFLAGS   = -idirafter $(SRCTREE)/include \
+-		-idirafter $(OBJTREE)/include2 \
+-		-idirafter $(OBJTREE)/include \
++CPPFLAGS   = -I$(SRCTREE)/include \
++		-I$(OBJTREE)/include2 \
++		-I$(OBJTREE)/include \
+ 		-DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC
+ CFLAGS     = $(HOST_CFLAGS) $(CPPFLAGS) -O
+ AFLAGS	   = -D__ASSEMBLY__ $(CPPFLAGS)
============================================================
--- packages/linux/linux-openmoko_2.6.22.5.bb	f3b1d99f1b43cbae85ff7d9ceb04575f5f70393c
+++ packages/linux/linux-openmoko_2.6.22.5.bb	74cf9545f327bec956585be1f56bb8cf83366097
@@ -8,4 +8,4 @@ PV = "${VANILLA_VERSION}-${MOKOR}"
 VANILLA_VERSION = "2.6.22.5"
 MOKOR = "moko11+svnr${SRCREV}"
 PV = "${VANILLA_VERSION}-${MOKOR}"
+PR = "r3"
-PR = "r2"
============================================================
--- packages/uboot/u-boot-mkimage-openmoko-native_oe.bb	811efcb68b9e1157d7d80f7525f1c0fe7506a91e
+++ packages/uboot/u-boot-mkimage-openmoko-native_oe.bb	c01c65b1498babb2fc3be4730cb705493ee6c823
@@ -55,6 +55,7 @@ file://unbusy-i2c.patch;patch=1 \
 file://uboot-s3c2443.patch;patch=1 \
 file://uboot-smdk2443.patch;patch=1 \
 file://unbusy-i2c.patch;patch=1 \
+file://makefile-no-dirafter.patch;patch=1 \
 "
 
 PROVIDES = ""


#
# mt diff -r886aada8adfc803f178de9d934a313ed503451e9 -r1e575ee19c4be65ddd942d560d34650b51e32422
#
# 
# 
# delete "packages/mono/mono-native_1.2.2.1.bb"
# 
# delete "packages/mono/mono-native_1.2.4.bb"
# 
# delete "packages/mono/mono.inc"
# 
# delete "packages/mono/mono_1.2.2.1.bb"
# 
# delete "packages/mono/mono_1.2.4.bb"
# 
# delete "packages/mono/mono_1.2.4.inc"
# 
# patch "packages/mono/mono-mcs-intermediate_1.2.5.1.bb"
#  from [cfb4d3805aa5678e130a2fe308b7bc1c5c8a9ded]
#    to [1d9b9b066d4c1157f47a1cb5632cae01cb04c41a]
# 
# patch "packages/mono/mono-native_1.2.5.1.bb"
#  from [161daeba7bb6f373f0acea01b5d4fa973e519bb2]
#    to [39cb5bc5e5684d008b2377df93a95072e79a4de7]
# 
============================================================
--- packages/mono/mono-mcs-intermediate_1.2.5.1.bb	cfb4d3805aa5678e130a2fe308b7bc1c5c8a9ded
+++ packages/mono/mono-mcs-intermediate_1.2.5.1.bb	1d9b9b066d4c1157f47a1cb5632cae01cb04c41a
@@ -9,6 +9,8 @@ DEPENDS = "mono-native glib-2.0-native"
 PR = "r0"
 DEPENDS = "mono-native glib-2.0-native"
 
+PARALLEL_MAKE = ""
+
 SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
 
 # Inherit native to set up compiler and paths ...
============================================================
--- packages/mono/mono-native_1.2.5.1.bb	161daeba7bb6f373f0acea01b5d4fa973e519bb2
+++ packages/mono/mono-native_1.2.5.1.bb	39cb5bc5e5684d008b2377df93a95072e79a4de7
@@ -1,9 +1,11 @@ SRC_URI += "file://mono-fix-libdir-path.
 require mono_1.2.5.inc
 PR = "r1"
 DEPENDS = "glib-2.0-native"
 
 SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
 
+PARALLEL_MAKE = ""
+
 inherit native
 
 #do_stage_prepend() {