summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-03 11:44:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 12:53:11 +0100
commit9674b1a4d399f7cb2b979b3cf5131053037603f1 (patch)
tree6a7f55429dbc8f3144175d2665ca45b3c096715a /meta-yocto/conf
parentad3743d4920e710449c39ac079f33e9bd9cd9848 (diff)
downloadpoky-9674b1a4d399f7cb2b979b3cf5131053037603f1.tar.gz
meta-yocto: fix for task rename
(From meta-yocto rev: da4717580cc06dfc3168acf22fe8e4e2f79f4b95) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto/conf')
-rw-r--r--meta-yocto/conf/distro/include/distro_alias.inc60
-rw-r--r--meta-yocto/conf/distro/include/maintainers.inc36
-rw-r--r--meta-yocto/conf/distro/include/recipe_color.inc12
-rw-r--r--meta-yocto/conf/distro/include/upstream_tracking.inc2
-rw-r--r--meta-yocto/conf/distro/poky-tiny.conf6
-rw-r--r--meta-yocto/conf/distro/poky.conf2
6 files changed, 59 insertions, 59 deletions
diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
index f5890ab5a9..c63bd47200 100644
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -313,36 +313,36 @@ DISTRO_PN_ALIAS_pn-systemtap-uprobes = "Ubuntu=systemtap Debian=systemtap"
313DISTRO_PN_ALIAS_pn-sysvinit-inittab = "OE-Core" 313DISTRO_PN_ALIAS_pn-sysvinit-inittab = "OE-Core"
314DISTRO_PN_ALIAS_pn-table = "Intel" 314DISTRO_PN_ALIAS_pn-table = "Intel"
315DISTRO_PN_ALIAS_pn-tar-replacement-native = "OE-Core" 315DISTRO_PN_ALIAS_pn-tar-replacement-native = "OE-Core"
316DISTRO_PN_ALIAS_pn-task-base = "OE-Core" 316DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core"
317DISTRO_PN_ALIAS_pn-task-core-basic = "OE-Core" 317DISTRO_PN_ALIAS_pn-packagegroup-core-basic = "OE-Core"
318DISTRO_PN_ALIAS_pn-task-core-boot = "OE-Core" 318DISTRO_PN_ALIAS_pn-packagegroup-core-boot = "OE-Core"
319DISTRO_PN_ALIAS_pn-task-core-clutter = "OE-Core" 319DISTRO_PN_ALIAS_pn-packagegroup-core-clutter = "OE-Core"
320DISTRO_PN_ALIAS_pn-task-core-console = "OE-Core" 320DISTRO_PN_ALIAS_pn-packagegroup-core-console = "OE-Core"
321DISTRO_PN_ALIAS_pn-task-core-gtk-directfb = "OE-Core" 321DISTRO_PN_ALIAS_pn-packagegroup-core-gtk-directfb = "OE-Core"
322DISTRO_PN_ALIAS_pn-task-core-lsb = "OE-Core" 322DISTRO_PN_ALIAS_pn-packagegroup-core-lsb = "OE-Core"
323DISTRO_PN_ALIAS_pn-task-core-nfs = "OE-Core" 323DISTRO_PN_ALIAS_pn-packagegroup-core-nfs = "OE-Core"
324DISTRO_PN_ALIAS_pn-task-core = "OE-Core" 324DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core"
325DISTRO_PN_ALIAS_pn-task-core-qt = "OE-Core" 325DISTRO_PN_ALIAS_pn-packagegroup-core-qt = "OE-Core"
326DISTRO_PN_ALIAS_pn-task-core-sdk-gmae = "OE-Core" 326DISTRO_PN_ALIAS_pn-packagegroup-core-sdk-gmae = "OE-Core"
327DISTRO_PN_ALIAS_pn-task-core-sdk = "OE-Core" 327DISTRO_PN_ALIAS_pn-packagegroup-core-sdk = "OE-Core"
328DISTRO_PN_ALIAS_pn-task-core-ssh-dropbear = "OE-Core" 328DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-dropbear = "OE-Core"
329DISTRO_PN_ALIAS_pn-task-core-ssh-openssh = "OE-Core" 329DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-openssh = "OE-Core"
330DISTRO_PN_ALIAS_pn-task-core-standalone-gmae-sdk-target = "OE-Core" 330DISTRO_PN_ALIAS_pn-packagegroup-core-standalone-gmae-sdk-target = "OE-Core"
331DISTRO_PN_ALIAS_pn-task-core-standalone-sdk-target = "OE-Core" 331DISTRO_PN_ALIAS_pn-packagegroup-core-standalone-sdk-target = "OE-Core"
332DISTRO_PN_ALIAS_pn-task-core-tools-debug = "OE-Core" 332DISTRO_PN_ALIAS_pn-packagegroup-core-tools-debug = "OE-Core"
333DISTRO_PN_ALIAS_pn-task-core-tools = "OE-Core" 333DISTRO_PN_ALIAS_pn-packagegroup-core-tools = "OE-Core"
334DISTRO_PN_ALIAS_pn-task-core-tools-profile = "OE-Core" 334DISTRO_PN_ALIAS_pn-packagegroup-core-tools-profile = "OE-Core"
335DISTRO_PN_ALIAS_pn-task-core-tools-testapps = "OE-Core" 335DISTRO_PN_ALIAS_pn-packagegroup-core-tools-testapps = "OE-Core"
336DISTRO_PN_ALIAS_pn-task-core-x11-mini = "OE-Core" 336DISTRO_PN_ALIAS_pn-packagegroup-core-x11-mini = "OE-Core"
337DISTRO_PN_ALIAS_pn-task-core-x11 = "OE-Core" 337DISTRO_PN_ALIAS_pn-packagegroup-core-x11 = "OE-Core"
338DISTRO_PN_ALIAS_pn-task-core-x11-sato = "OE-Core" 338DISTRO_PN_ALIAS_pn-packagegroup-core-x11-sato = "OE-Core"
339DISTRO_PN_ALIAS_pn-task-cross-canadian-i586 = "OE-Core" 339DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-i586 = "OE-Core"
340DISTRO_PN_ALIAS_pn-task-qt4e = "OE-Core" 340DISTRO_PN_ALIAS_pn-packagegroup-qt4e = "OE-Core"
341DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-nativesdk = "OE-Core" 341DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-host-nativesdk = "OE-Core"
342DISTRO_PN_ALIAS_pn-task-qte-toolchain-host-natives = "OE-Core" 342DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-host-natives = "OE-Core"
343DISTRO_PN_ALIAS_pn-task-qte-toolchain-target = "Intel" 343DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-target = "Intel"
344DISTRO_PN_ALIAS_pn-task-sdk-host = "OE-Core" 344DISTRO_PN_ALIAS_pn-packagegroup-sdk-host = "OE-Core"
345DISTRO_PN_ALIAS_pn-task-self-hosted = "OE-Core" 345DISTRO_PN_ALIAS_pn-packagegroup-self-hosted = "OE-Core"
346DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/" 346DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/"
347DISTRO_PN_ALIAS_pn-tinylogin = "Debian=busybox Ubuntu=busybox Mandriva=busybox" 347DISTRO_PN_ALIAS_pn-tinylogin = "Debian=busybox Ubuntu=busybox Mandriva=busybox"
348DISTRO_PN_ALIAS_pn-trace-cmd = "Mandriva=trace-cmd Ubuntu=trace-cmd" 348DISTRO_PN_ALIAS_pn-trace-cmd = "Mandriva=trace-cmd Ubuntu=trace-cmd"
diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc
index 7a8b2baa93..dace3b9c29 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -603,24 +603,24 @@ RECIPE_MAINTAINER_pn-systemtap-uprobes = "Tom Zanussi <tom.zanussi@intel.com>"
603RECIPE_MAINTAINER_pn-sysvinit = "Saul Wold <sgw@linux.intel.com>" 603RECIPE_MAINTAINER_pn-sysvinit = "Saul Wold <sgw@linux.intel.com>"
604RECIPE_MAINTAINER_pn-taglib = "Cristian Iorga <cristian.iorga@intel.com>" 604RECIPE_MAINTAINER_pn-taglib = "Cristian Iorga <cristian.iorga@intel.com>"
605RECIPE_MAINTAINER_pn-tar = "Scott Garman <scott.a.garman@intel.com>" 605RECIPE_MAINTAINER_pn-tar = "Scott Garman <scott.a.garman@intel.com>"
606RECIPE_MAINTAINER_pn-task-base = "Saul Wold <sgw@linux.intel.com>" 606RECIPE_MAINTAINER_pn-packagegroup-base = "Saul Wold <sgw@linux.intel.com>"
607RECIPE_MAINTAINER_pn-task-core-basic = "Saul Wold <sgw@linux.intel.com>" 607RECIPE_MAINTAINER_pn-packagegroup-core-basic = "Saul Wold <sgw@linux.intel.com>"
608RECIPE_MAINTAINER_pn-task-core-boot = "Saul Wold <sgw@linux.intel.com>" 608RECIPE_MAINTAINER_pn-packagegroup-core-boot = "Saul Wold <sgw@linux.intel.com>"
609RECIPE_MAINTAINER_pn-task-core-clutter = "Ross Burton <ross.burton@intel.com>" 609RECIPE_MAINTAINER_pn-packagegroup-core-clutter = "Ross Burton <ross.burton@intel.com>"
610RECIPE_MAINTAINER_pn-task-core-console = "Saul Wold <sgw@linux.intel.com>" 610RECIPE_MAINTAINER_pn-packagegroup-core-console = "Saul Wold <sgw@linux.intel.com>"
611RECIPE_MAINTAINER_pn-task-core-lsb = "Saul Wold <sgw@linux.intel.com>" 611RECIPE_MAINTAINER_pn-packagegroup-core-lsb = "Saul Wold <sgw@linux.intel.com>"
612RECIPE_MAINTAINER_pn-task-core-nfs = "Saul Wold <sgw@linux.intel.com>" 612RECIPE_MAINTAINER_pn-packagegroup-core-nfs = "Saul Wold <sgw@linux.intel.com>"
613RECIPE_MAINTAINER_pn-task-core-qt = "Saul Wold <sgw@linux.intel.com>" 613RECIPE_MAINTAINER_pn-packagegroup-core-qt = "Saul Wold <sgw@linux.intel.com>"
614RECIPE_MAINTAINER_pn-task-core-sdk = "Saul Wold <sgw@linux.intel.com>" 614RECIPE_MAINTAINER_pn-packagegroup-core-sdk = "Saul Wold <sgw@linux.intel.com>"
615RECIPE_MAINTAINER_pn-task-core-sdk-gmae = "Saul Wold <sgw@linux.intel.com>" 615RECIPE_MAINTAINER_pn-packagegroup-core-sdk-gmae = "Saul Wold <sgw@linux.intel.com>"
616RECIPE_MAINTAINER_pn-task-core-standalone-gmae-sdk-target = "Saul Wold <sgw@linux.intel.com>" 616RECIPE_MAINTAINER_pn-packagegroup-core-standalone-gmae-sdk-target = "Saul Wold <sgw@linux.intel.com>"
617RECIPE_MAINTAINER_pn-task-core-standalone-sdk-target = "Saul Wold <sgw@linux.intel.com>" 617RECIPE_MAINTAINER_pn-packagegroup-core-standalone-sdk-target = "Saul Wold <sgw@linux.intel.com>"
618RECIPE_MAINTAINER_pn-task-core-tools-profile = "Saul Wold <sgw@linux.intel.com>" 618RECIPE_MAINTAINER_pn-packagegroup-core-tools-profile = "Saul Wold <sgw@linux.intel.com>"
619RECIPE_MAINTAINER_pn-task-core-tools-profile = "Saul Wold <sgw@linux.intel.com>" 619RECIPE_MAINTAINER_pn-packagegroup-core-tools-profile = "Saul Wold <sgw@linux.intel.com>"
620RECIPE_MAINTAINER_pn-task-core-tools-testapps = "Saul Wold <sgw@linux.intel.com>" 620RECIPE_MAINTAINER_pn-packagegroup-core-tools-testapps = "Saul Wold <sgw@linux.intel.com>"
621RECIPE_MAINTAINER_pn-task-core-x11 = "Saul Wold <sgw@linux.intel.com>" 621RECIPE_MAINTAINER_pn-packagegroup-core-x11 = "Saul Wold <sgw@linux.intel.com>"
622RECIPE_MAINTAINER_pn-task-core-x11-sato = "Saul Wold <sgw@linux.intel.com>" 622RECIPE_MAINTAINER_pn-packagegroup-core-x11-sato = "Saul Wold <sgw@linux.intel.com>"
623RECIPE_MAINTAINER_pn-task-sdk-host = "Saul Wold <sgw@linux.intel.com>" 623RECIPE_MAINTAINER_pn-packagegroup-sdk-host = "Saul Wold <sgw@linux.intel.com>"
624RECIPE_MAINTAINER_pn-tcf-agent = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>" 624RECIPE_MAINTAINER_pn-tcf-agent = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
625RECIPE_MAINTAINER_pn-tcl = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>" 625RECIPE_MAINTAINER_pn-tcl = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
626RECIPE_MAINTAINER_pn-tcp-wrappers = "Radu Moisan <radu.moisan@intel.com>" 626RECIPE_MAINTAINER_pn-tcp-wrappers = "Radu Moisan <radu.moisan@intel.com>"
diff --git a/meta-yocto/conf/distro/include/recipe_color.inc b/meta-yocto/conf/distro/include/recipe_color.inc
index cb481c3c8e..612a698dfa 100644
--- a/meta-yocto/conf/distro/include/recipe_color.inc
+++ b/meta-yocto/conf/distro/include/recipe_color.inc
@@ -379,12 +379,12 @@ RECIPE_COLOR_pn-sysprof = "red"
379RECIPE_COLOR_pn-sysvinit = "yellow" 379RECIPE_COLOR_pn-sysvinit = "yellow"
380RECIPE_COLOR_pn-table = "red" 380RECIPE_COLOR_pn-table = "red"
381RECIPE_COLOR_pn-tar = "yellow" 381RECIPE_COLOR_pn-tar = "yellow"
382RECIPE_COLOR_pn-task-base = "red" 382RECIPE_COLOR_pn-packagegroup-base = "red"
383RECIPE_COLOR_pn-task-core-sdk = "red" 383RECIPE_COLOR_pn-packagegroup-core-sdk = "red"
384RECIPE_COLOR_pn-task-core-sdk-gmae = "red" 384RECIPE_COLOR_pn-packagegroup-core-sdk-gmae = "red"
385RECIPE_COLOR_pn-task-core-standalone-gmae-sdk-target = "red" 385RECIPE_COLOR_pn-packagegroup-core-standalone-gmae-sdk-target = "red"
386RECIPE_COLOR_pn-task-core-standalone-sdk-target = "red" 386RECIPE_COLOR_pn-packagegroup-core-standalone-sdk-target = "red"
387RECIPE_COLOR_pn-task-sdk-host = "red" 387RECIPE_COLOR_pn-packagegroup-sdk-host = "red"
388RECIPE_COLOR_pn-tcf-agent = "yellow" 388RECIPE_COLOR_pn-tcf-agent = "yellow"
389RECIPE_COLOR_pn-tcp-wrappers = "yellow" 389RECIPE_COLOR_pn-tcp-wrappers = "yellow"
390RECIPE_COLOR_pn-telepathy-farsight = "red" 390RECIPE_COLOR_pn-telepathy-farsight = "red"
diff --git a/meta-yocto/conf/distro/include/upstream_tracking.inc b/meta-yocto/conf/distro/include/upstream_tracking.inc
index bdd45cdd41..18731748d1 100644
--- a/meta-yocto/conf/distro/include/upstream_tracking.inc
+++ b/meta-yocto/conf/distro/include/upstream_tracking.inc
@@ -916,7 +916,7 @@ RECIPE_UPSTREAM_VERSION_pn-talloc = "2.0.5"
916RECIPE_UPSTREAM_VERSION_pn-tar = "1.26" 916RECIPE_UPSTREAM_VERSION_pn-tar = "1.26"
917RECIPE_UPSTREAM_DATE_pn-tar = "Mar 01, 2011" 917RECIPE_UPSTREAM_DATE_pn-tar = "Mar 01, 2011"
918CHECK_DATE_pn-tar = "Nov 14, 2011" 918CHECK_DATE_pn-tar = "Nov 14, 2011"
919RECIPE_UPSTREAM_DATE_pn-task-base="n/a" 919RECIPE_UPSTREAM_DATE_pn-packagegroup-base="n/a"
920RECIPE_UPSTREAM_DATE_pn-tcf-agent = "Jul 07, 2011" 920RECIPE_UPSTREAM_DATE_pn-tcf-agent = "Jul 07, 2011"
921RECIPE_UPSTREAM_VERSION_pn-tcl="8.5.11" 921RECIPE_UPSTREAM_VERSION_pn-tcl="8.5.11"
922RECIPE_UPSTREAM_DATE_pn-tcl = "Jul 07, 2011" 922RECIPE_UPSTREAM_DATE_pn-tcl = "Jul 07, 2011"
diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf
index 8ae1d85e8a..f3cc87451a 100644
--- a/meta-yocto/conf/distro/poky-tiny.conf
+++ b/meta-yocto/conf/distro/poky-tiny.conf
@@ -39,8 +39,8 @@ DISTRO = "poky-tiny"
39PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" 39PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny"
40PREFERRED_VERSION_linux-yocto-tiny = "3.2%" 40PREFERRED_VERSION_linux-yocto-tiny = "3.2%"
41 41
42# We can use task-core-boot, but in the future we may need a new task-core-tiny 42# We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny
43#POKY_DEFAULT_EXTRA_RDEPENDS += "task-core-boot" 43#POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot"
44# Drop kernel-module-af-packet from RRECOMMENDS 44# Drop kernel-module-af-packet from RRECOMMENDS
45POKY_DEFAULT_EXTRA_RRECOMMENDS = "" 45POKY_DEFAULT_EXTRA_RRECOMMENDS = ""
46 46
@@ -99,7 +99,7 @@ VIRTUAL-RUNTIME_init_manager = "tiny-init"
99VIRTUAL-RUNTIME_keymaps = "" 99VIRTUAL-RUNTIME_keymaps = ""
100 100
101# FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in 101# FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in
102# task-core-base to select modutils-initscripts or not. Similar with "net" and 102# packagegroup-core-base to select modutils-initscripts or not. Similar with "net" and
103# netbase. 103# netbase.
104 104
105# By default we only support ext2 and initramfs. We don't build live as that 105# By default we only support ext2 and initramfs. We don't build live as that
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 94dc567786..5409a7761f 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -25,7 +25,7 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
25EXTRAOPKGCONFIG = "poky-feed-config-opkg" 25EXTRAOPKGCONFIG = "poky-feed-config-opkg"
26 26
27# Override these in poky based distros to modify DISTRO_EXTRA_R* 27# Override these in poky based distros to modify DISTRO_EXTRA_R*
28POKY_DEFAULT_EXTRA_RDEPENDS = "task-core-boot" 28POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
29POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" 29POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
30 30
31DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" 31DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-10 19:38:10 +0000