summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-08-30 17:11:27 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-08-30 17:11:27 -0500
commit6b7647647610ebe404bd27c768e5df1727334c32 (patch)
treedde062d935f175398f865bb76fe06b6ee335348b
parent9e5bb46146bb87601ccec5eea950ffc57e5b7c05 (diff)
downloadkernel-6b7647647610ebe404bd27c768e5df1727334c32.zip
kernel-6b7647647610ebe404bd27c768e5df1727334c32.tar.gz
kernel-6b7647647610ebe404bd27c768e5df1727334c32.tar.xz
Rebuild with additional tracing to try to debug kernel-install issue
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rwxr-xr-xkernel.spec9
-rw-r--r--sources4
2 files changed, 7 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec
index 4ff76db..bbf5f5f 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -80,7 +80,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 60
+%global distro_build 61
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -125,13 +125,13 @@ Summary: The Linux kernel
%define rpmversion 5.14.0
%define patchversion 5.14
-%define pkgrelease 60
+%define pkgrelease 61
# This is needed to do merge window version magic
%define patchlevel 14
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 60%{?buildid}%{?dist}
+%define specrelease 61%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -853,6 +853,7 @@ Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\
Requires(pre): %{initrd_prereq}\
Requires(pre): linux-firmware >= 20150904-56.git6ebf5d57\
+Requires(pre): strace\
Requires(preun): systemd >= 200\
Conflicts: xfsprogs < 4.3.0-1\
Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
@@ -2654,7 +2655,7 @@ then\
%{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\
fi\
%endif\
-/bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
+/usr/bin/strace -f -s 8192 /bin/kernel-install -v add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
%{nil}
#
diff --git a/sources b/sources
index c246aad..66696f1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (linux-5.14.tar.xz) = 88f9313c421ecb42ba75b22b30113b7801fa448d4cf53f86160d422c630c5bbd1c69736c714294c6fc2b17fdace6a786f98076bee960dedf6783d524fd6abb11
-SHA512 (kernel-abi-stablelists-5.14.0-60.tar.bz2) = 9888fe44d4bf6395bac7a930e7063b66c65ac5483b17f7fa2408a52ce6cfb4f825aeb8115344eb3980334a1e1be87fdade434f8ebc21a883d5be55c2244c19cc
-SHA512 (kernel-kabi-dw-5.14.0-60.tar.bz2) = d231a72517da1f73bfe66888e67836bbaf580bbc038aceba698cfd126d23da697256b80f58267a2b3dcdfb39a731638dd485efa29ff9d67da1a15061fad896f2
+SHA512 (kernel-abi-stablelists-5.14.0-61.tar.bz2) = 9888fe44d4bf6395bac7a930e7063b66c65ac5483b17f7fa2408a52ce6cfb4f825aeb8115344eb3980334a1e1be87fdade434f8ebc21a883d5be55c2244c19cc
+SHA512 (kernel-kabi-dw-5.14.0-61.tar.bz2) = d231a72517da1f73bfe66888e67836bbaf580bbc038aceba698cfd126d23da697256b80f58267a2b3dcdfb39a731638dd485efa29ff9d67da1a15061fad896f2