[Buildroot] [PATCH v2 3/4] package/perf: migrate perf to use the new linux-tools infrastructure
Romain Naour
romain.naour at openwide.fr
Mon Jul 13 21:17:04 UTC 2015
Remove perf package and add legacy handling.
Signed-off-by: Romain Naour <romain.naour at openwide.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
---
v2: remove LINUX_TOOL prefix
use $(D) instead of $(LINUX_DIR)
fix title style
remove useless O=$(@D)
---
Config.in.legacy | 7 +++++
linux/Config.tools.in | 18 +++++++++++++
linux/linux-tool-perf.mk | 63 ++++++++++++++++++++++++++++++++++++++++++++
package/Config.in | 1 -
package/perf/Config.in | 21 ---------------
package/perf/perf.mk | 68 ------------------------------------------------
6 files changed, 88 insertions(+), 90 deletions(-)
create mode 100644 linux/linux-tool-perf.mk
delete mode 100644 package/perf/Config.in
delete mode 100644 package/perf/perf.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 0a8d0a6..c0f3a10 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -107,6 +107,13 @@ endif
###############################################################################
comment "Legacy options removed in 2015.08"
+config BR2_PACKAGE_PERF
+ bool "perf"
+ select BR2_LEGACY
+ select BR2_LINUX_KERNEL_TOOL_PERF
+ help
+ Perf package has been moved to linux tools package.
+
config BR2_BINUTILS_VERSION_2_22
bool "binutils 2.22 removed"
select BR2_LEGACY
diff --git a/linux/Config.tools.in b/linux/Config.tools.in
index 008e68c..0c94d55 100644
--- a/linux/Config.tools.in
+++ b/linux/Config.tools.in
@@ -8,4 +8,22 @@ config BR2_LINUX_KERNEL_TOOL_CPUPOWER
cpupower is a collection of tools to examine and tune power
saving related features of your processor.
+config BR2_LINUX_KERNEL_TOOL_PERF
+ bool "perf"
+ help
+ perf (sometimes "Perf Events" or perf tools, originally
+ "Performance Counters for Linux") - is a performance
+ analyzing tool in Linux, available from kernel version
+ 2.6.31. User-space controlling utility, called 'perf' has
+ git-like interface with subcommands. It is capable of
+ statistical profiling of entire system (both kernel and user
+ code), single CPU or severals threads.
+
+ This package builds and install the userspace 'perf'
+ command. It is up to the user to ensure that the kernel
+ configuration has all the suitable options enabled to allow a
+ proper operation of 'perf'.
+
+ https://perf.wiki.kernel.org/
+
endmenu
diff --git a/linux/linux-tool-perf.mk b/linux/linux-tool-perf.mk
new file mode 100644
index 0000000..e0b615b
--- /dev/null
+++ b/linux/linux-tool-perf.mk
@@ -0,0 +1,63 @@
+################################################################################
+#
+# perf
+#
+################################################################################
+
+LINUX_TOOLS += perf
+
+PERF_DEPENDENCIES = host-flex host-bison
+
+PERF_MAKE_FLAGS = \
+ $(LINUX_MAKE_FLAGS) \
+ NO_LIBAUDIT=1 \
+ NO_NEWT=1 \
+ NO_GTK2=1 \
+ NO_LIBPERL=1 \
+ NO_LIBPYTHON=1 \
+ DESTDIR=$(TARGET_DIR) \
+ prefix=/usr \
+ WERROR=0 \
+ ASCIIDOC=
+
+# The call to backtrace() function fails for ARC, because for some
+# reason the unwinder from libgcc returns early. Thus the usage of
+# backtrace() should be disabled in perf explicitly: at build time
+# backtrace() appears to be available, but it fails at runtime: the
+# backtrace will contain only several functions from the top of stack,
+# instead of the complete backtrace.
+ifeq ($(BR2_arc),y)
+PERF_MAKE_FLAGS += NO_BACKTRACE=1
+endif
+
+ifeq ($(BR2_PACKAGE_ELFUTILS),y)
+PERF_DEPENDENCIES += elfutils
+else
+PERF_MAKE_FLAGS += NO_LIBELF=1 NO_DWARF=1
+endif
+
+define PERF_BUILD_CMDS
+ $(Q)if test ! -f $(@D)/tools/perf/Makefile ; then \
+ echo "Your kernel version is too old and does not have the perf tool." ; \
+ echo "At least kernel 2.6.31 must be used." ; \
+ exit 1 ; \
+ fi
+ $(Q)if test "$(BR2_PACKAGE_ELFUTILS)" = "" ; then \
+ if ! grep -q NO_LIBELF $(@D)/tools/perf/Makefile* ; then \
+ if ! test -r $(@D)/tools/perf/config/Makefile ; then \
+ echo "The perf tool in your kernel cannot be built without libelf." ; \
+ echo "Either upgrade your kernel to >= 3.7, or enable the elfutils package." ; \
+ exit 1 ; \
+ fi \
+ fi \
+ fi
+ $(TARGET_MAKE_ENV) $(MAKE1) $(PERF_MAKE_FLAGS) -C $(@D)/tools/perf
+endef
+
+# After installation, we remove the Perl and Python scripts from the
+# target.
+define PERF_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_TOOL_PERF_MAKE_FLAGS) \
+ -C $(@D)/tools/perf install
+ $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/
+endef
diff --git a/package/Config.in b/package/Config.in
index 9dbb284..a3e3283 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -88,7 +88,6 @@ endif
source "package/netperf/Config.in"
source "package/oprofile/Config.in"
source "package/pax-utils/Config.in"
- source "package/perf/Config.in"
source "package/pv/Config.in"
source "package/racehound/Config.in"
source "package/ramsmp/Config.in"
diff --git a/package/perf/Config.in b/package/perf/Config.in
deleted file mode 100644
index 05c9870..0000000
--- a/package/perf/Config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-config BR2_PACKAGE_PERF
- bool "perf"
- depends on BR2_LINUX_KERNEL
- help
- perf (sometimes "Perf Events" or perf tools, originally
- "Performance Counters for Linux") - is a performance
- analyzing tool in Linux, available from kernel version
- 2.6.31. User-space controlling utility, called 'perf' has
- git-like interface with subcommands. It is capable of
- statistical profiling of entire system (both kernel and user
- code), single CPU or severals threads.
-
- This package builds and install the userspace 'perf'
- command. It is up to the user to ensure that the kernel
- configuration has all the suitable options enabled to allow a
- proper operation of 'perf'.
-
- https://perf.wiki.kernel.org/
-
-comment "perf needs a Linux kernel to be built"
- depends on !BR2_LINUX_KERNEL
diff --git a/package/perf/perf.mk b/package/perf/perf.mk
deleted file mode 100644
index 36989fc..0000000
--- a/package/perf/perf.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-################################################################################
-#
-# perf
-#
-################################################################################
-
-# Source taken from the Linux kernel tree
-PERF_SOURCE =
-PERF_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
-
-PERF_DEPENDENCIES = linux host-flex host-bison
-
-PERF_MAKE_FLAGS = \
- $(LINUX_MAKE_FLAGS) \
- NO_LIBAUDIT=1 \
- NO_NEWT=1 \
- NO_GTK2=1 \
- NO_LIBPERL=1 \
- NO_LIBPYTHON=1 \
- DESTDIR=$(TARGET_DIR) \
- prefix=/usr \
- WERROR=0 \
- ASCIIDOC=
-
-# The call to backtrace() function fails for ARC, because for some
-# reason the unwinder from libgcc returns early. Thus the usage of
-# backtrace() should be disabled in perf explicitly: at build time
-# backtrace() appears to be available, but it fails at runtime: the
-# backtrace will contain only several functions from the top of stack,
-# instead of the complete backtrace.
-ifeq ($(BR2_arc),y)
-PERF_MAKE_FLAGS += NO_BACKTRACE=1
-endif
-
-ifeq ($(BR2_PACKAGE_ELFUTILS),y)
-PERF_DEPENDENCIES += elfutils
-else
-PERF_MAKE_FLAGS += NO_LIBELF=1 NO_DWARF=1
-endif
-
-define PERF_BUILD_CMDS
- $(Q)if test ! -f $(LINUX_DIR)/tools/perf/Makefile ; then \
- echo "Your kernel version is too old and does not have the perf tool." ; \
- echo "At least kernel 2.6.31 must be used." ; \
- exit 1 ; \
- fi
- $(Q)if test "$(BR2_PACKAGE_ELFUTILS)" = "" ; then \
- if ! grep -q NO_LIBELF $(LINUX_DIR)/tools/perf/Makefile* ; then \
- if ! test -r $(LINUX_DIR)/tools/perf/config/Makefile ; then \
- echo "The perf tool in your kernel cannot be built without libelf." ; \
- echo "Either upgrade your kernel to >= 3.7, or enable the elfutils package." ; \
- exit 1 ; \
- fi \
- fi \
- fi
- $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/perf \
- $(PERF_MAKE_FLAGS) O=$(@D)
-endef
-
-# After installation, we remove the Perl and Python scripts from the
-# target.
-define PERF_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/perf \
- $(PERF_MAKE_FLAGS) O=$(@D) install
- $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/
-endef
-
-$(eval $(generic-package))
--
2.4.3
More information about the buildroot
mailing list