rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtems: Refactor to move to a single version on master.

Browse Source 
Move the 4.12 version and base defines to just RTEMS base defines
which includes the version. This removes the version from a number of
files and makes it simpler to move to a new version. It however means
we cannot support more than version on master.

This change further breaks 4.10 and 4.9 however it means we can
branch these versions and better support them on their branches.
This commit is contained in:
Chris Johns 2016-04-15 11:51:55 +10:00
parent c13971506a
commit 70fc466b48
11 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtems/config/4.12/rtems-autotools-base.bset
View File

@ -7,9 +7,9 @@
%define rtems_arch none
#
# The RTEMS 4.12 base defines.
# The RTEMS base defines.
#
%include rtems-4.12-base.bset
%include rtems-base.bset
#
# The autotools package.

10
rtems/config/4.12/rtems-default.bset
View File

@ -1,6 +1,14 @@
%include rtems-4.12-base.bset
#
# Default tools configuration.
#
#
# The RTEMS base defines
#
%include rtems-base.bset
4.12/rtems-autotools
devel/expat-2.1.0-1
tools/rtems-binutils-2.26-1
tools/rtems-gcc-6-20160327-newlib-2.4.0-1

4
rtems/config/4.12/rtems-epiphany.bset
View File

@ -33,9 +33,9 @@
%hash md5 f05996c7c42e6b2781946acbab153a481ce3fd0b.zip 05a4b208151a079bfbe2bed9c592ab43
#
# The RTEMS 4.12 base defines.
# The RTEMS base defines.
#
%include rtems-4.12-base.bset
%include rtems-base.bset
#
# Tools configuration.

4
rtems/config/4.12/rtems-m32c.bset
View File

@ -7,9 +7,9 @@
%define rtems_arch m32c
#
# The RTEMS 4.12 base defines.
# The RTEMS base defines.
#
%include rtems-4.12-base.bset
%include rtems-base.bset
#
# Disable building a C++ compiler.

5
rtems/config/4.12/rtems-or1k.bset
View File

@ -7,9 +7,9 @@
%define rtems_arch or1k
#
# The RTEMS 4.12 base defines.
# The RTEMS base defines.
#
%include rtems-4.12-base.bset
%include rtems-base.bset
#
# or1k specific patches
@ -41,4 +41,3 @@ tools/rtems-binutils-2.26-1
tools/rtems-gcc-4.9.3-newlib-2.4.0-1.cfg
tools/rtems-tools-4.12-1
tools/rtems-gdb-7.11-1

4
rtems/config/4.12/rtems-tools.bset
View File

@ -10,8 +10,8 @@
%define rtems_arch tools
#
# The RTEMS 4.12 base defines.
# The RTEMS base defines.
#
%include rtems-4.12-base.bset
%include rtems-base.bset
tools/rtems-tools-4.12-1

7
rtems/config/rtems-4.11-base.bset
View File

@ -1,7 +0,0 @@
#
# Base defines for RTEMS 4.11
#
%define rtems_version 4.11
%include rtems-base.bset

7
rtems/config/rtems-4.12-base.bset
View File

@ -1,7 +0,0 @@
#
# Base defines for RTEMS 4.12
#
%define rtems_version 4.12
%include rtems-base.bset

5
rtems/config/rtems-base.bset
View File

@ -2,6 +2,11 @@
# Base defines for RTEMS
#
#
# Get the version of RTEMS
#
%include rtems-version.bset
#
# Define the build target.
#

17
rtems/config/rtems-bsp.cfg
View File

@ -78,14 +78,6 @@
%define rtems_bsp_ccflags %{rtems_bsp_cflags}
%endif
#
# Map to names used for cross compiling.
#
%define host_cflags %{rtems_bsp_cflags}
%define host_cxxflags %{rtems_bsp_ccflags}
%define host_ldflags %{rtems_bsp_ldflags}
%define host_libs %{rtems_bsp_libs}
#
# Update the configure paths to be BSP specific.
#
@ -108,3 +100,12 @@
%define _localedir %{_datarootdir}/locale
%define _localedir %{_datadir}/locale
%define _localstatedir %{_exec_prefix}/var
#
# Map to names used for cross compiling.
#
%define host_includes -I%{_includedir}
%define host_cflags %{rtems_bsp_cflags}
%define host_cxxflags %{rtems_bsp_ccflags}
%define host_ldflags %{rtems_bsp_ldflags}
%define host_libs %{rtems_bsp_libs}

5
rtems/config/rtems-version.bset Normal file
View File

@ -0,0 +1,5 @@
#
# Current version is RTEMS 4.12
#
%define rtems_version 4.12