Changeset 4141cca in rtems-source-builder


Ignore:
Timestamp:
Apr 11, 2017, 12:12:13 PM (3 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
2074bd1
Parents:
44ebcc5
git-author:
Chris Johns <chrisj@…> (04/11/17 12:12:13)
git-committer:
Chris Johns <chrisj@…> (04/13/17 01:01:46)
Message:

Fix rtems-tools and rtems-kernel builds when released and with a release URL.

Updates #2952.

Location:
rtems/config/tools
Files:
2 edited

Legend:

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

    r44ebcc5 r4141cca  
    6363   %define rtems_kernel_compression xz
    6464  %endif
     65  %define rtems_kernel_version %{rtems_version}
    6566  %define rtems_bootstrap 0
    6667 %else
    67   %if ! %{defined rtems_kernel_version}
    68    %define rtems_kernel_version HEAD
    69   %endif
    70   %if %{defined rtems_kernel_git_commit_hash}
    71    %define rtems_kernel_git_checkout ?checkout=%{defined rtems_kernel_git_commit_hash}
    72   %else
    73    %define rtems_kernel_git_checkout %{nil}
    74   %endif
    75 
    76   %source set rtems git://git.rtems.org/rtems.git?reset=hard?branch=%{rtems_kernel_version}?pull%{rtems_kernel_git_checkout}
    77 
    7868  #
    7969  # The code in git needs to be bootstrapped. Do each build because we have
     
    8373 %endif
    8474
    85  #
     75 %if ! %{defined rtems_kernel_version}
     76  %define rtems_kernel_version HEAD
     77 %endif
     78 %if %{defined rtems_kernel_git_commit_hash}
     79  %define rtems_kernel_git_checkout ?checkout=%{defined rtems_kernel_git_commit_hash}
     80 %else
     81  %define rtems_kernel_git_checkout %{nil}
     82 %endif
     83
     84 %source set rtems git://git.rtems.org/rtems.git?reset=hard?branch=%{rtems_kernel_version}?pull%{rtems_kernel_git_checkout} #
    8685 # If C++ defined for the tool set use it to control RTEMS's setting..
    8786 #
  • rtems/config/tools/rtems-tools-1.cfg

    r44ebcc5 r4141cca  
    2121
    2222%if %{rtems_tools_build}
     23 %if %{rsb_released}
     24  %define rtems_tools_version %{rtems_version}
     25 %endif
     26
    2327 #
    2428 # rtems_git_commit_hash : The commit hash else the branch is tracked.
Note: See TracChangeset for help on using the changeset viewer.