Update 4.10 to build from the RTEMS 4.10 branch.

This commit is contained in:
Chris Johns 2016-09-02 08:58:31 +10:00
parent 3ad1e566e5
commit 1362d4f0ed
11 changed files with 83 additions and 53 deletions

View File

@ -5,7 +5,7 @@
# #
# The RTEMS http git URL. # The RTEMS http git URL.
# #
%define rtems_version 4.12 %define rtems_version 4.10
%define rtems_http_git http://git.rtems.org %define rtems_http_git http://git.rtems.org
%define rtems_git_tools %{rtems_http_git}/rtems-tools/plain/tools/%{rtems_version} %define rtems_git_tools %{rtems_http_git}/rtems-tools/plain/tools/%{rtems_version}
%define bare_binutils_patches %{rtems_git_tools}/binutils %define bare_binutils_patches %{rtems_git_tools}/binutils

View File

@ -7,30 +7,15 @@
%define rtems_arch arm %define rtems_arch arm
# #
# The RTEMS 4.10 base defines. # The RTEMS base defines.
# #
%include rtems-4.10-base.bset %include rtems-base.bset
#
# The RTEMS 4.10 BSP to build and test
#
# Do not build: lm3s3749
# For automated testing, edb7312 should be configured with:
# - ON_SKYEYE=1
# The GDB based simulators could be used as defaults for testing though.
# Skyeye includes coverage.
#
%define rtems_bsps all
%define rtems_test_bsps none
#
# Disable the tests because the samples do not build.
#
%define rtems_tests disable
# #
# Tools configuration. # Tools configuration.
# #
4.10/rtems-autotools
devel/expat-2.1.0-1 devel/expat-2.1.0-1
tools/rtems-binutils-2.20.1-1 tools/rtems-binutils-2.20.1-1
tools/rtems-gcc-4.4.7-newlib-1.18.0-1 tools/rtems-gcc-4.4.7-newlib-1.18.0-1

View File

@ -0,0 +1,23 @@
#
# Tools Set for RTEMS 4.10 Internal Autotools Stable
#
%define release 1
%define rtems_arch none
#
# The RTEMS base defines.
#
%include rtems-base.bset
#
# The autotools package.
#
package: rtems-%{rtems_version}-autotools-%{_host}-%{release}
#
# Tools configuration.
#
tools/rtems-autoconf-2.69-1
tools/rtems-automake-1.12.6-1

View File

@ -0,0 +1,13 @@
#
# Tools Set for RTEMS 4.10 Internal Autotools Stable
#
# Do not use via the command line.
#
%define _internal_autotools yes
%define _disable_collecting yes
%define _disable_packaging yes
%define _disable_reporting yes
%define _disable_installing yes
%include 4.10/rtems-autotools-base.bset

View File

@ -1,23 +1,22 @@
# #
# Tools Set for RTEMS 4.9 Autotools Stable # Tools Set for RTEMS 4.10 Autotools Stable
#
# Autoconf and automake are not relocatable and cannot be cross-compiled.
# RTEMS uses autoconf and automake and building RTEMS in the RSB requires
# bootstrapping and this requires a current autoconf and automake. The RSB
# provides to support by:
#
# 1. Building and installing autoconf and automake with a prefix to a
# temporary internal path.
# 2. Using the temporary internal build, build and install another copy
# using the final prefix location.
# #
%define release 1 #
# A magic internal path that would break if changes in the defaults.mc
# macro file are made.
#
%define _internal_autotools_path %{_tmppath}/sb-%{_uid}/${SB_PREFIX_CLEAN}
%define rtems_arch none 4.10/rtems-autotools-internal
4.10/rtems-autotools-base
#
# The RTEMS 4.9 base defines.
#
%include rtems-4.9-base.bset
#
# The autotoolspackage.
#
package: rtems-%{rtems_version}-autotools-%{_host}-%{release}
#
# Tools configuration.
#
devel/autoconf-2.69-1
devel/automake-1.12.2-1

View File

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

View File

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

View File

@ -0,0 +1,6 @@
#
# Vversion of RTEMS 4.10
#
%define rtems_version 4.10
%define release 1

View File

@ -2,11 +2,16 @@
# GDB 7.3. # GDB 7.3.
# #
%if %{_build_os} == freebsd
%define build_cflags -Wno-return-type
%endif
%include %{_configdir}/checks.cfg %include %{_configdir}/checks.cfg
%include %{_configdir}/base.cfg %include %{_configdir}/base.cfg
%define gdb_version 7.3.1 %define gdb_version 7.3.1
%define gdb_src_ext bz2
%hash md5 gdb-%{gdb_version}.tar.bz2 b89a5fac359c618dda97b88645ceab47 %hash md5 gdb-%{gdb_version}.tar.bz2 b89a5fac359c618dda97b88645ceab47
%patch add gdb %{rtems_gdb_patches}/gdb-7.3.1-rtems4.10-20120918.diff %patch add gdb %{rtems_gdb_patches}/gdb-7.3.1-rtems4.10-20120918.diff

View File

@ -4,6 +4,13 @@
# This configuration file configure's, make's and install's RTEMS. # This configuration file configure's, make's and install's RTEMS.
# #
%if %{release}
%define release 1
%endif
#
# If released use that version number else use the git version.
#
%if %{rsb_released} %if %{rsb_released}
%define rtems_kernel_version %{rsb_version} %define rtems_kernel_version %{rsb_version}
%else %else

View File

@ -2,14 +2,8 @@
# RTEMS 4.10.2 # RTEMS 4.10.2
# #
%include %{_configdir}/checks.cfg
%include %{_configdir}/base.cfg
%define rsb_released
%define rtems_kernel_version 4.10.2
%define rtems_kernel_compression bz2 %define rtems_kernel_compression bz2
%hash md5 rtems-%{rtems_version}.tar.bz2 158566d0f1330d4eaba5a60e757d3dd0
%hash md5 rtems-%{rtems_kernel_version}.tar.bz2 158566d0f1330d4eaba5a60e757d3dd0
# #
# The RTEMS build instructions. We use 4.xx Release 1. # The RTEMS build instructions. We use 4.xx Release 1.