Ignore:
Timestamp:
Nov 22, 2015, 12:34:16 PM (4 years ago)
Author:
amain
Message:

Relocate build/install dirs to prepare for building images for all targets

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/openwrt-deliver.mk

    r563 r696  
    7171
    7272openwrt/deliver/image: openwrt/deliver/prepare
    73         mkdir -p $(INSTALL_DIR)
     73        mkdir -p $(INSTALL_DIR_OPENWRT)
    7474        find $(OPENWRT_BIN_DIR) -maxdepth 1 -type f | while read fname; do \
    7575                tfname=`basename $$fname`; \
    7676                tfname=`echo $$tfname | sed 's/openwrt/debwrt-firmware/'`; \
    77                 cp -av $$fname $(INSTALL_DIR)/$$tfname; \
     77                cp -av $$fname $(INSTALL_DIR_OPENWRT)/$$tfname; \
    7878        done
    7979
    8080openwrt/deliver/kernel-modules: openwrt/deliver/prepare
    81         mkdir -p $(INSTALL_DIR) $(INSTALL_DIR_OPENWRT) $(INSTALL_DIR_OPENWRT_MODULES)
     81        mkdir -p $(INSTALL_DIR_OPENWRT) $(INSTALL_DIR_OPENWRT_MODULES)
    8282        mkdir -p $(INSTALL_DIR_OPENWRT_MODULES)/lib/modules
    8383        cp -r $(OPENWRT_TMP_DIR)/modules/lib/modules/$(OPENWRT_LINUX_UNAME_VERSION) $(INSTALL_DIR_OPENWRT_MODULES)/lib/modules
     
    8888        done
    8989        PATH="/sbin:/bin:/usr/sbin:/usr/bin" depmod -a -b $(INSTALL_DIR_OPENWRT_MODULES) $(OPENWRT_LINUX_UNAME_VERSION)
    90         tar czf $(INSTALL_DIR)/$(MODULES_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_MODULES) .
     90        tar czf $(INSTALL_DIR_OPENWRT)/$(MODULES_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_MODULES) .
    9191
    9292openwrt/deliver/kernel-headers: openwrt/deliver/prepare
     
    9898        #cp $(OPENWRT_LINUX_DIR)/include/linux/switch.h $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)/include/linux/switch.h
    9999        cp $(OPENWRT_LINUX_DIR)/.config $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)
    100         tar czf $(INSTALL_DIR)/$(HEADERS_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_HEADERS) .
     100        tar czf $(INSTALL_DIR_OPENWRT)/$(HEADERS_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_HEADERS) .
    101101
    102102openwrt/deliver/packages: openwrt/deliver/prepare
     
    105105
    106106openwrt/deliver/config: openwrt/deliver/prepare
    107         cp $(TOPDIR)/.config $(INSTALL_DIR)/config-debwrt
    108         cp $(OPENWRT_BUILD_DIR)/.config $(INSTALL_DIR)/config-openwrt
    109         cp $(OPENWRT_LINUX_DIR)/.config $(INSTALL_DIR)/config-kernel-$(OPENWRT_LINUX_VERSION)
    110         $(SCRIPT_GET_SVN_REVISION) $(OPENWRT_LINUX_DIR) > $(INSTALL_DIR)/openwrt-svn-revision
    111         $(SCRIPT_GET_SVN_REVISION) $(TOPDIR) > $(INSTALL_DIR)/debwrt-svn-revision
     107        cp $(TOPDIR)/.config $(INSTALL_DIR_OPENWRT)/config-debwrt
     108        cp $(OPENWRT_BUILD_DIR)/.config $(INSTALL_DIR_OPENWRT)/config-openwrt
     109        cp $(OPENWRT_LINUX_DIR)/.config $(INSTALL_DIR_OPENWRT)/config-kernel-$(OPENWRT_LINUX_VERSION)
     110        $(SCRIPT_GET_SVN_REVISION) $(OPENWRT_LINUX_DIR) > $(INSTALL_DIR_OPENWRT)/openwrt-svn-revision
     111        $(SCRIPT_GET_SVN_REVISION) $(TOPDIR) > $(INSTALL_DIR_OPENWRT)/debwrt-svn-revision
    112112
    113113openwrt/deliver/clean:
    114         rm -rf $(INSTALL_DIR)
     114        rm -rf $(INSTALL_DIR_OPENWRT)
    115115
Note: See TracChangeset for help on using the changeset viewer.