diff options
| author | Cliff Brake <cbrake@bec-systems.com> | 2007-10-03 17:08:10 +0000 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2007-10-03 17:08:10 +0000 |
| commit | b4fe3fc9e87bf6c26b23304434187548439b5ebf (patch) | |
| tree | 755a1506070f77e6049263b710b015c4284a5e8d /packages | |
| parent | 904f1c4293bb3782630904246eb9f1e7d4ca473d (diff) | |
| parent | bc7a87b8d2670b3023308c4a83c00625b3947241 (diff) | |
merge of '4ea5a9aef34545de02877a14b307a17a78e03939'
and '886aada8adfc803f178de9d934a313ed503451e9'
Diffstat (limited to 'packages')
3 files changed, 19 insertions, 1 deletions
diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb index e4608a7565..290f475130 100644 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ b/packages/linux/linux-openmoko_2.6.22.5.bb @@ -8,4 +8,4 @@ SRC_URI += "file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1" VANILLA_VERSION = "2.6.22.5" MOKOR = "moko11+svnr${SRCREV}" PV = "${VANILLA_VERSION}-${MOKOR}" -PR = "r2" +PR = "r3" diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch b/packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch new file mode 100644 index 0000000000..2ed26c3127 --- /dev/null +++ b/packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch @@ -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) diff --git a/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb b/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb index 8d69a54c4c..d0d47d84d8 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb +++ b/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb @@ -55,6 +55,7 @@ file://uboot-gta02.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 = "" |