summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-09-26 08:58:28 +0000
committerRoss Burton <ross@openedhand.com>2008-09-26 08:58:28 +0000
commitcd8b52418c475cf8708f136babb2bfa2f3b1744f (patch)
tree5733077975e7d4f0e7efbd89207d8f7d2268287a /meta
parent75f3f9bb6d823faec884569400f9dcb6c28ef732 (diff)
downloadpoky-cd8b52418c475cf8708f136babb2bfa2f3b1744f.tar.gz
Merged revisions 5189-5198 via svnmerge from
https://svn.o-hand.com/repos/poky/trunk ........ r5189 | richard | 2008-09-11 23:41:08 +0100 (Thu, 11 Sep 2008) | 1 line local.conf.sample: Make the parallel threads documentation more visible and update with a quadcore example ........ r5190 | richard | 2008-09-12 00:02:51 +0100 (Fri, 12 Sep 2008) | 1 line handbook/quickstart: Improve documentation on the options available in local.conf ........ r5191 | richard | 2008-09-12 00:11:45 +0100 (Fri, 12 Sep 2008) | 1 line handbook/faq.xml: Add a QA about proxy server setup ........ r5192 | ross | 2008-09-12 16:43:10 +0100 (Fri, 12 Sep 2008) | 1 line ref-variables.xml: Add POKY_EXTRA_INSTALL ........ r5193 | ross | 2008-09-16 10:00:50 +0100 (Tue, 16 Sep 2008) | 1 line poky-fixed-revisions.inc: bump matchbox-wm-2 ........ r5194 | ross | 2008-09-16 16:36:32 +0100 (Tue, 16 Sep 2008) | 1 line poky-fixed-revisions: bump libowl srvrev ........ r5195 | ross | 2008-09-16 17:24:31 +0100 (Tue, 16 Sep 2008) | 1 line poky-fixed-revisions.inc: bump matchbox-desktop srvrev ........ r5196 | richard | 2008-09-16 20:14:49 +0100 (Tue, 16 Sep 2008) | 1 line bitbake parse/__init_.py: Add missing update_mtime function fixing bitbake shell reparse failures ........ r5197 | richard | 2008-09-16 21:09:03 +0100 (Tue, 16 Sep 2008) | 1 line ConfHandler.py: revert accidental commit ........ r5198 | ross | 2008-09-18 10:35:14 +0100 (Thu, 18 Sep 2008) | 1 line poky-eabi.conf: add dialer to as-needed blacklist ........ git-svn-id: https://svn.o-hand.com/repos/poky/branches/elroy@5284 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-eabi.inc1
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc6
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc
index 135012404c..c3d6383c51 100644
--- a/meta/conf/distro/include/poky-eabi.inc
+++ b/meta/conf/distro/include/poky-eabi.inc
@@ -42,5 +42,6 @@ ASNEEDED_pn-xserver-kdrive-xomap = ""
42ASNEEDED_pn-minimo = "" 42ASNEEDED_pn-minimo = ""
43ASNEEDED_pn-pciutils = "" 43ASNEEDED_pn-pciutils = ""
44ASNEEDED_pn-puzzles = "" 44ASNEEDED_pn-puzzles = ""
45ASNEEDED_pn-dialer = ""
45 46
46TARGET_LDFLAGS += "${ASNEEDED}" 47TARGET_LDFLAGS += "${ASNEEDED}"
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 322b822fdd..59dd6cebdc 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -37,7 +37,7 @@ SRCREV_pn-gtk-theme-torturer ?= "99962ae39bb5aadb31929b25c58e1a053f9c9545"
37SRCREV_pn-gypsy ?= "147" 37SRCREV_pn-gypsy ?= "147"
38SRCREV_pn-libfakekey ?= "2031" 38SRCREV_pn-libfakekey ?= "2031"
39SRCREV_pn-libgsmd ?= "4335" 39SRCREV_pn-libgsmd ?= "4335"
40SRCREV_pn-libowl ?= "354" 40SRCREV_pn-libowl ?= "408"
41SRCREV_pn-libsyncml ?= "241" 41SRCREV_pn-libsyncml ?= "241"
42PV_pn-libxcalibrate ?= "0.0-poky1-${SRCREV}" 42PV_pn-libxcalibrate ?= "0.0-poky1-${SRCREV}"
43SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" 43SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056"
@@ -46,7 +46,7 @@ SRCREV_pn-matchbox-applet-light ?= "1548"
46SRCREV_pn-matchbox-common ?= "1561" 46SRCREV_pn-matchbox-common ?= "1561"
47SRCREV_pn-matchbox-config-gtk ?= "1614" 47SRCREV_pn-matchbox-config-gtk ?= "1614"
48SRCREV_pn-matchbox-desktop-sato ?= "76" 48SRCREV_pn-matchbox-desktop-sato ?= "76"
49SRCREV_pn-matchbox-desktop ?= "2066" 49SRCREV_pn-matchbox-desktop ?= "2077"
50SRCREV_pn-matchbox-keyboard ?= "1910" 50SRCREV_pn-matchbox-keyboard ?= "1910"
51SRCREV_pn-matchbox-panel-2 ?= "2061" 51SRCREV_pn-matchbox-panel-2 ?= "2061"
52SRCREV_pn-matchbox-panel ?= "1364" 52SRCREV_pn-matchbox-panel ?= "1364"
@@ -55,7 +55,7 @@ SRCREV_pn-matchbox-terminal ?= "1612"
55SRCREV_pn-matchbox-theme-sato-2 ?= "94" 55SRCREV_pn-matchbox-theme-sato-2 ?= "94"
56SRCREV_pn-matchbox-theme-sato ?= "90" 56SRCREV_pn-matchbox-theme-sato ?= "90"
57SRCREV_pn-matchbox-themes-extra ?= "1524" 57SRCREV_pn-matchbox-themes-extra ?= "1524"
58SRCREV_pn-matchbox-wm-2 ?= "2073" 58SRCREV_pn-matchbox-wm-2 ?= "2074"
59SRCREV_pn-matchbox-wm ?= "1524" 59SRCREV_pn-matchbox-wm ?= "1524"
60SRCREV_pn-oh-puzzles ?= "23" 60SRCREV_pn-oh-puzzles ?= "23"
61SRCREV_pn-opkg-native ?= "4545" 61SRCREV_pn-opkg-native ?= "4545"