From b353c3fb7d8e77e7e1088ab7635dc4d81000826c Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 11 Jan 2013 23:56:55 +0000 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta-yocto/conf/distro/include/distro_alias.inc | 3 --- meta-yocto/conf/distro/include/maintainers.inc | 3 --- meta-yocto/conf/distro/include/recipe_color.inc | 5 +++-- 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" DISTRO_PN_ALIAS_pn-lsbsetup = "Windriver" DISTRO_PN_ALIAS_pn-lsbtest = "Windriver" DISTRO_PN_ALIAS_pn-ltp = "Ubuntu=ltp" -DISTRO_PN_ALIAS_pn-lttng-control = "OSPDT upstream=http://lttng.org/" DISTRO_PN_ALIAS_pn-lttng-modules = "OSPDT upstream=http://lttng.org/" DISTRO_PN_ALIAS_pn-lttng-tools = "OSPDT upstream=http://lttng.org/" DISTRO_PN_ALIAS_pn-lttng-ust = "OSPDT upstream=http://lttng.org/" -DISTRO_PN_ALIAS_pn-lttng-viewer = "OSPDT upstream=http://lttng.org/" -DISTRO_PN_ALIAS_pn-lttng2-ust = "OSPDT upstream=http://lttng.org/" DISTRO_PN_ALIAS_pn-makedepend = "Mandriva=makedepend Ubuntu=xutils-dev" DISTRO_PN_ALIAS_pn-makedevs = "OE-Core" DISTRO_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 " RECIPE_MAINTAINER_pn-lsb = "Yi Zhao " RECIPE_MAINTAINER_pn-lsof = "Bogdan Marinescu " RECIPE_MAINTAINER_pn-ltp = "Mihai Lindner " -RECIPE_MAINTAINER_pn-lttng2-ust = "Bogdan Marinescu " -RECIPE_MAINTAINER_pn-lttng-control = "Bogdan Marinescu " RECIPE_MAINTAINER_pn-lttng-modules = "Bogdan Marinescu " RECIPE_MAINTAINER_pn-lttng-tools = "Bogdan Marinescu " RECIPE_MAINTAINER_pn-lttng-ust = "Bogdan Marinescu " -RECIPE_MAINTAINER_pn-lttng-viewer = "Constantin Musca " RECIPE_MAINTAINER_pn-lzop-native = "Saul Wold " RECIPE_MAINTAINER_pn-lzop = "Saul Wold " RECIPE_MAINTAINER_pn-lzo = "Radu Moisan " 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" RECIPE_COLOR_pn-linuxdoc-tools = "yellow" RECIPE_COLOR_pn-loudmouth = "red" RECIPE_COLOR_pn-lrzsz="yellow" -RECIPE_COLOR_pn-lttng-control = "yellow" +RECIPE_COLOR_pn-lttng-modules = "yellow" +RECIPE_COLOR_pn-lttng-tools = "yellow" RECIPE_COLOR_pn-lttng-ust = "yellow" -RECIPE_COLOR_pn-lttng-viewer = "yellow" +RECIPE_COLOR_pn-babeltrace = "yellow" RECIPE_COLOR_pn-makedevs = "yellow" RECIPE_COLOR_pn-man = "red" RECIPE_COLOR_pn-man-pages = "red" -- cgit v1.2.3-54-g00ecf