From 67d7c989dcb3c8c9af08e69258951a3f595b3af1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 23 Apr 2014 22:16:48 +0200
Subject: [PATCH] Fix a few error messages and other strangeness on `make
update` in a clean tree
---
include/gluon.mk | 2 +-
include/toplevel.mk | 4 +--
include/verbose.mk | 61 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 64 insertions(+), 3 deletions(-)
create mode 100644 include/verbose.mk
diff --git a/include/gluon.mk b/include/gluon.mk
index 006a1b117..12f670d14 100644
--- a/include/gluon.mk
+++ b/include/gluon.mk
@@ -26,7 +26,7 @@ $(GLUON_SITEDIR)/site.mk:
GLUON_VERSION := $(shell cd $(GLUONDIR) && git describe --always 2>/dev/null || echo unknown)
export GLUON_VERSION
-GLUON_CONFIG_VERSION := $(shell cd $(GLUON_SITEDIR) && git describe --always --dirty=.$$(stat -c %Y $(GLUON_SITEDIR)/site.conf) 2>/dev/null || stat -c %Y site.conf)
+GLUON_CONFIG_VERSION := $(shell test -d $(GLUON_SITEDIR) && (cd $(GLUON_SITEDIR) && git describe --always --dirty=.$$(stat -c %Y $(GLUON_SITEDIR)/site.conf) 2>/dev/null || stat -c %Y site.conf))
export GLUON_CONFIG_VERSION
GLUON_SITE_CODE := $(shell $(GLUONDIR)/scripts/site.sh site_code)
diff --git a/include/toplevel.mk b/include/toplevel.mk
index ccb61cc15..af7ff5cbb 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -10,9 +10,9 @@
RELEASE:=Attitude Adjustment
PREP_MK= OPENWRT_BUILD= QUIET=0
--include $(TOPDIR)/include/verbose.mk
+include $(GLUONDIR)/include/verbose.mk
-REVISION:=$(shell cd $(TOPDIR) && ./scripts/getver.sh 2>/dev/null)
+REVISION:=$(shell [ -d $(TOPDIR) ] && cd $(TOPDIR) && ./scripts/getver.sh 2>/dev/null)
HOSTCC ?= gcc
OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))
diff --git a/include/verbose.mk b/include/verbose.mk
new file mode 100644
index 000000000..2e8ace442
--- /dev/null
+++ b/include/verbose.mk
@@ -0,0 +1,61 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifndef OPENWRT_VERBOSE
+ OPENWRT_VERBOSE:=
+endif
+ifeq ("$(origin V)", "command line")
+ OPENWRT_VERBOSE:=$(V)
+endif
+
+ifeq ($(OPENWRT_VERBOSE),1)
+ OPENWRT_VERBOSE:=w
+endif
+ifeq ($(OPENWRT_VERBOSE),99)
+ OPENWRT_VERBOSE:=s
+endif
+
+ifeq ($(NO_TRACE_MAKE),)
+NO_TRACE_MAKE := $(MAKE) V=s$(OPENWRT_VERBOSE)
+export NO_TRACE_MAKE
+endif
+
+ifeq ($(IS_TTY),1)
+ ifneq ($(strip $(NO_COLOR)),1)
+ _Y:=\\033[33m
+ _N:=\\033[m
+ endif
+endif
+
+ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
+ define MESSAGE
+ printf "$(_Y)%s$(_N)\n" "$(1)" >&8
+ endef
+
+ ifeq ($(QUIET),1)
+ ifneq ($(CURDIR),$(TOPDIR))
+ _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
+ else
+ _DIR:=
+ endif
+ _NULL:=$(if $(MAKECMDGOALS),$(shell \
+ $(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
+ ))
+ SUBMAKE=$(MAKE)
+ else
+ SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1)
+ export QUIET:=1
+ SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* < /dev/null || { echo "make $$*: build failed. Please re-run make with V=s to see what's going on"; false; } } 8>&1 9>&2; cmd
+ endif
+
+ .SILENT: $(MAKECMDGOALS)
+else
+ SUBMAKE=$(MAKE) -w
+ define MESSAGE
+ printf "%s\n" "$(1)"
+ endef
+endif
--
GitLab