Changeset 171


Ignore:
Timestamp:
Feb 20, 2011, 1:21:30 AM (9 years ago)
Author:
amain
Message:

openwrt/all: is now only rebuild when debwrt's or openwrt's .config files have changed. Fixes ticket #91.

Location:
debwrt/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • debwrt/trunk/debian/rootfs/debian.mk

    r161 r171  
    8989        touch $@
    9090       
    91 debian/rootfs/clean-rootfs-dir: $(BUILD_DIR_BASE)
     91debian/rootfs/clean-rootfs-dir:
     92        mkdir -p $(BUILD_DIR_BASE)
    9293        sudo rm -rf $(ROOTFS_BUILD_DIR)
    9394        touch $@
  • debwrt/trunk/openwrt/openwrt.mk

    r165 r171  
    2020openwrt/all: openwrt/build
    2121        $(MAKE) -C $(TOPDIR) openwrt/deliver
     22        touch $@
    2223
    2324openwrt/build: openwrt/prepare
     
    2728        $(SCRIPT_CLEAN_EXEC) $(MAKE) -C $(OPENWRT_BUILD_DIR)
    2829endif
    29 
    30 openwrt/prepare: .config openwrt/checkout openwrt/patch openwrt/merge-config openwrt/download-link
    3130        touch $@
    3231
    33 openwrt/merge-config: $(TMP_DIR) openwrt/checkout openwrt/patch
     32openwrt/prepare: openwrt/checkout openwrt/patch openwrt/merge-config openwrt/download-link
     33        touch $@
     34
     35openwrt/merge-config: .config $(OPENWRT_BUILD_DIR)/.config openwrt/checkout openwrt/patch
     36        mkdir -p $(TMP_DIR)
    3437        @# Copy default OpenWrt settings
    3538        cp $(CONFIG_DIR)/openwrt.defconfig $(TMP_DIR)/.config_openwrt
     
    4447        @# Copy DebWrt config to the build dir - used to set kernel compile options
    4548        cp .config $(OPENWRT_BUILD_DIR)/.config.debwrt
     49        touch $@
    4650
    4751openwrt/download-link: openwrt/checkout
     
    4953        cd $(OPENWRT_BUILD_DIR) && if [ -d $(OPENWRT_DOWNLOAD_DIR) -a ! -e dl ]; then ln -snf $(OPENWRT_DOWNLOAD_DIR) dl; fi
    5054endif
     55        touch $@
    5156
    5257openwrt/patch: openwrt/checkout
  • debwrt/trunk/rules/debwrt.mk

    r61 r171  
    117117
    118118$(TMP_DIR) $(BIN_DIR) $(OPENWRT_BUILD_DIR) $(BUILD_DIR_BASE) $(INSTALL_DIR_BASE) $(INSTALL_DIR_OPENWRT) $(INSTALL_DIR_DEBIAN):
    119         mkdir -p $@
     119        if [ ! -d $@ ] && mkdir -p $@
    120120
Note: See TracChangeset for help on using the changeset viewer.