From 72bba92d25bb1155d93ce1e36ac3e17788025631 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Wed, 5 Aug 2015 10:27:29 -0600 Subject: [PATCH] Bodge back together the AAPITS makefile Several files were relocated in the source/* directory tree, so change the AAPITS makefile so it uses the new locations. This is necessary only because AAPITS is not actively maintained by ACPICA. Signed-off-by: Al Stone --- aapits-make.patch | 35 +++++++++++++++++++++++++++++++++++ acpica-tools.spec | 4 ++++ 2 files changed, 39 insertions(+) create mode 100644 aapits-make.patch diff --git a/aapits-make.patch b/aapits-make.patch new file mode 100644 index 0000000..0ad73af --- /dev/null +++ b/aapits-make.patch @@ -0,0 +1,35 @@ +diff -Naur acpica-unix2-20150717/tests/aapits/Makefile acpica-unix2-20150717-aapits/tests/aapits/Makefile +--- acpica-unix2-20150717/tests/aapits/Makefile 2015-07-17 10:05:11.000000000 -0600 ++++ acpica-unix2-20150717-aapits/tests/aapits/Makefile 2015-08-05 10:20:14.776322314 -0600 +@@ -31,6 +31,7 @@ + ../../source/components/debugger/dbinput.c \ + ../../source/components/debugger/dbmethod.c \ + ../../source/components/debugger/dbnames.c \ ++ ../../source/components/debugger/dbobject.c \ + ../../source/components/debugger/dbstats.c \ + ../../source/components/debugger/dbtest.c \ + ../../source/components/debugger/dbutils.c \ +@@ -39,7 +40,6 @@ + ../../source/components/disassembler/dmcstyle.c \ + ../../source/components/disassembler/dmdeferred.c \ + ../../source/components/disassembler/dmnames.c \ +- ../../source/components/disassembler/dmobject.c \ + ../../source/components/disassembler/dmopcode.c \ + ../../source/components/disassembler/dmresrc.c \ + ../../source/components/disassembler/dmresrcl.c \ +@@ -71,6 +71,7 @@ + ../../source/components/hardware/hwxfsleep.c \ + ../../source/components/dispatcher/dsargs.c \ + ../../source/components/dispatcher/dscontrol.c \ ++ ../../source/components/dispatcher/dsdebug.c \ + ../../source/components/dispatcher/dsfield.c \ + ../../source/components/dispatcher/dsinit.c \ + ../../source/components/dispatcher/dsmethod.c \ +@@ -183,6 +184,7 @@ + ../../source/components/utilities/utmath.c \ + ../../source/components/utilities/utmisc.c \ + ../../source/components/utilities/utmutex.c \ ++ ../../source/components/utilities/utnonansi.c \ + ../../source/components/utilities/utobject.c \ + ../../source/components/utilities/utosi.c \ + ../../source/components/utilities/utownerid.c \ diff --git a/acpica-tools.spec b/acpica-tools.spec index a71e241..34085fb 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -32,6 +32,7 @@ Patch5: re-enable-big-endian.patch Patch6: OPT_LDFLAGS.patch Patch7: int-format.patch Patch8: f23-harden.patch +Patch9: aapits-make.patch BuildRequires: bison patchutils flex @@ -90,6 +91,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f - %patch6 -p1 -b .OPT_LDFLAGS %patch7 -p1 -b .int-format %patch8 -p1 -b .f23-harden +%patch9 -p1 -b .aapits-make cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE3} iasl.1 @@ -197,6 +199,8 @@ fi * Tue Aug 4 2105 Al Stone - 20150717-1 - Update to latest upstream. Closes BZ#1244449. - Refresh patches +- Bodge back together the aapits makefile after source file relocations in + the primary ACPICA component files * Tue Jun 30 2015 Al Stone - 20150619-2 - Silly error: forgot to remove patches that are no longer needed