[Buildroot] [PATCH v8] package/sysdig: New package
Angelo Compagnucci
angelo.compagnucci at gmail.com
Wed Mar 25 21:50:17 UTC 2015
Dear Ryan Barnett,
2015-03-25 19:05 GMT+01:00 Ryan Barnett <ryan.barnett at rockwellcollins.com>:
> Angelo,
>
> On Wed, Mar 25, 2015 at 5:53 AM, Angelo Compagnucci
> <angelo.compagnucci at gmail.com> wrote:
>
> [...]
>
>> package/Config.in | 1 +
>> .../0001-makefile-driver-compile-options.patch | 23 ++++++++++++++++
>> .../sysdig/0002-remove-dkms-module-updater.patch | 32 ++++++++++++++++++++++
>> package/sysdig/Config.in | 21 ++++++++++++++
>> package/sysdig/sysdig.mk | 16 +++++++++++
>> 5 files changed, 93 insertions(+)
>> create mode 100644 package/sysdig/0001-makefile-driver-compile-options.patch
>
> Have you submitted this sysdig patch upstream via a github pull request?
I don't think they will be interested cause the patch is strictly
releated to buildroot, $(LINUX_MAKE_FLAGS) is indeed a buildroot
defined variable not applicable in other contexts.
> Giving it a quick look at 0001 looks like something that could be
> upstreamable since
>
>> create mode 100644 package/sysdig/0002-remove-dkms-module-updater.patch
>> create mode 100644 package/sysdig/Config.in
>> create mode 100644 package/sysdig/sysdig.mk
>>
>> diff --git a/package/Config.in b/package/Config.in
>> index e4ee95d..aaf12ec 100644
>> --- a/package/Config.in
>> +++ b/package/Config.in
>> @@ -94,6 +94,7 @@ endif
>> source "package/spidev_test/Config.in"
>> source "package/strace/Config.in"
>> source "package/stress/Config.in"
>> + source "package/sysdig/Config.in"
>> source "package/sysprof/Config.in"
>> source "package/tinymembench/Config.in"
>> source "package/trace-cmd/Config.in"
>> diff --git a/package/sysdig/0001-makefile-driver-compile-options.patch b/package/sysdig/0001-makefile-driver-compile-options.patch
>> new file mode 100644
>> index 0000000..b3444ad
>> --- /dev/null
>> +++ b/package/sysdig/0001-makefile-driver-compile-options.patch
>> @@ -0,0 +1,23 @@
>> +Updated Makefile compile options
>> +
>> +This patch updates linux kernel module (driver) of sysdig to be
>> +compatible with buildroot compile flags.
>> +
>> +Signed-off-by: Angelo Compagnucci <angelo.compagnucci at gmail.com>
>> +
>> +--- a/driver/Makefile.in
>> ++++ b/driver/Makefile.in
>> +@@ -6,10 +6,10 @@ KERNELDIR ?= /lib/modules/$(shell uname -r)/build
>> +
>> + TOP := $(shell pwd)
>> + all:
>> +- $(MAKE) -C $(KERNELDIR) M=$(TOP) modules
>> ++ $(MAKE) $(LINUX_MAKE_FLAGS) -C $(KERNELDIR) M=$(TOP) modules
>> +
>> + clean:
>> +- $(MAKE) -C $(KERNELDIR) M=$(TOP) clean
>> ++ $(MAKE) $(LINUX_MAKE_FLAGS) -C $(KERNELDIR) M=$(TOP) clean
>> +
>> + install: all
>> +- $(MAKE) -C $(KERNELDIR) M=$(TOP) modules_install
>> ++ $(MAKE) $(LINUX_MAKE_FLAGS) -C $(KERNELDIR) M=$(TOP) modules_install
>> diff --git a/package/sysdig/0002-remove-dkms-module-updater.patch b/package/sysdig/0002-remove-dkms-module-updater.patch
>> new file mode 100644
>> index 0000000..66fe3dd
>> --- /dev/null
>> +++ b/package/sysdig/0002-remove-dkms-module-updater.patch
>> @@ -0,0 +1,32 @@
>> +Remove DKMS module updater
>> +
>> +This patch disables the in target installation of DKMS module updater
>> +mechanism unneeded in buildroot.
>> +
>> +Signed-off-by: Angelo Compagnucci <angelo.compagnucci at gmail.com>
>> +
>> +--- a/driver/CMakeLists.txt
>> ++++ b/driver/CMakeLists.txt
>> +@@ -38,22 +38,3 @@ add_custom_target(install_driver
>> + DEPENDS driver
>> + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
>> + VERBATIM)
>> +-
>> +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Makefile.dkms
>> +- RENAME Makefile
>> +- DESTINATION "src/sysdig-${SYSDIG_VERSION}")
>> +-
>> +-install(FILES
>> +- ${CMAKE_CURRENT_BINARY_DIR}/dkms.conf
>> +- dynamic_params_table.c
>> +- event_table.c
>> +- flags_table.c
>> +- main.c
>> +- ppm.h
>> +- ppm_events.c
>> +- ppm_events.h
>> +- ppm_events_public.h
>> +- ppm_fillers.c
>> +- ppm_ringbuffer.h
>> +- syscall_table.c
>> +- DESTINATION "src/sysdig-${SYSDIG_VERSION}")
>> diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in
>> new file mode 100644
>> index 0000000..caf7ef8
>> --- /dev/null
>> +++ b/package/sysdig/Config.in
>> @@ -0,0 +1,21 @@
>> +config BR2_PACKAGE_SYSDIG
>> + bool "sysdig"
>> + select BR2_PACKAGE_ZLIB
>> + select BR2_PACKAGE_LUAJIT
>> + select BR2_PACKAGE_JSONCPP
>> + depends on BR2_LINUX_KERNEL
>> + depends on BR2_INSTALL_LIBSTDCPP # libjson
>> + depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
>> + help
>> + Sysdig is open source, system-level exploration:
>> + capture system state and activity from a running Linux instance,
>> + then save, filter and analyze.
>> + Think of it as strace + tcpdump + lsof + awesome sauce.
>> + With a little Lua cherry on top.
>> +
>> + http://sysdig.org
>> +
>> +comment "sysdig needs a toolchain w/ C++ and a Linux kernel to be built"
>> + depends on !BR2_LINUX_KERNEL
>> + depends on !BR2_INSTALL_LIBSTDCPP
>> + depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
>> diff --git a/package/sysdig/sysdig.mk b/package/sysdig/sysdig.mk
>> new file mode 100644
>> index 0000000..769cfe2
>> --- /dev/null
>> +++ b/package/sysdig/sysdig.mk
>> @@ -0,0 +1,16 @@
>> +################################################################################
>> +#
>> +# sysdig
>> +#
>> +################################################################################
>> +
>> +SYSDIG_VERSION = 0.1.99
>> +SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION))
>> +SYSDIG_LICENSE = GPLv2
>> +SYSDIG_LICENSE_FILES = COPYING
>> +SYSDIG_CONF_OPTS = -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_ZLIB=OFF \
>> + -DUSE_BUNDLED_JSONCPP=OFF
>> +SYSDIG_DEPENDENCIES = zlib luajit libjson linux
>> +SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO
>
> In your previous email you gave a link to saying why luajit is required:
>
> [1] http://www.sysdig.org/wiki/how-to-install-sysdig-from-the-source-code/
>
> However, from reading the documentation it says that you can use the
> bundled luajit. Quoting from the site you provided:
I think that deduplication is really important here. Having only a
system wide library installed is more appropriated for an embedded
system where resources is limited, instead of having several libraries
with similar functionality installed.
Sincerely, Angelo
>
>
>> +$(eval $(cmake-package))
>> --
>> 1.9.1
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>
>
>
> --
> Ryan Barnett / Sr Software Engineer
> Airborne Information Systems / Security Systems and Software
> MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
> ryan.barnett at rockwellcollins.com
> www.rockwellcollins.com
--
Profile: http://it.linkedin.com/in/compagnucciangelo
More information about the buildroot
mailing list