Patchwork [2/5] lttng2-ust: rename to lttng-ust

login
register
mail settings
Submitter Tom Zanussi
Date Jan. 11, 2013, 7:20 p.m.
Message ID <ed6ed5e95e9932260d83b1ab2473d53c02985688.1357930527.git.tom.zanussi@intel.com>
Download mbox | patch
Permalink /patch/42505/
State New
Headers show

Comments

Tom Zanussi - Jan. 11, 2013, 7:20 p.m.
From: Tom Zanussi <tom.zanussi@intel.com>

recipes-kernel/lttng/lttng-ust was removed by a previous patch, which
also removed the naming conflict that caused the lttng-2.0 version of
lttng-ust to be named lttng2-ust.  lttng2-ust was the only lttng-2.0
recipe to be named in this way and since that was entirely due to the
conflict, we can go back to the consistent naming for it.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-yocto/conf/distro/include/distro_alias.inc                      | 1 -
 meta-yocto/conf/distro/include/maintainers.inc                       | 1 -
 meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb   | 2 +-
 meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb                   | 2 +-
 .../lttng-2.0/{lttng2-ust_2.1.0.bb => lttng-ust_2.1.0.bb}            | 5 +++++
 5 files changed, 7 insertions(+), 4 deletions(-)
 rename meta/recipes-kernel/lttng-2.0/{lttng2-ust_2.1.0.bb => lttng-ust_2.1.0.bb} (87%)
Saul Wold - Jan. 11, 2013, 9:43 p.m.
On 01/11/2013 11:20 AM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
>
> recipes-kernel/lttng/lttng-ust was removed by a previous patch, which
> also removed the naming conflict that caused the lttng-2.0 version of
> lttng-ust to be named lttng2-ust.  lttng2-ust was the only lttng-2.0
> recipe to be named in this way and since that was entirely due to the
> conflict, we can go back to the consistent naming for it.
>
> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
> ---
>   meta-yocto/conf/distro/include/distro_alias.inc                      | 1 -
>   meta-yocto/conf/distro/include/maintainers.inc                       | 1 -
These need to be in a sperate patch to poky@yoctoproject, they are not 
part of OE-Core.

Thanks
	Sau!

>   meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb   | 2 +-
>   meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb                   | 2 +-
>   .../lttng-2.0/{lttng2-ust_2.1.0.bb => lttng-ust_2.1.0.bb}            | 5 +++++
>   5 files changed, 7 insertions(+), 4 deletions(-)
>   rename meta/recipes-kernel/lttng-2.0/{lttng2-ust_2.1.0.bb => lttng-ust_2.1.0.bb} (87%)
>
> diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
> index 0699c5f..1994e27 100644
> --- a/meta-yocto/conf/distro/include/distro_alias.inc
> +++ b/meta-yocto/conf/distro/include/distro_alias.inc
> @@ -226,7 +226,6 @@ 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 5efb7d0..6de57dc 100644
> --- a/meta-yocto/conf/distro/include/maintainers.inc
> +++ b/meta-yocto/conf/distro/include/maintainers.inc
> @@ -490,7 +490,6 @@ RECIPE_MAINTAINER_pn-lsbtest = "Yi Zhao <yi.zhao@windriver.com>"
>   RECIPE_MAINTAINER_pn-lsb = "Yi Zhao <yi.zhao@windriver.com>"
>   RECIPE_MAINTAINER_pn-lsof = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
>   RECIPE_MAINTAINER_pn-ltp = "Mihai Lindner <mihaix.lindner@linux.intel.com>"
> -RECIPE_MAINTAINER_pn-lttng2-ust = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
>   RECIPE_MAINTAINER_pn-lttng-control = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
>   RECIPE_MAINTAINER_pn-lttng-modules = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
>   RECIPE_MAINTAINER_pn-lttng-tools = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
> diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
> index 591f33f..8f40c4e 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
> @@ -46,7 +46,7 @@ SYSTEMTAP_aarch64 = ""
>   # which means we can not use syscall() to call it. So we ignore
>   # it for x86_64/uclibc
>
> -LTTNGUST = "lttng2-ust"
> +LTTNGUST = "lttng-ust"
>   LTTNGUST_libc-uclibc = ""
>   LTTNGUST_mips = ""
>   LTTNGUST_aarch64 = ""
> diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
> index 482b9a6..16e1ccc 100644
> --- a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
> +++ b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
> @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
>                       file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>                       file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
>
> -DEPENDS = "liburcu popt lttng2-ust"
> +DEPENDS = "liburcu popt lttng-ust"
>
>   SRCREV = "917f768512b5d336d553b801f6c5308d90252a89"
>   PV = "v2.1.0"
> diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
> similarity index 87%
> rename from meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
> rename to meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
> index 439e006..1076bde 100644
> --- a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
> +++ b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
> @@ -12,6 +12,11 @@ inherit autotools
>
>   DEPENDS = "liburcu util-linux"
>
> +# For backwards compatibility after rename
> +RPROVIDES_${PN} = "lttng2-ust"
> +RREPLACES_${PN} = "lttng2-ust"
> +RCONFLICTS_${PN} = "lttng2-ust"
> +
>   SRCREV = "0c9ad44b7604040dfcd1e67b18afc3dc5d025b19"
>   PV = "2.1.0"
>   PR = "r0"
>

Patch

diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
index 0699c5f..1994e27 100644
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -226,7 +226,6 @@  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 5efb7d0..6de57dc 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -490,7 +490,6 @@  RECIPE_MAINTAINER_pn-lsbtest = "Yi Zhao <yi.zhao@windriver.com>"
 RECIPE_MAINTAINER_pn-lsb = "Yi Zhao <yi.zhao@windriver.com>"
 RECIPE_MAINTAINER_pn-lsof = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-ltp = "Mihai Lindner <mihaix.lindner@linux.intel.com>"
-RECIPE_MAINTAINER_pn-lttng2-ust = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-lttng-control = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-lttng-modules = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
 RECIPE_MAINTAINER_pn-lttng-tools = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 591f33f..8f40c4e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -46,7 +46,7 @@  SYSTEMTAP_aarch64 = ""
 # which means we can not use syscall() to call it. So we ignore
 # it for x86_64/uclibc
 
-LTTNGUST = "lttng2-ust"
+LTTNGUST = "lttng-ust"
 LTTNGUST_libc-uclibc = ""
 LTTNGUST_mips = ""
 LTTNGUST_aarch64 = ""
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
index 482b9a6..16e1ccc 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
@@ -9,7 +9,7 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
                     file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
 
-DEPENDS = "liburcu popt lttng2-ust"
+DEPENDS = "liburcu popt lttng-ust"
 
 SRCREV = "917f768512b5d336d553b801f6c5308d90252a89"
 PV = "v2.1.0"
diff --git a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
similarity index 87%
rename from meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
rename to meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
index 439e006..1076bde 100644
--- a/meta/recipes-kernel/lttng-2.0/lttng2-ust_2.1.0.bb
+++ b/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
@@ -12,6 +12,11 @@  inherit autotools
 
 DEPENDS = "liburcu util-linux"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "lttng2-ust"
+RREPLACES_${PN} = "lttng2-ust"
+RCONFLICTS_${PN} = "lttng2-ust"
+
 SRCREV = "0c9ad44b7604040dfcd1e67b18afc3dc5d025b19"
 PV = "2.1.0"
 PR = "r0"