Ignore:
Timestamp:
Jun 26, 2013, 11:25:44 PM (6 years ago)
Author:
amain
Message:

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
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/openwrt

    • Property svn:ignore
      •  

        old new  
        77prepare
        88files-copy
         9unpatch
  • trunk/openwrt/openwrt-deliver.mk

    r332 r517  
    5050        @echo OPENWRT_LINUX_DIR=$(OPENWRT_LINUX_DIR)
    5151
    52 openwrt/deliver/check: ${OPENWRT_BIN_DIR} openwrt/deliver/import-config
     52openwrt/deliver/check: $(OPENWRT_BIN_DIR) openwrt/deliver/import-config
    5353  ifndef OPENWRT_PACKAGE_DIR
    5454        @echo OPENWRT_PACKAGE_DIR$(ERROR_MSG_NOCONF) && false
     
    7272openwrt/deliver/image: openwrt/deliver/prepare
    7373        mkdir -p $(INSTALL_DIR)
    74         find ${OPENWRT_BIN_DIR} -maxdepth 1 -type f | while read fname; do \
     74        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/'`; \
     
    8181        mkdir -p $(INSTALL_DIR) $(INSTALL_DIR_OPENWRT) $(INSTALL_DIR_OPENWRT_MODULES)
    8282        mkdir -p $(INSTALL_DIR_OPENWRT_MODULES)/lib/modules
    83         cp -r ${OPENWRT_TMP_DIR}/modules/lib/modules/${OPENWRT_LINUX_UNAME_VERSION} $(INSTALL_DIR_OPENWRT_MODULES)/lib/modules
    84         rm -f $(INSTALL_DIR_OPENWRT_MODULES)/lib/modules/${OPENWRT_LINUX_UNAME_VERSION}/build
    85         rm -f $(INSTALL_DIR_OPENWRT_MODULES)/lib/modules/${OPENWRT_LINUX_UNAME_VERSION}/source
     83        cp -r $(OPENWRT_TMP_DIR)/modules/lib/modules/$(OPENWRT_LINUX_UNAME_VERSION) $(INSTALL_DIR_OPENWRT_MODULES)/lib/modules
     84        rm -f $(INSTALL_DIR_OPENWRT_MODULES)/lib/modules/$(OPENWRT_LINUX_UNAME_VERSION)/build
     85        rm -f $(INSTALL_DIR_OPENWRT_MODULES)/lib/modules/$(OPENWRT_LINUX_UNAME_VERSION)/source
    8686        find $(OPENWRT_PACKAGE_DIR) -name "kmod-*" | while read fkmod; do \
    8787            $(SCRIPT_EXTRACT_KMODPKG) $$fkmod $(INSTALL_DIR_OPENWRT_MODULES) $(TMP_DIR) || true; \
    8888        done
    89         PATH="/sbin:/bin:/usr/sbin:/usr/bin" depmod -a -b $(INSTALL_DIR_OPENWRT_MODULES) ${OPENWRT_LINUX_UNAME_VERSION}
     89        PATH="/sbin:/bin:/usr/sbin:/usr/bin" depmod -a -b $(INSTALL_DIR_OPENWRT_MODULES) $(OPENWRT_LINUX_UNAME_VERSION)
    9090        tar czf $(INSTALL_DIR)/$(MODULES_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_MODULES) .
    9191
     
    9393        rm -rf $(INSTALL_DIR_OPENWRT_HEADERS)
    9494        mkdir -p $(INSTALL_DIR_OPENWRT_HEADERS)
    95         mkdir -p $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_UNAME_VERSION}
    96         cd $(OPENWRT_LINUX_DIR) && make headers_install ARCH=$(patsubst %el,%,$(TARGET_ARCH)) INSTALL_HDR_PATH=$(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_UNAME_VERSION}
     95        mkdir -p $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)
     96        cd $(OPENWRT_LINUX_DIR) && $(MAKE) headers_install ARCH=$(patsubst %el,%,$(TARGET_ARCH)) INSTALL_HDR_PATH=$(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)
    9797        # some overrides which are not cleanly installed by make headers_install
    98         cp $(OPENWRT_LINUX_DIR)/include/linux/switch.h $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_UNAME_VERSION}/include/linux/switch.h
    99         cp ${OPENWRT_LINUX_DIR}/.config $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-${OPENWRT_LINUX_UNAME_VERSION}
     98        cp $(OPENWRT_LINUX_DIR)/include/linux/switch.h $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)/include/linux/switch.h
     99        cp $(OPENWRT_LINUX_DIR)/.config $(INSTALL_DIR_OPENWRT_HEADERS)/usr/src/linux-headers-$(OPENWRT_LINUX_UNAME_VERSION)
    100100        tar czf $(INSTALL_DIR)/$(HEADERS_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_HEADERS) .
    101101
     
    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}
     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)
    110110        $(SCRIPT_GET_SVN_REVISION) $(OPENWRT_LINUX_DIR) > $(INSTALL_DIR)/openwrt-svn-revision
    111111        $(SCRIPT_GET_SVN_REVISION) $(TOPDIR) > $(INSTALL_DIR)/debwrt-svn-revision
Note: See TracChangeset for help on using the changeset viewer.