From patchwork Mon Nov 4 12:14:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 178395 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp1399170ilf; Mon, 4 Nov 2019 04:15:06 -0800 (PST) X-Google-Smtp-Source: APXvYqwVr6BFRL2Dmws8QjXzxOv9yIHJ7UvG8we/+JwLnHkppbLf/nNr/PpvEi2PWmBBLOM4KJCE X-Received: by 2002:a63:6a86:: with SMTP id f128mr29446124pgc.295.1572869706801; Mon, 04 Nov 2019 04:15:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572869706; cv=none; d=google.com; s=arc-20160816; b=my3L1lhJHyZ6xtq6EqS1RXEyijzvpA0XYUcfLmaNEZdsCx8FNYC08py0SwK80m/OyA u7kXn5SyEnGp3Zy2fUddL01g7BGvl52wsCvl5sHOYzQ0Ejk875KJBxs+h1ojAwdaGo57 Nq/uJVGMk2iHLCA8IOcjBbf/z2XiYUQjs8Jk1o0ouSH91kLKgR59NyfA4nndR+wMZjco xlPHuUhtVsIFIQyYzRWQWFlhweYdJIDyH8nc6EfEkChL4BI4sJDKYrbStuGouPmQ2VJj 72lbeIOb8Xl2CUSzScorT9u2SS4crHmnJCs4sf5DuygnZue5spC2xOw1wDqJ2bIXqUOg nidw== 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=Z+C4dBYQwWpQOUQHPDlGJEzXUbh5/2FqkpHixYvLa2I=; b=kVz/v/WY68X0a0+3KOrTUo231ItsjE2vhuUEVeLlS59C4qKaJ0VKrGM7+HVWyXYBni tAj14cZSAZxMTfwbOLmuONdEmbY/jMpuS9ZiYAJUvrWUBZFUliPR7alewlXRpfwsBPoU 3ne08DSiHCkuNlXnmAblr3TUURIgF8mZB2yS8Es0GYH69Pu1rHL6L6h6tRJHfbqKSipG TBBMSkiInL6tc0p4wK+kV+mshzvH08INJ/e7Dd06BtjF4bAX4eloTrywDxXHs3M3Ebo4 IsEEMirKLbQ9nTGADg7UVyFKd0/zoQGfE6Rx46ovGE6Zr7ctwwTb4iJzawwIAgAbzlDX PVXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=eShnGJdW; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w18si23669177pfq.257.2019.11.04.04.15.06; Mon, 04 Nov 2019 04:15:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=eShnGJdW; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.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 25F487F89C; Mon, 4 Nov 2019 12:15:03 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id B53196D230 for ; Mon, 4 Nov 2019 12:15:00 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id o28so16775555wro.7 for ; Mon, 04 Nov 2019 04:15:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TUmzuLbnw6MoCIFsxoOaEDqA/oDpCGpSwYcjtLHBsNk=; b=eShnGJdWbS/sQUtUKYZOi29pnGdqSgLtP8rdAikkRwOywQv45cvU8ngsO80V+tKtVD VTAn0rB9ltyMWinEavjtwHezlQw24tyJFMWASlvGZNdcvXYDObf3zCbc2RRfmmKPAMrZ DfFl6HGoQGebckIhR225hf9ybY3RAd2MWGg67HCAqBlDLPh/tvKpItaFFdRa1GJMgDJz sphnBDlVEYsd+nNvdr6T2CBKB918nIdVrXOb57xKXG+B18pw29/PIoOo1UY3m92nJFKN OlpP+1ofwgk4INYuoi45rc1r28nwWzSKcWTNz20dmDa7S+ADX+6UJlJUwITNq6/pcL/4 eKSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TUmzuLbnw6MoCIFsxoOaEDqA/oDpCGpSwYcjtLHBsNk=; b=p2ieU+XNOWN/g3EasRvLd3A53vSh5n9augObwBnaeZq05GZD7hemNCP0Ll+UqiCQgO iwQ0pDAxPazMabF45PRdBI5VYTKp/5OvA5o9XyATactoIM5qRsApFVRL6TNjFzWtocDv CXBdhkV+Qf/t+SRo6nwwjh1oIrEBPjJmTACoacKD/fQFMzu5H0wOqT0rNx3WncHqQpFo ZoiiwlWfIXWAq/wgiIaKnPbFFkP8ysr3FLobYVAhcfhGRhIvQM5Lr4U3h2lv1hp4OQKb gWkbCHV13F/3sw6WtN6q6fPx80rD+Cj7du2CbUgbvxre2QbyPVY7f3q/56DH1C4Ibcrf Bocw== X-Gm-Message-State: APjAAAV4UxShGXVceV9ug55piX83yTAsVov/4ZcI34M8Zqf08c9nU3MA JhwrQ6edJ31aEJcnUeh6Xz3X6BnFukk= X-Received: by 2002:adf:e805:: with SMTP id o5mr24706902wrm.223.1572869700895; Mon, 04 Nov 2019 04:15:00 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b3sm15388077wma.13.2019.11.04.04.14.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2019 04:15:00 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 4 Nov 2019 12:14:55 +0000 Message-Id: <20191104121457.22123-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH 1/3] file: fix CVE-2019-18218 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Ross Burton --- .../file/file/CVE-2019-18218.patch | 55 +++++++++++++++++++ meta/recipes-devtools/file/file_5.37.bb | 3 +- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/file/file/CVE-2019-18218.patch -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/file/file/CVE-2019-18218.patch b/meta/recipes-devtools/file/file/CVE-2019-18218.patch new file mode 100644 index 00000000000..3d02c5ad4b1 --- /dev/null +++ b/meta/recipes-devtools/file/file/CVE-2019-18218.patch @@ -0,0 +1,55 @@ +cdf_read_property_info in cdf.c in file through 5.37 does not restrict the +number of CDF_VECTOR elements, which allows a heap-based buffer overflow (4-byte +out-of-bounds write). + +CVE: CVE-2019-18218 +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 46a8443f76cec4b41ec736eca396984c74664f84 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Mon, 26 Aug 2019 14:31:39 +0000 +Subject: [PATCH] Limit the number of elements in a vector (found by oss-fuzz) + +--- + src/cdf.c | 9 ++++----- + src/cdf.h | 1 + + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/cdf.c b/src/cdf.c +index 9d6396742..bb81d6374 100644 +--- a/src/cdf.c ++++ b/src/cdf.c +@@ -1016,8 +1016,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, + goto out; + } + nelements = CDF_GETUINT32(q, 1); +- if (nelements == 0) { +- DPRINTF(("CDF_VECTOR with nelements == 0\n")); ++ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) { ++ DPRINTF(("CDF_VECTOR with nelements == %" ++ SIZE_T_FORMAT "u\n", nelements)); + goto out; + } + slen = 2; +@@ -1060,8 +1061,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, + goto out; + inp += nelem; + } +- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n", +- nelements)); + for (j = 0; j < nelements && i < sh.sh_properties; + j++, i++) + { +diff --git a/src/cdf.h b/src/cdf.h +index 2f7e554b7..05056668f 100644 +--- a/src/cdf.h ++++ b/src/cdf.h +@@ -48,6 +48,7 @@ + typedef int32_t cdf_secid_t; + + #define CDF_LOOP_LIMIT 10000 ++#define CDF_ELEMENT_LIMIT 100000 + + #define CDF_SECID_NULL 0 + #define CDF_SECID_FREE -1 diff --git a/meta/recipes-devtools/file/file_5.37.bb b/meta/recipes-devtools/file/file_5.37.bb index c53a120b840..71801f9d479 100644 --- a/meta/recipes-devtools/file/file_5.37.bb +++ b/meta/recipes-devtools/file/file_5.37.bb @@ -14,7 +14,8 @@ DEPENDS_class-native = "zlib-native" # Blacklist a bogus tag in upstream check UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P(?!6_23).+)" -SRC_URI = "git://github.com/file/file.git" +SRC_URI = "git://github.com/file/file.git \ + file://CVE-2019-18218.patch" SRCREV = "a0d5b0e4e9f97d74a9911e95cedd579852e25398" S = "${WORKDIR}/git" From patchwork Mon Nov 4 12:14:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 178396 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp1399349ilf; Mon, 4 Nov 2019 04:15:14 -0800 (PST) X-Google-Smtp-Source: APXvYqxi3BydLf67zFVkXYnGhgu+5XRI5HyktlVAXEVZuHvhCYKBHltTCGCQp1xAM4AXIl13tU7C X-Received: by 2002:a62:1517:: with SMTP id 23mr30580614pfv.236.1572869714122; Mon, 04 Nov 2019 04:15:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572869714; cv=none; d=google.com; s=arc-20160816; b=SkG0r9M9gMXx6UIiEhl21kIOzVSPYCH28XUBPnk5+PYHu1yz/YsZvKSkTh58cMKI+p okulmt37dPDmG9qne0HnUwyPN8lvM+8TSPqGy7ujYxqT4eTgocdH8d/yZ4ftxUEoTN6x KPdjvFMo8vhB+y8K2zeO2zZbACGFUs4MhpAAQKHzlVc36liYd90w8/tmPePWHiiAmtRl rXh6NH/OOzKEa+vHYO5bjic/oxiVGJ3lXJOcnRYFPkGgOY9qn4fdcdKPtICYMqbgLAEc IuW8C7lq4aGY9h0lE7fEAI4uTo28iXUipCnvvcId0P8D6aP6fDYMhEa+xwj9iUe/I5zW ifjw== 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=HA+4vr6SkJdqnWtJ414XNQrnjDCvwnQnbehdADHPWs8=; b=f5m6Zb0tOUWIsJC2XqTE6CrVrB3OhM97+3ueo6Yu+5G03pl7QEOAgy/LHNN49OF8tI 940RDz5ct5D7dEFMKhWe1okUOEP8BPM0P6Y9y1+QdNrYE7B26p4ziaThXChVzbynhHu1 Tpj//vjFQ6JOfewNXnHg9qJZxTZNli5r+pZn1vu2UdIqPF0EFa4yt+bvvuf1z5FopcG4 viZ2Ani1Es7cQuVrC/HWFzRj3qtgknZ+mgdUOJKDYR8SKbejjf/3ZwxZl0kxT9Oj/Zgj 6pYPvh8Qi0g3Gj5usJ1E4oEATztsV88YZg1Bs/fE2veGTNRjIDkSJ3i1qYP02hToPjL8 RAOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="lb/OD2wg"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 93si22176770plc.110.2019.11.04.04.15.13; Mon, 04 Nov 2019 04:15:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b="lb/OD2wg"; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.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 AA5067F8A0; Mon, 4 Nov 2019 12:15:10 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mail.openembedded.org (Postfix) with ESMTP id E13346D230 for ; Mon, 4 Nov 2019 12:15:01 +0000 (UTC) Received: by mail-wr1-f48.google.com with SMTP id n1so16794901wra.10 for ; Mon, 04 Nov 2019 04:15:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WaUowR7CIBOAqD7BfZvb1JM7oO7YJljynd7INaP02p4=; b=lb/OD2wg/v7JS+W1uiO7lPqq4fua5W/nPIFo/lkUiKh4HJDmZFrMeNMyPKovDMffOE U+RKNULweWJlwdFO2+XAc7hZJwbmQMl39LfJHbCBk0+yo62omQPpcFzv5H6lOjWNe4is EiNk9hExCkMzfdV3QOkJpEDhNi6u2+QxSEWWdRVk4vT7t6nzRped9d2iytPa/UZqjcrg jt1AKzNhjuJVG4GT67xCOhfAzwjxro4d0oWEOsbr4sLA31tvmivFD1RpFpppzhOixsnG Kj0tom8dwBPgbL8BUFgMShB9oE/CR5ufpk39xUL1cJpVPZPFOQVgWqALRryRA/LksX0j mSDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WaUowR7CIBOAqD7BfZvb1JM7oO7YJljynd7INaP02p4=; b=YYWXzr6vhvdzOFE+GWlEf8WunG5ka0e79J37B/20kwg+mupPORLbqrLebkoSSjdY/C giHA9gx8ioSTqRB1eVaIj8U4J1kGAa4u2B9a8wxTwqpoL3IHPvGdUVwmsnRfPRJnqrQW NOGh+y6/ycWEfQZhlPrXhsxPTnmrUEoD5OpTX28aqxViQYXXldkW3Y0UmU1mzNaOvTfB FqF6Y8Zcspj6SHpUxUzhpp4SV8COjpnv89k+zUbIAEvgjVwDFdVfClLJkiO9YKOuVpwr qUFsi2cdHmWzSlU9ZQPqPXiK07QcTWTGkAqADT/JxDa212JUX8sVmni4g/y5z46tGYIZ WWAQ== X-Gm-Message-State: APjAAAWrUfwnd5E5nv/cVMGOAMfB3Wa9omZ0Y2sum7k24+rRgyoGg/8X NUOUKMvwdWKIarWhOl6ahVnEa/WhxFk= X-Received: by 2002:adf:e886:: with SMTP id d6mr1287323wrm.188.1572869701891; Mon, 04 Nov 2019 04:15:01 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b3sm15388077wma.13.2019.11.04.04.15.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2019 04:15:01 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 4 Nov 2019 12:14:56 +0000 Message-Id: <20191104121457.22123-2-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191104121457.22123-1-ross.burton@intel.com> References: <20191104121457.22123-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/3] file: remove redundant upstream check workaround X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This tag has been removed, so we don't need to work around it anymore. Signed-off-by: Ross Burton --- meta/recipes-devtools/file/file_5.37.bb | 3 --- 1 file changed, 3 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/file/file_5.37.bb b/meta/recipes-devtools/file/file_5.37.bb index 71801f9d479..80e8b91058b 100644 --- a/meta/recipes-devtools/file/file_5.37.bb +++ b/meta/recipes-devtools/file/file_5.37.bb @@ -11,9 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd DEPENDS = "zlib file-replacement-native" DEPENDS_class-native = "zlib-native" -# Blacklist a bogus tag in upstream check -UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P(?!6_23).+)" - SRC_URI = "git://github.com/file/file.git \ file://CVE-2019-18218.patch" From patchwork Mon Nov 4 12:14:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 178397 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp1399464ilf; Mon, 4 Nov 2019 04:15:20 -0800 (PST) X-Google-Smtp-Source: APXvYqx6XNtEwjJ83f+RgS7ZwQCc3b718h+cv84M0gcnKBl4ZRErkW7k8tAk65xbYDLrTD7yBnXH X-Received: by 2002:a62:68c1:: with SMTP id d184mr20926364pfc.195.1572869720318; Mon, 04 Nov 2019 04:15:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572869720; cv=none; d=google.com; s=arc-20160816; b=g+I+BrE+7Ff/PaUx2EBResZmdmLQT8bCHAG66iK9anRKLzuMtiWDBLtSNAkK2Mc8XY Ws2ZjJFU/BqjtqKGpDeekjVVUlnhP2SrrzFMSeI5PTPc/dCP3EE54m6huO1TKfjoa9D1 NvQJ6X9aYastiNdfw8v30gwFxfpcRGAduBQy1yi5zaSQo7RIv6dUitoiFLZrfXIM7Ilo XIMqCe9lMXLyiW33sbweNYLOntBX3mOrrfd0R3oumybJG59c829nvFEMEKNyAtOZRDel GJLYfLS0jxvsqUFItDd8drj/zY9j33Ija7YwJfY2OUy7WysMJx9Rqe5n/fjazj+4bglC b7qQ== 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=juqaIgvSQU2SMblj2x6QPk7lmJGY6dPl+O99ojNMShU=; b=llp5NzSR1IgizTMfWHDSqmcX6F+L+5dPs/nQMt1xXgTRUpGnI+75JGUuXrNBesxxQl 5xmeCSRW74NOtLHsghrR6nJr2vL4xeGiRVdr9vL3jS7O5fxyPwES/tKSQ2HI9IzuSlch iSs1GqQHqOasN8YpTQwLyU1lLnWc2gdsRXjrEQzmOy9XNeRWFy8LrievVbM8gvNkM/vj zYhGauq5DEV2hgy/FxyCOpVX3zPO1IXXoGQ+vjUSkOD2mftIntniWbzj/Tp7vb7/s/Vs kY/UMUpDs+41vZzFgvsAgJOZz+Aa7GhCnXq/CNi3qTqdmEX/QB0jQQUPR/CKHbmtaMzG hEUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=UG2+V3yn; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id c21si21979919pgm.567.2019.11.04.04.15.19; Mon, 04 Nov 2019 04:15:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=UG2+V3yn; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.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 E10707F8A7; Mon, 4 Nov 2019 12:15:11 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id 263D37F87B for ; Mon, 4 Nov 2019 12:15:02 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id n1so16794956wra.10 for ; Mon, 04 Nov 2019 04:15:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sJkY+x+G9K5dgSRgoWD7sFFmhdGSWuPryLIIBp5Sou4=; b=UG2+V3ynxhzzAIfWWDq2KgwjuQaZkz7VjY6uorJ1uD3785fmIyED2KKFBVzYy6Uj8V rcTB6M/3BU5v1umiVYSZtzjhdSXgO/eawMabIrZkGvWn58+9ZI2/COqoLQMgmekatpMy HZ2oyIkYbTDpGUspCJHRp+rNaCmo70569fPSG0eT92+loUsilBK1svMfViX6I4Ztk2VP tLJQu6XiO/wMKmp0ENcQr6SjzmL0lpD/rbNnCY+fB20cjcLYiUa8rGt+MkBGQRdENnv5 2Hr6/zlj5ARAb2KVu1OKCfYZhAfgmnk85qZ2z3lGCSX5IsGrXK7bIBBv9QEWwZPCCTKz RTDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sJkY+x+G9K5dgSRgoWD7sFFmhdGSWuPryLIIBp5Sou4=; b=sGNAXDWjNlOUnV5NfqSA7CC68x90//UdYOV80P+m3ale4oV6nUtwZb/KqjzDSuFQz9 4Hwxb4SMElRX4fQWHpOwuV2H7zHC73aAN9i6Br3Db+xItgIxefRjdZdauFKbSY95w/Oe g35bcrdbDZ/xhtbDXMsB2RToK97a+Cg0wxauQav4pKCn3rLHeH/k8acSJOp3jnx34cU7 YI9SIISWmuRCi/ZrXAmvlg+OHOrYa/Eem0q0NjH76Ovdqd2PYORaKKAfQrja4zqX3jW/ CzmgFv6bXqPoRZwWYWY6VyuNptkowcpQZzHtAYLyW1nyS54IxTxfVMf7ZZMx4WbmO6xg 9ZYQ== X-Gm-Message-State: APjAAAVNUHcey4CwThiL/q0+42KroGix7fJU65FbpZS/cnpS2ITLLOQP AhEBuaqDSECeV16aXpNTA3U8GSmH0YQ= X-Received: by 2002:a5d:4649:: with SMTP id j9mr11645318wrs.248.1572869702841; Mon, 04 Nov 2019 04:15:02 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b3sm15388077wma.13.2019.11.04.04.15.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2019 04:15:02 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 4 Nov 2019 12:14:57 +0000 Message-Id: <20191104121457.22123-3-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191104121457.22123-1-ross.burton@intel.com> References: <20191104121457.22123-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 3/3] file: run test suite when building natively X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org As we apply the same patches to native and target builds of file, we can verify that the patches are not breaking by executing the test suite during the build of file-native. Signed-off-by: Ross Burton --- meta/recipes-devtools/file/file_5.37.bb | 4 ++++ 1 file changed, 4 insertions(+) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/file/file_5.37.bb b/meta/recipes-devtools/file/file_5.37.bb index 80e8b91058b..a96ccc0d399 100644 --- a/meta/recipes-devtools/file/file_5.37.bb +++ b/meta/recipes-devtools/file/file_5.37.bb @@ -29,6 +29,10 @@ EXTRA_OEMAKE_append_class-nativesdk = "-e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/ FILES_${PN} += "${datadir}/misc/*.mgc" +do_compile_append_class-native() { + oe_runmake check +} + do_install_append_class-native() { create_cmdline_wrapper ${D}/${bindir}/file \ --magic-file ${datadir}/misc/magic.mgc