diff options
author | Richard Purdie <richard@openedhand.com> | 2006-12-20 00:00:03 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-12-20 00:00:03 +0000 |
commit | f5b38f9db0cebb0c7c9d9d72fa98a4ff5241db20 (patch) | |
tree | 337089b8ad5015b9485099a263763c0c72cd3a99 /meta/conf | |
parent | 50bbb7742c760360d1003e441e2a029bee3035df (diff) | |
download | poky-f5b38f9db0cebb0c7c9d9d72fa98a4ff5241db20.tar.gz |
Remove DISTRO_TYPE, replacing with IMAGE_FEATURES. Documentation is in local.conf.sample
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1053 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/poky.conf | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index d42f59289a..f57c07d3fd 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
@@ -5,8 +5,6 @@ DISTRO = "poky" | |||
5 | DISTRO_NAME = "OpenedHand Linux (Poky)" | 5 | DISTRO_NAME = "OpenedHand Linux (Poky)" |
6 | DISTRO_VERSION = "0.0-snapshot-${DATE}" | 6 | DISTRO_VERSION = "0.0-snapshot-${DATE}" |
7 | 7 | ||
8 | DISTRO_TYPE ?= "release" | ||
9 | |||
10 | MAINTAINER = "OpenedHand <poky@openedhand.com>" | 8 | MAINTAINER = "OpenedHand <poky@openedhand.com>" |
11 | 9 | ||
12 | PACKAGE_CLASSES ?= "package_ipk" | 10 | PACKAGE_CLASSES ?= "package_ipk" |
@@ -186,3 +184,29 @@ DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi" | |||
186 | DISTRO_FEATURES_cmx270 = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost" | 184 | DISTRO_FEATURES_cmx270 = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost" |
187 | DISTRO_EXTRA_RDEPENDS_qemuarm += "qemu-distcc" | 185 | DISTRO_EXTRA_RDEPENDS_qemuarm += "qemu-distcc" |
188 | DISTRO_EXTRA_RDEPENDS_qemux86 += "qemu-distcc" | 186 | DISTRO_EXTRA_RDEPENDS_qemux86 += "qemu-distcc" |
187 | |||
188 | IMAGE_FEATURES ?= "" | ||
189 | |||
190 | DISTRO_TASKS = "\ | ||
191 | task-oh-boot \ | ||
192 | ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-dbg", "",d)} \ | ||
193 | ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-dev", "",d)} \ | ||
194 | task-oh-boot-extras \ | ||
195 | ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-extras-dbg", "",d)} \ | ||
196 | ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-extras-dev", "",d)} \ | ||
197 | ${@base_contains("IMAGE_FEATURES", "apps-core", "task-oh-base", "",d)} \ | ||
198 | ${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-oh-base-dbg", "",d)} \ | ||
199 | ${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-oh-base-dev", "",d)} \ | ||
200 | ${@base_contains("IMAGE_FEATURES", "apps-pda", "task-oh-standard", "",d)} \ | ||
201 | ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-oh-standard-dbg", "",d)} \ | ||
202 | ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-oh-standard-dev", "",d)} \ | ||
203 | ${@base_contains("IMAGE_FEATURES", "dev-tools", "task-oh-sdk", "",d)} \ | ||
204 | ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-oh-sdk-dbg", "",d)} \ | ||
205 | ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-oh-sdk-dev", "",d)} \ | ||
206 | ${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-oh-devtools", "",d)} \ | ||
207 | ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-oh-devtools-dbg", "",d)} \ | ||
208 | ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-oh-devtools-dev", "",d)} \ | ||
209 | ${@base_contains("IMAGE_FEATURES", "test-tools", "task-oh-testapps", "",d)} \ | ||
210 | ${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-oh-testapps-dbg", "",d)} \ | ||
211 | ${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-oh-testapps-dev", "",d)} \ | ||
212 | " | ||