[rtems-source-builder commit] rtems: Refactor to move to a single version on master.
Chris Johns
chrisj at rtems.org
Fri Apr 15 02:00:14 UTC 2016
Module: rtems-source-builder
Branch: master
Commit: 70fc466b48186c2bf192f5bf656cbbd5da3270a2
Changeset: http://git.rtems.org/rtems-source-builder/commit/?id=70fc466b48186c2bf192f5bf656cbbd5da3270a2
Author: Chris Johns <chrisj at rtems.org>
Date: Fri Apr 15 11:51:55 2016 +1000
rtems: Refactor to move to a single version on master.
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.
---
rtems/config/4.12/rtems-autotools-base.bset | 4 ++--
rtems/config/4.12/rtems-default.bset | 10 +++++++++-
rtems/config/4.12/rtems-epiphany.bset | 4 ++--
rtems/config/4.12/rtems-m32c.bset | 4 ++--
rtems/config/4.12/rtems-or1k.bset | 5 ++---
rtems/config/4.12/rtems-tools.bset | 4 ++--
rtems/config/rtems-4.11-base.bset | 7 -------
rtems/config/rtems-4.12-base.bset | 7 -------
rtems/config/rtems-base.bset | 5 +++++
rtems/config/rtems-bsp.cfg | 17 +++++++++--------
rtems/config/rtems-version.bset | 5 +++++
11 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/rtems/config/4.12/rtems-autotools-base.bset b/rtems/config/4.12/rtems-autotools-base.bset
index f68df75..e208a10 100644
--- a/rtems/config/4.12/rtems-autotools-base.bset
+++ b/rtems/config/4.12/rtems-autotools-base.bset
@@ -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.
diff --git a/rtems/config/4.12/rtems-default.bset b/rtems/config/4.12/rtems-default.bset
index 70520ed..cd850e8 100644
--- a/rtems/config/4.12/rtems-default.bset
+++ b/rtems/config/4.12/rtems-default.bset
@@ -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
diff --git a/rtems/config/4.12/rtems-epiphany.bset b/rtems/config/4.12/rtems-epiphany.bset
index 407e382..a6c95a2 100644
--- a/rtems/config/4.12/rtems-epiphany.bset
+++ b/rtems/config/4.12/rtems-epiphany.bset
@@ -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.
diff --git a/rtems/config/4.12/rtems-m32c.bset b/rtems/config/4.12/rtems-m32c.bset
index 9ff4a80..df8b9b5 100644
--- a/rtems/config/4.12/rtems-m32c.bset
+++ b/rtems/config/4.12/rtems-m32c.bset
@@ -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.
diff --git a/rtems/config/4.12/rtems-or1k.bset b/rtems/config/4.12/rtems-or1k.bset
index d80bf59..8f10563 100644
--- a/rtems/config/4.12/rtems-or1k.bset
+++ b/rtems/config/4.12/rtems-or1k.bset
@@ -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
-
diff --git a/rtems/config/4.12/rtems-tools.bset b/rtems/config/4.12/rtems-tools.bset
index 2fb60e2..6332b5c 100644
--- a/rtems/config/4.12/rtems-tools.bset
+++ b/rtems/config/4.12/rtems-tools.bset
@@ -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
diff --git a/rtems/config/rtems-4.11-base.bset b/rtems/config/rtems-4.11-base.bset
deleted file mode 100644
index 16fd12b..0000000
--- a/rtems/config/rtems-4.11-base.bset
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Base defines for RTEMS 4.11
-#
-
-%define rtems_version 4.11
-
-%include rtems-base.bset
diff --git a/rtems/config/rtems-4.12-base.bset b/rtems/config/rtems-4.12-base.bset
deleted file mode 100644
index fef8135..0000000
--- a/rtems/config/rtems-4.12-base.bset
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Base defines for RTEMS 4.12
-#
-
-%define rtems_version 4.12
-
-%include rtems-base.bset
diff --git a/rtems/config/rtems-base.bset b/rtems/config/rtems-base.bset
index 0e61423..04c9679 100644
--- a/rtems/config/rtems-base.bset
+++ b/rtems/config/rtems-base.bset
@@ -3,6 +3,11 @@
#
#
+# Get the version of RTEMS
+#
+%include rtems-version.bset
+
+#
# Define the build target.
#
%define _target %{rtems_arch}-rtems%{rtems_version}
diff --git a/rtems/config/rtems-bsp.cfg b/rtems/config/rtems-bsp.cfg
index 2664776..28d250f 100644
--- a/rtems/config/rtems-bsp.cfg
+++ b/rtems/config/rtems-bsp.cfg
@@ -79,14 +79,6 @@
%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.
#
%define rtems_bsp_prefix %{_prefix}/%{_host}/%{rtems_bsp}
@@ -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}
diff --git a/rtems/config/rtems-version.bset b/rtems/config/rtems-version.bset
new file mode 100644
index 0000000..e77f38b
--- /dev/null
+++ b/rtems/config/rtems-version.bset
@@ -0,0 +1,5 @@
+#
+# Current version is RTEMS 4.12
+#
+
+%define rtems_version 4.12
More information about the vc
mailing list