gentargets: add scp and Mercurial download helpers

This patch adds support for scp:// both for use in the package Makefiles, as for the BR2_PRIMARY_SITE variable.

This patch was based on the work of Richard Guy Briggs (see https://bugs.busybox.net/show_bug.cgi?id=3343).

Signed-off-by Thomas De Schampheleire <[email protected]>

---
v2: update based on comments of Thomas Petazzoni

?Config.in ? ? ? ? ? ? ? ? ? | ?13 ++++++++++++- ?package/Makefile.package.in | ?55
+++++++++++++++++++++++++++++++++++++++++++++++++------
?2 files changed, 61 insertions(+), 7 deletions(-)

Config.in +0 -0

@@ -36,6 +36,14 @@ config BR2_LOCALFILES

? ? ? ?string "Local files retrieval command"
? ? ? ?default "cp"

Config.in +8 -0

+config BR2_SCP
+ ? ? ? string "Secure copy (scp) command"
+ ? ? ? default "scp"
+
+config BR2_SSH
+ ? ? ? string "Secure shell (ssh) command"
+ ? ? ? default "ssh"
+

?config BR2_ZCAT
? ? ? ?string "zcat command"
? ? ? ?default "gzip -d -c"

Config.in +0 -0

@@ -102,7 +110,10 @@ config BR2_PRIMARY_SITE

? ? ? ? ?Primary site to download from. If this option is set then buildroot ? ? ? ? ?will try to download package source first from this site and try the ? ? ? ? ?default if the file is not found.
- ? ? ? ? NOTE: This only works for packages using the Makefile.autotools.in
+ ? ? ? ? Valid URIs are URIs recognized by $(WGET) and scp URIs of the form
+ ? ? ? ? scp://[user@]host:path .
+ ? ? ? ? NOTE: This works for all packages using the central package
+ ? ? ? ? infrastructure (generic, autotools, cmake, ...)

?config BR2_BACKUP_SITE
? ? ? ?string "Backup download site"

package/Makefile.package.in +2 -0

@@ -92,6 +92,8 @@ WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET
 ?SVN:=$(call qstrip,$(BR2_SVN))
 ?BZR:=$(call qstrip,$(BR2_BZR))
 ?GIT:=$(call qstrip,$(BR2_GIT))
+SCP:=$(call qstrip,$(BR2_SCP)) $(QUIET)
+SSH:=$(call qstrip,$(BR2_SSH)) $(QUIET)
 ?LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES))
 

?# Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'

package/Makefile.package.in +0 -0

@@ -104,20 +106,39 @@ ifeq ($(DL_DIR),)

?DL_DIR:=$(TOPDIR)/dl
?endif

package/Makefile.package.in +18 -0

