rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Don't try and merge local config changes on arches we aren't building

Browse Source
This commit is contained in:
Josh Boyer 2014-05-13 11:29:55 -04:00
parent 8ac1d4cad8
commit 54a9e1a9cf
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel.spec
View File

@ -34,7 +34,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and # For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
# #
%global baserelease 1 %global baserelease 2
%global fedora_build %{baserelease} %global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching # base_sublevel is the kernel version we're starting with and patching
@ -1194,12 +1194,14 @@ make -f %{SOURCE19} config-release
make -f %{SOURCE20} VERSION=%{version} configs make -f %{SOURCE20} VERSION=%{version} configs
# Merge in any user-provided local config option changes # Merge in any user-provided local config option changes
%ifnarch %nobuildarches
for i in %{all_arch_configs} for i in %{all_arch_configs}
do do
mv $i $i.tmp mv $i $i.tmp
./merge.pl %{SOURCE1000} $i.tmp > $i ./merge.pl %{SOURCE1000} $i.tmp > $i
rm $i.tmp rm $i.tmp
done done
%endif
ApplyPatch makefile-after_link.patch ApplyPatch makefile-after_link.patch
@ -2217,6 +2219,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Tue May 13 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Don't try and merge local config changes on arches we aren't building
* Tue May 13 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc5.git2.1 * Tue May 13 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc5.git2.1
- Linux v3.15-rc5-77-g14186fea0cb0 - Linux v3.15-rc5-77-g14186fea0cb0