From 5a6d98e43b39c62bed9f34752d9df9b4ece84836 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 4 May 2000 14:16:28 +0000 Subject: Made better package names. --- scripts-ada/buildall.in | 9 +++++---- scripts-ada/configure.in | 4 ++-- scripts-ada/gdb/gdb.spec.in | 4 ++-- scripts-ada/gnatnewlib/gnatnewlib.spec.in | 6 +++--- scripts-ada/mkbinutilspec.in | 4 ++-- scripts-ada/mkgdbspec.in | 4 ++-- scripts-ada/mkgnatnewlibspec.in | 4 ++-- 7 files changed, 18 insertions(+), 17 deletions(-) (limited to 'scripts-ada') diff --git a/scripts-ada/buildall.in b/scripts-ada/buildall.in index 8a39025bd8..42fb181d25 100644 --- a/scripts-ada/buildall.in +++ b/scripts-ada/buildall.in @@ -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 diff --git a/scripts-ada/configure.in b/scripts-ada/configure.in index 9ced3435c4..f665ad40d7 100644 --- a/scripts-ada/configure.in +++ b/scripts-ada/configure.in @@ -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) diff --git a/scripts-ada/gdb/gdb.spec.in b/scripts-ada/gdb/gdb.spec.in index e63c393db8..9e923b835f 100644 --- a/scripts-ada/gdb/gdb.spec.in +++ b/scripts-ada/gdb/gdb.spec.in @@ -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 diff --git a/scripts-ada/gnatnewlib/gnatnewlib.spec.in b/scripts-ada/gnatnewlib/gnatnewlib.spec.in index 6ee85565e2..341bd0d556 100644 --- a/scripts-ada/gnatnewlib/gnatnewlib.spec.in +++ b/scripts-ada/gnatnewlib/gnatnewlib.spec.in @@ -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 diff --git a/scripts-ada/mkbinutilspec.in b/scripts-ada/mkbinutilspec.in index 5275f28f7b..f9e64e5677 100644 --- a/scripts-ada/mkbinutilspec.in +++ b/scripts-ada/mkbinutilspec.in @@ -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} diff --git a/scripts-ada/mkgdbspec.in b/scripts-ada/mkgdbspec.in index 389321eb17..a89928795d 100644 --- a/scripts-ada/mkgdbspec.in +++ b/scripts-ada/mkgdbspec.in @@ -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" \ diff --git a/scripts-ada/mkgnatnewlibspec.in b/scripts-ada/mkgnatnewlibspec.in index 6b463ed640..1f2ce783bc 100644 --- a/scripts-ada/mkgnatnewlibspec.in +++ b/scripts-ada/mkgnatnewlibspec.in @@ -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" \ -- cgit v1.2.3