pool/fwts
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 293598 from home:pluskalm:branches:hardware

Browse Source 
- Update to 15.03.00
- Remove patches fwts-linking.patch and fwts-opensuse.patch
- Add json-c-includes.patch

Please add me as maintainer, I would like to get this package to factory

OBS-URL: https://build.opensuse.org/request/show/293598
OBS-URL: https://build.opensuse.org/package/show/hardware/fwts?expand=0&rev=4
This commit is contained in:
Ismail Dönmez 2015-04-06 10:15:52 +00:00 committed by Git OBS Bridge
parent a0cd44e5f7
commit 0a559a2ea1
7 changed files with 72 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fwts-0.24.13_git201111102129.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e863f2ce93e690cf33d79137c14cfab35542c43f559cb2ab34d2c1c5e3d5d087
size 1081911

3
fwts-V15.03.00.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eba9ce35d64c040baebb9f23bb4231bd7df6e917ba76c279dc2e3264d27b4bf2
size 3092600

52
fwts-linking.patch
View File

@ -1,52 +0,0 @@
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -67,9 +67,7 @@ fwts_SOURCES = main.c \
uefi/csm/csm.c \
uefi/uefidump/uefidump.c
-fwts_LDFLAGS = -ljson -lm
-
-fwts_LDADD = \
+fwts_LDADD = -ljson -lm \
-Llib/src -lfwts \
-L$(top_srcdir)/src/acpica -lfwtsacpica
--- src/acpica/Makefile.am.orig
+++ src/acpica/Makefile.am
@@ -34,7 +34,8 @@ BUILT_SOURCES = osunixxf_munged.c dsopco
CLEANFILES = osunixxf_munged.c
lib_LTLIBRARIES = libfwtsacpica.la
-libfwtsacpica_la_LDFLAGS = -lpthread -version-info 1:0:0
+libfwtsacpica_la_LDFLAGS = -no-undefined -version-info 1:0:0
+libfwtsacpica_la_LIBADD = -lpthread
libfwtsacpica_la_SOURCES = \
fwts_acpica.c \
osunixxf_munged.c \
--- src/acpica/source/compiler/Makefile.am.orig
+++ src/acpica/source/compiler/Makefile.am
@@ -48,7 +48,9 @@ BUILT_SOURCES = aslcompilerparse.c aslco
#
# Just export fwts specific API so we don't clash with core ACPICA library
#
-libfwtsiasl_la_LDFLAGS = -export-symbols-regex "fwts_.*" -lpthread -version-info 1:0:0
+libfwtsiasl_la_LDFLAGS = -no-undefined -export-symbols-regex "fwts_.*" -version-info 1:0:0
+
+libfwtsiasl_la_LIBADD = -lpthread
CLEANFILES = y.output y.tab.c y.tab.h aslcompiler.y.h \
aslcompilerparse.c aslcompilerlex.c \
--- src/lib/src/Makefile.am.orig
+++ src/lib/src/Makefile.am
@@ -5,9 +5,10 @@ AM_CPPFLAGS = \
-Wall
lib_LTLIBRARIES = libfwts.la
-libfwts_la_LDFLAGS = -lpcre -lpthread -ljson -version-info 1:0:0 \
+libfwts_la_LDFLAGS = -no-undefined -version-info 1:0:0 \
-L$(top_srcdir)/src/acpica/source/compiler -lfwtsiasl
+libfwts_la_LIBADD = -lpcre -lpthread -ljson -lfwtsiasl
libfwts_la_SOURCES = \
fwts_acpi.c \
fwts_acpid.c \

88
fwts-opensuse.patch
View File

