From 1b2919100b54871e58e14895af1ec9aafc8321d5 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 14 May 2014 16:37:46 +1000 Subject: config: Mirgrate the remaining configs. --- bare/config/bare-binutils-patches.cfg | 27 --------------- bare/config/bare-gcc-patches.cfg | 51 ---------------------------- bare/config/bare-gdb-patches.cfg | 27 --------------- bare/config/devel/binutils-2.23.2-1.cfg | 5 --- bare/config/devel/gcc-4.8.2-newlib-cvs-1.cfg | 10 ++---- bare/config/devel/gdb-7.6.1-1.cfg | 5 --- bare/config/devel/gdb-7.7-1.cfg | 5 --- bare/config/devel/libffi-3.0.13-1.cfg | 2 +- bare/config/devel/qemu-git-1.cfg | 8 ++--- bare/config/devel/texane-stlink-1.cfg | 13 ++++--- bare/config/dtc.bset | 7 ---- 11 files changed, 13 insertions(+), 147 deletions(-) delete mode 100644 bare/config/bare-binutils-patches.cfg delete mode 100644 bare/config/bare-gcc-patches.cfg delete mode 100644 bare/config/bare-gdb-patches.cfg delete mode 100644 bare/config/dtc.bset (limited to 'bare') diff --git a/bare/config/bare-binutils-patches.cfg b/bare/config/bare-binutils-patches.cfg deleted file mode 100644 index c61a29b..0000000 --- a/bare/config/bare-binutils-patches.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# -# Manage Bare Binutils specific patches in the build sets -# -%if %{defined bare_binutils_patch1} - Patch1: %{bare_binutils_patch1} -%endif -%if %{defined bare_binutils_patch2} - Patch2: %{bare_binutils_patch2} -%endif -%if %{defined bare_binutils_patch3} - Patch3: %{bare_binutils_patch3} -%endif -%if %{defined bare_binutils_patch4} - Patch4: %{bare_binutils_patch4} -%endif -%if %{defined bare_binutils_patch11} - Patch11: %{bare_binutils_patch11} -%endif -%if %{defined bare_binutils_patch12} - Patch12: %{bare_binutils_patch12} -%endif -%if %{defined bare_binutils_patch13} - Patch13: %{bare_binutils_patch13} -%endif -%if %{defined bare_binutils_patch14} - Patch14: %{bare_binutils_patch14} -%endif diff --git a/bare/config/bare-gcc-patches.cfg b/bare/config/bare-gcc-patches.cfg deleted file mode 100644 index 953771e..0000000 --- a/bare/config/bare-gcc-patches.cfg +++ /dev/null @@ -1,51 +0,0 @@ -# -# Manage Bare GCC/Newlib specific patches in the build sets -# -%if %{defined bare_gcc_patch1} - Patch1: %{bare_gcc_patch1} - %if %{defined bare_gcc_patch1_opts} - %define patch1_opts %{bare_gcc_patch1_opts} - %endif -%endif -%if %{defined bare_gcc_patch2} - Patch2: %{bare_gcc_patch2} - %if %{defined bare_gcc_patch2_opts} - %define patch2_opts %{bare_gcc_patch2_opts} - %endif -%endif -%if %{defined bare_gcc_patch3} - Patch3: %{bare_gcc_patch3} - %if %{defined bare_gcc_patch3_opts} - %define patch3_opts %{bare_gcc_patch3_opts} - %endif -%endif -%if %{defined bare_gcc_patch4} - Patch4: %{bare_gcc_patch4} - %if %{defined bare_gcc_patch4_opts} - %define patch4_opts %{bare_gcc_patch4_opts} - %endif -%endif -%if %{defined bare_gcc_patch11} - Patch11: %{bare_gcc_patch11} - %if %{defined bare_gcc_patch11_opts} - %define patch11_opts %{bare_gcc_patch11_opts} - %endif -%endif -%if %{defined bare_gcc_patch12} - Patch12: %{bare_gcc_patch12} - %if %{defined bare_gcc_patch12_opts} - %define patch12_opts %{bare_gcc_patch12_opts} - %endif -%endif -%if %{defined bare_gcc_patch13} - Patch13: %{bare_gcc_patch13} - %if %{defined bare_gcc_patch13_opts} - %define patch13_opts %{bare_gcc_patch13_opts} - %endif -%endif -%if %{defined bare_gcc_patch14} - Patch14: %{bare_gcc_patch14} - %if %{defined bare_gcc_patch14_opts} - %define patch14_opts %{bare_gcc_patch14_opts} - %endif -%endif diff --git a/bare/config/bare-gdb-patches.cfg b/bare/config/bare-gdb-patches.cfg deleted file mode 100644 index 78b37a8..0000000 --- a/bare/config/bare-gdb-patches.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# -# Manage Bare GDB specific patches in the build sets -# -%if %{defined bare_gdb_patch1} - Patch1: %{bare_gdb_patch1} -%endif -%if %{defined bare_gdb_patch2} - Patch2: %{bare_gdb_patch2} -%endif -%if %{defined bare_gdb_patch3} - Patch3: %{bare_gdb_patch3} -%endif -%if %{defined bare_gdb_patch4} - Patch4: %{bare_gdb_patch4} -%endif -%if %{defined bare_gdb_patch11} - Patch11: %{bare_gdb_patch11} -%endif -%if %{defined bare_gdb_patch12} - Patch12: %{bare_gdb_patch12} -%endif -%if %{defined bare_gdb_patch13} - Patch13: %{bare_gdb_patch13} -%endif -%if %{defined bare_gdb_patch14} - Patch14: %{bare_gdb_patch14} -%endif diff --git a/bare/config/devel/binutils-2.23.2-1.cfg b/bare/config/devel/binutils-2.23.2-1.cfg index b785e58..1457e86 100644 --- a/bare/config/devel/binutils-2.23.2-1.cfg +++ b/bare/config/devel/binutils-2.23.2-1.cfg @@ -16,11 +16,6 @@ # %define with_deterministic_archives 1 -# -# Include the bare patches -# -%include bare-binutils-patches.cfg - # # The binutils build instructions. We use 2.xx Release 1. # diff --git a/bare/config/devel/gcc-4.8.2-newlib-cvs-1.cfg b/bare/config/devel/gcc-4.8.2-newlib-cvs-1.cfg index 176bba1..7312673 100644 --- a/bare/config/devel/gcc-4.8.2-newlib-cvs-1.cfg +++ b/bare/config/devel/gcc-4.8.2-newlib-cvs-1.cfg @@ -34,20 +34,14 @@ # # Newlib is from CVS. # -Source10: cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}?reset +%source set newlib cvs://pserver:anoncvs@sourceware.org/cvs/src?module=newlib?src-prefix=src?date=%{newlib_version}?reset # # Joel's stack_t patch. # -%define bare_gcc_patch11 %{bare_newlib_patches}/newlib-sys-signal-20130532.diff -%define bare_gcc_patch11_opts -p0 +%patch add newlib -p0 %{bare_newlib_patches}/newlib-sys-signal-20130532.diff # -# -# Manage bare patches -# -%include bare-gcc-patches.cfg - # The gcc/newlib build instructions. We use 4.8 Release 1. # %include %{_configdir}/gcc-4.8-1.cfg diff --git a/bare/config/devel/gdb-7.6.1-1.cfg b/bare/config/devel/gdb-7.6.1-1.cfg index 4ad433d..4841256 100644 --- a/bare/config/devel/gdb-7.6.1-1.cfg +++ b/bare/config/devel/gdb-7.6.1-1.cfg @@ -7,11 +7,6 @@ %define gdb_version 7.6.1 -# -# Bare Build Set patches. -# -%include bare-gdb-patches.cfg - # # The gdb build instructions. We use 7.xx Release 1. # diff --git a/bare/config/devel/gdb-7.7-1.cfg b/bare/config/devel/gdb-7.7-1.cfg index 956d044..1afce5a 100644 --- a/bare/config/devel/gdb-7.7-1.cfg +++ b/bare/config/devel/gdb-7.7-1.cfg @@ -7,11 +7,6 @@ %define gdb_version 7.7 -# -# Bare Build Set patches. -# -%include bare-gdb-patches.cfg - # # The gdb build instructions. We use 7.xx Release 1. # diff --git a/bare/config/devel/libffi-3.0.13-1.cfg b/bare/config/devel/libffi-3.0.13-1.cfg index 05cb50b..f609003 100644 --- a/bare/config/devel/libffi-3.0.13-1.cfg +++ b/bare/config/devel/libffi-3.0.13-1.cfg @@ -19,7 +19,7 @@ # # Fix pkgconfig file on Fedora 64bit. # -Patch0: %{rtems_git_tools}/libffi/libffi-pkg-config-lib64-fix.diff +%patch add libffi %{rtems_git_tools}/libffi/libffi-pkg-config-lib64-fix.diff # # The LibFFI build instructions. We use 3.x.x Release 1. diff --git a/bare/config/devel/qemu-git-1.cfg b/bare/config/devel/qemu-git-1.cfg index e6d02c3..193279a 100644 --- a/bare/config/devel/qemu-git-1.cfg +++ b/bare/config/devel/qemu-git-1.cfg @@ -3,7 +3,7 @@ # %if %{release} == %{nil} -%define release 1 + %define release 1 %endif %include %{_configdir}/base.cfg @@ -16,15 +16,15 @@ # # Qemu is from GIT. # -Source0: git://git.qemu-project.org/qemu.git?pull?checkout=%{qemu_version}?submodule=dtc +%source set qemu git://git.qemu-project.org/qemu.git?pull?checkout=%{qemu_version}?submodule=dtc # # Patches from Qemu's patchworks site. # -Patch0: pw://patchwork.ozlabs.org/patch/318435/raw/PULL-29-29-arm-zynq-Add-software-system-reset-via-SCLR.patch +%patch add qemu pw://patchwork.ozlabs.org/patch/318435/raw/PULL-29-29-arm-zynq-Add-software-system-reset-via-SCLR.patch %if %{_host} == mingw32 - Patch5: pw://patchwork.ozlabs.org/patch/99999999/raw/qemu-channel-win32-cdecls.patch + %patch add qemu pw://patchwork.ozlabs.org/patch/99999999/raw/qemu-channel-win32-cdecls.patch %endif # diff --git a/bare/config/devel/texane-stlink-1.cfg b/bare/config/devel/texane-stlink-1.cfg index 9a5d075..e071789 100644 --- a/bare/config/devel/texane-stlink-1.cfg +++ b/bare/config/devel/texane-stlink-1.cfg @@ -22,18 +22,17 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) # # Source # -Source0: https://api.github.com/repos/texane/stlink/texane-stlink-%{stlink_version}.tar.gz -VersionControl0: git clone https://github.com/texane/stlink.git -Patch0: texane-stlink-3494c11-2.diff +%source set stlink https://api.github.com/repos/texane/stlink/texane-stlink-%{stlink_version}.tar.gz +%patch add stlink texane-stlink-3494c11-2.diff # # Prepare the source code. # %prep -%setup -q -c -n %{name}-%{version} -cd texane-stlink-%{stlink_version} -%{?patch0:%patch0 -p1} -cd .. + %source setup stlink -q -c -n %{name}-%{version} + cd texane-stlink-%{stlink_version} + %patch setup stlink -p1 + cd .. %build export PATH="%{_bindir}:${PATH}" diff --git a/bare/config/dtc.bset b/bare/config/dtc.bset deleted file mode 100644 index ace4020..0000000 --- a/bare/config/dtc.bset +++ /dev/null @@ -1,7 +0,0 @@ -# -# Build the DTC. -# - -%define release 1 - -devel/dtc-1.2.0.cfg -- cgit v1.2.3