summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2013-01-11 23:56:55 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-20 13:01:46 +0000
commitb353c3fb7d8e77e7e1088ab7635dc4d81000826c (patch)
treeba02bb4b7a0b247e5392c2a70d6c39a8e7f33788 /meta-yocto/conf
parent208a641416e7d1594def47de12cc86e58603ca1e (diff)
downloadpoky-b353c3fb7d8e77e7e1088ab7635dc4d81000826c.tar.gz
lttng: update references to legacy lttng recipes
'legacy' lttng was removed, so we need to remove the references to the legacy lttng recipes, namely lttng-control and lttng-viewer. Also update recipe_color to add entries for the new lttng-2.0 recipes lttng-modules, lttng-tools, and babeltrace, to maintain consistency. (From meta-yocto rev: ce68fe95471200261e1ac968f63ae82020ac8871) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@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.inc3
-rw-r--r--meta-yocto/conf/distro/include/maintainers.inc3
-rw-r--r--meta-yocto/conf/distro/include/recipe_color.inc5
3 files changed, 3 insertions, 8 deletions
diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
index 0699c5fbe7..879ae606d2 100644
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -221,12 +221,9 @@ DISTRO_PN_ALIAS_pn-lsbinitscripts = "Windriver"
221DISTRO_PN_ALIAS_pn-lsbsetup = "Windriver" 221DISTRO_PN_ALIAS_pn-lsbsetup = "Windriver"
222DISTRO_PN_ALIAS_pn-lsbtest = "Windriver" 222DISTRO_PN_ALIAS_pn-lsbtest = "Windriver"
223DISTRO_PN_ALIAS_pn-ltp = "Ubuntu=ltp" 223DISTRO_PN_ALIAS_pn-ltp = "Ubuntu=ltp"
224DISTRO_PN_ALIAS_pn-lttng-control = "OSPDT upstream=http://lttng.org/"
225DISTRO_PN_ALIAS_pn-lttng-modules = "OSPDT upstream=http://lttng.org/" 224DISTRO_PN_ALIAS_pn-lttng-modules = "OSPDT upstream=http://lttng.org/"
226DISTRO_PN_ALIAS_pn-lttng-tools = "OSPDT upstream=http://lttng.org/" 225DISTRO_PN_ALIAS_pn-lttng-tools = "OSPDT upstream=http://lttng.org/"
227DISTRO_PN_ALIAS_pn-lttng-ust = "OSPDT upstream=http://lttng.org/" 226DISTRO_PN_ALIAS_pn-lttng-ust = "OSPDT upstream=http://lttng.org/"
228DISTRO_PN_ALIAS_pn-lttng-viewer = "OSPDT upstream=http://lttng.org/"
229DISTRO_PN_ALIAS_pn-lttng2-ust = "OSPDT upstream=http://lttng.org/"
230DISTRO_PN_ALIAS_pn-makedepend = "Mandriva=makedepend Ubuntu=xutils-dev" 227DISTRO_PN_ALIAS_pn-makedepend = "Mandriva=makedepend Ubuntu=xutils-dev"
231DISTRO_PN_ALIAS_pn-makedevs = "OE-Core" 228DISTRO_PN_ALIAS_pn-makedevs = "OE-Core"
232DISTRO_PN_ALIAS_pn-matchbox-config-gtk = "OpenedHand" 229DISTRO_PN_ALIAS_pn-matchbox-config-gtk = "OpenedHand"
diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc
index 0627e99c36..74a4a03b2f 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -490,12 +490,9 @@ RECIPE_MAINTAINER_pn-lsbtest = "Yi Zhao <yi.zhao@windriver.com>"
490RECIPE_MAINTAINER_pn-lsb = "Yi Zhao <yi.zhao@windriver.com>" 490RECIPE_MAINTAINER_pn-lsb = "Yi Zhao <yi.zhao@windriver.com>"
491RECIPE_MAINTAINER_pn-lsof = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>" 491RECIPE_MAINTAINER_pn-lsof = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
492RECIPE_MAINTAINER_pn-ltp = "Mihai Lindner <mihaix.lindner@linux.intel.com>" 492RECIPE_MAINTAINER_pn-ltp = "Mihai Lindner <mihaix.lindner@linux.intel.com>"
493RECIPE_MAINTAINER_pn-lttng2-ust = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
494RECIPE_MAINTAINER_pn-lttng-control = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
495RECIPE_MAINTAINER_pn-lttng-modules = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>" 493RECIPE_MAINTAINER_pn-lttng-modules = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
496RECIPE_MAINTAINER_pn-lttng-tools = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>" 494RECIPE_MAINTAINER_pn-lttng-tools = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
497RECIPE_MAINTAINER_pn-lttng-ust = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>" 495RECIPE_MAINTAINER_pn-lttng-ust = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
498RECIPE_MAINTAINER_pn-lttng-viewer = "Constantin Musca <constantinx.musca@intel.com>"
499RECIPE_MAINTAINER_pn-lzop-native = "Saul Wold <sgw@linux.intel.com>" 496RECIPE_MAINTAINER_pn-lzop-native = "Saul Wold <sgw@linux.intel.com>"
500RECIPE_MAINTAINER_pn-lzop = "Saul Wold <sgw@linux.intel.com>" 497RECIPE_MAINTAINER_pn-lzop = "Saul Wold <sgw@linux.intel.com>"
501RECIPE_MAINTAINER_pn-lzo = "Radu Moisan <radu.moisan@intel.com>" 498RECIPE_MAINTAINER_pn-lzo = "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 012f5e20f5..9402a939fc 100644
--- a/meta-yocto/conf/distro/include/recipe_color.inc
+++ b/meta-yocto/conf/distro/include/recipe_color.inc
@@ -250,9 +250,10 @@ RECIPE_COLOR_pn-lighttpd = "yellow"
250RECIPE_COLOR_pn-linuxdoc-tools = "yellow" 250RECIPE_COLOR_pn-linuxdoc-tools = "yellow"
251RECIPE_COLOR_pn-loudmouth = "red" 251RECIPE_COLOR_pn-loudmouth = "red"
252RECIPE_COLOR_pn-lrzsz="yellow" 252RECIPE_COLOR_pn-lrzsz="yellow"
253RECIPE_COLOR_pn-lttng-control = "yellow" 253RECIPE_COLOR_pn-lttng-modules = "yellow"
254RECIPE_COLOR_pn-lttng-tools = "yellow"
254RECIPE_COLOR_pn-lttng-ust = "yellow" 255RECIPE_COLOR_pn-lttng-ust = "yellow"
255RECIPE_COLOR_pn-lttng-viewer = "yellow" 256RECIPE_COLOR_pn-babeltrace = "yellow"
256RECIPE_COLOR_pn-makedevs = "yellow" 257RECIPE_COLOR_pn-makedevs = "yellow"
257RECIPE_COLOR_pn-man = "red" 258RECIPE_COLOR_pn-man = "red"
258RECIPE_COLOR_pn-man-pages = "red" 259RECIPE_COLOR_pn-man-pages = "red"