From 4fd61277f66278d7ce4a77accb662d00e800cce7 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Tue, 18 Sep 2018 17:45:53 +0900
Subject: [PATCH] kbuild: do not pass $(objtree) to scripts/mkmakefile
Since $(objtree) is always '.', it is not useful to pass it to
scripts/mkmakefile. I assume nobody wants to run this script directly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
Makefile | 2 +-
scripts/mkmakefile | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 182172c724412..d2de86c2eba38 100644
--- a/Makefile
+++ b/Makefile
@@ -494,7 +494,7 @@ PHONY += outputmakefile
outputmakefile:
ifneq ($(KBUILD_SRC),)
$(Q)ln -fsn $(srctree) source
- $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree) $(objtree)
+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree)
endif
ifeq ($(cc-name),clang)
diff --git a/scripts/mkmakefile b/scripts/mkmakefile
index 24354284d4add..85995f90e5c80 100755
--- a/scripts/mkmakefile
+++ b/scripts/mkmakefile
@@ -6,19 +6,18 @@
# Usage
# $1 - Kernel src directory
-# $2 - Output directory
# Only overwrite automatically generated Makefiles
# (so we do not overwrite kernel Makefile)
-if test -e $2/Makefile && ! grep -q Automatically $2/Makefile
+if test -e Makefile && ! grep -q Automatically Makefile
then
exit 0
fi
if [ "${quiet}" != "silent_" ]; then
- echo " GEN $2/Makefile"
+ echo " GEN Makefile"
fi
-cat << EOF > $2/Makefile
+cat << EOF > Makefile
# Automatically generated by $0: don't edit
lastword = \$(word \$(words \$(1)),\$(1))
--
GitLab