[x86] fix grub installation on target images, regression caused by multi-libc support

[openwrt.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index d9c16a5..6d46fe1 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -7,126 +7,127 @@
 #
 
 RELEASE:=Kamikaze
 #
 
 RELEASE:=Kamikaze

-#VERSION:=2.0 # uncomment for final release
+SHELL:=/usr/bin/env bash
+PREP_MK= OPENWRT_BUILD= QUIET=0

 
 

-all: world
+include $(TOPDIR)/include/verbose.mk

 
 

-SHELL:=/usr/bin/env bash
-OPENWRTVERSION:=$(RELEASE)
-ifneq ($(VERSION),)
-  OPENWRTVERSION:=$(VERSION) ($(OPENWRTVERSION))
+ifeq ($(SDK),1)
+  include $(TOPDIR)/include/version.mk

 else
 else

-  REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
-  ifneq ($(REV),)
-    OPENWRTVERSION:=$(OPENWRTVERSION)/r$(REV)
-  endif
+  REVISION:=$(shell $(TOPDIR)/scripts/getver.sh)

 endif
 endif

+
+OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))
+export RELEASE
+export REVISION

 export OPENWRTVERSION
 export OPENWRTVERSION

+export IS_TTY=$(shell tty -s && echo 1 || echo 0)
+
+# make sure that a predefined CFLAGS variable does not disturb packages
+export CFLAGS=

 
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build
 
 ifeq ($(FORCE),)
   .config scripts/config/conf scripts/config/mconf: tmp/.prereq-build

-  world: prereq

 endif
 
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 
 endif
 
 SCAN_COOKIE?=$(shell echo $$$$)
 export SCAN_COOKIE
 

