Skip to contentSkip to conversation

Add support for local packages through 'file://' pseudo-protocol

PATCH New david.wagner at free-electrons.com 1 participant 3 messages May 17, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add support for local packages through 'file://' pseudo-protocol

	Hi,

I needed that feature ("downloading" tarballs that are already on my computer) for a package that wasn't easily available as a tarball and I thought I might not be the only one to need it.

I hope the format of the submit is correct ; it's the first time I use git send-email.

Regards,
--
David Wagner, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

#1 lore raw

PATCH 1/1 Add support for local packages through 'file://' pseudo-protocol

From: David Wagner <[email protected]>

Can be useful to integrate a home-made project or for testing purposes. The default command to retrieve files is 'cp' but 'rsync' could also be used. Through sshfs, it should also be possible to get non-public remote files on a ssh server.

---
 Config.in                   |    4 ++++
 package/Makefile.package.in |   21 ++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
Config.in +4 -0
index a67c08d..954c4f3 100644
@@ -32,6 +32,10 @@ config BR2_GIT
 	string "Git command"
 	default "git"
 
+config BR2_LOCALFILES
+	string "Local files retrieval command"
+	default "cp"
+
 config BR2_ZCAT
 	string "zcat command"
 	default "gzip -d -c"
package/Makefile.package.in +18 -3
index bf4e1b4..4c45ddc 100644
@@ -73,6 +73,7 @@ WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET)
 SVN:=$(call qstrip,$(BR2_SVN)) $(QUIET)
 BZR:=$(call qstrip,$(BR2_BZR)) $(QUIET)
 GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET)
+LOCALFILES:=$(call qstrip,$(BR2_LOCALFILES)) $(QUIET)
 
 # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK'
 # used by the _source-check target and 'SHOW_EXTERNAL_DEPS', used by the
@@ -85,18 +86,18 @@ DL_DIR:=$(TOPDIR)/dl
 endif
 
 ################################################################################
-# The DOWNLOAD_{GIT,SVN,BZR} helpers are in charge of getting a
+# 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
 # archive out of it. DOWNLOAD_WGET is the normal wget-based download
 # mechanism.
 #
-# The SOURCE_CHECK_{GIT,SVN,BZR,WGET} helpers are in charge of simply
+# 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
 # to make sure one will be able to get all the sources needed for
 # one's build configuration.
 #
-# The SHOW_EXTERNAL_DEPS_{GIT,SVN,BZR,WGET} helpers simply output to
+# 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
 # and revision of the source repositories, producing a list of all the
 # "external dependencies" of a given build configuration.
@@ -170,6 +171,19 @@ define SHOW_EXTERNAL_DEPS_WGET
   echo $(2)
 endef
 
+define DOWNLOAD_LOCALFILES
+	test -e $(DL_DIR)/$(2) || \
+		$(LOCALFILES) $(call qstrip,$(subst file://,,$(1)))/$(2) $(DL_DIR)
+endef
+
+define SOURCE_CHECK_LOCALFILES
+  test -e $(call qstrip,$(subst file://,,$(1)))/$(2)
+endef
+
+define SHOW_EXTERNAL_DEPS_LOCALFILES
+  echo $(2)
+endef
+
 ################################################################################
 # DOWNLOAD -- Download helper. Will try to download source from:
 # 1) BR2_PRIMARY_SITE if enabled
@@ -192,6 +206,7 @@ define DOWNLOAD
 			git) $($(DL_MODE)_GIT) && exit ;; \
 			svn) $($(DL_MODE)_SVN) && exit ;; \
 			bzr) $($(DL_MODE)_BZR) && exit ;; \
+			file) $($(DL_MODE)_LOCALFILES) && exit ;; \
 			*) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
 		esac ; \
 	fi ; \
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 1/1 Add support for local packages through 'file://' pseudo-protocol

In reply to david.wagner at free-electrons.com
Quoted 4 lines · david.wagner at free-electrons.com

From: David Wagner <[email protected]>

Can be useful to integrate a home-made project or for testing purposes. The default command to retrieve files is 'cp' but 'rsync' could also

be used.

Quoted 1 line

Through sshfs, it should also be possible to get non-public remote

files on a

Quoted 1 line

ssh server.

Sorry for the "raw" format of this submit. I guess I haven't figured out yet how to add an introductory text with git send-email.

I needed the submitted feature to add a tool that wasn't easily available as tarball (logfsprogs: Thomas showed me how to override the download method but I couldn't have figured it out otherwise). But there are other use-cases, like the ones in the commit message.

I hope the patch is ok, tell me if not.

Regards,

Signature · 4 lines
David Wagner, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com