summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-10-28 16:31:39 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-10-28 16:34:35 +0000
commit47c42b6c3014429886eaa66a17f38e86a33d086e (patch)
tree989db176169552482c2aa0ba0b4b5ccb0b8b2137
parent3a73995e31a6e2af4ec572edd174e9579f99dfb9 (diff)
downloadpoky-47c42b6c3014429886eaa66a17f38e86a33d086e.tar.gz
conf/distro: Create a moblin distro config file based on the Poky one
Also refactor various data into common include files.
Diffstat
-rw-r--r--meta-moblin/classes/moblin.bbclass12
-rw-r--r--meta-moblin/conf/distro/moblin.conf115
-rw-r--r--meta/conf/distro/include/as-needed.inc14
-rw-r--r--meta/conf/distro/include/poky-eabi.inc15
-rw-r--r--meta/conf/distro/include/poky-moblin.inc26
-rw-r--r--meta/conf/distro/include/world-broken.inc30
-rw-r--r--meta/conf/distro/poky.conf30
7 files changed, 201 insertions, 41 deletions
diff --git a/meta-moblin/classes/moblin.bbclass b/meta-moblin/classes/moblin.bbclass
new file mode 100644
index 0000000000..aac6957583
--- /dev/null
+++ b/meta-moblin/classes/moblin.bbclass
@@ -0,0 +1,12 @@
1
2PREMIRRORS_append () {
3ftp://.*/.* http://pokylinux.org/sources/
4http://.*/.* http://pokylinux.org/sources/
5https://.*/.* http://pokylinux.org/sources/
6}
7
8MIRRORS_append () {
9ftp://.*/.* http://pokylinux.org/sources/
10http://.*/.* http://pokylinux.org/sources/
11https://.*/.* http://pokylinux.org/sources/
12}
diff --git a/meta-moblin/conf/distro/moblin.conf b/meta-moblin/conf/distro/moblin.conf
new file mode 100644
index 0000000000..20d96cc2a6
--- /dev/null
+++ b/meta-moblin/conf/distro/moblin.conf
@@ -0,0 +1,115 @@
1DISTRO = "moblin"
2DISTRO_NAME = "Moblin (Poky Powered)"
3DISTRO_VERSION = "1.99+snapshot-${DATE}"
4
5MAINTAINER = "Moblin <dev@lists.moblin.org>"
6
7PACKAGE_CLASSES ?= "package_rpm"
8INHERIT_INSANE ?= "insane"
9INHERIT += "${PACKAGE_CLASSES} debian moblin devshell ${INHERIT_INSANE} packaged-staging"
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# Metadata is git based
22#METADATA_REVISION = "${@base_get_metadata_git_revision(d)}"
23#FIXME
24METADATA_REVISION = "unknown"
25
26#IPK_FEED_URIS += " \
27# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
28#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
29# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
30# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
31# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
32# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
33# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
34
35#RPM_FEED_URIS += " \
36# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
37#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
38# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
39# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
40# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
41# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
42# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
43
44OEINCLUDELOGS = "yes"
45KERNEL_CONSOLE = "ttyS0"
46#DEBUG_OPTIMIZATION = "-O -g3"
47#DEBUG_BUILD = "1"
48#INHIBIT_PACKAGE_STRIP = "1"
49
50# Default to TARGETOS values for EABI
51GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
52UCLIBCTARGETOS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
53
54POKYMODE ?= "moblin"
55require conf/distro/include/poky-${POKYMODE}.inc
56
57POKYLIBC ?= "glibc"
58require conf/distro/include/poky-${POKYLIBC}.inc
59
60SDK_NAME = "${DISTRO}-${POKYMODE}-${POKYLIBC}-${HOST_ARCH}-${TARGET_ARCH}"
61SDK_PREFIX = "/usr/local/${DISTRO}/${POKYMODE}-${POKYLIBC}/${TARGET_ARCH}"
62
63CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
64
65#
66# Preferred providers:
67#
68
69# Virtuals:
70PREFERRED_PROVIDER_virtual/db ?= "db"
71PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
72PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
73PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
74PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
75PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
76PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
77PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet"
78PREFERRED_PROVIDER_xf86-video-intel ?= xf86-video-intel
79
80VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
81
82# Others:
83PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
84PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
85PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
86PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
87PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
88PREFERRED_PROVIDER_opkg ?= "opkg"
89
90require conf/distro/include/poky-fixed-revisions.inc
91require conf/distro/include/preferred-xorg-versions.inc
92
93PCMCIA_MANAGER ?= "pcmciautils"
94
95CVS_TARBALL_STASH += "http://www.o-hand.com/~richard/poky/sources/"
96
97IMAGE_LINGUAS ?= "en-gb"
98LIMIT_BUILT_LOCALES ?= "en_GB"
99ENABLE_BINARY_LOCALE_GENERATION ?= "1"
100LOCALE_UTF8_ONLY = "1"
101
102DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
103
104POKY_EXTRA_RDEPENDS = ""
105POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
106POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config"
107POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config"
108POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config"
109
110DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
111DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
112
113IMAGE_FEATURES ?= ""
114
115require conf/distro/include/world-broken.inc
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
new file mode 100644
index 0000000000..50a152de32
--- /dev/null
+++ b/meta/conf/distro/include/as-needed.inc
@@ -0,0 +1,14 @@
1
2ASNEEDED = "-Wl,--as-needed"
3
4ASNEEDED_pn-console-tools = ""
5ASNEEDED_pn-distcc = ""
6ASNEEDED_pn-openobex = ""
7ASNEEDED_pn-icu = ""
8ASNEEDED_pn-xserver-kdrive-xomap = ""
9ASNEEDED_pn-minimo = ""
10ASNEEDED_pn-pciutils = ""
11ASNEEDED_pn-puzzles = ""
12ASNEEDED_pn-dialer = ""
13
14TARGET_LDFLAGS += "${ASNEEDED}" \ No newline at end of file
diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc
index e0cafbaaa9..10706b695c 100644
--- a/meta/conf/distro/include/poky-eabi.inc
+++ b/meta/conf/distro/include/poky-eabi.inc
@@ -35,15 +35,6 @@ PREFERRED_VERSION_glibc ?= "2.6.1"
35PREFERRED_VERSION_glibc-initial ?= "2.6.1" 35PREFERRED_VERSION_glibc-initial ?= "2.6.1"
36PREFERRED_VERSION_elfutils ?= "0.131" 36PREFERRED_VERSION_elfutils ?= "0.131"
37 37
38ASNEEDED = "-Wl,--as-needed" 38require conf/distro/include/as-needed.inc
39ASNEEDED_pn-console-tools = "" 39
40ASNEEDED_pn-distcc = "" 40
41ASNEEDED_pn-openobex = ""
42ASNEEDED_pn-icu = ""
43ASNEEDED_pn-xserver-kdrive-xomap = ""
44ASNEEDED_pn-minimo = ""
45ASNEEDED_pn-pciutils = ""
46ASNEEDED_pn-puzzles = ""
47ASNEEDED_pn-dialer = ""
48
49TARGET_LDFLAGS += "${ASNEEDED}"
diff --git a/meta/conf/distro/include/poky-moblin.inc b/meta/conf/distro/include/poky-moblin.inc
new file mode 100644
index 0000000000..45535c5540
--- /dev/null
+++ b/meta/conf/distro/include/poky-moblin.inc
@@ -0,0 +1,26 @@
1TARGET_VENDOR = "-poky"
2
3PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc"
4PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
5PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
6PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
7PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
8PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
9
10GCCVERSION ?= "4.2.3"
11BINUVERSION = "2.18"
12
13PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
14PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
15PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}"
16PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}"
17PREFERRED_VERSION_gcc-cross-sdk ?= "${GCCVERSION}"
18PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
19PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}"
20PREFERRED_VERSION_linux-libc-headers ?= "2.6.24"
21PREFERRED_VERSION_glibc ?= "2.6.1"
22PREFERRED_VERSION_glibc-initial ?= "2.6.1"
23PREFERRED_VERSION_elfutils ?= "0.131"
24
25require conf/distro/include/as-needed.inc
26
diff --git a/meta/conf/distro/include/world-broken.inc b/meta/conf/distro/include/world-broken.inc
new file mode 100644
index 0000000000..e1e14880fc
--- /dev/null
+++ b/meta/conf/distro/include/world-broken.inc
@@ -0,0 +1,30 @@
1#
2# Exclude known broken packages
3#
4# Needs old OpenSync
5EXCLUDE_FROM_WORLD_pn-libsync = "1"
6EXCLUDE_FROM_WORLD_pn-libopensync-plugin-evo2-sync = "1"
7EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1"
8EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc = "1"
9EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1"
10EXCLUDE_FROM_WORLD_pn-libopensync-plugin-google-calendar = "1"
11# Needs python
12EXCLUDE_FROM_WORLD_pn-opkg-utils = "1"
13# Needs gcc 3.x
14EXCLUDE_FROM_WORLD_pn-qemu = "1"
15# temporary
16EXCLUDE_FROM_WORLD_pn-lirc = "1"
17EXCLUDE_FROM_WORLD_pn-lirc-modules = "1"
18# these applications need clutter 0.6
19EXCLUDE_FROM_WORLD_pn-aaina = "1"
20EXCLUDE_FROM_WORLD_pn-table = "1"
21EXCLUDE_FROM_WORLD_pn-task-poky-clutter = "1"
22# Need bzr
23EXCLUDE_FROM_WORLD_pn-eds-tools = "1"
24# Need fixed Perl - OE bug #3403
25EXCLUDE_FROM_WORLD_pn-libxml-parser-perl = "1"
26# Needs libxml-parser-perl
27EXCLUDE_FROM_WORLD_pn-libxml-simple-perl = "1"
28# Needs gtk+ <= 2.10
29EXCLUDE_FROM_WORLD_pn-gcalctool = "1"
30
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 7be505765f..1abafa5d22 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -116,33 +116,5 @@ DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet"
116 116
117IMAGE_FEATURES ?= "" 117IMAGE_FEATURES ?= ""
118 118
119# 119require conf/distro/include/world-broken.inc
120# Exclude known broken packages
121#
122# Needs old OpenSync
123EXCLUDE_FROM_WORLD_pn-libsync = "1"
124EXCLUDE_FROM_WORLD_pn-libopensync-plugin-evo2-sync = "1"
125EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1"
126EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc = "1"
127EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1"
128EXCLUDE_FROM_WORLD_pn-libopensync-plugin-google-calendar = "1"
129# Needs python
130EXCLUDE_FROM_WORLD_pn-opkg-utils = "1"
131# Needs gcc 3.x
132EXCLUDE_FROM_WORLD_pn-qemu = "1"
133# temporary
134EXCLUDE_FROM_WORLD_pn-lirc = "1"
135EXCLUDE_FROM_WORLD_pn-lirc-modules = "1"
136# these applications need clutter 0.6
137EXCLUDE_FROM_WORLD_pn-aaina = "1"
138EXCLUDE_FROM_WORLD_pn-table = "1"
139EXCLUDE_FROM_WORLD_pn-task-poky-clutter = "1"
140# Need bzr
141EXCLUDE_FROM_WORLD_pn-eds-tools = "1"
142# Need fixed Perl - OE bug #3403
143EXCLUDE_FROM_WORLD_pn-libxml-parser-perl = "1"
144# Needs libxml-parser-perl
145EXCLUDE_FROM_WORLD_pn-libxml-simple-perl = "1"
146# Needs gtk+ <= 2.10
147EXCLUDE_FROM_WORLD_pn-gcalctool = "1"
148 120
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 11:49:51 +0000