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>
This commit is contained in:
Richard Purdie
parent
16cfbd6ef1
commit
044853350b
|
|
@ -1,6 +1,3 @@
|
|||
#@TYPE: Distribution#@NAME: Poky
|
||||
#@DESCRIPTION: Distribution configuration for the Yocto Project build by Poky
|
||||
|
||||
DISTRO = "poky"
|
||||
DISTRO_NAME = "Yocto (Built by Poky 5.0)"
|
||||
DISTRO_VERSION = "1.0+snapshot-${DATE}"
|
||||
|
|
@ -31,29 +28,8 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
|
|||
|
||||
LOCALCONF_VERSION = "1"
|
||||
|
||||
#IPK_FEED_URIS += " \
|
||||
# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
|
||||
#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
|
||||
# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
|
||||
# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
|
||||
# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
|
||||
# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
|
||||
# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
|
||||
|
||||
#RPM_FEED_URIS += " \
|
||||
# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
|
||||
#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
|
||||
# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
|
||||
# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
|
||||
# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
|
||||
# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
|
||||
# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
|
||||
|
||||
OEINCLUDELOGS = "yes"
|
||||
KERNEL_CONSOLE = "ttyS0"
|
||||
#DEBUG_OPTIMIZATION = "-O -g3"
|
||||
#DEBUG_BUILD = "1"
|
||||
#INHIBIT_PACKAGE_STRIP = "1"
|
||||
|
||||
# Default to TARGETOS values for EABI on arm
|
||||
GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
|
||||
|
|
@ -70,39 +46,7 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
|
|||
|
||||
CACHE = "${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))]}"
|
||||
|
||||
#
|
||||
# Preferred providers:
|
||||
#
|
||||
|
||||
# Virtuals:
|
||||
PREFERRED_PROVIDER_virtual/db ?= "db"
|
||||
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
|
||||
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86"
|
||||
PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
|
||||
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
|
||||
PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
|
||||
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
|
||||
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
|
||||
PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
|
||||
|
||||
VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
|
||||
|
||||
# Others:
|
||||
PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
|
||||
PREFERRED_PROVIDER_linux-libc-headers-nativesdk ?= "linux-libc-headers-nativesdk"
|
||||
PREFERRED_PROVIDER_libgcc ?= "libgcc"
|
||||
PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
|
||||
PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
|
||||
PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
|
||||
PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
|
||||
PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
|
||||
PREFERRED_PROVIDER_opkg ?= "opkg"
|
||||
PREFERRED_PROVIDER_opkg-native ?= "opkg-native"
|
||||
PREFERRED_PROVIDER_opkg-nativesdk ?= "opkg-nativesdk"
|
||||
|
||||
PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
|
||||
|
||||
require conf/distro/include/poky-fixed-revisions.inc
|
||||
require conf/distro/include/preferred-xorg-versions.inc
|
||||
|
||||
PCMCIA_MANAGER ?= "pcmciautils"
|
||||
|
|
@ -153,8 +97,6 @@ COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
|
|||
|
||||
BB_GENERATE_MIRROR_TARBALLS ??= "0"
|
||||
|
||||
require conf/distro/include/world-broken.inc
|
||||
|
||||
QEMU_TARGETS ?= "arm i386 mips mipsel ppc x86_64"
|
||||
# Other QEMU_TARGETS "mips64 mips64el sh4"
|
||||
|
||||
|
|
|
|||
|
|
@ -627,6 +627,9 @@ include conf/build/${BUILD_SYS}.conf
|
|||
include conf/target/${TARGET_SYS}.conf
|
||||
include conf/machine/${MACHINE}.conf
|
||||
include conf/machine-sdk/${SDKMACHINE}.conf
|
||||
include conf/distro/include/default-providers.inc
|
||||
include conf/distro/include/default-versions.inc
|
||||
include conf/distro/include/world-broken.inc
|
||||
include conf/distro/${DISTRO}.conf
|
||||
include conf/documentation.conf
|
||||
require conf/sanity.conf
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
# Preferred Versions:
|
||||
#
|
||||
PREFERRED_VERSION_libmatchbox ?= "1.9"
|
||||
PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
|
||||
PREFERRED_VERSION_elfutils ?= "0.89"
|
||||
PREFERRED_VERSION_hal ?= "0.5.14"
|
||||
PREFERRED_VERSION_hal-info ?= "20091130"
|
||||
PREFERRED_VERSION_udev ?= "164"
|
||||
PREFERRED_VERSION_wpa-supplicant ?= "0.7.3"
|
||||
PREFERRED_VERSION_pseudo = "1.0"
|
||||
PREFERRED_VERSION_pseudo-native = "1.0"
|
||||
|
||||
PULSEAUDIOVERSION ?= "0.9.22"
|
||||
PULSEAUDIOVERSION_arm ?= "0.9.15"
|
||||
PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}"
|
||||
|
||||
# Force the python versions in one place
|
||||
PYTHON_BASEVERSION ?= "2.6"
|
||||
PREFERRED_VERSION_python ?= "2.6.6"
|
||||
PREFERRED_VERSION_python-native ?= "2.6.6"
|
||||
|
||||
# Force the older version of liberation-fonts until we fix the fontforge issue
|
||||
PREFERRED_VERSION_liberation-fonts ?= "1.04"
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue