gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

u-boot: add support for custom Mercurial repository 

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas De Schampheleire 2013-09-02 22:07:55 +02:00 committed by Peter Korsgaard
parent 63ecded2e3
commit f2c2193b05
3 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Config.in.legacy
View File

@ -109,6 +109,34 @@ config BR2_PACKAGE_MODULE_INIT_TOOLS
The 'module-init-tools' package has been removed, since it
has been depracated upstream and replaced by 'kmod'.
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

23
boot/uboot/Config.in
View File

@ -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.10" 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

5
boot/uboot/uboot.mk
View File

@ -18,8 +18,11 @@ UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
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