From f0b0a70a482d5ccda497039f0254d4d20a86f123 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Mon, 11 Nov 2019 15:12:40 +1100 Subject: rtems: Fix kernel and tools release source package selection. Closes #3814 --- rtems/config/tools/rtems-kernel-common.cfg | 9 ++++----- rtems/config/tools/rtems-libbsd-common.cfg | 9 +++++++-- rtems/config/tools/rtems-tools-5-1.cfg | 11 ++++++++--- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/rtems/config/tools/rtems-kernel-common.cfg b/rtems/config/tools/rtems-kernel-common.cfg index 6e8cf32..6749937 100644 --- a/rtems/config/tools/rtems-kernel-common.cfg +++ b/rtems/config/tools/rtems-kernel-common.cfg @@ -114,12 +114,10 @@ URL: https://www.rtems.org/ # Source # %if %{rsb_released} - %if ! %{defined rtems_kernel_compression} - %define rtems_kernel_compression xz - %endif - %define rtems_kernel_version %{rtems_version} + %define rtems_kernel_file rtems-%{rtems_kernel_version}.tar.xz %define rtems_bootstrap 0 %else + %define rtems_kernel_file rtems-kernel-%{rtems_kernel_version}.tar.xz # # The code in git needs to be bootstrapped. Do each build because we have # no way to change what changes may have happened in the code. @@ -131,7 +129,8 @@ URL: https://www.rtems.org/ %error No RTEMS kernel version defined %endif -%source set rtems_kernel --rsb-file=rtems-kernel-%{rtems_kernel_version}.tar.bz2 https://git.rtems.org/rtems/snapshot/rtems-%{rtems_kernel_version}.tar.bz2 +%source set rtems_kernel --rsb-file=%{rtems_kernel_file} \ + https://git.rtems.org/rtems/snapshot/rtems-%{rtems_kernel_version}.tar.bz2 # If C++ defined for the tool set use it to control RTEMS's setting.. # diff --git a/rtems/config/tools/rtems-libbsd-common.cfg b/rtems/config/tools/rtems-libbsd-common.cfg index f5f78f2..1cea6b7 100644 --- a/rtems/config/tools/rtems-libbsd-common.cfg +++ b/rtems/config/tools/rtems-libbsd-common.cfg @@ -20,6 +20,9 @@ URL: https://git.rtems.org/rtems-libbsd.git/ # %if %{rsb_released} %define rtems_libbsd_version %{rsb_version} + %define rtems_libbsd_ext xz +%else + %define rtems_libbsd_ext bz2 %endif # @@ -34,8 +37,10 @@ URL: https://git.rtems.org/rtems-libbsd.git/ # which is a good thing because we would collect the entire FreeBSD source # -%source set rtems_libbsd https://git.rtems.org/rtems-libbsd/snapshot/rtems-libbsd-%{rtems_libbsd_version}.tar.bz2 -%source set rtems_waf https://git.rtems.org/rtems_waf/snapshot/rtems_waf-%{rtems_waf_version}.tar.bz2 +%source set rtems_libbsd \ + https://git.rtems.org/rtems-libbsd/snapshot/rtems-libbsd-%{rtems_libbsd_version}.tar.%{rtems_libbsd_ext} +%source set rtems_waf \ + https://git.rtems.org/rtems_waf/snapshot/rtems_waf-%{rtems_waf_version}.tar.%{rtems_libbsd_ext} # # Prepare the source code. diff --git a/rtems/config/tools/rtems-tools-5-1.cfg b/rtems/config/tools/rtems-tools-5-1.cfg index 459d9fe..c633093 100644 --- a/rtems/config/tools/rtems-tools-5-1.cfg +++ b/rtems/config/tools/rtems-tools-5-1.cfg @@ -7,13 +7,18 @@ # %if %{rsb_released} %define rtems_tools_version %{rsb_version} + %define rtems_tools_source rtems-tools-%{rtems_tools_version} + %define rtems_tools_ext xz %else %define rtems_tools_version 12bd8f77bad4779319039fd7be33d006e10f5618 - %define rtems_tools_source rtems-tools-%{rtems_tools_version} - %source set rtems-tools https://git.rtems.org/rtems-tools/snapshot/%{rtems_tools_source}.tar.bz2 - %hash sha512 rtems-tools-%{rtems_tools_version}.tar.bz2 d720966bee1cd7f4484cadfbc8bad2ac0d74e07912df0b66f900a959e652d18080157e31c957ca0c9a4f0d8bec99dcc0b7c06e61a62b955ef230d9630f6fe111 + %define rtems_tools_ext bz2 %endif +%define rtems_tools_source rtems-tools-%{rtems_tools_version} +%source set rtems-tools https://git.rtems.org/rtems-tools/snapshot/%{rtems_tools_source}.tar.%{rtems_tools_ext} +%hash sha512 rtems-tools-%{rtems_tools_version}.tar.bz2 \ + 1yCWa+4c1/RITK37yLrSrA104HkS3wtm+QCpWeZS0YCAFX4xyVfKDJpPDYvsmdzAt8BuYaYrlV7yMNljD2/hEQ== + # # Optionally enable/disable building the RTEMS Tools via the command line. # -- cgit v1.2.3