Attempting to split binutils and gcc into base/shared and CPU specific

packages.

3 files changed, 71 insertions, 31 deletions

diff --git a/scripts/binutils/binutils.spec.in b/scripts/binutils/binutils.spec.in
index b214653630..924ae391e7 100644
--- a/scripts/binutils/binutils.spec.in
+++ b/scripts/binutils/binutils.spec.in
@@ -1,5 +1,5 @@
 #
-# spec file for package rtems
+# spec file for binutils package targetting rtems
 # 
 # Copyright  (c)  1999  OARCorp, Huntsville, AL
 #
@@ -8,18 +8,19 @@
 
 Vendor:       OAR Corporation
 Distribution: Linux
-Name:         @target_alias@-binutils
+Name:         @target_alias@-binutils-collection
+Summary:      binutils for target @target_alias@
+Group:        rtems
 Release:      @Release@
 Copyright:    1999 OARCorp
-Group:        rtems
-Provides:     @target_alias@-binutils
+
+Provides:     rtems-base-binutils @target_alias@-binutils
 
 Autoreqprov:  	on
 Packager:     	corsepiu@faw.uni-ulm.de and joel@OARcorp.com
 Prefix:		/opt
 
 Version:      	@binutils_version@
-Summary:      	binutils for target @target_alias@
 Source0:      	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-@binutils_version@.tar.gz
 Patch0:		binutils-@binutils_version@-rtems-@binutils_patch_version@.diff
 #
@@ -36,6 +37,28 @@ Patch0:		binutils-@binutils_version@-rtems-@binutils_patch_version@.diff
 NoSource:      0
 
 %description
+
+RTEMS is an open source operating system for embedded systems.
+
+This is binutils sources with patches for RTEMS.
+
+%package -n rtems-base-binutils
+Summary:      base package for rtems binutils
+Group: rtems
+
+%description -n rtems-base-binutils
+
+RTEMS is an open source operating system for embedded systems.
+
+This is the base for binutils regardless of target CPU.
+
+%package -n @target_alias@-binutils
+Summary:      rtems gcc and newlib C Library for @target_alias@
+Group: rtems
+Requires: rtems-base-binutils
+
+%description -n @target_alias@-binutils
+
 RTEMS is an open source operating system for embedded systems.
 
 This is the GNU binutils for RTEMS targetting @target_alias@.
@@ -102,9 +125,9 @@ Authors:
     done
   fi
 
-%files -f files
+%files -n rtems-base-binutils
 %dir /opt/rtems/info
-%doc /opt/rtems/info/dir
+# %doc /opt/rtems/info/dir
 %doc /opt/rtems/info/as.info.gz
 %doc /opt/rtems/info/as.info-?.gz
 %doc /opt/rtems/info/bfd.info.gz
@@ -118,6 +141,21 @@ Authors:
 
 %dir /opt/rtems/man
 %dir /opt/rtems/man/man1
+
+%dir /opt/rtems/include
+/opt/rtems/include/bfd.h
+/opt/rtems/include/ansidecl.h
+/opt/rtems/include/bfdlink.h
+
+%dir /opt/rtems/lib
+/opt/rtems/lib/libbfd*
+/opt/rtems/lib/libiberty*
+/opt/rtems/lib/libopcodes*
+
+%dir /opt/rtems/share
+%dir /opt/rtems/share/locale
+
+%files -n @target_alias@-binutils -f files
 %doc /opt/rtems/man/man1/@target_alias@-*.1
 
 %dir /opt/rtems/bin
@@ -136,19 +174,6 @@ Authors:
 /opt/rtems/bin/@target_alias@-strings@exe_ext@
 /opt/rtems/bin/@target_alias@-strip@exe_ext@
 
-%dir /opt/rtems/include
-/opt/rtems/include/bfd.h
-/opt/rtems/include/ansidecl.h
-/opt/rtems/include/bfdlink.h
-
-%dir /opt/rtems/lib
-/opt/rtems/lib/libbfd*
-/opt/rtems/lib/libiberty*
-/opt/rtems/lib/libopcodes*
-
-%dir /opt/rtems/share
-%dir /opt/rtems/share/locale
-
 %dir /opt/rtems/@target_alias@
 %dir /opt/rtems/@target_alias@/bin
 /opt/rtems/@target_alias@/bin/ar@exe_ext@
