[Buildroot] [git commit] package/oprofile: drop custom install rules

[Buildroot] [git commit] package/oprofile: drop custom install rules

[Peter Korsgaard]

commit: https://git.buildroot.net/buildroot/commit/?id=5259807318699646a7bb9cbc24fb137983bc5270
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Drop custom install rules which were added since commit
676797d57f33fbe9d5adc81932847154ebd1ce93. Indeed, they result in a
broken installation. Especially, they are trying to "guess" what must
be installed based on BR2_ARCH but oprofile has its own logic. For
example, goldmont microarchitecture files must be installed in i386
directory even if this architecture is 64 bits:
https://sourceforge.net/p/oprofile/oprofile/ci/0ad5a9e6af86a88e1dd41180f45bc48b646eba6a

This will result in the following runtime failure:

oprofile: could not open unit mask description file /usr/share/oprofile//i386/goldmont/unit_masks
Unable to find info for event cpu_clk_unhalted

Fixes:
 - https://bugs.buildroot.org/show_bug.cgi?id=14641

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/oprofile/oprofile.mk | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index 85bc4efa9b..265d6ebd18 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -14,51 +14,10 @@ OPROFILE_CONF_OPTS = \
 	--enable-gui=no \
 	--with-kernel=$(STAGING_DIR)/usr
 
-OPROFILE_BINARIES = \
-	utils/ophelp pp/opannotate pp/oparchive pp/opgprof \
-	pp/opreport opjitconv/opjitconv \
-	utils/op-check-perfevents libabi/opimport \
-	pe_counting/ocount pe_profiling/operf
-
-ifeq ($(BR2_i386),y)
-OPROFILE_ARCH = i386
-endif
-ifeq ($(BR2_mipsel),y)
-OPROFILE_ARCH = mips
-endif
-ifeq ($(BR2_powerpc),y)
-OPROFILE_ARCH = ppc
-endif
-ifeq ($(BR2_x86_64),y)
-OPROFILE_ARCH = x86-64
-endif
-ifeq ($(OPROFILE_ARCH),)
-OPROFILE_ARCH = $(BR2_ARCH)
-endif
-
 OPROFILE_DEPENDENCIES = popt binutils host-pkgconf
 
 ifeq ($(BR2_PACKAGE_LIBPFM4),y)
 OPROFILE_DEPENDENCIES += libpfm4
 endif
 
-ifeq ($(BR2_STATIC_LIBS),)
-define OPROFILE_INSTALL_SHARED_LIBRARY
-	$(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile
-endef
-endif
-
-define OPROFILE_INSTALL_TARGET_CMDS
-	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin
-	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile
-	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/lib/oprofile
-	if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \
-		cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \
-			$(TARGET_DIR)/usr/share/oprofile; \
-	fi
-	$(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile
-	$(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin
-	$(OPROFILE_INSTALL_SHARED_LIBRARY)
-endef
-
 $(eval $(autotools-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot