KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

51
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.
@ -8,7 +8,7 @@
DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED) DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
# Try to guess the download method from the URL # Try to guess the download method from the URL
define dl_method define dl_method
$(strip \ $(strip \
$(if $(2),$(2), \ $(if $(2),$(2), \
$(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% file://%,$(1)),default, \ $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% file://%,$(1)),default, \
@ -16,9 +16,9 @@ $(strip \
$(if $(filter svn://%,$(1)),svn, \ $(if $(filter svn://%,$(1)),svn, \
$(if $(filter cvs://%,$(1)),cvs, \ $(if $(filter cvs://%,$(1)),cvs, \
$(if $(filter hg://%,$(1)),hg, \ $(if $(filter hg://%,$(1)),hg, \
unknown \ unknown \
) \ ) \
) \ ) \
) \ ) \
) \ ) \
) \ ) \
@ -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
@ -49,19 +49,18 @@ endef
define DownloadMethod/cvs define DownloadMethod/cvs
$(call wrap_mirror, \ $(call wrap_mirror, \
echo "Checking out files from the cvs repository..."; \ echo "Checking out files from the cvs repository..."; \
mkdir -p $(TMP_DIR)/dl && \ mkdir -p $(TMP_DIR)/dl && \
cd $(TMP_DIR)/dl && \ cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \ rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \ [ \! -d $(SUBDIR) ] && \
cvs -d $(URL) co $(VERSION) $(SUBDIR) && \ cvs -d $(URL) co $(VERSION) $(SUBDIR) && \
find $(SUBDIR) -name CVS | xargs rm -rf && \ find $(SUBDIR) -name CVS | xargs rm -rf && \
echo "Packing checkout..." && \ echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \ $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \ mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
) )
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