rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix config-local usage (rhbz 950841)

This commit is contained in:
Josh Boyer 2013-05-16 10:40:24 -04:00
parent b4d48651d4
commit 9184c309b4
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

@ -1278,14 +1278,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
@ -2289,6 +2287,9 @@ fi
# and build.
%changelog
* Thu May 16 2013 Josh Boyer <jwboyer@redhat.com>
- Fix config-local usage (rhbz 950841)
* Wed May 15 2013 Dave Airlie <airlied@redhat.com>
- fix nomodeset on radeon (rhbz 924507)