From a178eba2a4a1c08faf938376ac948bb5d2cb8a78 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Thu, 16 Sep 2021 14:26:23 -0500
Subject: Remove automake/autoconf from rtems 6 tools

These are unneeded with the waf build system.

Closes #4081.
---
 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-default.bset            |  2 --
 rtems/config/6/rtems-microblaze.bset         |  2 --
 5 files changed, 49 deletions(-)
 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

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-default.bset b/rtems/config/6/rtems-default.bset
index 1b60066..0c07b08 100644
--- a/rtems/config/6/rtems-default.bset
+++ b/rtems/config/6/rtems-default.bset
@@ -3,8 +3,6 @@
 #
 %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.
diff --git a/rtems/config/6/rtems-microblaze.bset b/rtems/config/6/rtems-microblaze.bset
index 4b12899..3eb7a89 100644
--- a/rtems/config/6/rtems-microblaze.bset
+++ b/rtems/config/6/rtems-microblaze.bset
@@ -6,8 +6,6 @@
 #
 %include 6/rtems-base.bset
 
-6/rtems-autotools
-
 devel/dtc-1.6.0-1
 
 #
-- 
cgit v1.2.3