Changeset 556 for trunk/openwrt/patches/trunk/021_install_kernel_modules_and_merge_debwrt_config

Timestamp:

Nov 17, 2013, 10:29:44 PM (9 years ago)

Author:

amain

Message:

openwrt: fix trunk build issues

File:

• trunk/openwrt/patches/trunk/021_install_kernel_modules_and_merge_debwrt_config (modified) (2 diffs)

trunk/openwrt/patches/trunk/021_install_kernel_modules_and_merge_debwrt_config

@@ -1 +1 @@
 --- openwrt/include/kernel-defaults.mk  2012-09-30 00:14:28.601162927 +0200
 +++ openwrt/include/kernel-defaults.mk.new      2012-09-30 00:14:17.834676182 +0200
-@@ -96,9 +96,11 @@
- endif
+@@ -93,9 +93,11 @@
+ endef
  
  define Kernel/Configure/Default
@@ -14 +14 @@
         echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
         echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
-        echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target
-@@ -106,13 +108,20 @@
+        echo "# CONFIG_KALLSYMS_UNCOMPRESSED is not set" >> $(LINUX_DIR)/.config.target
+@@ -103,6 +105,8 @@
+        $(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config > $(LINUX_DIR)/.config.override
         $(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config
-        $(call Kernel/SetInitramfs)
-        rm -rf $(KERNEL_BUILD_DIR)/modules
+        $(call Kernel/SetNoInitramfs)
 +# DebWrt: merge new kernel config, say no to anything new
 +       +$(MAKE) $(KERNEL_MAKEOPTS) oldnoconfig
+        rm -rf $(KERNEL_BUILD_DIR)/modules
         [ -d $(LINUX_DIR)/user_headers ] || $(MAKE) $(KERNEL_MAKEOPTS) INSTALL_HDR_PATH=$(LINUX_DIR)/user_headers headers_install
         $(SH_FUNC) grep '=[ym]' $(LINUX_DIR)/.config | LC_ALL=C sort | md5s > $(LINUX_DIR)/.vermagic
- endef
+@@ -114,7 +118,12 @@
  
  define Kernel/CompileModules/Default