Changeset 1b29191 in rtems-source-builder

Timestamp:

05/14/14 06:37:46 (10 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.10, 4.11, 4.9, 5, master

Children:

e119c6a

Parents:

9a15c40

Message:

config: Mirgrate the remaining configs.

Location:

bare/config

Files:

• bare-binutils-patches.cfg (deleted)
• bare-gcc-patches.cfg (deleted)
• bare-gdb-patches.cfg (deleted)
• devel/binutils-2.23.2-1.cfg (modified) (1 diff)
• devel/gcc-4.8.2-newlib-cvs-1.cfg (modified) (1 diff)
• devel/gdb-7.6.1-1.cfg (modified) (1 diff)
• devel/gdb-7.7-1.cfg (modified) (1 diff)
• devel/libffi-3.0.13-1.cfg (modified) (1 diff)
• devel/qemu-git-1.cfg (modified) (2 diffs)
• devel/texane-stlink-1.cfg (modified) (2 diffs)
• dtc.bset (deleted)

bare/config/devel/binutils-2.23.2-1.cfg

@@ -18 +18 @@
 
 #
-# Include the bare patches
-#
-%include bare-binutils-patches.cfg
-
-#
 # The binutils build instructions. We use 2.xx Release 1.
 #

bare/config/devel/gcc-4.8.2-newlib-cvs-1.cfg

@@ -35 +35 @@
 # 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.
 #

bare/config/devel/gdb-7.6.1-1.cfg

@@ -9 +9 @@
 
 #
-# Bare Build Set patches.
-#
-%include bare-gdb-patches.cfg
-
-#
 # The gdb build instructions. We use 7.xx Release 1.
 #

bare/config/devel/gdb-7.7-1.cfg

@@ -9 +9 @@
 
 #
-# Bare Build Set patches.
-#
-%include bare-gdb-patches.cfg
-
-#
 # The gdb build instructions. We use 7.xx Release 1.
 #

bare/config/devel/libffi-3.0.13-1.cfg

@@ -20 +20 @@
 # 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
 
 #

bare/config/devel/qemu-git-1.cfg

@@ -4 +4 @@
 
 %if %{release} == %{nil}
-%define release 1
+ %define release 1
 %endif
 
@@ -17 +17 @@
 # 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
 

bare/config/devel/texane-stlink-1.cfg

@@ -23 +23 @@
 # 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
 
 #
@@ -31 +30 @@
 #
 %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