util-linux: Update to 2.21.2

Remove patch that was corrected upstream

(From OE-Core rev: 6cbcee1a7fe52437e58045d4acd169ea214b6cb3)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 3 insertions, 28 deletions

diff --git a/meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch b/meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch
deleted file mode 100644
index 545c3a9c7b..0000000000
--- a/meta/recipes-core/util-linux/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-configure uses AC_CHECK_DECLS to check for _NL_TIME_WEEK_1STDAY
-which means we will get HAVE_DECL__NL_TIME_WEEK_1STDAY
-defined to 1 if symbol is declared, otherwise to 0 in config.h
-
-Therefore we cannot rely on conditionals which check for it
-being defined or not since it always will be defined so correct
-thing is to use #if instead of #ifdef
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-Index: util-linux-2.21/misc-utils/cal.c
-===================================================================
---- util-linux-2.21.orig/misc-utils/cal.c       2012-02-29 23:41:54.413347665 -0800
-+++ util-linux-2.21/misc-utils/cal.c    2012-02-29 23:42:44.573350057 -0800
-@@ -297,7 +297,7 @@
-  * the locale database, which can be overridden with the
-  * -s (Sunday) or -m (Monday) options.
-  */
--#ifdef HAVE_DECL__NL_TIME_WEEK_1STDAY
-+#if HAVE_DECL__NL_TIME_WEEK_1STDAY
-        /*
-         * You need to use 2 locale variables to get the first day of the week.
-         * This is needed to support first_weekday=2 and first_workday=1 for
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.1.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
index 8492cdf8e7..7f2c2a915f 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.21"
-PR = "r1"
+PR = "r0"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
@@ -8,11 +8,10 @@ LICENSE_${PN}-lscpu = "GPLv3+"
 SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
             file://util-linux-ng-2.16-mount_lock_path.patch \
             file://uclibc-__progname-conflict.patch \
-            file://fix_NL_TIME_FIRST_WEEKDAY.patch \
 "
 
-SRC_URI[md5sum] = "3d9ad37bf8c5a8e6d0e165b020cf9ba5"
-SRC_URI[sha256sum] = "4bf9641fd58454106589be8a8d1cfd61e7694f0a6912d8095d17b1fb94b85abe"
+SRC_URI[md5sum] = "b75b3cfecb943f74338382fde693c2c3"
+SRC_URI[sha256sum] = "066f9d8e51bfabd809d266edcd54eefba1cdca57725b95c074fd47fe6fba3d30"
 
 # Only lscpu part is gplv3; rest of the code is not, 
 # so take out the lscpu parts while running non-gplv3 build.