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

Fix config-local usage (rhbz 950841)

Browse Source
This commit is contained in:
Josh Boyer 2013-05-16 10:40:24 -04:00
parent c5489f3983
commit e26533c072
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel.spec
View File

@ -1246,14 +1246,12 @@ 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
%if %{?all_arch_configs:1}%{!?all_arch_configs:0} for i in kernel-%{version}-*.config
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
@ -2227,6 +2225,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Thu May 16 2013 Josh Boyer <jwboyer@redhat.com>
- Fix config-local usage (rhbz 950841)
* Wed May 15 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git5.1 * Wed May 15 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc1.git5.1
- Linux v3.10-rc1-185-gc240a53 - Linux v3.10-rc1-185-gc240a53