From patchwork Thu Jan 3 18:07:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 154732 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp931773ljp; Thu, 3 Jan 2019 10:08:35 -0800 (PST) X-Google-Smtp-Source: ALg8bN7eQS4MQh2bD77xgpQ9Fqpw3v3Tpqnl16XcmhqXdeyY0Z5a7rYjZyYIvx8k1Vlj9S1Tt8sK X-Received: by 2002:a63:4e15:: with SMTP id c21mr17961328pgb.50.1546538915822; Thu, 03 Jan 2019 10:08:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546538915; cv=none; d=google.com; s=arc-20160816; b=ueCRnxT8+oKz0XAWZKG/gO1vTdkooR9TcoOT2KbavOufcclwYP0tGj7uv9961AbGwB ILG/d5FzZNH9tBZQSxNT5u8HjuionRlpFb9MfFBYOLPvP2/ZP5F1RVKWYSs9j/dYep6q zqKk8Kk2CbNGN7WdBpDjJ52eVzFQ7loukG2pK/x5Ut+LYVmd7ci799kpQzXOGH3MDbP9 aVZKcziVuwyVpWqr/+IaRxVUAdPyqkSIxNQB5m4UWGYiDqrfo8lvW3FPfxsnYK4XcSJi irL3CDR3e1XtPz2T02dGA3VUD5wAgLv0dqyv5+O7FYhLq4ZmtdzfTGMurIpwlp1u1McC IseA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=ed2gyiJITEoXD5zl9Wq8HS/Fqfy655S8d+kWUf35H2o=; b=0M+EOvxNedSnNNGkD/ysxtuLSqGlSPN7/eRmILgyNF+Fvbc4hq/+pWxMjunSWXBGBy HLknUxyI/XqtF4c8CATCNi5Mk9y/3XcLnHP8/WmMoMQTZ9ENuM8q7sKXI5uu7svb8J1u rMaw+zXH2y3XZv7ki53a7HZBYTC/+Zh3q8RK2tcaYJMjf1vHMJeBjnwCtUoqx/samaxv m0mx/ccK7IGtvd8/b1C2U4WZuWEES1g/u43uAA3Qs/WS9weFUnueF7pAU7pEaUHPjK8y C7nS979mEQG6q1vnptRnGK982wwgz+QXbG/AyGbReuZXlXJfs0+7why0bT5bibtsYIQs Hvyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=JWdYuLuB; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id r81si1862670pfr.164.2019.01.03.10.08.35; Thu, 03 Jan 2019 10:08:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=JWdYuLuB; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3548879C9B; Thu, 3 Jan 2019 18:08:28 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mail.openembedded.org (Postfix) with ESMTP id 6E96A74813 for ; Thu, 3 Jan 2019 18:08:01 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id y4so16300757pgc.12 for ; Thu, 03 Jan 2019 10:08:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cKiuPVTbPoaJtrFSx+aUSdpI+UzMXyqTaFQ9NzMzLUI=; b=JWdYuLuBPsM5kpnfhJ7dTnBG9x5ALGD1Mqm5OGC8K/mDkMCm30Y7Ji26ve5K/GZjrl 50FXUdbB4hoCAoUJ4GxIpeXM9S6yBcHXGvGtKrp6PK8mZpU/2NF9PpMU0KGvk87hZwgK OZoWEwxn/5Nvg6GMCfQkAazXpM1YaqGM5k1OL3dQaH12Jm82UtANJyHotfVEpx5m6pL2 uZvJzTgKG+iB/4GufB1rB2e9tiwaSz0bHDbdb5Mi+7C4TbPGVH+8mimRd1DPPwKuHMdP Yojc+So0r829YxSbsbVg3g9L/xvURVwTu4MHUmQpb4blj5DRt4cQ8wXkjs2S6oR8o+mN LdJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cKiuPVTbPoaJtrFSx+aUSdpI+UzMXyqTaFQ9NzMzLUI=; b=Uy7TgMuNggAm7U73HWYfrNnJnslaUoYztp0bsECkqjuq+B/UscwCcsMiO3cWXR3zPx EcwtbXWCl4LuhcY9njX6S+ZsNDtM1n8EZwQImc3XEAClBWyjGEq7uAUv2bF7u0nfG9QD 6F74najrCYz7MF/0rjy0NN9phXGNMABfeWQSXI0eX5NIm+dK/pfQGJb8uxm3EvJdJoE4 qbuawSOD+wzNMdFLelmOLPBJ2JilfxqyqK2vRgE/j6BcN3gDrqRB3yTwSsE2X85UbQcv ZtET02QmU5eDQR21zEaPZGwfqQOO5PzijpL0QocCpFEFvSConN2cNsUCHlPexi1qTb4i o7xA== X-Gm-Message-State: AJcUukfeiQ2TGObRzwUHGr+JK5E/KyUe8GOuGztWvumPtOc2K9u4HeuP J92+6/xbEpozLY3r67bg/thlBdERPkw= X-Received: by 2002:a63:ac46:: with SMTP id z6mr17903117pgn.162.1546538881693; Thu, 03 Jan 2019 10:08:01 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:877f:9499::6ee7]) by smtp.gmail.com with ESMTPSA id m67sm75487168pfm.73.2019.01.03.10.07.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Jan 2019 10:08:00 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 3 Jan 2019 10:07:51 -0800 Message-Id: <20190103180751.24958-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190103180751.24958-1-raj.khem@gmail.com> References: <20190103180751.24958-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 3/3] sysdig: Upgrade to 0.24.1 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org * License changed to Apache-2.0 upstream as well [1] * Forward port patches to apply on 0.24 * Just build libb64 from internal modules everything else should be provided by OE recipes * Disable luajit on aarch64 and mips64 since luajit on these arches is not available, fall back to liblua Signed-off-by: Khem Raj --- ...usl-backtrace-APIs-are-glibc-specifi.patch | 37 +++++++++---------- ...-libsinsp-Port-to-build-with-lua-5.2.patch | 25 +++++-------- meta-oe/recipes-extended/sysdig/sysdig_git.bb | 34 ++++++++--------- 3 files changed, 45 insertions(+), 51 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch index 7d3f8a19d7..6ba436911a 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch @@ -9,42 +9,41 @@ Signed-off-by: Khem Raj userspace/libsinsp/utils.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) -diff --git a/userspace/libsinsp/utils.cpp b/userspace/libsinsp/utils.cpp -index 8f23f9c..c496a57 100644 --- a/userspace/libsinsp/utils.cpp +++ b/userspace/libsinsp/utils.cpp -@@ -21,7 +21,9 @@ along with sysdig. If not, see . +@@ -22,7 +22,7 @@ limitations under the License. #include #include #include -+#ifdef __GLIBC__ +-#ifndef CYGWING_AGENT ++#if !defined(CYGWING_AGENT) || defined(__GLIBC__) #include -+#endif + #endif #include - #include - #include -@@ -741,7 +743,7 @@ uint64_t sinsp_utils::get_current_time_ns() - return tv.tv_sec * (uint64_t) 1000000000 + tv.tv_usec * 1000; - } +@@ -772,6 +772,7 @@ bool sinsp_utils::glob_match(const char --#ifndef _WIN32 -+#if defined(_WIN32) && defined(__GLIBC__) + #ifndef CYGWING_AGENT + #ifndef _WIN32 ++#ifdef __GLIBC__ void sinsp_utils::bt(void) { static const char start[] = "BACKTRACE ------------"; -diff --git a/userspace/libsinsp/utils.h b/userspace/libsinsp/utils.h -index 600d00b..4ab4650 100644 +@@ -793,6 +794,7 @@ void sinsp_utils::bt(void) + + free(bt_syms); + } ++#endif // Glibc + #endif // _WIN32 + #endif // CYGWING_AGENT + --- a/userspace/libsinsp/utils.h +++ b/userspace/libsinsp/utils.h -@@ -79,7 +79,7 @@ public: +@@ -104,7 +104,7 @@ public: - static uint64_t get_current_time_ns(); + static bool glob_match(const char *pattern, const char *string); -#ifndef _WIN32 +#if not defined(_WIN32) && defined(__GLIBC__) // // Print the call stack // --- -2.6.2 - diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch index 8fec0ca59f..1c71b91fcc 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch +++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-Port-to-build-with-lua-5.2.patch @@ -8,38 +8,36 @@ Signed-off-by: Khem Raj userspace/libsinsp/chisel.cpp | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) -diff --git a/userspace/libsinsp/chisel.cpp b/userspace/libsinsp/chisel.cpp -index 3cfbd8d..2db9348 100644 --- a/userspace/libsinsp/chisel.cpp +++ b/userspace/libsinsp/chisel.cpp -@@ -94,7 +94,7 @@ void lua_stackdump(lua_State *L) +@@ -97,7 +97,7 @@ void lua_stackdump(lua_State *L) // Lua callbacks /////////////////////////////////////////////////////////////////////////////// #ifdef HAS_LUA_CHISELS --const static struct luaL_reg ll_sysdig [] = +-const static struct luaL_reg ll_sysdig [] = +const static struct luaL_Reg ll_sysdig [] = { {"set_filter", &lua_cbacks::set_global_filter}, {"set_snaplen", &lua_cbacks::set_snaplen}, -@@ -120,7 +120,7 @@ const static struct luaL_reg ll_sysdig [] = +@@ -133,7 +133,7 @@ const static struct luaL_reg ll_sysdig [ {NULL,NULL} }; --const static struct luaL_reg ll_chisel [] = +-const static struct luaL_reg ll_chisel [] = +const static struct luaL_Reg ll_chisel [] = { {"request_field", &lua_cbacks::request_field}, {"set_filter", &lua_cbacks::set_filter}, -@@ -131,7 +131,7 @@ const static struct luaL_reg ll_chisel [] = +@@ -145,7 +145,7 @@ const static struct luaL_reg ll_chisel [ {NULL,NULL} }; --const static struct luaL_reg ll_evt [] = +-const static struct luaL_reg ll_evt [] = +const static struct luaL_Reg ll_evt [] = { {"field", &lua_cbacks::field}, {"get_num", &lua_cbacks::get_num}, -@@ -853,10 +853,28 @@ bool sinsp_chisel::parse_view_info(lua_State *ls, OUT chisel_desc* cd) +@@ -959,10 +959,28 @@ bool sinsp_chisel::parse_view_info(lua_S #ifdef HAS_LUA_CHISELS @@ -69,7 +67,7 @@ index 3cfbd8d..2db9348 100644 if(ls == NULL) { return false; -@@ -867,9 +885,9 @@ bool sinsp_chisel::init_lua_chisel(chisel_desc &cd, string const &fpath) +@@ -973,9 +991,9 @@ bool sinsp_chisel::init_lua_chisel(chise // // Load our own lua libs // @@ -82,13 +80,13 @@ index 3cfbd8d..2db9348 100644 // // Add our chisel paths to package.path -@@ -1111,16 +1129,16 @@ void sinsp_chisel::load(string cmdstr) +@@ -1203,16 +1221,16 @@ void sinsp_chisel::load(string cmdstr) // // Open the script // - m_ls = lua_open(); + m_ls = luaL_newstate(); - + luaL_openlibs(m_ls); // @@ -103,6 +101,3 @@ index 3cfbd8d..2db9348 100644 // // Add our chisel paths to package.path --- -2.6.2 - diff --git a/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-oe/recipes-extended/sysdig/sysdig_git.bb index 4f58281f9f..bbe25e8d43 100644 --- a/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -3,39 +3,39 @@ 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" +LIC_FILES_CHKSUM = "file://COPYING;md5=f8fee3d59797546cffab04f3b88b2d44" inherit cmake pkgconfig OECMAKE_GENERATOR = "Unix Makefiles" -DEPENDS = "luajit zlib ncurses" +DEPENDS = "luajit zlib ncurses jsoncpp tbb jq openssl elfutils" +DEPENDS_remove_mips64 = "luajit" +DEPENDS_remove_aarch64 = "luajit" +DEPENDS_append_aarch64 = " lua" +DEPENDS_append_mips64 = " lua" RDEPENDS_${PN} = "bash" -SRC_URI = "git://github.com/draios/sysdig.git;branch=master \ +SRC_URI = "git://github.com/draios/sysdig.git;branch=dev \ file://0001-libsinsp-Port-to-build-with-lua-5.2.patch \ file://0001-Fix-build-with-musl-backtrace-APIs-are-glibc-specifi.patch \ " -SRCREV = "85d16f33a82a17f87ccdbc088749271c71d87013" -PV = "0.1.102+git${SRCPV}" +# v0.24.2 +SRCREV = "aa82b2fb329ea97a8ade31590954ddaa675e1728" +PV = "0.24.2+git${SRCPV}" 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 = "\ + -DUSE_BUNDLED_DEPS=OFF \ + -DBUILD_DRIVER=OFF \ + -DUSE_BUNDLED_B64=ON \ + -DDIR_ETC=${sysconfdir} \ +" FILES_${PN} += " \ ${DIR_ETC}/* \ ${datadir}/zsh/* \ ${prefix}/src/* \ " - -# luajit not supported on Aarch64 -COMPATIBLE_HOST = "^(?!aarch64).*" -