Add back in a patch to rename AcpiNames.h to acpinames.h
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone
parent
5f1097d5a8
commit
ddc6947ee3
@ -33,6 +33,7 @@ Patch6: int-format.patch
|
||||
Patch7: f23-harden.patch
|
||||
Patch8: asllookup-ppc64.patch
|
||||
Patch9: template.patch
|
||||
Patch10: acpinames.patch
|
||||
|
||||
BuildRequires: bison patchutils flex
|
||||
|
||||
@ -92,6 +93,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
|
||||
%patch7 -p1 -b .f23-harden
|
||||
%patch8 -p1 -b .asllookup-ppc64
|
||||
%patch9 -p1 -b .template
|
||||
%patch10 -p1 -b .acpinames
|
||||
|
||||
cp -p %{SOURCE2} README.Fedora
|
||||
cp -p %{SOURCE3} iasl.1
|
||||
@ -189,6 +191,9 @@ fi
|
||||
* Tue Dec 15 2015 Al Stone <ahs3@redhat.com> - 20151124-1
|
||||
- Update to latest upstream. Closes BZ#1267772.
|
||||
- Refresh patches.
|
||||
- Add back in a patch to rename source/tools/acpinames/AcpiNames.h to remove
|
||||
the camel case; this is a leftover in the conversion to Un*x files, and
|
||||
crept back in with this version.
|
||||
|
||||
* Wed Oct 14 2015 Al Stone <ahs3@redhat.com> - 20150930-1
|
||||
- Update to latest upstream. Closes BZ#1267772.
|
||||
|
||||
140
acpinames.patch
Normal file
140
acpinames.patch
Normal file
@ -0,0 +1,140 @@
|
||||
diff -Naur acpica-unix2-20151124/source/tools/acpinames/acpinames.h acpica-unix2-20151124.patched/source/tools/acpinames/acpinames.h
|
||||
--- acpica-unix2-20151124/source/tools/acpinames/acpinames.h 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ acpica-unix2-20151124.patched/source/tools/acpinames/acpinames.h 2015-12-15 15:41:57.418737677 -0700
|
||||
@@ -0,0 +1,66 @@
|
||||
+/******************************************************************************
|
||||
+ *
|
||||
+ * Module Name: acpinames.h - Common include for AcpiNames utility
|
||||
+ *
|
||||
+ *****************************************************************************/
|
||||
+
|
||||
+/*
|
||||
+ * Copyright (C) 2000 - 2015, Intel Corp.
|
||||
+ * All rights reserved.
|
||||
+ *
|
||||
+ * Redistribution and use in source and binary forms, with or without
|
||||
+ * modification, are permitted provided that the following conditions
|
||||
+ * are met:
|
||||
+ * 1. Redistributions of source code must retain the above copyright
|
||||
+ * notice, this list of conditions, and the following disclaimer,
|
||||
+ * without modification.
|
||||
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
|
||||
+ * substantially similar to the "NO WARRANTY" disclaimer below
|
||||
+ * ("Disclaimer") and any redistribution must be conditioned upon
|
||||
+ * including a substantially similar Disclaimer requirement for further
|
||||
+ * binary redistribution.
|
||||
+ * 3. Neither the names of the above-listed copyright holders nor the names
|
||||
+ * of any contributors may be used to endorse or promote products derived
|
||||
+ * from this software without specific prior written permission.
|
||||
+ *
|
||||
+ * Alternatively, this software may be distributed under the terms of the
|
||||
+ * GNU General Public License ("GPL") version 2 as published by the Free
|
||||
+ * Software Foundation.
|
||||
+ *
|
||||
+ * NO WARRANTY
|
||||
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
|
||||
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
||||
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
+ * POSSIBILITY OF SUCH DAMAGES.
|
||||
+ */
|
||||
+
|
||||
+#ifndef _ACPINAMES_H
|
||||
+#define _ACPINAMES_H
|
||||
+
|
||||
+#include "acpi.h"
|
||||
+#include "accommon.h"
|
||||
+#include "acapps.h"
|
||||
+#include "acutils.h"
|
||||
+#include "acnamesp.h"
|
||||
+#include "actables.h"
|
||||
+#include "acinterp.h"
|
||||
+
|
||||
+#include <stdio.h>
|
||||
+
|
||||
+#define ACPI_MAX_INIT_TABLES (32)
|
||||
+
|
||||
+extern BOOLEAN AcpiGbl_NsLoadOnly;
|
||||
+
|
||||
+
|
||||
+ACPI_STATUS
|
||||
+AnBuildLocalTables (
|
||||
+ ACPI_NEW_TABLE_DESC *TableList);
|
||||
+
|
||||
+#endif
|
||||
diff -Naur acpica-unix2-20151124/source/tools/acpinames/AcpiNames.h acpica-unix2-20151124.patched/source/tools/acpinames/AcpiNames.h
|
||||
--- acpica-unix2-20151124/source/tools/acpinames/AcpiNames.h 2015-11-24 08:11:31.000000000 -0700
|
||||
+++ acpica-unix2-20151124.patched/source/tools/acpinames/AcpiNames.h 1969-12-31 17:00:00.000000000 -0700
|
||||
@@ -1,66 +0,0 @@
|
||||
-/******************************************************************************
|
||||
- *
|
||||
- * Module Name: acpinames.h - Common include for AcpiNames utility
|
||||
- *
|
||||
- *****************************************************************************/
|
||||
-
|
||||
-/*
|
||||
- * Copyright (C) 2000 - 2015, Intel Corp.
|
||||
- * All rights reserved.
|
||||
- *
|
||||
- * Redistribution and use in source and binary forms, with or without
|
||||
- * modification, are permitted provided that the following conditions
|
||||
- * are met:
|
||||
- * 1. Redistributions of source code must retain the above copyright
|
||||
- * notice, this list of conditions, and the following disclaimer,
|
||||
- * without modification.
|
||||
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
|
||||
- * substantially similar to the "NO WARRANTY" disclaimer below
|
||||
- * ("Disclaimer") and any redistribution must be conditioned upon
|
||||
- * including a substantially similar Disclaimer requirement for further
|
||||
- * binary redistribution.
|
||||
- * 3. Neither the names of the above-listed copyright holders nor the names
|
||||
- * of any contributors may be used to endorse or promote products derived
|
||||
- * from this software without specific prior written permission.
|
||||
- *
|
||||
- * Alternatively, this software may be distributed under the terms of the
|
||||
- * GNU General Public License ("GPL") version 2 as published by the Free
|
||||
- * Software Foundation.
|
||||
- *
|
||||
- * NO WARRANTY
|
||||
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
|
||||
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
|
||||
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
- * POSSIBILITY OF SUCH DAMAGES.
|
||||
- */
|
||||
-
|
||||
-#ifndef _ACPINAMES_H
|
||||
-#define _ACPINAMES_H
|
||||
-
|
||||
-#include "acpi.h"
|
||||
-#include "accommon.h"
|
||||
-#include "acapps.h"
|
||||
-#include "acutils.h"
|
||||
-#include "acnamesp.h"
|
||||
-#include "actables.h"
|
||||
-#include "acinterp.h"
|
||||
-
|
||||
-#include <stdio.h>
|
||||
-
|
||||
-#define ACPI_MAX_INIT_TABLES (32)
|
||||
-
|
||||
-extern BOOLEAN AcpiGbl_NsLoadOnly;
|
||||
-
|
||||
-
|
||||
-ACPI_STATUS
|
||||
-AnBuildLocalTables (
|
||||
- ACPI_NEW_TABLE_DESC *TableList);
|
||||
-
|
||||
-#endif
|
||||
Loading…
Reference in New Issue
Block a user