lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 023/542] tools/power/acpi: fix compilation error
    Date
    From: Zhengyuan Liu <liuzhengyuan@kylinos.cn>

    [ Upstream commit 1985f8c7f9a42a651a9750d6fcadc74336d182df ]

    If we compile tools/acpi target in the top source directory, we'd get a
    compilation error showing as bellow:

    # make tools/acpi
    DESCEND power/acpi
    DESCEND tools/acpidbg
    CC tools/acpidbg/acpidbg.o
    Assembler messages:
    Fatal error: can't create /home/lzy/kernel-upstream/power/acpi/\
    tools/acpidbg/acpidbg.o: No such file or directory
    ../../Makefile.rules:26: recipe for target '/home/lzy/kernel-upstream/\
    power/acpi/tools/acpidbg/acpidbg.o' failed
    make[3]: *** [/home/lzy/kernel-upstream//power/acpi/tools/acpidbg/\
    acpidbg.o] Error 1
    Makefile:19: recipe for target 'acpidbg' failed
    make[2]: *** [acpidbg] Error 2
    Makefile:54: recipe for target 'acpi' failed
    make[1]: *** [acpi] Error 2
    Makefile:1607: recipe for target 'tools/acpi' failed
    make: *** [tools/acpi] Error 2

    Fixes: d5a4b1a540b8 ("tools/power/acpi: Remove direct kernel source include reference")
    Signed-off-by: Zhengyuan Liu <liuzhengyuan@kylinos.cn>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/power/acpi/Makefile.config | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/power/acpi/Makefile.config b/tools/power/acpi/Makefile.config
    index 0111d246d1ca2..54a2857c2510a 100644
    --- a/tools/power/acpi/Makefile.config
    +++ b/tools/power/acpi/Makefile.config
    @@ -15,7 +15,7 @@ include $(srctree)/../../scripts/Makefile.include

    OUTPUT=$(srctree)/
    ifeq ("$(origin O)", "command line")
    - OUTPUT := $(O)/power/acpi/
    + OUTPUT := $(O)/tools/power/acpi/
    endif
    #$(info Determined 'OUTPUT' to be $(OUTPUT))

    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 19:23    [W:2.280 / U:0.548 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site