Fix config-local usage (rhbz 950841)

This commit is contained in:
Josh Boyer 2013-05-16 10:40:24 -04:00
parent acc1b9e2ce
commit 033f53a432
1 changed files with 4 additions and 3 deletions

View File

@ -1276,14 +1276,12 @@ make -f %{SOURCE19} config-release
make -f %{SOURCE20} VERSION=%{version} configs
# Merge in any user-provided local config option changes
%if %{?all_arch_configs:1}%{!?all_arch_configs:0}
for i in %{all_arch_configs}
for i in kernel-%{version}-*.config
do
mv $i $i.tmp
./merge.pl %{SOURCE1000} $i.tmp > $i
rm $i.tmp
done
%endif
ApplyPatch makefile-after_link.patch
@ -2294,6 +2292,9 @@ fi
# ||----w |
# || ||
%changelog
* Thu May 16 2013 Josh Boyer <jwboyer@redhat.com>
- Fix config-local usage (rhbz 950841)
* Mon May 13 2013 Dave Jones <davej@redhat.com> - 3.9.2-200
- Linux 3.9.2