+#
+# URI scheme helper functions
+# Example URIs:
+# * http://www.example.com/dir/file
+# * scp://www.example.com:dir/file (with domainseparator :)
+#
+# geturischeme: http
+geturischeme=$(firstword $(subst ://, ,$(call qstrip,$(1))))
+# stripurischeme: www.example.com/dir/file
+stripurischeme=$(lastword $(subst ://, ,$(call qstrip,$(1))))
+# domain: www.example.com
+domain=$(firstword $(subst $(call domainseparator,$(2)), ,$(call stripurischeme,$(1))))
+# notdomain: dir/file
+notdomain=$(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$(call stripurischeme,$(1)))
+#
+# default domainseparator is /, specify alternative value as first argument
+domainseparator=$(if $(1),$(1),/)
+

?################################################################################ ?# The DOWNLOAD_{GIT,SVN,BZR,LOCALFILES} helpers are in charge of getting a ?# working copy of the source repository for their corresponding SCM, ?# checking out the requested version / commit / tag, and create an

package/Makefile.package.in +2 -1

-# archive out of it. DOWNLOAD_WGET is the normal wget-based download
+# archive out of it. DOWNLOAD_SCP uses scp to obtain a remote file with
+# ssh authentication. DOWNLOAD_WGET is the normal wget-based download

?# mechanism.
?#

package/Makefile.package.in +2 -2

-# The SOURCE_CHECK_{GIT,SVN,BZR,WGET,LOCALFILES} helpers are in charge of simply
-# checking that the source is available for download. This can be used
+# The SOURCE_CHECK_{GIT,SVN,BZR,WGET,LOCALFILES,SCP} helpers are in charge of
+# simply checking that the source is available for download. This can be used

?# to make sure one will be able to get all the sources needed for ?# one's build configuration.
?#

package/Makefile.package.in +2 -2

-# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,WGET,LOCALFILES} helpers simply output to
-# the console the names of the files that will be downloaded, or path
+# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,WGET,LOCALFILES,SCP} helpers simply output
+# to the console the names of the files that will be downloaded, or path

?# and revision of the source repositories, producing a list of all the ?# "external dependencies" of a given build configuration. ?################################################################################

package/Makefile.package.in +0 -0

@@ -176,6 +197,22 @@ define SHOW_EXTERNAL_DEPS_SVN
 ? echo $($(PKG)_SOURCE)

?endef

package/Makefile.package.in +16 -0

+# SCP URIs should be of the form scp://[user@]host:filepath
+# Note that filepath is relative to the user's home directory, so you may want
+# to prepend the path with a slash: scp://[user@]host:/absolutepath
+define DOWNLOAD_SCP
+ ? ? ? test -e $(DL_DIR)/$(2) || \
+ ? ? ? $(SCP) $(call stripurischeme,$(call qstrip,$(1)))/$(2) $(DL_DIR)
+endef
+
+define SOURCE_CHECK_SCP
+ ? ? ? $(SSH) $(call domain,$(1),:) ls $(call notdomain,$(1)/$(2),:) > /dev/null
+endef
+
+define SHOW_EXTERNAL_DEPS_SCP
+ ? ? ? echo $(2)
+endef
+

?define DOWNLOAD_WGET
? ? ? ?test -e $(DL_DIR)/$(2) || \

package/Makefile.package.in +0 -0

@@ -218,7 +255,10 @@ endef
 

?define DOWNLOAD
? ? ? ?$(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \
- ? ? ? ? ? ? ? $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE),$(2)) && exit ; \
+ ? ? ? ? ? ? ? case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \
+ ? ? ? ? ? ? ? ? ? ? ? scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
+ ? ? ? ? ? ? ? ? ? ? ? *) $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
+ ? ? ? ? ? ? ? esac ; \
? ? ? ?fi ; \
? ? ? ?if test -n "$(1)" ; then \
? ? ? ? ? ? ? ?case "$($(PKG)_SITE_METHOD)" in \

package/Makefile.package.in +1 -0

@@ -226,6 +266,7 @@ define DOWNLOAD
 ? ? ? ? ? ? ? ? ? ? ? ?svn) $($(DL_MODE)_SVN) && exit ;; \
 ? ? ? ? ? ? ? ? ? ? ? ?bzr) $($(DL_MODE)_BZR) && exit ;; \
 ? ? ? ? ? ? ? ? ? ? ? ?file) $($(DL_MODE)_LOCALFILES) && exit ;; \
+ ? ? ? ? ? ? ? ? ? ? ? scp) $($(DL_MODE)_SCP) && exit ;; \
 ? ? ? ? ? ? ? ? ? ? ? ?*) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
 ? ? ? ? ? ? ? ?esac ; \
 ? ? ? ?fi ; \

@@ -655,6 +696,8 @@ else ifeq ($$($(2)_SITE_METHOD),git)

?DL_TOOLS_DEPENDENCIES += git
?else ifeq ($$($(2)_SITE_METHOD),bzr)
?DL_TOOLS_DEPENDENCIES += bzr

package/Makefile.package.in +2 -0

+else ifeq ($$($(2)_SITE_METHOD),scp)
+DL_TOOLS_DEPENDENCIES += scp ssh

?endif # SITE_METHOD

?endif # $(2)_KCONFIG_VAR

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

Add support for packages stored in Mercurial (hg) repositories.

Signed-off-by Thomas De Schampheleire <[email protected]>

---
?Config.in ? ? ? ? ? ? ? ? ? | ? 4 ++++ ?package/Makefile.package.in | ?33 +++++++++++++++++++++++++++++---- ?2 files changed, 33 insertions(+), 4 deletions(-)

Config.in +0 -0

@@ -44,6 +44,10 @@ config BR2_SSH

? ? ? ?string "Secure shell (ssh) command"
? ? ? ?default "ssh"

Config.in +4 -0

+config BR2_HG
+ ? ? ? string "Mercurial (hg) command"
+ ? ? ? default "hg"
+

?config BR2_ZCAT
? ? ? ?string "zcat command"
? ? ? ?default "gzip -d -c"

package/Makefile.package.in +1 -0

@@ -92,6 +92,7 @@ WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET
 ?SVN:=$(call qstrip,$(BR2_SVN))
 ?BZR:=$(call qstrip,$(BR2_BZR))
 ?GIT:=$(call qstrip,$(BR2_GIT))
+HG:=$(call qstrip,$(BR2_HG)) $(QUIET)
 ?SCP:=$(call qstrip,$(BR2_SCP)) $(QUIET)
 ?SSH:=$(call qstrip,$(BR2_SSH)) $(QUIET)
 ?LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES))

