Merged from 4.5.0-beta3a

This commit is contained in:
Joel Sherrill
2000-06-12 15:00:15 +00:00
parent 0ab6547431
commit df49c60c96
2120 changed files with 123526 additions and 13179 deletions

View File

@@ -13,3 +13,4 @@ mkbinutilspec
mkbspspec
mkgdbspec
mkgnatnewlibspec
setup.cache

View File

@@ -2,31 +2,24 @@
## $Id$
##
AUTOMAKE_OPTIONS = foreign
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
SUBDIRS = . binutils gnatnewlib gdb
SUBDIRS = . gnatnewlib gdb
noinst_SCRIPTS = \
setup \
buildall \
mkbinutilspec \
mkbspspec \
mkgnatnewlibspec \
mkgdbspec \
mkrpms \
mkspec
noinst_SCRIPTS = setup buildall mkbinutilspec mkbspspec mkgnatnewlibspec \
mkgdbspec mkrpms mkspec
TEMPLATES =
TEMPLATES =
noinst_DATA = \
setup.def $(TEMPLATES)
noinst_DATA = setup.def $(TEMPLATES)
EXTRA_DIST = \
$(noinst_DATA) \
$(noinst_SCRIPTS)
EXTRA_DIST = $(noinst_DATA) $(noinst_SCRIPTS)
CONFIGURE_DEPENDENCIES = setup.cache
setup.cache: setup.def
cp setup.def $@
DISTCLEANFILES = setup.cache
include $(top_srcdir)/../automake/subdirs.am
include $(top_srcdir)/../automake/local.am

View File

@@ -1,3 +1,4 @@
*.spec
Makefile
Makefile.in
binutils.spec

View File

