diff options
| author | Khem Raj <raj.khem@gmail.com> | 2023-04-24 22:27:41 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-05 11:07:25 +0100 |
| commit | d0882a936eb5ea27faa1d22d9100453be34b0a5d (patch) | |
| tree | dab03dd579d49df6f6a9cd63043605b9e29073d0 /meta/recipes-devtools/quilt/quilt.inc | |
| parent | 8a6f52393ec874e3d401f9faf620ebf5075889dc (diff) | |
| download | poky-d0882a936eb5ea27faa1d22d9100453be34b0a5d.tar.gz | |
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
(From OE-Core rev: 511bcd965af658e6bb0c61d9f2adb1af75af773b)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/quilt/quilt.inc')
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index c93c38b83c..3374f4dfbf 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc | |||
| @@ -13,6 +13,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ | |||
| 13 | file://0001-tests-Allow-different-output-from-mv.patch \ | 13 | file://0001-tests-Allow-different-output-from-mv.patch \ |
| 14 | file://fix-grep-3.8.patch \ | 14 | file://fix-grep-3.8.patch \ |
| 15 | file://faildiff-order.patch \ | 15 | file://faildiff-order.patch \ |
| 16 | file://0001-test-Fix-a-race-condition-in-merge.test.patch \ | ||
| 16 | " | 17 | " |
| 17 | 18 | ||
| 18 | SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" | 19 | SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" |