[oe-commits] Bian Naimeng : sysdig: 0.1.101 -> 0.1.102

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: ee2939aec738650e3fa8d188f3aebb832eccb8b5
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=ee2939aec738650e3fa8d188f3aebb832eccb8b5

Author: Bian Naimeng <biannm at cn.fujitsu.com>
Date:   Tue Aug 25 17:56:16 2015 +0800

sysdig: 0.1.101 -> 0.1.102

upgrade sysdig to 0.1.102, and using GIT source instead of archive.

Because the bug had been fixed at upstream before 0.1.102 released,
so get rid of 01-donot-set-default-value-to-va_list.patch.

Please obtain detail from
https://github.com/draios/sysdig/commit/3cf4db08314b8559405198fb998eab421fec4b7d

Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../01-donot-set-default-value-to-va_list.patch    | 22 ----------------------
 .../sysdig/{sysdig_0.1.101.bb => sysdig_git.bb}    | 10 ++++------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/meta-oe/recipes-extended/sysdig/sysdig/01-donot-set-default-value-to-va_list.patch b/meta-oe/recipes-extended/sysdig/sysdig/01-donot-set-default-value-to-va_list.patch
deleted file mode 100644
index 9cb6378..0000000
--- a/meta-oe/recipes-extended/sysdig/sysdig/01-donot-set-default-value-to-va_list.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix build error as following.
-
-  sysdig-0.1.101/userspace/libsinsp/ctext.h:376:50: error: could not convert '0' from 'int' to 'va_list {aka __va_list}'
-  |    int8_t vprintf(const char*format, va_list ap = 0);
-  |                                                   ^
-  | make[2]: *** [userspace/libsinsp/CMakeFiles/sinsp.dir/ctext.cpp.o] Error 1
-
-
-Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>
-
-diff -Nurp sysdig-0.1.101.orig/userspace/libsinsp/ctext.h sysdig-0.1.101/userspace/libsinsp/ctext.h
---- sysdig-0.1.101.orig/userspace/libsinsp/ctext.h	2015-06-04 02:58:51.000000000 +0800
-+++ sysdig-0.1.101/userspace/libsinsp/ctext.h	2015-07-02 09:18:14.154627357 +0800
-@@ -373,7 +373,7 @@ class ctext
- 		// application to this library seamlessly.
- 		//
- 		int8_t printf(const char*format, ...);
--		int8_t vprintf(const char*format, va_list ap = 0);
-+		int8_t vprintf(const char*format, va_list ap);
- 
- 		//
- 		// nprintf is identical to the printf above EXCEPT for
diff --git a/meta-oe/recipes-extended/sysdig/sysdig_0.1.101.bb b/meta-oe/recipes-extended/sysdig/sysdig_git.bb
similarity index 73%
rename from meta-oe/recipes-extended/sysdig/sysdig_0.1.101.bb
rename to meta-oe/recipes-extended/sysdig/sysdig_git.bb
index 789fd47..62aa433 100644
--- a/meta-oe/recipes-extended/sysdig/sysdig_0.1.101.bb
+++ b/meta-oe/recipes-extended/sysdig/sysdig_git.bb
@@ -11,13 +11,11 @@ inherit cmake pkgconfig
 DEPENDS = "luajit zlib ncurses"
 RDEPENDS_${PN} = "bash"
 
+SRC_URI = "git://github.com/draios/sysdig.git;branch=master"
+SRCREV = "b7394e29ced4f1a991af03c0381a5828abcbab7a"
+PV = "0.1.102+git${SRCPV}"
 
-SRC_URI = "https://github.com/draios/sysdig/archive/${PV}.tar.gz \
-           file://01-donot-set-default-value-to-va_list.patch \
-          "
-
-SRC_URI[md5sum] = "5fe96a3a0fd98b2157a40cb29af41afc"
-SRC_URI[sha256sum] = "6995e39be565514901b5cb587689ee2efbf8359293e4e597362382cccf0e9db6"
+S = "${WORKDIR}/git"
 
 DIR_ETC="/etc"
 EXTRA_OECMAKE = ' -DUSE_BUNDLED_LUAJIT="OFF" \