diff options
| -rw-r--r-- | meta-oe/recipes-extended/sysdig/sysdig/01-donot-set-default-value-to-va_list.patch | 22 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/sysdig/sysdig_git.bb (renamed from meta-oe/recipes-extended/sysdig/sysdig_0.1.101.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 9cb6378af2..0000000000 --- a/meta-oe/recipes-extended/sysdig/sysdig/01-donot-set-default-value-to-va_list.patch +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | fix build error as following. | ||
| 2 | |||
| 3 | sysdig-0.1.101/userspace/libsinsp/ctext.h:376:50: error: could not convert '0' from 'int' to 'va_list {aka __va_list}' | ||
| 4 | | int8_t vprintf(const char*format, va_list ap = 0); | ||
| 5 | | ^ | ||
| 6 | | make[2]: *** [userspace/libsinsp/CMakeFiles/sinsp.dir/ctext.cpp.o] Error 1 | ||
| 7 | |||
| 8 | |||
| 9 | Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> | ||
| 10 | |||
| 11 | diff -Nurp sysdig-0.1.101.orig/userspace/libsinsp/ctext.h sysdig-0.1.101/userspace/libsinsp/ctext.h | ||
| 12 | --- sysdig-0.1.101.orig/userspace/libsinsp/ctext.h 2015-06-04 02:58:51.000000000 +0800 | ||
| 13 | +++ sysdig-0.1.101/userspace/libsinsp/ctext.h 2015-07-02 09:18:14.154627357 +0800 | ||
| 14 | @@ -373,7 +373,7 @@ class ctext | ||
| 15 | // application to this library seamlessly. | ||
| 16 | // | ||
| 17 | int8_t printf(const char*format, ...); | ||
| 18 | - int8_t vprintf(const char*format, va_list ap = 0); | ||
| 19 | + int8_t vprintf(const char*format, va_list ap); | ||
| 20 | |||
| 21 | // | ||
| 22 | // 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 index 789fd4790c..62aa433b3c 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 | |||
| 11 | DEPENDS = "luajit zlib ncurses" | 11 | DEPENDS = "luajit zlib ncurses" |
| 12 | RDEPENDS_${PN} = "bash" | 12 | RDEPENDS_${PN} = "bash" |
| 13 | 13 | ||
| 14 | SRC_URI = "git://github.com/draios/sysdig.git;branch=master" | ||
| 15 | SRCREV = "b7394e29ced4f1a991af03c0381a5828abcbab7a" | ||
| 16 | PV = "0.1.102+git${SRCPV}" | ||
| 14 | 17 | ||
| 15 | SRC_URI = "https://github.com/draios/sysdig/archive/${PV}.tar.gz \ | 18 | S = "${WORKDIR}/git" |
| 16 | file://01-donot-set-default-value-to-va_list.patch \ | ||
| 17 | " | ||
| 18 | |||
| 19 | SRC_URI[md5sum] = "5fe96a3a0fd98b2157a40cb29af41afc" | ||
| 20 | SRC_URI[sha256sum] = "6995e39be565514901b5cb587689ee2efbf8359293e4e597362382cccf0e9db6" | ||
| 21 | 19 | ||
| 22 | DIR_ETC="/etc" | 20 | DIR_ETC="/etc" |
| 23 | EXTRA_OECMAKE = ' -DUSE_BUNDLED_LUAJIT="OFF" \ | 21 | EXTRA_OECMAKE = ' -DUSE_BUNDLED_LUAJIT="OFF" \ |
