rpm/acpica
SHA256
1
0
Fork 0
forked from pool/acpica
Code Pull Requests Activity

Accepting request 448923 from home:trenn:branches:hardware

Browse Source 
- Update to version 20161117
- __DATE__ __TIME__ macros added again mainline, revert them to avoid
  constant build service rebuilding
*Add revert_62ca7996_build_date_and_time.patch
*Add revert_cdd3c612d4230bbb_build_date_and_time.patch

OBS-URL: https://build.opensuse.org/request/show/448923
OBS-URL: https://build.opensuse.org/package/show/hardware/acpica?expand=0&rev=97
This commit is contained in:
Thomas Renninger
2017-01-05 17:44:39 +00:00
committed by Git OBS Bridge
parent c95c581b6b
commit 671995c790
7 changed files with 96 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
acpica-no-compiletime.patch
View File

@@ -12,11 +12,11 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
source/include/acapps.h | 8 ++++----
3 files changed, 8 insertions(+), 13 deletions(-)
Index: acpica-unix2-20121018/source/compiler/aslcompile.c
Index: acpica-unix2-20161117/source/compiler/aslcompile.c
===================================================================
--- acpica-unix2-20121018.orig/source/compiler/aslcompile.c
+++ acpica-unix2-20121018/source/compiler/aslcompile.c
@@ -160,8 +160,6 @@ void
--- acpica-unix2-20161117.orig/source/compiler/aslcompile.c 2016-11-17 18:20:12.000000000 +0100
+++ acpica-unix2-20161117/source/compiler/aslcompile.c 2016-12-07 12:26:58.193287602 +0100
@@ -471,8 +471,6 @@ void
AslCompilerFileHeader (
UINT32 FileId)
{
@@ -25,7 +25,7 @@ Index: acpica-unix2-20121018/source/compiler/aslcompile.c
char *Prefix = "";
@@ -201,12 +199,9 @@ AslCompilerFileHeader (
@@ -515,12 +513,9 @@ AslCompilerFileHeader (
/* Compilation header with timestamp */
@@ -40,11 +40,11 @@ Index: acpica-unix2-20121018/source/compiler/aslcompile.c
Prefix);
switch (FileId)
Index: acpica-unix2-20121018/source/compiler/aslutils.c
Index: acpica-unix2-20161117/source/compiler/aslutils.c
===================================================================
--- acpica-unix2-20121018.orig/source/compiler/aslutils.c
+++ acpica-unix2-20121018/source/compiler/aslutils.c
@@ -454,8 +454,8 @@ UtDisplaySummary (
--- acpica-unix2-20161117.orig/source/compiler/aslutils.c 2016-11-17 18:20:13.000000000 +0100
+++ acpica-unix2-20161117/source/compiler/aslutils.c 2016-12-07 12:26:58.197287829 +0100
@@ -381,8 +381,8 @@ UtDisplaySummary (
{
/* Compiler name and version number */

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

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

3
acpica-unix2-20161117.tar.gz Normal file
View File

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

9
acpica.changes
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Jan 5 16:51:25 UTC 2017 - trenn@suse.de
- Update to version 20161117
- __DATE__ __TIME__ macros added again mainline, revert them to avoid
constant build service rebuilding
*Add revert_62ca7996_build_date_and_time.patch
*Add revert_cdd3c612d4230bbb_build_date_and_time.patch
-------------------------------------------------------------------
Fri Sep 16 16:06:19 UTC 2016 - dmueller@suse.com

8
acpica.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package acpica
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: acpica
Url: http://acpica.org
Version: 20160422
Version: 20161117
Release: 0
%define src_dir acpica-unix2-%{version}
@@ -32,6 +32,8 @@ Group: Development/Tools/Debuggers
Source: https://acpica.org/sites/acpica/files/%{src_dir}.tar.gz
Patch1: acpica-no-compiletime.patch
Patch2: wmidump_add_she_bang.patch
Patch3: revert_62ca7996_build_date_and_time.patch
Patch4: revert_cdd3c612d4230bbb_build_date_and_time.patch
Source1: ec_access.c
Source2: acpi_genl.tar.bz2
Source3: acpi_validate
@@ -62,6 +64,8 @@ firmware. It also can disassemble AML, for debugging purposes.
%setup -n %{src_dir} -a 2 -a 4
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
mkdir acpidump-%{dmp_ver}
cd acpidump-%{dmp_ver}
# acpitools (acpidump) from kernel sources:

44
revert_62ca7996_build_date_and_time.patch Normal file
View File

@@ -0,0 +1,44 @@
From: Robert Moore <Robert.Moore@intel.com>
Subject: acpiexec: Add option to display build date and time
References:
Patch-Mainline: R08_31_16
Git-commit: 62ca7996656f5fa06efedd395b78bf5a0f2c0258
Git-repo: github.com/acpica/acpica.git
Signed-off-by: Thomas Renninger <trenn@suse.de>
Useful when building multiple versions.
Index: acpica-unix2-20161117/source/tools/acpiexec/aemain.c
===================================================================
--- acpica-unix2-20161117.orig/source/tools/acpiexec/aemain.c 2016-11-17 18:20:17.000000000 +0100
+++ acpica-unix2-20161117/source/tools/acpiexec/aemain.c 2016-12-07 12:36:03.532283666 +0100
@@ -92,8 +92,6 @@ BOOLEAN AcpiGbl_Load
BOOLEAN AcpiGbl_AeLoadOnly = FALSE;
static UINT8 AcpiGbl_ExecutionMode = AE_MODE_COMMAND_LOOP;
static char BatchBuffer[AE_BUFFER_SIZE]; /* Batch command buffer */
-static char AeBuildDate[] = __DATE__;
-static char AeBuildTime[] = __TIME__;
#define ACPIEXEC_NAME "AML Execution/Debug Utility"
#define AE_SUPPORTED_OPTIONS "?b:d:e:f^ghi:lm^rv^:x:"
@@ -170,7 +168,6 @@ usage (
ACPI_OPTION ("-l", "Load tables and namespace only");
ACPI_OPTION ("-r", "Use hardware-reduced FADT V5");
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");
@@ -408,11 +405,6 @@ AeDoOptions (
(void) AcpiOsTerminate ();
return (1);
- case 'd':
-
- printf ("Build date/time: %s %s\n", AeBuildDate, AeBuildTime);
- return (1);
-
case 'i':
AcpiDbgLevel |= ACPI_LV_INIT_NAMES;

25
revert_cdd3c612d4230bbb_build_date_and_time.patch Normal file
View File

@@ -0,0 +1,25 @@
--- a/source/compiler/asloptions.c.orig 2016-12-07 12:28:18.697863579 +0100
+++ b/source/compiler/asloptions.c 2017-01-05 17:38:08.726122659 +0100
@@ -142,9 +142,6 @@ AslDoResponseFile (
#define ASL_TOKEN_SEPARATORS " \t\n"
#define ASL_SUPPORTED_OPTIONS "@:a:b|c|d^D:e:f^gh^i|I:l^m:no|p:P^r:s|t|T+G^v^w|x:z"
-static char ASL_BUILD_DATE[] = __DATE__;
-static char ASL_BUILD_TIME[] = __TIME__;
-
/*******************************************************************************
*
@@ -799,12 +796,6 @@ AslDoOptions (
Gbl_NoErrors = TRUE;
break;
- case 'd':
-
- printf ("%s Build date/time: %s %s\n",
- ASL_COMPILER_NAME, ASL_BUILD_DATE, ASL_BUILD_TIME);
- exit (0);
-
case 'e':
/* Disable all warning/remark messages (errors only) */