diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb | 51 |
1 files changed, 32 insertions, 19 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb index 4f58281f9..04a022af4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -3,39 +3,52 @@ DESCRIPTION = "Sysdig is open source, system-level exploration: capture \ system state and activity from a running Linux instance, then save, \ filter and analyze." HOMEPAGE = "http://www.sysdig.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LICENSE = "Apache-2.0 & (MIT | GPL-2.0)" +LIC_FILES_CHKSUM = "file://COPYING;md5=f8fee3d59797546cffab04f3b88b2d44" inherit cmake pkgconfig -OECMAKE_GENERATOR = "Unix Makefiles" +#OECMAKE_GENERATOR = "Unix Makefiles" +JIT ?= "jit" +JIT_mipsarchn32 = "" +JIT_mipsarchn64 = "" +JIT_riscv64 = "" +JIT_riscv32 = "" -DEPENDS = "luajit zlib ncurses" +DEPENDS += "lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp tbb jq openssl elfutils protobuf protobuf-native jq-native" RDEPENDS_${PN} = "bash" -SRC_URI = "git://github.com/draios/sysdig.git;branch=master \ - file://0001-libsinsp-Port-to-build-with-lua-5.2.patch \ +SRC_URI = "git://github.com/draios/sysdig.git;branch=dev \ + file://0001-fix-build-with-LuaJIT-2.1-betas.patch \ file://0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch \ + file://fix-uint64-const.patch \ + file://aarch64.patch \ " -SRCREV = "85d16f33a82a17f87ccdbc088749271c71d87013" -PV = "0.1.102+git${SRCPV}" +SRCREV = "8daeef8da752c5f07f439391bc20c5948eb11470" +PV = "0.26.6" S = "${WORKDIR}/git" -DIR_ETC="/etc" -EXTRA_OECMAKE = ' -DUSE_BUNDLED_LUAJIT="OFF" \ - -DUSE_BUNDLED_ZLIB="OFF" \ - -DBUILD_DRIVER="OFF" \ - -DUSE_BUNDLED_NCURSES="OFF" \ - -DDIR_ETC="${DIR_ETC}" \ - ' +EXTRA_OECMAKE = "\ + -DBUILD_DRIVER=OFF \ + -DUSE_BUNDLED_DEPS=OFF \ + -DUSE_BUNDLED_B64=ON \ + -DCREATE_TEST_TARGETS=OFF \ + -DDIR_ETC=${sysconfdir} \ + -DLUA_INCLUDE_DIR=${STAGING_INCDIR}/luajit-2.1 \ + -DLUA_LIBRARY=libluajit-5.1.so \ +" FILES_${PN} += " \ ${DIR_ETC}/* \ ${datadir}/zsh/* \ ${prefix}/src/* \ " - -# luajit not supported on Aarch64 -COMPATIBLE_HOST = "^(?!aarch64).*" - +# Use getaddrinfo_a is a GNU extension in libsinsp +# It should be fixed in sysdig, until then disable +# on musl +# Something like this https://code.videolan.org/ePirat/vlc/-/commit/01fd9fe4c7f6c5558f7345f38abf0152e17853ab is needed to fix it +COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST_mips = "null" +COMPATIBLE_HOST_riscv64 = "null" +COMPATIBLE_HOST_riscv32 = "null" |