diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-04-12 06:26:03 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-04-12 06:26:03 +0000 |
commit | 0a80a16223ab9efa2e05bce4c692073f2c7e7503 (patch) | |
tree | 10298b5c0f13283a365a45892579cb56155c2017 | |
parent | 2005-04-12 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-0a80a16223ab9efa2e05bce4c692073f2c7e7503.tar.bz2 |
Eliminate @PATCH2@.
-rw-r--r-- | scripts/binutils/binutils.add | 2 | ||||
-rw-r--r-- | scripts/binutils/mkspec.in | 2 | ||||
-rw-r--r-- | scripts/gdb/gdb.add | 8 | ||||
-rw-r--r-- | scripts/gdb/mkspec.in | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add index d0dad35deb..00e23bcd28 100644 --- a/scripts/binutils/binutils.add +++ b/scripts/binutils/binutils.add @@ -39,7 +39,7 @@ Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_version}@binutil %prep %setup -c -n %{name}-%{version} -@PATCH2@ +%{?PATCH0:%patch0 -p0} test -d build || mkdir build %build diff --git a/scripts/binutils/mkspec.in b/scripts/binutils/mkspec.in index a3e86a2e6c..6c9378b58c 100644 --- a/scripts/binutils/mkspec.in +++ b/scripts/binutils/mkspec.in @@ -50,7 +50,6 @@ target_alias=$1 if test -n "${binutils_patch_version}"; then PATCH1="Patch0: binutils-${binutils_version}-rtems-${binutils_patch_version}.diff" -PATCH2="%patch0 -p0" fi sed -e "s%@Release\@%${binutils_rpm_release}%g" \ @@ -64,5 +63,4 @@ sed -e "s%@Release\@%${binutils_rpm_release}%g" \ -e "s%@binutils_patch_version\@%${binutils_patch_version}%g" \ -e "s%@binutils_suffix\@%${binutils_suffix}%g" \ -e "s,@PATCH1\@,${PATCH1}," \ - -e "s,@PATCH2\@,${PATCH2}," \ < ${specsrc} diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add index d8aaa32f78..b25edcc644 100644 --- a/scripts/gdb/gdb.add +++ b/scripts/gdb/gdb.add @@ -20,7 +20,7 @@ Patch1: gdb-%{gdb_version}-rtems-cg-@gdb_patch_version@.diff Patch2: gdb-%{gdb_version}-rtems-rdbg-@gdb_patch_version@.diff %else Source0: ftp://ftp.gnu.org/pub/gnu/gdb-%{gdb_version}.tar.bz2 -Patch0: gdb-%{gdb_version}-rtems-@gdb_patch_version@.diff +@PATCH1@ %endif %if "%{_vendor}" == "redhat" @@ -61,9 +61,9 @@ This is the GNU gdb for RTEMS targetting %{gdb_version}. %setup -c -n %{name}-%{version} -a 0 cd gdb-%{gdb_version} -%patch0 -p1 -# %patch1 -p1 -# %patch2 -p1 +%{?PATCH0:%patch0 -p1} +%{?PATCH1:%patch1 -p1} +%{?PATCH2:%patch2 -p1} %build %if "%_sim" == "1" diff --git a/scripts/gdb/mkspec.in b/scripts/gdb/mkspec.in index 7aac46d811..7e26cfa9d7 100644 --- a/scripts/gdb/mkspec.in +++ b/scripts/gdb/mkspec.in @@ -52,11 +52,9 @@ patchn=-1 if test -n "${gdb_patch_version}"; then patchn=`expr $patchn + 1` PATCH1="Patch${patchn}: gdb-${gdb_version}-rtems-${gdb_patch_version}.diff" -PATCH2="%patch${patchn} -p0" fi sed -e "s,@PATCH1\@,${PATCH1}," \ - -e "s,@PATCH2\@,${PATCH2}," \ -e "s%@Release\@%${gdb_rpm_release}%g" \ -e "s,@rpm_build_root\@,${rpm_build_root},g" \ -e "s%@prefix\@%@prefix@%g" \ |