Made better package names.

This commit is contained in:
Joel Sherrill
2000-05-04 14:16:28 +00:00
parent d123a04b09
commit 5a6d98e43b
7 changed files with 18 additions and 17 deletions

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

@@ -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

@@ -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

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" \