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

Make depmod call fatal if it errors or warns

Browse Source
This commit is contained in:
Josh Boyer 2014-04-29 17:28:19 -04:00
parent 94ce4eca27
commit 069d85652e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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 9 %global baserelease 10
%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
@ -1650,7 +1650,14 @@ BuildKernel() {
rm filter-*.sh rm filter-*.sh
# Run depmod on the resulting module tree and make sure it isn't broken # Run depmod on the resulting module tree and make sure it isn't broken
depmod -b . -aeF ./System.map $KernelVer depmod -b . -aeF ./System.map $KernelVer &> depmod.out
if [ -s depmod.out ]; then
echo "Depmod failure"
cat depmod.out
exit 1
else
rm depmod.out
fi
# remove files that will be auto generated by depmod at rpm -i time # remove files that will be auto generated by depmod at rpm -i time
pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/ pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/
rm -f modules.{alias*,builtin.bin,dep*,*map,symbols*,devname,softdep} rm -f modules.{alias*,builtin.bin,dep*,*map,symbols*,devname,softdep}
@ -2180,6 +2187,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Tue Apr 29 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc3.git1.10
- Make depmod call fatal if it errors or warns
* Tue Apr 29 2014 Josh Boyer <jwboyer@fedoraproject.org> * Tue Apr 29 2014 Josh Boyer <jwboyer@fedoraproject.org>
- Introduce kernel-core/kernel-drivers split for F21 Feature work - Introduce kernel-core/kernel-drivers split for F21 Feature work