Changeset 730 for trunk


Ignore:
Timestamp:
Mar 4, 2016, 1:06:06 PM (5 years ago)
Author:
amain
Message:

Move to git

Location:
trunk
Files:
4 deleted
2 edited
6 moved

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r727 r730  
    8484endif
    8585        rm -rf $(BIN_DIR)
     86
     87distclean:
     88        rm -rf $(BIN_DIR)
     89        rm -rf $(BUILD_DIR)
    8690        rm -f .config
     91
    8792
    8893.PHONY: clean all world flash board update-targets
  • trunk/openwrt/openwrt.mk

    r727 r730  
    3838        find \
    3939          $(OPENWRT_PATCH_DIRS) \
    40           -name .svn -prune -o \! -type d -printf %f/%p\\n | \
     40          -name .svn -prune -o \! -type d -printf %f/%p\\n 2>/dev/null | \
    4141        gawk -F / '\
    4242          BEGIN { OFS=FS } \
     
    158158        touch $@
    159159
     160CONFIG_OPENWRT_SVN_REPO_URL=git://git.openwrt.org
    160161ifeq ($(OPENWRT_BRANCH),trunk)
    161 OPENWRT_SUBVERSION:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/trunk/
    162 else ifeq ($(OPENWRT_TAG),)
    163 OPENWRT_SUBVERSION:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/branches/$(OPENWRT_BRANCH)/
     162OPENWRT_GIT:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/openwrt.git
    164163else
    165 OPENWRT_SUBVERSION:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/tags/$(OPENWRT_TAG)
     164OPENWRT_GIT:=$(call qstrip,$(CONFIG_OPENWRT_SVN_REPO_URL))/$(OPENWRT_BRANCH)/openwrt.git
    166165endif
    167166
     
    170169        if [ ! -f $(TOPDIR)/.config ]; then echo "Please type menuconfig first"; exit 1; fi
    171170        mkdir -p $(OPENWRT_BUILD_DIR)
    172         svn co -r $(OPENWRT_REVISION) $(OPENWRT_SUBVERSION) $(OPENWRT_BUILD_DIR)
     171        git clone $(OPENWRT_GIT) $(OPENWRT_BUILD_DIR)
     172ifneq ($(OPENWRT_REVISION),HEAD)
     173        cd $(OPENWRT_BUILD_DIR); git checkout $(OPENWRT_REVISION)
     174endif
    173175        touch $(OPENWRT_BUILD_DIR)/.debwrt.checkout.stamp
    174176        touch $@
    175177
    176 openwrt/update: openwrt/checkout
    177         svn up -r $(OPENWRT_REVISION) $(OPENWRT_BUILD_DIR)
     178openwrt/update: openwrt/checkout openwrt/patch
     179        $(MAKE) openwrt/unpatch
     180        cd $(OPENWRT_BUILD_DIR); git pull origin master
     181        $(MAKE) openwrt/patch
    178182
    179183openwrt/menuconfig: openwrt/prepare
Note: See TracChangeset for help on using the changeset viewer.