summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-02-03 18:54:58 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-07 16:52:40 +0000
commit5ade6c7de84893b4f94f7c068d775beeaecb9f5f (patch)
treeead6c182a65ea29908fee35de112a5dc5f3fdf34 /meta/conf
parent7586adb360d8075d3e97184dfcafb1b13ce5f838 (diff)
downloadpoky-5ade6c7de84893b4f94f7c068d775beeaecb9f5f.tar.gz
pseudo: Uprev pseudo and fix a few minor bugs
Uprev pseudo to the latest version. This corrects a linking problem on some newer host systems. In addition, we add more detail to the local.conf.sample file to explain the NO32LIBS and why someone would set it to 0. Also fix a minor bug in pseudo that prevented it from building for the target. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc2
-rw-r--r--meta/conf/local.conf.sample9
2 files changed, 10 insertions, 1 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index db72140a0e..f7ee1c04d0 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -152,7 +152,7 @@ PRELINKSRCREV ??= "909470ee441237563d6236c505cb2d02ddc48704"
152SRCREV_pn-prelink ??= "${PRELINKSRCREV}" 152SRCREV_pn-prelink ??= "${PRELINKSRCREV}"
153SRCREV_pn-prelink-native ??= "${PRELINKSRCREV}" 153SRCREV_pn-prelink-native ??= "${PRELINKSRCREV}"
154SRCREV_pn-psplash ??= "424" 154SRCREV_pn-psplash ??= "424"
155PSEUDOSRCREV ??= "bcb42d80c0817da5479ab9c4f2cd8c4727e98ef8" 155PSEUDOSRCREV ??= "5434325fc887817ebb2bad36313d8277992cef1d"
156SRCREV_pn-pseudo ??= "${PSEUDOSRCREV}" 156SRCREV_pn-pseudo ??= "${PSEUDOSRCREV}"
157SRCREV_pn-pseudo-native ??= "${PSEUDOSRCREV}" 157SRCREV_pn-pseudo-native ??= "${PSEUDOSRCREV}"
158SRCREV_pn-pseudo-nativesdk ??= "${PSEUDOSRCREV}" 158SRCREV_pn-pseudo-nativesdk ??= "${PSEUDOSRCREV}"
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index f9953d1cee..8ac31d8f77 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -170,6 +170,15 @@ ENABLE_BINARY_LOCALE_GENERATION = "1"
170#IMAGE_LINGUAS ?= "en-gb" 170#IMAGE_LINGUAS ?= "en-gb"
171#LIMIT_BUILT_LOCALES ?= "POSIX en_GB" 171#LIMIT_BUILT_LOCALES ?= "POSIX en_GB"
172 172
173# This value is currently used by PSEUDO to determine if the recipe should
174# build both the 32-bit and 64-bit wrapper libraries on a 64-bit build system.
175#
176# PSEUDO will attempt to determine if a 32-bit wrapper is necessary, but
177# it doesn't always guess properly. If you have 32-bit executables on
178# your 64-bit build system, you likely want to set this to "0",
179# otherwise you could end up with incorrect file attributes on the
180# target filesystem.
181#
173# Default to not build 32 bit libs on 64 bit systems, comment this 182# Default to not build 32 bit libs on 64 bit systems, comment this
174# out if that is desired 183# out if that is desired
175NO32LIBS = "1" 184NO32LIBS = "1"