Changeset 270


Ignore:
Timestamp:
May 25, 2011, 10:03:50 PM (8 years ago)
Author:
amain
Message:

debwrt-config: some kernel settings were missed because of filtering out CONFIG_* is not set.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • debwrt/trunk/openwrt/openwrt.mk

    r269 r270  
    5050        echo $(OPENWRT_BUILD_DIR)/.config
    5151
    52 openwrt/merge-config: \
    53   .config \
    54   $(OPENWRT_BUILD_DIR)/.config \
    55   openwrt/checkout openwrt/patch \
    56   # end openwrt/merge-config:
     52openwrt/merge-config: .config $(OPENWRT_BUILD_DIR)/.config openwrt/checkout openwrt/patch
    5753        mkdir -p $(TMP_DIR)
    58         @# Copy default OpenWrt settings
     54        # Copy default OpenWrt settings
    5955        cp $(CONFIG_DIR)/openwrt.defconfig $(TMP_DIR)/.config_openwrt
    60         @# Merge default OpenWrt settings with menu settings
    61         cat .config | grep -v -e CONFIG_TARGET_BOARD -e "^#" \
    62           >> $(TMP_DIR)/.config_openwrt
    63         @# Merge default and menu settings
    64         @#  with possibly altered settings in make menuconfig in OpenWrt
     56        # Merge default OpenWrt settings with menu settings
     57        #cat .config | grep -v -e CONFIG_TARGET_BOARD -e "^#" >> $(TMP_DIR)/.config_openwrt
     58        cat .config | grep -v -e CONFIG_TARGET_BOARD >> $(TMP_DIR)/.config_openwrt
     59        # Merge default and menu settings with possibly altered settings in make menuconfig in OpenWrt
    6560        touch $(OPENWRT_BUILD_DIR)/.config
    6661        cp $(OPENWRT_BUILD_DIR)/.config $(OPENWRT_BUILD_DIR)/.config.org
    67         @$(SCRIPT_KCONFIG) + $(OPENWRT_BUILD_DIR)/.config.org \
    68           $(TMP_DIR)/.config_openwrt > $(OPENWRT_BUILD_DIR)/.config
    69         @# Make sure the config is clean
     62        $(SCRIPT_KCONFIG) + $(OPENWRT_BUILD_DIR)/.config.org $(TMP_DIR)/.config_openwrt > $(OPENWRT_BUILD_DIR)/.config
     63        # Make sure the config is clean
    7064        $(SCRIPT_CLEAN_EXEC) $(MAKE) -C $(OPENWRT_BUILD_DIR) defconfig
    71         @# Copy DebWrt config to the build dir 
    72         @#  used to set kernel compile options
     65        # Copy DebWrt config to the build dir used to set kernel compile options
    7366        cp .config $(OPENWRT_BUILD_DIR)/.config.debwrt
    7467        touch $@
Note: See TracChangeset for help on using the changeset viewer.