diff --git a/scripts/configure.in b/scripts/configure.in
index bfa8872d7a..187e9f7667 100644
--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -1,7 +1,7 @@
 ## $Id$
 
 AC_INIT(binutils)
-AM_INIT_AUTOMAKE(scripts,19991025-0,no)
+AM_INIT_AUTOMAKE(scripts,20000124-0,no)
 
 AC_EXEEXT
 
diff --git a/scripts/gccnewlib/gccnewlib.spec.in b/scripts/gccnewlib/gccnewlib.spec.in
index a4cc4d9fa3..cf95d060f5 100644
--- a/scripts/gccnewlib/gccnewlib.spec.in
+++ b/scripts/gccnewlib/gccnewlib.spec.in
@@ -14,8 +14,8 @@ Group:	      rtems
 Release:      @Release@
 Copyright:    1999 OARCorp
 
-Provides:     	@target_alias@-gcc @target_alias@-chill @target_alias@-gcj
-Provides:	@target_alias@-g77 @target_alias@-objc
+Provides:     	rtems-base-gcc @target_alias@-gcc @target_alias@-chill
+Provides:	@target_alias@-gcj @target_alias@-g77 @target_alias@-objc
 Requires:     	@target_alias@-binutils
 
 Autoreqprov:  	on
@@ -56,10 +56,20 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
  your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR).
  Or you can try the ftp options of rpm :-)
 
+%package -n rtems-base-gcc
+Summary:      base package for rtems gcc and newlib C Library 
+Group: rtems
+
+%description -n rtems-base-gcc
+
+RTEMS is an open source operating system for embedded systems.
+
+This is the files for gcc and newlib that are shared by all targets.
+
 %package -n @target_alias@-gcc
 Summary:      rtems gcc and newlib C Library for @target_alias@
 Group: rtems
-Requires: @target_alias@-binutils
+Requires: @target_alias@-binutils rtems-base-gcc
 
 %description -n @target_alias@-gcc
 RTEMS is an open source operating system for embedded systems.
@@ -188,23 +198,30 @@ This is the gcc/objc compiler for @target_alias@
     esac
   done
 
-%files -n @target_alias@-gcc -f build/files.gcc
+%files -n rtems-base-gcc
 %dir /opt/rtems/info
-%doc /opt/rtems/info/dir
+# %doc /opt/rtems/info/dir
 %doc /opt/rtems/info/cpp.info*
 %doc /opt/rtems/info/gcc.info*
 %doc /opt/rtems/info/libc.info*
 %doc /opt/rtems/info/libm.info*
 
+%dir /opt/rtems/bin
+/opt/rtems/bin/cpp@exe_ext@
+/opt/rtems/bin/gcov@exe_ext@
+
 %dir /opt/rtems/man
 %dir /opt/rtems/man/man1
 %doc /opt/rtems/man/man1/cccp.1
+
+%dir /opt/rtems/include
+/opt/rtems/include/g++-3
+
+%files -n @target_alias@-gcc -f build/files.gcc
+
 %doc /opt/rtems/man/man1/@target_alias@-gcc.1
 %doc /opt/rtems/man/man1/@target_alias@-g++.1
 
-%dir /opt/rtems/bin
-/opt/rtems/bin/cpp@exe_ext@
-/opt/rtems/bin/gcov@exe_ext@
 /opt/rtems/bin/@target_alias@-c++@exe_ext@
 /opt/rtems/bin/@target_alias@-g++@exe_ext@
 /opt/rtems/bin/@target_alias@-gcc@exe_ext@
@@ -213,8 +230,6 @@ This is the gcc/objc compiler for @target_alias@
 
 %dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include
 
-%dir /opt/rtems/include
-/opt/rtems/include/g++-3
 /opt/rtems/@target_alias@
 
 %post -n @target_alias@-gcc