summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-01-31 07:29:27 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-01-31 07:29:27 +0000
commitab591073c53d6c511057161eca81673710c7937c (patch)
treeed99dc05da1fd99f1f1051dc4ffe6afa9f7c2611
parent2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-ab591073c53d6c511057161eca81673710c7937c.tar.bz2
2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* common/common.add.in: Add Vendor, Distribution, BuildRoot. * binutils/Makefile.am: Fix path to clean.add. * binutils/binutils.add: Remove BuildRoot. * cpukit/Makefile.am: Use $(top_builddir)/common/common.add, $(top_builddir)/common/clean.add, header.add. Generate rtems-cpukit.spec.in. * cpukit/header.add: New. * cpukit/rtems-cpukit.spec.in: Remove. * cpukit/rtems-cpukit.add: New. * gccnewlib/gccnewlib.add: Remove Buildroot. * gdb/gdb.add: Remove Buildroot. * rtemsdoc/rtemsdoc.add: Remove BuildRoot.
-rw-r--r--scripts/ChangeLog15
-rw-r--r--scripts/binutils/Makefile.am2
-rw-r--r--scripts/binutils/binutils.add1
-rw-r--r--scripts/common/common.add.in4
-rw-r--r--scripts/cpukit/Makefile.am16
-rw-r--r--scripts/cpukit/header.add4
-rw-r--r--scripts/cpukit/rtems-cpukit.add (renamed from scripts/cpukit/rtems-cpukit.spec.in)13
-rw-r--r--scripts/gccnewlib/gccnewlib.add1
-rw-r--r--scripts/gdb/gdb.add1
-rw-r--r--scripts/rtemsdoc/rtemsdoc.add1
10 files changed, 35 insertions, 23 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 4cb126e3ff..fdb3865951 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,20 @@
2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * common/common.add.in: Add Vendor, Distribution, BuildRoot.
+ * binutils/Makefile.am: Fix path to clean.add.
+ * binutils/binutils.add: Remove BuildRoot.
+ * cpukit/Makefile.am: Use $(top_builddir)/common/common.add,
+ $(top_builddir)/common/clean.add, header.add.
+ Generate rtems-cpukit.spec.in.
+ * cpukit/header.add: New.
+ * cpukit/rtems-cpukit.spec.in: Remove.
+ * cpukit/rtems-cpukit.add: New.
+ * gccnewlib/gccnewlib.add: Remove Buildroot.
+ * gdb/gdb.add: Remove Buildroot.
+ * rtemsdoc/rtemsdoc.add: Remove BuildRoot.
+
+2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* rtemsdoc/Makefile.am: Use $(top_builddir)/common/common.add,
$(top_builddir)/common/clean.add, header.add.
Generate rtemsdoc.spec.in.
diff --git a/scripts/binutils/Makefile.am b/scripts/binutils/Makefile.am
index 3f1a156947..aad90027a9 100644
--- a/scripts/binutils/Makefile.am
+++ b/scripts/binutils/Makefile.am
@@ -7,7 +7,7 @@ MKBINUTILSSPEC = $(SHELL) ./mkspec
SUBPACKAGES = header.add
SUBPACKAGES += $(top_builddir)/common/common.add binutils.add
-SUBPACKAGES += $(top_builddir)./common/clean.add
+SUBPACKAGES += $(top_builddir)/common/clean.add
SUBPACKAGES += base-binutils.add target-binutils.add
binutils.spec.in: $(SUBPACKAGES)
diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add
index 7e187fd7e9..0526e32066 100644
--- a/scripts/binutils/binutils.add
+++ b/scripts/binutils/binutils.add
@@ -7,7 +7,6 @@ License: GPL/LGPL
Autoreqprov: on
Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com
Prefix: %{_prefix}
-BuildRoot: %{_defaultbuildroot}
BuildPreReq: /sbin/install-info
BuildPreReq: texinfo >= 4.2
diff --git a/scripts/common/common.add.in b/scripts/common/common.add.in
index fc54d465c0..9b977d6692 100644
--- a/scripts/common/common.add.in
+++ b/scripts/common/common.add.in
@@ -12,3 +12,7 @@
%define _exeext %{nil}
%endif
+Vendor: OARCorp
+Distribution: Linux
+
+BuildRoot: %{_defaultbuildroot}
diff --git a/scripts/cpukit/Makefile.am b/scripts/cpukit/Makefile.am
index d17f183083..03a95b87e3 100644
--- a/scripts/cpukit/Makefile.am
+++ b/scripts/cpukit/Makefile.am
@@ -5,9 +5,18 @@
MKSPEC = $(SHELL) ./mkspec
+SUBPACKAGES = header.add
+SUBPACKAGES += $(top_builddir)/common/common.add
+SUBPACKAGES += rtems-cpukit.add
+SUBPACKAGES += $(top_builddir)/common/clean.add
+
MKSPEC_DEPS = mkspec rtems-cpukit.spec.in \
$(top_builddir)/setup.cache
+rtems-cpukit.spec.in: $(SUBPACKAGES)
+ cat $^ > $@
+CLEANFILES = rtems-cpukit.spec.in
+
c4x-rtems-cpukit.spec: $(MKSPEC_DEPS)
$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . c4x-rtems > $@
RPM_SPECS_DATA = c4x-rtems-cpukit.spec
@@ -56,11 +65,8 @@ sparc-rtems-cpukit.spec: $(MKSPEC_DEPS)
$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems > $@
RPM_SPECS_DATA += sparc-rtems-cpukit.spec
-TEMPLATES = rtems-cpukit.spec.in
-
-noinst_DATA = $(TEMPLATES)
+EXTRA_DIST = $(SUBPACKAGES)
-EXTRA_DIST = $(TEMPLATES)
+CLEANFILES += $(RPM_SPECS_DATA)
-CLEANFILES = $(RPM_SPECS_DATA)
include $(top_srcdir)/../automake/local.am
diff --git a/scripts/cpukit/header.add b/scripts/cpukit/header.add
new file mode 100644
index 0000000000..ab6bc693e0
--- /dev/null
+++ b/scripts/cpukit/header.add
@@ -0,0 +1,4 @@
+#
+# spec file for package rtems-cpukit
+#
+# Copyright (c) 2002 Ralf Corsepius, Ulm, Germany
diff --git a/scripts/cpukit/rtems-cpukit.spec.in b/scripts/cpukit/rtems-cpukit.add
index 3510beb24c..9593360e40 100644
--- a/scripts/cpukit/rtems-cpukit.spec.in
+++ b/scripts/cpukit/rtems-cpukit.add
@@ -1,15 +1,3 @@
-#
-# spec file for package rtems-cpukit
-#
-# Copyright (c) 2002 Ralf Corsepius, Ulm, Germany
-#
-# please send bugfixes or comments to joel@OARcorp.com
-#
-
-%define _prefix /opt/rtems
-
-Vendor: OAR Corporation
-Distribution: Linux
Name: @target_alias@-cpukit
Release: @Release@
License: Various, Open Source.
@@ -40,7 +28,6 @@ Source: rtems-@rtems_version@.tar.gz
NoSource: 0
# We claim to be relocatible, but in fact we are not
Prefix: %{_prefix}
-Buildroot: %{_tmppath}/%{name}-%{version}-root
%description
RTEMS is a free operating system for embedded systems.
diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add
index 4e08530d27..6921882ac2 100644
--- a/scripts/gccnewlib/gccnewlib.add
+++ b/scripts/gccnewlib/gccnewlib.add
@@ -15,7 +15,6 @@ Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-everything-@gcc_version@.tar.gz
Source1: ftp://sources.redhat.com/pub/newlib/newlib-@newlib_version@.tar.gz
Patch0: gcc-@gcc_version@-rtems-@gcc_patch_version@.diff
Patch1: newlib-@newlib_version@-rtems-@newlib_patch_version@.diff
-Buildroot: %{_tmppath}/%{name}
#
# The original sources are not included in the source RPM.
diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add
index ae47d1e349..c1a5419ac7 100644
--- a/scripts/gdb/gdb.add
+++ b/scripts/gdb/gdb.add
@@ -12,7 +12,6 @@ Source0: ftp://ftp.gnu.org/pub/gnu/gdb-@gdb_version@.tar.gz
Patch0: gdb-@gdb_version@-rtems-base-@gdb_patch_version@.diff
Patch1: gdb-@gdb_version@-rtems-cg-@gdb_patch_version@.diff
Patch2: gdb-@gdb_version@-rtems-rdbg-@gdb_patch_version@.diff
-Buildroot: %{_defaultbuildroot}
%if "%{_vendor}" == "redhat"
BuildPreReq: ncurses-devel
diff --git a/scripts/rtemsdoc/rtemsdoc.add b/scripts/rtemsdoc/rtemsdoc.add
index 9bb7cce8a9..fe5c20b145 100644
--- a/scripts/rtemsdoc/rtemsdoc.add
+++ b/scripts/rtemsdoc/rtemsdoc.add
@@ -35,7 +35,6 @@ NoSource: 0
Prefix: %{_prefix}
Prefix: %{_infodir}
Prefix: %{_datadir}
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
%description