Patchwork [3,of,3] linux/uboot: line-up repository-related configuration options

login
register
mail settings
Submitter Thomas De Schampheleire
Date July 19, 2013, 11:27 a.m.
Message ID <3c808c389a7d8a39cfaf.1374233234@BEANTN0L019720>
Download mbox | patch
Permalink /patch/260244/
State Superseded
Headers show

Comments

Thomas De Schampheleire - July 19, 2013, 11:27 a.m.
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.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
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(-)
Peter Korsgaard - July 21, 2013, 10:11 p.m.
>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com> writes:

 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 <thomas.de.schampheleire@gmail.com>

 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.
Thomas De Schampheleire - July 22, 2013, 6:49 a.m.
Op 22-jul.-2013 00:11 schreef "Peter Korsgaard" <jacmet@uclibc.org> het
volgende:
>
> >>>>> "Thomas" == Thomas De Schampheleire <
patrickdepinguin+buildroot@gmail.com> writes:
>
>  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 <
thomas.de.schampheleire@gmail.com>
>
>  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.

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

Best regards,
Thomas

Patch

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -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
 
diff --git a/linux/Config.in b/linux/Config.in
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -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.