@ -1,88 +0,0 @@
--- src/lib/include/fwts_binpaths.h.orig
+++ src/lib/include/fwts_binpaths.h
@@ -20,7 +20,7 @@
#ifndef __FWTS_BINPATHS_H__
#define __FWTS_BINPATHS_H__
-#define FWTS_LSPCI_PATH "/usr/bin/lspci"
+#define FWTS_LSPCI_PATH "/sbin/lspci"
#define FWTS_DMIDECODE_PATH "/usr/sbin/dmidecode"
#define FWTS_IASL_PATH "/usr/bin/iasl"
--- src/lib/include/fwts_microcode.h.orig
+++ src/lib/include/fwts_microcode.h
@@ -21,7 +21,7 @@
#define __FWTS_MICROCODE_H__
#define FWTS_MICROCODE_DEVICE "/dev/cpu/microcode"
-#define FWTS_MICROCODE_FILE "/usr/share/misc/intel-microcode.dat"
+#define FWTS_MICROCODE_FILE "/lib/firmware/microcode.dat"
int fwts_update_microcode(fwts_framework *fw, const char *device, const char *filename);
--- configure.ac.orig
+++ configure.ac
@@ -1,5 +1,5 @@
AC_INIT([fwts],[0.1],[colin.king@canonical.com])
- AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+ AM_INIT_AUTOMAKE([-Wall foreign])
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -6,7 +6,7 @@
# but libfwts.so depends on libraries produced by acpica/source/compiler.
SUBDIRS = acpica/source/compiler lib acpica
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/acpica/source/include -Wall -Werror
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib/include -I$(top_srcdir)/src/acpica/source/include -Wall
bin_PROGRAMS = fwts
fwts_SOURCES = main.c \
--- src/lib/src/Makefile.am.orig
+++ src/lib/src/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/include \
-I$(top_srcdir)/src/acpica/source/include \
-I$(top_srcdir)/src/acpica/source/compiler \
- -Wall -Werror
+ -Wall
lib_LTLIBRARIES = libfwts.la
libfwts_la_LDFLAGS = -lpcre -lpthread -ljson -version-info 1:0:0 \
--- src/acpica/source/compiler/aslutils.c.orig
+++ src/acpica/source/compiler/aslutils.c
@@ -528,8 +528,8 @@ UtDisplaySummary (
{
/* Compiler name and version number */
- FlPrintFile (FileId, "%s version %X%s [%s]\n",
- ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, ACPI_WIDTH, __DATE__);
+ FlPrintFile (FileId, "%s version %X%s\n",
+ ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, ACPI_WIDTH);
}
if (Gbl_FileType == ASL_INPUT_TYPE_ASCII_DATA)
--- src/acpica/source/include/acapps.h.orig
+++ src/acpica/source/include/acapps.h
@@ -141,15 +141,15 @@
/* Macros for signons and file headers */
#define ACPI_COMMON_SIGNON(UtilityName) \
- "\n%s\n%s version %8.8X%s [%s]\n%s\n\n", \
+ "\n%s\n%s version %8.8X%s\n%s\n\n", \
ACPICA_NAME, \
- UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
+ UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, \
ACPICA_COPYRIGHT
#define ACPI_COMMON_HEADER(UtilityName, Prefix) \
- "%s%s\n%s%s version %8.8X%s [%s]\n%s%s\n%s\n", \
+ "%s%s\n%s%s version %8.8X%s\n%s%s\n%s\n", \
Prefix, ACPICA_NAME, \
- Prefix, UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, __DATE__, \
+ Prefix, UtilityName, ((UINT32) ACPI_CA_VERSION), ACPI_WIDTH, \
Prefix, ACPICA_COPYRIGHT, \
Prefix

7
fwts.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Mar 29 08:46:16 UTC 2015 - mpluskal@suse.com
- Update to 15.03.00
- Remove patches fwts-linking.patch and fwts-opensuse.patch
- Add json-c-includes.patch
-------------------------------------------------------------------
Wed Feb 1 17:46:43 UTC 2012 - crrodriguez@opensuse.org

66
fwts.spec
View File

@ -1,35 +1,44 @@
#
# spec file for package fwts (Version 0.18.1)
# spec file for package fwts
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: fwts
Version: 0.24.13_git201111102129
Release: 1
License: GPLv2+
Version: 15.03.00
Release: 0
Summary: Firmware Test Suite
Url: http://kernel.ubuntu.com/git?p=cking/fwts/.git
License: GPL-2.0+
Group: Development/Tools/Other
Source: %{name}-%{version}.tar.bz2
Patch: fwts-opensuse.patch
Patch1: fwts-linking.patch
BuildRequires: pciutils-devel
BuildRequires: pcre-devel
BuildRequires: libjson-devel
Url: https://wiki.ubuntu.com/Kernel/Reference/fwts
Source0: http://fwts.ubuntu.com/release/%{name}-V%{version}.tar.gz
Patch0: json-c-includes.patch
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: bison
BuildRequires: flex
BuildRequires: libtool
BuildRequires: automake
BuildRequires: pkgconfig(libpci)
BuildRequires: pkgconfig(libpcre)
BuildRequires: pkgconfig(json)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkg-config
Requires: acpica
Requires: dmidecode
Requires: pciutils
Requires: firmware(microcode.dat)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -41,24 +50,22 @@ will give some form of advice on how to fix issues or workaround firmware
issues.
%prep
%setup -q
%patch
%patch1
%setup -q -c %{name}-%{version}
%patch0 -p1
%build
autoreconf -fiv
export CFLAGS="%optflags -fno-strict-aliasing"
%configure --disable-static
autoreconf -fi
%configure \
--disable-static
make %{?_smp_mflags}
%install
%make_install
find %{buildroot} -type f -name "*.la" -print -delete
find %{buildroot} -type f -name "*.la" -delete -print
install -D -m 0644 data/klog.json %{buildroot}%{_datadir}/%{name}/klog.json
install -D -m 0644 data/syntaxcheck.json %{buildroot}%{_datadir}/%{name}/syntaxcheck.json
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@ -67,10 +74,9 @@ rm -rf %{buildroot}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/klog.json
%{_datadir}/%{name}/syntaxcheck.json
%{_mandir}/man1/fwts*.1.gz
%{_mandir}/man1/*.1.gz
%{_bindir}/fwts
%{_libdir}/libfwts*.so*
%{_bindir}/kernelscan
%{_libdir}/%{name}
%changelog

26
json-c-includes.patch Normal file
View File

@ -0,0 +1,26 @@
Index: fwts-15.03.00/src/lib/include/fwts_json.h
===================================================================
--- fwts-15.03.00.orig/src/lib/include/fwts_json.h
+++ fwts-15.03.00/src/lib/include/fwts_json.h
@@ -20,7 +20,7 @@
#ifndef __FWTS_JSON_H__
#define __FWTS_JSON_H__
-#include <json.h>
+#include <json-c/json.h>
#define __FWTS_JSON_ERR_PTR__ ((json_object*) -1)
/*
Index: fwts-15.03.00/src/utilities/kernelscan.c
===================================================================
--- fwts-15.03.00.orig/src/utilities/kernelscan.c
+++ fwts-15.03.00/src/utilities/kernelscan.c
@@ -25,7 +25,7 @@
#include <unistd.h>
#include <pcre.h>
-#include <json.h>
+#include <json-c/json.h>
#include "config.h"
#define PARSER_OK 0