mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
diffutils: update 3.9 -> 3.10
Remove the comment addition from the patch body, as it increases likelyhood of rebase conflicts, and repeats what the commit says. (From OE-Core rev: 925155acc6922f7e9df2afa45e79ad1b2c57ba24) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a9c96819fb
commit
f965880f7f
|
@ -1,4 +1,4 @@
|
|||
From 027229d25392b22d7280c0abbc3efde4f467d167 Mon Sep 17 00:00:00 2001
|
||||
From f31395c931bc633206eccfcfaaaa5d15021a3e86 Mon Sep 17 00:00:00 2001
|
||||
From: Peiran Hong <peiran.hong@windriver.com>
|
||||
Date: Thu, 5 Sep 2019 15:42:22 -0400
|
||||
Subject: [PATCH] Skip strip-trailing-cr test case
|
||||
|
@ -12,23 +12,18 @@ Upstream-Status: Inappropriate [embedded specific]
|
|||
Signed-off-by: Peiran Hong <peiran.hong@windriver.com>
|
||||
|
||||
---
|
||||
tests/Makefile.am | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
tests/Makefile.am | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index d98df82..757ea52 100644
|
||||
index 79bacfb..4adb4d7 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -21,9 +21,11 @@ TESTS = \
|
||||
@@ -22,7 +22,6 @@ TESTS = \
|
||||
stdin \
|
||||
strcoll-0-names \
|
||||
filename-quoting \
|
||||
- strip-trailing-cr \
|
||||
timezone \
|
||||
colors
|
||||
+# Skipping this test since it requires valgrind
|
||||
+# and thus is too heavy for diffutils package
|
||||
+# strip-trailing-cr
|
||||
|
||||
XFAIL_TESTS = large-subopt
|
||||
|
||||
colors \
|
||||
y2038-vs-32bit
|
||||
|
|
|
@ -8,7 +8,7 @@ SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \
|
|||
file://0001-Skip-strip-trailing-cr-test-case.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1"
|
||||
SRC_URI[sha256sum] = "90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e"
|
||||
|
||||
EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix"
|
||||
|
Loading…
Reference in New Issue
Block a user