Skip to contentSkip to conversation

package/oprofile: Bump version to 1.0.0

PATCH New Ilya Lipnitskiy 2 participants 2 messages Dec 15, 2014 – Dec 20, 2014

lore
Share & tools
lore

Ilya Lipnitskiy

author
#0 lore raw

PATCH 1/1 package/oprofile: Bump version to 1.0.0

Remove opcontrol and oprofiled from the install list, they are no longer present in the package.

Remove all patches, they have been integrated upstream.

Signed-off-by Ilya Lipnitskiy <[email protected]>
---
 .../oprofile-001-avr32-enable-lookup_dcookie.patch | 24 -------
 ...-error-on-ppc-uClibc-platform-AT_BASE_PLA.patch | 78 ----------------------
 ...e-fix-test-for-synth-check-with-GCC-4.9.0.patch | 45 -------------
 package/oprofile/oprofile.mk                       |  5 +-
 4 files changed, 2 insertions(+), 150 deletions(-)
 delete mode 100644 package/oprofile/oprofile-001-avr32-enable-lookup_dcookie.patch
 delete mode 100644 package/oprofile/oprofile-002-Fix-compile-error-on-ppc-uClibc-platform-AT_BASE_PLA.patch
 delete mode 100644 package/oprofile/oprofile-003-configure-fix-test-for-synth-check-with-GCC-4.9.0.patch
package/oprofile/oprofile-001-avr32-enable-lookup_dcookie.patch deleted +0 -24
deleted file mode 100644
index 7c41389..0000000
@@ -1,24 +0,0 @@
-Index: oprofile-0.9.4/daemon/opd_cookie.c
-===================================================================
---- oprofile-0.9.4.orig/daemon/opd_cookie.c	2008-07-25 16:00:17.000000000 +0200
-+++ oprofile-0.9.4/daemon/opd_cookie.c	2008-07-25 16:00:20.000000000 +0200
-@@ -78,6 +78,19 @@
- 		       (unsigned long)(cookie & 0xffffffff),
- 		       (unsigned long)(cookie >> 32), buf, size);
- }
-+#elif (defined(__avr32__))
-+static inline int lookup_dcookie(cookie_t cookie, char * buf, size_t size)
-+{
-+	/* On avr32, the first 64bit arg (cookie) is expected to be in
-+	 * r11(MSW)/r10(LSW) which normally hold arg 2 and arg 3. The second arg
-+	 * (buf) is then expected to be in r12 which normally holds the first
-+	 * arg. Third arg (size) is at the right position.
-+	 */
-+	return syscall(__NR_lookup_dcookie, buf,
-+			(unsigned long)(cookie >> 32),
-+			(unsigned long)(cookie & 0xffffffff),
-+			size);
-+}
- #else
- static inline int lookup_dcookie(cookie_t cookie, char * buf, size_t size)
- {
package/oprofile/oprofile-002-Fix-compile-error-on-ppc-uClibc-platform-AT_BASE_PLA.patch deleted +0 -78

78 lines not on this page · raw message

package/oprofile/oprofile-003-configure-fix-test-for-synth-check-with-GCC-4.9.0.patch deleted +0 -45

45 lines not on this page · raw message

package/oprofile/oprofile.mk +2 -3
index ee2f212..d40c8be 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPROFILE_VERSION = 0.9.9
+OPROFILE_VERSION = 1.0.0
 OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION)
 OPROFILE_LICENSE = GPLv2+
 OPROFILE_LICENSE_FILES = COPYING

@@ -14,7 +14,7 @@ OPROFILE_CONF_OPTS = \
 	--with-kernel=$(STAGING_DIR)/usr
 OPROFILE_AUTORECONF = YES
 OPROFILE_BINARIES = utils/ophelp pp/opannotate pp/oparchive pp/opgprof
-OPROFILE_BINARIES += pp/opreport opjitconv/opjitconv daemon/oprofiled
+OPROFILE_BINARIES += pp/opreport opjitconv/opjitconv
 OPROFILE_BINARIES += utils/op-check-perfevents libabi/opimport
 OPROFILE_BINARIES += pe_counting/ocount
 

@@ -60,7 +60,6 @@ define OPROFILE_INSTALL_TARGET_CMDS
 			$(TARGET_DIR)/usr/share/oprofile; \
 	fi
 	$(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile
-	$(INSTALL) -m 755 $(@D)/utils/opcontrol $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile
 endef
Signature · 1 line
1.9.1
Applied
#1 lore raw

PATCH 1/1 package/oprofile: Bump version to 1.0.0

Dear Ilya Lipnitskiy,

Quoted 6 lines · Ilya Lipnitskiy

Remove opcontrol and oprofiled from the install list, they are no longer present in the package.

Remove all patches, they have been integrated upstream.

Signed-off-by Ilya Lipnitskiy <[email protected]>
Quoted 9 lines
---
 .../oprofile-001-avr32-enable-lookup_dcookie.patch | 24 -------
 ...-error-on-ppc-uClibc-platform-AT_BASE_PLA.patch | 78 ----------------------
 ...e-fix-test-for-synth-check-with-GCC-4.9.0.patch | 45 -------------
 package/oprofile/oprofile.mk                       |  5 +-
 4 files changed, 2 insertions(+), 150 deletions(-)
 delete mode 100644 package/oprofile/oprofile-001-avr32-enable-lookup_dcookie.patch
 delete mode 100644 package/oprofile/oprofile-002-Fix-compile-error-on-ppc-uClibc-platform-AT_BASE_PLA.patch
 delete mode 100644 package/oprofile/oprofile-003-configure-fix-test-for-synth-check-with-GCC-4.9.0.patch

Applied, thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com