From 020c63fb5b661774029ae6e661f91fa095926fd2 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 2 Jul 2020 17:15:41 +1000 Subject: rtems: Remove RTEMS 6 build sets. Updates #4014 --- rtems/config/6/rtems-aarch64.bset | 4 ---- rtems/config/6/rtems-all.bset | 19 ------------------- rtems/config/6/rtems-arm.bset | 4 ---- rtems/config/6/rtems-autotools-base.bset | 9 --------- rtems/config/6/rtems-autotools-internal.bset | 11 ----------- rtems/config/6/rtems-autotools.bset | 25 ------------------------- rtems/config/6/rtems-base.bset | 13 ------------- rtems/config/6/rtems-bfin.bset | 3 --- rtems/config/6/rtems-default.bset | 15 --------------- rtems/config/6/rtems-epiphany.bset | 17 ----------------- rtems/config/6/rtems-i386.bset | 4 ---- rtems/config/6/rtems-lm32.bset | 3 --- rtems/config/6/rtems-m68k.bset | 3 --- rtems/config/6/rtems-microblaze.bset | 3 --- rtems/config/6/rtems-mips.bset | 6 ------ rtems/config/6/rtems-moxie.bset | 6 ------ rtems/config/6/rtems-nios2.bset | 3 --- rtems/config/6/rtems-or1k.bset | 3 --- rtems/config/6/rtems-powerpc.bset | 4 ---- rtems/config/6/rtems-riscv.bset | 4 ---- rtems/config/6/rtems-sh.bset | 3 --- rtems/config/6/rtems-sparc.bset | 6 ------ rtems/config/6/rtems-sparc64.bset | 3 --- rtems/config/6/rtems-v850.bset | 3 --- rtems/config/6/rtems-x86_64.bset | 4 ---- 25 files changed, 178 deletions(-) delete mode 100644 rtems/config/6/rtems-aarch64.bset delete mode 100644 rtems/config/6/rtems-all.bset delete mode 100644 rtems/config/6/rtems-arm.bset delete mode 100644 rtems/config/6/rtems-autotools-base.bset delete mode 100644 rtems/config/6/rtems-autotools-internal.bset delete mode 100644 rtems/config/6/rtems-autotools.bset delete mode 100644 rtems/config/6/rtems-base.bset delete mode 100644 rtems/config/6/rtems-bfin.bset delete mode 100644 rtems/config/6/rtems-default.bset delete mode 100644 rtems/config/6/rtems-epiphany.bset delete mode 100644 rtems/config/6/rtems-i386.bset delete mode 100644 rtems/config/6/rtems-lm32.bset delete mode 100644 rtems/config/6/rtems-m68k.bset delete mode 100644 rtems/config/6/rtems-microblaze.bset delete mode 100644 rtems/config/6/rtems-mips.bset delete mode 100644 rtems/config/6/rtems-moxie.bset delete mode 100644 rtems/config/6/rtems-nios2.bset delete mode 100644 rtems/config/6/rtems-or1k.bset delete mode 100644 rtems/config/6/rtems-powerpc.bset delete mode 100644 rtems/config/6/rtems-riscv.bset delete mode 100644 rtems/config/6/rtems-sh.bset delete mode 100644 rtems/config/6/rtems-sparc.bset delete mode 100644 rtems/config/6/rtems-sparc64.bset delete mode 100644 rtems/config/6/rtems-v850.bset delete mode 100644 rtems/config/6/rtems-x86_64.bset diff --git a/rtems/config/6/rtems-aarch64.bset b/rtems/config/6/rtems-aarch64.bset deleted file mode 100644 index e3c91af..0000000 --- a/rtems/config/6/rtems-aarch64.bset +++ /dev/null @@ -1,4 +0,0 @@ -%define release 1 -%define rtems_arch aarch64 -%define with_libgomp -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-all.bset b/rtems/config/6/rtems-all.bset deleted file mode 100644 index 8f020f9..0000000 --- a/rtems/config/6/rtems-all.bset +++ /dev/null @@ -1,19 +0,0 @@ -6/rtems-aarch64 -6/rtems-arm -6/rtems-bfin -6/rtems-epiphany -6/rtems-i386 -6/rtems-lm32 -6/rtems-m68k -6/rtems-microblaze -6/rtems-mips -6/rtems-moxie -6/rtems-nios2 -6/rtems-or1k -6/rtems-powerpc -6/rtems-riscv -6/rtems-sh -6/rtems-sparc -6/rtems-sparc64 -6/rtems-v850 -6/rtems-x86_64 diff --git a/rtems/config/6/rtems-arm.bset b/rtems/config/6/rtems-arm.bset deleted file mode 100644 index 425d66b..0000000 --- a/rtems/config/6/rtems-arm.bset +++ /dev/null @@ -1,4 +0,0 @@ -%define release 1 -%define rtems_arch arm -%define with_libgomp -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-autotools-base.bset b/rtems/config/6/rtems-autotools-base.bset deleted file mode 100644 index c6819c1..0000000 --- a/rtems/config/6/rtems-autotools-base.bset +++ /dev/null @@ -1,9 +0,0 @@ -%define release 1 -%define rtems_arch none - -%include 6/rtems-base.bset - -package: rtems-%{rtems_version}-autotools-%{_host}-%{release} - -tools/rtems-autoconf-2.69-1 -tools/rtems-automake-1.12.6-1 diff --git a/rtems/config/6/rtems-autotools-internal.bset b/rtems/config/6/rtems-autotools-internal.bset deleted file mode 100644 index 19d2f19..0000000 --- a/rtems/config/6/rtems-autotools-internal.bset +++ /dev/null @@ -1,11 +0,0 @@ -# -# 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 6/rtems-autotools-base.bset diff --git a/rtems/config/6/rtems-autotools.bset b/rtems/config/6/rtems-autotools.bset deleted file mode 100644 index e57d25d..0000000 --- a/rtems/config/6/rtems-autotools.bset +++ /dev/null @@ -1,25 +0,0 @@ -# -# 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 - -6/rtems-autotools-internal -6/rtems-autotools-base diff --git a/rtems/config/6/rtems-base.bset b/rtems/config/6/rtems-base.bset deleted file mode 100644 index ba394ef..0000000 --- a/rtems/config/6/rtems-base.bset +++ /dev/null @@ -1,13 +0,0 @@ -%define rtems_version 6 -%define _target %{rtems_arch}-rtems%{rtems_version} -%define gcc_version_message RTEMS %{rtems_version}, RSB %{_sbgit_id}, Newlib %{newlib_version} - -%include rtems-urls.bset - -%ifos win32 mingw ming32 - %define rtems_waf_build_root_suffix %{waf_build_root_suffix} -%else - %define rtems_waf_build_root_suffix %{nil} -%endif - -package: rtems-%{rtems_version}-%{_target}-%{_host}-%{release} diff --git a/rtems/config/6/rtems-bfin.bset b/rtems/config/6/rtems-bfin.bset deleted file mode 100644 index 12a215e..0000000 --- a/rtems/config/6/rtems-bfin.bset +++ /dev/null @@ -1,3 +0,0 @@ -%define release 1 -%define rtems_arch bfin -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-default.bset b/rtems/config/6/rtems-default.bset deleted file mode 100644 index 31ce3aa..0000000 --- a/rtems/config/6/rtems-default.bset +++ /dev/null @@ -1,15 +0,0 @@ -%include 6/rtems-base.bset - -6/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-head - -tools/rtems-binutils-head -tools/rtems-gcc-head-newlib-head -tools/rtems-tools-5-1 diff --git a/rtems/config/6/rtems-epiphany.bset b/rtems/config/6/rtems-epiphany.bset deleted file mode 100644 index c0a6f16..0000000 --- a/rtems/config/6/rtems-epiphany.bset +++ /dev/null @@ -1,17 +0,0 @@ -%define release 1 -%define rtems_arch epiphany - -# Custom GDB -%define gdb_external 1 -%define gdb_expand_name epiphany-binutils-gdb-f05996c7c42e6b2781946acbab153a481ce3fd0b -%source set gdb https://github.com/adapteva/epiphany-binutils-gdb/archive/f05996c7c42e6b2781946acbab153a481ce3fd0b.zip -%hash sha256 f05996c7c42e6b2781946acbab153a481ce3fd0b.zip 2b2034fd12f2fd5108205ade66400c175ede8cef8141a38ae03fc78bf2d65325 - -%include 6/rtems-base.bset - -6/rtems-autotools -devel/expat-2.1.0-1 -tools/rtems-binutils-head -tools/rtems-gcc-head-newlib-head -tools/rtems-gdb-7.8.1-1 -tools/rtems-tools-5-1 diff --git a/rtems/config/6/rtems-i386.bset b/rtems/config/6/rtems-i386.bset deleted file mode 100644 index a27319d..0000000 --- a/rtems/config/6/rtems-i386.bset +++ /dev/null @@ -1,4 +0,0 @@ -%define release 1 -%define rtems_arch i386 -%define with_libgomp -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-lm32.bset b/rtems/config/6/rtems-lm32.bset deleted file mode 100644 index b5afad1..0000000 --- a/rtems/config/6/rtems-lm32.bset +++ /dev/null @@ -1,3 +0,0 @@ -%define release 1 -%define rtems_arch lm32 -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-m68k.bset b/rtems/config/6/rtems-m68k.bset deleted file mode 100644 index 0932d20..0000000 --- a/rtems/config/6/rtems-m68k.bset +++ /dev/null @@ -1,3 +0,0 @@ -%define release 1 -%define rtems_arch m68k -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-microblaze.bset b/rtems/config/6/rtems-microblaze.bset deleted file mode 100644 index 0e35a65..0000000 --- a/rtems/config/6/rtems-microblaze.bset +++ /dev/null @@ -1,3 +0,0 @@ -%define release 1 -%define rtems_arch microblaze -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-mips.bset b/rtems/config/6/rtems-mips.bset deleted file mode 100644 index 370e5ea..0000000 --- a/rtems/config/6/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 6/rtems-default.bset -tools/rtems-mipstx39-gdb-head diff --git a/rtems/config/6/rtems-moxie.bset b/rtems/config/6/rtems-moxie.bset deleted file mode 100644 index be00950..0000000 --- a/rtems/config/6/rtems-moxie.bset +++ /dev/null @@ -1,6 +0,0 @@ -%define release 1 -%define rtems_arch moxie -%define win32-gdb-disable-sim -%define with_libgomp -devel/dtc-1.4.1-1 -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-nios2.bset b/rtems/config/6/rtems-nios2.bset deleted file mode 100644 index 522eff5..0000000 --- a/rtems/config/6/rtems-nios2.bset +++ /dev/null @@ -1,3 +0,0 @@ -%define release 1 -%define rtems_arch nios2 -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-or1k.bset b/rtems/config/6/rtems-or1k.bset deleted file mode 100644 index c299c25..0000000 --- a/rtems/config/6/rtems-or1k.bset +++ /dev/null @@ -1,3 +0,0 @@ -%define release 1 -%define rtems_arch or1k -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-powerpc.bset b/rtems/config/6/rtems-powerpc.bset deleted file mode 100644 index c19327a..0000000 --- a/rtems/config/6/rtems-powerpc.bset +++ /dev/null @@ -1,4 +0,0 @@ -%define release 1 -%define rtems_arch powerpc -%define with_libgomp -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-riscv.bset b/rtems/config/6/rtems-riscv.bset deleted file mode 100644 index 42a4ebd..0000000 --- a/rtems/config/6/rtems-riscv.bset +++ /dev/null @@ -1,4 +0,0 @@ -%define release 1 -%define rtems_arch riscv -%define with_libgomp -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-sh.bset b/rtems/config/6/rtems-sh.bset deleted file mode 100644 index f867962..0000000 --- a/rtems/config/6/rtems-sh.bset +++ /dev/null @@ -1,3 +0,0 @@ -%define release 1 -%define rtems_arch sh -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-sparc.bset b/rtems/config/6/rtems-sparc.bset deleted file mode 100644 index 48d152d..0000000 --- a/rtems/config/6/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 6/rtems-default.bset -devel/sis-2-1 diff --git a/rtems/config/6/rtems-sparc64.bset b/rtems/config/6/rtems-sparc64.bset deleted file mode 100644 index 8da80a6..0000000 --- a/rtems/config/6/rtems-sparc64.bset +++ /dev/null @@ -1,3 +0,0 @@ -%define release 1 -%define rtems_arch sparc64 -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-v850.bset b/rtems/config/6/rtems-v850.bset deleted file mode 100644 index dd68147..0000000 --- a/rtems/config/6/rtems-v850.bset +++ /dev/null @@ -1,3 +0,0 @@ -%define release 1 -%define rtems_arch v850 -%include 6/rtems-default.bset diff --git a/rtems/config/6/rtems-x86_64.bset b/rtems/config/6/rtems-x86_64.bset deleted file mode 100644 index dbfc9e6..0000000 --- a/rtems/config/6/rtems-x86_64.bset +++ /dev/null @@ -1,4 +0,0 @@ -%define release 1 -%define rtems_arch x86_64 -%define with_libgomp -%include 6/rtems-default.bset -- cgit v1.2.3