source: trunk/openwrt/patches/trunk/002_install_kernel_modules_and_merge_debwrt_config @ 332

Last change on this file since 332 was 332, checked in by amain, 8 years ago

Fix ticket #167: handle kernel version 3.0

File size: 1.7 KB
Line 
1Index: include/kernel-defaults.mk
2===================================================================
3--- include/kernel-defaults.mk  (revision 26508)
4+++ include/kernel-defaults.mk  (working copy)
5@@ -76,9 +76,11 @@
6 endif
7 
8 define Kernel/Configure/Default
9-       $(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target
10+       $(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target.default
11 # copy CONFIG_KERNEL_* settings over to .config.target
12-       awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target
13+       awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target.default
14+# DebWrt: merge our custom config
15+       $(SCRIPT_DIR)/kconfig.pl + $(LINUX_DIR)/.config.target.default $(TOPDIR)/.config.debwrt > $(LINUX_DIR)/.config.target
16        echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
17        echo "# CONFIG_KALLSYMS_ALL is not set" >> $(LINUX_DIR)/.config.target
18        echo "# CONFIG_KPROBES is not set" >> $(LINUX_DIR)/.config.target
19@@ -91,7 +93,12 @@
20 
21 define Kernel/CompileModules/Default
22        rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
23-       +$(MAKE) $(KERNEL_MAKEOPTS) modules
24+       # DebWrt make modules install
25+       -mkdir -p $(TMP_DIR)/modules
26+       +$(MAKE) $(KERNEL_MAKEOPTS) modules modules_install INSTALL_MOD_PATH=$(TMP_DIR)/modules
27+       echo "OPENWRT_LINUX_VERSION=$(LINUX_VERSION)" >> $(TOPDIR)/.openwrt_env
28+       echo "OPENWRT_LINUX_UNAME_VERSION=$(LINUX_UNAME_VERSION)" >> $(TOPDIR)/.openwrt_env
29+       echo "OPENWRT_LINUX_DIR=$(LINUX_DIR)" >> $(TOPDIR)/.openwrt_env
30 endef
31 
32 OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
Note: See TracBrowser for help on using the repository browser.