-tmp/.packageinfo tmp/.targetinfo prepare-tmpinfo:
-       @mkdir -p tmp/info
-       @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk" SCAN_DEPTH=4 SCAN_EXTRA=""
-       @$(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk" SCAN_DEPTH=2 SCAN_EXTRA=""
-       @for type in package target; do \
+prepare-mk: FORCE ;
+
+prepare-tmpinfo: FORCE
+       mkdir -p tmp/info
+       $(_SINGLE)$(NO_TRACE_MAKE) -j1 -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk" SCAN_DEPTH=5 SCAN_EXTRA=""
+       $(_SINGLE)$(NO_TRACE_MAKE) -j1 -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1"
+       for type in package target; do \

                f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \
                f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \

-               [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config < "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
+               [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \

        done
        done

+       ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
+       touch $(TOPDIR)/tmp/.build

 
 

-.config: ./scripts/config/conf prepare-tmpinfo
-       if [ \! -f .config ]; then \
+.config: ./scripts/config/conf prepare-tmpinfo $(if $(CONFIG_HAVE_DOT_CONFIG),,FORCE)
+       @+if [ \! -e .config ] || ! grep CONFIG_HAVE_DOT_CONFIG .config >/dev/null; then \

                [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \
                [ -e $(HOME)/.openwrt/defconfig ] && cp $(HOME)/.openwrt/defconfig .config; \

-               $(NO_TRACE_MAKE) menuconfig; \
+               $(_SINGLE)$(NO_TRACE_MAKE) menuconfig $(PREP_MK); \

        fi
        fi

-       $< -D .config Config.in &> /dev/null

 
 scripts/config/mconf:
 
 scripts/config/mconf:

-       $(MAKE) -C scripts/config all
+       @$(_SINGLE)$(SUBMAKE) -s -C scripts/config all
+
+$(eval $(call rdep,scripts/config,scripts/config/mconf))

 
 scripts/config/conf:
 
 scripts/config/conf:

-       $(MAKE) -C scripts/config conf
+       @$(_SINGLE)$(SUBMAKE) -s -C scripts/config conf

 
 config: scripts/config/conf prepare-tmpinfo FORCE
        $< Config.in
 
 config-clean: FORCE
 
 config: scripts/config/conf prepare-tmpinfo FORCE
        $< Config.in
 
 config-clean: FORCE

-       $(NO_TRACE_MAKE) -C scripts/config clean
+       $(_SINGLE)$(NO_TRACE_MAKE) -C scripts/config clean

 
 defconfig: scripts/config/conf prepare-tmpinfo FORCE
        touch .config
        $< -D .config Config.in
 
 oldconfig: scripts/config/conf prepare-tmpinfo FORCE
 
 defconfig: scripts/config/conf prepare-tmpinfo FORCE
        touch .config
        $< -D .config Config.in
 
 oldconfig: scripts/config/conf prepare-tmpinfo FORCE

-       $< -o Config.in
+       $< -$(if $(CONFDEFAULT),$(CONFDEFAULT),o) Config.in

 
 menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
 
 menuconfig: scripts/config/mconf prepare-tmpinfo FORCE

-       if [ \! -f .config -a -e $(HOME)/.openwrt/defconfig ]; then \
+       if [ \! -e .config -a -e $(HOME)/.openwrt/defconfig ]; then \

                cp $(HOME)/.openwrt/defconfig .config; \
        fi
        $< Config.in
 
 kernel_oldconfig: .config FORCE
                cp $(HOME)/.openwrt/defconfig .config; \
        fi
        $< Config.in
 
 kernel_oldconfig: .config FORCE

-       $(NO_TRACE_MAKE) -C target/linux oldconfig
+       $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux oldconfig

 
 kernel_menuconfig: .config FORCE
 
 kernel_menuconfig: .config FORCE

-       $(NO_TRACE_MAKE) -C target/linux menuconfig
+       $(_SINGLE)$(NO_TRACE_MAKE) -C target/linux menuconfig

 
 tmp/.prereq-build: include/prereq-build.mk
        mkdir -p tmp
        rm -f tmp/.host.mk
 
 tmp/.prereq-build: include/prereq-build.mk
        mkdir -p tmp
        rm -f tmp/.host.mk

-       $(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
-               echo "Prerequisite check failed. Use FORCE=1 to override."; \
-               false; \
-       }
-       touch $@
-
-tmp/.prereq-package: tmp/.packageinfo
-tmp/.prereq-target: tmp/.targetinfo .config
-tmp/.prereq-package tmp/.prereq-target: include/prereq.mk 
-       mkdir -p tmp
-       rm -f tmp/.host.mk
-       $(NO_TRACE_MAKE) -s -C $(patsubst tmp/.prereq-%,%,$@) prereq 2>/dev/null || { \
+       @$(_SINGLE)$(NO_TRACE_MAKE) -j1 -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \

                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
        touch $@
 
                echo "Prerequisite check failed. Use FORCE=1 to override."; \
                false; \
        }
        touch $@
 

-prereq: tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target .config FORCE ;
-

 download: .config FORCE
 download: .config FORCE

-       $(MAKE) -j1 tools/download
-       $(MAKE) -j1 toolchain/download
-       $(MAKE) -j1 package/download
-       $(MAKE) -j1 target/download
+       @+$(SUBMAKE) tools/download
+       @+$(SUBMAKE) toolchain/download
+       @+$(SUBMAKE) package/download
+       @+$(SUBMAKE) target/download

 
 

-clean dirclean distclean:
-       @$(MAKE) $@ 
+clean dirclean: .config
+       @+$(SUBMAKE) $@ 
+
+prereq:: .config
+       @+$(MAKE) -s tmp/.prereq-build $(PREP_MK)
+       @+$(NO_TRACE_MAKE) -s $@

 
 %::
 
 %::

-       @$(SUBMAKE) -s prereq QUIET=0 OPENWRT_BUILD=
-       @$(MAKE) $@ 
+       @+$(PREP_MK) $(NO_TRACE_MAKE) -s prereq
+       @+$(SUBMAKE) -r $@

 
 help:
        cat README
 
 docs docs/compile: FORCE
 
 help:
        cat README
 
 docs docs/compile: FORCE

-       $(MAKE) -C docs compile
+       @$(_SINGLE)$(SUBMAKE) -C docs compile

 
 docs/clean: FORCE
 
 docs/clean: FORCE

-       $(MAKE) -C docs clean
+       @$(_SINGLE)$(SUBMAKE) -C docs clean

 
 

-symlinkclean:
-       -find package -type l | xargs rm -f
-       rm -rf tmp
+distclean:
+       rm -rf tmp build_dir staging_dir dl .config* feeds package/feeds package/openwrt-packages bin
+       @$(_SINGLE)$(SUBMAKE) -C scripts/config clean

 
 

-.SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target
+ifeq ($(findstring v,$(DEBUG)),)
+  .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package prepare-tmpinfo
+endif

 .PHONY: help FORCE
 .NOTPARALLEL:
 
 .PHONY: help FORCE
 .NOTPARALLEL: