Changeset 27


Ignore:
Timestamp:
Jun 25, 2010, 12:02:19 AM (9 years ago)
Author:
amain
Message:

Fix problem with merging our config with kernel config

File:
1 edited

Legend:

Unmodified
Added
Removed
  • debwrt/trunk/openwrt/patches/trunk/002_install_kernel_modules_and_merge_debwrt_config

    r21 r27  
    1 --- include/kernel-defaults.mk.org      2010-05-15 18:32:35.075275795 +0200
    2 +++ include/kernel-defaults.mk  2010-05-15 18:32:04.805270593 +0200
    3 @@ -98,7 +98,9 @@
     1--- include/kernel-defaults.mk.org      2010-06-25 00:00:14.942838440 +0200
     2+++ include/kernel-defaults.mk  2010-06-24 23:58:56.272846235 +0200
     3@@ -96,9 +96,11 @@
     4        -$(_SINGLE)$(MAKE) $(KERNEL_MAKEOPTS) oldconfig prepare scripts
     5 endef
    46 define Kernel/Configure/Default
    5         $(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target
     7-       $(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target
     8+       $(LINUX_CONFCMD) > $(LINUX_DIR)/.config.target.default
    69 # copy CONFIG_KERNEL_* settings over to .config.target
    710-       awk '/^(#[[:space:]]+)?CONFIG_KERNEL/{sub("CONFIG_KERNEL_","CONFIG_");print}' $(TOPDIR)/.config >> $(LINUX_DIR)/.config.target
Note: See TracChangeset for help on using the changeset viewer.