Changeset 728 for trunk/openwrt/patches


Ignore:
Timestamp:
Mar 3, 2016, 9:47:26 PM (4 years ago)
Author:
amain
Message:

Fix build hanging at make silentoldconfig

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/patches/all/021_install_kernel_modules_and_merge_debwrt_config

    r724 r728  
    1 --- openwrt/include/kernel-defaults.mk  2012-09-30 00:14:28.601162927 +0200
    2 +++ openwrt/include/kernel-defaults.mk.new      2012-09-30 00:14:17.834676182 +0200
    3 @@ -93,9 +93,11 @@
     1Index: trunk-HEAD/include/kernel-defaults.mk
     2===================================================================
     3--- trunk-HEAD/include/kernel-defaults.mk       (revision 36948)
     4+++ trunk-HEAD/include/kernel-defaults.mk       (working copy)
     5@@ -105,9 +105,11 @@
    46 endef
    57 
     
    1416        echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
    1517        echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
    16         echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target
    17 @@ -103,6 +105,8 @@
    18         $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override
    19         $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
     18        echo "CONFIG_KALLSYMS_UNCOMPRESSED=y" >> $(LINUX_DIR)/.config.target
     19@@ -114,6 +116,8 @@
     20        $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config $(KERNEL_PATCHVER) > $(LINUX_DIR)/.config.override
     21        $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config.set
    2022        $(call Kernel/SetNoInitramfs)
    2123+# DebWrt: merge new kernel config, say no to anything new
    2224+       +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig
    2325        rm -rf $(KERNEL_BUILD_DIR)/modules
    24         [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install
    25         $(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic
    26 @@ -114,7 +118,12 @@
     26        cmp -s $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.prev || { \
     27                cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config; \
     28@@ -120,6 +124,8 @@
     29                cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.prev; \
     30        }
     31        $(_SINGLE) [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install
     32+# DebWrt: merge new kernel config, say no to anything new, 2nd pass to make sure any *new* config options are automatically satisfied (no questions asked on console). Not sure why this needed
     33+       +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig
     34        $(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config.set | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic
     35 endef
     36 
     37@@ -129,7 +135,12 @@
    2738 
    2839 define Kernel/CompileModules/Default
Note: See TracChangeset for help on using the changeset viewer.