summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-moblin/conf/distro/include/moblin-fixed-revisions.inc4
-rw-r--r--meta-moblin/conf/distro/moblin.conf105
2 files changed, 2 insertions, 107 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index 55ba546d67..6cbc8d8aa3 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -3,10 +3,6 @@
3# from Poky (or to lock down SCM based packages): 3# from Poky (or to lock down SCM based packages):
4# 4#
5PREFERRED_VERSION_eds-dbus ?= "2.20.0" 5PREFERRED_VERSION_eds-dbus ?= "2.20.0"
6PREFERRED_VERSION_dbus ?= "1.2.14"
7PREFERRED_VERSION_dbus-native ?= "1.2.14"
8PREFERRED_VERSION_gtk+ ?= "2.18.5"
9PREFERRED_VERSION_pango = "1.26.0"
10PREFERRED_VERSION_udev ?= "145" 6PREFERRED_VERSION_udev ?= "145"
11 7
12PREFERRED_VERSION_mesa-dri ?= "7.8.2" 8PREFERRED_VERSION_mesa-dri ?= "7.8.2"
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf
index abbbdf617c..a0d5af7393 100644
--- a/meta-moblin/conf/distro/moblin.conf
+++ b/meta-moblin/conf/distro/moblin.conf
@@ -1,113 +1,12 @@
1require conf/distro/poky.conf
2
1DISTRO = "moblin" 3DISTRO = "moblin"
2DISTRO_NAME = "Moblin (Poky Powered)" 4DISTRO_NAME = "Moblin (Poky Powered)"
3DISTRO_VERSION = "1.99+snapshot-${DATE}" 5DISTRO_VERSION = "1.99+snapshot-${DATE}"
4 6
5MAINTAINER = "Moblin <dev@lists.moblin.org>"
6
7PACKAGE_CLASSES ?= "package_ipk package_rpm"
8INHERIT_INSANE ?= "insane"
9INHERIT += "${PACKAGE_CLASSES} debian poky devshell ${INHERIT_INSANE} packaged-staging packagehistory"
10
11# For some reason, this doesn't work
12# TARGET_OS ?= "linux"
13# TARGET_VENDOR ?= "-poky"
14# Set by POKYMODE instead
15TARGET_OS = "linux"
16
17QA_LOGFILE = "${TMPDIR}/qa.log"
18
19IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
20
21#IPK_FEED_URIS += " \
22# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
23#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
24# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
25# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
26# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
27# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
28# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
29
30#RPM_FEED_URIS += " \
31# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
32#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
33# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
34# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
35# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
36# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
37# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
38
39OEINCLUDELOGS = "yes"
40KERNEL_CONSOLE = "ttyS0"
41#DEBUG_OPTIMIZATION = "-O -g3"
42#DEBUG_BUILD = "1"
43#INHIBIT_PACKAGE_STRIP = "1"
44
45# Default to TARGETOS values for EABI
46GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
47UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
48
49POKYMODE ?= "default"
50require conf/distro/include/poky-${POKYMODE}.inc
51
52POKYLIBC ?= "glibc"
53require conf/distro/include/poky-${POKYLIBC}.inc
54
55SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
56SDKPATH = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}"
57
58CACHE = "${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))]}"
59
60#
61# Preferred providers:
62#
63
64# Virtuals:
65PREFERRED_PROVIDER_virtual/db ?= "db"
66PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
67PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86"
68PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
69PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
70PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
71PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
72PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
73PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
74
75VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
76
77# Others:
78PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
79PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
80PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
81PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
82PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
83PREFERRED_PROVIDER_opkg ?= "opkg"
84PREFERRED_PROVIDER_opkg-native ?= "opkg-native"
85
86require conf/distro/include/moblin-fixed-revisions.inc 7require conf/distro/include/moblin-fixed-revisions.inc
87require conf/distro/include/poky-fixed-revisions.inc
88require conf/distro/include/preferred-xorg-versions.inc
89
90PCMCIA_MANAGER ?= "pcmciautils"
91
92IMAGE_LINGUAS ?= "en-gb"
93LIMIT_BUILT_LOCALES ?= "en_GB"
94ENABLE_BINARY_LOCALE_GENERATION ?= "1"
95LOCALE_UTF8_ONLY = "1"
96
97DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
98 8
99POKY_EXTRA_RDEPENDS = "task-moblin-boot" 9POKY_EXTRA_RDEPENDS = "task-moblin-boot"
100POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
101POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config"
102POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config"
103POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config"
104
105DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
106DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
107
108IMAGE_FEATURES ?= ""
109
110require conf/distro/include/world-broken.inc
111 10
112TOOLCHAIN_TARGET_SDKTASK ?= "task-moblin-standalone-sdk-target" 11TOOLCHAIN_TARGET_SDKTASK ?= "task-moblin-standalone-sdk-target"
113#No debug info for now " task-moblin-standalone-sdk-target-dbg" 12#No debug info for now " task-moblin-standalone-sdk-target-dbg"