summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-10 12:53:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-11 15:22:54 +0100
commit044853350b3eff5342e23d6d4fe03e0ef0a9b66a (patch)
tree5ab7fb6a8544c5b9a4eaaa2915dc679acc96bd07
parent16cfbd6ef1b228a4ddbd3eced988f877534ffd55 (diff)
downloadpoky-044853350b3eff5342e23d6d4fe03e0ef0a9b66a.tar.gz
bitbake.conf: Include the new default-providers.inc and default-versions.inc files
These are the minimal defaults to allow OE-Core to function standalone with no distro set and are constucted such that the distro can either override values, or totally replace the include file entirely as needed. (From OE-Core rev: b34d5e93fab4274e1a56f446e2ba4756d614cc47) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto/conf/distro/poky.conf60
-rw-r--r--meta/conf/bitbake.conf3
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc27
3 files changed, 4 insertions, 86 deletions
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index c9652be66f..9680746e64 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -1,6 +1,3 @@
1#@TYPE: Distribution#@NAME: Poky
2#@DESCRIPTION: Distribution configuration for the Yocto Project build by Poky
3
4DISTRO = "poky" 1DISTRO = "poky"
5DISTRO_NAME = "Yocto (Built by Poky 5.0)" 2DISTRO_NAME = "Yocto (Built by Poky 5.0)"
6DISTRO_VERSION = "1.0+snapshot-${DATE}" 3DISTRO_VERSION = "1.0+snapshot-${DATE}"
@@ -31,29 +28,8 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
31 28
32LOCALCONF_VERSION = "1" 29LOCALCONF_VERSION = "1"
33 30
34#IPK_FEED_URIS += " \
35# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
36#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
37# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
38# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
39# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
40# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
41# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
42
43#RPM_FEED_URIS += " \
44# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
45#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
46# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
47# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
48# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
49# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
50# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
51
52OEINCLUDELOGS = "yes" 31OEINCLUDELOGS = "yes"
53KERNEL_CONSOLE = "ttyS0" 32KERNEL_CONSOLE = "ttyS0"
54#DEBUG_OPTIMIZATION = "-O -g3"
55#DEBUG_BUILD = "1"
56#INHIBIT_PACKAGE_STRIP = "1"
57 33
58# Default to TARGETOS values for EABI on arm 34# Default to TARGETOS values for EABI on arm
59GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" 35GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
@@ -70,39 +46,7 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
70 46
71CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}" 47CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}"
72 48
73# 49
74# Preferred providers:
75#
76
77# Virtuals:
78PREFERRED_PROVIDER_virtual/db ?= "db"
79PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
80PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86"
81PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
82PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
83PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
84PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
85PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
86PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
87
88VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
89
90# Others:
91PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
92PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-libc-headers-nativesdk"
93PREFERRED_PROVIDER_libgcc ?= "libgcc"
94PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
95PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
96PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
97PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
98PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
99PREFERRED_PROVIDER_opkg ?= "opkg"
100PREFERRED_PROVIDER_opkg-native ?= "opkg-native"
101PREFERRED_PROVIDER_opkg-nativesdk ?= "opkg-nativesdk"
102
103PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
104
105require conf/distro/include/poky-fixed-revisions.inc
106require conf/distro/include/preferred-xorg-versions.inc 50require conf/distro/include/preferred-xorg-versions.inc
107 51
108PCMCIA_MANAGER ?= "pcmciautils" 52PCMCIA_MANAGER ?= "pcmciautils"
@@ -153,8 +97,6 @@ COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
153 97
154BB_GENERATE_MIRROR_TARBALLS ??= "0" 98BB_GENERATE_MIRROR_TARBALLS ??= "0"
155 99
156require conf/distro/include/world-broken.inc
157
158QEMU_TARGETS ?= "arm i386 mips mipsel ppc x86_64" 100QEMU_TARGETS ?= "arm i386 mips mipsel ppc x86_64"
159# Other QEMU_TARGETS "mips64 mips64el sh4" 101# Other QEMU_TARGETS "mips64 mips64el sh4"
160 102
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 4a1bfa168b..d843e705fd 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -627,6 +627,9 @@ include conf/build/${BUILD_SYS}.conf
627include conf/target/${TARGET_SYS}.conf 627include conf/target/${TARGET_SYS}.conf
628include conf/machine/${MACHINE}.conf 628include conf/machine/${MACHINE}.conf
629include conf/machine-sdk/${SDKMACHINE}.conf 629include conf/machine-sdk/${SDKMACHINE}.conf
630include conf/distro/include/default-providers.inc
631include conf/distro/include/default-versions.inc
632include conf/distro/include/world-broken.inc
630include conf/distro/${DISTRO}.conf 633include conf/distro/${DISTRO}.conf
631include conf/documentation.conf 634include conf/documentation.conf
632require conf/sanity.conf 635require conf/sanity.conf
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
deleted file mode 100644
index 948608001e..0000000000
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ /dev/null
@@ -1,27 +0,0 @@
1# Preferred Versions:
2#
3PREFERRED_VERSION_libmatchbox ?= "1.9"
4PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
5PREFERRED_VERSION_elfutils ?= "0.89"
6PREFERRED_VERSION_hal ?= "0.5.14"
7PREFERRED_VERSION_hal-info ?= "20091130"
8PREFERRED_VERSION_udev ?= "164"
9PREFERRED_VERSION_wpa-supplicant ?= "0.7.3"
10PREFERRED_VERSION_pseudo = "1.0"
11PREFERRED_VERSION_pseudo-native = "1.0"
12
13PULSEAUDIOVERSION ?= "0.9.22"
14PULSEAUDIOVERSION_arm ?= "0.9.15"
15PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}"
16
17# Force the python versions in one place
18PYTHON_BASEVERSION ?= "2.6"
19PREFERRED_VERSION_python ?= "2.6.6"
20PREFERRED_VERSION_python-native ?= "2.6.6"
21
22# Force the older version of liberation-fonts until we fix the fontforge issue
23PREFERRED_VERSION_liberation-fonts ?= "1.04"
24
25
26
27