moblin.conf: Collapse to an overlay of poky.conf
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
parent
7af8cb9d02
commit
2b84008bc9
|
|
@ -3,10 +3,6 @@
|
|||
# from Poky (or to lock down SCM based packages):
|
||||
#
|
||||
PREFERRED_VERSION_eds-dbus ?= "2.20.0"
|
||||
PREFERRED_VERSION_dbus ?= "1.2.14"
|
||||
PREFERRED_VERSION_dbus-native ?= "1.2.14"
|
||||
PREFERRED_VERSION_gtk+ ?= "2.18.5"
|
||||
PREFERRED_VERSION_pango = "1.26.0"
|
||||
PREFERRED_VERSION_udev ?= "145"
|
||||
|
||||
PREFERRED_VERSION_mesa-dri ?= "7.8.2"
|
||||
|
|
|
|||
|
|
@ -1,113 +1,12 @@
|
|||
require conf/distro/poky.conf
|
||||
|
||||
DISTRO = "moblin"
|
||||
DISTRO_NAME = "Moblin (Poky Powered)"
|
||||
DISTRO_VERSION = "1.99+snapshot-${DATE}"
|
||||
|
||||
MAINTAINER = "Moblin <dev@lists.moblin.org>"
|
||||
|
||||
PACKAGE_CLASSES ?= "package_ipk package_rpm"
|
||||
INHERIT_INSANE ?= "insane"
|
||||
INHERIT += "${PACKAGE_CLASSES} debian poky devshell ${INHERIT_INSANE} packaged-staging packagehistory"
|
||||
|
||||
# For some reason, this doesn't work
|
||||
# TARGET_OS ?= "linux"
|
||||
# TARGET_VENDOR ?= "-poky"
|
||||
# Set by POKYMODE instead
|
||||
TARGET_OS = "linux"
|
||||
|
||||
QA_LOGFILE = "${TMPDIR}/qa.log"
|
||||
|
||||
IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
|
||||
|
||||
#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
|
||||
GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
|
||||
UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
|
||||
|
||||
POKYMODE ?= "default"
|
||||
require conf/distro/include/poky-${POKYMODE}.inc
|
||||
|
||||
POKYLIBC ?= "glibc"
|
||||
require conf/distro/include/poky-${POKYLIBC}.inc
|
||||
|
||||
SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
|
||||
SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}"
|
||||
|
||||
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-diet"
|
||||
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_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"
|
||||
|
||||
require conf/distro/include/moblin-fixed-revisions.inc
|
||||
require conf/distro/include/poky-fixed-revisions.inc
|
||||
require conf/distro/include/preferred-xorg-versions.inc
|
||||
|
||||
PCMCIA_MANAGER ?= "pcmciautils"
|
||||
|
||||
IMAGE_LINGUAS ?= "en-gb"
|
||||
LIMIT_BUILT_LOCALES ?= "en_GB"
|
||||
ENABLE_BINARY_LOCALE_GENERATION ?= "1"
|
||||
LOCALE_UTF8_ONLY = "1"
|
||||
|
||||
DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
|
||||
|
||||
POKY_EXTRA_RDEPENDS = "task-moblin-boot"
|
||||
POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
|
||||
POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config"
|
||||
POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config"
|
||||
POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config"
|
||||
|
||||
DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
|
||||
DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
|
||||
|
||||
IMAGE_FEATURES ?= ""
|
||||
|
||||
require conf/distro/include/world-broken.inc
|
||||
|
||||
TOOLCHAIN_TARGET_SDKTASK ?= "task-moblin-standalone-sdk-target"
|
||||
#No debug info for now " task-moblin-standalone-sdk-target-dbg"
|
||||
|
|
|
|||
Loading…
Reference in New Issue