util-linux: fix lscpu packaging

lscpu in util-linux 2.17.2 is specially under GPLv3, ensure it's
packaged separately if it's being built.

Signed-off-by: Qing He <qing.he@intel.com>

diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 42881093fdadefe594e334d35344639251f1694b..f6beb918abfe9bd3cb63baed4a66cd8a1fcef577 100644 (file)
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -29,7 +29,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${MAJOR_VERSION}/u
 
 PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff \
                     util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile \
-                    util-linux-libblkid util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev "
+                    util-linux-libblkid util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
+                    util-linux-lscpu \
+                   "
 
 PACKAGES_virtclass-native = ""
 
@@ -49,6 +51,7 @@ FILES_util-linux-losetup = "/sbin/losetup.${PN}"
 FILES_util-linux-mount = "/bin/mount.${PN}"
 FILES_util-linux-umount = "/bin/umount.${PN}"
 FILES_util-linux-readprofile = "/sbin/readprofile"
+FILES_util-linux-lscpu = "/usr/bin/lscpu"
 
 FILES_util-linux-libblkid = "/usr/lib/libblkid.so.*"
 FILES_util-linux-libblkid-dev = "/usr/lib/libblkid.so /usr/lib/libblkid.a /usr/lib/libblkid.la /usr/include/blkid"

diff --git a/meta/recipes-core/util-linux/util-linux_2.17.2.bb b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
index d0b1b41ed461b6ee4895e058307538923bc68a76..082b3f09d30f9795faa01133ac0c154f4bd0433b 100644 (file)
--- a/meta/recipes-core/util-linux/util-linux_2.17.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
@@ -1,6 +1,6 @@
 MAJOR_VERSION = "2.17"
 require util-linux.inc
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://uclibc-compile.patch \
                  file://util-linux-ng-replace-siginterrupt.patch"