domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

this patch adds support for bzr in include/download.mk, and fixes whitespace.

Browse Source 
-Raphael

SVN-Revision: 19769
This commit is contained in:
Travis Kemen
2010-02-20 04:48:07 +00:00
parent 25a5fab34c
commit f04ad5bb5f
1 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/download.mk
View File

@@ -1,5 +1,5 @@
# #
# Copyright (C) 2007 OpenWrt.org # Copyright (C) 2006-2010 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@@ -26,7 +26,7 @@ $(strip \
) )
endef endef
# code for creating tarballs from cvs/svn/git/hg checkouts - useful for mirror support # code for creating tarballs from cvs/svn/git/bzr/hg checkouts - useful for mirror support
dl_pack/bz2=$(TAR) cfj $(1) $(2) dl_pack/bz2=$(TAR) cfj $(1) $(2)
dl_pack/gz=$(TAR) cfz $(1) $(2) dl_pack/gz=$(TAR) cfz $(1) $(2)
dl_pack/unknown=echo "ERROR: Unknown pack format for file $(1)"; false dl_pack/unknown=echo "ERROR: Unknown pack format for file $(1)"; false
@@ -61,7 +61,6 @@ define DownloadMethod/cvs
) )
endef endef
define DownloadMethod/svn define DownloadMethod/svn
$(call wrap_mirror, \ $(call wrap_mirror, \
echo "Checking out files from the svn repository..."; \ echo "Checking out files from the svn repository..."; \
@@ -93,6 +92,21 @@ define DownloadMethod/git
) )
endef endef
define DownloadMethod/bzr
$(call wrap_mirror, \
echo "Checking out files from the bzr repository..."; \
mkdir -p $(TMP_DIR)/dl && \
cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \
bzr co --lightweight -r$(VERSION) $(URL) $(SUBDIR) && \
find $(SUBDIR) -name .bzr | xargs rm -rf && \
echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
)
endef
define DownloadMethod/hg define DownloadMethod/hg
$(call wrap_mirror, \ $(call wrap_mirror, \
echo "Checking out files from the hg repository..."; \ echo "Checking out files from the hg repository..."; \
@@ -111,6 +125,7 @@ endef
Validate/cvs=VERSION SUBDIR Validate/cvs=VERSION SUBDIR
Validate/svn=VERSION SUBDIR Validate/svn=VERSION SUBDIR
Validate/git=VERSION SUBDIR Validate/git=VERSION SUBDIR
Validate/bzr=VERSION SUBDIR
Validate/hg=VERSION SUBDIR Validate/hg=VERSION SUBDIR
define Download/Defaults define Download/Defaults