X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/fd8eb5df1ac4180570a915ec45b975e74ae12897..eac54909415f8a3bf2e5fecd8b80803ef80f8b4a:/include/toplevel.mk diff --git a/include/toplevel.mk b/include/toplevel.mk index ba5cb3375..4e194bf50 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -7,21 +7,22 @@ # RELEASE:=Kamikaze -#VERSION:=2.0 # uncomment for final release - SHELL:=/usr/bin/env bash -OPENWRTVERSION:=$(RELEASE) PREP_MK= OPENWRT_BUILD= QUIET=0 + include $(TOPDIR)/include/verbose.mk -ifneq ($(VERSION),) - OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION)) + +ifeq ($(SDK),1) + include $(TOPDIR)/include/version.mk else - REV:=$(if $(wildcard .svn/entries),$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )) - ifneq ($(REV),) - OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV) - endif + REVISION:=$(shell $(TOPDIR)/scripts/getver.sh) endif + +OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION))) +export RELEASE +export REVISION export OPENWRTVERSION +export IS_TTY=$(shell tty -s && echo 1 || echo 0) ifeq ($(FORCE),) .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build @@ -97,7 +98,7 @@ download: .config FORCE $(MAKE) -j1 package/download $(MAKE) -j1 target/download -clean dirclean: +clean dirclean: .config @$(MAKE) $@ prereq:: .config