0) The v4.14.10 stable updates adds a new executable (tools/objtool/sync-
check.sh). Somehow this was added non-executable during my local build of
v4.14.10 (on fc26, that is). This made the build fail:
[...]
+ make -s ARCH=x86_64 V=1 -j4 bzImage
make[2]: execvp: ./sync-check.sh: Permission denied
make[2]: *** [Makefile:49:
[...]/BUILD/kernel-4.14.fc26/linux-4.14.10-1.local0.fc26.x86_64/tools/objtool/objtool]
Error 127
make[1]: *** [Makefile:62: objtool] Error 2
make: *** [Makefile:1623: tools/objtool] Error 2
make: *** Waiting for unfinished jobs....
error: Bad exit status from /var/tmp/rpm-tmp.fTUkoT (%build)
RPM build errors:
Bad exit status from /var/tmp/rpm-tmp.fTUkoT (%build)
Anybody else seeing this?
1) Switching the specfile from patch to "git apply" seems to do the right
thing. This is what I tried:
diff --git a/kernel.spec b/kernel.spec
index 965345c2a26e..b2a1ffbe843d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1267,8 +1267,9 @@ fi
# released_kernel with possible stable updates
%if 0%{?stable_base}
# This is special because the kernel spec is hell and nothing is consistent
-xzcat %{SOURCE5000} | patch -p1 -F1 -s
-git commit -a -m "Stable update"
+xzcat %{SOURCE5000} | git apply -
+git add -A
+git commit -m "Stable update"
%endif
# Drop some necessary files from the source dir into the buildroot
2) Would it make sense to further gitify the specfile and move from patch to
"git apply" here (and a few other places)? Or should we expect patch to do the
right thing? (In the latter case I guess I might have to report a bug against
patch.)
Thanks,
Paul Bolle
Show replies by thread