From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com ([143.182.124.37]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Ttmcu-0005WZ-IY for openembedded-core@lists.openembedded.org; Fri, 11 Jan 2013 22:59:17 +0100 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 11 Jan 2013 13:43:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,453,1355126400"; d="scan'208";a="242931804" Received: from unknown (HELO [10.255.14.194]) ([10.255.14.194]) by azsmga001.ch.intel.com with ESMTP; 11 Jan 2013 13:43:32 -0800 Message-ID: <50F08780.10407@linux.intel.com> Date: Fri, 11 Jan 2013 13:43:28 -0800 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: tom.zanussi@intel.com References: <88b78152fff010082e07b57992977e0b9d65fdde.1357930527.git.tom.zanussi@intel.com> In-Reply-To: Cc: openembedded-core@lists.openembedded.org Subject: Re: [PATCH 2/5] lttng2-ust: rename to lttng-ust X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2013 21:59:18 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 01/11/2013 11:20 AM, tom.zanussi@intel.com wrote: > From: Tom Zanussi > > 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 > --- > 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 " > 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 " > 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" >