linux/uboot: add support for custom Mercurial repositories

---
 boot/uboot/Config.in |  20 ++++++++++++++------
 boot/uboot/uboot.mk  |   5 ++++-
 linux/Config.in      |  29 +++++++++++++++++++----------
 linux/linux.mk       |   5 ++++-
 4 files changed, 41 insertions(+), 18 deletions(-)

---
 linux/Config.in |  27 ++++++++++++++++++---------
 linux/linux.mk  |   5 ++++-
 2 files changed, 22 insertions(+), 10 deletions(-)

@@ -52,6 +52,12 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT
 	  This option allows Buildroot to get the Linux kernel source
 	  code from a Git repository.
 
+config BR2_LINUX_KERNEL_CUSTOM_HG
+	bool "Custom Mercurial repository"
+	help
+	  This option allows Buildroot to get the Linux kernel source
+	  code from a Mercurial repository.
+
 endchoice
 
 config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE

@@ -62,25 +68,28 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_L
 	string "URL of custom kernel tarball"
 	depends on BR2_LINUX_KERNEL_CUSTOM_TARBALL
 
-config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL
-	string "URL of custom Git repository"
-	depends on BR2_LINUX_KERNEL_CUSTOM_GIT
+if BR2_LINUX_KERNEL_CUSTOM_GIT || BR2_LINUX_KERNEL_CUSTOM_HG
 
-config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
-	string "Custom Git version"
-	default "HEAD"
-	depends on BR2_LINUX_KERNEL_CUSTOM_GIT
+config BR2_LINUX_KERNEL_CUSTOM_REPO_URL
+	string "URL of custom repository"
+
+config BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION
+	string "Custom repository version"
+	default "HEAD" if BR2_LINUX_KERNEL_CUSTOM_GIT
+	default "tip" if BR2_LINUX_KERNEL_CUSTOM_HG
 	help
-	  Git revision to use in the format used by git rev-parse,
+	  Revision to use in the typical format used by Git/Mercurial
 	  E.G. a sha id, a tag, branch, ..
 
+endif
+
 config BR2_LINUX_KERNEL_VERSION
 	string
 	default "3.10.1" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
-	default $BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION if BR2_LINUX_KERNEL_CUSTOM_GIT
+	default $BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION if BR2_LINUX_KERNEL_CUSTOM_HG || BR2_LINUX_KERNEL_CUSTOM_GIT
 
 #
 # Patch selection

@@ -14,8 +14,11 @@ LINUX_TARBALL = $(call qstrip,$(BR2_LINU
 LINUX_SITE = $(patsubst %/,%,$(dir $(LINUX_TARBALL)))
 LINUX_SOURCE = $(notdir $(LINUX_TARBALL))
 else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y)
-LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL))
+LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
 LINUX_SITE_METHOD = git
+else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_HG),y)
+LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
+LINUX_SITE_METHOD = hg
 else
 LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
 # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order

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

 Thomas>  linux/Config.in |  27 ++++++++++++++++++---------
 Thomas>  linux/linux.mk  |   5 ++++-

Thomas> 2 files changed, 22 insertions(+), 10 deletions(-)

Thomas> diff --git a/linux/Config.in b/linux/Config.in Thomas> --- a/linux/Config.in
Thomas> +++ b/linux/Config.in
Thomas> @@ -52,6 +52,12 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT

 Thomas>  	  This option allows Buildroot to get the Linux kernel source
 Thomas>  	  code from a Git repository.

Thomas> +config BR2_LINUX_KERNEL_CUSTOM_HG
Thomas> + bool "Custom Mercurial repository"
Thomas> + help
Thomas> + This option allows Buildroot to get the Linux kernel source
Thomas> + code from a Mercurial repository.
Thomas> +
Thomas> endchoice

Thomas> config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE Thomas> @@ -62,25 +68,28 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL_L
Thomas> string "URL of custom kernel tarball"
Thomas> depends on BR2_LINUX_KERNEL_CUSTOM_TARBALL

