source: trunk/openwrt/patches/backfire/021_install_kernel_modules_and_merge_debwrt_config @ 517

Last change on this file since 517 was 517, checked in by amain, 6 years ago

Merge contrib branch 340:516. Main features added:

  • updated plugin architecture
  • improved patch system
  • bitten continous integration support
  • sever build fixed over time to remain in sync with OpenWrt
File size: 1.4 KB
RevLine 
[430]1--- openwrt/include/kernel-defaults.mk.org      2010-01-24 18:54:27.180961698 +0100
2+++ openwrt/include/kernel-defaults.mk  2010-01-24 18:54:16.741060956 +0100
[21]3@@ -96,7 +96,9 @@
4        -$(_SINGLE)$(MAKE) $(KERNEL_MAKEOPTS) oldconfig prepare scripts
5 endef
6 define Kernel/Configure/Default
7-       $(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target
8+       # DebWrt: merge our custom config
9+       $(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target.default
10+       $(SCRIPT_DIR)/kconfig.pl + $(LINUX_DIR)/.config.target.default $(TOPDIR)/.config.debwrt > $(LINUX_DIR)/.config.target
[138]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        echo "# CONFIG_KALLSYMS_EXTRA_PASS is not set" >> $(LINUX_DIR)/.config.target
[332]14@@ -113,7 +115,12 @@
[21]15 
16 define Kernel/CompileModules/Default
17        rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
18-       +$(MAKE) $(KERNEL_MAKEOPTS) modules
19+       # DebWrt make modules install
20+       -mkdir -p $(TMP_DIR)/modules
21+       +$(MAKE) $(KERNEL_MAKEOPTS) modules modules_install INSTALL_MOD_PATH=$(TMP_DIR)/modules
22+       echo "OPENWRT_LINUX_VERSION=$(LINUX_VERSION)" >> $(TOPDIR)/.openwrt_env
[332]23+       echo "OPENWRT_LINUX_UNAME_VERSION=$(LINUX_UNAME_VERSION)" >> $(TOPDIR)/.openwrt_env
[21]24+       echo "OPENWRT_LINUX_DIR=$(LINUX_DIR)" >> $(TOPDIR)/.openwrt_env
25 endef
26 
27 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.