oprofile: upgrade 1.2.0 -> 1.3.0

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

4 files changed, 10 insertions, 41 deletions

diff --git a/meta-oe/recipes-kernel/oprofile/oprofile.inc b/meta-oe/recipes-kernel/oprofile/oprofile.inc
index dabc30b36..349e2bf54 100644
--- a/meta-oe/recipes-kernel/oprofile/oprofile.inc
+++ b/meta-oe/recipes-kernel/oprofile/oprofile.inc
@@ -30,7 +30,6 @@ UPSTREAM_CHECK_REGEX = "oprofile-(?P<pver>\d+(\.\d+)+)/"
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/oprofile/files/oprofile/"
 
 SRC_URI_append_libc-musl = " file://musl.patch \
-                             file://0001-fix-musl-libc-compile-error.patch \
 "
 
 inherit autotools pkgconfig ptest
diff --git a/meta-oe/recipes-kernel/oprofile/oprofile/0001-fix-musl-libc-compile-error.patch b/meta-oe/recipes-kernel/oprofile/oprofile/0001-fix-musl-libc-compile-error.patch
deleted file mode 100644
index c21a10575..000000000
--- a/meta-oe/recipes-kernel/oprofile/oprofile/0001-fix-musl-libc-compile-error.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 512f1b3a4727a3a18f8fa55f196eedcacdd4a872 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 18 Jul 2018 13:01:03 +0800
-Subject: [PATCH] fix musl libc compile error
-
-use op_basename instead of basename to fix below error:
-../../oprofile-1.2.0/pp/oparchive.cpp:264:20: error: 'basename'
-was not declared in this scope
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- pp/oparchive.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pp/oparchive.cpp b/pp/oparchive.cpp
-index 6221e14..274152b 100644
---- a/pp/oparchive.cpp
-+++ b/pp/oparchive.cpp
-@@ -261,7 +261,7 @@ int oparchive(options::spec const & spec)
-                /* determine the session name of sample file */
-                int offset = sample_name.find('{');
-                string base_samples_dir = sample_name.substr(0, offset-1);
--               string session = basename(base_samples_dir.c_str());
-+               string session = op_basename(base_samples_dir.c_str());
-                /* Get rid of the the archive_path from the name */
-                string sample_base = sample_name.substr(offset);
-                string sample_archive_file = dest_samples_dir + "/" + session + "/" + sample_base;
--- 
-2.7.4
-
diff --git a/meta-oe/recipes-kernel/oprofile/oprofile_1.2.0.bb b/meta-oe/recipes-kernel/oprofile/oprofile_1.2.0.bb
deleted file mode 100644
index e85e805c3..000000000
--- a/meta-oe/recipes-kernel/oprofile/oprofile_1.2.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require oprofile.inc
-
-DEPENDS += "virtual/kernel"
-DEPENDS_append_powerpc64 = " libpfm4"
-
-SRC_URI[md5sum] = "4fcd3920984dcb607314b2e225086c3a"
-SRC_URI[sha256sum] = "eb95f98c40b7d0ee29b45fba3565d9f8381747528aa6b6159e37d4fa0c8ca57d"
-
-S = "${WORKDIR}/oprofile-${PV}"
-
diff --git a/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb b/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
new file mode 100644
index 000000000..1dc535ed8
--- /dev/null
+++ b/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
@@ -0,0 +1,10 @@
+require oprofile.inc
+
+DEPENDS += "virtual/kernel"
+DEPENDS_append_powerpc64 = " libpfm4"
+
+SRC_URI[md5sum] = "bd998df5521ebedae31e71cd3fb6200b"
+SRC_URI[sha256sum] = "95ded8bde1ec39922f0af015981a67aec63e025a501e4dc04cd65d38f73647e6"
+
+S = "${WORKDIR}/oprofile-${PV}"
+