Thomas> -config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL
Thomas> - string "URL of custom Git repository"
Thomas> - depends on BR2_LINUX_KERNEL_CUSTOM_GIT
Thomas> +if BR2_LINUX_KERNEL_CUSTOM_GIT || BR2_LINUX_KERNEL_CUSTOM_HG

Thomas> -config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
Thomas> - string "Custom Git version"
Thomas> - default "HEAD"
Thomas> - depends on BR2_LINUX_KERNEL_CUSTOM_GIT

Please add Config.in.legacy entries for these.

Thomas> +config BR2_LINUX_KERNEL_CUSTOM_REPO_URL
Thomas> + string "URL of custom repository"
Thomas> +
Thomas> +config BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION
Thomas> + string "Custom repository version"
Thomas> + default "HEAD" if BR2_LINUX_KERNEL_CUSTOM_GIT
Thomas> + default "tip" if BR2_LINUX_KERNEL_CUSTOM_HG

I know we had this already for git, but these are not really good defaults as buildroot will only download these once and not update the tarballs even though HEAD/tip changes - So I think we should just default to "".

Bye, Peter Korsgaard

---
 boot/uboot/Config.in |  15 +++++++++------
 boot/uboot/uboot.mk  |   5 ++++-
 2 files changed, 13 insertions(+), 7 deletions(-)

@@ -31,6 +31,9 @@ config BR2_TARGET_UBOOT_CUSTOM_TARBALL
 config BR2_TARGET_UBOOT_CUSTOM_GIT
 	bool "Custom Git repository"
 
+config BR2_TARGET_UBOOT_CUSTOM_HG
+	bool "Custom Mercurial repository"
+
 endchoice
 
 config BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE

@@ -49,7 +52,7 @@ config BR2_TARGET_UBOOT_VERSION
 	default "2013.04"	if BR2_TARGET_UBOOT_LATEST_VERSION
 	default $BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
-	default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
+	default $BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
 
 config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 	string "custom patch dir"

@@ -60,13 +63,13 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
 
 	  Most users may leave this empty
 
-if BR2_TARGET_UBOOT_CUSTOM_GIT
+if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
 
-config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL
-	string "URL of custom Git repository"
+config BR2_TARGET_UBOOT_CUSTOM_REPO_URL
+	string "URL of custom repository"
 
-config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION
-	string "Custom Git version"
+config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
+	string "Custom repository version"
 
 endif
 

@@ -18,8 +18,11 @@ UBOOT_TARBALL = $(call qstrip,$(BR2_TARG
 UBOOT_SITE    = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
 UBOOT_SOURCE  = $(notdir $(UBOOT_TARBALL))
 else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
-UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL))
+UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
 UBOOT_SITE_METHOD = git
+else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y)
+UBOOT_SITE        = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
+UBOOT_SITE_METHOD = hg
 else
 # Handle stable official U-Boot versions
 UBOOT_SITE    = ftp://ftp.denx.de/pub/u-boot

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

 Thomas>  boot/uboot/Config.in |  15 +++++++++------
 Thomas>  boot/uboot/uboot.mk  |   5 ++++-

Thomas> 2 files changed, 13 insertions(+), 7 deletions(-)

Thomas> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in Thomas> --- a/boot/uboot/Config.in
Thomas> +++ b/boot/uboot/Config.in
Thomas> @@ -31,6 +31,9 @@ config BR2_TARGET_UBOOT_CUSTOM_TARBALL Thomas> config BR2_TARGET_UBOOT_CUSTOM_GIT
Thomas> bool "Custom Git repository"

Thomas> +config BR2_TARGET_UBOOT_CUSTOM_HG
Thomas> + bool "Custom Mercurial repository"
Thomas> +
Thomas> endchoice

Thomas> config BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE Thomas> @@ -49,7 +52,7 @@ config BR2_TARGET_UBOOT_VERSION

 Thomas>  	default "2013.04"	if BR2_TARGET_UBOOT_LATEST_VERSION
 Thomas>  	default $BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_VERSION
 Thomas>  	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL

