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

4 files changed, 17 insertions, 17 deletions

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
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==