From 2fb3e72238ba10f80637a50e89e1845d0a21cd9e Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Wed, 17 Jan 2018 08:32:46 -0800 Subject: Add verbose option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There may be cases when it's useful to see the full kernel build output. Add an option to allow rebuilding with full logs. From Jaroslav Škarvada --- kernel.spec | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/kernel.spec b/kernel.spec index 9a9a47caa..ac51036f2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -118,11 +118,20 @@ Summary: The Linux kernel # build a release kernel on rawhide %define with_release %{?_with_release: 1} %{?!_with_release: 0} +# verbose build, i.e. no silent rules and V=1 +%define with_verbose %{?_with_verbose: 1} %{?!_with_verbose: 0} + # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. %define debugbuildsenabled 1 +%if %{with_verbose} +%define make_opts V=1 +%else +%define make_opts -s +%endif + # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} @@ -1250,7 +1259,7 @@ BuildKernel() { # and now to start the build process - make -s mrproper + make %{?make_opts} mrproper cp configs/$Config .config %if %{signkernel}%{signmodules} @@ -1260,9 +1269,9 @@ BuildKernel() { Arch=`head -1 .config | cut -b 3-` echo USING ARCH=$Arch - make -s ARCH=$Arch oldnoconfig >/dev/null - %{make} -s ARCH=$Arch V=1 %{?_smp_mflags} $MakeTarget %{?sparse_mflags} %{?kernel_mflags} - %{make} -s ARCH=$Arch V=1 %{?_smp_mflags} modules %{?sparse_mflags} || exit 1 + make %{?make_opts} ARCH=$Arch oldnoconfig >/dev/null + %{make} %{?make_opts} ARCH=$Arch %{?_smp_mflags} $MakeTarget %{?sparse_mflags} %{?kernel_mflags} + %{make} %{?make_opts} ARCH=$Arch %{?_smp_mflags} modules %{?sparse_mflags} || exit 1 mkdir -p $RPM_BUILD_ROOT/%{image_install_path} mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer @@ -1271,7 +1280,7 @@ BuildKernel() { %endif %ifarch %{arm} aarch64 - %{make} -s ARCH=$Arch V=1 dtbs dtbs_install INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer + %{make} %{?make_opts} ARCH=$Arch dtbs dtbs_install INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer cp -r $RPM_BUILD_ROOT/%{image_install_path}/dtb-$KernelVer $RPM_BUILD_ROOT/lib/modules/$KernelVer/dtb find arch/$Arch/boot/dts -name '*.dtb' -type f | xargs rm -f %endif @@ -1312,10 +1321,10 @@ BuildKernel() { # Override $(mod-fw) because we don't want it to install any firmware # we'll get it from the linux-firmware package and we don't want conflicts - %{make} -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw= + %{make} %{?make_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw= if [ $DoVDSO -ne 0 ]; then - %{make} -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer + %{make} %{?make_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer if [ ! -s ldconfig-kernel.conf ]; then echo > ldconfig-kernel.conf "\ # Placeholder file, no vDSO hwcap entries used in this kernel." -- cgit From d9ae6e1327b30bf1456b4b10c96f13a0d3d24a80 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Wed, 17 Jan 2018 08:36:40 -0800 Subject: Reenable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index ac51036f2..a00014f32 100644 --- a/kernel.spec +++ b/kernel.spec @@ -124,7 +124,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 %if %{with_verbose} %define make_opts V=1 @@ -1903,6 +1903,9 @@ fi # # %changelog +* Wed Jan 17 2018 Laura Abbott +- Reenable debugging options. + * Mon Jan 15 2018 Laura Abbott - 4.15.0-0.rc8.git0.1 - Linux v4.15-rc8 -- cgit From 1fb9a121c47cfe381d40bc1ae36df021f838e1e8 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Wed, 17 Jan 2018 08:37:52 -0800 Subject: Linux v4.15-rc8-72-g8cbab92dff77 --- gitrev | 2 +- kernel.spec | 5 ++++- sources | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gitrev b/gitrev index 18e11e412..d21acad0e 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -1545dec46db3858bbce84c2065b579e2925706ab +8cbab92dff778e516064c13113ca15d4869ec883 diff --git a/kernel.spec b/kernel.spec index a00014f32..b7de40760 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 8 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1903,6 +1903,9 @@ fi # # %changelog +* Wed Jan 17 2018 Laura Abbott - 4.15.0-0.rc8.git1.1 +- Linux v4.15-rc8-72-g8cbab92dff77 + * Wed Jan 17 2018 Laura Abbott - Reenable debugging options. diff --git a/sources b/sources index 28a9de977..41eeb90ba 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (linux-4.14.tar.xz) = 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 SHA512 (perf-man-4.14.tar.gz) = 76a9d8adc284cdffd4b3fbb060e7f9a14109267707ce1d03f4c3239cd70d8d164f697da3a0f90a363fbcac42a61d3c378afbcc2a86f112c501b9cb5ce74ef9f8 SHA512 (patch-4.15-rc8.xz) = 1a70ada185b738586ca79cf7497582a3d0198746cebac028fc8e7558d00984e089242e1f3c48cec80eb2baf0ba1b519873a73dd418c9c209dd5568f0c5604634 +SHA512 (patch-4.15-rc8-git1.xz) = c83ea545d388298c192a1c9e6c7d0cb3b58f78a8aade698996abc509900eb281ff1137700155068e7e9c66d9670c99cd6a179912ae3fc4ab363df0a88d570eaa -- cgit