From patchwork Fri Jun 1 04:58:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 137454 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp472870lji; Thu, 31 May 2018 21:58:19 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIzi81KztjtcTy120bVc+66VUS6o7ZExMhUxUrm5jb9AYjyDOf4lpOkCuyaDeOJob9Sd0lW X-Received: by 2002:a17:902:ba97:: with SMTP id k23-v6mr9799766pls.259.1527829099424; Thu, 31 May 2018 21:58:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527829099; cv=none; d=google.com; s=arc-20160816; b=nobKMziJLwqQZGDDrVAsgs8q2kwZrznK5LCxQDlzrlUltRGsMHZO6dyuCa+QdC6P3/ +O3ly53i7X9jGfOC8fOtWB4Ec//ZdbgPnT9PVGOAdJPM3Hu/LnFOOm3fQDpoRWMIMoYO RR3ljp0Soh/+xfTVAaGQK7c/+x1tZGpRKC2wTLTMQ2LKaG6v39Iypqu3zhuG6SALznh0 VIKXTGCpomOFIBmqhbJcXCoAM4JR0l+7Rn+wQJxmq9h+D+6GXfdecFZCsX/CNk8V/Rls oYyjm3KUoQSx1Cw0WWikFSKPLCLZ7cldcewwQ1kpmBbI/qA27SsyQzjNFOpmhTkYtaFD SneQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=2Vqz5aiPDx6mPmTtdPMSDeF9e1LMWZiyAtD9oMOBcVc=; b=ICQPxSB3Ptvnecd0jpda3Pme9tDAc/WlGcQxvAldEMrtmB2zJxrg4Nchbly4a5Mzd0 cfuC/jL4yxjVX+OFzGU8UIcuu0so0ipi4xq2hNv3hdeq9RjZyWWw9WOHmg/fYMwttAVC YY1P+r/Ci9wb30GIbxG0L98ZtdT28xa6AuBpVqBLz4qIj2S6T5rjX0Uej31DP+HnEcIb LJipqF8fXmskIE65QTvPhJy/m9POmOGou4kC8QAIX52zijtBdSnc6RJA+wBN6ZCpxm4W q6IzpQ0Tnq32EDPfjvSZlpJBHsuLYOsvd4aMN3GH5k7/yXhxLfnq844gp3ESCPMhU9ts o6UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eW+EXyfM; 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 r59-v6si38172897plb.314.2018.05.31.21.58.18; Thu, 31 May 2018 21:58:19 -0700 (PDT) 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=eW+EXyfM; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8E39F74F37; Fri, 1 Jun 2018 04:58:15 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f48.google.com (mail-pg0-f48.google.com [74.125.83.48]) by mail.openembedded.org (Postfix) with ESMTP id E00567458B for ; Fri, 1 Jun 2018 04:58:14 +0000 (UTC) Received: by mail-pg0-f48.google.com with SMTP id c9-v6so7879592pgf.5 for ; Thu, 31 May 2018 21:58:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=DdvFypMR/pWZGLoVCcmqHhyimCTD1ktrxQos2+Re9yE=; b=eW+EXyfMFilGJSGHrRNLwyMOjKhz/+cor/TIyajag7SJRT3NbsdjW2+8NX6EzXHReL cKCDKX0UAY+ZpoC/+ECLGlbZ7zqlDmkn6WFnHzhO9bA/cTFYVM34RZk2ldCkgNlaLw0q rM+vpi+bO/OgndeL0Sa5rGsaxhDOlfEtt/opkETWELNF+Nf2okrVAG/IszlYRDmyXFas 7xGh+1IuaV4Klz7VzDrP8rl7upoD4gq5k/cDDsiAL9hirVZU4EOzTCgtFXG2w2TtFyc0 RTOugweJMRKqvIY3dChF916NzW5QZg+kd3ke2z0fV782AudYCYtduAzac9Mb/bmlRcVL moRA== 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; bh=DdvFypMR/pWZGLoVCcmqHhyimCTD1ktrxQos2+Re9yE=; b=IFm9HhR6NlS9UbpPwBybbcA0shyqV8/aRcQT3P4IKLIoiKX8sEeA7w98DXpnztqxvo +UutfJP6lsu5pnEpYVSAqXnxoQvVn5TQ3wGCgO3M67u1Rsne93BSwt9dJmJbVnHdjwI1 embsp1AiCqZSHUMamW0qeMWYODFkinNAFYgoYygDqaig9C0GtCds6AFyos26dDTK+k13 fFE/EIqYW3OsGDFFAnHGeV4YhZCh+IRxM+mzyJG2hikNXQDmWLIt5Qd3bDsI2RjQaqM+ Q6ynyiXlndneNZ+T4W/eFT5Z4Cuz+t0tj48LH+a2tswxw8eZQnrDJt41T4c239bMZVDF 2cYg== X-Gm-Message-State: ALKqPwdQxzzNAJNpyesG0J0SgSERT/UokAGkPQZjM4bqFRTHV+q+peEx UopspPv/LrrOz7aiWqHwGjn5tQ== X-Received: by 2002:a63:a702:: with SMTP id d2-v6mr7833777pgf.246.1527829095140; Thu, 31 May 2018 21:58:15 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id q68-v6sm67909762pfb.182.2018.05.31.21.58.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 21:58:14 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 31 May 2018 21:58:13 -0700 Message-Id: <20180601045815.15819-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [oe] [meta-oe][PATCH 1/3] fwts: Upgrade to V18.05.00 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: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org drop backported patches and fix build with gcc8 Signed-off-by: Khem Raj --- ...d-correct-printf-qualifier-for-off_t.patch | 21 ++++---- ...l.h-instead-of-deprecated-sys-poll.h.patch | 12 ++--- .../fwts/0001-Remove-Werror-from-build.patch | 52 ++++++++++++++++++ ...t-logical-operand-warning-with-clang.patch | 21 ++++---- ...defined-format-for-printing-uint64_t.patch | 53 ------------------- ...-__SWORD_TYPE-if-not-defined-by-libc.patch | 10 ++-- .../fwts/fwts/0003-Undefine-PAGE_SIZE.patch | 10 ++-- ..._t-to-fix-pointer-to-int-cast-issues.patch | 52 +++++++++--------- meta-oe/recipes-test/fwts/fwts_git.bb | 8 +-- 9 files changed, 116 insertions(+), 123 deletions(-) create mode 100644 meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch delete mode 100644 meta-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch -- 2.17.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch b/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch index 192e05f1cb..c2d679aabc 100644 --- a/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch +++ b/meta-oe/recipes-test/fwts/fwts/0001-Add-correct-printf-qualifier-for-off_t.patch @@ -1,18 +1,19 @@ -From 232daf5fca6fb52cced5e810f2601fe1a71b96d8 Mon Sep 17 00:00:00 2001 +From 613e5cfe7751068062cc92f83870e436669fc0a8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 8 Jun 2017 16:49:50 -0700 -Subject: [PATCH 1/3] Add correct printf qualifier for off_t +Subject: [PATCH] Add correct printf qualifier for off_t Signed-off-by: Khem Raj + --- - src/bios/ebda_region/ebda_region.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + src/bios/ebda_region/ebda_region.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) -Index: git/src/bios/ebda_region/ebda_region.c -=================================================================== ---- git.orig/src/bios/ebda_region/ebda_region.c -+++ git/src/bios/ebda_region/ebda_region.c -@@ -83,9 +83,9 @@ static int ebda_test1(fwts_framework *fw +diff --git a/src/bios/ebda_region/ebda_region.c b/src/bios/ebda_region/ebda_region.c +index 16c39357..ad6d635c 100644 +--- a/src/bios/ebda_region/ebda_region.c ++++ b/src/bios/ebda_region/ebda_region.c +@@ -83,9 +83,9 @@ static int ebda_test1(fwts_framework *fw) if ((entry != NULL) && (entry->type == FWTS_MEMORY_MAP_RESERVED || entry->type == FWTS_MEMORY_MAP_ACPI)) { @@ -24,7 +25,7 @@ Index: git/src/bios/ebda_region/ebda_region.c (entry->end_address - entry->start_address) / 1024, memory_map_name, entry->start_address, -@@ -93,8 +93,8 @@ static int ebda_test1(fwts_framework *fw +@@ -93,8 +93,8 @@ static int ebda_test1(fwts_framework *fw) } else fwts_failed(fw, LOG_LEVEL_MEDIUM, "EBDAMappedNotReserved", diff --git a/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch b/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch index 8ad0789361..4baefe4a4c 100644 --- a/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch +++ b/meta-oe/recipes-test/fwts/fwts/0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch @@ -1,18 +1,19 @@ -From 100a107a53d5dc9b0554252ac5dbf2c9330615e9 Mon Sep 17 00:00:00 2001 +From ed988c27efde5355c3ba9d0de8a14a4a40f798cc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 6 Jun 2017 07:25:09 -0700 -Subject: [PATCH 1/3] Include poll.h instead of deprecated sys/poll.h +Subject: [PATCH] Include poll.h instead of deprecated sys/poll.h Upstream-Status: Pending Signed-off-by: Khem Raj + --- src/lib/src/fwts_ipmi.c | 3 ++- src/lib/src/fwts_pipeio.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/src/fwts_ipmi.c b/src/lib/src/fwts_ipmi.c -index cbb27611..70d11cfa 100644 +index a4c8a511..e298969e 100644 --- a/src/lib/src/fwts_ipmi.c +++ b/src/lib/src/fwts_ipmi.c @@ -18,10 +18,11 @@ @@ -29,7 +30,7 @@ index cbb27611..70d11cfa 100644 #include diff --git a/src/lib/src/fwts_pipeio.c b/src/lib/src/fwts_pipeio.c -index fd719640..bdc5b2ea 100644 +index 3b3cfaff..289564d1 100644 --- a/src/lib/src/fwts_pipeio.c +++ b/src/lib/src/fwts_pipeio.c @@ -30,9 +30,9 @@ @@ -43,6 +44,3 @@ index fd719640..bdc5b2ea 100644 #include #include #include --- -2.13.0 - diff --git a/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch b/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch new file mode 100644 index 0000000000..611ccc8fc8 --- /dev/null +++ b/meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch @@ -0,0 +1,52 @@ +From 475979cf5c1af978f4e8409666365ec75b3320ea Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Mon, 21 Aug 2017 10:34:40 +0200 +Subject: [PATCH] Remove -Werror from build + +Upstream-Status: Pending + +--- + src/Makefile.am | 2 +- + src/lib/src/Makefile.am | 2 +- + src/utilities/Makefile.am | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 4daa9e8f..873f23eb 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -14,7 +14,7 @@ AM_CPPFLAGS = \ + `pkg-config --silence-errors --cflags json` \ + `pkg-config --silence-errors --cflags json-c` \ + -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ +- -Wall -Werror -Wextra ++ -Wall -Wextra + + bin_PROGRAMS = fwts + +diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am +index fa232451..082403a2 100644 +--- a/src/lib/src/Makefile.am ++++ b/src/lib/src/Makefile.am +@@ -24,7 +24,7 @@ AM_CPPFLAGS = \ + `pkg-config --silence-errors --cflags json-c` \ + `pkg-config --cflags glib-2.0 gio-2.0` \ + -DDATAROOTDIR=\"$(datarootdir)\" \ +- -Wall -Werror -Wextra ++ -Wall -Wextra + + pkglib_LTLIBRARIES = libfwts.la + +diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am +index aa37de55..4d5297cc 100644 +--- a/src/utilities/Makefile.am ++++ b/src/utilities/Makefile.am +@@ -16,7 +16,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + # + +-AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ ++AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ + `pkg-config --silence-errors --cflags json` \ + `pkg-config --silence-errors --cflags json-c` + diff --git a/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch b/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch index a3cc1ff8e5..ae3665b4d0 100644 --- a/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch +++ b/meta-oe/recipes-test/fwts/fwts/0001-ignore-constant-logical-operand-warning-with-clang.patch @@ -1,9 +1,10 @@ -From 953cff93c85d3cfd5cbcac56e14443dc5f6e5fbd Mon Sep 17 00:00:00 2001 +From 5bd05ad8569880985ddf6d4c06ed927d388c297f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 19 Oct 2016 01:57:16 +0000 Subject: [PATCH] ignore constant-logical-operand warning with clang Signed-off-by: Khem Raj + --- src/dmi/dmicheck/dmicheck.c | 3 +++ src/lib/src/fwts_acpi_tables.c | 5 +++++ @@ -11,10 +12,10 @@ Signed-off-by: Khem Raj 3 files changed, 13 insertions(+) diff --git a/src/dmi/dmicheck/dmicheck.c b/src/dmi/dmicheck/dmicheck.c -index ecd98223..7fca4a64 100644 +index 3cca9db9..60fb758f 100644 --- a/src/dmi/dmicheck/dmicheck.c +++ b/src/dmi/dmicheck/dmicheck.c -@@ -209,6 +209,8 @@ static const char *uuid_patterns[] = { +@@ -211,6 +211,8 @@ static const char *uuid_patterns[] = { "0A0A0A0A-0A0A-0A0A-0A0A-0A0A0A0A0A0A", NULL, }; @@ -23,19 +24,19 @@ index ecd98223..7fca4a64 100644 static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { { "Invalid", FWTS_SMBIOS_CHASSIS_INVALID }, -@@ -245,6 +247,7 @@ static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { - { "Convertible", FWTS_SMBIOS_CHASSIS_CONVERTIBLE }, - { "Detachable", FWTS_SMBIOS_CHASSIS_DETACHABLE }, +@@ -251,6 +253,7 @@ static const fwts_chassis_type_map fwts_dmi_chassis_type[] = { + { "Mini PC", FWTS_SMBIOS_CHASSIS_MINI_PC }, + { "Stick PC", FWTS_SMBIOS_CHASSIS_STICK_PC }, }; +#pragma clang diagnostic pop /* Remapping table from buggy version numbers to correct values */ static const fwts_dmi_version dmi_versions[] = { diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c -index 30b4060e..d5339bf7 100644 +index c7ba59be..bdd224aa 100644 --- a/src/lib/src/fwts_acpi_tables.c +++ b/src/lib/src/fwts_acpi_tables.c -@@ -394,10 +394,14 @@ static int fwts_acpi_handle_fadt( +@@ -393,10 +393,14 @@ static int fwts_acpi_handle_fadt( /* Determine FACS addr and load it. * Will ignore the missing FACS in the hardware-reduced mode. */ @@ -50,7 +51,7 @@ index 30b4060e..d5339bf7 100644 if (result != FWTS_OK) { if ((result == FWTS_NULL_POINTER) && fwts_acpi_is_reduced_hardware(fadt)) { -@@ -416,6 +420,7 @@ static int fwts_acpi_handle_fadt( +@@ -415,6 +419,7 @@ static int fwts_acpi_handle_fadt( return FWTS_ERROR; } return FWTS_OK; @@ -59,7 +60,7 @@ index 30b4060e..d5339bf7 100644 /* diff --git a/src/uefi/uefirtauthvar/uefirtauthvar.c b/src/uefi/uefirtauthvar/uefirtauthvar.c -index cdfd7aa3..001e8cc8 100644 +index c2031741..7a33d19d 100644 --- a/src/uefi/uefirtauthvar/uefirtauthvar.c +++ b/src/uefi/uefirtauthvar/uefirtauthvar.c @@ -142,6 +142,9 @@ static int uefirtauthvar_deinit(fwts_framework *fw) diff --git a/meta-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch b/meta-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch deleted file mode 100644 index 35ce883a2a..0000000000 --- a/meta-oe/recipes-test/fwts/fwts/0002-Add-C99-defined-format-for-printing-uint64_t.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 25f18b9ac37960dc12a3b648a5c866bd56ef2cbe Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 8 Jun 2017 16:50:23 -0700 -Subject: [PATCH 2/3] Add C99 defined format for printing uint64_t - -Signed-off-by: Khem Raj ---- - src/opal/reserv_mem.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/opal/reserv_mem.c b/src/opal/reserv_mem.c -index eeec2947..f0672e05 100644 ---- a/src/opal/reserv_mem.c -+++ b/src/opal/reserv_mem.c -@@ -185,7 +185,7 @@ static int reserv_mem_limits_test(fwts_framework *fw) - regions[j].start = (uint64_t)be64toh(ranges[2 * j]); - regions[j].len = (uint64_t)be64toh(ranges[2 * j + 1]); - fwts_log_info(fw, "Region name %80s" -- " start: 0x%08lx, len: 0x%08lx\n", -+ " start: 0x%08" PRIx64 ", len: 0x%08" PRIx64 "\n", - regions[j].name, regions[j].start, regions[j].len); - } - -@@ -248,7 +248,7 @@ static int reserv_mem_limits_test(fwts_framework *fw) - fwts_failed(fw, LOG_LEVEL_MEDIUM, - "ImageSizeMismatch", - "Mismatch in homer-image size, " -- "expected: 0x%lx, actual: 0x%lx", -+ "expected: 0x%" PRIx64 ", actual: 0x%" PRIx64 "", - configstruct.homer, regions[j].len); - ok = false; - } else -@@ -261,7 +261,7 @@ static int reserv_mem_limits_test(fwts_framework *fw) - fwts_failed(fw, LOG_LEVEL_MEDIUM, - "ImageSizeMismatch", - "Mismatch in slw-image size, " -- "expected: 0x%lx, actual: 0x%lx", -+ "expected: 0x%" PRIx64 ", actual: 0x%" PRIx64 "", - configstruct.slw, regions[j].len); - ok = false; - } else -@@ -274,7 +274,7 @@ static int reserv_mem_limits_test(fwts_framework *fw) - fwts_failed(fw, LOG_LEVEL_MEDIUM, - "ImageSizeMismatch", - "Mismatch in occ-common-area size, " -- "expected: 0x%lx, actual: 0x%lx", -+ "expected: 0x%" PRIx64", actual: 0x%" PRIx64"", - configstruct.occ_common, - regions[j].len); - ok = false; --- -2.13.1 - diff --git a/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch b/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch index 3b83ca57c8..b45e46a3d9 100644 --- a/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch +++ b/meta-oe/recipes-test/fwts/fwts/0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch @@ -1,7 +1,7 @@ -From 0e89127cd02ecd5ea4506b935cb2b59eb94107d2 Mon Sep 17 00:00:00 2001 +From 1112e51d240a206bdcf253878ef1f4963b92da8a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 6 Jun 2017 07:37:20 -0700 -Subject: [PATCH 2/3] Define __SWORD_TYPE if not defined by libc +Subject: [PATCH] Define __SWORD_TYPE if not defined by libc __SWORD_TYPE is internal to glibc, therefore check and define it if needed e.g. on musl @@ -9,12 +9,13 @@ check and define it if needed e.g. on musl Upstream-Status: Pending Signed-off-by: Khem Raj + --- src/lib/src/fwts_uefi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/src/fwts_uefi.c b/src/lib/src/fwts_uefi.c -index 1f9d31fa..2d925f8d 100644 +index 544145fa..460b0b77 100644 --- a/src/lib/src/fwts_uefi.c +++ b/src/lib/src/fwts_uefi.c @@ -59,6 +59,10 @@ typedef struct { @@ -28,6 +29,3 @@ index 1f9d31fa..2d925f8d 100644 /* File system magic numbers */ #define PSTOREFS_MAGIC ((__SWORD_TYPE)0x6165676C) #define EFIVARFS_MAGIC ((__SWORD_TYPE)0xde5e81e4) --- -2.13.0 - diff --git a/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch b/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch index f84fbffd88..1d8c620efa 100644 --- a/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch +++ b/meta-oe/recipes-test/fwts/fwts/0003-Undefine-PAGE_SIZE.patch @@ -1,7 +1,7 @@ -From 0857269d5a053b5b4c31cfa01b6501526b24035f Mon Sep 17 00:00:00 2001 +From 244e9551ab9bbc1dfa91d19cd472ef254a94ae41 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 6 Jun 2017 07:39:28 -0700 -Subject: [PATCH 3/3] Undefine PAGE_SIZE +Subject: [PATCH] Undefine PAGE_SIZE musl defines PAGE_SIZE and build complains of multiple definitions @@ -9,12 +9,13 @@ of multiple definitions Upstream-Status: Pending Signed-off-by: Khem Raj + --- src/lib/src/fwts_acpi_tables.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c -index 1d4fc705..71023ad2 100644 +index bdd224aa..58e982a6 100644 --- a/src/lib/src/fwts_acpi_tables.c +++ b/src/lib/src/fwts_acpi_tables.c @@ -42,6 +42,7 @@ @@ -25,6 +26,3 @@ index 1d4fc705..71023ad2 100644 #define PAGE_SIZE (4096) static fwts_acpi_table_info tables[ACPI_MAX_TABLES]; --- -2.13.0 - diff --git a/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch b/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch index 3cd3fbbc1b..bebbfa4ad1 100644 --- a/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch +++ b/meta-oe/recipes-test/fwts/fwts/0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch @@ -1,13 +1,14 @@ -From d0d76820efe51dd404d381fc4c46544008e757dd Mon Sep 17 00:00:00 2001 +From 1848b8f8b9be500046ca5d632789a068d6151815 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 8 Jun 2017 16:50:59 -0700 -Subject: [PATCH 3/3] use intptr_t to fix pointer-to-int-cast issues +Subject: [PATCH] use intptr_t to fix pointer-to-int-cast issues uintptr_t is guaranteed to be wide enough that converting a void* to uintptr_t and back again will yield the original pointer value Signed-off-by: Khem Raj + --- src/lib/src/fwts_acpi_tables.c | 4 ++-- src/lib/src/fwts_mmap.c | 2 +- @@ -15,19 +16,19 @@ Signed-off-by: Khem Raj 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/src/fwts_acpi_tables.c b/src/lib/src/fwts_acpi_tables.c -index 832f8d66..d0006529 100644 +index 58e982a6..6522032f 100644 --- a/src/lib/src/fwts_acpi_tables.c +++ b/src/lib/src/fwts_acpi_tables.c -@@ -150,7 +150,7 @@ static fwts_acpi_table_rsdp *fwts_acpi_get_rsdp(fwts_framework *fw, void *addr, - fwts_acpi_table_rsdp *rsdp = NULL; - *rsdp_len = 0; +@@ -156,7 +156,7 @@ static fwts_acpi_table_rsdp *fwts_acpi_get_rsdp(fwts_framework *fw, void *addr, + return NULL; + } - if ((mem = fwts_mmap((off_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED) + if ((mem = fwts_mmap((uintptr_t)addr, sizeof(fwts_acpi_table_rsdp))) == FWTS_MAP_FAILED) return NULL; - if (fwts_safe_memread(mem, sizeof(fwts_acpi_table_rsdp)) != FWTS_OK) { -@@ -456,7 +456,7 @@ static int fwts_acpi_load_tables_from_firmware(fwts_framework *fw) + if (fwts_safe_memcpy(rsdp, mem, sizeof(fwts_acpi_table_rsdp)) != FWTS_OK) { +@@ -455,7 +455,7 @@ static int fwts_acpi_load_tables_from_firmware(fwts_framework *fw) if ((rsdp = fwts_acpi_get_rsdp(fw, rsdp_addr, &rsdp_len)) == NULL) return FWTS_ERROR; @@ -37,7 +38,7 @@ index 832f8d66..d0006529 100644 /* Load any tables from XSDT if it's valid */ if (rsdp->xsdt_address) { diff --git a/src/lib/src/fwts_mmap.c b/src/lib/src/fwts_mmap.c -index a09f688e..9fe6329a 100644 +index e28abf87..2180b2cc 100644 --- a/src/lib/src/fwts_mmap.c +++ b/src/lib/src/fwts_mmap.c @@ -81,7 +81,7 @@ int fwts_munmap(void *mem, const size_t size) @@ -50,27 +51,24 @@ index a09f688e..9fe6329a 100644 if (munmap((void *)((uint8_t *)mem - offset), size + offset) < 0) return FWTS_ERROR; diff --git a/src/lib/src/fwts_smbios.c b/src/lib/src/fwts_smbios.c -index 8d0ea39b..63b4bf25 100644 +index e5b3c774..c8134926 100644 --- a/src/lib/src/fwts_smbios.c +++ b/src/lib/src/fwts_smbios.c -@@ -54,7 +54,7 @@ static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry * - if ((addr = fwts_scan_efi_systab("SMBIOS")) != NULL) { +@@ -55,7 +55,7 @@ static void *fwts_smbios_find_entry_uefi(fwts_framework *fw, fwts_smbios_entry * fwts_smbios_entry *mapped_entry; + const size_t size = sizeof(fwts_smbios_entry); -- if ((mapped_entry = fwts_mmap((off_t)addr, sizeof(fwts_smbios_entry))) != FWTS_MAP_FAILED) { -+ if ((mapped_entry = fwts_mmap((uintptr_t)addr, sizeof(fwts_smbios_entry))) != FWTS_MAP_FAILED) { - *entry = *mapped_entry; - (void)fwts_munmap(mapped_entry, sizeof(fwts_smbios_entry)); - *type = FWTS_SMBIOS; -@@ -84,7 +84,7 @@ static void *fwts_smbios30_find_entry_uefi(fwts_framework *fw, fwts_smbios30_ent - if ((addr = fwts_scan_efi_systab("SMBIOS3")) != NULL) { +- if ((mapped_entry = fwts_mmap((off_t)addr, size)) != FWTS_MAP_FAILED) { ++ if ((mapped_entry = fwts_mmap((uintptr_t)addr, size)) != FWTS_MAP_FAILED) { + if (fwts_safe_memcpy(entry, mapped_entry, size) == FWTS_OK) { + (void)fwts_munmap(mapped_entry, size); + *type = FWTS_SMBIOS; +@@ -91,7 +91,7 @@ static void *fwts_smbios30_find_entry_uefi(fwts_framework *fw, fwts_smbios30_ent fwts_smbios30_entry *mapped_entry; + const size_t size = sizeof(fwts_smbios30_entry); -- if ((mapped_entry = fwts_mmap((off_t)addr, sizeof(fwts_smbios30_entry))) != FWTS_MAP_FAILED) { -+ if ((mapped_entry = fwts_mmap((uintptr_t)addr, sizeof(fwts_smbios30_entry))) != FWTS_MAP_FAILED) { - *entry = *mapped_entry; - (void)fwts_munmap(mapped_entry, sizeof(fwts_smbios30_entry)); - return addr; --- -2.13.1 - +- if ((mapped_entry = fwts_mmap((off_t)addr, size)) != FWTS_MAP_FAILED) { ++ if ((mapped_entry = fwts_mmap((uintptr_t)addr, size)) != FWTS_MAP_FAILED) { + if (fwts_safe_memread(mapped_entry, size) == FWTS_OK) { + *entry = *mapped_entry; + (void)fwts_munmap(mapped_entry, size); diff --git a/meta-oe/recipes-test/fwts/fwts_git.bb b/meta-oe/recipes-test/fwts/fwts_git.bb index 87a23af19f..defe31ddff 100644 --- a/meta-oe/recipes-test/fwts/fwts_git.bb +++ b/meta-oe/recipes-test/fwts/fwts_git.bb @@ -5,17 +5,17 @@ HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519" -PV = "17.03.00+git${SRCPV}" +PV = "18.05.00+git${SRCPV}" -SRCREV = "0153ea51cb648b3067a1b327eee6a075b6cfa330" +SRCREV = "b0ec7aa2ef743d113fd8c5e57c0ca3d5edd86f0e" SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \ file://0001-ignore-constant-logical-operand-warning-with-clang.patch \ file://0001-Include-poll.h-instead-of-deprecated-sys-poll.h.patch \ file://0002-Define-__SWORD_TYPE-if-not-defined-by-libc.patch \ file://0003-Undefine-PAGE_SIZE.patch \ file://0001-Add-correct-printf-qualifier-for-off_t.patch \ - file://0002-Add-C99-defined-format-for-printing-uint64_t.patch \ file://0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \ + file://0001-Remove-Werror-from-build.patch \ " S = "${WORKDIR}/git" @@ -25,7 +25,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" DEPENDS = "libpcre json-c glib-2.0 dtc" DEPENDS_append_libc-musl = " libexecinfo" -inherit autotools pkgconfig +inherit autotools bash-completion pkgconfig CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=unknown-pragmas" LDFLAGS_append_libc-musl = " -lexecinfo" From patchwork Fri Jun 1 04:58:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 137455 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp473006lji; Thu, 31 May 2018 21:58:31 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIxrewq8074t8vJWaCc2Sab2NGXWndoxIEU8KshUK/zyn82OrDlk0X9MaA6m/lRRCv4fE8Q X-Received: by 2002:a65:4107:: with SMTP id w7-v6mr7515453pgp.90.1527829111128; Thu, 31 May 2018 21:58:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527829111; cv=none; d=google.com; s=arc-20160816; b=qeLfp83gfVSgAA2yTjYLnBCTqCBANjQIpmrDfXKrnNEVA0fdRXbmDMW1Vwkro+jOjd N+JnBgxqTqFiZe8geiUkdtWRDLnigsa8rjtZjARANSl1HikXWSFKdTuYz2ox33CINgo9 sMjHb/Dhpa8Yeo3ZB+T3gcq8lRHxFziJz15Q5oznTv2Sp5IoDn4/698HLKnKh+ogrsRd FqrNatPWuBR0u7GBfiF3TlTjBXU3X/yMU3GfWtDzvXL+pldw5/rBbKxlima1xbPOHvVO i0gA4cad7SrSHQrLia0+OWkojwxNE44SQOri/F0BJQ6/gD5RnLDc2HoLrr1nU9SAORl+ ha6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=+WunsLo4NkOeXQbFZkUlmjAcrQaBY4VNOVzrJzreEY8=; b=h3L0WoEHk5lX/J9w9uHjhofO9g3MPePuwCX9c8JTKIBZtzRlCE7Lqxtq/daJ5Wb5JK An3+wEy1kF7kypXxoF/wzRLAI3DEOLs5Kcz0wSvGPc5YhgWSzayLRMsapqzJqEJhrGNN tS4PiU1txFDoNM7xueRhAaXwd6ObS0Vmo72Zj3Ii53pveaWfrTnb904Ry/zBSBSnjEGi +XRy/BlVzWlUDw9wqg0HEVkx3xNk/5ttzFTPzRIM/y3XHOapZM+4ehG78tCdMiletG/W 0vcc33PvY/O+XOOWdEDI3AopgXLg6ObVnZUm4Vf/U/1Jp5fU3SC+rOCVFJU7dE/qgb1X NUoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Li3+8ai+; 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 3-v6si38039330plz.337.2018.05.31.21.58.30; Thu, 31 May 2018 21:58:31 -0700 (PDT) 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=Li3+8ai+; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9919274F95; Fri, 1 Jun 2018 04:58:27 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by mail.openembedded.org (Postfix) with ESMTP id 5D8E974F37 for ; Fri, 1 Jun 2018 04:58:15 +0000 (UTC) Received: by mail-pf0-f173.google.com with SMTP id a14-v6so11894524pfi.1 for ; Thu, 31 May 2018 21:58:16 -0700 (PDT) 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; bh=73N0nP5HHIJiWeFdRlf180oqKMgqociaF7yN5zQb2rM=; b=Li3+8ai+BMg5THhroOBaiHdp1mI8LwILUUfey8TBaTKHhlgFF2xNHCeJt3v10KoL7F 99NJ3eY7e08PxgIA1ZR8DoOgFxN+nb1Ij3YNixWwKBgAUPppwU3/GgkE+ETdUw5j4qcH TC0gJSOj4PJrUd10/CMTFwK9yUQGJmrqHb1BqLCq71WnuBL1f21n2XEI2w5aQU/34aTs bZVMWqlKh4DiMmdBo/mHo9Y1hh4PDw3q/4KCp+Y3N1BF+VCZLkXWFVisRCAj24d9RQh9 K8cOcs3X/DMaXlTpb6oHVQRrCzu+nK9IWVHRsyp7KfNlFJppFwOduQq5qjgQZAWQmq/v Hd3A== 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; bh=73N0nP5HHIJiWeFdRlf180oqKMgqociaF7yN5zQb2rM=; b=TfcV8EKDJnUM2YAPwVKopcReYDPAr4eRcYM1o/OCTjo/ZFIMvKyTWZ772V9pl2Dzcp kSGaS3GOoAVHFeqzRbPEJ6WrW8yUcTnEONboNaRCdHLfMyJZCKDvoP5OKcQhRZXypWH5 Y20cXcN2zZiFTOiU1s3d1lRLP02JKQLdg2cjo21mJZKM8/9HkQs3eU3iZY/ZKW+RcVeg UYp7vgzRx4EqbNaeYOT47LodqcVArxJQvPZTowvfdEH1AihhADf9rvu0VKut+ypqdcjx 5SRphrtkyaZjFn5MVSrWSzEwWHBzOW6Iu5kJxqdE2io25f05qV+h7HRWxNZFYMdZz9sd LnpA== X-Gm-Message-State: ALKqPwfeAZ2zXhktWVyw/VIOSJX6bEHRqMj1h0E3mupsOlVzXTQeMVa7 coQG38e4ZbPkeQx6gSllBSL52g== X-Received: by 2002:a63:aa07:: with SMTP id e7-v6mr7658934pgf.331.1527829095925; Thu, 31 May 2018 21:58:15 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id q68-v6sm67909762pfb.182.2018.05.31.21.58.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 21:58:15 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 31 May 2018 21:58:14 -0700 Message-Id: <20180601045815.15819-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180601045815.15819-1-raj.khem@gmail.com> References: <20180601045815.15819-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 2/3] lowpan-tools: Fix build with gcc-8 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: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...tential-string-truncation-in-strncpy.patch | 139 ++++++++++++++++++ .../lowpan-tools/lowpan-tools_git.bb | 1 + 2 files changed, 140 insertions(+) create mode 100644 meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-potential-string-truncation-in-strncpy.patch -- 2.17.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-potential-string-truncation-in-strncpy.patch b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-potential-string-truncation-in-strncpy.patch new file mode 100644 index 0000000000..e621d8f2a8 --- /dev/null +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-potential-string-truncation-in-strncpy.patch @@ -0,0 +1,139 @@ +From 58b6d9a2efe101e5b80fd708e6f84c7ca779ce93 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 May 2018 20:27:43 -0700 +Subject: [PATCH] Fix potential string truncation in strncpy() + +GCC 8 complains about the string truncation during copy + +error: 'strncpy' specified bound 16 equals destination size + +Upstream-Status: Inappropriate [depricated component] + +Signed-off-by: Khem Raj +--- + tests/listen-packet.c | 3 ++- + tests/listen.c | 3 ++- + tests/test2.c | 4 ++-- + tests/test3.c | 3 ++- + tests/test4.c | 3 ++- + tests/test5.c | 3 ++- + tests/test6.c | 3 ++- + tests/test7.c | 3 ++- + 8 files changed, 16 insertions(+), 9 deletions(-) + +diff --git a/tests/listen-packet.c b/tests/listen-packet.c +index e40af81..eae0c71 100644 +--- a/tests/listen-packet.c ++++ b/tests/listen-packet.c +@@ -50,7 +50,8 @@ int main(int argc, char **argv) { + return 1; + } + +- strncpy(req.ifr_name, iface, IF_NAMESIZE); ++ strncpy(req.ifr_name, iface, IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFINDEX, &req); + if (ret < 0) + perror("ioctl: SIOCGIFINDEX"); +diff --git a/tests/listen.c b/tests/listen.c +index 75c320b..5ce1ed9 100644 +--- a/tests/listen.c ++++ b/tests/listen.c +@@ -47,7 +47,8 @@ int main(int argc, char **argv) { + return 1; + } + +- strncpy(req.ifr_name, iface, IFNAMSIZ); ++ strncpy(req.ifr_name, iface, IFNAMSIZ - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFHWADDR, &req); + if (ret < 0) + perror("ioctl: SIOCGIFHWADDR"); +diff --git a/tests/test2.c b/tests/test2.c +index 58eb74b..5d02838 100644 +--- a/tests/test2.c ++++ b/tests/test2.c +@@ -45,8 +45,8 @@ int main(int argc, char **argv) { + perror("socket"); + return 1; + } +- +- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE); ++ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFHWADDR, &req); + if (ret < 0) + perror("ioctl: SIOCGIFHWADDR"); +diff --git a/tests/test3.c b/tests/test3.c +index fb36627..2f50a5a 100644 +--- a/tests/test3.c ++++ b/tests/test3.c +@@ -46,7 +46,8 @@ int main(int argc, char **argv) { + return 1; + } + +- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE); ++ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFHWADDR, &req); + if (ret < 0) + perror("ioctl: SIOCGIFHWADDR"); +diff --git a/tests/test4.c b/tests/test4.c +index 33c274c..8737149 100644 +--- a/tests/test4.c ++++ b/tests/test4.c +@@ -46,7 +46,8 @@ int main(int argc, char **argv) { + return 1; + } + +- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE); ++ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFHWADDR, &req); + if (ret < 0) + perror("ioctl: SIOCGIFHWADDR"); +diff --git a/tests/test5.c b/tests/test5.c +index 4439dfa..28db562 100644 +--- a/tests/test5.c ++++ b/tests/test5.c +@@ -45,7 +45,8 @@ int main(int argc, char **argv) { + return 1; + } + +- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE); ++ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFADDR, &req); + if (ret < 0) { + perror("ioctl: SIOCGIFADDR"); +diff --git a/tests/test6.c b/tests/test6.c +index e375bfb..ce7de59 100644 +--- a/tests/test6.c ++++ b/tests/test6.c +@@ -45,7 +45,8 @@ int main(int argc, char **argv) { + return 1; + } + +- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE); ++ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFADDR, &req); + if (ret < 0) { + perror("ioctl: SIOCGIFADDR"); +diff --git a/tests/test7.c b/tests/test7.c +index e9a5a55..37da22d 100644 +--- a/tests/test7.c ++++ b/tests/test7.c +@@ -58,7 +58,8 @@ int main(int argc, char **argv) { + if (ret) + perror("setsockopt"); + +- strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE); ++ strncpy(req.ifr_name, argv[1] ?: "wpan0", IF_NAMESIZE - 1); ++ req.ifr_name[IF_NAMESIZE - 1] = '\0'; + ret = ioctl(sd, SIOCGIFHWADDR, &req); + if (ret < 0) + perror("ioctl: SIOCGIFHWADDR"); +-- +2.17.1 + diff --git a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index d0fe59c983..b70c43f156 100644 --- a/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -15,6 +15,7 @@ SRC_URI = "git://github.com/linux-wpan/lowpan-tools \ file://0001-src-iz.c-Undef-dprintf-before-redefining.patch \ file://0001-Remove-newline-from-format-line.patch \ file://0001-coordinator-Fix-strncpy-range-warning.patch \ + file://0001-Fix-potential-string-truncation-in-strncpy.patch \ " SRCREV = "1c2d8674cc6f4b1166a066e8822e295c105ae7a2" From patchwork Fri Jun 1 04:58:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 137456 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp473091lji; Thu, 31 May 2018 21:58:38 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKVqETjUdwbJ6TOOzIyLDAGawY6t7h/NBPu9dnsRzw+m+aF6UEBXXrWBfEliNPiyCbquPhe X-Received: by 2002:a65:6119:: with SMTP id z25-v6mr7686014pgu.139.1527829118403; Thu, 31 May 2018 21:58:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527829118; cv=none; d=google.com; s=arc-20160816; b=OudMEf03s92fJwa5jD2saS5d249NXD7rswmd17IOGQ1dEwmsndOU8LV3qDO2AAfbAZ dqap/J/nqJQajWKVJnuGLK8zTlLId/mp//mY4RSGBjnG6Tpou7E1WXXGxyH5Kmsku2Ds EeRUYWZqaH9b4ntpAR9gt3AsTa/Ulz1KtpoYJNfztWBV8LFLCqS9ZivOEgnqZwoLJgyX hlSCJdp3927DjLhudBI/SdCDhGo3q6BW/wMZuBsPuL49ncQBFbEIDtEtbBoFHBq99/JG E68CKuSRMgIe+q8cFbCfaKr+Fn9eiamX+wJccl9Vvp7l2Pdm8ePfQ1rthOKZ/wyjdxnr HdWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=bC5THAfxnZz4+FR1d0zu9Vg/eVU/PlxgPHqlojH7/Ls=; b=Sxu5885i7zARnYn5sOYPzGX/2b/po4JHcF8DcLuedQGBk60U1HWsEkh4TSz+Zr11wp aOZas5cYy1m8CC9KA1kWPx08qCGn0YnF3XznRkch33DaE7QLbsk2dYhuC1xjuPrOqzT0 BuFp7c2aBs8K+E6rzZDqS78YhUBWGxXUAcdd91CTIoxay12K51bu13VOyTjDsYtfDFVw rm8sTbKOa7i7MHjSmwAkJQGmgiD2zO9tpJJwNLfNnEmJUx0LBhHF4h7kD4OaFommSNKC CzoZ2HbElSlu0CyDrK3lnoRFBFCwZxSNZAHheynmqf8qZBkzKZJJd1jzy8RSWFG01nvl mvTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NB2Kua4m; 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 o12-v6si38925856plg.463.2018.05.31.21.58.38; Thu, 31 May 2018 21:58:38 -0700 (PDT) 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=NB2Kua4m; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C486E74FC4; Fri, 1 Jun 2018 04:58:30 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f53.google.com (mail-pg0-f53.google.com [74.125.83.53]) by mail.openembedded.org (Postfix) with ESMTP id 7003774F83 for ; Fri, 1 Jun 2018 04:58:16 +0000 (UTC) Received: by mail-pg0-f53.google.com with SMTP id z1-v6so3771472pgv.12 for ; Thu, 31 May 2018 21:58:17 -0700 (PDT) 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; bh=w/5V5ZDQTNffrWZjAUQcjJegvAdjlCHW/EPKzQphJw0=; b=NB2Kua4mYT9NRnpikW6SCoD8Ls0cgQKdWKnVOebBbPWeT1sw0IKThP8GKgoJb3q1Ap xmoL3ASCfSSbsJlHQVchUDoMCUQdsHeAWx1X1RxRvWW/D+x6/ThfmmYzzLgzdmOh1ZXl UytAxgAywTchFPmjMmB7O8KqX6V5XC5JGfJ1ACcdCqdg0bJSwlvUr2yFzqSABDYUTsuG 1E7FEveyxMns8mGn+AW250e8//MJKEVR608LPY8Q8GsnS8qnuighZVEFb1lh78yQMTjm oK/mlxmLV3F3XL24kt8ugmPnnyYbFgSi8hdCecXkKpNrHHW5TgTgg/9/dY/6sRE3TNuy NBZw== 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; bh=w/5V5ZDQTNffrWZjAUQcjJegvAdjlCHW/EPKzQphJw0=; b=jkuQYq7JNBBbApyFO/WSyF4OVdeXNzn/RFizOxRNZpIheP9oP//SLnjPW39keQRiDO 9gi0+5CiV338MEo5FS+fv8e3bETgZFRguZdHHu94ei0SQPyxp5xnTmxBwjoozwTjM3s5 /i3U55Wdr37eIqPQJZ3k2lHe7MqXfIs84D9nPn//8i5LnBttD1Crz0XEXbVnrqrMpBOX 1cF2DKUYnB7BdDWS7WQu1CTEg800wnAmF+727gQksHrUUjsLyKNmkGfVQNdJvop33k5t jjZbr6Vtwa0eBFYdwsUpuRlCHD8uplMSn2euybWzfcsx5m1ajwP+pb/5UYnTPyPpN+3J GyQg== X-Gm-Message-State: ALKqPweCX2RTeG0J8WCM1V3A3nexnDy4s23diN4gFa0tXvrW1RRoPigz NSic1NP0DLHQCDCV6h630o2eFQ== X-Received: by 2002:a63:bd09:: with SMTP id a9-v6mr7607655pgf.250.1527829097069; Thu, 31 May 2018 21:58:17 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id q68-v6sm67909762pfb.182.2018.05.31.21.58.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 21:58:16 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 31 May 2018 21:58:15 -0700 Message-Id: <20180601045815.15819-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180601045815.15819-1-raj.khem@gmail.com> References: <20180601045815.15819-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 3/3] openocd: Upgrade to latest tip of master 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: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix build with new libusb and gcc8 Signed-off-by: Khem Raj --- ...2-deprecated-libusb_set_debug-with-l.patch | 39 +++++++++++++++++++ .../recipes-devtools/openocd/openocd_git.bb | 5 ++- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch -- 2.17.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/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch b/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch new file mode 100644 index 0000000000..c5b9083dca --- /dev/null +++ b/meta-oe/recipes-devtools/openocd/openocd/0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch @@ -0,0 +1,39 @@ +From b95a996bfb281104b68ec66f32ebb79db519a4a8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 May 2018 21:06:46 -0700 +Subject: [PATCH] Fix libusb-1.0.22 deprecated libusb_set_debug with + libusb_set_option + +libusb_set_debug is deprecated in libusb >= 1.0.22 therefore replace +with equivalent libusb_set_option() API + +see libusb commit for more details + +https://github.com/libusb/libusb/commit/539f22e2fd916558d11ab9a66f10f461c5593168 + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted [http://openocd.zylin.com/#/c/4540/] + src/jtag/drivers/xds110.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/jtag/drivers/xds110.c b/src/jtag/drivers/xds110.c +index 90b699027..9bfe02ea8 100644 +--- a/src/jtag/drivers/xds110.c ++++ b/src/jtag/drivers/xds110.c +@@ -367,8 +367,11 @@ static bool usb_connect(void) + + /* Set libusb to auto detach kernel and disable debug messages */ + (void)libusb_set_auto_detach_kernel_driver(dev, 1); ++#if LIBUSB_API_VERSION >= 0x01000106 ++ libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_NONE); ++#else + libusb_set_debug(ctx, LIBUSB_LOG_LEVEL_NONE); +- ++#endif + /* Claim the debug interface on the XDS110 */ + result = libusb_claim_interface(dev, INTERFACE_DEBUG); + } else { +-- +2.17.1 + diff --git a/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-oe/recipes-devtools/openocd/openocd_git.bb index 67abeede93..84727bf970 100644 --- a/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -5,8 +5,9 @@ DEPENDS = "libusb-compat libftdi" RDEPENDS_${PN} = "libusb1" SRC_URI = "git://repo.or.cz/openocd.git \ -" -SRCREV = "3737dd69e73816d186ba418d7b833462a8041079" + file://0001-Fix-libusb-1.0.22-deprecated-libusb_set_debug-with-l.patch \ + " +SRCREV = "cdf1e826eb23c29de1019ce64125f644f01b0afe" PV = "0.10+gitr${SRCPV}" S = "${WORKDIR}/git"