summaryrefslogtreecommitdiffstats
path: root/rtems
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2016-03-14 16:23:19 +1100
committerChris Johns <chrisj@rtems.org>2016-03-14 16:23:19 +1100
commit6e490ae1e1c11825eeeef36e802a5a3c426435de (patch)
tree08a2bc6f1489510ad3705cf8c7b6230ab130965c /rtems
parentsb: Fix build's --with-error-report handling. (diff)
downloadrtems-source-builder-6e490ae1e1c11825eeeef36e802a5a3c426435de.tar.bz2
sb: Update download to check the config file for release URL control.
Provide without_release_url support in the configuration file so the release tarball download of the kernel and tools uses the release's top level directory and not the sources directory. Closes #2481.
Diffstat (limited to 'rtems')
-rw-r--r--rtems/config/tools/rtems-kernel-4-1.cfg3
-rw-r--r--rtems/config/tools/rtems-tools-1.cfg1
2 files changed, 3 insertions, 1 deletions
diff --git a/rtems/config/tools/rtems-kernel-4-1.cfg b/rtems/config/tools/rtems-kernel-4-1.cfg
index d6c1f5b..e5d115c 100644
--- a/rtems/config/tools/rtems-kernel-4-1.cfg
+++ b/rtems/config/tools/rtems-kernel-4-1.cfg
@@ -21,7 +21,8 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%define rtems_kernel_compression xz
%endif
%source set rtems %{rtems_release_url}/%{rtems_kernel_version}/rtems-%{rtems_kernel_version}.tar.%{rtems_kernel_compression}
- %define rtems_bootstrap 0
+ %define rtems_bootstrap 0
+ %define without_release_url
%else
%if ! %{defined rtems_kernel_version}
%define rtems_kernel_version HEAD
diff --git a/rtems/config/tools/rtems-tools-1.cfg b/rtems/config/tools/rtems-tools-1.cfg
index b03b7ad..bde2ce5 100644
--- a/rtems/config/tools/rtems-tools-1.cfg
+++ b/rtems/config/tools/rtems-tools-1.cfg
@@ -25,6 +25,7 @@
#
%if %{rsb_released}
%source set rtems-tools %{rtems_release_url}/%{rtems_tools_version}/rtems-tools-%{rtems_tools_version}.tar.xz
+ %define without_release_url
%else
#
# rtems_git_commit_hash : The commit hash else the branch is tracked.