summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-10-30 14:50:31 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-10-30 14:50:31 +0000
commiteef6f1d950d0772086452937e5cd11e21b303686 (patch)
tree561faf79b12f83c784ad013ad53d01e0d980438b /conf/distro
parenta882f7e95c5db9e7b727cabccbd0773054fea8c7 (diff)
parent18f5c86801714259eaaa1e1a81565984f58ecd14 (diff)
merge of '13924b6ed700ce1a3e3b1fca1d40f3d76389688a'
and 'b93aeec0119f1318d2b0f72f074bfff67bc23942'
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/include/sane-srcrevs.inc14
-rw-r--r--conf/distro/sharprom-compatible.conf4
2 files changed, 10 insertions, 8 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d34d765af0..e537c66c30 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -9,12 +9,14 @@
SRCREV_pn-aircrack-ng ?= "802"
SRCREV_pn-bfin-uclibc ?= "1857"
+SRCREV_pn-dbus-c++-native ?= "13131"
+SRCREV_pn-dbus-c++ ?= "13131"
SRCREV_pn-dfu-util ?= "2866"
SRCREV_pn-dfu-util-native ?= "2866"
SRCREV_pn-eglibc ?= "3531"
SRCREV_pn-eglibc-initial ?= "3531"
SRCREV_pn-eglibc-intermediate ?= "3531"
-SRCREV_pn-ezxd ?= "2058"
+SRCREV_pn-ezxd ?= "2070"
SRCREV_pn-elf2flt="1786"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-fstests ?= "204"
@@ -27,7 +29,7 @@ SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libfakekey ?= "1455"
SRCREV_pn-libgsmd ?= "3074"
SRCREV_pn-libgsmd-devel ?= "3293"
-SRCREV_pn-libjana ?= "662"
+SRCREV_pn-libjana ?= "665"
SRCREV_pn-libmokogsmd2 ?= "2950"
SRCREV_pn-libmokojournal2 ?= "3217"
SRCREV_pn-libmokopanelui2 ?= "3226"
@@ -53,7 +55,7 @@ SRCREV_pn-osb-nrcit ?= "125"
SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-openmoko-appearance ?= "3239"
SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-appmanager2 ?= "3271"
+SRCREV_pn-openmoko-appmanager2 ?= "3299"
SRCREV_pn-openmoko-browser2 ?= "3249"
SRCREV_pn-openmoko-calculator ?= "2404"
SRCREV_pn-openmoko-calculator2 ?= "3235"
@@ -64,7 +66,7 @@ SRCREV_pn-openmoko-contacts2 ?= "358"
SRCREV_pn-openmoko-dates ?= "467"
SRCREV_pn-openmoko-dates2 ?= "658"
SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3282"
+SRCREV_pn-openmoko-dialer2 ?= "3298"
SRCREV_pn-openmoko-feedreader2 ?= "3080"
SRCREV_pn-openmoko-finger-demo ?= "1671"
SRCREV_pn-openmoko-firststart2 ?= "3158"
@@ -74,7 +76,7 @@ SRCREV_pn-openmoko-icon-theme-standard2 ?= "3225"
SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3225"
SRCREV_pn-openmoko-keyboard ?= "1631"
SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3274"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3300"
SRCREV_pn-openmoko-messages ?= "2276"
SRCREV_pn-openmoko-panel-battery ?= "3272"
SRCREV_pn-openmoko-panel-bt ?= "2896"
@@ -101,7 +103,7 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3210"
SRCREV_pn-openmoko-today ?= "3056"
SRCREV_pn-openmoko-today2 ?= "3287"
SRCREV_pn-openmoko-today2-folders ?= "2680"
-SRCREV_pn-openmoko-worldclock2 ?= "3241"
+SRCREV_pn-openmoko-worldclock2 ?= "3301"
SRCREV_pn-openocd ?= "206"
SRCREV_pn-openocd-native ?= "206"
SRCREV_pn-oprofileui ?= "160"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index fd01d21397..92fd42f4f8 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -20,8 +20,8 @@ FULL_OPTIMIZATION_pn-fetchmail = "-fexpensive-optimizations -fomit-frame-pointer
OEINCLUDELOGS = "yes"
KERNEL_CONSOLE = "tty1"
# prebuilt toolchain doesn't know about -isystem
-export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+export BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}"
#DEBUG_OPTIMIZATION = "-O -g3"
#DEBUG_BUILD = "1"