Skip to contentSkip to conversation

oprofile: remove the recipe

PATCH New Alexander Kanavin 1 participant 4 messages Aug 24, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 oprofile: remove the recipe

Perf is the preferred solution, and oprofile is difficult to maintain against musl.

---
 meta/conf/distro/include/distro_alias.inc          |   1 -
 meta/conf/layer.conf                               |   1 -
 meta/recipes-kernel/oprofile/oprofile.inc          |  65 ---
 ...Add-rmb-definition-for-NIOS2-architecture.patch |  30 --
 .../0001-Fix-FTBFS-problem-with-GCC-6.patch        |  51 --
 meta/recipes-kernel/oprofile/oprofile/acinclude.m4 | 581 ---------------------
 .../oprofile/oprofile/automake-foreign.patch       |  12 -
 meta/recipes-kernel/oprofile/oprofile/musl.patch   |  46 --
 .../oprofile/oprofile-cross-compile-tests.patch    |  98 ----
 .../oprofile/oprofile/root-home-dir.patch          |  44 --
 meta/recipes-kernel/oprofile/oprofile/run-ptest    |  19 -
 meta/recipes-kernel/oprofile/oprofile_1.1.0.bb     |  10 -
 12 files changed, 958 deletions(-)
 delete mode 100644 meta/recipes-kernel/oprofile/oprofile.inc
 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch
 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch
 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/acinclude.m4
 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch
 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/musl.patch
 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch
 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch
 delete mode 100644 meta/recipes-kernel/oprofile/oprofile/run-ptest
 delete mode 100644 meta/recipes-kernel/oprofile/oprofile_1.1.0.bb
meta/conf/distro/include/distro_alias.inc +0 -1
index f7c8b4a6bda..3b0411c3547 100644
@@ -278,7 +278,6 @@ DISTRO_PN_ALIAS_pn-opkg-collateral = "OE-Core"
 DISTRO_PN_ALIAS_pn-opkg-keyrings = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils"
 DISTRO_PN_ALIAS_pn-opkg-nogpg = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils"
 DISTRO_PN_ALIAS_pn-opkg-utils = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils"
-DISTRO_PN_ALIAS_pn-oprofile = "Debian=oprofile Fedora=oprofile"
 DISTRO_PN_ALIAS_pn-os-release = "OE-Core"
 DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core"
 DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core"
meta/conf/layer.conf +0 -1
index 38bec331975..8d0c4ff96bd 100644
@@ -58,7 +58,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   font-alias->font-util \
   weston-init->weston \
   weston-init->kbd \
-  oprofile->virtual/kernel \
 "
 
 # We need to keep bitbake tools in PATH
meta/recipes-kernel/oprofile/oprofile.inc deleted +0 -65

65 lines not on this page · raw message

