#5 Better handling of patche series

Open
opened 3 years ago by karasz · 0 comments
karasz commented 3 years ago
Owner

At the moment we apply patches in a buggy order because the patches are not properly sorted. This becomes evident when we have patch series with numbered patches that go beyond 10. My proposed fix is:

diff -ruN functions.in{.orig,}
--- functions.in.orig	2020-11-16 18:51:31.491093287 +0200
+++ functions.in	2020-11-16 13:55:09.696409851 +0200
@@ -864,7 +864,7 @@
 	local x= y=
 	patchfiles="`ls $confdir/*.patch{,.$arch} \
 			$confdir/*.patch_$xpkg{.$arch} \
-			2> /dev/null | tr '\n' ' '`"
+			2> /dev/null | sort -V | tr '\n' ' '`"
 
 	for x in $( get_reverted $targetchain ); do
 		for y in pkg_$pkg.patch{,.$arch} xpkg_$xpkg.patch{,.$arch}; do

At the moment we apply patches in a buggy order because the patches are not properly sorted. This becomes evident when we have patch series with numbered patches that go beyond 10. My proposed fix is: ``` diff -ruN functions.in{.orig,} --- functions.in.orig 2020-11-16 18:51:31.491093287 +0200 +++ functions.in 2020-11-16 13:55:09.696409851 +0200 @@ -864,7 +864,7 @@ local x= y= patchfiles="`ls $confdir/*.patch{,.$arch} \ $confdir/*.patch_$xpkg{.$arch} \ - 2> /dev/null | tr '\n' ' '`" + 2> /dev/null | sort -V | tr '\n' ' '`" for x in $( get_reverted $targetchain ); do for y in pkg_$pkg.patch{,.$arch} xpkg_$xpkg.patch{,.$arch}; do ```
karasz added the
bug
label 3 years ago
karasz self-assigned this 3 years ago
Sign in to join this conversation.
No Milestone
No Assignees
1 Participants
Notifications
Due Date

No due date set.

Dependencies

This issue currently doesn't have any dependencies.

Loading…
There is no content yet.