Changeset 517 for trunk/rules/debwrt.mk


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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/rules/debwrt.mk

    r332 r517  
    2020VERSION:=2.1$(BUILD_CYCLE_ID)
    2121RELEASE_DATE=$(shell LC_ALL=c date +"%d %B %Y")
    22 SVN_REVISION:=$(shell $(SCRIPT_GET_SVN_REVISION))
     22SVN_REVISION:=$(call get_svn_revision)
    2323DEBWRTVERSION:=$(RELEASE) - $(VERSION) - [ $(RELEASE_DATE) ($(SVN_REVISION)) ]
    2424DEBWRT_VERSION:=$(RELEASE)-$(VERSION)
     
    4242LINUX_VERSION:=$(call qstrip,$(CONFIG_DEBWRT_KERNEL_VERSION))
    4343
    44 # OpenWrt Revision to checkout [rXXXX]
     44# OpenWrt Branch to checkout [trunk|<otherbranchname>]
     45OPENWRT_BRANCH:=$(call qstrip,$(CONFIG_OPENWRT_BRANCH))
     46
     47# OpenWrt Release Tag to checkout
     48OPENWRT_TAG:=$(call qstrip,$(CONFIG_OPENWRT_TAG))
     49
     50# OpenWrt Revision to checkout [suitable for `svn -r XXXXX`]
    4551OPENWRT_REVISION:=$(call qstrip,$(CONFIG_OPENWRT_REVISION))
    46 
    47 # OpenWrt Revision is trunk [y or emtpy]
    48 IS_OPENWRT_TRUNK:=$(call qstrip,$(CONFIG_OPENWRT_REVISION_TRUNK))
    49 
    50 # OpenWrt Revision is branch [y or empty]
    51 IS_OPENWRT_BACKFIRE:=$(call qstrip,$(CONFIG_OPENWRT_REVISION_BACKFIRE))
    5252
    5353# Base BuildDir
     
    8282
    8383# Image file containing OpenWrt kernel modules
    84 MODULES_TAR_GZ=debwrt-modules-${BOARD}-${SUB_BOARD}-${OPENWRT_LINUX_UNAME_VERSION}-$(DEBWRT_VERSION).tar.gz
     84MODULES_TAR_GZ=debwrt-modules-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.gz
    8585
    8686# Image file containing OpenWrt kernel headers
    87 HEADERS_TAR_GZ=debwrt-headers-${BOARD}-${SUB_BOARD}-${OPENWRT_LINUX_UNAME_VERSION}-$(DEBWRT_VERSION).tar.gz
     87HEADERS_TAR_GZ=debwrt-headers-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.gz
     88
     89# Image file containing DebWrt rootfs
     90ROOTFS_TAR_BZ2=debwrt-rootfs-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.bz2
    8891
    8992# Filename of DebWrt firmware image
    90 TARGET_IMAGE_NAME_BIN=debwrt-firmware-${BOARD}-${SUB_BOARD}-${OPENWRT_LINUX_UNAME_VERSION}-$(DEBWRT_VERSION).bin
    91 TARGET_IMAGE_NAME_TRX=debwrt-firmware-${BOARD}-${SUB_BOARD}-${OPENWRT_LINUX_UNAME_VERSION}-$(DEBWRT_VERSION).trx
     93TARGET_IMAGE_NAME_BIN=debwrt-firmware-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).bin
     94TARGET_IMAGE_NAME_TRX=debwrt-firmware-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).trx
    9295
    9396# OpenWrt patches directory
     
    98101
    99102# OpenWrt Build (checkout) directory
    100 OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_REVISION)-$(LINUX_VERSION)
     103ifeq ($(OPENWRT_TAG),)
     104OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_BRANCH)-$(OPENWRT_REVISION)-$(LINUX_VERSION)
     105else
     106OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_BRANCH)-$(OPENWRT_TAG)-$(LINUX_VERSION)
     107endif
    101108
    102109# Special saved environment variables during OpenWrt's build process
Note: See TracChangeset for help on using the changeset viewer.