releases/5.5.4/tools-power-acpi-fix-compilation-error.patch

   1 From 1985f8c7f9a42a651a9750d6fcadc74336d182df Mon Sep 17 00:00:00 2001
   2 From: Zhengyuan Liu <liuzhengyuan@kylinos.cn>
   3 Date: Sat, 14 Dec 2019 00:27:12 +0800
   4 Subject: tools/power/acpi: fix compilation error
   5
   6 From: Zhengyuan Liu <liuzhengyuan@kylinos.cn>
   7
   8 commit 1985f8c7f9a42a651a9750d6fcadc74336d182df upstream.
   9
  10 If we compile tools/acpi target in the top source directory, we'd get a
  11 compilation error showing as bellow:
  12
  13         # make tools/acpi
  14           DESCEND  power/acpi
  15           DESCEND  tools/acpidbg
  16           CC       tools/acpidbg/acpidbg.o
  17         Assembler messages:
  18         Fatal error: can't create /home/lzy/kernel-upstream/power/acpi/\
  19                         tools/acpidbg/acpidbg.o: No such file or directory
  20         ../../Makefile.rules:26: recipe for target '/home/lzy/kernel-upstream/\
  21                         power/acpi/tools/acpidbg/acpidbg.o' failed
  22         make[3]: *** [/home/lzy/kernel-upstream//power/acpi/tools/acpidbg/\
  23                         acpidbg.o] Error 1
  24         Makefile:19: recipe for target 'acpidbg' failed
  25         make[2]: *** [acpidbg] Error 2
  26         Makefile:54: recipe for target 'acpi' failed
  27         make[1]: *** [acpi] Error 2
  28         Makefile:1607: recipe for target 'tools/acpi' failed
  29         make: *** [tools/acpi] Error 2
  30
  31 Fixes: d5a4b1a540b8 ("tools/power/acpi: Remove direct kernel source include reference")
  32 Signed-off-by: Zhengyuan Liu <liuzhengyuan@kylinos.cn>
  33 Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  34 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  35
  36 ---
  37  tools/power/acpi/Makefile.config |    2 +-
  38  1 file changed, 1 insertion(+), 1 deletion(-)
  39
  40 --- a/tools/power/acpi/Makefile.config
  41 +++ b/tools/power/acpi/Makefile.config
  42 @@ -15,7 +15,7 @@ include $(srctree)/../../scripts/Makefil
  43
  44  OUTPUT=$(srctree)/
  45  ifeq ("$(origin O)", "command line")
  46 -       OUTPUT := $(O)/power/acpi/
  47 +       OUTPUT := $(O)/tools/power/acpi/
  48  endif
  49  #$(info Determined 'OUTPUT' to be $(OUTPUT))
  50