Changeset 513


Ignore:
Timestamp:
May 9, 2013, 10:44:44 PM (10 years ago)
Author:
ehem
Message:

Get another UUOC taken care of. When building an OpenWrt branch tag,
use the tag for the build directory name, rather than the revision (which
is usually "HEAD").

Location:
branches/contrib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/contrib/openwrt/openwrt.mk

    r510 r513  
    8686        cp $(CONFIG_DIR)/openwrt.defconfig $(TMP_DIR)/.config_openwrt
    8787        # Merge default OpenWrt settings with DebWrt menu config settings
    88         #cat .config | grep -v -e CONFIG_TARGET_BOARD -e "^#" >> $(TMP_DIR)/.config_openwrt
    89         cat .config | grep -v -e CONFIG_TARGET_BOARD >> $(TMP_DIR)/.config_openwrt
     88        grep -v -e CONFIG_TARGET_BOARD .config >> $(TMP_DIR)/.config_openwrt
    9089        # Merge default and menu settings with possibly altered settings in make menuconfig in OpenWrt
    9190        # note: settings manually made in OpenWrt menu config will be included!
  • branches/contrib/rules/debwrt.mk

    r510 r513  
    101101
    102102# OpenWrt Build (checkout) directory
     103ifeq ($(OPENWRT_TAG),)
    103104OPENWRT_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
    104108
    105109# Special saved environment variables during OpenWrt's build process
Note: See TracChangeset for help on using the changeset viewer.