summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-02-29 22:54:52 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-01 15:51:41 +0000
commit100111f6ff2e0d9d39d9c828178ccf2be715877a (patch)
treeb3f7de22d250b2f38bceb39b363c457e2f1e0fbc
parenta9101b1b41463013606312df5bf4b858ced92c91 (diff)
downloadpoky-100111f6ff2e0d9d39d9c828178ccf2be715877a.tar.gz
util-linux: Fix removal of lscpu for non-GPLv3 Build
(From OE-Core rev: 998abea2748c6c7e0873ffd382b2bb2fd233c3f1) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch43
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.21.bb2
2 files changed, 30 insertions, 15 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
index 434e28d637..a15c1e32a7 100644
--- a/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
@@ -2,24 +2,39 @@ Upstream-Status: Inappropriate [distribution]
2 2
3Take out lscpu stuff from the code 3Take out lscpu stuff from the code
4 4
52011/03/17 5Signed-off-by: Saul Wold <sgw@linux.intel.com>
6Saul Wold <saul.wold@intel.com>
7Nitin A Kamble <nitin.a.kamble@intel.com>
8 6
9Index: util-linux-2.20.1/sys-utils/Makefile.am 7Index: util-linux-2.21/configure.ac
10=================================================================== 8===================================================================
11--- util-linux-2.20.1.orig/sys-utils/Makefile.am 9--- util-linux-2.21.orig/configure.ac
12+++ util-linux-2.20.1/sys-utils/Makefile.am 10+++ util-linux-2.21/configure.ac
13@@ -17,12 +17,6 @@ usrsbin_exec_PROGRAMS += ldattach tunelp 11@@ -871,7 +871,7 @@ UL_REQUIRES_BUILD([lsblk], [libblkid])
14 dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \ 12 AM_CONDITIONAL(BUILD_LSBLK, test "x$build_lsblk" = xyes)
15 ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
16 13
17-if HAVE_CPU_SET_T 14
15-UL_BUILD_INIT([lscpu], [check])
16+UL_BUILD_INIT([lscpu], [no])
17 UL_REQUIRES_LINUX([lscpu])
18 UL_REQUIRES_HAVE([lscpu], [cpu_set_t], [cpu_set_t type])
19 AM_CONDITIONAL(BUILD_LSCPU, test "x$build_lscpu" = xyes)
20Index: util-linux-2.21/sys-utils/Makefile.am
21===================================================================
22--- util-linux-2.21.orig/sys-utils/Makefile.am
23+++ util-linux-2.21/sys-utils/Makefile.am
24@@ -108,16 +108,6 @@ swapon_CFLAGS = $(AM_CFLAGS) -I$(ul_libb
25 swapon_LDADD = $(ul_libblkid_la)
26 endif
27
28-if BUILD_LSCPU
18-usrbin_exec_PROGRAMS += lscpu 29-usrbin_exec_PROGRAMS += lscpu
19-lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c $(top_srcdir)/lib/strutils.c 30-lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c \
31- $(top_srcdir)/lib/strutils.c \
32- $(top_srcdir)/lib/mbsalign.c \
33- $(top_srcdir)/lib/tt.c \
34- $(top_srcdir)/lib/path.c
20-dist_man_MANS += lscpu.1 35-dist_man_MANS += lscpu.1
21-endif 36-endif
22- 37-
23 endif 38 if BUILD_CHCPU
24 39 sbin_PROGRAMS += chcpu
25 cytune_SOURCES = cytune.c cyclades.h 40 chcpu_SOURCES = chcpu.c $(top_srcdir)/lib/cpuset.c \
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.bb b/meta/recipes-core/util-linux/util-linux_2.21.bb
index aa6ac649a3..e21f484b79 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.21" 1MAJOR_VERSION = "2.21"
2PR = "r0" 2PR = "r1"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+