@@ -2,26 +2,23 @@
## $Id$
##
AUTOMAKE_OPTIONS = foreign
AUTOMAKE_OPTIONS = foreign 1.4
MKBINUTILSSPEC = $(SHELL) $(top_builddir)/mkbinutilspec
MKBINUTILSSPEC_DEPS = \
$(top_builddir)/mkbinutilspec binutils.spec.in $(top_builddir)/setup.cache
MKBINUTILSSPEC_DEPS = $(top_builddir)/mkbinutilspec binutils.spec.in \
$(top_builddir)/setup.cache
sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS)
$(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
TEMPLATES = \
binutils.spec.in
TEMPLATES = binutils.spec.in
RPM_SPECS_DATA = \
sparc-rtems-$(BINUTILSVERS).spec
RPM_SPECS_DATA = sparc-rtems-$(BINUTILSVERS).spec
noinst_DATA = \
$(TEMPLATES)
noinst_DATA = $(TEMPLATES)
EXTRA_DIST = \
$(TEMPLATES)
EXTRA_DIST = $(TEMPLATES)
CLEANFILES = $(RPM_SPECS_DATA)
include $(top_srcdir)/../automake/local.am

View File

@@ -12,7 +12,7 @@ Name: @target_alias@-gnat-binutils-collection
Summary: binutils for target @target_alias@
Group: gnatrtems
Release: @Release@
Copyright: 1999 OARCorp
License: GPL/LGPL
Provides: rtems-base-gnat-binutils @target_alias@-gnat-binutils

View File

@@ -56,6 +56,7 @@ fi
binutils=${binutils_version}
gcc=${gcc_version}
gnat=${gnat_version}
gdb=${gdb_version}
newlib=${newlib_version}
# also use binutils_rpm_release
@@ -77,7 +78,7 @@ if [ ${testing} = yes ] ; then
ECHO=echo
fi
installed_count=`rpm -qa | grep rtems | wc -l`
installed_count=`rpm -q -g gnatrtems | wc -l`
if [ ${installed_count} -ne 0 ] ; then
echo This script should be run with NO rtems RPMs installed.
echo It appears that the following rtems RPMs are installed:
@@ -116,7 +117,7 @@ for target in ${TARGETS}
do
if [ ${do_binutils} = yes ] ; then
logfile=log/${target}-binutils
specfile=${dst}/${target}-binutils-${binutils}.spec
specfile=${dst}/${target}-gnat-${gnat}-binutils-${binutils}.spec
echo "rpm -ba ${specfile} >${logfile} 2>&1"
if [ ${testing} = no ] ; then
rpm -ba ${specfile} >${logfile} 2>&1
@@ -145,7 +146,7 @@ do
# ${ECHO} rpm -i ${binutils_rpm}
logfile=log/${target}-gnatnewlib
specfile=${dst}/${target}-gcc-${gcc}-newlib-${newlib}.spec
specfile=${dst}/${target}-gnat-${gnat}-newlib-${newlib}.spec
echo "rpm -ba ${specfile} >${logfile} 2>&1"
if [ ${testing} = no ] ; then
rpm -ba ${specfile} >${logfile} 2>&1
@@ -169,7 +170,7 @@ do
if [ ${do_gdb} = yes ] ; then
# now build gdb
logfile=log/${target}-gdb
specfile=${dst}/${target}-gdb-${gdb}.spec
specfile=${dst}/${target}-gnat-${gnat}-gdb-${gdb}.spec
echo "rpm -ba ${specfile} >${logfile} 2>&1"
if [ ${testing} = no ] ; then
rpm -ba ${specfile} >${logfile} 2>&1

View File

@@ -30,9 +30,9 @@ AC_SUBST(RPM_SPECSdir)
GNATNEWLIBVERS="gnat-${gnat_version}-newlib-${newlib_version}"
AC_SUBST(GNATNEWLIBVERS)
BINUTILSVERS="gnat-binutils-${binutils_version}"
BINUTILSVERS="gnat-${gnat_version}-binutils-${binutils_version}"
AC_SUBST(BINUTILSVERS)
GDBVERS="gnat-gdb-${gdb_version}"
GDBVERS="gnat-${gnat_version}-gdb-${gdb_version}"
AC_SUBST(GDBVERS)
BSPVERS="${rtems_version}"
AC_SUBST(RTEMS_VERSION)

View File

@@ -1,3 +1,4 @@
*.spec
Makefile
Makefile.in
gdb.spec

View File

@@ -2,12 +2,12 @@
## $Id$
##
AUTOMAKE_OPTIONS = foreign
AUTOMAKE_OPTIONS = foreign 1.4
MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec
MKGDBSPEC_DEPS = \
$(top_builddir)/mkgdbspec gdb.spec.in $(top_builddir)/setup.cache
MKGDBSPEC_DEPS = $(top_builddir)/mkgdbspec gdb.spec.in \
$(top_builddir)/setup.cache
powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
@@ -15,17 +15,13 @@ powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
$(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
TEMPLATES = \
gdb.spec.in
TEMPLATES = gdb.spec.in
RPM_SPECS_DATA = \
powerpc-rtems-$(GDBVERS).spec \
sparc-rtems-$(GDBVERS).spec
RPM_SPECS_DATA = powerpc-rtems-$(GDBVERS).spec sparc-rtems-$(GDBVERS).spec
noinst_DATA = \
$(TEMPLATES)
noinst_DATA = $(TEMPLATES)
EXTRA_DIST = \
$(TEMPLATES)
EXTRA_DIST = $(TEMPLATES)
CLEANFILES = $(RPM_SPECS_DATA)
include $(top_srcdir)/../automake/local.am

View File

@@ -12,7 +12,7 @@ Vendor: OAR Corporation
Distribution: Linux
Name: @target_alias@-gnat-gdb-collection
Release: @Release@
Copyright: 1999 OARCorp
License: GPL/LGPL
Group: gnatrtems
Provides: rtems-base-gnat-gdb @target_alias@-gnat-gdb
@@ -23,7 +23,7 @@ Version: @gdb_version@
Summary: gdb for target @target_alias@
Source0: ftp://ftp.gnu.org/pub/gnu/gdb-@gdb_version@.tar.gz
Source1: ftp://cs.nyu.edu/pub/gnat/gnat-@gnat_version@-src.tar.gz
Patch0: gdb-@gdb_version@-rtems-@gdb_patch_version@.diff
Patch0: gdb-@gdb_version@-rtems-gnat-@gnat_version@-@gdb_patch_version@.diff
Buildroot: /tmp
#
@@ -127,7 +127,7 @@ test -d build || mkdir build
%dir /opt/gnatrtems/info
%doc /opt/gnatrtems/info/gdb.info*
%doc /opt/gnatrtems/info/mmalloc.info*
%doc /opt/gnatrtems/info/readline.info*
# %doc /opt/gnatrtems/info/readline.info*
%dir /opt/gnatrtems/man
%dir /opt/gnatrtems/man/man1

View File

@@ -1,3 +1,4 @@
*.spec
Makefile
Makefile.in
gnatnewlib.spec

View File

@@ -1,11 +1,11 @@
## $Id$
AUTOMAKE_OPTIONS = foreign
AUTOMAKE_OPTIONS = foreign 1.4
MKGNATNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgnatnewlibspec
MKGNATNEWLIBSPEC_DEPS = \
$(top_builddir)/mkgnatnewlibspec gnatnewlib.spec.in $(top_builddir)/setup.cache
MKGNATNEWLIBSPEC_DEPS = $(top_builddir)/mkgnatnewlibspec gnatnewlib.spec.in \
$(top_builddir)/setup.cache
powerpc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS)
$(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
@@ -13,17 +13,14 @@ powerpc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS)
sparc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS)
$(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
TEMPLATES = \
gnatnewlib.spec.in
TEMPLATES = gnatnewlib.spec.in
RPM_SPECS_DATA = \
powerpc-rtems-$(GNATNEWLIBVERS).spec \
sparc-rtems-$(GNATNEWLIBVERS).spec
RPM_SPECS_DATA = powerpc-rtems-$(GNATNEWLIBVERS).spec \
sparc-rtems-$(GNATNEWLIBVERS).spec
noinst_DATA = \
$(TEMPLATES)
noinst_DATA = $(TEMPLATES)
EXTRA_DIST = \
$(TEMPLATES)
EXTRA_DIST = $(TEMPLATES)
CLEANFILES = $(RPM_SPECS_DATA)
include $(top_srcdir)/../automake/local.am

View File

@@ -12,7 +12,7 @@ Name: @target_alias@-gnat-newlib
Summary: gnat, gcc, and newlib C Library for @target_alias@.
Group: gnatrtems
Release: @Release@
Copyright: 1999 OARCorp
License: gcc is GPL/LGPL ; newlib no has restrictions on run-time usage
Provides: rtems-base-gnat @target_alias@-gnat
Provides: rtems-base-gnat-binutils @target_alias@-gnat-binutils
@@ -26,10 +26,10 @@ Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.gz
Source1: ftp://sourceware.cygnus/com/pub/newlib/newlib-@newlib_version@.tar.gz
Source2: ftp://cs.nyu.edu/pub/gnat/gnat-@gnat_version@-src.tar.gz
Source3: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-@binutils_version@.tar.gz
Patch0: gcc-@gcc_version@-rtems-@gcc_patch_version@.diff
Patch0: gcc-@gcc_version@-rtems-gnat-@gnat_version@-@gcc_patch_version@.diff
Patch1: newlib-@newlib_version@-rtems-@newlib_patch_version@.diff
Patch2: gnat-@gnat_version@-src-rtems-@gnat_patch_version@.diff
Patch3: binutils-@binutils_version@-rtems-@binutils_patch_version@.diff
Patch2: gnat-@gnat_version@-rtems-@gnat_patch_version@.diff
Patch3: binutils-@binutils_version@-rtems-gnat-@gnat_version@-@binutils_patch_version@.diff
#
Buildroot: /tmp
@@ -44,7 +44,10 @@ Buildroot: /tmp
# your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR).
# Or you can try the ftp options of rpm :-)
#
NoSource: 0, 1, 2, 3
NoSource: 0
NoSource: 1
NoSource: 2
NoSource: 3
%description
RTEMS is an open source operating system for embedded systems.

View File

@@ -48,13 +48,13 @@ target_alias=$1
. ./$CFG
specfile=${dst}/${target_alias}-gnat-binutils-${binutils_version}.spec
specfile=${dst}/${target_alias}-gnat-${gnat_version}-binutils-${binutils_version}.spec
sed -e "s%@Release@%${binutils_rpm_release}%g" \
-e "s%@rpm_build_root@%${rpm_build_root}%g" \
-e "s%@target_alias@%${target_alias}%g" \
-e "s%@binutils_version@%${binutils_version}%g" \
-e "s%@binutils_patch_version@%gnat-${binutils_patch_version}%g" \
-e "s%@binutils_patch_version@%${binutils_patch_version}%g" \
-e "s%@exe_ext@%${exe_ext}%g" \
< ${RTEMS_DIR}/binutils/binutils.spec.in \
> ${specfile}

View File

@@ -48,7 +48,7 @@ target_alias=$1
. ./$CFG
specfile=${dst}/${target_alias}-gnat-gdb-${gdb_version}.spec
specfile=${dst}/${target_alias}-gnat-${gnat_version}-gdb-${gdb_version}.spec
case ${target_alias} in
powerpc*)
@@ -68,7 +68,7 @@ sed -e "s%@Release@%${gdb_rpm_release}%g" \
-e "s%@rpm_build_root@%${rpm_build_root}%g" \
-e "s%@target_alias@%${target_alias}%g" \
-e "s%@gdb_version@%${gdb_version}%g" \
-e "s%@gdb_patch_version@%gnat-${gdb_patch_version}%g" \
-e "s%@gdb_patch_version@%${gdb_patch_version}%g" \
-e "s%@gnat_version@%${gnat_version}%g" \
-e "s%@gnat_patch_version@%${gnat_patch_version}%g" \
-e "s%@extra_configure_arguments@%${extra_configure_arguments}%g" \

