mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -10,6 +10,8 @@ newer versions that introduce new warnings.
|
||||
Remove use of -Werror.
|
||||
|
||||
Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
|
||||
[Fabrice: updated for 20.08.00]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
src/Makefile.am | 2 +-
|
||||
@@ -36,11 +38,11 @@ index 52c637dd..d9d73f1c 100644
|
||||
`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
|
||||
|
||||
- -Wall -Werror -Wextra \
|
||||
+ -Wall -Wextra \
|
||||
-Wno-address-of-packed-member \
|
||||
-Wfloat-equal -Wmissing-declarations \
|
||||
-Wno-long-long -Wredundant-decls -Wshadow \
|
||||
diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am
|
||||
index 54de7f44..e129ed16 100644
|
||||
--- a/src/lib/src/Makefile.am
|
||||
@@ -49,11 +51,11 @@ index 54de7f44..e129ed16 100644
|
||||
`pkg-config --silence-errors --cflags json-c` \
|
||||
`pkg-config --cflags glib-2.0 gio-2.0` \
|
||||
-DDATAROOTDIR=\"$(datarootdir)\" \
|
||||
- -Wall -Werror -Wextra
|
||||
+ -Wall -Wextra
|
||||
- -Wall -Werror -Wextra \
|
||||
+ -Wall -Wextra \
|
||||
-Wno-address-of-packed-member
|
||||
|
||||
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
|
||||
|
||||
@@ -2,13 +2,11 @@ config BR2_PACKAGE_FWTS
|
||||
bool "fwts"
|
||||
depends on BR2_i386 || BR2_x86_64 || BR2_aarch64
|
||||
depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
|
||||
depends on BR2_USE_MMU # libglib2
|
||||
depends on BR2_USE_WCHAR # libglib2, libbsd
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libbsd
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_JSON_C
|
||||
select BR2_PACKAGE_LIBBSD
|
||||
help
|
||||
Firmware Test Suite (FWTS) is a test suite that performs
|
||||
@@ -36,7 +34,6 @@ endif
|
||||
comment "fwts needs a glibc toolchain w/ wchar, threads"
|
||||
depends on BR2_i386 || BR2_x86_64 || BR2_aarch64
|
||||
depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS # libbsd
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_USES_GLIBC
|
||||
|
||||
@@ -1,2 +1,5 @@
|
||||
# Hash from: http://fwts.ubuntu.com/release/SHA256SUMS
|
||||
sha256 7fcdcf3acecfb92510fcb2faef3ab0db66f639bf3f068cf77a4e0aebba036f93 fwts-V18.09.00.tar.gz
|
||||
sha256 bfe7993f1dd328b96a90ecfe92df67063df21afe4b4a103e498da6625c7c71b7 fwts-V20.08.00.tar.gz
|
||||
|
||||
# Hash for license file
|
||||
sha256 379eab3c1071a6f5b8acd3632586577ec9c47ef10601b10467e890b8ff8b3842 debian/copyright
|
||||
|
||||
@@ -4,13 +4,14 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FWTS_VERSION = V18.09.00
|
||||
FWTS_VERSION = 20.08.00
|
||||
FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz
|
||||
FWTS_SITE = http://fwts.ubuntu.com/release
|
||||
FWTS_STRIP_COMPONENTS = 0
|
||||
FWTS_LICENSE = GPL-2.0, LGPL-2.1, Custom
|
||||
FWTS_LICENSE_FILES = debian/copyright
|
||||
FWTS_AUTORECONF = YES
|
||||
FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf json-c libglib2 libbsd \
|
||||
FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \
|
||||
$(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \
|
||||
$(if $(BR2_PACKAGE_DTC),dtc)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user