add sysdig package and dependencies. cleanup Config.in.debug

4 files changed, 144 insertions, 40 deletions

diff --git a/package/jsoncpp/Makefile b/package/jsoncpp/Makefile
new file mode 100644
index 000000000..bd318c3f3
--- /dev/null
+++ b/package/jsoncpp/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		jsoncpp
+PKG_VERSION:=		9cb88d2ca66af19c53a98843d159cc1d32ebaec6
+PKG_RELEASE:=		1
+PKG_DESCR:=		c++ library for json
+PKG_SECTION:=		libs/misc
+PKG_URL:=		https://github.com/open-source-parsers/jsoncpp
+PKG_SITES:=		https://github.com/open-source-parsers/jsoncpp.git
+PKG_OPTS:=		dev
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,JSONCPP,jsoncpp,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+CONFIG_STYLE:=		cmake
+CMAKE_FLAGS:=		-DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
+
+jsoncpp-install:
+	$(INSTALL_DIR) $(IDIR_JSONCPP)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/luajit/Makefile b/package/luajit/Makefile
new file mode 100644
index 000000000..6024a55b6
--- /dev/null
+++ b/package/luajit/Makefile
@@ -0,0 +1,46 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		luajit
+PKG_VERSION:=		2.0.3
+PKG_RELEASE:=		1
+PKG_HASH:=		55be6cb2d101ed38acca32c5b1f99ae345904b365b642203194c585d27bebd79
+PKG_DESCR:=		just in time compiler for lua
+PKG_SECTION:=		dev/lang
+PKG_URL:=		http://luajit.org/download/
+PKG_SITES:=		http://luajit.org/download/
+
+DISTFILES:=             LuaJIT-$(PKG_VERSION).tar.gz
+
+WRKDIST=		$(WRKDIR)/LuaJIT-$(PKG_VERSION)
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LUAJIT,luajit,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+CONFIG_STYLE:=		manual
+MAKE_TARGET:=		amalg
+XAKE_FLAGS+=		STATIC_CC="$(TARGET_CC)" \
+			DYNAMIC_CC="$(TARGET_CC)" \
+			CROSS='$(TARGET_CROSS)' \
+			PREFIX=/usr \
+			CFLAGS='' \
+			LDFLAGS='' \
+			TARGET_CFLAGS='$(TARGET_CFLAGS)' \
+			TARGET_LDFLAGS='$(TARGET_LDFLAGS)' \
+			HOST_CC='$(HOST_CC) -m32' \
+			HOST_CFLAGS='$(HOST_CFLAGS)' \
+			HOST_LDFLAGS='$(HOST_LDFLAGS)' \
+			Q=''
+
+luajit-install:
+	$(INSTALL_DIR) $(IDIR_LUAJIT)/usr/bin
+	$(CP) $(WRKINST)/usr/bin/luajit* \
+		$(IDIR_LUAJIT)/usr/bin
+	$(INSTALL_DIR) $(IDIR_LUAJIT)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libluajit-*.so* \
+		$(IDIR_LUAJIT)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/sysdig/Makefile b/package/sysdig/Makefile
new file mode 100644
index 000000000..e1d7f557a
--- /dev/null
+++ b/package/sysdig/Makefile
@@ -0,0 +1,43 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:=		sysdig
+PKG_VERSION:=		d7f05fc973080f5471af596cbcc8e2b2efc9e934
+PKG_RELEASE:=		1
+PKG_DESCR:=		system troubleshooting tool
+PKG_SECTION:=		app/debug
+PKG_DEPENDS:=		libstdcxx zlib jsoncpp luajit
+PKG_BUILDDEP:=		cmake-host zlib jsoncpp luajit
+PKG_URL:=		http://www.sysdig.org/
+PKG_SITES:=		https://github.com/draios/sysdig.git
+
+PKG_CFLINE_SYSDIG:=	select ADK_KERNEL_FTRACE@
+PKG_CFLINE_SYSDIG+=	select ADK_KERNEL_GENERIC_TRACER@
+PKG_CFLINE_SYSDIG+=	select ADK_KERNEL_FUNCTION_TRACER
+
+include $(ADK_TOPDIR)/mk/package.mk
+include ${ADK_TOPDIR}/mk/kernel-ver.mk
+
+$(eval $(call PKG_template,SYSDIG,sysdig,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+
+WRKBUILD=		$(WRKDIR)/$(PKG_NAME)-obj
+CONFIG_STYLE:=		cmake
+CMAKE_FLAGS:=		-DUSE_BUNDLED_ZLIB=OFF -DUSE_BUNDLED_JSONCPP=OFF -DUSE_BUNDLED_LUAJIT=OFF
+XAKE_FLAGS+=		KERNELDIR="$(LINUX_DIR)" ARCH=$(ADK_TARGET_ARCH) GCC_HONOUR_COPTS=s
+
+sysdig-install:
+	$(INSTALL_DIR) $(IDIR_SYSDIG)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/sysdig \
+		$(IDIR_SYSDIG)/usr/bin
+	$(INSTALL_DIR) $(IDIR_SYSDIG)/usr/share
+	$(CP) $(WRKINST)/usr/share/* \
+		$(IDIR_SYSDIG)/usr/share
+	${INSTALL_DIR} ${IDIR_SYSDIG}/etc/modules.d/
+	echo "sysdig-probe" > ${IDIR_SYSDIG}/etc/modules.d/90-sysdig
+	${INSTALL_DIR} ${IDIR_SYSDIG}/lib/modules/${KERNEL_VERSION}/
+	${INSTALL_DATA} ${WRKBUILD}/driver/sysdig-probe.ko \
+		${IDIR_SYSDIG}/lib/modules/${KERNEL_VERSION}
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug
index f2a00666e..d1682093b 100644
--- a/target/linux/config/Config.in.debug
+++ b/target/linux/config/Config.in.debug
@@ -1,66 +1,64 @@
 menu "Kernel debugging"
 
+config ADK_KERNEL_FTRACE
+	bool
+
+config ADK_KERNEL_GENERIC_TRACER
+	bool
+
+config ADK_KERNEL_FUNCTION_TRACER
+	bool
+
 config ADK_KERNEL_PROFILING
-	boolean
+	bool
 
 config ADK_KERNEL_DEBUG_KERNEL
-	boolean
+	bool
 
 config ADK_KERNEL_DEBUG_INFO
-	boolean
+	bool
 
 config ADK_KERNEL_KGDB
-	boolean
+	bool
 
 config ADK_KERNEL_KGDB_SERIAL_CONSOLE
-	boolean
+	bool
 
 config ADK_KERNEL_FRAME_POINTER
-	boolean
+	bool
 
 config ADK_KERNEL_EARLY_PRINTK
-	boolean
-	default n
+	bool
 
 config ADK_KERNEL_KALLSYMS_ALL
-	boolean
+	bool
 
 config ADK_KERNEL_PRINTK
-	prompt "printk support (disable to save space and quieten bootup)"
-	boolean
+	bool "printk support (disable to save space and quieten bootup)"
 	select ADK_KERNEL_EARLY_PRINTK
 	default y
 	help
 	  Disable printk to save space and quieten bootup.
 
 config ADK_KERNEL_PRINTK_TIME
-	prompt "timing information for printk"
-	boolean
+	bool "timing information for printk"
 	depends on ADK_KERNEL_PRINTK
-	default n
 	help
 	  Enable timing information for printk, to analyze kernel
 	  bootup performance.
 
 config ADK_KERNEL_BUG
-	prompt "Enable BUGS()"
-	boolean
-	default n
+	bool "Enable BUGS()"
 	help
 	  Enable if you need BUGS() in the kernel.
 
 config ADK_KERNEL_COREDUMP
-	prompt "Enable coredumps"
-	boolean
-	default y if ADK_PACKAGE_LTP
-	default n
+	bool "Enable coredumps"
 	help
 	  Enable if you need coredumps.
 
 config ADK_KERNEL_NETCONSOLE
-	prompt "Netconsole support"
-	boolean
-	default n
+	bool "Netconsole support"
 	help
 	  Activate netconsole. netconsole=@/,@192.168.1.2/
 
@@ -81,16 +79,14 @@ config ADK_PARAMETER_NETCONSOLE_DST_IP
        	  ip address logging to.
 
 config ADK_KERNEL_MAGIC_SYSRQ
-	prompt "Magic BREAK sequence"
-	boolean
+	bool "Magic BREAK sequence"
 	default y
 	help
 	  Enable this to be able to use the Magic SysRq functions,
 	  probably using a serial console break.
 
 config ADK_KERNEL_DEBUG_FS
-	prompt "Debug Filesystem"
-	boolean
+	bool "Debug Filesystem"
 	default n
 	help
 	  debugfs is a virtual file system that kernel developers use to put
@@ -98,14 +94,10 @@ config ADK_KERNEL_DEBUG_FS
 	  write to these files.
 
 config ADK_KERNEL_DEBUG_INFO
-	prompt "Debug info"
-	boolean
-	default n
-	help
+	bool "Debug info"
 
 config ADK_KERNEL_DEBUG_WITH_KGDB
-	prompt "Enable remote kernel debugging using KGDB"
-	boolean
+	bool "Enable remote kernel debugging using KGDB"
 	select ADK_KERNEL_DEBUG_KERNEL
 	select ADK_KERNEL_DEBUG_INFO
 	select ADK_KERNEL_KGDB
@@ -119,20 +111,18 @@ config ADK_KERNEL_DEBUG_WITH_KGDB
 	default n
 
 config ADK_KERNEL_OPROFILE
-	prompt "Oprofile support"
-	tristate
+	tristate "Oprofile support"
 	select ADK_KERNEL_PROFILING
 	depends on !ADK_TARGET_ARCH_M68K
 	default n
 	help
-	 use oprofile package to make use of the kernel support.
+	  use oprofile package to make use of the kernel support.
 
 config ADK_KERNEL_KALLSYMS
-	prompt "Support for symbol names in OOPS"
-	boolean
+	bool "Support for symbol names in OOPS"
 	select ADK_KERNEL_KALLSYMS_ALL
 	default n
 	help
-	 Load all symbols to the kernel.
+	  Load all symbols to the kernel.
 
 endmenu