From c8685430d81b60c38d43ed20e480b2a0942dc768 Mon Sep 17 00:00:00 2001 From: Zang Ruochen Date: Fri, 5 Jul 2019 16:25:49 +0800 Subject: [PATCH] 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. Signed-off-by: Zang Ruochen Signed-off-by: Richard Purdie --- ...check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch | 16 ---------------- .../{util-linux_2.33.2.bb => util-linux_2.34.bb} | 5 ++--- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux/check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch rename meta/recipes-core/util-linux/{util-linux_2.33.2.bb => util-linux_2.34.bb} (59%) 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 @@ -Checking for exitence of the define is not enough since -it will be defined with 0 or 1 value - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- a/sys-utils/ldattach.c -+++ b/sys-utils/ldattach.c -@@ -242,7 +242,7 @@ static int my_cfsetspeed(struct termios - * -- we have to bypass glibc and set the speed manually (because glibc - * checks for speed and supports Bxxx bit rates only)... - */ --#ifdef _HAVE_STRUCT_TERMIOS_C_ISPEED -+#if _HAVE_STRUCT_TERMIOS_C_ISPEED - # define BOTHER 0010000 /* non standard rate */ - dbg("using non-standard speeds"); - 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 similarity index 59% rename from meta/recipes-core/util-linux/util-linux_2.33.2.bb rename to 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 \ file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch \ " -SRC_URI[md5sum] = "91653b90fcbe9c161153e39b8cc69fb5" -SRC_URI[sha256sum] = "631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97" +SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" +SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" -- 2.40.1