Resync x86_64 kernel config and make uml build ext2 images by default

[openwrt.git] / Makefile

diff --git a/Makefile b/Makefile
index f06b151..dbb4a0c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,11 +44,13 @@ endif
 package/%/Makefile: ;
 target/%/Makefile: ;
 
 package/%/Makefile: ;
 target/%/Makefile: ;
 

-tmp/.packageinfo: $(wildcard package/*/Makefile include/package*.mk include/kernel.mk) FORCE
-tmp/.targetinfo: $(wildcard target/*/Makefile include/kernel*.mk)  FORCE
-tmp/.%info:
+SCAN_COOKIE?=$(shell echo $$$$)
+export SCAN_COOKIE
+
+tmp/.packageinfo tmp/.targetinfo: FORCE

        mkdir -p tmp/info
        mkdir -p tmp/info

-       $(NO_TRACE_MAKE) -s -f include/scan.mk SCAN_TARGET="$*info" SCAN_DIR="$(patsubst target,target/linux,$*)" SCAN_NAME="$*" SCAN_DEPS="$(filter-out FORCE, $^)" 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=""
+       $(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=""

 
 tmpinfo-clean: FORCE
        -rm -rf tmp/.*info
 
 tmpinfo-clean: FORCE
        -rm -rf tmp/.*info


@@ -90,11 +92,12 @@ menuconfig: scripts/config/mconf tmp/.config-target.in tmp/.config-package.in FO
        fi
        $< Config.in
 
        fi
        $< Config.in
 

+kernel_oldconfig: .config FORCE
+       $(NO_TRACE_MAKE) -C target/linux oldconfig
+

 kernel_menuconfig: .config FORCE
 kernel_menuconfig: .config FORCE

-       -$(MAKE) target/linux-prepare

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

-

 package/% target/%: tmp/.packageinfo
 toolchain/% package/% target/%: tmp/.targetinfo
 package/% target/% tools/% toolchain/%: FORCE
 package/% target/%: tmp/.packageinfo
 toolchain/% package/% target/%: tmp/.targetinfo
 package/% target/% tools/% toolchain/%: FORCE


@@ -142,20 +145,21 @@ clean: FORCE
 dirclean: clean
        rm -rf staging_dir_* toolchain_build_* tool_build
 
 dirclean: clean
        rm -rf staging_dir_* toolchain_build_* tool_build
 

-distclean: dirclean config-clean symlinkclean docclean
+distclean: dirclean config-clean symlinkclean docs/clean

        rm -rf dl
 
 help:
        cat README
 
        rm -rf dl
 
 help:
        cat README
 

-doc:
-       $(MAKE) -C docs/ openwrt.pdf
+docs docs/compile: FORCE
+       $(MAKE) -C docs compile

 
 

-docclean:
-       $(MAKE) -C docs/ clean
+docs/clean: FORCE
+       $(MAKE) -C docs clean

 
 symlinkclean:
        -find package -type l | xargs rm -f
 
 symlinkclean:
        -find package -type l | xargs rm -f

+       rm -rf tmp

 
 .SILENT: clean dirclean distclean symlinkclean config-clean download world help tmp/.packageinfo tmp/.targetinfo tmpinfo-clean tmp/.config-package.in tmp/.config-target.in .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target
 FORCE: ;
 
 .SILENT: clean dirclean distclean symlinkclean config-clean download world help tmp/.packageinfo tmp/.targetinfo tmpinfo-clean tmp/.config-package.in tmp/.config-target.in .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target
 FORCE: ;