[Buildroot] [PATCH v3 1/1] ktap: new package
Thomas De Schampheleire
patrickdepinguin at gmail.com
Tue Dec 10 08:22:16 UTC 2013
Hej Anders,
On Tue, Dec 10, 2013 at 8:38 AM, Anders Darander <anders at chargestorm.se> wrote:
> Add ktap, a script-based dynamic tracing tool.
>
> Signed-off-by: Anders Darander <anders at chargestorm.se>
> ---
>
> Changes v2 -> v3:
> - Fix typo in TARGET_CONFIGURE_OPTS. The typo was added after
> building and running on a beaglebone, but prior to pure build
> testing on another target. ktap successfully built, but for the
> host arch...
>
> No update to ktap v0.4, as this will require more configure options
> to get a deterministic build. I'll update to v0.4 as soon as my
> schedule allows me some time for testing.
>
> Changes v1 -> v2:
> - Change {} to () around e.g. LINUX_VERSION_PROBED
> - Use TARGET_CONFIGURE_OPTS instead of setting CC
> - Explicitly install to file instead of directory
> - Add depends on BR2_TOOLCHAIN_HAS_THREADS
>
> package/Config.in | 1 +
> .../0001-interpreter-vm.c-include-uaccess.h.patch | 27 +++++++++++++++++++++
> package/ktap/0002-Set-PWD-in-Makefile.patch | 28 ++++++++++++++++++++++
> package/ktap/Config.in | 26 ++++++++++++++++++++
> package/ktap/ktap.mk | 25 +++++++++++++++++++
> 5 files changed, 107 insertions(+)
> create mode 100644 package/ktap/0001-interpreter-vm.c-include-uaccess.h.patch
> create mode 100644 package/ktap/0002-Set-PWD-in-Makefile.patch
The naming convention is <package>-<number>-<description>.patch, so
these patches should be prefixed with ktap-
> create mode 100644 package/ktap/Config.in
> create mode 100644 package/ktap/ktap.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index aa928ec..40c9e31 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -50,6 +50,7 @@ source "package/duma/Config.in"
> source "package/gdb/Config.in"
> source "package/iozone/Config.in"
> source "package/kexec/Config.in"
> +source "package/ktap/Config.in"
> source "package/latencytop/Config.in"
> source "package/lmbench/Config.in"
> if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
> diff --git a/package/ktap/0001-interpreter-vm.c-include-uaccess.h.patch b/package/ktap/0001-interpreter-vm.c-include-uaccess.h.patch
> new file mode 100644
> index 0000000..c7c6bbe
> --- /dev/null
> +++ b/package/ktap/0001-interpreter-vm.c-include-uaccess.h.patch
> @@ -0,0 +1,27 @@
> +From 343cb5a8b11a1dfdf4262fce326113e889f13496 Mon Sep 17 00:00:00 2001
> +From: Anders Darander <anders at chargestorm.se>
> +Date: Sat, 9 Nov 2013 23:05:05 +0100
> +Subject: [PATCH] interpreter/vm.c: include uaccess.h
> +
> +otherwise functions, such as copy_from_user, is implicitly defined.
> +
> +Signed-off-by: Anders Darander <anders at chargestorm.se>
> +---
> + interpreter/vm.c | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/interpreter/vm.c b/interpreter/vm.c
> +index bc7b951..f7cb794 100644
> +--- a/interpreter/vm.c
> ++++ b/interpreter/vm.c
> +@@ -28,6 +28,7 @@
> + #include <linux/signal.h>
> + #include <linux/sched.h>
> + #include "../include/ktap.h"
> ++#include <linux/uaccess.h>
> +
> + #define KTAP_MINSTACK 20
> +
> +--
> +1.8.4.2
> +
> diff --git a/package/ktap/0002-Set-PWD-in-Makefile.patch b/package/ktap/0002-Set-PWD-in-Makefile.patch
> new file mode 100644
> index 0000000..e62d4f1
> --- /dev/null
> +++ b/package/ktap/0002-Set-PWD-in-Makefile.patch
> @@ -0,0 +1,28 @@
> +From 90a8dd877b7766b1ba722c19569cffb68625288b Mon Sep 17 00:00:00 2001
> +From: Anders Darander <anders at chargestorm.se>
> +Date: Mon, 11 Nov 2013 13:04:36 +0100
> +Subject: Set PWD in Makefile
> +
> +When cross-compiling using e.g. buildroot, PWD was not reset in the Makefile.
> +That caused PWD to have an incorrect value, and thus building the module failed.
> +
> +Signed-off-by: Anders Darander <anders at chargestorm.se>
> +---
> + Makefile | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/Makefile b/Makefile
> +index 372b41a..939d25e 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -25,6 +25,7 @@ ktapvm-y := $(INTP_OBJS)
> +
> + KVERSION ?= $(shell uname -r)
> + KERNEL_SRC ?= /lib/modules/$(KVERSION)/build
> ++PWD := $(shell pwd)
> + mod:
> + $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules
> +
> +--
> +1.8.4.2
> +
> diff --git a/package/ktap/Config.in b/package/ktap/Config.in
> new file mode 100644
> index 0000000..d50a6ac
> --- /dev/null
> +++ b/package/ktap/Config.in
> @@ -0,0 +1,26 @@
> +config BR2_PACKAGE_KTAP
> + bool "ktap"
> + depends on BR2_LINUX_KERNEL
> + depends on BR2_TOOLCHAIN_HAS_THREADS
> + help
> + ktap is a script-based dynamic tracing tool for Linux
> +
> + it uses a scripting language and lets users trace the Linux kernel
It (capitalized)
> + dynamically. ktap is designed to give operational insights with
> + interoperability that allows users to tune, troubleshoot and extend
> + kernel and application. It's similar with Linux Systemtap and
similar to
(I do realize that this is copied from the README, but I think it's
incorrect English)
> + Solaris Dtrace.
> +
> + ktap don't support kernels older than 3.1.
doesn't
> +
> + Your kernel must have CONFIG_EVENT_TRACING,
> + CONFIG_PERF_EVENTS, and CONFIG_DEBUG_FS enabled to compile.
> +
> + http://www.ktap.org
> +
> +comment "ktap requires a linux kernel to be built"
> + depends on !BR2_LINUX_KERNEL
> +
> +comment "ktap needs a toolchain w/ threads"
> + depends on !BR2_TOOLCHAIN_HAS_THREADS
> +
> diff --git a/package/ktap/ktap.mk b/package/ktap/ktap.mk
> new file mode 100644
> index 0000000..89ef6ff
> --- /dev/null
> +++ b/package/ktap/ktap.mk
> @@ -0,0 +1,25 @@
> +################################################################################
> +#
> +# ktap, script-based dynamic tracing tool
> +#
> +################################################################################
> +
> +KTAP_VERSION = 0.3
> +KTAP_SITE = https://github.com/ktap/ktap/archive
> +KTAP_SOURCE = v$(KTAP_VERSION).tar.gz
Please use the new github helper to obtain packages from github, see
http://git.buildroot.org/buildroot/commit/?id=c7c7d0697c00e45bcfad15b027f5c66005f4c005
Also: no need to align the = signs here.
> +KTAP_LICENSE = GPLv2
> +KTAP_LICENSE_FILES = LICENSE-GPL
> +
> +KTAP_DEPENDENCIES = linux
> +
> +define KTAP_BUILD_CMDS
> + $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) ktap
> + $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_SRC=$(LINUX_DIR) KVERSION=$(LINUX_VERSION_PROBED) mod
> +endef
> +
> +define KTAP_INSTALL_TARGET_CMDS
> + $(INSTALL) -D -m755 $(@D)/ktap $(TARGET_DIR)/usr/bin/ktap
> + $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) KERNEL_SRC=$(LINUX_DIR) KVERSION=$(LINUX_VERSION_PROBED) modules_install
> +endef
> +
> +$(eval $(generic-package))
> --
Best regards,
Thomas
More information about the buildroot
mailing list