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