Changeset 347


Ignore:
Timestamp:
Sep 28, 2012, 8:02:13 AM (8 years ago)
Author:
ehem
Message:

Implement the highest priority portions of honoring the $(OPENWRT_BRANCH)
and $(OPENWRT_REVISION) split. Now the revision specified by
$(OPENWRT_REVISION) is honored when doing checkouts and updates.

Location:
branches/contrib
Files:
2 edited

Legend:

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

    r343 r347  
    8080        patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
    8181          < $(PATCHES_DIR_OPENWRT)/001_disable_all_openwrt_packages
    82 ifeq ($(IS_OPENWRT_TRUNK),y)
     82ifeq ($(OPENWRT_BRANCH),trunk)
    8383        patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
    8484          < $(PATCHES_DIR_OPENWRT)/trunk/002_install_kernel_modules_and_merge_debwrt_config
     
    8686          < $(PATCHES_DIR_OPENWRT)/trunk/005_make_empty_rootfs
    8787        #patch -d $(OPENWRT_BUILD_DIR) -p 1 -N  < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
    88 else ifeq ($(IS_OPENWRT_BACKFIRE),y)
     88else ifeq ($(OPENWRT_BRANCH),backfire)
    8989        patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
    9090          < $(PATCHES_DIR_OPENWRT)/backfire/002_install_kernel_modules_and_merge_debwrt_config
     
    101101        -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
    102102          < $(PATCHES_DIR_OPENWRT)/001_disable_all_openwrt_packages
    103 ifeq ($(IS_OPENWRT_TRUNK),y)
     103ifeq ($(OPENWRT_BRANCH),trunk)
    104104        -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
    105105          < $(PATCHES_DIR_OPENWRT)/trunk/002_install_kernel_modules_and_merge_debwrt_config
     
    107107          < $(PATCHES_DIR_OPENWRT)/trunk/005_make_empty_rootfs
    108108        #-patch -R -d $(OPENWRT_BUILD_DIR) -p 1 -N  < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
    109 else ifeq ($(IS_OPENWRT_BACKFIRE),y)
     109else ifeq ($(OPENWRT_BRANCH),backfire)
    110110        -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
    111111          < $(PATCHES_DIR_OPENWRT)/backfire/002_install_kernel_modules_and_merge_debwrt_config
     
    125125        touch $@
    126126
     127ifeq ($(OPENWRT_BRANCH),trunk)
     128OPENWRT_SUBVERSION:=svn://svn.openwrt.org/openwrt/trunk/
     129else
     130OPENWRT_SUBVERSION:=svn://svn.openwrt.org/openwrt/branches/$(OPENWRT_BRANCH)/
     131endif
     132
    127133$(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp:
    128134openwrt/checkout: $(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp
    129         rm -rf $(OPENWRT_BUILD_DIR)
    130         mkdir -p $(OPENWRT_BUILD_DIR)
    131 ifeq ($(IS_OPENWRT_TRUNK),y)
    132         cd $(OPENWRT_BUILD_DIR) && \
    133           svn co svn://svn.openwrt.org/openwrt/trunk/ .
    134 else ifeq ($(IS_OPENWRT_BACKFIRE),y)
    135         cd $(OPENWRT_BUILD_DIR) && \
    136           svn co svn://svn.openwrt.org/openwrt/branches/backfire/ .
    137 else
    138         cd $(OPENWRT_BUILD_DIR) && \
    139           svn co -r $(OPENWRT_REVISION) svn://svn.openwrt.org/openwrt/trunk/ .
    140 endif
    141         touch $(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp
    142         touch $@
     135        rm -rf $(OPENWRT_BUILD_DIR) && \
     136        svn co -r $(OPENWRT_REVISION) $(OPENWRT_SUBVERSION) $(OPENWRT_BUILD_DIR) && \
     137        touch $@ $<
    143138
    144139openwrt/update: openwrt/checkout
    145         cd $(OPENWRT_BUILD_DIR) && svn update
     140        svn up -r $(OPENWRT_REVISION) $(OPENWRT_BUILD_DIR)
    146141
    147142openwrt/menuconfig: openwrt/prepare
  • branches/contrib/rules/debwrt.mk

    r346 r347  
    4848OPENWRT_REVISION:=$(call qstrip,$(CONFIG_OPENWRT_REVISION))
    4949
    50 # OpenWrt Revision is trunk [y or emtpy]
    51 IS_OPENWRT_TRUNK:=$(call qstrip,$(CONFIG_OPENWRT_BRANCH_TRUNK))
    52 
    53 # OpenWrt Revision is branch [y or empty]
    54 IS_OPENWRT_BACKFIRE:=$(call qstrip,$(CONFIG_OPENWRT_BRANCH_BACKFIRE))
    55 
    5650# Base BuildDir
    5751BUILD_DIR_BASE:=$(TOPDIR)/build
     
    10195
    10296# OpenWrt Build (checkout) directory
    103 OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_REVISION)-$(LINUX_VERSION)
     97OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_BRANCH)-$(OPENWRT_REVISION)-$(LINUX_VERSION)
    10498
    10599# Special saved environment variables during OpenWrt's build process
Note: See TracChangeset for help on using the changeset viewer.