pool/acpica
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 598496 from hardware

Browse Source 
- Upgrade to latest version 20180313
- Update patches:
  * acpica-no-compiletime.patch
  * do_not_use_build_date_and_time.patch

OBS-URL: https://build.opensuse.org/request/show/598496
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/acpica?expand=0&rev=55
This commit is contained in:
Dominique Leuenberger
2018-04-25 07:59:41 +00:00
committed by Git OBS Bridge
parent 123ac81822 b67b925867
commit 2f758f8fb6
6 changed files with 235 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
acpica-no-compiletime.patch
View File

@@ -1,22 +1,8 @@
From: <idoenmez@suse.de>
acpica: Do not compile in date or time into binaries
Otherwise the data/time compiled in may cause constant re-compilation
in build service environments
Signed-off-by: Thomas Renninger <trenn@suse.de>
---
source/compiler/aslcompile.c | 9 ++-------
source/compiler/aslutils.c | 4 ++--
source/include/acapps.h | 8 ++++----
3 files changed, 8 insertions(+), 13 deletions(-)
Index: acpica-unix2-20170531/source/compiler/aslcompile.c
Index: acpica-unix-20180313/source/compiler/aslcompile.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslcompile.c 2017-05-31 19:57:50.000000000 +0200
+++ acpica-unix2-20170531/source/compiler/aslcompile.c 2017-06-13 12:06:28.534979117 +0200
@@ -492,8 +492,6 @@ void
--- acpica-unix-20180313.orig/source/compiler/aslcompile.c
+++ acpica-unix-20180313/source/compiler/aslcompile.c
@@ -599,8 +599,6 @@ void
AslCompilerFileHeader (
UINT32 FileId)
{
@@ -25,7 +11,7 @@ Index: acpica-unix2-20170531/source/compiler/aslcompile.c
char *Prefix = "";
@@ -536,12 +534,9 @@ AslCompilerFileHeader (
@@ -643,12 +641,9 @@ AslCompilerFileHeader (
/* Compilation header with timestamp */
@@ -40,18 +26,18 @@ Index: acpica-unix2-20170531/source/compiler/aslcompile.c
Prefix);
switch (FileId)
Index: acpica-unix2-20170531/source/compiler/aslutils.c
Index: acpica-unix-20180313/source/compiler/aslutils.c
===================================================================
--- acpica-unix2-20170531.orig/source/compiler/aslutils.c 2017-05-31 19:57:51.000000000 +0200
+++ acpica-unix2-20170531/source/compiler/aslutils.c 2017-06-13 12:06:28.534979117 +0200
@@ -381,8 +381,8 @@ UtDisplaySummary (
--- acpica-unix-20180313.orig/source/compiler/aslutils.c
+++ acpica-unix-20180313/source/compiler/aslutils.c
@@ -450,8 +450,8 @@ UtDisplaySummary (
{
/* Compiler name and version number */
- FlPrintFile (FileId, "%s version %X [%s]\n\n",
- ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION, __DATE__);
+ FlPrintFile (FileId, "%s version %X\n\n",
+ ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION);
+ ASL_COMPILER_NAME, (UINT32) ACPI_CA_VERSION);
}
/* Summary of main input and output files */

3
acpica-unix-20180313.tar.gz Normal file
View File

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

3
acpica-unix2-20180105.tar.gz
View File

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

8
acpica.changes
View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Apr 18 13:56:47 UTC 2018 - josef.moellers@suse.com
- Upgrade to latest version 20180313
- Update patches:
* acpica-no-compiletime.patch
* do_not_use_build_date_and_time.patch
-------------------------------------------------------------------
Fri Jan 12 17:46:18 UTC 2018 - trenn@suse.de

43
acpica.spec
View File

@@ -16,34 +16,31 @@
#
Name: acpica
Url: http://acpica.org
Version: 20180105
Release: 0
%define src_dir acpica-unix2-%{version}
%define src_dir acpica-unix-%{version}
%define kver %(rpm -q --qf '%%{VERSION}' kernel-source)
BuildRequires: kernel-source >= 2.6.31
%define dmp_ver %{kver}
Name: acpica
Version: 20180313
Release: 0
Summary: This is a set of tools to display and debug your BIOS ACPI tables
License: GPL-2.0
License: GPL-2.0-only
Group: Development/Tools/Debuggers
URL: http://acpica.org
Source: https://acpica.org/sites/acpica/files/%{src_dir}.tar.gz
Patch1: acpica-no-compiletime.patch
Patch2: wmidump_add_she_bang.patch
Patch3: do_not_use_build_date_and_time.patch
Source1: ec_access.c
Source2: acpi_genl.tar.bz2
Source3: acpi_validate
Source4: wmidump.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 x86_64 aarch64 %arm
Patch1: acpica-no-compiletime.patch
Patch2: wmidump_add_she_bang.patch
Patch3: do_not_use_build_date_and_time.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: glibc-devel
BuildRequires: kernel-source >= 2.6.31
BuildRequires: patch
Provides: iasl
ExclusiveArch: %ix86 ia64 x86_64 aarch64 %arm
%description
The included tools share the same code as it is used in the ACPI
@@ -60,7 +57,7 @@ Language). This AML is suitable for inclusion as a DSDT in system
firmware. It also can disassemble AML, for debugging purposes.
%prep
%setup -n %{src_dir} -a 2 -a 4
%setup -q -n %{src_dir} -a 2 -a 4
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -68,7 +65,7 @@ mkdir acpidump-%{dmp_ver}
cd acpidump-%{dmp_ver}
# acpitools (acpidump) from kernel sources:
# copy necessary files from kernel-source since we need to modify them
(cd /usr/src/linux ; tar -cf - COPYING CREDITS README tools include scripts Kbuild Makefile drivers/acpi lib) | tar -xf -
(cd %{_prefix}/src/linux ; tar -cf - COPYING CREDITS README tools include scripts Kbuild Makefile drivers/acpi lib) | tar -xf -
%build
cc %{SOURCE1} %{optflags} -o ec_access
@@ -82,19 +79,19 @@ fi
make %{?_smp_mflags} EXTRA_CFLAGS="%{optflags} -fno-strict-aliasing" prefix=%{_prefix} all
%install
install -Dm 755 %{SOURCE3} %{buildroot}/usr/bin/acpi_validate
install -Dm 755 ec_access %{buildroot}/usr/sbin/ec_access
install -Dm 755 %{SOURCE3} %{buildroot}%{_bindir}/acpi_validate
install -Dm 755 ec_access %{buildroot}%{_sbindir}/ec_access
install -Dm 755 wmidump/wmidump %{buildroot}/usr/bin/wmidump
install -Dm 755 wmidump/wmixtract.py %{buildroot}/usr/bin/wmixtract
install -Dm 755 wmidump/wmidump %{buildroot}%{_bindir}/wmidump
install -Dm 755 wmidump/wmixtract.py %{buildroot}%{_bindir}/wmixtract
install -Dm 644 wmidump/README %{buildroot}/%{_docdir}/%{name}/README_wmidump
install -Dm 755 acpi_genl/acpi_genl %{buildroot}/usr/sbin/acpi_genl
install -Dm 755 acpi_genl/acpi_genl %{buildroot}%{_sbindir}/acpi_genl
install -Dm 644 acpi_genl/README %{buildroot}/%{_docdir}/%{name}/README_acpi_genl
make install DESTDIR="%{buildroot}"
make install DESTDIR=%{buildroot}
# Latest acpidump is coming from kernel and not from acpica sources now.
rm -rf "%{buildroot}"/usr/bin/acpidump
rm -rf %{buildroot}%{_bindir}/acpidump
cd acpidump-%{dmp_ver}/tools/power/acpi
if [ -f tools/acpidump/Makefile ]; then # 4.3+
cd tools/acpidump/

201
do_not_use_build_date_and_time.patch
View File

@@ -1,13 +1,200 @@
Index: acpica-unix2-20180105/source/include/acapps.h
Index: acpica-unix-20180313/source/compiler/asloptions.c
===================================================================
--- acpica-unix2-20180105.orig/source/include/acapps.h 2018-01-05 17:42:19.000000000 +0100
+++ acpica-unix2-20180105/source/include/acapps.h 2018-01-12 18:22:52.414042176 +0100
@@ -81,7 +81,7 @@
--- acpica-unix-20180313.orig/source/compiler/asloptions.c
+++ acpica-unix-20180313/source/compiler/asloptions.c
@@ -870,12 +870,6 @@ AslDoOptions (
Gbl_NoErrors = TRUE;
break;
- case 'd':
-
- printf (ACPI_COMMON_SIGNON (ASL_COMPILER_NAME));
- printf (ACPI_COMMON_BUILD_TIME);
- exit (0);
-
case 'e':
/* Disable all warning/remark messages (errors only) */
Index: acpica-unix-20180313/source/include/acapps.h
===================================================================
--- acpica-unix-20180313.orig/source/include/acapps.h
+++ acpica-unix-20180313/source/include/acapps.h
@@ -188,9 +188,6 @@
Prefix, ACPICA_COPYRIGHT, \
Prefix
#define ACPI_COMMON_BUILD_TIME \
-#define ACPI_COMMON_BUILD_TIME \
- "Build date/time: %s %s\n", __DATE__, __TIME__
+ "Build date/time: See rpm -qi acpica"
-
/* Macros for usage messages */
#define ACPI_USAGE_HEADER(Usage) \
Index: acpica-unix-20180313/source/tools/acpibin/abmain.c
===================================================================
--- acpica-unix-20180313.orig/source/tools/acpibin/abmain.c
+++ acpica-unix-20180313/source/tools/acpibin/abmain.c
@@ -192,7 +192,6 @@ AbDisplayUsage (
ACPI_OPTION ("-s <File>", "Update checksum for binary AML file");
ACPI_OPTION ("-t", "Terse mode");
ACPI_OPTION ("-v", "Display version information");
- ACPI_OPTION ("-vd", "Display build date and time");
}
@@ -299,11 +298,6 @@ main (
return (1);
- case 'd':
-
- printf (ACPI_COMMON_BUILD_TIME);
- return (1);
-
default:
printf ("Unknown option: -v%s\n", AcpiGbl_Optarg);
Index: acpica-unix-20180313/source/tools/acpidump/apmain.c
===================================================================
--- acpica-unix-20180313.orig/source/tools/acpidump/apmain.c
+++ acpica-unix-20180313/source/tools/acpidump/apmain.c
@@ -223,7 +223,6 @@ ApDisplayUsage (
ACPI_OPTION ("-r <Address>", "Dump tables from specified RSDP");
ACPI_OPTION ("-s", "Print table summaries only");
ACPI_OPTION ("-v", "Display version information");
- ACPI_OPTION ("-vd", "Display build date and time");
ACPI_OPTION ("-z", "Verbose mode");
ACPI_USAGE_TEXT ("\nTable Options:\n");
@@ -379,12 +378,6 @@ ApDoOptions (
fprintf (stderr, ACPI_COMMON_SIGNON (AP_UTILITY_NAME));
return (1);
- case 'd':
-
- fprintf (stderr, ACPI_COMMON_SIGNON (AP_UTILITY_NAME));
- printf (ACPI_COMMON_BUILD_TIME);
- return (1);
-
default:
printf ("Unknown option: -v%s\n", AcpiGbl_Optarg);
Index: acpica-unix-20180313/source/tools/acpiexec/aemain.c
===================================================================
--- acpica-unix-20180313.orig/source/tools/acpiexec/aemain.c
+++ acpica-unix-20180313/source/tools/acpiexec/aemain.c
@@ -276,7 +276,6 @@ usage (
printf ("\n");
ACPI_OPTION ("-v", "Display version information");
- ACPI_OPTION ("-vd", "Display build date and time");
ACPI_OPTION ("-vi", "Verbose initialization output");
ACPI_OPTION ("-vr", "Verbose region handler output");
ACPI_OPTION ("-x <DebugLevel>", "Debug output level");
@@ -535,11 +534,6 @@ AeDoOptions (
return (1);
- case 'd':
-
- printf (ACPI_COMMON_BUILD_TIME);
- return (1);
-
case 'i':
AcpiDbgLevel |= ACPI_LV_INIT_NAMES;
Index: acpica-unix-20180313/source/tools/acpihelp/ahmain.c
===================================================================
--- acpica-unix-20180313.orig/source/tools/acpihelp/ahmain.c
+++ acpica-unix-20180313/source/tools/acpihelp/ahmain.c
@@ -187,7 +187,6 @@ AhDisplayUsage (
ACPI_USAGE_HEADER ("acpihelp <options> [Name/Prefix | HexValue]");
ACPI_OPTION ("-h", "Display help");
ACPI_OPTION ("-v", "Display version information");
- ACPI_OPTION ("-vd", "Display build date and time");
ACPI_USAGE_TEXT ("\nAML Names and Encodings (ACPI Machine Language):\n");
ACPI_OPTION ("-a [Name/Prefix | *]", "Display both ASL operator and AML opcode name(s)");
@@ -317,11 +316,6 @@ main (
return (1);
- case 'd':
-
- printf (ACPI_COMMON_BUILD_TIME);
- return (1);
-
default:
printf ("Unknown option: -v%s\n", AcpiGbl_Optarg);
Index: acpica-unix-20180313/source/tools/acpinames/anmain.c
===================================================================
--- acpica-unix-20180313.orig/source/tools/acpinames/anmain.c
+++ acpica-unix-20180313/source/tools/acpinames/anmain.c
@@ -203,7 +203,6 @@ usage (
ACPI_OPTION ("-?", "Display this message");
ACPI_OPTION ("-l", "Load namespace only, no display");
ACPI_OPTION ("-v", "Display version information");
- ACPI_OPTION ("-vd", "Display build date and time");
ACPI_OPTION ("-x <DebugLevel>", "Debug output level");
}
@@ -273,11 +272,6 @@ main (
exit (0);
- case 'd':
-
- printf (ACPI_COMMON_BUILD_TIME);
- return (0);
-
default:
printf ("Unknown option: -v%s\n", AcpiGbl_Optarg);
Index: acpica-unix-20180313/source/tools/acpisrc/asmain.c
===================================================================
--- acpica-unix-20180313.orig/source/tools/acpisrc/asmain.c
+++ acpica-unix-20180313/source/tools/acpisrc/asmain.c
@@ -374,7 +374,6 @@ AsDisplayUsage (
ACPI_OPTION ("-s", "Generate source statistics only");
ACPI_OPTION ("-v", "Display version information");
ACPI_OPTION ("-vb", "Verbose mode");
- ACPI_OPTION ("-vd", "Display build date and time");
ACPI_OPTION ("-y", "Suppress file overwrite prompts");
}
@@ -479,11 +478,6 @@ main (
Gbl_VerboseMode = TRUE;
break;
- case 'd':
-
- printf (ACPI_COMMON_BUILD_TIME);
- return (0);
-
default:
printf ("Unknown option: -v%s\n", AcpiGbl_Optarg);
Index: acpica-unix-20180313/source/tools/acpixtract/axmain.c
===================================================================
--- acpica-unix-20180313.orig/source/tools/acpixtract/axmain.c
+++ acpica-unix-20180313/source/tools/acpixtract/axmain.c
@@ -181,7 +181,6 @@ DisplayUsage (
ACPI_OPTION ("-m", "Extract multiple DSDT/SSDTs to a single file");
ACPI_OPTION ("-s <signature>", "Extract all tables with <signature>");
ACPI_OPTION ("-v", "Display version information");
- ACPI_OPTION ("-vd", "Display build date and time");
ACPI_USAGE_TEXT ("\nExtract binary ACPI tables from text acpidump output\n");
ACPI_USAGE_TEXT ("Default invocation extracts the DSDT and all SSDTs\n");
@@ -259,11 +258,6 @@ main (
exit (0);
- case 'd':
-
- printf (ACPI_COMMON_BUILD_TIME);
- return (0);
-
default:
printf ("Unknown option: -v%s\n", AcpiGbl_Optarg);