Skip to contentSkip to conversation

[PATCH 0/3]

PATCH New [email protected] 1 participant 4 messages Mar 1, 2013

lore
Share & tools
lore
#0 lore raw

cover [PATCH 0/3]

From: Tom Zanussi <[email protected]>

This patchset contains a couple of things:

- a sysprof upgrade (YOCTO #3448)
- a fix for YOCTO #3951, which is for perf, but I found and fixed a similar problem for systemtap while doing the fix for perf. In any case, I'm now able to build a minimal image with tools-profile.

The following changes since commit 8264863ea0674f6cb105f5f7301861408fdc409b:

Add KERNEL_EXTRA_ARGS parameter (2013-03-01 14:57:52 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib.git tzanussi/minimal-and-sysprof-update-v0
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/minimal-and-sysprof-update-v0

Tom Zanussi (3):
sysprof: upgrade to 1.2.0
perf: add bash dependency
systemtap: add python and bash dependencies

 meta/recipes-kernel/perf/perf_3.4.bb               |  2 +-
 ...PowerPC-checks-for-__NR_perf_counter_open.patch | 35 ----------------------
 meta/recipes-kernel/sysprof/sysprof_git.bb         |  6 ++--
 meta/recipes-kernel/systemtap/systemtap_git.bb     |  4 +++
 4 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
Signature · 1 line
1.7.11.4
#1 lore raw

PATCH 1/3 sysprof: upgrade to 1.2.0

From: Tom Zanussi <[email protected]>

---
 ...PowerPC-checks-for-__NR_perf_counter_open.patch | 35 ----------------------
 meta/recipes-kernel/sysprof/sysprof_git.bb         |  6 ++--
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch
meta/recipes-kernel/sysprof/files/0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch deleted +0 -35
deleted file mode 100644
index 041054e..0000000
@@ -1,35 +0,0 @@
-Upstream-Status: Backport
-
-From 4708a509aa9d65ae93e9824e42ddbc6e8d42d90c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]>
-Date: Sat, 27 Aug 2011 20:04:44 +0200
-Subject: [PATCH] Fix PowerPC checks for __NR_perf_counter_open.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-__ppc__ isn't defined here on Debian powerpc. Grepping through the headers
-installed in /usr/include, there are a few references to __ppc__ and
-__ppc64__, but I suspect they're for other OSs.
-
-Signed-off-by: Michel Dänzer <[email protected]>
----
- collector.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/collector.c b/collector.c
-index b28964f..fe16967 100644
---- a/collector.c
-+++ b/collector.c
-@@ -175,7 +175,7 @@ sysprof_perf_counter_open (struct perf_counter_attr *attr,
- #define __NR_perf_counter_open 337
- #elif defined(__hppa__)
- #define __NR_perf_counter_open 318
--#elif defined(__ppc__) || defined(__ppc64__)
-+#elif defined(__powerpc__) || defined(__powerpc64__)
- #define __NR_perf_counter_open 319
- #elif defined(__s390__)
- #define __NR_perf_counter_open 331
--- 
-1.7.6.1
-
meta/recipes-kernel/sysprof/sysprof_git.bb +2 -4
index 64414c0..c7506fe 100644
@@ -4,13 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "gtk+ libglade"
 
-SRCREV = "4692f85f625f4fd969cef4ab5dc47cc4655c87f9"
-PR = "r2"
-PV = "1.1.8+git${SRCPV}"
+SRCREV = "cd44ee6644c3641507fb53b8a2a69137f2971219"
+PV = "1.2.0+git${SRCPV}"
 
 SRC_URI = "git://git.gnome.org/sysprof;protocol=git \
            file://define-NT_GNU_BUILD_ID.patch \
-	   file://0001-Fix-PowerPC-checks-for-__NR_perf_counter_open.patch \
           "
 
 SRC_URI_append_arm  = " file://rmb-arm.patch"
Signature · 1 line
1.7.11.4
#2 lore raw

PATCH 2/3 perf: add bash dependency

From: Tom Zanussi <[email protected]>

There are a number of scripts in the perf installation that use bash, so we need to add a run-time dependency on bash for them. If not, we can generate build errors like "no package provides /bin/bash".

Fixes [YOCTO #3951].

---
 meta/recipes-kernel/perf/perf_3.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/perf/perf_3.4.bb +1 -1
index e89a7c3..be0f386 100644
@@ -28,7 +28,7 @@ DEPENDS = "virtual/kernel \
           "
 
 SCRIPTING_RDEPENDS = "${@perf_feature_enabled('perf-scripting', 'perl perl-modules python', '',d)}"
-RDEPENDS_${PN} += "elfutils ${SCRIPTING_RDEPENDS}"
+RDEPENDS_${PN} += "elfutils bash ${SCRIPTING_RDEPENDS}"
 
 PROVIDES = "virtual/perf"
 
Signature · 1 line
1.7.11.4
#3 lore raw

PATCH 3/3 systemtap: add python and bash dependencies

In reply to [email protected]

From: Tom Zanussi <[email protected]>

There are a number of scripts in the systemtap installation that use python and bash, so we need to add run-time dependencies for them. If not, we can generate build errors like "no package provides /usr/bin/python".

Fixes [YOCTO #3951].

---
 meta/recipes-kernel/systemtap/systemtap_git.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-kernel/systemtap/systemtap_git.bb +4 -0
index 7fc92c8..22f8959 100644
@@ -6,6 +6,10 @@ DEPENDS = "elfutils sqlite3 systemtap-native"
 DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native"
 DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext"
 
+RDEPENDS_${PN} += "python bash"
+RDEPENDS_${PN}_class-native += "python-native"
+RDEPENDS_${PN}_class-nativesdk += "python-native"
+
 PR = "r1"
 
 EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
Signature · 1 line
1.7.11.4