From 069d85652efc7bb705ab209784e2580c96408a7c Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 29 Apr 2014 17:28:19 -0400 Subject: [PATCH] Make depmod call fatal if it errors or warns --- kernel.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index 9f36fe0d2..51a594e26 100644 --- a/kernel.spec +++ b/kernel.spec @@ -34,7 +34,7 @@ Summary: The Linux kernel # 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" # -%global baserelease 9 +%global baserelease 10 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -1650,7 +1650,14 @@ BuildKernel() { rm filter-*.sh # 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 pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/ rm -f modules.{alias*,builtin.bin,dep*,*map,symbols*,devname,softdep} @@ -2180,6 +2187,9 @@ fi # ||----w | # || || %changelog +* Tue Apr 29 2014 Josh Boyer - 3.15.0-0.rc3.git1.10 +- Make depmod call fatal if it errors or warns + * Tue Apr 29 2014 Josh Boyer - Introduce kernel-core/kernel-drivers split for F21 Feature work