summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2019-07-05 16:25:49 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-09 23:30:44 +0100
commitd44e5f18443f37e61f89a854b90200ab90d76a77 (patch)
treef4807299712074465762d8b3be0ae43f34fb383a /meta
parent85af5bb62891b321f2b36ec051c356859a8eaa42 (diff)
downloadpoky-d44e5f18443f37e61f89a854b90200ab90d76a77.tar.gz
util-linux:upgrade 2.33.2 -> 2.34
-Upgrade from util-linux_2.33.2.bb to util-linux_2.34.bb. -util-linux/check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch Removed since this is included in 2.34. (From OE-Core rev: c8685430d81b60c38d43ed20e480b2a0942dc768) Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux/check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch16
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.34.bb (renamed from meta/recipes-core/util-linux/util-linux_2.33.2.bb)5
2 files changed, 2 insertions, 19 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch b/meta/recipes-core/util-linux/util-linux/check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch
deleted file mode 100644
index c92c276ac1..0000000000
--- a/meta/recipes-core/util-linux/util-linux/check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Checking for exitence of the define is not enough since
2it will be defined with 0 or 1 value
3
4Upstream-Status: Pending
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6--- a/sys-utils/ldattach.c
7+++ b/sys-utils/ldattach.c
8@@ -242,7 +242,7 @@ static int my_cfsetspeed(struct termios
9 * -- we have to bypass glibc and set the speed manually (because glibc
10 * checks for speed and supports Bxxx bit rates only)...
11 */
12-#ifdef _HAVE_STRUCT_TERMIOS_C_ISPEED
13+#if _HAVE_STRUCT_TERMIOS_C_ISPEED
14 # define BOTHER 0010000 /* non standard rate */
15 dbg("using non-standard speeds");
16 ts->c_ospeed = ts->c_ispeed = speed;
diff --git a/meta/recipes-core/util-linux/util-linux_2.33.2.bb b/meta/recipes-core/util-linux/util-linux_2.34.bb
index 538e27612c..262f4bacb0 100644
--- a/meta/recipes-core/util-linux/util-linux_2.33.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.34.bb
@@ -7,7 +7,6 @@ SRC_URI += "file://configure-sbindir.patch \
7 file://run-ptest \ 7 file://run-ptest \
8 file://display_testname_for_subtest.patch \ 8 file://display_testname_for_subtest.patch \
9 file://avoid_parallel_tests.patch \ 9 file://avoid_parallel_tests.patch \
10 file://check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch \
11" 10"
12SRC_URI[md5sum] = "91653b90fcbe9c161153e39b8cc69fb5" 11SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50"
13SRC_URI[sha256sum] = "631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97" 12SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5"