The following commit removes the requirement for patches to be placed in 1000, 2000, or 3000 ID blocks depending on their upstream status. Instead upstream status is documented in the header of the patch with some semi-standard notation as described in template.patch. The patches are re-numbered and defined and applied in the same order. Verified that before and after the patch that the source tree does not change. The patch definition is resorted to match the patch application order.
On 04/17/2018 10:00 PM, Carlos O'Donell wrote:
The following commit removes the requirement for patches to be placed in 1000, 2000, or 3000 ID blocks depending on their upstream status. Instead upstream status is documented in the header of the patch with some semi-standard notation as described in template.patch. The patches are re-numbered and defined and applied in the same order. Verified that before and after the patch that the source tree does not change. The patch definition is resorted to match the patch application order.
Have you checked whether %autosetup works? If yes, we should switch to it and never look back.
Thanks, Florian
On 04/17/2018 10:00 PM, Carlos O'Donell wrote:
The following commit removes the requirement for patches to be placed in 1000, 2000, or 3000 ID blocks depending on their upstream status. Instead upstream status is documented in the header of the patch with some semi-standard notation as described in template.patch. The patches are re-numbered and defined and applied in the same order.
Great. This allows us to switch over to %autosetup, which I just did (after adding %autosetup support to the patch management scripts).
Thanks, Florian
On 04/19/2018 06:55 AM, Florian Weimer wrote:
On 04/17/2018 10:00 PM, Carlos O'Donell wrote:
The following commit removes the requirement for patches to be placed in 1000, 2000, or 3000 ID blocks depending on their upstream status. Instead upstream status is documented in the header of the patch with some semi-standard notation as described in template.patch. The patches are re-numbered and defined and applied in the same order.
Great. This allows us to switch over to %autosetup, which I just did (after adding %autosetup support to the patch management scripts).
Thanks!
The only other thing I was playing with, and I attach it here for posterity, is switching to -S git (or git_am as you discovered).
That would replace the quilt-based workflow with something that is entirely based on git.
-
Carlos O'Donell -
Florian Weimer