| Message ID | 1432892326-10261-4-git-send-email-angelo.compagnucci@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
On 05/29/15 11:38, Angelo Compagnucci wrote: > This patch adds the option to download at91bootstrap3 from > a custom git URL. This is a requirement for all that boards > that use a custom at91bootstrap3 version. > > Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> > --- > boot/at91bootstrap3/Config.in | 34 ++++++++++++++++++++++++++++++++++ > boot/at91bootstrap3/at91bootstrap3.mk | 9 ++++++++- > 2 files changed, 42 insertions(+), 1 deletion(-) > > diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in > index 8ac40ed..9f2f49b 100644 > --- a/boot/at91bootstrap3/Config.in > +++ b/boot/at91bootstrap3/Config.in > @@ -10,6 +10,40 @@ config BR2_TARGET_AT91BOOTSTRAP3 > > if BR2_TARGET_AT91BOOTSTRAP3 > > +choice > + > + prompt "AT91 Bootstrap 3 version" > + > +config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION > + bool "3.7.2" > + > +config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT > + bool "Custom Git repository" > + help > + This option allows Buildroot to get the AT91 Bootstrap 3 source > + code from a Git repository. > + > +endchoice > + > +if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT > + > +config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL > + string "URL of custom repository" > + > +config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION > + string "Custom repository version" > + help > + Revision to use in the typical format used by Git > + E.G. a sha id, a tag, branch, .. > + > +endif > + > +config BR2_TARGET_AT91BOOTSTRAP3_VERSION > + string > + default "v3.7.2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION > + default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \ > + if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT > + > config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR > string "custom patch dir" > help > diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk > index b73821e..fae2e8e 100644 > --- a/boot/at91bootstrap3/at91bootstrap3.mk > +++ b/boot/at91bootstrap3/at91bootstrap3.mk > @@ -4,8 +4,15 @@ > # > ################################################################################ > > -AT91BOOTSTRAP3_VERSION = v3.7.2 > +AT91BOOTSTRAP3_VERSION = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_VERSION)) > + > +ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT),y) > +AT91BOOTSTRAP3_SITE = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL)) > +AT91BOOTSTRAP3_SITE_METHOD = git > +else > AT91BOOTSTRAP3_SITE = $(call github,linux4sam,at91bootstrap,$(AT91BOOTSTRAP3_VERSION)) > +endif > + > AT91BOOTSTRAP3_LICENSE = BSD-2c > AT91BOOTSTRAP3_LICENSE_FILES = main.c There should be a check against an empty version in the custom repo case, similar like it's done for uboot. Otherwise you get the cryptic: >>> at91bootstrap3 Downloading Doing full clone fatal: The empty string is not a valid path --2015-06-01 21:29:11-- http://sources.buildroot.net/at91bootstrap3-.tar.gz Resolving sources.buildroot.net (sources.buildroot.net)... 176.9.16.109 Connecting to sources.buildroot.net (sources.buildroot.net)|176.9.16.109|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2015-06-01 21:29:12 ERROR 404: Not Found. Otherwise, looks good to me. Regards, Arnout
diff --git a/boot/at91bootstrap3/Config.in b/boot/at91bootstrap3/Config.in index 8ac40ed..9f2f49b 100644 --- a/boot/at91bootstrap3/Config.in +++ b/boot/at91bootstrap3/Config.in @@ -10,6 +10,40 @@ config BR2_TARGET_AT91BOOTSTRAP3 if BR2_TARGET_AT91BOOTSTRAP3 +choice + + prompt "AT91 Bootstrap 3 version" + +config BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + bool "3.7.2" + +config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT + bool "Custom Git repository" + help + This option allows Buildroot to get the AT91 Bootstrap 3 source + code from a Git repository. + +endchoice + +if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT + +config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL + string "URL of custom repository" + +config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION + string "Custom repository version" + help + Revision to use in the typical format used by Git + E.G. a sha id, a tag, branch, .. + +endif + +config BR2_TARGET_AT91BOOTSTRAP3_VERSION + string + default "v3.7.2" if BR2_TARGET_AT91BOOTSTRAP3_LATEST_VERSION + default BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION \ + if BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT + config BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR string "custom patch dir" help diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk index b73821e..fae2e8e 100644 --- a/boot/at91bootstrap3/at91bootstrap3.mk +++ b/boot/at91bootstrap3/at91bootstrap3.mk @@ -4,8 +4,15 @@ # ################################################################################ -AT91BOOTSTRAP3_VERSION = v3.7.2 +AT91BOOTSTRAP3_VERSION = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_VERSION)) + +ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT),y) +AT91BOOTSTRAP3_SITE = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL)) +AT91BOOTSTRAP3_SITE_METHOD = git +else AT91BOOTSTRAP3_SITE = $(call github,linux4sam,at91bootstrap,$(AT91BOOTSTRAP3_VERSION)) +endif + AT91BOOTSTRAP3_LICENSE = BSD-2c AT91BOOTSTRAP3_LICENSE_FILES = main.c
This patch adds the option to download at91bootstrap3 from a custom git URL. This is a requirement for all that boards that use a custom at91bootstrap3 version. Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> --- boot/at91bootstrap3/Config.in | 34 ++++++++++++++++++++++++++++++++++ boot/at91bootstrap3/at91bootstrap3.mk | 9 ++++++++- 2 files changed, 42 insertions(+), 1 deletion(-)