View File

@@ -61,9 +61,9 @@ sed -e "s%@Release@%${gnatnewlib_rpm_release}%g" \
-e "s%@target_alias@%${target_alias}%g" \
-e "s%@rpm_build_root@%${rpm_build_root}%g" \
-e "s%@binutils_version@%${binutils_version}%g" \
-e "s%@binutils_patch_version@%gnat-${binutils_patch_version}%g" \
-e "s%@binutils_patch_version@%${binutils_patch_version}%g" \
-e "s%@gcc_version@%${gcc_version}%g" \
-e "s%@gcc_patch_version@%gnat-${gcc_patch_version}%g" \
-e "s%@gcc_patch_version@%${gcc_patch_version}%g" \
-e "s%@gnat_version@%${gnat_version}%g" \
-e "s%@gnat_patch_version@%${gnat_patch_version}%g" \
-e "s%@newlib_version@%${newlib_version}%g" \

View File

@@ -1,17 +1,17 @@
# RTEMS tools setup
binutils_version=2.9.1
binutils_patch_version=20000126
binutils_rpm_release=1
binutils_patch_version=20000429
binutils_rpm_release=2
newlib_version=1.8.2
newlib_patch_version=20000131
newlib_patch_version=20000525
gcc_version=2.8.1
gcc_patch_version=20000126
gcc_patch_version=20000429
gnat_version=3.12p
gnat_patch_version=20000126
gnatnewlib_rpm_release=2
gnat_patch_version=20000429
gnatnewlib_rpm_release=4
gdb_version=4.17
gdb_patch_version=20000126
gdb_rpm_release=1
rtems_version=19991117
gdb_patch_version=20000429
gdb_rpm_release=2
rtems_version=4.5.0-beta2a
rtems_rpm_release=1
rpm_build_root=/tmp