From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mout02.posteo.de ([185.67.36.66]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cs5eF-0005oF-Hu for barebox@lists.infradead.org; Sun, 26 Mar 2017 10:43:49 +0000 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id C902820A2E for ; Sun, 26 Mar 2017 12:43:19 +0200 (CEST) From: Dennis Menschel Date: Sun, 26 Mar 2017 12:40:37 +0200 Message-Id: <1490524837-8826-1-git-send-email-menschel-d@posteo.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH] scripts: mkmakefile: apply changes from Linux kernel To: barebox@lists.infradead.org Cc: Dennis Menschel The version of mkmakefile which has been used in barebox until now dates back to commit fd5f0cd6b0cef59ba18e5ac13be5b2775fa6ec28 from the Linux kernel git history (Tue May 2 12:33:20 2006 +0200). This patch effectively includes all changes from the aforementioned commit to the latest stable version of the Linux kernel: git log --pretty=oneline --abbrev-commit fd5f0cd..v4.10 scripts/mkmakefile 06ed5c2 kbuild: Make scripts executable 9319f45 kbuild: support simultaneous "make %config" and "make all" 0ff3577 kbuild: silence generated makefile message 3c955b4 fixes for using make 3.82 d230124 kbuild: teach mkmakfile to be silent 1d3b3bf kbuild: scripts/mkmakefile: dynamic determination of output directory 971edcf kbuild: re-enable Makefile generation in a new O=... directory 18c32da kbuild: fix building with O=.. options 0b35786 kbuild: call make once for all targets when O=.. is used In particular, the list of changes includes a fix for the following Make warning: Makefile:18: *** mixed implicit and normal rules: deprecated syntax GNU Make 3.82 raises an error instead of a warning and aborts the make process. GNU Make 3.82 is still used today by distributions like Red Hat Enterprise Linux 7.3. Signed-off-by: Dennis Menschel --- scripts/mkmakefile | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) mode change 100644 => 100755 scripts/mkmakefile diff --git a/scripts/mkmakefile b/scripts/mkmakefile old mode 100644 new mode 100755 index 7f9d544..84af27b --- a/scripts/mkmakefile +++ b/scripts/mkmakefile @@ -11,7 +11,15 @@ test ! -r $2/Makefile -o -O $2/Makefile || exit 0 -echo " GEN $2/Makefile" +# Only overwrite automatically generated Makefiles +# (so we do not overwrite kernel Makefile) +if test -e $2/Makefile && ! grep -q Automatically $2/Makefile +then + exit 0 +fi +if [ "${quiet}" != "silent_" ]; then + echo " GEN $2/Makefile" +fi cat << EOF > $2/Makefile # Automatically generated by $0: don't edit @@ -19,18 +27,26 @@ cat << EOF > $2/Makefile VERSION = $3 PATCHLEVEL = $4 -KERNELSRC := $1 -KERNELOUTPUT := $2 +lastword = \$(word \$(words \$(1)),\$(1)) +makedir := \$(dir \$(call lastword,\$(MAKEFILE_LIST))) -MAKEFLAGS += --no-print-directory +ifeq ("\$(origin V)", "command line") +VERBOSE := \$(V) +endif +ifneq (\$(VERBOSE),1) +Q := @ +endif + +MAKEARGS := -C $1 +MAKEARGS += O=\$(if \$(patsubst /%,,\$(makedir)),\$(CURDIR)/)\$(patsubst %/,%,\$(makedir)) -.PHONY: all \$(MAKECMDGOALS) +MAKEFLAGS += --no-print-directory -all: - \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) +.PHONY: __sub-make \$(MAKECMDGOALS) -Makefile:; +__sub-make: + \$(Q)\$(MAKE) \$(MAKEARGS) \$(MAKECMDGOALS) -\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/: - \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@ +\$(filter-out __sub-make, \$(MAKECMDGOALS)): __sub-make + @: EOF -- 2.7.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox