diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-09-23 06:27:34 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-09-23 06:27:34 +0000 |
| commit | 9a76986097ca9d27f7c2d14182d258d887719f8c (patch) | |
| tree | 538590c338e5d886c5bf70ab235026e0d013b043 | |
| parent | 2004-09-23 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-9a76986097ca9d27f7c2d14182d258d887719f8c.tar.bz2 | |
2004-09-23 Ralf Corsepius <ralf_corsepius@rtems.org>
* binutils/binutils.add: Rename package from binutils-collection to
binutils. Cleanups.
* binutils/target-binutils.add: Reflect changes above.
* binutils/Makefile.am: Add avr. Reflect changes above.
| -rw-r--r-- | scripts/ChangeLog | 4 | ||||
| -rw-r--r-- | scripts/binutils/Makefile.am | 6 | ||||
| -rw-r--r-- | scripts/binutils/binutils.add | 23 | ||||
| -rw-r--r-- | scripts/binutils/target-binutils.add | 10 |
4 files changed, 28 insertions, 15 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 9ad79a0d15..a078fb9e0e 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,5 +1,9 @@ 2004-09-23 Ralf Corsepius <ralf_corsepius@rtems.org> + * binutils/binutils.add: Rename package from binutils-collection to + binutils. Cleanups. + * binutils/target-binutils.add: Reflect changes above. + * binutils/Makefile.am: Add avr. Reflect changes above. * autotools/autoconf-rtems.spec.in: Cleanup for chroot'ed builds. * autotools/automake-rtems.spec.in: automake-1.9.2. Cleanup for chroot'ed builds. diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am index 27d990b7cf..d99c314e92 100644 --- a/scripts/binutils/Makefile.am +++ b/scripts/binutils/Makefile.am @@ -9,7 +9,7 @@ MKBINUTILSSPEC = $(SHELL) ./mkspec SUBPACKAGES = header.add SUBPACKAGES += $(top_builddir)/common/common.add binutils.add SUBPACKAGES += $(top_builddir)/common/clean.add -SUBPACKAGES += base-binutils.add target-binutils.add +SUBPACKAGES += target-binutils.add base-binutils.add binutils.spec.in: $(SUBPACKAGES) cat $^ > $@ @@ -66,6 +66,10 @@ tic4x-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache tic4x-rtems@osversion@ > $@ RPM_SPECS_DATA += tic4x-rtems@osversion@-$(BINUTILSVERS).spec +avr-rtems@osversion@-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) + $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache avr-rtems@osversion@ > $@ +RPM_SPECS_DATA += avr-rtems@osversion@-$(BINUTILSVERS).spec + CLEANFILES += $(RPM_SPECS_DATA) EXTRA_DIST = $(SUBPACKAGES) diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add index be5a1adf7e..e746828569 100644 --- a/scripts/binutils/binutils.add +++ b/scripts/binutils/binutils.add @@ -2,14 +2,14 @@ %define binutils_version @binutils_version@ %define binutils_target @target_alias@ -Name: %{rpmprefix}%{binutils_target}-binutils-collection +Name: %{rpmprefix}%{binutils_target}-binutils Summary: binutils for target %{binutils_target} Group: %{rpmgroup} Release: @Release@ License: GPL/LGPL Autoreqprov: on -Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com +Packager: ralf_corsepius@rtems.org and joel@OARcorp.com Prefix: %{_prefix} BuildPreReq: /sbin/install-info BuildPreReq: texinfo >= 4.2 @@ -32,11 +32,11 @@ Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_version}.tar.bz2 # NoSource: 0 -%description - -RTEMS is an open source operating system for embedded systems. - -This is binutils sources with patches for RTEMS. +# %description +# +# RTEMS is an open source operating system for embedded systems. +# +# This is binutils sources with patches for RTEMS. %prep %setup -c -n %{name}-%{version} @@ -71,8 +71,13 @@ This is binutils sources with patches for RTEMS. $RPM_BUILD_ROOT%{_prefix}/share/locale # gzip info files - gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info 2>/dev/null - gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info-* 2>/dev/null + # gzip info files + ls $RPM_BUILD_ROOT%{_infodir}/*.info \ + $RPM_BUILD_ROOT%{_infodir}/*.info-? \ + $RPM_BUILD_ROOT%{_infodir}/*.info-?? 2>/dev/null \ + | while read a; do \ + gzip -9qf $a 2>/dev/null; \ + done # We assume that info/dir exists when building the RPMs rm -f $RPM_BUILD_ROOT%{_infodir}/dir diff --git a/scripts/binutils/target-binutils.add b/scripts/binutils/target-binutils.add index 6a41d8e9d0..52036445fb 100644 --- a/scripts/binutils/target-binutils.add +++ b/scripts/binutils/target-binutils.add @@ -1,11 +1,11 @@ # ============================================================== # %{binutils_target}-binutils # ============================================================== -%package -n %{rpmprefix}%{binutils_target}-binutils -Summary: rtems binutils for %{binutils_target} -Group: %{rpmgroup} -Requires: %{rpmprefix}rtems@osversion@-base-binutils -Autoreqprov: off +# %package -n %{rpmprefix}%{binutils_target}-binutils +# Summary: rtems binutils for %{binutils_target} +# Group: %{rpmgroup} +# Requires: %{rpmprefix}rtems@osversion@-base-binutils +# Autoreqprov: off %description -n %{rpmprefix}%{binutils_target}-binutils |