* [PATCH 0/2] Remove legacy lttng references
@ 2013-01-11 22:13 ` tom.zanussi
0 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2013-01-11 22:13 UTC (permalink / raw)
To: poky
From: Tom Zanussi <tom.zanussi@intel.com>
This patchset removes legacy lttng references from meta-yocto to
correspond with the patchset sent to oe-core that removes legacy
lttng.
The following changes since commit 53cc748b93e8af584557d6db5309c3e955182c5c:
linux-libc-headers: fix headers install in long path name environments (2013-01-10 23:53:51 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib.git tzanussi/rm-legacy-lttng-v2
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/rm-legacy-lttng-v2
Tom Zanussi (2):
lttng: remove references to legacy lttng recipes
recipe_color.inc: add lttng recipes
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 +--
--
1.7.11.4
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/5] lttng: remove 'legacy' lttng
2013-01-11 22:13 ` [PATCH 0/2] Remove legacy lttng references tom.zanussi
(?)
@ 2013-01-11 19:20 ` tom.zanussi
-1 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2013-01-11 19:20 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
This removes 'legacy' lttng - it hasn't actually worked for awhile
now, and has been replaced by equivalent functionality in
recipes-kernel/lttng-2.0 (which will be renamed to lttng in a
follow-up patch).
Fixes [YOCTO #3303].
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/recipes-kernel/lttng/lttng-control_0.89.bb | 23 ------------
meta/recipes-kernel/lttng/lttng-ust_0.16.bb | 32 -----------------
.../lttng-viewer/add_linkage_to_lttvwindow.patch | 42 ----------------------
meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb | 40 ---------------------
4 files changed, 137 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/lttng-control_0.89.bb
delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.16.bb
delete mode 100644 meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
delete mode 100644 meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
diff --git a/meta/recipes-kernel/lttng/lttng-control_0.89.bb b/meta/recipes-kernel/lttng/lttng-control_0.89.bb
deleted file mode 100644
index 77314c8..0000000
--- a/meta/recipes-kernel/lttng/lttng-control_0.89.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SECTION = "devel"
-SUMMARY = "Linux Trace Toolkit Control"
-DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
-extract program execution details from the Linux operating system and \
-interpret them."
-LICENSE = "GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r0"
-
-LTTDATE = "05122011"
-
-SRC_URI = "http://lttng.org/files/lttng/ltt-control-${PV}-${LTTDATE}.tar.gz"
-
-SRC_URI[md5sum] = "2e5a531bf5cab88eef5282b45271789f"
-SRC_URI[sha256sum] = "feb120e0bedd9ef8917dd14ee96cc94941f517826a4c2035d1c4aa33e4e808ab"
-
-S = "${WORKDIR}/ltt-control-${PV}-${LTTDATE}"
-
-inherit autotools
-
-export KERNELDIR="${STAGING_KERNEL_DIR}"
-
-FILES_${PN} += "${datadir}/ltt-control/facilities/*"
diff --git a/meta/recipes-kernel/lttng/lttng-ust_0.16.bb b/meta/recipes-kernel/lttng/lttng-ust_0.16.bb
deleted file mode 100644
index 3618a2d..0000000
--- a/meta/recipes-kernel/lttng/lttng-ust_0.16.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "Linux Trace Toolkit Userspace Tracer"
-DESCRIPTION = "The LTTng Userspace Tracer (UST) is a library accompanied by a set of tools to trace userspace code"
-HOMEPAGE = "http://lttng.org/ust"
-BUGTRACKER = "http://lttng.org/project/issues"
-
-LICENSE = "LGPLv2.1+ & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \
- file://ustctl/ustctl.c;endline=16;md5=b50c6fa0307175bb1ce0db49d752c03b \
- file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44"
-
-DEPENDS = "liburcu"
-
-PR = "r1"
-PE = "1"
-
-SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "8e5d5de47bfff29f50439d192ad1e478"
-SRC_URI[sha256sum] = "88167741b1fbf335e006f0208d8c41784705e28adac84df71d3d9f6c58191dab"
-
-
-S = "${WORKDIR}/ust-${PV}"
-
-inherit autotools
-
-#EXTRA_OECONF = "ac_cv_lib_urcu_bp_synchronize_rcu_bp=no"
-
-# Due to liburcu not building on MIPS currently this recipe needs to
-# be limited also.
-# So here let us first suppport x86/arm/powerpc platforms now.
-COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux.*'
-
diff --git a/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch b/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
deleted file mode 100644
index 4a135df..0000000
--- a/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Explicitly add linkage to lttvwindow.
-
-Without the fix, lttv-gui inside target can't run, complaining
-"undefined symbol: LTTV_VIEWER_CONSTRUCTORS".
-
-Tue May 3 21:39:37 CST 2011
-
-Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
-
-diff --git a/lttv/modules/gui/common.am b/lttv/modules/gui/common.am
-index ce50113..89083aa 100644
---- a/lttv/modules/gui/common.am
-+++ b/lttv/modules/gui/common.am
-@@ -21,3 +21,4 @@ AM_LDFLAGS = $(MODULE_LDFLAGS)
-
- libdir = ${lttvplugindir}
-
-+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
-diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
-index c953fc9..489d640 100644
---- a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
-+++ b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
-@@ -1,13 +1,14 @@
- ## Process this file with automake to produce Makefile.in
-
--include ../../common.am
--
- INCLUDES = \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- $(DEFAULT_INCLUDES)
-
--#libdir = ${lttvplugindir}
-+AM_CFLAGS = $(MODULE_CFLAGS)
-+AM_LDFLAGS = $(MODULE_LDFLAGS)
-+
-+libdir = ${lttvplugindir}
-
- lib_LTLIBRARIES = liblttvwindow.la
-
diff --git a/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb b/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
deleted file mode 100644
index 9d94903..0000000
--- a/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = "Linux Trace Toolkit Viewer"
-DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
-extract program execution details from the Linux operating system and \
-interpret them."
-HOMEPAGE = "http://lttng.org/content/download"
-BUGTRACKER = "n/a"
-
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f650d5f5af1e9648fe0b40e290d3adbb \
- file://ltt/ltt.h;beginline=2;endline=18;md5=8b7da9190028c50396d97fc85bad0da9 \
- file://lttv/lttv/traceset.c;beginline=2;endline=17;md5=bcab42863b64b41d153bf81bbe2490a6"
-PR = "r3"
-
-DEPENDS = "gtk+ pango popt"
-
-SECTION = "devel"
-
-ALTNAME = "lttv-${PV}-21032011"
-
-SRC_URI = "http://lttng.org/files/packages/${ALTNAME}.tar.gz \
- file://add_linkage_to_lttvwindow.patch"
-
-SRC_URI[md5sum] = "071bf3dd13e7562c08ee8f8971cfc76d"
-SRC_URI[sha256sum] = "cf87ffcf5d266b18979418e610a180a0b4214de41677f0be867885e15b2f7647"
-S = "${WORKDIR}/${ALTNAME}"
-
-inherit autotools
-
-LEAD_SONAME = "liblttvtraceread*"
-
-FILES_SOLIBSDEV = ""
-FILES_${PN} += "\
- ${libdir}/liblttvtraceread*.so \
- ${libdir}/lttv/plugins/*.so \
- ${datadir}/lttv/facilities/* \
- ${datadir}/lttv/pixmaps/* "
-FILES_${PN}-dbg += "${libdir}/lttv/plugins/.debug/"
-FILES_${PN}-dev += "${libdir}/lttv/plugins/*.la"
-FILES_${PN}-staticdev += "${libdir}/lttv/plugins/*.a"
-INSANE_SKIP_${PN} = "dev-so"
--
1.7.11.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/5] lttng2-ust: rename to lttng-ust
2013-01-11 22:13 ` [PATCH 0/2] Remove legacy lttng references tom.zanussi
(?)
(?)
@ 2013-01-11 19:20 ` tom.zanussi
2013-01-11 21:43 ` Saul Wold
-1 siblings, 1 reply; 12+ messages in thread
From: tom.zanussi @ 2013-01-11 19:20 UTC (permalink / raw)
To: openembedded-core
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%)
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"
--
1.7.11.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 2/5] lttng2-ust: rename to lttng-ust
2013-01-11 19:20 ` [PATCH 2/5] lttng2-ust: rename to lttng-ust tom.zanussi
@ 2013-01-11 21:43 ` Saul Wold
0 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2013-01-11 21:43 UTC (permalink / raw)
To: tom.zanussi; +Cc: openembedded-core
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"
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/5] recipes-kernel/lttng-2.0: rename to recipes-kernel/lttng
2013-01-11 22:13 ` [PATCH 0/2] Remove legacy lttng references tom.zanussi
` (2 preceding siblings ...)
(?)
@ 2013-01-11 19:20 ` tom.zanussi
-1 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2013-01-11 19:20 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
recipes-kernel/lttng was removed by a previous patch, which also
removed the naming conflict that caused the lttng-2.0 version of lttng
to be named recipes-kernel/lttng-2.0. Since the naming conflict has
disappeared, we can go back to the simpler naming.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/recipes-kernel/{lttng-2.0 => lttng}/babeltrace_1.0.0.bb | 0
.../lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 0
meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb | 0
meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb | 0
meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-ust_2.1.0.bb | 0
5 files changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/babeltrace_1.0.0.bb (100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch (100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb (100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb (100%)
rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-ust_2.1.0.bb (100%)
diff --git a/meta/recipes-kernel/lttng-2.0/babeltrace_1.0.0.bb b/meta/recipes-kernel/lttng/babeltrace_1.0.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/babeltrace_1.0.0.bb
rename to meta/recipes-kernel/lttng/babeltrace_1.0.0.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
rename to meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-modules_2.1.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.1.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-modules_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.1.0.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.1.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-tools_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.1.0.bb
diff --git a/meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb
similarity index 100%
rename from meta/recipes-kernel/lttng-2.0/lttng-ust_2.1.0.bb
rename to meta/recipes-kernel/lttng/lttng-ust_2.1.0.bb
--
1.7.11.4
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 4/5] lttng: remove references to legacy lttng recipes
2013-01-11 22:13 ` [PATCH 0/2] Remove legacy lttng references tom.zanussi
@ 2013-01-11 22:13 ` tom.zanussi
-1 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2013-01-11 19:20 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
'legacy' lttng was removed, so we need to remove the references to
the legacy lttng recipes, namely lttng-control and lttng-viewer.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-yocto/conf/distro/include/distro_alias.inc | 2 --
meta-yocto/conf/distro/include/maintainers.inc | 2 --
meta-yocto/conf/distro/include/recipe_color.inc | 2 --
3 files changed, 6 deletions(-)
diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
index 1994e27..879ae60 100644
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -221,11 +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-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 6de57dc..69595b3 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -490,11 +490,9 @@ 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-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>"
RECIPE_MAINTAINER_pn-lttng-ust = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
-RECIPE_MAINTAINER_pn-lttng-viewer = "Constantin Musca <constantinx.musca@intel.com>"
RECIPE_MAINTAINER_pn-lzop-native = "Saul Wold <sgw@linux.intel.com>"
RECIPE_MAINTAINER_pn-lzop = "Saul Wold <sgw@linux.intel.com>"
RECIPE_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 012f5e2..2c9a5c6 100644
--- a/meta-yocto/conf/distro/include/recipe_color.inc
+++ b/meta-yocto/conf/distro/include/recipe_color.inc
@@ -250,9 +250,7 @@ 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-ust = "yellow"
-RECIPE_COLOR_pn-lttng-viewer = "yellow"
RECIPE_COLOR_pn-makedevs = "yellow"
RECIPE_COLOR_pn-man = "red"
RECIPE_COLOR_pn-man-pages = "red"
--
1.7.11.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/5] lttng: remove references to legacy lttng recipes
@ 2013-01-11 22:13 ` tom.zanussi
0 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2013-01-11 22:13 UTC (permalink / raw)
To: poky
From: Tom Zanussi <tom.zanussi@intel.com>
'legacy' lttng was removed, so we need to remove the references to
the legacy lttng recipes, namely lttng-control and lttng-viewer.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-yocto/conf/distro/include/distro_alias.inc | 2 --
meta-yocto/conf/distro/include/maintainers.inc | 2 --
meta-yocto/conf/distro/include/recipe_color.inc | 2 --
3 files changed, 6 deletions(-)
diff --git a/meta-yocto/conf/distro/include/distro_alias.inc b/meta-yocto/conf/distro/include/distro_alias.inc
index 1994e27..879ae60 100644
--- a/meta-yocto/conf/distro/include/distro_alias.inc
+++ b/meta-yocto/conf/distro/include/distro_alias.inc
@@ -221,11 +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-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 6de57dc..69595b3 100644
--- a/meta-yocto/conf/distro/include/maintainers.inc
+++ b/meta-yocto/conf/distro/include/maintainers.inc
@@ -490,11 +490,9 @@ 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-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>"
RECIPE_MAINTAINER_pn-lttng-ust = "Bogdan Marinescu <bogdan.a.marinescu@intel.com>"
-RECIPE_MAINTAINER_pn-lttng-viewer = "Constantin Musca <constantinx.musca@intel.com>"
RECIPE_MAINTAINER_pn-lzop-native = "Saul Wold <sgw@linux.intel.com>"
RECIPE_MAINTAINER_pn-lzop = "Saul Wold <sgw@linux.intel.com>"
RECIPE_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 012f5e2..2c9a5c6 100644
--- a/meta-yocto/conf/distro/include/recipe_color.inc
+++ b/meta-yocto/conf/distro/include/recipe_color.inc
@@ -250,9 +250,7 @@ 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-ust = "yellow"
-RECIPE_COLOR_pn-lttng-viewer = "yellow"
RECIPE_COLOR_pn-makedevs = "yellow"
RECIPE_COLOR_pn-man = "red"
RECIPE_COLOR_pn-man-pages = "red"
--
1.7.11.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/5] recipe_color.inc: add lttng recipes
2013-01-11 22:13 ` [PATCH 0/2] Remove legacy lttng references tom.zanussi
@ 2013-01-11 22:13 ` tom.zanussi
-1 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2013-01-11 19:20 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
Add entries for the new lttng-2.0 recipes lttng-modules, lttng-tools,
and babeltrace, to maintain consistency.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-yocto/conf/distro/include/recipe_color.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-yocto/conf/distro/include/recipe_color.inc b/meta-yocto/conf/distro/include/recipe_color.inc
index 2c9a5c6..9402a93 100644
--- a/meta-yocto/conf/distro/include/recipe_color.inc
+++ b/meta-yocto/conf/distro/include/recipe_color.inc
@@ -250,7 +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-modules = "yellow"
+RECIPE_COLOR_pn-lttng-tools = "yellow"
RECIPE_COLOR_pn-lttng-ust = "yellow"
+RECIPE_COLOR_pn-babeltrace = "yellow"
RECIPE_COLOR_pn-makedevs = "yellow"
RECIPE_COLOR_pn-man = "red"
RECIPE_COLOR_pn-man-pages = "red"
--
1.7.11.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/5] recipe_color.inc: add lttng recipes
@ 2013-01-11 22:13 ` tom.zanussi
0 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2013-01-11 22:13 UTC (permalink / raw)
To: poky
From: Tom Zanussi <tom.zanussi@intel.com>
Add entries for the new lttng-2.0 recipes lttng-modules, lttng-tools,
and babeltrace, to maintain consistency.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-yocto/conf/distro/include/recipe_color.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-yocto/conf/distro/include/recipe_color.inc b/meta-yocto/conf/distro/include/recipe_color.inc
index 2c9a5c6..9402a93 100644
--- a/meta-yocto/conf/distro/include/recipe_color.inc
+++ b/meta-yocto/conf/distro/include/recipe_color.inc
@@ -250,7 +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-modules = "yellow"
+RECIPE_COLOR_pn-lttng-tools = "yellow"
RECIPE_COLOR_pn-lttng-ust = "yellow"
+RECIPE_COLOR_pn-babeltrace = "yellow"
RECIPE_COLOR_pn-makedevs = "yellow"
RECIPE_COLOR_pn-man = "red"
RECIPE_COLOR_pn-man-pages = "red"
--
1.7.11.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 0/5] Remove legacy lttng
2013-01-11 22:13 ` [PATCH 0/2] Remove legacy lttng references tom.zanussi
` (5 preceding siblings ...)
(?)
@ 2013-01-11 21:45 ` Saul Wold
-1 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2013-01-11 21:45 UTC (permalink / raw)
To: tom.zanussi; +Cc: openembedded-core
On 01/11/2013 11:20 AM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
>
> This patchset removes legacy lttng, which hasn't been operational in
> Yocto for awhile now. lttng-2.0 is the current version, which was
> recently updated and now does work.
>
> With legacy lttng gone, lttng-2.0 can be renamed back to lttng, which
> this patchset also does.
>
> Tested on crownbay (kernel and userspace).
>
> v2 changes:
>
> - added upgrade path for lttng2->lttng rename
> - since the original posting, lttng-2.0 was upgraded, so the original
> patchset had to be rebased on top of that
>
> The following changes since commit 53cc748b93e8af584557d6db5309c3e955182c5c:
>
> linux-libc-headers: fix headers install in long path name environments (2013-01-10 23:53:51 +0000)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib.git tzanussi/rm-legacy-lttng-v2
> http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/rm-legacy-lttng-v2
>
> Tom Zanussi (5):
> lttng: remove 'legacy' lttng
> lttng2-ust: rename to lttng-ust
> recipes-kernel/lttng-2.0: rename to recipes-kernel/lttng
> lttng: remove references to legacy lttng recipes
> recipe_color.inc: add lttng recipes
These last 2 should go to poky@yoctoproject.org
Thanks
Sau!
>
> 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 +--
> .../packagegroup-core-tools-profile.bb | 2 +-
> .../{lttng-2.0 => lttng}/babeltrace_1.0.0.bb | 0
> meta/recipes-kernel/lttng/lttng-control_0.89.bb | 23 ------------
> ...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 0
> .../{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb | 0
> .../{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb | 2 +-
> meta/recipes-kernel/lttng/lttng-ust_0.16.bb | 32 -----------------
> .../lttng-ust_2.1.0.bb} | 5 +++
> .../lttng-viewer/add_linkage_to_lttvwindow.patch | 42 ----------------------
> meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb | 40 ---------------------
> 13 files changed, 10 insertions(+), 147 deletions(-)
> rename meta/recipes-kernel/{lttng-2.0 => lttng}/babeltrace_1.0.0.bb (100%)
> delete mode 100644 meta/recipes-kernel/lttng/lttng-control_0.89.bb
> rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch (100%)
> rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-modules_2.1.0.bb (100%)
> rename meta/recipes-kernel/{lttng-2.0 => lttng}/lttng-tools_2.1.0.bb (97%)
> delete mode 100644 meta/recipes-kernel/lttng/lttng-ust_0.16.bb
> rename meta/recipes-kernel/{lttng-2.0/lttng2-ust_2.1.0.bb => lttng/lttng-ust_2.1.0.bb} (87%)
> delete mode 100644 meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
> delete mode 100644 meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
>
^ permalink raw reply [flat|nested] 12+ messages in thread