]> git.baikalelectronics.ru Git - kernel.git/commit
scripts/kconfig/Makefile: Fix KBUILD_DEFCONFIG check when building with O=
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 15 Oct 2015 03:33:57 +0000 (14:33 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 15 Oct 2015 09:31:42 +0000 (20:31 +1100)
commitc68abd04d54a953eb08eaf2b8c722dacb0fd82f2
tree78ec5ff2913428bd168c062de4eac829fcbf9fc7
parent1d4d28e1e54c37581f0a643ced1814827c32364d
scripts/kconfig/Makefile: Fix KBUILD_DEFCONFIG check when building with O=

My recent commit acc7626be42e ("scripts/kconfig/Makefile: Allow
KBUILD_DEFCONFIG to be a target"), contained a bug in that when it
checks if KBUILD_DEFCONFIG is a file it forgets to prepend $(srctree) to
the path.

This causes the build to fail when building out of tree (with O=), and
when the value of KBUILD_DEFCONFIG is 'defconfig'. In that case we will
fail to find the 'defconfig' file, because we look in the build
directory not $(srctree), and so we will call Make again with
'defconfig' as the target. From there we loop infinitely calling 'make
defconfig' again and again.

The fix is simple, we need to look for the file under $(srctree).

Fixes: acc7626be42e ("scripts/kconfig/Makefile: Allow KBUILD_DEFCONFIG to be a target")
Reported-by: Olof Johansson <olof@lixom.net>
Acked-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
scripts/kconfig/Makefile