Changeset 347

Timestamp:

Sep 28, 2012, 8:02:13 AM (11 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:

• openwrt/openwrt.mk (modified) (5 diffs)
• rules/debwrt.mk (modified) (2 diffs)

branches/contrib/openwrt/openwrt.mk

@@ -80 +80 @@
         patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
           < $(PATCHES_DIR_OPENWRT)/001_disable_all_openwrt_packages
-ifeq ($(IS_OPENWRT_TRUNK),y)
+ifeq ($(OPENWRT_BRANCH),trunk)
         patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
           < $(PATCHES_DIR_OPENWRT)/trunk/002_install_kernel_modules_and_merge_debwrt_config
@@ -86 +86 @@
           < $(PATCHES_DIR_OPENWRT)/trunk/005_make_empty_rootfs
         #patch -d $(OPENWRT_BUILD_DIR) -p 1 -N  < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
-else ifeq ($(IS_OPENWRT_BACKFIRE),y)
+else ifeq ($(OPENWRT_BRANCH),backfire)
         patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
           < $(PATCHES_DIR_OPENWRT)/backfire/002_install_kernel_modules_and_merge_debwrt_config
@@ -101 +101 @@
         -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
           < $(PATCHES_DIR_OPENWRT)/001_disable_all_openwrt_packages
-ifeq ($(IS_OPENWRT_TRUNK),y)
+ifeq ($(OPENWRT_BRANCH),trunk)
         -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
           < $(PATCHES_DIR_OPENWRT)/trunk/002_install_kernel_modules_and_merge_debwrt_config
@@ -107 +107 @@
           < $(PATCHES_DIR_OPENWRT)/trunk/005_make_empty_rootfs
         #-patch -R -d $(OPENWRT_BUILD_DIR) -p 1 -N  < $(PATCHES_DIR_OPENWRT)/trunk/006_reverse-changeset27849-changes.patch
-else ifeq ($(IS_OPENWRT_BACKFIRE),y)
+else ifeq ($(OPENWRT_BRANCH),backfire)
         -patch -R -d $(OPENWRT_BUILD_DIR) -p 0 -N \
           < $(PATCHES_DIR_OPENWRT)/backfire/002_install_kernel_modules_and_merge_debwrt_config
@@ -125 +125 @@
         touch $@
 
+ifeq ($(OPENWRT_BRANCH),trunk)
+OPENWRT_SUBVERSION:=svn://svn.openwrt.org/openwrt/trunk/
+else
+OPENWRT_SUBVERSION:=svn://svn.openwrt.org/openwrt/branches/$(OPENWRT_BRANCH)/
+endif
+
 $(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp:
 openwrt/checkout: $(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp
-        rm -rf $(OPENWRT_BUILD_DIR)
-        mkdir -p $(OPENWRT_BUILD_DIR)
-ifeq ($(IS_OPENWRT_TRUNK),y)
-        cd $(OPENWRT_BUILD_DIR) && \
-          svn co svn://svn.openwrt.org/openwrt/trunk/ .
-else ifeq ($(IS_OPENWRT_BACKFIRE),y)
-        cd $(OPENWRT_BUILD_DIR) && \
-          svn co svn://svn.openwrt.org/openwrt/branches/backfire/ .
-else
-        cd $(OPENWRT_BUILD_DIR) && \
-          svn co -r $(OPENWRT_REVISION) svn://svn.openwrt.org/openwrt/trunk/ .
-endif
-        touch $(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp
-        touch $@
+        rm -rf $(OPENWRT_BUILD_DIR) && \
+        svn co -r $(OPENWRT_REVISION) $(OPENWRT_SUBVERSION) $(OPENWRT_BUILD_DIR) && \
+        touch $@ $<
 
 openwrt/update: openwrt/checkout
-        cd $(OPENWRT_BUILD_DIR) && svn update
+        svn up -r $(OPENWRT_REVISION) $(OPENWRT_BUILD_DIR)
 
 openwrt/menuconfig: openwrt/prepare

branches/contrib/rules/debwrt.mk

@@ -48 +48 @@
 OPENWRT_REVISION:=$(call qstrip,$(CONFIG_OPENWRT_REVISION))
 
-# OpenWrt Revision is trunk [y or emtpy]
-IS_OPENWRT_TRUNK:=$(call qstrip,$(CONFIG_OPENWRT_BRANCH_TRUNK))
-
-# OpenWrt Revision is branch [y or empty]
-IS_OPENWRT_BACKFIRE:=$(call qstrip,$(CONFIG_OPENWRT_BRANCH_BACKFIRE))
-
 # Base BuildDir
 BUILD_DIR_BASE:=$(TOPDIR)/build
@@ -101 +95 @@
 
 # OpenWrt Build (checkout) directory
-OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_REVISION)-$(LINUX_VERSION)
+OPENWRT_BUILD_DIR:=$(BUILD_DIR_BASE)/openwrt-$(BOARD)-$(SUB_BOARD)-$(OPENWRT_BRANCH)-$(OPENWRT_REVISION)-$(LINUX_VERSION)
 
 # Special saved environment variables during OpenWrt's build process