meta/recipes-kernel/oprofile/oprofile/0001-Add-rmb-definition-for-NIOS2-architecture.patch deleted +0 -30
deleted file mode 100644
index ae8562a231a..00000000000
@@ -1,30 +0,0 @@
-From 34b0d9b1a32fb404a30327a7ae8931c7c75583bf Mon Sep 17 00:00:00 2001
-From: Marek Vasut <[email protected]>
-Date: Tue, 9 Feb 2016 02:00:29 +0100
-Subject: [PATCH] Add rmb() definition for NIOS2 architecture
-
-Signed-off-by: Marek Vasut <[email protected]>
-Upstream-Status: Submitted [ http://marc.info/?l=oprofile-list&m=145501915931874&w=2 ]
----
- libperf_events/operf_utils.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libperf_events/operf_utils.h b/libperf_events/operf_utils.h
-index 32954cc..8270e53 100644
---- a/libperf_events/operf_utils.h
-+++ b/libperf_events/operf_utils.h
-@@ -178,6 +178,11 @@ void op_release_resources(void);
- #define cpu_relax()	asm volatile("" ::: "memory")
- #endif
- 
-+#ifdef __nios2__
-+#define rmb()		asm volatile("" ::: "memory")
-+#define cpu_relax()	asm volatile("" ::: "memory")
-+#endif
-+
- #ifdef __tile__
- #include <asm/unistd.h>
- #define rmb()		__insn_mf()
--- 
-2.7.0
-
meta/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch deleted +0 -51

51 lines not on this page · raw message

meta/recipes-kernel/oprofile/oprofile/acinclude.m4 deleted +0 -581

581 lines not on this page · raw message

meta/recipes-kernel/oprofile/oprofile/automake-foreign.patch deleted +0 -12
deleted file mode 100644
index b9bb6c57799..00000000000
@@ -1,12 +0,0 @@
-oprofile doesn't want GNU-levels of automake strictness so tell it to be "foreign".
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <[email protected]>
-
-diff --git a/configure.ac b/configure.ac
-index 5740585..cf6c316 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -16 +16 @@ AC_CONFIG_SRCDIR([libop/op_config.h])
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
meta/recipes-kernel/oprofile/oprofile/musl.patch deleted +0 -46

46 lines not on this page · raw message

meta/recipes-kernel/oprofile/oprofile/oprofile-cross-compile-tests.patch deleted +0 -98

98 lines not on this page · raw message

meta/recipes-kernel/oprofile/oprofile/root-home-dir.patch deleted +0 -44

44 lines not on this page · raw message

meta/recipes-kernel/oprofile/oprofile/run-ptest deleted +0 -19
deleted file mode 100644
index 4814be652a7..00000000000
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-saved_dir=$PWD
-for dir in */tests ; do
-	cd $dir
-	for atest in * ; do
-		if [ \( -x $atest \) -a \( -f $atest \) ] ; then
-			./$atest > ${atest}.stdout 2> ${atest}.stderr
-			if [ $? = 0 ] ; then
-				echo "PASS: $dir $atest"
-				rm ${atest}.stdout ${atest}.stderr
-			else
-				echo "FAIL: ${dir}/${atest}"
-			fi
-		fi
-	done
-	cd $saved_dir
-done
-
meta/recipes-kernel/oprofile/oprofile_1.1.0.bb deleted +0 -10
deleted file mode 100644
index 92a94ad0d4d..00000000000
@@ -1,10 +0,0 @@
-require oprofile.inc
-
-DEPENDS += "virtual/kernel"
-DEPENDS_append_powerpc64 = " libpfm4"
-
-SRC_URI[md5sum] = "248c4c069f9476f427fa7195563f9867"
-SRC_URI[sha256sum] = "cf759a6de1a6033d5dfc93bda129a9f2e128aecc4238cc657feb0801d1b0366c"
-
-S = "${WORKDIR}/oprofile-${PV}"
-
Signature · 1 line
2.14.1
#1 lore raw

PATCH 2/4 libpfm4: remove the recipe

It was required only by oprofile.

---
 ...Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch | 31 ------------------
 .../files/fix-misleading-indentation-error.patch   | 38 ----------------------
 meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb        | 33 -------------------
 3 files changed, 102 deletions(-)
 delete mode 100644 meta/recipes-kernel/libpfm/files/0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch
 delete mode 100644 meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch
 delete mode 100644 meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb
meta/recipes-kernel/libpfm/files/0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch deleted +0 -31
deleted file mode 100644
index d59a7f7d88c..00000000000
@@ -1,31 +0,0 @@
-From 272a8a069a8f5f06a1e5dfa0ef12f5f92984728b Mon Sep 17 00:00:00 2001
-From: Noor <[email protected]>
-Date: Wed, 12 Aug 2015 20:54:00 +0500
-Subject: [PATCH] Makefile: Add LDFLAGS variable to SLDFLAGS.
-
-* Add LDFLAGS variable to SLDFLAGS so that extra linker
-  flags can be sent via this variable.
-
-Upstream-Status: Submitted [[email protected]]
-
-Signed-off-by: Noor Ahsan <[email protected]>
----
- lib/Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index 1cc8765..4bd92ef 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -187,7 +187,7 @@ CFLAGS += -DCONFIG_PFMLIB_CELL
- endif
- 
- ifeq ($(SYS),Linux)
--SLDFLAGS=-shared -Wl,-soname -Wl,$(VLIBPFM)
-+SLDFLAGS=$(LDFLAGS) -shared -Wl,-soname -Wl,$(VLIBPFM)
- SLIBPFM=libpfm.so.$(VERSION).$(REVISION).$(AGE)
- VLIBPFM=libpfm.so.$(VERSION)
- SOLIBEXT=so
--- 
-1.7.9.5
-
meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch deleted +0 -38
deleted file mode 100644
index 25d47ef1255..00000000000
@@ -1,38 +0,0 @@
-Upstream-Status: Pending
-
-Fix compile error:
-
-| syst_count.c:346:3: error: this 'for' clause does not guard... [-Werror=misleading-indentation] 
-|    for(c=cmin ; c < cmax; c++) 
-|       ^~~ 
-
-Signed-off-by: Kai Kang <[email protected]>
----
-diff --git a/perf_examples/syst_count.c b/perf_examples/syst_count.c
-index 0d53078..2dfb9b9 100644
---- a/perf_examples/syst_count.c
-+++ b/perf_examples/syst_count.c
-@@ -343,8 +343,9 @@ measure(void)
- 
- 		for (delay = 1 ; delay <= options.delay; delay++) {
- 
--		for(c=cmin ; c < cmax; c++)
--			start_cpu(c);
-+			for(c=cmin ; c < cmax; c++) {
-+				start_cpu(c);
-+			}
- 
- 			if (0) {
- 				tv.tv_sec = 0;
-@@ -353,8 +354,9 @@ measure(void)
- 			} else
- 				sleep(1);
- 
--		for(c=cmin ; c < cmax; c++)
--			stop_cpu(c);
-+			for(c=cmin ; c < cmax; c++) {
-+				stop_cpu(c);
-+			}
- 
- 			for(c = cmin; c < cmax; c++) {
- 				printf("# %'ds -----\n", delay);
meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb deleted +0 -33
deleted file mode 100644
index 4136eac81f7..00000000000
@@ -1,33 +0,0 @@
-SUMMARY = "Monitoring tools exploiting the performance monitoring events"
-DESCRIPTION = "This package provides a library, called libpfm4 which is used to develop \
-monitoring tools exploiting the performance monitoring events such as those \
-provided by the Performance Monitoring Unit (PMU) of modern processors."
-HOMEPAGE = "http://perfmon2.sourceforge.net/"
-BUGTRACKER = "http://sourceforge.net/tracker/?group_id=144822&atid=759953&source=navbar"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0de488f3bd4424e308e2e399cb99c788"
-
-SECTION = "devel"
-
-COMPATIBLE_HOST = "powerpc64"
-
-SRC_URI = "http://downloads.sourceforge.net/project/perfmon2/${BPN}/libpfm-${PV}.tar.gz \
-           file://0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch \
-           file://fix-misleading-indentation-error.patch \
-          "
-
-SRC_URI[md5sum] = "5077b9022440e4951d96f2d0e73bd487"
-SRC_URI[sha256sum] = "5ab1e5b0472550f9037a8800834f6bc3b927690070f69fac0b67284b4b05fd5f"
-
-UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/perfmon2/files/libpfm4/"
-
-EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCONFIG=\"true\""
-EXTRA_OEMAKE_append_powerpc = " ARCH=\"powerpc\""
-EXTRA_OEMAKE_append_powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\""
-
-S = "${WORKDIR}/libpfm-${PV}"
-
-do_install () {
-	oe_runmake install
-}
Signature · 1 line
2.14.1
#2 lore raw

PATCH 3/4 qemu: fix upstream version check

In reply to Alexander Kanavin
---
 meta/recipes-devtools/qemu/qemu_2.10.0-rc2.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-devtools/qemu/qemu_2.10.0-rc2.bb +2 -0
index 08eaf197375..204e36fd2e6 100644
@@ -27,6 +27,8 @@ SRC_URI = "http://wiki.qemu-project.org/download/${BP}.tar.bz2 \
            file://0001-osdep-Add-runtime-OFD-lock-detection.patch \
            file://0002-file-posix-Do-runtime-check-for-ofd-lock-API.patch \
            "
+UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+\..*)\.tar"
+
 
 SRC_URI_append_class-native = " \
             file://fix-libcap-header-issue-on-some-distro.patch \
Signature · 1 line
2.14.1
#3 lore raw

PATCH 4/4 libva: fix upstream version check

In reply to Alexander Kanavin
---
 meta/recipes-graphics/libva/libva_1.8.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/libva/libva_1.8.3.bb +1 -1
index bb5f829fcc5..ceeda842832 100644
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f"
 
 SRC_URI = "git://github.com/01org/libva.git;protocol=http;branch=v1.8-branch "
 SRCREV = "457470987cc9df5976ce8c72ffd4bfbd9baaf0f9"
-UPSTREAM_CHECK_GITTAGREGEX = "libva-(?P<pver>(\d+(\.\d+)+))"
+UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>(\d+(\.\d+)+))$"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.14.1