[PATCH v2] Move 5 build sets to 6
chrisj at rtems.org
chrisj at rtems.org
Thu Aug 13 01:55:31 UTC 2020
From: Chris Johns <chrisj at rtems.org>
- Move 5/bsps/* to bsps/*
- Update package build references from 5 to 6
- Remove 5 build sets.
Update #4048
---
rtems/config/5/bsps/atsamv.bset | 10 -----
rtems/config/5/bsps/imx7.bset | 10 -----
rtems/config/5/bsps/qoriq_e500.bset | 10 -----
rtems/config/5/bsps/qoriq_e6500_32.bset | 10 -----
rtems/config/5/bsps/qoriq_e6500_64.bset | 10 -----
rtems/config/5/rtems-aarch64.bset | 4 --
rtems/config/5/rtems-all.bset | 19 ---------
rtems/config/5/rtems-arm.bset | 4 --
rtems/config/5/rtems-autotools-base.bset | 23 -----------
rtems/config/5/rtems-autotools-internal.bset | 13 -------
rtems/config/5/rtems-autotools.bset | 27 -------------
rtems/config/5/rtems-bfin.bset | 3 --
rtems/config/5/rtems-default.bset | 22 -----------
rtems/config/5/rtems-epiphany.bset | 39 -------------------
rtems/config/5/rtems-i386.bset | 4 --
rtems/config/5/rtems-lm32.bset | 10 -----
rtems/config/5/rtems-m68k.bset | 3 --
rtems/config/5/rtems-microblaze.bset | 3 --
rtems/config/5/rtems-mips.bset | 6 ---
rtems/config/5/rtems-moxie.bset | 12 ------
rtems/config/5/rtems-nios2.bset | 3 --
rtems/config/5/rtems-or1k.bset | 15 -------
rtems/config/5/rtems-powerpc.bset | 8 ----
rtems/config/5/rtems-riscv.bset | 17 --------
rtems/config/5/rtems-sh.bset | 6 ---
rtems/config/5/rtems-sparc.bset | 6 ---
rtems/config/5/rtems-sparc64.bset | 3 --
rtems/config/5/rtems-tier-1.bset | 5 ---
rtems/config/5/rtems-tier-2.bset | 3 --
rtems/config/5/rtems-tier-3.bset | 17 --------
rtems/config/5/rtems-tier-4.bset | 10 -----
rtems/config/5/rtems-v850.bset | 3 --
rtems/config/5/rtems-x86_64.bset | 13 -------
rtems/config/6/rtems-default.bset | 3 ++
rtems/config/{5 => 6}/rtems-kernel.bset | 2 +-
rtems/config/{5 => 6}/rtems-libbsd.bset | 2 +-
rtems/config/{5 => 6}/rtems-llvm.bset | 0
rtems/config/{5 => 6}/rtems-packages.bset | 0
rtems/config/{5 => 6}/rtems-tools.bset | 4 +-
rtems/config/bsps/atsamv.bset | 10 +++++
.../config/{5 => }/bsps/beagleboneblack.bset | 10 ++---
rtems/config/{5 => }/bsps/erc32.bset | 10 ++---
rtems/config/{5 => }/bsps/gr712rc.bset | 6 +--
rtems/config/{5 => }/bsps/gr740.bset | 6 +--
rtems/config/bsps/imx7.bset | 10 +++++
rtems/config/{5 => }/bsps/pc.bset | 10 ++---
rtems/config/bsps/qoriq_e500.bset | 10 +++++
rtems/config/bsps/qoriq_e6500_32.bset | 10 +++++
rtems/config/bsps/qoriq_e6500_64.bset | 10 +++++
rtems/config/{5 => }/bsps/raspberrypi2.bset | 10 ++---
.../{5 => }/bsps/xilinx_zynq_zc702.bset | 10 ++---
.../{5 => }/bsps/xilinx_zynq_zc706.bset | 10 ++---
.../{5 => }/bsps/xilinx_zynq_zedboard.bset | 10 ++---
rtems/config/ftp/curl.bset | 5 ---
rtems/config/net-mgmt/net-snmp.bset | 5 ---
rtems/config/tools/rtems-kernel-5.cfg | 12 ------
rtems/config/tools/rtems-kernel-6.cfg | 12 ++++++
rtems/config/tools/rtems-kernel-common.cfg | 3 +-
...{rtems-libbsd-5.cfg => rtems-libbsd-6.cfg} | 7 ++--
59 files changed, 115 insertions(+), 423 deletions(-)
delete mode 100644 rtems/config/5/bsps/atsamv.bset
delete mode 100644 rtems/config/5/bsps/imx7.bset
delete mode 100644 rtems/config/5/bsps/qoriq_e500.bset
delete mode 100644 rtems/config/5/bsps/qoriq_e6500_32.bset
delete mode 100644 rtems/config/5/bsps/qoriq_e6500_64.bset
delete mode 100644 rtems/config/5/rtems-aarch64.bset
delete mode 100644 rtems/config/5/rtems-all.bset
delete mode 100644 rtems/config/5/rtems-arm.bset
delete mode 100644 rtems/config/5/rtems-autotools-base.bset
delete mode 100644 rtems/config/5/rtems-autotools-internal.bset
delete mode 100644 rtems/config/5/rtems-autotools.bset
delete mode 100644 rtems/config/5/rtems-bfin.bset
delete mode 100644 rtems/config/5/rtems-default.bset
delete mode 100644 rtems/config/5/rtems-epiphany.bset
delete mode 100644 rtems/config/5/rtems-i386.bset
delete mode 100644 rtems/config/5/rtems-lm32.bset
delete mode 100644 rtems/config/5/rtems-m68k.bset
delete mode 100644 rtems/config/5/rtems-microblaze.bset
delete mode 100644 rtems/config/5/rtems-mips.bset
delete mode 100644 rtems/config/5/rtems-moxie.bset
delete mode 100644 rtems/config/5/rtems-nios2.bset
delete mode 100644 rtems/config/5/rtems-or1k.bset
delete mode 100644 rtems/config/5/rtems-powerpc.bset
delete mode 100644 rtems/config/5/rtems-riscv.bset
delete mode 100644 rtems/config/5/rtems-sh.bset
delete mode 100644 rtems/config/5/rtems-sparc.bset
delete mode 100644 rtems/config/5/rtems-sparc64.bset
delete mode 100644 rtems/config/5/rtems-tier-1.bset
delete mode 100644 rtems/config/5/rtems-tier-2.bset
delete mode 100644 rtems/config/5/rtems-tier-3.bset
delete mode 100644 rtems/config/5/rtems-tier-4.bset
delete mode 100644 rtems/config/5/rtems-v850.bset
delete mode 100644 rtems/config/5/rtems-x86_64.bset
rename rtems/config/{5 => 6}/rtems-kernel.bset (88%)
rename rtems/config/{5 => 6}/rtems-libbsd.bset (77%)
rename rtems/config/{5 => 6}/rtems-llvm.bset (100%)
rename rtems/config/{5 => 6}/rtems-packages.bset (100%)
rename rtems/config/{5 => 6}/rtems-tools.bset (74%)
create mode 100644 rtems/config/bsps/atsamv.bset
rename rtems/config/{5 => }/bsps/beagleboneblack.bset (68%)
rename rtems/config/{5 => }/bsps/erc32.bset (65%)
rename rtems/config/{5 => }/bsps/gr712rc.bset (55%)
rename rtems/config/{5 => }/bsps/gr740.bset (55%)
create mode 100644 rtems/config/bsps/imx7.bset
rename rtems/config/{5 => }/bsps/pc.bset (65%)
create mode 100644 rtems/config/bsps/qoriq_e500.bset
create mode 100644 rtems/config/bsps/qoriq_e6500_32.bset
create mode 100644 rtems/config/bsps/qoriq_e6500_64.bset
rename rtems/config/{5 => }/bsps/raspberrypi2.bset (67%)
rename rtems/config/{5 => }/bsps/xilinx_zynq_zc702.bset (68%)
rename rtems/config/{5 => }/bsps/xilinx_zynq_zc706.bset (68%)
rename rtems/config/{5 => }/bsps/xilinx_zynq_zedboard.bset (69%)
delete mode 100644 rtems/config/tools/rtems-kernel-5.cfg
create mode 100644 rtems/config/tools/rtems-kernel-6.cfg
rename rtems/config/tools/{rtems-libbsd-5.cfg => rtems-libbsd-6.cfg} (63%)
diff --git a/rtems/config/5/bsps/atsamv.bset b/rtems/config/5/bsps/atsamv.bset
deleted file mode 100644
index 4bde317..0000000
--- a/rtems/config/5/bsps/atsamv.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/bsps/imx7.bset b/rtems/config/5/bsps/imx7.bset
deleted file mode 100644
index c48a526..0000000
--- a/rtems/config/5/bsps/imx7.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/bsps/qoriq_e500.bset b/rtems/config/5/bsps/qoriq_e500.bset
deleted file mode 100644
index 4390e72..0000000
--- a/rtems/config/5/bsps/qoriq_e500.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/bsps/qoriq_e6500_32.bset b/rtems/config/5/bsps/qoriq_e6500_32.bset
deleted file mode 100644
index ddd2055..0000000
--- a/rtems/config/5/bsps/qoriq_e6500_32.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/bsps/qoriq_e6500_64.bset b/rtems/config/5/bsps/qoriq_e6500_64.bset
deleted file mode 100644
index 9869b40..0000000
--- a/rtems/config/5/bsps/qoriq_e6500_64.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-aarch64.bset b/rtems/config/5/rtems-aarch64.bset
deleted file mode 100644
index f38aff3..0000000
--- a/rtems/config/5/rtems-aarch64.bset
+++ /dev/null
@@ -1,4 +0,0 @@
-%define release 1
-%define rtems_arch aarch64
-%define with_libgomp
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-all.bset b/rtems/config/5/rtems-all.bset
deleted file mode 100644
index 00ccfae..0000000
--- a/rtems/config/5/rtems-all.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-arm.bset b/rtems/config/5/rtems-arm.bset
deleted file mode 100644
index 896c534..0000000
--- a/rtems/config/5/rtems-arm.bset
+++ /dev/null
@@ -1,4 +0,0 @@
-%define release 1
-%define rtems_arch arm
-%define with_libgomp
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-autotools-base.bset b/rtems/config/5/rtems-autotools-base.bset
deleted file mode 100644
index 12ebffa..0000000
--- a/rtems/config/5/rtems-autotools-base.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-autotools-internal.bset b/rtems/config/5/rtems-autotools-internal.bset
deleted file mode 100644
index 67dae0d..0000000
--- a/rtems/config/5/rtems-autotools-internal.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-autotools.bset b/rtems/config/5/rtems-autotools.bset
deleted file mode 100644
index c50f988..0000000
--- a/rtems/config/5/rtems-autotools.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-bfin.bset b/rtems/config/5/rtems-bfin.bset
deleted file mode 100644
index ae30324..0000000
--- a/rtems/config/5/rtems-bfin.bset
+++ /dev/null
@@ -1,3 +0,0 @@
-%define release 1
-%define rtems_arch bfin
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-default.bset b/rtems/config/5/rtems-default.bset
deleted file mode 100644
index 3f4e6ab..0000000
--- a/rtems/config/5/rtems-default.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-epiphany.bset b/rtems/config/5/rtems-epiphany.bset
deleted file mode 100644
index e54a8ea..0000000
--- a/rtems/config/5/rtems-epiphany.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-i386.bset b/rtems/config/5/rtems-i386.bset
deleted file mode 100644
index 7fd0313..0000000
--- a/rtems/config/5/rtems-i386.bset
+++ /dev/null
@@ -1,4 +0,0 @@
-%define release 1
-%define rtems_arch i386
-%define with_libgomp
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-lm32.bset b/rtems/config/5/rtems-lm32.bset
deleted file mode 100644
index e54ad34..0000000
--- a/rtems/config/5/rtems-lm32.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-m68k.bset b/rtems/config/5/rtems-m68k.bset
deleted file mode 100644
index 6ed64eb..0000000
--- a/rtems/config/5/rtems-m68k.bset
+++ /dev/null
@@ -1,3 +0,0 @@
-%define release 1
-%define rtems_arch m68k
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-microblaze.bset b/rtems/config/5/rtems-microblaze.bset
deleted file mode 100644
index e5c23af..0000000
--- a/rtems/config/5/rtems-microblaze.bset
+++ /dev/null
@@ -1,3 +0,0 @@
-%define release 1
-%define rtems_arch microblaze
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-mips.bset b/rtems/config/5/rtems-mips.bset
deleted file mode 100644
index bb6e4d1..0000000
--- a/rtems/config/5/rtems-mips.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-moxie.bset b/rtems/config/5/rtems-moxie.bset
deleted file mode 100644
index 0e01f7f..0000000
--- a/rtems/config/5/rtems-moxie.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-nios2.bset b/rtems/config/5/rtems-nios2.bset
deleted file mode 100644
index 4a20854..0000000
--- a/rtems/config/5/rtems-nios2.bset
+++ /dev/null
@@ -1,3 +0,0 @@
-%define release 1
-%define rtems_arch nios2
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-or1k.bset b/rtems/config/5/rtems-or1k.bset
deleted file mode 100644
index 75e0eb8..0000000
--- a/rtems/config/5/rtems-or1k.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-powerpc.bset b/rtems/config/5/rtems-powerpc.bset
deleted file mode 100644
index 25e0ae2..0000000
--- a/rtems/config/5/rtems-powerpc.bset
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# PowerPC architecture
-#
-%define release 1
-%define rtems_arch powerpc
-%define with_libgomp
-
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-riscv.bset b/rtems/config/5/rtems-riscv.bset
deleted file mode 100644
index bf5874b..0000000
--- a/rtems/config/5/rtems-riscv.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-sh.bset b/rtems/config/5/rtems-sh.bset
deleted file mode 100644
index 5a14c87..0000000
--- a/rtems/config/5/rtems-sh.bset
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# SH architecture
-#
-%define release 1
-%define rtems_arch sh
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-sparc.bset b/rtems/config/5/rtems-sparc.bset
deleted file mode 100644
index ccb3e10..0000000
--- a/rtems/config/5/rtems-sparc.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-sparc64.bset b/rtems/config/5/rtems-sparc64.bset
deleted file mode 100644
index a56ad71..0000000
--- a/rtems/config/5/rtems-sparc64.bset
+++ /dev/null
@@ -1,3 +0,0 @@
-%define release 1
-%define rtems_arch sparc64
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-tier-1.bset b/rtems/config/5/rtems-tier-1.bset
deleted file mode 100644
index 3e2dbe6..0000000
--- a/rtems/config/5/rtems-tier-1.bset
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Tier 1 architectures. Must build.
-#
-5/rtems-arm
-5/rtems-i386
diff --git a/rtems/config/5/rtems-tier-2.bset b/rtems/config/5/rtems-tier-2.bset
deleted file mode 100644
index d2dfa31..0000000
--- a/rtems/config/5/rtems-tier-2.bset
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Tier 2 architectures. Must build.
-#
diff --git a/rtems/config/5/rtems-tier-3.bset b/rtems/config/5/rtems-tier-3.bset
deleted file mode 100644
index 0fb7622..0000000
--- a/rtems/config/5/rtems-tier-3.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-tier-4.bset b/rtems/config/5/rtems-tier-4.bset
deleted file mode 100644
index 2820fda..0000000
--- a/rtems/config/5/rtems-tier-4.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/5/rtems-v850.bset b/rtems/config/5/rtems-v850.bset
deleted file mode 100644
index e09bc4f..0000000
--- a/rtems/config/5/rtems-v850.bset
+++ /dev/null
@@ -1,3 +0,0 @@
-%define release 1
-%define rtems_arch v850
-%include 5/rtems-default.bset
diff --git a/rtems/config/5/rtems-x86_64.bset b/rtems/config/5/rtems-x86_64.bset
deleted file mode 100644
index b414908..0000000
--- a/rtems/config/5/rtems-x86_64.bset
+++ /dev/null
@@ -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
diff --git a/rtems/config/6/rtems-default.bset b/rtems/config/6/rtems-default.bset
index 9b09e8e..0dc2e77 100644
--- a/rtems/config/6/rtems-default.bset
+++ b/rtems/config/6/rtems-default.bset
@@ -1,3 +1,6 @@
+#
+# Default tools configuration.
+#
%include 6/rtems-base.bset
6/rtems-autotools
diff --git a/rtems/config/5/rtems-kernel.bset b/rtems/config/6/rtems-kernel.bset
similarity index 88%
rename from rtems/config/5/rtems-kernel.bset
rename to rtems/config/6/rtems-kernel.bset
index 080af0b..e3402f6 100644
--- a/rtems/config/5/rtems-kernel.bset
+++ b/rtems/config/6/rtems-kernel.bset
@@ -12,4 +12,4 @@
#
# Build the kernel.
#
-tools/rtems-kernel-5
+tools/rtems-kernel-6
diff --git a/rtems/config/5/rtems-libbsd.bset b/rtems/config/6/rtems-libbsd.bset
similarity index 77%
rename from rtems/config/5/rtems-libbsd.bset
rename to rtems/config/6/rtems-libbsd.bset
index 2b84cf8..3d779bc 100644
--- a/rtems/config/5/rtems-libbsd.bset
+++ b/rtems/config/6/rtems-libbsd.bset
@@ -5,4 +5,4 @@
#
# Build the BSD library for RTEMS.
#
-tools/rtems-libbsd-5
+tools/rtems-libbsd-6
diff --git a/rtems/config/5/rtems-llvm.bset b/rtems/config/6/rtems-llvm.bset
similarity index 100%
rename from rtems/config/5/rtems-llvm.bset
rename to rtems/config/6/rtems-llvm.bset
diff --git a/rtems/config/5/rtems-packages.bset b/rtems/config/6/rtems-packages.bset
similarity index 100%
rename from rtems/config/5/rtems-packages.bset
rename to rtems/config/6/rtems-packages.bset
diff --git a/rtems/config/5/rtems-tools.bset b/rtems/config/6/rtems-tools.bset
similarity index 74%
rename from rtems/config/5/rtems-tools.bset
rename to rtems/config/6/rtems-tools.bset
index 12a3302..d0be01a 100644
--- a/rtems/config/5/rtems-tools.bset
+++ b/rtems/config/6/rtems-tools.bset
@@ -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
diff --git a/rtems/config/bsps/atsamv.bset b/rtems/config/bsps/atsamv.bset
new file mode 100644
index 0000000..6b2dcf5
--- /dev/null
+++ b/rtems/config/bsps/atsamv.bset
@@ -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
diff --git a/rtems/config/5/bsps/beagleboneblack.bset b/rtems/config/bsps/beagleboneblack.bset
similarity index 68%
rename from rtems/config/5/bsps/beagleboneblack.bset
rename to rtems/config/bsps/beagleboneblack.bset
index 41a06f6..33954d8 100644
--- a/rtems/config/5/bsps/beagleboneblack.bset
+++ b/rtems/config/bsps/beagleboneblack.bset
@@ -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
diff --git a/rtems/config/5/bsps/erc32.bset b/rtems/config/bsps/erc32.bset
similarity index 65%
rename from rtems/config/5/bsps/erc32.bset
rename to rtems/config/bsps/erc32.bset
index 276b061..bd27833 100644
--- a/rtems/config/5/bsps/erc32.bset
+++ b/rtems/config/bsps/erc32.bset
@@ -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
diff --git a/rtems/config/5/bsps/gr712rc.bset b/rtems/config/bsps/gr712rc.bset
similarity index 55%
rename from rtems/config/5/bsps/gr712rc.bset
rename to rtems/config/bsps/gr712rc.bset
index e997905..e74a984 100644
--- a/rtems/config/5/bsps/gr712rc.bset
+++ b/rtems/config/bsps/gr712rc.bset
@@ -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
diff --git a/rtems/config/5/bsps/gr740.bset b/rtems/config/bsps/gr740.bset
similarity index 55%
rename from rtems/config/5/bsps/gr740.bset
rename to rtems/config/bsps/gr740.bset
index 2e02c54..79b8ef1 100644
--- a/rtems/config/5/bsps/gr740.bset
+++ b/rtems/config/bsps/gr740.bset
@@ -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
diff --git a/rtems/config/bsps/imx7.bset b/rtems/config/bsps/imx7.bset
new file mode 100644
index 0000000..e49e979
--- /dev/null
+++ b/rtems/config/bsps/imx7.bset
@@ -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
diff --git a/rtems/config/5/bsps/pc.bset b/rtems/config/bsps/pc.bset
similarity index 65%
rename from rtems/config/5/bsps/pc.bset
rename to rtems/config/bsps/pc.bset
index e096fc9..57212f6 100644
--- a/rtems/config/5/bsps/pc.bset
+++ b/rtems/config/bsps/pc.bset
@@ -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
diff --git a/rtems/config/bsps/qoriq_e500.bset b/rtems/config/bsps/qoriq_e500.bset
new file mode 100644
index 0000000..2011d75
--- /dev/null
+++ b/rtems/config/bsps/qoriq_e500.bset
@@ -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
diff --git a/rtems/config/bsps/qoriq_e6500_32.bset b/rtems/config/bsps/qoriq_e6500_32.bset
new file mode 100644
index 0000000..419f334
--- /dev/null
+++ b/rtems/config/bsps/qoriq_e6500_32.bset
@@ -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
diff --git a/rtems/config/bsps/qoriq_e6500_64.bset b/rtems/config/bsps/qoriq_e6500_64.bset
new file mode 100644
index 0000000..2d02b26
--- /dev/null
+++ b/rtems/config/bsps/qoriq_e6500_64.bset
@@ -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
diff --git a/rtems/config/5/bsps/raspberrypi2.bset b/rtems/config/bsps/raspberrypi2.bset
similarity index 67%
rename from rtems/config/5/bsps/raspberrypi2.bset
rename to rtems/config/bsps/raspberrypi2.bset
index a7e51a3..83b12ea 100644
--- a/rtems/config/5/bsps/raspberrypi2.bset
+++ b/rtems/config/bsps/raspberrypi2.bset
@@ -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
diff --git a/rtems/config/5/bsps/xilinx_zynq_zc702.bset b/rtems/config/bsps/xilinx_zynq_zc702.bset
similarity index 68%
rename from rtems/config/5/bsps/xilinx_zynq_zc702.bset
rename to rtems/config/bsps/xilinx_zynq_zc702.bset
index 01177d7..295c841 100644
--- a/rtems/config/5/bsps/xilinx_zynq_zc702.bset
+++ b/rtems/config/bsps/xilinx_zynq_zc702.bset
@@ -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
diff --git a/rtems/config/5/bsps/xilinx_zynq_zc706.bset b/rtems/config/bsps/xilinx_zynq_zc706.bset
similarity index 68%
rename from rtems/config/5/bsps/xilinx_zynq_zc706.bset
rename to rtems/config/bsps/xilinx_zynq_zc706.bset
index 1865b09..8b493cf 100644
--- a/rtems/config/5/bsps/xilinx_zynq_zc706.bset
+++ b/rtems/config/bsps/xilinx_zynq_zc706.bset
@@ -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
diff --git a/rtems/config/5/bsps/xilinx_zynq_zedboard.bset b/rtems/config/bsps/xilinx_zynq_zedboard.bset
similarity index 69%
rename from rtems/config/5/bsps/xilinx_zynq_zedboard.bset
rename to rtems/config/bsps/xilinx_zynq_zedboard.bset
index b1fc65c..801c6c9 100644
--- a/rtems/config/5/bsps/xilinx_zynq_zedboard.bset
+++ b/rtems/config/bsps/xilinx_zynq_zedboard.bset
@@ -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
diff --git a/rtems/config/ftp/curl.bset b/rtems/config/ftp/curl.bset
index 84cac39..e0c58e4 100644
--- a/rtems/config/ftp/curl.bset
+++ b/rtems/config/ftp/curl.bset
@@ -4,11 +4,6 @@
%define release 1
-#
-# RTEMS Version
-#
-%define rtems_version 5
-
#
# The RTEMS URL paths.
#
diff --git a/rtems/config/net-mgmt/net-snmp.bset b/rtems/config/net-mgmt/net-snmp.bset
index 667acaa..07c2721 100644
--- a/rtems/config/net-mgmt/net-snmp.bset
+++ b/rtems/config/net-mgmt/net-snmp.bset
@@ -4,11 +4,6 @@
%define release 1
-#
-# RTEMS Version
-#
-%define rtems_version 4.11
-
#
# The RTEMS URL paths.
#
diff --git a/rtems/config/tools/rtems-kernel-5.cfg b/rtems/config/tools/rtems-kernel-5.cfg
deleted file mode 100644
index ef63205..0000000
--- a/rtems/config/tools/rtems-kernel-5.cfg
+++ /dev/null
@@ -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
diff --git a/rtems/config/tools/rtems-kernel-6.cfg b/rtems/config/tools/rtems-kernel-6.cfg
new file mode 100644
index 0000000..f1d0990
--- /dev/null
+++ b/rtems/config/tools/rtems-kernel-6.cfg
@@ -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
diff --git a/rtems/config/tools/rtems-kernel-common.cfg b/rtems/config/tools/rtems-kernel-common.cfg
index 3a17a28..157c7a4 100644
--- a/rtems/config/tools/rtems-kernel-common.cfg
+++ b/rtems/config/tools/rtems-kernel-common.cfg
@@ -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 ..
diff --git a/rtems/config/tools/rtems-libbsd-5.cfg b/rtems/config/tools/rtems-libbsd-6.cfg
similarity index 63%
rename from rtems/config/tools/rtems-libbsd-5.cfg
rename to rtems/config/tools/rtems-libbsd-6.cfg
index f2c0e3d..1657096 100644
--- a/rtems/config/tools/rtems-libbsd-5.cfg
+++ b/rtems/config/tools/rtems-libbsd-6.cfg
@@ -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==
--
2.24.1
More information about the devel
mailing list