mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
fwts: Update to 16.09 release
license change is just year change from 2014 to 2016 Fix build with clang while here Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
53a6b833df
commit
2b9328074d
|
|
@ -0,0 +1,81 @@
|
|||
From 953cff93c85d3cfd5cbcac56e14443dc5f6e5fbd Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 19 Oct 2016 01:57:16 +0000
|
||||
Subject: [PATCH] ignore constant-logical-operand warning with clang
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/uefi/uefirtauthvar/uefirtauthvar.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
Index: git/src/uefi/uefirtauthvar/uefirtauthvar.c
|
||||
===================================================================
|
||||
--- git.orig/src/uefi/uefirtauthvar/uefirtauthvar.c
|
||||
+++ git/src/uefi/uefirtauthvar/uefirtauthvar.c
|
||||
@@ -142,6 +142,9 @@ static int uefirtauthvar_deinit(fwts_fra
|
||||
return FWTS_OK;
|
||||
}
|
||||
|
||||
+#pragma clang diagnostic push
|
||||
+#pragma clang diagnostic ignored "-Wconstant-logical-operand"
|
||||
+
|
||||
static int check_fw_support(fwts_framework *fw, uint64_t status)
|
||||
{
|
||||
if ((status == EFI_INVALID_PARAMETER) &&
|
||||
@@ -172,6 +175,8 @@ static int check_fw_support(fwts_framewo
|
||||
return FWTS_OK;
|
||||
}
|
||||
|
||||
+#pragma clang diagnostic pop
|
||||
+
|
||||
/*
|
||||
* Set the created authenticated variable, AuthVarCreate,
|
||||
* and checking the data size and data.
|
||||
Index: git/src/lib/src/fwts_acpi_tables.c
|
||||
===================================================================
|
||||
--- git.orig/src/lib/src/fwts_acpi_tables.c
|
||||
+++ git/src/lib/src/fwts_acpi_tables.c
|
||||
@@ -392,10 +392,14 @@ static int fwts_acpi_handle_fadt(
|
||||
/* Determine FACS addr and load it.
|
||||
* Will ignore the missing FACS in the hardware-reduced mode.
|
||||
*/
|
||||
+#pragma clang diagnostic push
|
||||
+#pragma clang diagnostic ignored "-Waddress-of-packed-member"
|
||||
+
|
||||
result = fwts_acpi_handle_fadt_tables(fw, fadt,
|
||||
"FACS", "FIRMWARE_CTRL", "X_FIRMWARE_CTRL",
|
||||
&fadt->firmware_control, &fadt->x_firmware_ctrl,
|
||||
provenance);
|
||||
+
|
||||
if (result != FWTS_OK) {
|
||||
if ((result == FWTS_NULL_POINTER) &&
|
||||
fwts_acpi_is_reduced_hardware(fadt)) {
|
||||
@@ -414,6 +418,7 @@ static int fwts_acpi_handle_fadt(
|
||||
return FWTS_ERROR;
|
||||
}
|
||||
return FWTS_OK;
|
||||
+#pragma clang diagnostic pop
|
||||
}
|
||||
|
||||
/*
|
||||
Index: git/src/dmi/dmicheck/dmicheck.c
|
||||
===================================================================
|
||||
--- git.orig/src/dmi/dmicheck/dmicheck.c
|
||||
+++ git/src/dmi/dmicheck/dmicheck.c
|
||||
@@ -209,6 +209,8 @@ static const char *uuid_patterns[] = {
|
||||
"0A0A0A0A-0A0A-0A0A-0A0A-0A0A0A0A0A0A",
|
||||
NULL,
|
||||
};
|
||||
+#pragma clang diagnostic push
|
||||
+#pragma clang diagnostic ignored "-Wunneeded-internal-declaration"
|
||||
|
||||
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_
|
||||
{ "Convertible", FWTS_SMBIOS_CHASSIS_CONVERTIBLE },
|
||||
{ "Detachable", FWTS_SMBIOS_CHASSIS_DETACHABLE },
|
||||
};
|
||||
+#pragma clang diagnostic pop
|
||||
|
||||
/* Remapping table from buggy version numbers to correct values */
|
||||
static const fwts_dmi_version dmi_versions[] = {
|
||||
|
|
@ -3,22 +3,29 @@ DESCRIPTION = "The tool fwts comprises of over fifty tests that are designed to
|
|||
HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts"
|
||||
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=deb8af5388e838d133eaa036f4d1496f"
|
||||
LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519"
|
||||
|
||||
PV = "14.12.00"
|
||||
PV = "16.09.00"
|
||||
|
||||
SRCREV = "efc18d16294f492b7f72bba64344b2eed50e6a69"
|
||||
SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git"
|
||||
SRCREV = "15386283ad55e2a5b9366c1f43f4531ef79b01cb"
|
||||
SRC_URI = "git://kernel.ubuntu.com/hwe/fwts.git \
|
||||
file://0001-ignore-constant-logical-operand-warning-with-clang.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS = "libpcre json-c glib-2.0"
|
||||
COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux"
|
||||
|
||||
inherit autotools-brokensep
|
||||
DEPENDS = "libpcre json-c glib-2.0 dtc"
|
||||
|
||||
CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=misleading-indentation"
|
||||
inherit autotools pkgconfig
|
||||
|
||||
CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=unknown-pragmas"
|
||||
|
||||
FILES_${PN} += "${libdir}/fwts/lib*${SOLIBS}"
|
||||
FILES_${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la"
|
||||
FILES_${PN}-staticdev += "${libdir}/fwts/lib*a"
|
||||
FILES_${PN}-dbg += "${libdir}/fwts/.debug"
|
||||
|
||||
TOOLCHAIN = "gcc"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user