diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-28 16:31:39 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-10-28 16:34:35 +0000 |
commit | 47c42b6c3014429886eaa66a17f38e86a33d086e (patch) | |
tree | 989db176169552482c2aa0ba0b4b5ccb0b8b2137 /meta/conf | |
parent | 3a73995e31a6e2af4ec572edd174e9579f99dfb9 (diff) | |
download | poky-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 (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/include/as-needed.inc | 14 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-eabi.inc | 15 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-moblin.inc | 26 | ||||
-rw-r--r-- | meta/conf/distro/include/world-broken.inc | 30 | ||||
-rw-r--r-- | meta/conf/distro/poky.conf | 30 |
5 files changed, 74 insertions, 41 deletions
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 | |||
2 | ASNEEDED = "-Wl,--as-needed" | ||
3 | |||
4 | ASNEEDED_pn-console-tools = "" | ||
5 | ASNEEDED_pn-distcc = "" | ||
6 | ASNEEDED_pn-openobex = "" | ||
7 | ASNEEDED_pn-icu = "" | ||
8 | ASNEEDED_pn-xserver-kdrive-xomap = "" | ||
9 | ASNEEDED_pn-minimo = "" | ||
10 | ASNEEDED_pn-pciutils = "" | ||
11 | ASNEEDED_pn-puzzles = "" | ||
12 | ASNEEDED_pn-dialer = "" | ||
13 | |||
14 | TARGET_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" | |||
35 | PREFERRED_VERSION_glibc-initial ?= "2.6.1" | 35 | PREFERRED_VERSION_glibc-initial ?= "2.6.1" |
36 | PREFERRED_VERSION_elfutils ?= "0.131" | 36 | PREFERRED_VERSION_elfutils ?= "0.131" |
37 | 37 | ||
38 | ASNEEDED = "-Wl,--as-needed" | 38 | require conf/distro/include/as-needed.inc |
39 | ASNEEDED_pn-console-tools = "" | 39 | |
40 | ASNEEDED_pn-distcc = "" | 40 | |
41 | ASNEEDED_pn-openobex = "" | ||
42 | ASNEEDED_pn-icu = "" | ||
43 | ASNEEDED_pn-xserver-kdrive-xomap = "" | ||
44 | ASNEEDED_pn-minimo = "" | ||
45 | ASNEEDED_pn-pciutils = "" | ||
46 | ASNEEDED_pn-puzzles = "" | ||
47 | ASNEEDED_pn-dialer = "" | ||
48 | |||
49 | TARGET_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 @@ | |||
1 | TARGET_VENDOR = "-poky" | ||
2 | |||
3 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" | ||
4 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" | ||
5 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" | ||
6 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" | ||
7 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" | ||
8 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" | ||
9 | |||
10 | GCCVERSION ?= "4.2.3" | ||
11 | BINUVERSION = "2.18" | ||
12 | |||
13 | PREFERRED_VERSION_gcc ?= "${GCCVERSION}" | ||
14 | PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}" | ||
15 | PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}" | ||
16 | PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}" | ||
17 | PREFERRED_VERSION_gcc-cross-sdk ?= "${GCCVERSION}" | ||
18 | PREFERRED_VERSION_binutils ?= "${BINUVERSION}" | ||
19 | PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" | ||
20 | PREFERRED_VERSION_linux-libc-headers ?= "2.6.24" | ||
21 | PREFERRED_VERSION_glibc ?= "2.6.1" | ||
22 | PREFERRED_VERSION_glibc-initial ?= "2.6.1" | ||
23 | PREFERRED_VERSION_elfutils ?= "0.131" | ||
24 | |||
25 | require 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 | ||
5 | EXCLUDE_FROM_WORLD_pn-libsync = "1" | ||
6 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-evo2-sync = "1" | ||
7 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1" | ||
8 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc = "1" | ||
9 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1" | ||
10 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-google-calendar = "1" | ||
11 | # Needs python | ||
12 | EXCLUDE_FROM_WORLD_pn-opkg-utils = "1" | ||
13 | # Needs gcc 3.x | ||
14 | EXCLUDE_FROM_WORLD_pn-qemu = "1" | ||
15 | # temporary | ||
16 | EXCLUDE_FROM_WORLD_pn-lirc = "1" | ||
17 | EXCLUDE_FROM_WORLD_pn-lirc-modules = "1" | ||
18 | # these applications need clutter 0.6 | ||
19 | EXCLUDE_FROM_WORLD_pn-aaina = "1" | ||
20 | EXCLUDE_FROM_WORLD_pn-table = "1" | ||
21 | EXCLUDE_FROM_WORLD_pn-task-poky-clutter = "1" | ||
22 | # Need bzr | ||
23 | EXCLUDE_FROM_WORLD_pn-eds-tools = "1" | ||
24 | # Need fixed Perl - OE bug #3403 | ||
25 | EXCLUDE_FROM_WORLD_pn-libxml-parser-perl = "1" | ||
26 | # Needs libxml-parser-perl | ||
27 | EXCLUDE_FROM_WORLD_pn-libxml-simple-perl = "1" | ||
28 | # Needs gtk+ <= 2.10 | ||
29 | EXCLUDE_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 | ||
117 | IMAGE_FEATURES ?= "" | 117 | IMAGE_FEATURES ?= "" |
118 | 118 | ||
119 | # | 119 | require conf/distro/include/world-broken.inc |
120 | # Exclude known broken packages | ||
121 | # | ||
122 | # Needs old OpenSync | ||
123 | EXCLUDE_FROM_WORLD_pn-libsync = "1" | ||
124 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-evo2-sync = "1" | ||
125 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1" | ||
126 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc = "1" | ||
127 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1" | ||
128 | EXCLUDE_FROM_WORLD_pn-libopensync-plugin-google-calendar = "1" | ||
129 | # Needs python | ||
130 | EXCLUDE_FROM_WORLD_pn-opkg-utils = "1" | ||
131 | # Needs gcc 3.x | ||
132 | EXCLUDE_FROM_WORLD_pn-qemu = "1" | ||
133 | # temporary | ||
134 | EXCLUDE_FROM_WORLD_pn-lirc = "1" | ||
135 | EXCLUDE_FROM_WORLD_pn-lirc-modules = "1" | ||
136 | # these applications need clutter 0.6 | ||
137 | EXCLUDE_FROM_WORLD_pn-aaina = "1" | ||
138 | EXCLUDE_FROM_WORLD_pn-table = "1" | ||
139 | EXCLUDE_FROM_WORLD_pn-task-poky-clutter = "1" | ||
140 | # Need bzr | ||
141 | EXCLUDE_FROM_WORLD_pn-eds-tools = "1" | ||
142 | # Need fixed Perl - OE bug #3403 | ||
143 | EXCLUDE_FROM_WORLD_pn-libxml-parser-perl = "1" | ||
144 | # Needs libxml-parser-perl | ||
145 | EXCLUDE_FROM_WORLD_pn-libxml-simple-perl = "1" | ||
146 | # Needs gtk+ <= 2.10 | ||
147 | EXCLUDE_FROM_WORLD_pn-gcalctool = "1" | ||
148 | 120 | ||