fwts: Upgrade to 20.07.00
PATCH 1/1 fwts: Upgrade to 20.07.00
Use B = S since new version uses relative paths in makefiles this version compiles fine with clang too
Signed-off-by Khem Raj <[email protected]>
---
.../fwts/0001-Remove-Werror-from-build.patch | 16 +++++-----------
.../fwts/{fwts_19.06.00.bb => fwts_20.07.00.bb} | 10 +++-------
2 files changed, 8 insertions(+), 18 deletions(-)
rename meta-oe/recipes-test/fwts/{fwts_19.06.00.bb => fwts_20.07.00.bb} (80%)meta-oe/recipes-test/fwts/fwts/0001-Remove-Werror-from-build.patch +5 -11
@@ -11,8 +11,6 @@ Upstream-Status: Pending src/utilities/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/Makefile.am b/src/Makefile.am -index 62c9ba8..435ec23 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ AM_CPPFLAGS = \
@@ -20,15 +18,13 @@ index 62c9ba8..435ec23 100644 `pkg-config --silence-errors --cflags json-c` \ -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ - -Wall -Werror -Wextra \ -+ -Wall -Wextra \ - -Wno-address-of-packed-member - - bin_PROGRAMS = fwts -diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am -index 6bcf9f8..de89bf1 100644 ++ -Wall -Wextra \ + -Wno-address-of-packed-member \ + -Wfloat-equal -Wmissing-declarations \ + -Wno-long-long -Wredundant-decls -Wshadow \ --- a/src/lib/src/Makefile.am +++ b/src/lib/src/Makefile.am -@@ -24,7 +24,7 @@ AM_CPPFLAGS = \ +@@ -25,7 +25,7 @@ AM_CPPFLAGS = \ `pkg-config --silence-errors --cflags json-c` \ `pkg-config --cflags glib-2.0 gio-2.0` \ -DDATAROOTDIR=\"$(datarootdir)\" \
@@ -37,8 +33,6 @@ index 6bcf9f8..de89bf1 100644 -Wno-address-of-packed-member pkglib_LTLIBRARIES = libfwts.la -diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am -index 21f969e..82009a0 100644 --- a/src/utilities/Makefile.am +++ b/src/utilities/Makefile.am @@ -16,7 +16,7 @@
meta-oe/recipes-test/fwts/fwts_20.07.00.bb renamed from meta-oe/recipes-test/fwts/fwts_19.06.00.bb +3 -7
@@ -5,8 +5,7 @@ HOMEPAGE = "https://wiki.ubuntu.com/Kernel/Reference/fwts" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://src/main.c;beginline=1;endline=16;md5=31da590f3e9f3bd34dcdb9e4db568519" -SRCREV = "b0ec7aa2ef743d113fd8c5e57c0ca3d5edd86f0e" -SRC_URI = "http://fwts.ubuntu.com/release/fwts-V19.06.00.tar.gz;subdir=${BPN}-${PV} \ +SRC_URI = "http://fwts.ubuntu.com/release/fwts-V${PV}.tar.gz;subdir=${BP} \ 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 \
@@ -14,15 +13,14 @@ SRC_URI = "http://fwts.ubuntu.com/release/fwts-V19.06.00.tar.gz;subdir=${BPN}-${ file://0003-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \ file://0001-Remove-Werror-from-build.patch \ " -SRC_URI[md5sum] = "012f933329510cc5a71817ede681eee2" -SRC_URI[sha256sum] = "13aa991f12c69f48df368aae5e5d0fbc9136413b4bfe115421bc3216d919f8a2" +SRC_URI[sha256sum] = "4a8e0211b388efbcfcb6530297e9a924d0afa2d6db58e9db2f031129eda6d66f" COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" DEPENDS = "libpcre json-c glib-2.0 dtc bison-native libbsd" DEPENDS_append_libc-musl = " libexecinfo" -inherit autotools bash-completion pkgconfig +inherit autotools-brokensep bash-completion pkgconfig CFLAGS += "-I${STAGING_INCDIR}/json-c -Wno-error=unknown-pragmas" LDFLAGS_append_libc-musl = " -lexecinfo"
@@ -32,5 +30,3 @@ 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" -
Signature · 1 line
2.28.0