@@ -125,20 +126,20 @@ notdomain=$(patsubst $(call domain,$(1),
 ?domainseparator=$(if $(1),$(1),/)
 

?################################################################################

package/Makefile.package.in +1 -1

-# The DOWNLOAD_{GIT,SVN,BZR,LOCALFILES} helpers are in charge of getting a
+# The DOWNLOAD_{GIT,SVN,BZR,HG,LOCALFILES} helpers are in charge of getting a

?# working copy of the source repository for their corresponding SCM, ?# checking out the requested version / commit / tag, and create an ?# archive out of it. DOWNLOAD_SCP uses scp to obtain a remote file with ?# ssh authentication. DOWNLOAD_WGET is the normal wget-based download ?# mechanism.
?#

package/Makefile.package.in +1 -1

-# The SOURCE_CHECK_{GIT,SVN,BZR,WGET,LOCALFILES,SCP} helpers are in charge of
+# The SOURCE_CHECK_{GIT,SVN,BZR,HG,WGET,LOCALFILES,SCP} helpers are in charge of

?# simply checking that the source is available for download. This can be used ?# to make sure one will be able to get all the sources needed for ?# one's build configuration.
?#

package/Makefile.package.in +2 -2

-# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,WGET,LOCALFILES,SCP} helpers simply output
-# to the console the names of the files that will be downloaded, or path
+# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,HG,WGET,LOCALFILES,SCP} helpers simply
+# output to the console the names of the files that will be downloaded, or path

?# and revision of the source repositories, producing a list of all the ?# "external dependencies" of a given build configuration. ?################################################################################

package/Makefile.package.in +0 -0

@@ -214,6 +215,27 @@ define SHOW_EXTERNAL_DEPS_SCP

?endef

package/Makefile.package.in +21 -0

+define DOWNLOAD_HG
+ ? ? ? test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
+ ? ? ? (pushd $(DL_DIR) > /dev/null && \
+ ? ? ? $(HG) clone --noupdate --rev $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \
+ ? ? ? $(HG) archive --repository $($(PKG)_BASE_NAME) --type tgz --prefix $($(PKG)_BASE_NAME)/ \
+ ? ? ? ? ? ? ? ? ? ? --rev $($(PKG)_DL_VERSION) $(DL_DIR)/$($(PKG)_SOURCE) && \
+ ? ? ? rm -rf $($(PKG)_DL_DIR) && \
+ ? ? ? popd > /dev/null)
+endef
+
+# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
+# repository
+define SOURCE_CHECK_HG
+ ?$(HG) incoming --force -l1 $($(PKG)_SITE) > /dev/null
+endef
+
+define SHOW_EXTERNAL_DEPS_HG
+ ?echo $($(PKG)_SOURCE)
+endef
+
+

?define DOWNLOAD_WGET
? ? ? ?test -e $(DL_DIR)/$(2) || \
? ? ? ?$(WGET) -P $(DL_DIR) $(call qstrip,$(1))/$(2)

package/Makefile.package.in +1 -0

@@ -267,6 +289,7 @@ define DOWNLOAD
 ? ? ? ? ? ? ? ? ? ? ? ?bzr) $($(DL_MODE)_BZR) && exit ;; \
 ? ? ? ? ? ? ? ? ? ? ? ?file) $($(DL_MODE)_LOCALFILES) && exit ;; \
 ? ? ? ? ? ? ? ? ? ? ? ?scp) $($(DL_MODE)_SCP) && exit ;; \
+ ? ? ? ? ? ? ? ? ? ? ? hg) $($(DL_MODE)_HG) && exit ;; \
 ? ? ? ? ? ? ? ? ? ? ? ?*) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
 ? ? ? ? ? ? ? ?esac ; \
 ? ? ? ?fi ; \

@@ -698,6 +721,8 @@ else ifeq ($$($(2)_SITE_METHOD),bzr)

?DL_TOOLS_DEPENDENCIES += bzr
?else ifeq ($$($(2)_SITE_METHOD),scp)
?DL_TOOLS_DEPENDENCIES += scp ssh

package/Makefile.package.in +2 -0

+else ifeq ($$($(2)_SITE_METHOD),hg)
+DL_TOOLS_DEPENDENCIES += hg

?endif # SITE_METHOD

?endif # $(2)_KCONFIG_VAR

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

This patch series adds download methods for scp and Mercurial.

Documentation was updated in the first version of this series, but this update was left out in this series because of the move to asciidoc that is not yet complete. Once the new documentation format is in master, it needs to be updated with these new features.

Signed-off-by Thomas De Schampheleire <[email protected]>

---
v2: update scp patch based on comments.

?Config.in ? ? ? ? ? ? ? ? ? | ?17 ++++++++++++++++-
?package/Makefile.package.in | ?82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- ?2 files changed, 91 insertions(+), 8 deletions(-)

This patch series adds download methods for scp and Mercurial.

Documentation was updated in the first version of this series, but this update was left out in this series because of the move to asciidoc that is not yet complete. Once the new documentation format is in master, it needs to be updated with these new features.

Signed-off-by Thomas De Schampheleire <[email protected]>

---
v2: update scp patch based on comments.

?Config.in ? ? ? ? ? ? ? ? ? | ?17 ++++++++++++++++-
?package/Makefile.package.in | ?82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- ?2 files changed, 91 insertions(+), 8 deletions(-)