On Tue, Jan 02, 2018 at 05:13:59PM +0100, Paul Bolle wrote:
On Tue, 2018-01-02 at 09:50 -0500, Don Zickus wrote:
On Sat, Dec 30, 2017 at 01:52:49PM +0100, Paul Bolle wrote:
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 -
if you get rid of '-F1' does that cause it to work?
No, it still fails.
Or if you add '-C1' to git-apply, does that make it fail?
No, I still get 755 file permissions.
(Nit: I think '-C2' is the equivalent of patch's '-F1', given the default of three lines of context in patches, so I used '-C2'.)
Nevermind. I was half asleep when I responded and didn't notice it was a file permissions problem. Laura fixed it with chmod, which patch doesn't do. Whereas git-apply can.
Cheers, Don