Skip to contentSkip to conversation

quilt: Fix merge.test race condition

PATCH New Khem Raj 1 participant 1 message Apr 25, 2023

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 quilt: Fix merge.test race condition

This is consistently seen with musl and grep from busybox Therefore backport a patch from upstream to fix it

---
 meta/recipes-devtools/quilt/quilt.inc         |  1 +
 ...t-Fix-a-race-condition-in-merge.test.patch | 48 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch
meta/recipes-devtools/quilt/quilt.inc +1 -0
index c93c38b83c..3374f4dfbf 100644
@@ -13,6 +13,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
         file://0001-tests-Allow-different-output-from-mv.patch \
         file://fix-grep-3.8.patch \
         file://faildiff-order.patch \
+        file://0001-test-Fix-a-race-condition-in-merge.test.patch \
 "
 
 SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch"
meta/recipes-devtools/quilt/quilt/0001-test-Fix-a-race-condition-in-merge.test.patch new file +48 -0

48 lines not on this page · raw message

Signature · 1 line
2.40.0