From patchwork Sat Dec 28 08:07:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182489 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp3923330ild; Sat, 28 Dec 2019 00:07:57 -0800 (PST) X-Google-Smtp-Source: APXvYqw/9dxBYnXG704+75TwZQVBdla3qPEMcoH6oR9Tdh5fcpOkadc8lusfLKXuD/Cb46BaiofJ X-Received: by 2002:a17:90b:f0f:: with SMTP id br15mr31126479pjb.138.1577520477214; Sat, 28 Dec 2019 00:07:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577520477; cv=none; d=google.com; s=arc-20160816; b=rHCG0iFWt7YvaGG9N/zv1EVF0P4s3/4IdDgluc9/lfh0haV2gVaSGC6TzJ0Kg+yyv7 UiWwRQf2vnZXoJnxoNX17fosWSE5JERBceViZ06CaR6RkO1gTBwCVUXJWLBQ/djIg48X t4J9o9T8+lH89jO3+dhQ9ih4tmuRdohQLDwQikqzcEZd4lq5pHv/Z1WcINe6HKTk2Ewr fJhjzX0hBosSEcAVJ/nxkVty7LKLCwTyatnGTmntQRrrD0k9STD/VzPWEjMsmyy55OAE i0WFVssugv6R/OCsIi1i20TVNkPIuEos9j2RGRAgbe0kRxPhLK0wcnHMgfpWa8yqg8zD Bl/A== 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:message-id:date:to:from:dkim-signature:delivered-to; bh=Q4bVoQP85/eA8CRnXV5X2om0HSXRWzRl6o08/akoXfc=; b=Xz/4w2ON3ugF9KIA0gXTBzx21SdxqYRNvt2ZO1uungV5uYAe+NvR/kcIGKFutpy+iE I/d+OO8Hfcsewo/gu7qxMPyuNVAsL8Xv9OaDJ6Zk73zKu+IkpSx8Q6PNnhySVZ6zklWu fSz+iYAFDZwzdlK4AW4rqjubaZMVXWZ/dxMCTf+j2okm/WMFCHfDee/JYwKp4+KUZz0A MJpDJPeMtlyju6MhpMHYYbEd+V21Hj21DeCjujH79WaHgyqThCYnfJ6zgNQ+nYRth53I 88PWK7XLHOPc3R8QZweCGymUIw3pwEKEpPuoXoPSYoB9hph1TXC+5CxLSEPkc66pfeTX PuUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sC47Ts+B; 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 a4si14310930pjw.6.2019.12.28.00.07.56; Sat, 28 Dec 2019 00:07:57 -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=sC47Ts+B; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 80E637C7A9; Sat, 28 Dec 2019 08:07:50 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mail.openembedded.org (Postfix) with ESMTP id 29BE56004D for ; Sat, 28 Dec 2019 08:07:48 +0000 (UTC) Received: by mail-pl1-f175.google.com with SMTP id a6so11890010plm.3 for ; Sat, 28 Dec 2019 00:07:49 -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:mime-version :content-transfer-encoding; bh=KlWUqaqD4F3rdHcubW8+/2JXyGikeZchluwTolpoVA4=; b=sC47Ts+BqyiD8PpnaAB9dEDd2cDY7dhNX2MPGRcI35FD932Ufp3/T2NcGy/h0qeE5q 8xa5hjOV24dqIa8irWFMfa6AddfwWGg3XZwIniQcBH7VzALnUlO7yCyLmxCkAKQexZRC v27D3HY7pRi/oFIewGhQyOo4xDa9OcQgMFy92rybwcVnlj+bEMOJAy9Co/uZr13jlPmh esbNDzvQbusH+LuY7MMM5F989dVVcWXW0KYe7UHkn9nfLcyY0Fuk+xgzIl3DRN1TzVmU 8hbf8d3p3LB6zwJm7mXZwgUf9MZr44n2qDQ1lifb0gH+2EkhelTIytwDkqrYMLIAm5Xb JMHA== 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:mime-version :content-transfer-encoding; bh=KlWUqaqD4F3rdHcubW8+/2JXyGikeZchluwTolpoVA4=; b=K7rngkxaDaEEPnP7wqC0Oz0s1xs/lqbF9jqCKqPqo+DPOqLTr/d4mUtYFilJRQoeHm +6WibArBelQbY7m6etNEn7ed5EsOU1oo5xF93E+h8daFiQ3ndFMWUnpQxE+5yxxPgg7n 0ZvSbF89ihD9bunH1OnkbupzP2+9sPWwHsgdRlhEP+jfkyEzneaNPE7e3H6xrTtuR76C 7kXbwY1wZymTeZypBuh23K6eZETjKg7VYGKUl2722q6lgnApg0OjgUewFNB8Df66+u4R zusf+IPfu4zgqf014krFsGkBF8ATQGBLKko0/9ML0JAKARO+byKgDa1+j5Z/O83abFXs d/1A== X-Gm-Message-State: APjAAAW+ByIVficzuS/wqwy/o+F+S/TjH0t2U/bBTCSxr+o8TX/ivsUG k7dWIg6eca9Bl+unwcgGvvSSZXCfIcM= X-Received: by 2002:a17:902:8c91:: with SMTP id t17mr55018488plo.225.1577520468669; Sat, 28 Dec 2019 00:07:48 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::2f83]) by smtp.gmail.com with ESMTPSA id r66sm44135124pfc.74.2019.12.28.00.07.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2019 00:07:48 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 28 Dec 2019 00:07:36 -0800 Message-Id: <20191228080740.63169-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 1/5] jsoncpp: Upgrade to 1.9.2 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 Signed-off-by: Khem Raj --- .../jsoncpp/{jsoncpp_1.8.4.bb => jsoncpp_1.9.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-devtools/jsoncpp/{jsoncpp_1.8.4.bb => jsoncpp_1.9.2.bb} (93%) -- 2.24.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb similarity index 93% rename from meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb rename to meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb index 97fc6c73b2..a88410f2ff 100644 --- a/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.8.4.bb +++ b/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.2.bb @@ -11,7 +11,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b" -SRCREV = "ddabf50f72cf369bf652a95c4d9fe31a1865a781" +SRCREV = "d2e6a971f4544c55b8e3b25cf96db266971b778f" SRC_URI = "git://github.com/open-source-parsers/jsoncpp" S = "${WORKDIR}/git" From patchwork Sat Dec 28 08:07:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182490 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp3923662ild; Sat, 28 Dec 2019 00:08:20 -0800 (PST) X-Google-Smtp-Source: APXvYqzGNQ8prRMOGLKY7Mg9Y1AARKyqWRNr9FQi6oFYc6bzZd0g1zhlkpKrF/iNMRl8Lbsc7o1r X-Received: by 2002:a17:902:bb8d:: with SMTP id m13mr44787266pls.143.1577520500752; Sat, 28 Dec 2019 00:08:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577520500; cv=none; d=google.com; s=arc-20160816; b=G4mL7aS6SKLeNARBEefIY+ZE/OxKMQZeJhbsx6huKeyDJdmTqnTjQF7gqGI8XNZ/uc u1Jqas9PrSLyvPeeJvXOX135zXV86zp51AWQ4lbY77pO1wpoq8aOZh/ftmwOvMTUfdY0 gD6fwm+lc8jV6R/AgZUGkaItlH7HfVa1sjk9ITy4ZH792lziHY2Blw2HcoHBW6dSKd0r Lu+hGNlyCIxDh0QKchAsROz8tK/9F1e+OHdiY6igmQNOpfrHM7w06laFGTtvxXemrF2j Fobr1qb2BsHY0HDaO2Pa8udKqGWQjDSpXEwv5cGjASxlG5336fEDC4O2h53Yp4nVErFQ UcTw== 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 :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=rt2xk/ATRYYFSrqa7Df4FUYL5DuV3STc5B0nW7Qd6QI=; b=byspxRNbhM7+aMD9DxN1SmPNFPbEFCOt1gaA5QJ3ucFH38W4D7mdiPt5xsx8UzXD6w AklW1CW4h9MAN8BnrA2IiOR9c624kU420es26tPNSwcm0Mm90RZFZhekoK8q39AOqhpO cKDAU4gnegHvINxzw+eLybdy3PZ7tRge22puKAGZS+fTgZLhwcF9KuH6TamyNWmv/556 XyUFnvH9mqsyLfGV4txUszminsjUHxzXyQufIGvswAL6XptS6Q0SopnvLg7y9vSzeM2x /G3yxjeNNjGVTn++eNPV5S/cf3aBgDXS1sh7C/D75s1baR1yo4+cb9jdHk9M4PPZ5qfE hatA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Evg06Wv6; 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 b8si32311598pfd.71.2019.12.28.00.08.20; Sat, 28 Dec 2019 00:08:20 -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=Evg06Wv6; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C4DA57C873; Sat, 28 Dec 2019 08:08:17 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by mail.openembedded.org (Postfix) with ESMTP id D62B76004D for ; Sat, 28 Dec 2019 08:07:48 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id x184so15828925pfb.3 for ; Sat, 28 Dec 2019 00:07:50 -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=+RGBaWMGDM8vqP+Twk9VIT+CiLV8vMVB031Rho+zXDw=; b=Evg06Wv6o1B6uWG5cZy2r6Mcj+Dka5TUD1358+AumStSAZVXh8lYtry0Io2BxlVA8u 5Q5MYeNekmmOLg3X5hGJwnG6RVqKqARiX7UtKjGJLYc1m8golMdiPjuDwMQvxmysKl7y OlTlcte7wXuujQBTdDO/4Qh826wWx8vMK80C1+l/4wa24EqyVSYZ/pG6eCAF+5NGWETF O0HnhQeXuQxYb0mNta4nmkC7CM/xTN0wBO/5JFC2mb6DHCkUfzSO9Cz8ZlfWw9h6dIhm 1K0daVhJdyr44LcuMAsBvJ0RjtOR/cwXNlRqca0+KyKygtMDGkS6k2353sa5kf+57tsM VPyA== 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=+RGBaWMGDM8vqP+Twk9VIT+CiLV8vMVB031Rho+zXDw=; b=IiCvVmJsQWwT9I4KZwdmYxaP1NZf9N0oC8d6cw6+0OrnAQR7qrt4bhq/eSgyhkrsGX oU7ChCBybiMw7gbMJKi3LA5cTTuqB3ZhYSLtr6Fi3uOOxQ+o/eekH184k46mLYUAN6Pg 0gafHXLr8/ib4K+kFJOmpAGKjqdAvYCcpkDVe31QuMX6DZS7D5NHQA/BblTviAc+8K1t 18wPKdZws8J5JCVQDJcYj5FAOQcISlksmZGPsbvIdyKk5St6Wgcd1rmbymmGq0A4mULP PZk2F1f+lAGpyU2AZED3/7owJ8GzQlJfz6+/TZvmpNaKqQnGC49yFipKOU1M7FKk7SGi aTaQ== X-Gm-Message-State: APjAAAVrar/2tRIr9ZGpOPO8ZCKS+2ZZnHr1J0l7NVPSsv3lm2wMgNXw vmBhONvz4iICkCPxqppFR3zpAIKVdrY= X-Received: by 2002:a62:a209:: with SMTP id m9mr49547969pff.16.1577520469413; Sat, 28 Dec 2019 00:07:49 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::2f83]) by smtp.gmail.com with ESMTPSA id r66sm44135124pfc.74.2019.12.28.00.07.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2019 00:07:49 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 28 Dec 2019 00:07:37 -0800 Message-Id: <20191228080740.63169-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191228080740.63169-1-raj.khem@gmail.com> References: <20191228080740.63169-1-raj.khem@gmail.com> MIME-Version: 1.0 Cc: Adrian Bunk Subject: [oe] [meta-networking][PATCH V2 2/5] ippool: Fix strncpy -Wformat-truncation warning 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 Signed-off-by: Khem Raj Cc: Adrian Bunk --- .../ippool/ippool/strncpy-truncation.patch | 39 +++++++++++++++++++ .../recipes-daemons/ippool/ippool_1.3.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta-networking/recipes-daemons/ippool/ippool/strncpy-truncation.patch -- 2.24.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/ippool/ippool/strncpy-truncation.patch b/meta-networking/recipes-daemons/ippool/ippool/strncpy-truncation.patch new file mode 100644 index 0000000000..01e1da8703 --- /dev/null +++ b/meta-networking/recipes-daemons/ippool/ippool/strncpy-truncation.patch @@ -0,0 +1,39 @@ +Replace strncpy with memcpy + +since the length of data to +be copied has already been determined with strlen(). Replace strncpy() +with memcpy() to address the warning and optimize the code a little. + +| ippool_config.c:112:2: note: 'snprintf' output between 8 and 55 bytes into a destination of size 48 +| 112 | snprintf(prompt, sizeof(prompt), "ippool-%s", server_name); +| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/cli/cli_readline.c ++++ b/cli/cli_readline.c +@@ -257,10 +257,15 @@ static void cli_rl_display_wrapped_text( + int pos; + int in_ws; + int i; ++ int bufsize = sizeof(text_buf)/sizeof(text_buf[0]); + + if (left_margin == 0) { + left_margin = 3; + } ++ if (left_margin > bufsize) { ++ left_margin = bufsize; ++ } ++ + if (right_margin == 0) { + right_margin = 78;; + } +@@ -271,7 +276,7 @@ static void cli_rl_display_wrapped_text( + /* First copy the text heading to the buffer and add a "-", accounting for + * the specified left margin. + */ +- strncpy(&text_buf[0], text1, left_margin - 3); ++ memcpy(&text_buf[0], text1, left_margin - 3); + for (pos = strlen(text1); pos < left_margin - 3; pos++) { + text_buf[pos] = ' '; + } diff --git a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 6fa46904b3..3554e688ab 100644 --- a/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -26,6 +26,7 @@ SRC_URI = "https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-$ file://0003-cli-Mark-return-of-strtol-as-long-int.patch \ file://0002-link-with-libtirpc.patch \ file://0003-musl-fixes.patch \ + file://strncpy-truncation.patch \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=4c59283b82fc2b166455e0fc23c71c6f" From patchwork Sat Dec 28 08:07:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182491 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp3923730ild; Sat, 28 Dec 2019 00:08:26 -0800 (PST) X-Google-Smtp-Source: APXvYqx5Tpmm48jsKVA1TE7+Ir1YmWaqoApeTvAOGuDGbn424XkA3Bli5Wpf/5/0S5My4YSb86YN X-Received: by 2002:a17:90a:8a0e:: with SMTP id w14mr32084535pjn.51.1577520506686; Sat, 28 Dec 2019 00:08:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577520506; cv=none; d=google.com; s=arc-20160816; b=h4q3mQYmd2VBaB5Uimajf0zFxDM9QZuyjm2evJm1k/KDSxvZ4mx7Ua0F9n5zqxXcb3 elvK1g8g+lzHo5WX5xQJTC8MPbpVkN7Gij5jWsKBmFrTXYNG/KkyTvJeuwFbmulkBd57 oB7xk406iAEvGjNrUn4+IoQa1g2550FavmEMN4aX0HgBAY1lntI8aF//577qd/Ub4G/Z 30IIDjOVwsTWLUa5kEDc98Fb/DCTdlxPqbnPZTBQIWugIE0QValEIC7Fyyu0ro7etna6 rivutOyN9qqTOeB4hJf8SQZxLIDjGef9/+ehhHE9O2R9Yls7Jq6NLLG0ggxti1SAPQ99 +zhQ== 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=y4kXcdNWiyJhRBZz6HY2OwczmYIpd6/nr1xdNhTaikI=; b=aBJO/uaK6pBzdasNF5Mt4IQ2aJEWqfIeNZMhEuWi3LmxCNkgB3bLCWVCH3R2mGSxyP c6Ysq3M2cUMPxgMuZ42SKyZcAkmQTpuR/YKEM4W7lvNpPWDqNG0wJSa/FW+V8opmplvi ZRXdl6LmHguoF/+igFo6tDPK+x1PVqG/0qHyXqqHetm0YXiYLzvLsSI/SDBY2YE4Z+Oh Fv6mHDU99y9yhQqF05NzCqrlK8Zr14uWzfixQ1oSaE27jMV5YDyei/nERp/pyLWS3ZT3 ptB/MdkipKDCSqzs4LskBoYkgTxarLFraM8AODBOgqShcJGsrWk5tG8TsfvY06hZPNz3 BgPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BS2VKazT; 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 q5si32671903pll.103.2019.12.28.00.08.26; Sat, 28 Dec 2019 00:08:26 -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=BS2VKazT; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BE5AB7CDC0; Sat, 28 Dec 2019 08:08:19 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mail.openembedded.org (Postfix) with ESMTP id 599C06025E for ; Sat, 28 Dec 2019 08:07:49 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id p14so15818918pfn.4 for ; Sat, 28 Dec 2019 00:07:50 -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=ZJpXXNOWhkpp95BqV+r2fl+EVIDcrQI+XmQ0cgZJA9o=; b=BS2VKazTewXE65xOHuX3H3M4I3AGAnzvjgegHaSV7OwwrvNSTNSwFdhin2LQK2EIsw TEce723a7pQNXm8fflA4mGZP+eTs4OtVTkk9pS81Q6W4lnxpKjAX7IXKlzc+ehY8b80C fygLxHnvi8lzT6kGov3xd2NuDv/xxtWCPxkUPJRCPWgpoxPYMim4+2HH/RmAJHzmGQFy qaVo+ggsLlQmbjxa1hCD1jowRFEy6SzQLgWeUBwKdhESQ3Gxow/zmW8O1R7Yqi73e9J6 3AZ6peD4/JZHaWLP1hIA6ul7Z8KRbywScuRGh2J8tezTCBxkH4RQEaQF4Q3Dir5H9Gxz 4PJg== 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=ZJpXXNOWhkpp95BqV+r2fl+EVIDcrQI+XmQ0cgZJA9o=; b=TcLSQwm0obIhNMm2mBockZLW1B1Ckr77m8yH1Cmxn3uLCOFE1qIDw4fohMxYASdzp/ V6uqed7Fk11OZ1a30F4IQaZIlanx7YDBVhp2trZG95LLLl8OgCcSQNRf7MOwhkfITN/b nbPAB80o2w+Mm/vpl7xn31fPcPosgKBMKL0eVKYi7V2HgzF2PfDtuwpTsY/DlKyZj0Sv u4fwCyxPulivbqpdzMz3EOuuW3wVfoyCIbY+1zufJYwt3R1c06QAyS61mFn5ZPfjoaxg ugPHdlOP9em94DBz2TKMubLjtAZB9ulAINZGBcuVIV5GkbXQ1d/8PSvIeQLXh98BPDg6 FhXQ== X-Gm-Message-State: APjAAAUk6Wm3h01PLg8HGpbjYl0i/iaoftjHsD34hxvEH3X8dXV9eCkf AoXoSvODb3VHhPOEpI78u4LkIBSp9zU= X-Received: by 2002:a62:f251:: with SMTP id y17mr60467851pfl.204.1577520470065; Sat, 28 Dec 2019 00:07:50 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::2f83]) by smtp.gmail.com with ESMTPSA id r66sm44135124pfc.74.2019.12.28.00.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2019 00:07:49 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 28 Dec 2019 00:07:38 -0800 Message-Id: <20191228080740.63169-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191228080740.63169-1-raj.khem@gmail.com> References: <20191228080740.63169-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 3/5] opensc: Fix misaligned indentation 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 Signed-off-by: Khem Raj --- ...0001-Fix-misleading-code-indentation.patch | 69 +++++++++++++++++++ .../recipes-support/opensc/opensc_0.19.0.bb | 1 + 2 files changed, 70 insertions(+) create mode 100644 meta-oe/recipes-support/opensc/opensc/0001-Fix-misleading-code-indentation.patch -- 2.24.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/opensc/opensc/0001-Fix-misleading-code-indentation.patch b/meta-oe/recipes-support/opensc/opensc/0001-Fix-misleading-code-indentation.patch new file mode 100644 index 0000000000..eb71b9d766 --- /dev/null +++ b/meta-oe/recipes-support/opensc/opensc/0001-Fix-misleading-code-indentation.patch @@ -0,0 +1,69 @@ +From 283578519ec83a8792b026c10322789784d629de Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 27 Dec 2019 11:33:57 -0800 +Subject: [PATCH] Fix misleading code indentation + +Fixes +error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation] + if(cipher) + ^ +../../../git/src/libopensc/card-entersafe.c:369:2: note: previous statement is here + if(sbuf) + ^ +Upstream-Status: Submitted [https://github.com/OpenSC/OpenSC/pull/1894] +Signed-off-by: Khem Raj +--- + src/libopensc/card-entersafe.c | 12 ++++++------ + src/tools/pkcs15-init.c | 4 ++-- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/libopensc/card-entersafe.c b/src/libopensc/card-entersafe.c +index 3e42c11f..abb9fd81 100644 +--- a/src/libopensc/card-entersafe.c ++++ b/src/libopensc/card-entersafe.c +@@ -352,10 +352,10 @@ static int entersafe_transmit_apdu(sc_card_t *card, sc_apdu_t *apdu, + size_t cipher_data_size,mac_data_size; + int blocks; + int r=SC_SUCCESS; +- u8 *sbuf=NULL; +- size_t ssize=0; ++ u8 *sbuf=NULL; ++ size_t ssize=0; + +- SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE); ++ SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE); + + assert(card); + assert(apdu); +@@ -363,10 +363,10 @@ static int entersafe_transmit_apdu(sc_card_t *card, sc_apdu_t *apdu, + if((cipher||mac) && (!key||(keylen!=8 && keylen!=16))) + SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_VERBOSE, SC_ERROR_INVALID_ARGUMENTS); + +- r = sc_apdu_get_octets(card->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW); +- if (r == SC_SUCCESS) ++ r = sc_apdu_get_octets(card->ctx, apdu, &sbuf, &ssize, SC_PROTO_RAW); ++ if (r == SC_SUCCESS) + sc_apdu_log(card->ctx, SC_LOG_DEBUG_VERBOSE, sbuf, ssize, 1); +- if(sbuf) ++ if(sbuf) + free(sbuf); + + if(cipher) +diff --git a/src/tools/pkcs15-init.c b/src/tools/pkcs15-init.c +index 1ce79f45..9a73121c 100644 +--- a/src/tools/pkcs15-init.c ++++ b/src/tools/pkcs15-init.c +@@ -2311,8 +2311,8 @@ do_read_private_key(const char *filename, const char *format, + r = util_getpass(&passphrase, &len, stdin); + if (r < 0 || !passphrase) + return SC_ERROR_INTERNAL; +- r = do_read_pkcs12_private_key(filename, +- passphrase, pk, certs, max_certs); ++ r = do_read_pkcs12_private_key(filename, ++ passphrase, pk, certs, max_certs); + } + } else { + util_error("Error when reading private key. " +-- +2.24.1 + diff --git a/meta-oe/recipes-support/opensc/opensc_0.19.0.bb b/meta-oe/recipes-support/opensc/opensc_0.19.0.bb index 006a1b6b29..0d744e213b 100644 --- a/meta-oe/recipes-support/opensc/opensc_0.19.0.bb +++ b/meta-oe/recipes-support/opensc/opensc_0.19.0.bb @@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" SRCREV = "f1691fc91fc113191c3a8aaf5facd6983334ec47" SRC_URI = "git://github.com/OpenSC/OpenSC \ file://0001-Remove-redundant-logging.patch \ + file://0001-Fix-misleading-code-indentation.patch \ " DEPENDS = "virtual/libiconv openssl" From patchwork Sat Dec 28 08:07:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182492 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp3923799ild; Sat, 28 Dec 2019 00:08:33 -0800 (PST) X-Google-Smtp-Source: APXvYqxU+OxRVuLQdfcffiln7xMu2PvweOJeBZcBcvmoiz3P2vSlbdo6IqrulYUAo1NCIV8qq+Qr X-Received: by 2002:a62:c583:: with SMTP id j125mr61824389pfg.27.1577520513409; Sat, 28 Dec 2019 00:08:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577520513; cv=none; d=google.com; s=arc-20160816; b=VBjE9A7oGNaNZWQgMUNjhXKi/0yDPVTHpTcpCtfMPNS84V2eOU/9DyflSGX0EegYsT PAZmujYw3nvzKGofIZ4l2chAs9k67TXnE61FZdkm78zJYa9v+SYDJ7xKhDA+qKVqnlkF HSPLBIwcQQQkm+qeeICeRy+upP8mOgDorgKZ5NXbBj8VqwFm4czU4xkvf084obvZ5zw2 Y5rf1EC0PbyL7cQalQZCpXb3iJ78xAf+1EmHTvM5sX3/fUZLB3L7ZuB1dG7YFdFi3F2i 2YhUvkkniP6PWs37jm/B/tIqZBpsIfBreLJYEbqDr73+nu21cdBtuOaTpjKUrEZaJnYD YW6w== 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=ssQ2djFHPCFeSMSgMOorwTGVBRYpwux5rrayBXRSTOs=; b=EW26E+rHTwSxsaq3DTNNffOlYmXRvVzCTkbNrejggBquf7sVqQ+COhr5P0WzJjRfTh TTjtXkKxmLO++0cFZiThOxCU1wPte2cWfcQ+O8268xrQyJuNFO+DkwVXb4naBKk4RwdU oqDcHxWird5ImZEnKl67dh/yi4moLvT2GkeHBF+jginEfaxLMskHihEEb5JMSZNxITjO BIEVB+YdAzfL2LZrmY7yw/Qd/GpoD5tQ36ZqaEO+ZBI3r5nC72pWbbb9DXUSCpZd8sRZ 0plxLdpD/SX7dmgpshiiYJybygAlU0HOFWOyL0Wk7cMD9mrt4VcIQfj5m2GLV5FUgSgL MzKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ZgRAd6vB; 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 x3si8672709pll.156.2019.12.28.00.08.33; Sat, 28 Dec 2019 00:08:33 -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=ZgRAd6vB; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E3CDA7CE4E; Sat, 28 Dec 2019 08:08:20 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mail.openembedded.org (Postfix) with ESMTP id 2C33D7C7A9 for ; Sat, 28 Dec 2019 08:07:49 +0000 (UTC) Received: by mail-pg1-f169.google.com with SMTP id q127so15546649pga.4 for ; Sat, 28 Dec 2019 00:07:51 -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=4eTXXCxRp9511xkohVxNlYMUESe+wYkit6IoCmyIjPE=; b=ZgRAd6vB0af0HQ7uaUToRWgQbOfcdfKh+R5WwO3Ge0YLMga1xVEqSBaOi12DkEy8/z bUPX38C5x7xq0Hz2O4SpnZjTqOJyr1Fu5T9jyY/jrJutW2zgmsAgK6FeyvTH88tzYNwo t8wrfvl0XY3EG82Gzq2oXBAth8jMkaWi3P5dDXwfsV6DsfZlhx7JkKEVoh2BdLkxoh99 4YTQeNtL4OcA3kw7rdu8aUDtUiDkWBqkgXYC4sApVHuDHBUYorvRwnKw0Jsbqzgaw5UV EmkFUNc4D4vixgCj+WesjttbWfP6jqBmodo6uJZzKYUAFeJ/mrUg6XwEUIO1d9DXzf+9 hJZw== 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=4eTXXCxRp9511xkohVxNlYMUESe+wYkit6IoCmyIjPE=; b=umMz9GYGg9W4cMuWYeU9lU6R+6qNPnk8ztnlt5HktaXvMNVNUK5rExcdUx3wjrVgIu 1lU4n6oMQ8phztTZz5/GiTGQ1DoLIx1ctgrFX2eSaEZ/8uOU43iN+F/LlgHEjjQNcT7C ZwtveVTOEaOyqVuSbgnUyXlS28hSmOPDHXQZIPougtjjtLP4RwTgkSWnOyFmBvNli0No WEFwdi7BXljp8NcX3JTlTDolzQhwQAXwXlsi2g8Dm4+DuJDGvFWjAVQnt0x9dy+2jC3Y BuWKl/AY+4EfaBjdqwxdKfycHQ+IdUAW1XvtYFwUnAnt0JZyaKUuH5lR9xVwBZGOJf7U VL0A== X-Gm-Message-State: APjAAAVg5LN0WOlaU66OvgP9LF8wvxsSEUSy5WreBsb3CVfeRPhxdkTd F5kJODd5QftqlzYUIteP7eTB3luWzzI= X-Received: by 2002:a63:de4a:: with SMTP id y10mr59524609pgi.367.1577520470709; Sat, 28 Dec 2019 00:07:50 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::2f83]) by smtp.gmail.com with ESMTPSA id r66sm44135124pfc.74.2019.12.28.00.07.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2019 00:07:50 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 28 Dec 2019 00:07:39 -0800 Message-Id: <20191228080740.63169-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191228080740.63169-1-raj.khem@gmail.com> References: <20191228080740.63169-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 4/5] glm: Upgrade to 0.9.9.6 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-Update: Use copying.txt for checksum, no change in licenses as such Fix type conversion warnings Signed-off-by: Khem Raj --- ...t-float-conversion-warnings-with-cla.patch | 158 ++++++++++++++++++ .../glm/{glm_0.9.9.5.bb => glm_0.9.9.6.bb} | 8 +- 2 files changed, 163 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch rename meta-oe/recipes-graphics/glm/{glm_0.9.9.5.bb => glm_0.9.9.6.bb} (66%) -- 2.24.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch b/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch new file mode 100644 index 0000000000..2eb50a5a3a --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch @@ -0,0 +1,158 @@ +From 461861cd2e34294830b121db834c05ff39424f6f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 27 Dec 2019 18:42:51 -0800 +Subject: [PATCH] Fix Wimplicit-int-float-conversion warnings with clang 10+ + +This is a new warning in clang which will be available in clang 10 +onwards + +Fixes +error: implicit conversion from 'const int' to 'float' may lose precision [-Werror,-Wimplicit-int-float-conversion] + +Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/986] +Signed-off-by: Khem Raj +--- + glm/gtx/scalar_multiplication.hpp | 2 +- + test/gtx/gtx_fast_trigonometry.cpp | 32 +++++++++++++++--------------- + 2 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp +index f391f8de..496ba193 100644 +--- a/glm/gtx/scalar_multiplication.hpp ++++ b/glm/gtx/scalar_multiplication.hpp +@@ -54,7 +54,7 @@ namespace glm + template \ + return_type_scalar_multiplication \ + operator/(Vec lh, T const& s){ \ +- return lh *= 1.0f / s; \ ++ return lh *= 1.0f / static_cast(s); \ + } + + GLM_IMPLEMENT_SCAL_MULT(vec2) +diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp +index f3bf17bf..f3c4e957 100644 +--- a/test/gtx/gtx_fast_trigonometry.cpp ++++ b/test/gtx/gtx_fast_trigonometry.cpp +@@ -239,12 +239,12 @@ namespace taylorCos + std::vector Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * i)); ++ Results[i] = fastCosNew(AngleShift + glm::vec4(Begin + Steps * float(i))); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -280,12 +280,12 @@ namespace taylorCos + std::vector Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * i)); ++ Results[i] = taylorCos::fastCosDeterminisctic(AngleShift + glm::vec4(Begin + Steps * float(i))); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -327,12 +327,12 @@ namespace taylorCos + std::vector Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * i)); ++ Results[i] = taylorCos::fastRefCos(AngleShift + glm::vec4(Begin + Steps * float(i))); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -349,12 +349,12 @@ namespace taylorCos + std::vector Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * i)); ++ Results[i] = glm::fastCos(AngleShift + glm::vec4(Begin + Steps * float(i))); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -371,12 +371,12 @@ namespace taylorCos + std::vector Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * i)); ++ Results[i] = glm::cos(AngleShift + glm::vec4(Begin + Steps * float(i))); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -466,12 +466,12 @@ namespace taylor2 + std::vector Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = taylorCosA(AngleShift.x + Begin + Steps * i); ++ Results[i] = taylorCosA(AngleShift.x + Begin + Steps * float(i)); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -488,12 +488,12 @@ namespace taylor2 + std::vector Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = taylorCosB(AngleShift.x + Begin + Steps * i); ++ Results[i] = taylorCosB(AngleShift.x + Begin + Steps * float(i)); + + std::clock_t const TimeStampEnd = std::clock(); + +@@ -510,12 +510,12 @@ namespace taylor2 + std::vector Results; + Results.resize(Samples); + +- float Steps = (End - Begin) / Samples; ++ float Steps = (End - Begin) / float(Samples); + + std::clock_t const TimeStampBegin = std::clock(); + + for(std::size_t i = 0; i < Samples; ++i) +- Results[i] = taylorCosC(AngleShift.x + Begin + Steps * i); ++ Results[i] = taylorCosC(AngleShift.x + Begin + Steps * float(i)); + + std::clock_t const TimeStampEnd = std::clock(); + +-- +2.24.1 + diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.5.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb similarity index 66% rename from meta-oe/recipes-graphics/glm/glm_0.9.9.5.bb rename to meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb index f367e4eae0..817b8392b2 100644 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9.5.bb +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.6.bb @@ -6,13 +6,13 @@ HOMEPAGE = "https://glm.g-truc.net" BUGTRACKER = "https://github.com/g-truc/glm/issues" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://readme.md;beginline=21;endline=22;md5=3075b5727d36f29edccf97b93e72b790" +LIC_FILES_CHKSUM = "file://copying.txt;md5=4a735e33f271f57404fda17e80085411" SRC_URI = " \ git://github.com/g-truc/glm;branch=master \ + file://0001-Fix-Wimplicit-int-float-conversion-warnings-with-cla.patch \ " -# v0.9.9.5 -SRCREV = "d162eee1e6f7c317a09229fe6ceab8ec6ab9a4b4" +SRCREV = "4db8f89aace8f04c839b606e15b39fb8383ec732" S = "${WORKDIR}/git" @@ -21,3 +21,5 @@ inherit cmake RDEPENDS_${PN}-dev = "" BBCLASSEXTEND = "native" + +OECMAKE_GENERATOR = "Unix Makefiles" From patchwork Sat Dec 28 08:07:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182493 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp3923919ild; Sat, 28 Dec 2019 00:08:40 -0800 (PST) X-Google-Smtp-Source: APXvYqx1k5cNiSQE+hfam0KiH5afzqTg7fUUX3h619OlU+8ch1ceJtHPR77ecDMCZqoEsAkvE560 X-Received: by 2002:a17:902:bf49:: with SMTP id u9mr3373871pls.199.1577520520315; Sat, 28 Dec 2019 00:08:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577520520; cv=none; d=google.com; s=arc-20160816; b=NSqp257k8T43BowDfd35iFjc6SNv9POL9UE6REWJyqrQjQvqWrLE4Hg0l0gXl7WhPD d6zZeZHTC67F11ribMv5c8tYjEBslWu0N9lvh/F909ohWd05Tqb2ZD59gXJ8wnjVuvvB 9fINeZxaUt7nIrqVchVMjBWq7J/JOJo5DYLUxXZe3R/CzAuiOGAzPaJ8tw8hraAIwbSL hJE5Nc0mKnBu5VeJ9yaivl9Dr+No6X+lqr2NAdun0OV2i9Phm2IaQVnu4r5mI6ReZK79 YhjUL7BxxtGOgjrWOjDp+wFCL+d1vhklp6l7mPVl+luhr6B4qmuE6mBNpCY3Lepxs0GY kYzg== 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=tYh5VdugRvG9LT1ABm0fRNHJMqIys/2k/ccf6WX+SwA=; b=BqFUmTBLTvJoFs/0Jurm8mDsCEAoktUXpFsUEMyhiz6HyoPnwC7WmlXrdiAwWgEnoA UpJJtE3YT/S1M4sdgx6VcZrkDxOaI55JY58n3q8Eo86CVGlZtKkNPaKXsqxk+ZKfoglU 2T8fl+EGxogSdSnMSdJ/uShgM/UMu1Mld0/VHmhK7evfYazfGXX7StmjfY1ExiwSstDP YSFr5i+Tney4XgfeGzAUe+4xiQEDtBgTt6VYEcV22MDCCi781S58qu6UG47q6zhds/ue mmE4nDWmH7OOeIbXYvMJuTvpJwckOQ+BAlA+OtM0XTjo7W5Vdn4/4KYALJtvMfLpMi9l dMfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mdVZfM5z; 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 q11si32060052pfh.247.2019.12.28.00.08.40; Sat, 28 Dec 2019 00:08:40 -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=mdVZfM5z; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 31C497CECE; Sat, 28 Dec 2019 08:08:22 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mail.openembedded.org (Postfix) with ESMTP id BDD6D7C127 for ; Sat, 28 Dec 2019 08:07:50 +0000 (UTC) Received: by mail-pg1-f174.google.com with SMTP id q127so15546668pga.4 for ; Sat, 28 Dec 2019 00:07:52 -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=JVJoCjq9NYOixFODjICmgQ9/P3lt6sFjcTO3JidNR+Q=; b=mdVZfM5zEaPx0yV96EcZC6lxtio8xOsgeh26BlRgYW1X0aDa3kEy2Ar0NX3yg108Xm jF2Gn8EvHr9wuQeQnaWlvO3xkoB9N82HoYgqKYrfebSkik9FPiPejHQmZEMRn0FYJnal jUAS+5oltSFaGwyAOgCKWGUk78152eaVKbu+VuYpVjoxrQN5akOp9l64o1AiSrURpRwO OIm3U/74OMiaouHPDUJpiAVUl0/s5dt33a6tpIjCNsXI1WaC8V8tfXlMMLYnmmiOVXmr XtcCDA3cL2oxbciW8U7UP61Ko6lN3YkA7rIXnjqug8ti9ssYHsNukD0R9kkq5zEDRc9d E0Ew== 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=JVJoCjq9NYOixFODjICmgQ9/P3lt6sFjcTO3JidNR+Q=; b=dbdASoAG0DKMnKKv97DxejYah/sU4Foe3SDTQ1bsQfuRQtX1XbwcppoGd8Wqe2bZxd Ng5YeYspmD4+sNxI4jHUMDwC/fE1lO+fJrHZgtlhftglrb5Uoh/Cr3rOvNBDiHcZrdjd xFQ6Zc9lkky+Rr6DL2LHzwS0ZF2q8MrxukSFBJDOQEJG6qqv9KkMYFpL+C1LYwB7TMHq KfOP3CRMo29O6RlEfF18s+1d4c2dVcLjU72QmGaehw+zwzjnr04jpFr+tTOyq5aaHUMh b1qdtyYRHj7dTKh5rVmfU+tGiP7+2tH7OOT63ztNHjfsKoeyfUBB2FyX8t6DpD6WHrfO Q37Q== X-Gm-Message-State: APjAAAV+GJkHd0gDB9ms3D6N68U4UymIl7uNYnaSbNmQHToQ9qNrxycb oKN4lkJoScK1OmeGuTkt+HlGoQQEHFQ= X-Received: by 2002:a63:dc0d:: with SMTP id s13mr57139264pgg.129.1577520471373; Sat, 28 Dec 2019 00:07:51 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::2f83]) by smtp.gmail.com with ESMTPSA id r66sm44135124pfc.74.2019.12.28.00.07.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Dec 2019 00:07:51 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 28 Dec 2019 00:07:40 -0800 Message-Id: <20191228080740.63169-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191228080740.63169-1-raj.khem@gmail.com> References: <20191228080740.63169-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 5/5] fluentbit: Upgrade to 1.3.5 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 Sync recipe with the one in sourcecode Record Accessor feature requires Flex and Bison fts dependency is needed on musl Delete cmake_multilib.patch its fixed upstream Mark it systemd-only, since it does not have runtime script for sysvinit Signed-off-by: Khem Raj --- .../fluentbit/fluentbit/cmake_multilib.patch | 18 ------ .../cross-build-init-system-detection.patch | 38 +++++++++++++ .../fluentbit/fluentbit/jemalloc.patch | 16 +++--- .../fluentbit/fluentbit_0.12.19.bb | 30 ---------- .../fluentbit/fluentbit_1.3.5.bb | 56 +++++++++++++++++++ 5 files changed, 101 insertions(+), 57 deletions(-) delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch delete mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb -- 2.24.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/fluentbit/fluentbit/cmake_multilib.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch deleted file mode 100644 index 8fe9f3e703..0000000000 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/cmake_multilib.patch +++ /dev/null @@ -1,18 +0,0 @@ -Use CMAKE_INSTALL_LIBDIR instead of hardcoding lib path - -Helps build on platforms where libpaths are not lib/ but say lib64/ - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -182,7 +182,7 @@ if(NOT FLB_WITHOUT_SHARED_LIB) - PROPERTIES OUTPUT_NAME fluent-bit) - - # Library install routines -- install(TARGETS fluent-bit-shared LIBRARY DESTINATION lib) -+ install(TARGETS fluent-bit-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - # Static Library diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch new file mode 100644 index 0000000000..a185789992 --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/cross-build-init-system-detection.patch @@ -0,0 +1,38 @@ +Define CMake variables to indicate init system for target +incase of cross compile, detecting systemd support based on +host directory structure is not right thing to do + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -317,7 +317,7 @@ if(FLB_BINARY) + install(TARGETS fluent-bit-bin RUNTIME DESTINATION ${FLB_INSTALL_BINDIR}) + + # Detect init system, install upstart, systemd or init.d script +- if(IS_DIRECTORY /lib/systemd/system) ++ if(IS_DIRECTORY /lib/systemd/system OR FLB_SYSTEMD) + set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service") + configure_file( + "${PROJECT_SOURCE_DIR}/init/systemd.in" +@@ -325,7 +325,7 @@ if(FLB_BINARY) + ) + install(FILES ${FLB_SYSTEMD_SCRIPT} DESTINATION /lib/systemd/system) + install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR}) +- elseif(IS_DIRECTORY /usr/share/upstart) ++ elseif(IS_DIRECTORY /usr/share/upstart OR FLB_UPSTART) + set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf") + configure_file( + "${PROJECT_SOURCE_DIR}/init/upstart.in" +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,6 +70,8 @@ option(FLB_RECORD_ACCESSOR "Enable re + option(FLB_SYSTEM_STRPTIME "Use strptime in system libc" Yes) + option(FLB_STATIC_CONF "Build binary using static configuration") + option(FLB_STREAM_PROCESSOR "Enable Stream Processor" Yes) ++option(FLB_SYSTEMD "Enable systemd init system" No) ++option(FLB_UPSTART "Enable upstart init system" No) + option(FLB_CORO_STACK_SIZE "Set coroutine stack size") + + # Metrics: Experimental Feature, disabled by default on 0.12 series diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch index abaf92c052..67b3397a6f 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/jemalloc.patch @@ -3,16 +3,14 @@ Add --with-jemalloc-prefix=je_ so it compiles on musl Signed-off-by: Khem Raj Upstream-Status: Pending -Index: fluent-bit-0.12.1/CMakeLists.txt -=================================================================== ---- fluent-bit-0.12.1.orig/CMakeLists.txt -+++ fluent-bit-0.12.1/CMakeLists.txt -@@ -325,7 +325,7 @@ if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -523,7 +523,7 @@ if(FLB_JEMALLOC AND ${CMAKE_SYSTEM_NAME} # Link to Jemalloc as an external dependency ExternalProject_Add(jemalloc - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc -- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix= -+ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc/configure --with-jemalloc-prefix=je_ ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix= + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc-5.2.1 +- CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc-5.2.1/configure ${AUTOCONF_HOST_OPT} --with-lg-quantum=3 --enable-cc-silence --prefix= ++ CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lib/jemalloc-5.2.1/configure ${AUTOCONF_HOST_OPT} --with-jemalloc-prefix=je_ --with-lg-quantum=3 --enable-cc-silence --prefix= CFLAGS=-std=gnu99\ -Wall\ -pipe\ -g3\ -O3\ -funroll-loops - BUILD_COMMAND ${MAKE} + BUILD_COMMAND $(MAKE) INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/ diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb deleted file mode 100644 index 27b910b8be..0000000000 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_0.12.19.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Fast data collector for Embedded Linux" -HOMEPAGE = "http://fluentbit.io" -BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" - -SRC_URI = "http://fluentbit.io/releases/0.12/fluent-bit-${PV}.tar.gz \ - file://jemalloc.patch \ - file://cmake_multilib.patch \ - " -SRC_URI[md5sum] = "7c8708312ac9122faacf9e2a4751eb34" -SRC_URI[sha256sum] = "23a81087edf0e2c6f2d49411c6a82308afc5224f67bbaa45729c057af62e9241" - -S = "${WORKDIR}/fluent-bit-${PV}" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" - -DEPENDS = "zlib" -INSANE_SKIP_${PN}-dev += "dev-elf" - -inherit cmake systemd - -EXTRA_OECMAKE = "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1" - -# With Ninja it fails with: -# ninja: error: build.ninja:134: bad $-escape (literal $ must be written as $$) -OECMAKE_GENERATOR = "Unix Makefiles" - -SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" - -TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}" diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb new file mode 100644 index 0000000000..4057696edd --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb @@ -0,0 +1,56 @@ +SUMMARY = "Fast Log processor and Forwarder" +DESCRIPTION = "Fluent Bit is a data collector, processor and \ +forwarder for Linux. It supports several input sources and \ +backends (destinations) for your data. \ +" + +HOMEPAGE = "http://fluentbit.io" +BUGTRACKER = "https://github.com/fluent/fluent-bit/issues" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" +SECTION = "net" + +SRC_URI = "http://fluentbit.io/releases/1.3/fluent-bit-${PV}.tar.gz \ + file://jemalloc.patch \ + file://cross-build-init-system-detection.patch \ + " +SRC_URI[md5sum] = "6eae6dfd0a874e5dd270c36e9c68f747" +SRC_URI[sha256sum] = "e037c76c89269c8dc4027a08e442fefd2751b0f1e0f9c38f9a4b12d781a9c789" + +S = "${WORKDIR}/fluent-bit-${PV}" +DEPENDS = "zlib bison-native flex-native" +DEPENDS_append_libc-musl = " fts " + +INSANE_SKIP_${PN}-dev += "dev-elf" + +# Use CMake 'Unix Makefiles' generator +OECMAKE_GENERATOR ?= "Unix Makefiles" + +# Fluent Bit build options +# ======================== + +# Host related setup +EXTRA_OECMAKE += "-DGNU_HOST=${HOST_SYS} -DFLB_ALL=ON -DFLB_TD=1" + +# Disable LuaJIT and filter_lua support +EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off " + +# Disable Library and examples +EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off -DFLB_EXAMPLES=Off " + +EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','',d)}" + +# Kafka Output plugin (disabled by default): note that when +# enabling Kafka output plugin, the backend library librdkafka +# requires 'openssl' as a dependency. +# +# DEPENDS += "openssl " +# EXTRA_OECMAKE += "-DFLB_OUT_KAFKA=On " + +REQUIRED_DISTRO_FEATURES = "systemd" + +inherit cmake systemd features_check + +SYSTEMD_SERVICE_${PN} = "td-agent-bit.service" +TARGET_CC_ARCH_append = " ${SELECTED_OPTIMIZATION}"