Thomas> - default $BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT
Thomas> + default $BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG

Thomas> config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
Thomas> string "custom patch dir"
Thomas> @@ -60,13 +63,13 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR

Thomas> Most users may leave this empty

Thomas> -if BR2_TARGET_UBOOT_CUSTOM_GIT
Thomas> +if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG

Thomas> -config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL
Thomas> - string "URL of custom Git repository"
Thomas> +config BR2_TARGET_UBOOT_CUSTOM_REPO_URL
Thomas> + string "URL of custom repository"

Thomas> -config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION
Thomas> - string "Custom Git version"
Thomas> +config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
Thomas> + string "Custom repository version"

Same comment about Config.in.legacy.

Bye, Peter Korsgaard

Although the configuration options for custom repository locations and versions are very similar between the linux and uboot packages, there are some minor differences. This patch lines up both packages.

---
Note: one remaining difference is that there are help texts in linux for options BR2_LINUX_KERNEL_CUSTOM_GIT and BR2_LINUX_KERNEL_CUSTOM_HG. I didn't add them to uboot because it seems a bit redundant, but if you prefer we can line this up as well (either add help texts to uboot or remove them from linux).

 boot/uboot/Config.in |  5 +++++
 linux/Config.in      |  2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

@@ -70,6 +70,11 @@ config BR2_TARGET_UBOOT_CUSTOM_REPO_URL
 
 config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
 	string "Custom repository version"
+	default "HEAD" if BR2_TARGET_UBOOT_CUSTOM_GIT
+	default "tip" if BR2_TARGET_UBOOT_CUSTOM_HG
+	help
+	  Revision to use in the typical format used by Git/Mercurial
+	  E.G. a sha id, a tag, branch, ..
 
 endif
 

@@ -47,7 +47,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL
 	  specific kernel source tarball
 
 config BR2_LINUX_KERNEL_CUSTOM_GIT
-	bool "Custom Git tree"
+	bool "Custom Git repository"
 	help
 	  This option allows Buildroot to get the Linux kernel source
 	  code from a Git repository.

Thomas> Although the configuration options for custom repository locations and Thomas> versions are very similar between the linux and uboot packages, there are Thomas> some minor differences. This patch lines up both packages.

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

Thomas> ---
Thomas> Note: one remaining difference is that there are help texts in linux for Thomas> options BR2_LINUX_KERNEL_CUSTOM_GIT and BR2_LINUX_KERNEL_CUSTOM_HG. I Thomas> didn't add them to uboot because it seems a bit redundant, but if you Thomas> prefer we can line this up as well (either add help texts to uboot or Thomas> remove them from linux).

 Thomas>  boot/uboot/Config.in |  5 +++++
 Thomas>  linux/Config.in      |  2 +-

Thomas> 2 files changed, 6 insertions(+), 1 deletions(-)

Thomas> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in Thomas> --- a/boot/uboot/Config.in
Thomas> +++ b/boot/uboot/Config.in
Thomas> @@ -70,6 +70,11 @@ config BR2_TARGET_UBOOT_CUSTOM_REPO_URL

Thomas> config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
Thomas> string "Custom repository version"
Thomas> + default "HEAD" if BR2_TARGET_UBOOT_CUSTOM_GIT
Thomas> + default "tip" if BR2_TARGET_UBOOT_CUSTOM_HG
Thomas> + help
Thomas> + Revision to use in the typical format used by Git/Mercurial
Thomas> + E.G. a sha id, a tag, branch, ..

As mentioned for the linux change, I prefer to drop the defaults, otherwise it looks good.

Bye, Peter Korsgaard

Op 22-jul.-2013 00:11 schreef "Peter Korsgaard" <[email protected]> het volgende:

locations and

there are

[email protected]>

linux for

BR2_LINUX_KERNEL_CUSTOM_HG. I

if you

uboot or

Git/Mercurial

Thanks for the feedback. I'll update and send a new set, hopefully later this week.

Best regards,
Thomas
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130722/6649c813/attachment-0001.html>