Ignore:
Timestamp:
Nov 30, 2015, 6:09:45 AM (5 years ago)
Author:
ehem
Message:

Drag in changes to trunk

Coordination is interesting to deal with. Drag in changes that were done
on trunk.

Location:
branches/contrib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/contrib

  • branches/contrib/rules/debwrt.mk

    r650 r707  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 RELEASE:=testing
    19 BUILD_CYCLE_ID:=-1
    20 VERSION:=2.1$(BUILD_CYCLE_ID)
     18RELEASE:=unstable
     19BUILD_CYCLE_ID:=
     20VERSION:=$(BUILD_CYCLE_ID)
    2121RELEASE_DATE=$(shell LC_ALL=c date +"%d %B %Y")
    2222SVN_REVISION:=$(call get_svn_revision)
    2323DEBWRTVERSION:=$(RELEASE) - $(VERSION) - [ $(RELEASE_DATE) ($(SVN_REVISION)) ]
    24 DEBWRT_VERSION:=$(RELEASE)-$(VERSION)
     24ifeq ($(VERSION),)
     25    DEBWRT_VERSION:=$(RELEASE)
     26else
     27    DEBWRT_VERSION:=$(RELEASE)-$(VERSION)
     28endif
    2529
    2630empty:=
     
    3337TARGET_ARCH:=$(call qstrip,$(CONFIG_ARCH))
    3438
    35 # Board [example: ar7xx]
    36 BOARD:=$(call qstrip,$(CONFIG_TARGET_BOARD))
    37 
    38 # Sub board [example: ubnt-rspro]
    39 SUB_BOARD:=$(shell $(SCRIPT_GET_BOARD) $(TOPDIR)/.config $(BOARD))
     39# Board
     40# Example:
     41#      target    : ar71xx
     42#      sub_target: generic
     43#      profile   : ubntrspro
     44TARGET:=$(shell $(SCRIPT_GET_TARGET) target $(TOPDIR)/.config)
     45SUB_TARGET:=$(shell $(SCRIPT_GET_TARGET) subtarget $(TOPDIR)/.config)
     46PROFILE:=$(shell $(SCRIPT_GET_TARGET) profile $(TOPDIR)/.config)
    4047
    4148# Linux version [2.6.X(.X)]
     
    5158OPENWRT_REVISION:=$(call qstrip,$(CONFIG_OPENWRT_REVISION))
    5259
    53 # Base BuildDir
    54 BUILD_DIR_BASE:=$(TOPDIR)/build
     60# bin/delivery dir
     61BIN_DIR:=$(TOPDIR)/bin
     62
     63# build dir
     64BUILD_DIR:=$(TOPDIR)/build
     65
     66# tmp dir
     67TMP_DIR:=$(TOPDIR)/tmp
    5568
    5669# Config dir
     
    6073PLUGINS_DIR:=$(TOPDIR)/plugins
    6174
    62 # bin/delivery dir
    63 BIN_DIR:=$(TOPDIR)/bin
    64 
    65 # tmp dir
    66 TMP_DIR:=$(TOPDIR)/tmp
     75# Base BuildDir
     76BUILD_DIR_BASE:=$(BUILD_DIR)/$(DEBWRT_VERSION)
    6777
    6878# Install dir
    69 INSTALL_DIR:=$(BIN_DIR)/$(BOARD)-$(SUB_BOARD)-$(DEBWRT_VERSION)
     79INSTALL_DIR_BASE:=$(BIN_DIR)/$(DEBWRT_VERSION)
    7080
    7181# Install dir for OpenWrt binaries
    72 INSTALL_DIR_OPENWRT:=$(INSTALL_DIR)/openwrt
     82INSTALL_DIR_OPENWRT:=$(INSTALL_DIR_BASE)/firmware/${TARGET_ARCH}/$(TARGET)/$(SUB_TARGET)
    7383
    7484# Install dir OpenWrt kernel modules
     
    8292
    8393# Image file containing OpenWrt kernel modules
    84 MODULES_TAR_GZ=debwrt-modules-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.gz
     94MODULES_TAR_GZ=debwrt-modules-$(TARGET_ARCH)-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.gz
    8595
    8696# Image file containing OpenWrt kernel headers
    87 HEADERS_TAR_GZ=debwrt-headers-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.gz
    88 
    89 # Image file containing DebWrt rootfs
    90 ROOTFS_TAR_BZ2=debwrt-rootfs-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.bz2
     97HEADERS_TAR_GZ=debwrt-headers-$(TARGET_ARCH)-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).tar.gz
    9198
    9299# Filename of DebWrt firmware image
    93 TARGET_IMAGE_NAME_BIN=debwrt-firmware-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).bin
    94 TARGET_IMAGE_NAME_TRX=debwrt-firmware-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).trx
     100TARGET_IMAGE_NAME_BIN=debwrt-firmware-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).bin
     101TARGET_IMAGE_NAME_TRX=debwrt-firmware-$(TARGET)-$(SUB_TARGET)-$(OPENWRT_LINUX_UNAME_VERSION)-$(DEBWRT_VERSION).trx
    95102
    96103# OpenWrt patches directory
     
    102109# OpenWrt Build (checkout) directory
    103110ifeq ($(OPENWRT_TAG),)
    104 OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_BRANCH)-$(OPENWRT_REVISION)
     111OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt/$(TARGET_ARCH)/$(TARGET)/$(SUB_TARGET)/$(OPENWRT_BRANCH)-$(OPENWRT_REVISION)
    105112else
    106 OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_TAG)
     113OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt/$(TARGET_ARCH)/$(TARGET)/$(SUB_TARGET)/$(OPENWRT_TAG)
    107114endif
    108115
     
    113120OPENWRT_DOWNLOAD_DIR:=$(call qstrip,$(CONFIG_OPENWRT_DOWNLOAD_DIR))
    114121
    115 # Debian build environment version
    116 DEBIAN_BUILD_VERSION:=$(call qstrip,$(CONFIG_DEBWRT_DEBIAN_RELEASE))
    117 
    118122# Debian
    119 DEBIAN_BUILD_DIR:=$(BUILD_DIR_BASE)/debian-$(BOARD)-$(SUB_BOARD)-$(DEBIAN_BUILD_VERSION)
     123DEBIAN_BUILD_DIR:=$(BUILD_DIR_BASE)/debian-$(TARGET)-$(SUB_TARGET)-$(DEBIAN_BUILD_VERSION)
    120124
    121125DEBIAN_BUILD_PKG_DIR:=$(BUILD_DIR_BASE)/debian-buildhost-$(DEBIAN_BUILD_VERSION)
     
    129133
    130134# Debian rootfs
    131 ROOTFS_BUILD_DIR:=$(BUILD_DIR_BASE)/rootfs-$(TARGET_ARCH)-$(DEBWRT_VERSION)
     135ROOTFS_DEBIAN_ARCH:=$(call qstrip,$(CONFIG_ROOTFS_DEBIAN_ARCH))
     136ROOTFS_DEBIAN_RELEASE:=$(call qstrip,$(CONFIG_ROOTFS_DEBIAN_RELEASE))
     137ROOTFS_BUILD_DIR:=$(BUILD_DIR_BASE)/rootfs/$(ROOTFS_DEBIAN_RELEASE)/${ROOTFS_DEBIAN_ARCH}
     138ROOTFS_INSTALL_DIR:=$(INSTALL_DIR_BASE)/rootfs/$(ROOTFS_DEBIAN_RELEASE)/${ROOTFS_DEBIAN_ARCH}
     139
     140# Image file containing DebWrt rootfs
     141ROOTFS_TAR_BZ2=debwrt-rootfs-$(ROOTFS_DEBIAN_RELEASE)-$(ROOTFS_DEBIAN_ARCH)-$(DEBWRT_VERSION).tar.bz2
    132142
    133143# Export defaults to other Makefiles
Note: See TracChangeset for help on using the changeset viewer.