From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 6 of 9 v4] u-boot: add support for custom Mercurial repository
Date: Mon, 02 Sep 2013 22:07:55 +0200 [thread overview]
Message-ID: <cc484ef5946f1b9b0d18.1378152475@argentina> (raw)
In-Reply-To: <patchbomb.1378152469@argentina>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v4: no changes
v3:
- add automatic propagation of old->new values
- fix legacy entries
v2: add Config.in.legacy entries (comment Peter)
Config.in.legacy | 30 ++++++++++++++++++++++++++++++
boot/uboot/Config.in | 23 ++++++++++++++++-------
boot/uboot/uboot.mk | 5 ++++-
3 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,36 @@ endif
###############################################################################
comment "Legacy options removed in 2013.11"
+config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL
+ string "u-boot: the git repository URL option has been renamed"
+ help
+ The option BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL has
+ been renamed to
+ BR2_TARGET_UBOOT_CUSTOM_REPO_URL.
+
+config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL_WRAP
+ bool
+ default y if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != ""
+ select BR2_LEGACY
+
+# Note: BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL is still referenced from
+# boot/uboot/Config.in
+
+config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION
+ string "u-boot: the git repository version option has been renamed"
+ help
+ The option BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION has
+ been renamed to
+ BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION.
+
+config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION_WRAP
+ bool
+ default y if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != ""
+ select BR2_LEGACY
+
+# Note: BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION is still referenced from
+# boot/uboot/Config.in
+
config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL
string "linux: the git repository URL option has been renamed"
help
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -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
@@ -47,9 +50,11 @@ endif
config BR2_TARGET_UBOOT_VERSION
string
default "2013.07" if BR2_TARGET_UBOOT_LATEST_VERSION
- default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE if BR2_TARGET_UBOOT_CUSTOM_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 +65,17 @@ 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"
+ default BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL \
+ if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != "" # legacy
-config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION
- string "Custom Git version"
+config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
+ string "Custom repository version"
+ default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \
+ if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" # legacy
endif
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -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
next prev parent reply other threads:[~2013-09-02 20:07 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-02 20:07 [Buildroot] [PATCH 0 of 9 v4] linux/uboot: add support for custom Mercurial repositories Thomas De Schampheleire
2013-09-02 20:07 ` [Buildroot] [PATCH 1 of 9 v4] Config.in.legacy: update description for developers Thomas De Schampheleire
2013-09-02 20:54 ` Thomas Petazzoni
2013-09-03 12:13 ` Thomas De Schampheleire
2013-09-03 16:46 ` Arnout Vandecappelle
2013-10-27 7:24 ` Peter Korsgaard
2013-10-27 8:10 ` Thomas De Schampheleire
2013-09-02 20:07 ` [Buildroot] [PATCH 2 of 9 v4] Config.in.legacy: update description for users Thomas De Schampheleire
2013-09-02 20:55 ` Thomas Petazzoni
2013-09-03 6:16 ` Arnout Vandecappelle
2013-09-03 7:18 ` Thomas Petazzoni
2013-09-03 11:42 ` Thomas De Schampheleire
2013-09-03 11:52 ` Thomas Petazzoni
2013-09-03 15:06 ` Peter Korsgaard
2013-09-03 16:50 ` Arnout Vandecappelle
2013-09-04 8:33 ` Thomas De Schampheleire
2013-09-04 16:08 ` Arnout Vandecappelle
2013-09-04 19:07 ` Thomas De Schampheleire
2013-09-02 20:07 ` [Buildroot] [PATCH 3 of 9 v4] Config.in.legacy: add separator to " Thomas De Schampheleire
2013-09-02 20:07 ` [Buildroot] [PATCH 4 of 9 v4] Remove redundant dollar signs in Config.in files Thomas De Schampheleire
2013-09-02 20:07 ` [Buildroot] [PATCH 5 of 9 v4] linux: add support for custom Mercurial repository Thomas De Schampheleire
2013-09-02 20:07 ` Thomas De Schampheleire [this message]
2013-09-02 20:07 ` [Buildroot] [PATCH 7 of 9 v4] linux/uboot: line-up repository-related configuration options Thomas De Schampheleire
2013-09-02 20:07 ` [Buildroot] [PATCH 8 of 9 v4] defconfigs: update after rename of custom git repo/version options Thomas De Schampheleire
2013-09-02 20:07 ` [Buildroot] [PATCH 9 of 9 v4] linux: mention 3.x.y kernels in 'custom version' help Thomas De Schampheleire
2013-09-02 21:04 ` Thomas Petazzoni
2013-09-19 19:49 ` [Buildroot] [PATCH 0 of 9 v4] linux/uboot: add support for custom Mercurial repositories Thomas Petazzoni
2013-09-20 9:22 ` Thomas De Schampheleire
2013-09-25 20:12 ` Thomas De Schampheleire
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cc484ef5946f1b9b0d18.1378152475@argentina \
--to=patrickdepinguin+buildroot@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox