Move 5 build sets to 6

- Move 5/bsps/* to bsps/*

- Update package build references from 5 to 6

- Remove 5 build sets.

Update #4048
This commit is contained in:
Chris Johns 2020-08-13 11:44:23 +10:00
parent dc989037e4
commit 40af487dfc
59 changed files with 115 additions and 423 deletions

View File

@ -1,10 +0,0 @@
%define mail_single_report 1
%define with_rtems_bsp atsamv
%define rtems_target arm-rtems5
%define rtems_host %{rtems_target}
5/rtems-arm
5/rtems-kernel
5/rtems-libbsd
5/rtems-packages

View File

@ -1,10 +0,0 @@
%define mail_single_report 1
%define with_rtems_bsp imx7
%define rtems_target arm-rtems5
%define rtems_host %{rtems_target}
5/rtems-arm
5/rtems-kernel
5/rtems-libbsd
5/rtems-packages

View File

@ -1,10 +0,0 @@
%define mail_single_report 1
%define with_rtems_bsp qoriq_e500
%define rtems_target powerpc-rtems5
%define rtems_host %{rtems_target}
5/rtems-powerpc
5/rtems-kernel
5/rtems-libbsd
5/rtems-packages

View File

@ -1,10 +0,0 @@
%define mail_single_report 1
%define with_rtems_bsp qoriq_e6500_32
%define rtems_target powerpc-rtems5
%define rtems_host %{rtems_target}
5/rtems-powerpc
5/rtems-kernel
5/rtems-libbsd
5/rtems-packages

View File

@ -1,10 +0,0 @@
%define mail_single_report 1
%define with_rtems_bsp qoriq_e6500_64
%define rtems_target powerpc-rtems5
%define rtems_host %{rtems_target}
5/rtems-powerpc
5/rtems-kernel
5/rtems-libbsd
5/rtems-packages

View File

@ -1,4 +0,0 @@
%define release 1
%define rtems_arch aarch64
%define with_libgomp
%include 5/rtems-default.bset

View File

@ -1,19 +0,0 @@
5/rtems-aarch64
5/rtems-arm
5/rtems-bfin
5/rtems-epiphany
5/rtems-i386
5/rtems-lm32
5/rtems-m68k
5/rtems-microblaze
5/rtems-mips
5/rtems-moxie
5/rtems-nios2
5/rtems-or1k
5/rtems-powerpc
5/rtems-riscv
5/rtems-sh
5/rtems-sparc
5/rtems-sparc64
5/rtems-v850
5/rtems-x86_64

View File

@ -1,4 +0,0 @@
%define release 1
%define rtems_arch arm
%define with_libgomp
%include 5/rtems-default.bset

View File

@ -1,23 +0,0 @@
#
# Tools Set for RTEMS 5 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

@ -1,13 +0,0 @@
#
# Tools Set for RTEMS 5 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 5/rtems-autotools-base.bset

View File

@ -1,27 +0,0 @@
#
# Tools Set for RTEMS 5 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.
#
#
# 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}
#
# Disable emailing reports of this building for RTEMS.
#
%define mail_disable
5/rtems-autotools-internal
5/rtems-autotools-base

View File

@ -1,3 +0,0 @@
%define release 1
%define rtems_arch bfin
%include 5/rtems-default.bset

View File

@ -1,22 +0,0 @@
#
# Default tools configuration.
#
#
# The RTEMS base defines
#
%include rtems-base.bset
5/rtems-autotools
#
# Build gdb first to raise the Python install error as early as possible.
# GDB needs expat so it needs to be built before.
#
devel/expat-2.1.0-1
tools/rtems-gdb-9.1-1
tools/rtems-binutils-2.34
tools/rtems-gcc-7.5.0-newlib-7947581
tools/rtems-tools-5-1

View File

@ -1,39 +0,0 @@
#
# Tools Set for RTEMS Epiphany 5 Stable
#
%define release 1
%define rtems_arch epiphany
#
# Get GNU tools from external repositories.
#
%define gdb_external 1
#
# Expanded names of the GNU tools
#
%define gdb_expand_name epiphany-binutils-gdb-f05996c7c42e6b2781946acbab153a481ce3fd0b
#
# Fetch GNU tools from external repos (temporarly).
#
%define epiphany_gdb_version f05996c7c42e6b2781946acbab153a481ce3fd0b
%source set gdb --rsb-file=gdb-f05996c7c42e6b2781946acbab153a481ce3fd0b.zip https://github.com/adapteva/epiphany-binutils-gdb/archive/f05996c7c42e6b2781946acbab153a481ce3fd0b.zip
%hash sha256 gdb-f05996c7c42e6b2781946acbab153a481ce3fd0b.zip 2b2034fd12f2fd5108205ade66400c175ede8cef8141a38ae03fc78bf2d65325
#
# The RTEMS base defines.
#
%include rtems-base.bset
#
# Tools configuration.
#
5/rtems-autotools
devel/expat-2.1.0-1
tools/rtems-binutils-2.34
tools/rtems-gcc-7.5.0-newlib-7947581
tools/rtems-gdb-7.8.1-1
tools/rtems-tools-5-1

View File

@ -1,4 +0,0 @@
%define release 1
%define rtems_arch i386
%define with_libgomp
%include 5/rtems-default.bset

View File

@ -1,10 +0,0 @@
%define release 1
%define rtems_arch lm32
#
# Fix the simulator UART interface.
#
%patch add gdb https://devel.rtems.org/raw-attachment/ticket/3030/gdb-7.9-lm32uart-2.diff
%hash sha256 gdb-7.9-lm32uart-2.diff 7a266c1800829dcb5e493073ef98ad7d7f38a69715b93154dfaaffd34073dff3
%include 5/rtems-default.bset

View File

@ -1,3 +0,0 @@
%define release 1
%define rtems_arch m68k
%include 5/rtems-default.bset

View File

@ -1,3 +0,0 @@
%define release 1
%define rtems_arch microblaze
%include 5/rtems-default.bset

View File

@ -1,6 +0,0 @@
%define release 1
%define rtems_arch mips
%define gdb-sim-options --enable-sim-hardware
%define win32-gdb-disable-sim
%include 5/rtems-default.bset
tools/rtems-mipstx39-gdb-8.0.1-1

View File

@ -1,12 +0,0 @@
#
# Tools Set for RTEMS Moxie 5 Stable
#
%define release 1
%define rtems_arch moxie
%define win32-gdb-disable-sim
%define with_libgomp
# Moxie needs dtc to build gdb, then pick up the rest of the set
devel/dtc-1.6.0-1
%include 5/rtems-default.bset

View File

@ -1,3 +0,0 @@
%define release 1
%define rtems_arch nios2
%include 5/rtems-default.bset

View File

@ -1,15 +0,0 @@
#
# or1k architecture
#
%define release 1
%define rtems_arch or1k
%include rtems-base.bset
5/rtems-autotools
devel/expat-2.1.0-1
tools/rtems-gdb-8.2.1-1
tools/rtems-binutils-2.34
tools/rtems-gcc-9.3.0-newlib-7947581
tools/rtems-tools-5-1

View File

@ -1,8 +0,0 @@
#
# PowerPC architecture
#
%define release 1
%define rtems_arch powerpc
%define with_libgomp
%include 5/rtems-default.bset

View File

@ -1,17 +0,0 @@
#
# RISC-V architecture
#
%define release 1
%define rtems_arch riscv
%define with_libgomp
%include rtems-base.bset
5/rtems-autotools
devel/expat-2.1.0-1
tools/rtems-gdb-8.3-1
tools/rtems-binutils-2.34
tools/rtems-gcc-9.3.0-newlib-7947581
tools/rtems-tools-5-1
devel/sis-2-1

View File

@ -1,6 +0,0 @@
#
# SH architecture
#
%define release 1
%define rtems_arch sh
%include 5/rtems-default.bset

View File

@ -1,6 +0,0 @@
%define release 1
%define rtems_arch sparc
%define with_libgomp
%define gdb-disable-sim 1
%include 5/rtems-default.bset
devel/sis-2-1

View File

@ -1,3 +0,0 @@
%define release 1
%define rtems_arch sparc64
%include 5/rtems-default.bset

View File

@ -1,5 +0,0 @@
#
# Tier 1 architectures. Must build.
#
5/rtems-arm
5/rtems-i386

View File

@ -1,3 +0,0 @@
#
# Tier 2 architectures. Must build.
#

View File

@ -1,17 +0,0 @@
#
# Tier 3 architectures. Must build.
#
5/rtems-arm
5/rtems-bfin
5/rtems-i386
5/rtems-lm32
5/rtems-m68k
5/rtems-mips
5/rtems-moxie
5/rtems-nios2
5/rtems-or1k
5/rtems-powerpc
5/rtems-sh
5/rtems-sparc
5/rtems-sparc64
5/rtems-v850

View File

@ -1,10 +0,0 @@
#
# Tier 4 architectures. Do not need to build.
#
# Tools listed here may not have a BSP in the kernel and are here to support
# anyone working on adding a BSP.
#
5/rtems-epiphany
5/rtems-microblaze
5/rtems-riscv32
5/rtems-x86_64

View File

@ -1,3 +0,0 @@
%define release 1
%define rtems_arch v850
%include 5/rtems-default.bset

View File

@ -1,13 +0,0 @@
%define release 1
%define rtems_arch x86_64
%define with_libgomp
%include rtems-base.bset
5/rtems-autotools
devel/expat-2.1.0-1
tools/rtems-gdb-8.2.1-1
tools/rtems-binutils-2.34
tools/rtems-gcc-9.3.0-newlib-7947581
tools/rtems-tools-5-1

View File

@ -1,3 +1,6 @@
#
# Default tools configuration.
#
%include 6/rtems-base.bset
6/rtems-autotools

View File

@ -12,4 +12,4 @@
#
# Build the kernel.
#
tools/rtems-kernel-5
tools/rtems-kernel-6

View File

@ -5,4 +5,4 @@
#
# Build the BSD library for RTEMS.
#
tools/rtems-libbsd-5
tools/rtems-libbsd-6

View File

@ -1,5 +1,5 @@
#
# Tools Set for RTEMS 5 Tools Stable
# Tools Set for RTEMS 6 Tools Stable
#
%define release 1
@ -14,4 +14,4 @@
#
%include rtems-base.bset
tools/rtems-tools-5-1
tools/rtems-tools-6-1

View File

@ -0,0 +1,10 @@
%define mail_single_report 1
%define with_rtems_bsp atsamv
%define rtems_target arm-rtems%{rtems_version}
%define rtems_host %{rtems_target}
6/rtems-arm
6/rtems-kernel
6/rtems-libbsd
6/rtems-packages

View File

@ -12,10 +12,10 @@
%define mail_single_report 1
%define with_rtems_bsp beagleboneblack
%define rtems_target arm-rtems5
%define rtems_target arm-rtems%{rtems_version}
%define rtems_host %{rtems_target}
5/rtems-arm
5/rtems-kernel
5/rtems-libbsd
5/rtems-packages
6/rtems-arm
6/rtems-kernel
6/rtems-libbsd
6/rtems-packages

View File

@ -12,10 +12,10 @@
%define mail_single_report 1
%define with_rtems_bsp erc32
%define rtems_target sparc-rtems5
%define rtems_target sparc-rtems%{rtems_version}
%define rtems_host %{rtems_target}
5/rtems-sparc
5/rtems-kernel
5/rtems-libbsd
5/rtems-packages
6/rtems-sparc
6/rtems-kernel
6/rtems-libbsd
6/rtems-packages

View File

@ -1,8 +1,8 @@
%define mail_single_report 1
%define with_rtems_bsp gr712rc
%define rtems_target sparc-rtems5
%define rtems_target sparc-rtems%{rtems_version}
%define rtems_host %{rtems_target}
5/rtems-sparc
5/rtems-kernel
6/rtems-sparc
6/rtems-kernel

View File

@ -1,8 +1,8 @@
%define mail_single_report 1
%define with_rtems_bsp gr740
%define rtems_target sparc-rtems5
%define rtems_target sparc-rtems%{rtems_version}
%define rtems_host %{rtems_target}
5/rtems-sparc
5/rtems-kernel
6/rtems-sparc
6/rtems-kernel

View File

@ -0,0 +1,10 @@
%define mail_single_report 1
%define with_rtems_bsp imx7
%define rtems_target arm-rtems%{rtems_version}
%define rtems_host %{rtems_target}
6/rtems-arm
6/rtems-kernel
6/rtems-libbsd
6/rtems-packages

View File

@ -12,10 +12,10 @@
%define mail_single_report 1
%define with_rtems_bsp pc686
%define rtems_target i386-rtems5
%define rtems_target i386-rtems%{rtems_version}
%define rtems_host %{rtems_target}
5/rtems-i386
5/rtems-kernel
5/rtems-libbsd
5/rtems-packages
6/rtems-i386
6/rtems-kernel
6/rtems-libbsd
6/rtems-packages

View File

@ -0,0 +1,10 @@
%define mail_single_report 1
%define with_rtems_bsp qoriq_e500
%define rtems_target powerpc-rtems%{rtems_version}
%define rtems_host %{rtems_target}
6/rtems-powerpc
6/rtems-kernel
6/rtems-libbsd
6/rtems-packages

View File

@ -0,0 +1,10 @@
%define mail_single_report 1
%define with_rtems_bsp qoriq_e6500_32
%define rtems_target powerpc-rtems%{rtems_version}
%define rtems_host %{rtems_target}
6/rtems-powerpc
6/rtems-kernel
6/rtems-libbsd
6/rtems-packages

View File

@ -0,0 +1,10 @@
%define mail_single_report 1
%define with_rtems_bsp qoriq_e6500_64
%define rtems_target powerpc-rtems%{rtems_version}
%define rtems_host %{rtems_target}
6/rtems-powerpc
6/rtems-kernel
6/rtems-libbsd
6/rtems-packages

View File

@ -12,10 +12,10 @@
%define mail_single_report 1
%define with_rtems_bsp raspberrypi2
%define rtems_target arm-rtems5
%define rtems_target arm-rtems%{rtems_version}
%define rtems_host %{rtems_target}
5/rtems-arm
5/rtems-kernel
5/rtems-libbsd
5/rtems-packages
6/rtems-arm
6/rtems-kernel
6/rtems-libbsd
6/rtems-packages

View File

@ -12,10 +12,10 @@
%define mail_single_report 1
%define with_rtems_bsp xilinx_zynq_zc702
%define rtems_target arm-rtems5
%define rtems_target arm-rtems%{rtems_version}
%define rtems_host %{rtems_target}
5/rtems-arm
5/rtems-kernel
5/rtems-libbsd
5/rtems-packages
6/rtems-arm
6/rtems-kernel
6/rtems-libbsd
6/rtems-packages

View File

@ -12,10 +12,10 @@
%define mail_single_report 1
%define with_rtems_bsp xilinx_zynq_zc706
%define rtems_target arm-rtems5
%define rtems_target arm-rtems%{rtems_version}
%define rtems_host %{rtems_target}
5/rtems-arm
5/rtems-kernel
5/rtems-libbsd
5/rtems-packages
6/rtems-arm
6/rtems-kernel
6/rtems-libbsd
6/rtems-packages

View File

@ -12,10 +12,10 @@
%define mail_single_report 1
%define with_rtems_bsp xilinx_zynq_zedboard
%define rtems_target arm-rtems5
%define rtems_target arm-rtems%{rtems_version}
%define rtems_host %{rtems_target}
5/rtems-arm
5/rtems-kernel
5/rtems-libbsd
5/rtems-packages
6/rtems-arm
6/rtems-kernel
6/rtems-libbsd
6/rtems-packages

View File

@ -4,11 +4,6 @@
%define release 1
#
# RTEMS Version
#
%define rtems_version 5
#
# The RTEMS URL paths.
#

View File

@ -4,11 +4,6 @@
%define release 1
#
# RTEMS Version
#
%define rtems_version 4.11
#
# The RTEMS URL paths.
#

View File

@ -1,12 +0,0 @@
#
# RTEMS 5
#
%define rtems_kernel_version 46c23871813618e7a16050068041b3d33551cd0d
%hash sha512 rtems-kernel-%{rtems_kernel_version}.tar.bz2 \
CoTpxkjoEXVITsFBDFJReE4AbOYdgXFI1U3eCazd3dzi3B8R0n4L2qx5wSbzxajN7RzzTJZkbRMttRcB7Xh0lg==
#
# The RTEMS build instructions.
#
%include tools/rtems-kernel-common.cfg

View File

@ -0,0 +1,12 @@
#
# RTEMS 5
#
%define rtems_kernel_version 3ec5f20484cc4201e1d7b87844505644533b6148
%hash sha512 rtems-kernel-%{rtems_kernel_version}.tar.bz2 \
BjMKrf5n1YR6IpiZrY5TUEzKATPRJxA2/6m6f833DdRu+RyLxccXqA4gHRdVUqFelFNQ3o0XdG4o1naBKYfhkQ==
#
# The RTEMS build instructions.
#
%include tools/rtems-kernel-common.cfg

View File

@ -214,8 +214,7 @@ URL: https://www.rtems.org/
export PATH="%{_internal_autotools_path}/bin:${PATH}"
%endif
./bootstrap -c
%{_sbdir}/sb-bootstrap --preinstall
%{_sbdir}/sb-bootstrap
./rtems-bootstrap
%endif
cd ..

View File

@ -1,10 +1,11 @@
#
# RTEMS 5 LibBSD
# RTEMS 6 LibBSD
#
%define rtems_libbsd_version b96abfd647154f10ea8f7fac68e25676636eded5
# branch: 6-freebsd-12
%define rtems_libbsd_version d964a6703c705cc92fd053bcefc08bb3b6baa0e2
%hash sha512 rtems-libbsd-%{rtems_libbsd_version}.tar.bz2 \
/v2tsVlOL/ggpH8GMQib21tgEWaGKpjXdp44Ss/dDBgxxgbuc5mZ3DTlkjpOA72HeQ8HujGCdSX7QP9tjDkfMQ==
wEy8HtzSezKJtA3Vob7wM/D5qaG3ZVTDoNkK1yeTju04ov4IfL6IXWEtrNkOFsu9LdV1OPAOKSSYyAQ13sQqvg==
%define rtems_waf_version ad08908c452c6a9bbb3bf7bbbcc9fc03fe46cc7f
%hash sha512 rtems-waf-%{rtems_waf_version}.tar.bz2 \
EyuEit0DsAR1gK9Ki1sjl416PFgFe7dcggH3H/hmdAPmMjEIIdX7TVOTDgOIK1Pt0DW6lZ9NcW7O87GZFyy8hg==