Am 17.12.19 um 16:34 schrieb Justin Forbes: > On Mon, Dec 16, 2019 at 7:39 AM Thorsten Leemhuis <fedora@xxxxxxxxxxxxx > <mailto:fedora@xxxxxxxxxxxxx>> wrote: > Hi Fedora kernel maintainers! Could you please consider applying below > small tweak to kernel.spec (all branches, ideally) the next time you > change it? A change like this would be helpful for the Kernel vanilla > repositories, as "git am" afaics will endlessly wait for input from > STDIN right now if "%{patches}" is empty – which is the case currently > if one sets "nopatches 1" in the spec file :-/ > > This does not build as is for the default case. What the...? How embarrassing. I tested it, but seems I did something wrong, which means I tested poorly :-/ Sorry. Can somebody hand me a brown paper bag to hide my face? Anyway, let's try again: Below is a new patch that should work properly. I tried using RPM spec file conditionals as intended ("%if 0%{?patches:1} ..."), but that doesn't work, so I chose to use bashism, as that is used in the spec file already. Ciao, Thorsten diff --git a/kernel.spec b/kernel.spec index c34968b..ac19cc7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1507,9 +1507,12 @@ git commit -a -m "Stable update" %endif # Note: Even in the "nopatches" path some patches (build tweaks and compile -# fixes) will always get applied; see patch defition above for details +# fixes) might get applied; see patch defition above for details + +if [[ "%{patches}" ]]; then + git am %{patches} +fi -git am %{patches} # END OF PATCH APPLICATIONS _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
