Changeset 61e2617 in rtems-source-builder


Ignore:
Timestamp:
Apr 10, 2017, 7:30:06 AM (3 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.11
Children:
949731c
Parents:
6ae8c3d
Message:

Fix the tools and kernel source URL when released to use sources.

Remove %define without_release_url so the standard release URL processing
is used. This requires the tools and kernel source is available in the
releases sources directory.

Updates #2952.

Location:
rtems/config/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • rtems/config/tools/rtems-kernel-4-1.cfg

    r6ae8c3d r61e2617  
    6363   %define rtems_kernel_compression xz
    6464  %endif
    65   %source set rtems %{rtems_release_url}/%{rtems_kernel_version}/rtems-%{rtems_kernel_version}.tar.%{rtems_kernel_compression}
    6665  %define rtems_bootstrap 0
    67   %define without_release_url
    6866 %else
    6967  %if ! %{defined rtems_kernel_version}
  • rtems/config/tools/rtems-tools-1.cfg

    r6ae8c3d r61e2617  
    2222%if %{rtems_tools_build}
    2323 #
    24  # If the RSB is released look for a release tarball else use git.
     24 # rtems_git_commit_hash : The commit hash else the branch is tracked.
    2525 #
    26  %if %{rsb_released}
    27   %source set rtems-tools %{rtems_release_url}/%{rtems_tools_version}/rtems-tools-%{rtems_tools_version}.tar.xz
    28   %define without_release_url
     26 %if ! %{defined rtems_tools_version}
     27  %define rtems_tools_version HEAD
     28 %endif
     29 %if %{defined rtems_tools_git_commit_hash}
     30  %define rtems_tools_git_checkout ?checkout=%{defined rtems_tools_git_commit_hash}
    2931 %else
    30   #
    31   # rtems_git_commit_hash : The commit hash else the branch is tracked.
    32   #
    33   %if ! %{defined rtems_tools_version}
    34    %define rtems_tools_version HEAD
    35   %endif
    36   %if %{defined rtems_tools_git_commit_hash}
    37    %define rtems_tools_git_checkout ?checkout=%{defined rtems_tools_git_commit_hash}
    38   %else
    39    %define rtems_tools_git_checkout %{nil}
    40   %endif
     32  %define rtems_tools_git_checkout %{nil}
     33 %endif
    4134
    42   %source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?fetch?branch=%{rtems_tools_version}?pull%{rtems_tools_git_checkout}
    43  %endif
     35 %source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?fetch?branch=%{rtems_tools_version}?pull%{rtems_tools_git_checkout}
    4436
    4537 #
Note: See TracChangeset for help on using the changeset viewer.