summaryrefslogtreecommitdiffstats
path: root/openembedded
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-11-16 17:42:39 +0000
committerRichard Purdie <richard@openedhand.com>2005-11-16 17:42:39 +0000
commitf8f6ddf146ae0b63089d9dfd7aa4e1426935ac02 (patch)
tree5e5e48a426c6eb1cbc530ec13f8c30344fc949ad /openembedded
parente5ba6f2e4424ea4b8baa39bfaec6ab01b7b66861 (diff)
downloadpoky-f8f6ddf146ae0b63089d9dfd7aa4e1426935ac02.tar.gz
Make poky a distribution in its own right solving several issues. Unfortunately this means everyone needs to change DISTRO=openzaurus-3.5.4 to DISTRO=poky in their build/conf/local.conf files.
git-svn-id: https://svn.o-hand.com/repos/poky@184 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
-rw-r--r--openembedded/conf/distro/openzaurus-3.5.4.conf2
-rw-r--r--openembedded/conf/distro/poky-additions.inc62
-rw-r--r--openembedded/conf/distro/poky.conf162
3 files changed, 162 insertions, 64 deletions
diff --git a/openembedded/conf/distro/openzaurus-3.5.4.conf b/openembedded/conf/distro/openzaurus-3.5.4.conf
index 10214614f9..58e36c5036 100644
--- a/openembedded/conf/distro/openzaurus-3.5.4.conf
+++ b/openembedded/conf/distro/openzaurus-3.5.4.conf
@@ -68,5 +68,3 @@ include conf/distro/preferred-gpe-versions-2.7.inc
68# E 68# E
69# 69#
70#include conf/distro/preferred-e-versions.inc 70#include conf/distro/preferred-e-versions.inc
71
72include conf/distro/poky-additions.inc
diff --git a/openembedded/conf/distro/poky-additions.inc b/openembedded/conf/distro/poky-additions.inc
deleted file mode 100644
index 1474aebdbf..0000000000
--- a/openembedded/conf/distro/poky-additions.inc
+++ /dev/null
@@ -1,62 +0,0 @@
1# Overide some bits
2
3DISTRO = "openzaurus"
4DISTRO_NAME = "OpenedHand PokyLinux" # Bad?
5DISTRO_VERSION = "0.0-snapshot-${DATE}"
6
7DISTRO_TYPE = "debug"
8# DISTRO_TYPE = "release"
9
10#PREFERRED_PROVIDER_gconf=gconf-dbus
11
12CVSDATE_ipkg-utils-native = "20050930"
13CVSDATE_ipkg-link-1 = "20050930"
14CVSDATE_ipkg-utils = "20050930"
15CVSDATE_ipkg-link = "20050930"
16CVSDATE_matchbox-common = "20051101"
17CVSDATE_matchbox-config-gtk = "20051101"
18CVSDATE_matchbox-desktop = "20051101"
19CVSDATE_matchbox-keyboard = "20051101"
20CVSDATE_matchbox-panel = "20051101"
21CVSDATE_matchbox-panel-manager = "20051101"
22CVSDATE_matchbox-stroke = "20051101"
23CVSDATE_matchbox-themes-extra = "20051101"
24CVSDATE_matchbox-wm = "20051101"
25CVSDATE_libmatchbox = "20051101"
26CVSDATE_tslib = "20051101"
27CVSDATE_xext = "20051101"
28CVSDATE_renderext = "20051101"
29CVSDATE_libxrender = "20051101"
30CVSDATE_fixesext = "20051101"
31CVSDATE_damageext = "20051101"
32CVSDATE_compositeext = "20051101"
33CVSDATE_xcalibrateext = "20051101"
34CVSDATE_recordext = "20051101"
35CVSDATE_libfakekey = "20051101"
36CVSDATE_xmodmap = "20051101"
37CVSDATE_xrandr = "20051101"
38CVSDATE_xtst = "20051101"
39CVSDATE_xcalibrate = "20051101"
40
41PREFERRED_VERSION_matchbox = "0.9.1"
42PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
43PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"
44PREFERRED_VERSION_matchbox-common = "0.9.1+cvs-${CVSDATE}"
45PREFERRED_VERSION_matchbox-config-gtk = "0.0+cvs-${CVSDATE}"
46PREFERRED_VERSION_matchbox-desktop = "0.9.1+cvs-${CVSDATE}"
47PREFERRED_VERSION_matchbox-keyboard = "0.0+cvs-${CVSDATE}"
48PREFERRED_VERSION_matchbox-panel = "0.9.2+cvs-${CVSDATE}"
49PREFERRED_VERSION_matchbox-panel-manager = "0.0+cvs-${CVSDATE}"
50PREFERRED_VERSION_matchbox-stroke = "0.0+cvs-${CVSDATE}"
51PREFERRED_VERSION_matchbox-themes-extra = "0.3+cvs-${CVSDATE}"
52PREFERRED_VERSION_matchbox-wm = "0.9.5+cvs-${CVSDATE}"
53PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}"
54
55
56PREFERRED_VERSION_atk = "1.10.0"
57PREFERRED_VERSION_cairo = "1.0.0"
58PREFERRED_VERSION_glib-2.0 = "2.8.1"
59PREFERRED_VERSION_gtk+ = "2.6.7"
60PREFERRED_VERSION_pango = "1.10.0"
61
62PREFERRED_VERSION_dbus = "0.50"
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
new file mode 100644
index 0000000000..02761a7d0e
--- /dev/null
+++ b/openembedded/conf/distro/poky.conf
@@ -0,0 +1,162 @@
1#@TYPE: Distribution
2#@NAME: Poky
3#@DESCRIPTION: Distribution configuration for OpenedHand (Poky)
4
5DISTRO = "poky"
6DISTRO_NAME = "OpenedHand Linux (Poky)"
7DISTRO_VERSION = "0.0-snapshot-${DATE}"
8
9# DISTRO_VERSION = "3.5.4"
10DISTRO_TYPE = "debug"
11# DISTRO_TYPE = "release"
12
13
14INHERIT += " package_ipk debian"
15# For some reason, this doesn't work
16# TARGET_OS ?= "linux"
17TARGET_OS = "linux"
18TARGET_FPU ?= "soft"
19
20PARALLEL_INSTALL_MODULES = "1"
21
22FEED_URIS += " \
23 upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
24upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
25 machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
26 base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
27 libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
28 console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
29 devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
30
31ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
32OEINCLUDELOGS = "yes"
33KERNEL_CONSOLE = "ttyS0"
34#DEBUG_OPTIMIZATION = "-O -g3"
35#DEBUG_BUILD = "1"
36#INHIBIT_PACKAGE_STRIP = "1"
37
38
39#
40# Core Versions
41#
42PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
43PREFERRED_VERSION_gcc-cross ?= "3.4.4"
44PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
45PREFERRED_VERSION_hostap-modules ?= "0.3.9"
46
47
48#
49# Opie and E Image preferred verions
50# Use our own instead of GPE
51#
52OPIE_VERSION = "1.2.1"
53include conf/distro/preferred-opie-versions.inc
54#include conf/distro/preferred-e-versions.inc
55
56
57#
58# Preferred providers:
59#
60PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
61PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
62PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
63PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
64#fix some iconv issues, needs to be adjusted when doing uclibc builds
65PREFERRED_PROVIDER_virtual/libiconv=glibc
66PREFERRED_PROVIDER_virtual/libintl=glibc
67PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
68PREFERRED_PROVIDER_x11 = "diet-x11"
69#PREFERRED_PROVIDER_gconf=gconf-dbus
70PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
71
72
73#
74# CVS Dates to use:
75#
76CVSDATE_minimo=20050401
77CVSDATE_ipkg-utils-native = "20050930"
78CVSDATE_ipkg-link-1 = "20050930"
79CVSDATE_ipkg-utils = "20050930"
80CVSDATE_ipkg-link = "20050930"
81CVSDATE_matchbox-common = "20051101"
82CVSDATE_matchbox-config-gtk = "20051101"
83CVSDATE_matchbox-desktop = "20051101"
84CVSDATE_matchbox-keyboard = "20051101"
85CVSDATE_matchbox-panel = "20051101"
86CVSDATE_matchbox-panel-manager = "20051101"
87CVSDATE_matchbox-stroke = "20051101"
88CVSDATE_matchbox-themes-extra = "20051101"
89CVSDATE_matchbox-wm = "20051101"
90CVSDATE_libmatchbox = "20051101"
91CVSDATE_tslib = "20051101"
92CVSDATE_xext = "20051101"
93CVSDATE_renderext = "20051101"
94CVSDATE_libxrender = "20051101"
95CVSDATE_fixesext = "20051101"
96CVSDATE_damageext = "20051101"
97CVSDATE_compositeext = "20051101"
98CVSDATE_xcalibrateext = "20051101"
99CVSDATE_recordext = "20051101"
100CVSDATE_libfakekey = "20051101"
101CVSDATE_xmodmap = "20051101"
102CVSDATE_xrandr = "20051101"
103CVSDATE_xtst = "20051101"
104CVSDATE_xcalibrate = "20051101"
105CVSDATE_xmu = "20051115"
106CVSDATE_xdpyinfo = "20051115"
107
108#
109# Preferred Versions:
110#
111PREFERRED_VERSION_matchbox = "0.9.1"
112PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
113PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"
114PREFERRED_VERSION_matchbox-common = "0.9.1+cvs-${CVSDATE}"
115PREFERRED_VERSION_matchbox-config-gtk = "0.0+cvs-${CVSDATE}"
116PREFERRED_VERSION_matchbox-desktop = "0.9.1+cvs-${CVSDATE}"
117PREFERRED_VERSION_matchbox-keyboard = "0.0+cvs-${CVSDATE}"
118PREFERRED_VERSION_matchbox-panel = "0.9.2+cvs-${CVSDATE}"
119PREFERRED_VERSION_matchbox-stroke = "0.0+cvs-${CVSDATE}"
120PREFERRED_VERSION_matchbox-themes-extra = "0.3+cvs-${CVSDATE}"
121PREFERRED_VERSION_matchbox-wm = "0.9.5+cvs-${CVSDATE}"
122PREFERRED_VERSION_libmatchbox = "1.7+cvs-${CVSDATE}"
123
124PREFERRED_VERSION_atk = "1.10.0"
125PREFERRED_VERSION_cairo = "1.0.0"
126PREFERRED_VERSION_glib-2.0 = "2.8.1"
127PREFERRED_VERSION_gtk+ = "2.6.7"
128PREFERRED_VERSION_pango = "1.10.0"
129
130PREFERRED_VERSION_dbus = "0.50"
131
132PREFERRED_VERSION_diet-x11 ?= "6.2.1"
133PREFERRED_VERSION_dillo2 ?= "0.6.6"
134PREFERRED_VERSION_evince ?= "0.3.2"
135PREFERRED_VERSION_firefox ?= "1.0"
136PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
137PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
138PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
139PREFERRED_VERSION_keylaunch ?= "2.0.7"
140PREFERRED_VERSION_librsvg ?= "2.6.5"
141PREFERRED_VERSION_libgpewidget ?= "0.103"
142PREFERRED_VERSION_libgpepimc ?= "0.5"
143PREFERRED_VERSION_libgpevtype ?= "0.12"
144PREFERRED_VERSION_libgsm ?= "1.0.10"
145PREFERRED_VERSION_libschedule ?= "0.15"
146PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
147PREFERRED_VERSION_linphone ?= "0.12.2"
148PREFERRED_VERSION_minilite ?= "0.49"
149PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
150PREFERRED_VERSION_poppler ?= "0.3.3"
151PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}"
152PREFERRED_VERSION_rxvt-unicode ?= "5.3"
153PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
154PREFERRED_VERSION_xdemineur ?= "2.1.1"
155PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
156PREFERRED_VERSION_xmonobut ?= "0.4"
157PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
158PREFERRED_VERSION_xproto ?= "6.6.2"
159PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
160PREFERRED_VERSION_xst ?= "0.15"
161
162
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 10:20:33 +0000