[OE-core] [PATCH] util-linux: Rebase remove-lscpu.patch for the current version

[Saul Wold]

Andrei,

I think our patches crossed on the list, already applied a similar patch.

Sau!

On 12/06/2012 03:37 AM, Andrei Gherzan wrote:
> Signed-off-by: Andrei Gherzan <andrei.gherzan at windriver.com>
> ---
>   .../util-linux/util-linux/remove-lscpu.patch       |   30 +++++++++----------
>   meta/recipes-core/util-linux/util-linux_2.22.1.bb  |    2 +-
>   2 files changed, 15 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 a15c1e3..4d0b311 100644
> --- a/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
> +++ b/meta/recipes-core/util-linux/util-linux/remove-lscpu.patch
> @@ -3,12 +3,13 @@ Upstream-Status: Inappropriate [distribution]
>   Take out lscpu stuff from the code
>
>   Signed-off-by: Saul Wold <sgw at linux.intel.com>
> +Signed-off-by: Andrei Gherzan <andrei.gherzan at windriver.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	2012-12-06 13:22:58.209874400 +0200
> ++++ util-linux-2.22.1/configure.ac	2012-12-06 13:23:18.721873663 +0200
> +@@ -934,7 +934,7 @@
>    AM_CONDITIONAL(BUILD_LSBLK, test "x$build_lsblk" = xyes)
>
>
> @@ -17,24 +18,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	2012-12-06 13:23:07.585874063 +0200
> ++++ util-linux-2.22.1/sys-utils/Makemodule.am	2012-12-06 13:23:34.217873111 +0200
> +@@ -224,13 +224,6 @@
> + 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 0177bba..f5d777f 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+
>