util-linux: rebase remove-lscpu patch

(From OE-Core rev: b7c343fc4ae8c65cdc3e12e5b75257e3780bd2a0)

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

2 files changed, 14 insertions, 17 deletions

diff --git a/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
index a15c1e32a7..ddf14a50d1 100644
--- a/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
+++ b/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
@@ -4,11 +4,11 @@ Take out lscpu stuff from the code
 
 Signed-off-by: Saul Wold <sgw@linux.intel.com>
 
-Index: util-linux-2.21/configure.ac
+Index: util-linux-2.22.1/configure.ac
 ===================================================================
---- util-linux-2.21.orig/configure.ac
-+++ util-linux-2.21/configure.ac
-@@ -871,7 +871,7 @@ UL_REQUIRES_BUILD([lsblk], [libblkid])
+--- util-linux-2.22.1.orig/configure.ac
++++ util-linux-2.22.1/configure.ac
+@@ -937,7 +937,7 @@ UL_REQUIRES_BUILD([lsblk], [libmount])
  AM_CONDITIONAL(BUILD_LSBLK, test "x$build_lsblk" = xyes)
  
  
@@ -17,24 +17,21 @@ Index: util-linux-2.21/configure.ac
  UL_REQUIRES_LINUX([lscpu])
  UL_REQUIRES_HAVE([lscpu], [cpu_set_t], [cpu_set_t type])
  AM_CONDITIONAL(BUILD_LSCPU, test "x$build_lscpu" = xyes)
-Index: util-linux-2.21/sys-utils/Makefile.am
+Index: util-linux-2.22.1/sys-utils/Makemodule.am
 ===================================================================
---- util-linux-2.21.orig/sys-utils/Makefile.am
-+++ util-linux-2.21/sys-utils/Makefile.am
-@@ -108,16 +108,6 @@ swapon_CFLAGS = $(AM_CFLAGS) -I$(ul_libb
- swapon_LDADD = $(ul_libblkid_la)
+--- util-linux-2.22.1.orig/sys-utils/Makemodule.am
++++ util-linux-2.22.1/sys-utils/Makemodule.am
+@@ -224,13 +224,6 @@ swapoff_CFLAGS = $(AM_CFLAGS) -I$(ul_lib
+ swapoff_LDADD = $(LDADD) libmount.la
  endif
  
 -if BUILD_LSCPU
 -usrbin_exec_PROGRAMS += lscpu
--lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c \
--                       $(top_srcdir)/lib/strutils.c \
--                       $(top_srcdir)/lib/mbsalign.c \
--                       $(top_srcdir)/lib/tt.c \
--                       $(top_srcdir)/lib/path.c
--dist_man_MANS += lscpu.1
+-lscpu_SOURCES = sys-utils/lscpu.c
+-lscpu_LDADD = $(LDADD) libcommon.la
+-dist_man_MANS += sys-utils/lscpu.1
 -endif
 -
  if BUILD_CHCPU
  sbin_PROGRAMS += chcpu
- chcpu_SOURCES = chcpu.c $(top_srcdir)/lib/cpuset.c \
+ chcpu_SOURCES = sys-utils/chcpu.c
diff --git a/meta/recipes-core/util-linux/util-linux_2.22.1.bb b/meta/recipes-core/util-linux/util-linux_2.22.1.bb
index 0177bba260..f5d777f686 100644
--- a/meta/recipes-core/util-linux/util-linux_2.22.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.22.1.bb
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.22"
-PR = "r1"
+PR = "r2"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+