5 files changed, 14 insertions, 3 deletions

diff --git a/meta/packages/util-linux/util-linux-2.17/tls.patch b/meta/packages/util-linux/util-linux-2.17.2/tls.patch
index bdb29cae1f..bdb29cae1f 100644
--- a/meta/packages/util-linux/util-linux-2.17/tls.patch
+++ b/meta/packages/util-linux/util-linux-2.17.2/tls.patch
diff --git a/meta/packages/util-linux/util-linux-2.17/uclibc-compile.patch b/meta/packages/util-linux/util-linux-2.17.2/uclibc-compile.patch
index b2e8a8b95a..b2e8a8b95a 100644
--- a/meta/packages/util-linux/util-linux-2.17/uclibc-compile.patch
+++ b/meta/packages/util-linux/util-linux-2.17.2/uclibc-compile.patch
diff --git a/meta/packages/util-linux/util-linux-2.17/util-linux-ng-replace-siginterrupt.patch b/meta/packages/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch
index 4b5eb73760..4b5eb73760 100644
--- a/meta/packages/util-linux/util-linux-2.17/util-linux-ng-replace-siginterrupt.patch
+++ b/meta/packages/util-linux/util-linux-2.17.2/util-linux-ng-replace-siginterrupt.patch
diff --git a/meta/packages/util-linux/util-linux.inc b/meta/packages/util-linux/util-linux.inc
index 733667a9c7..571b53c99c 100644
--- a/meta/packages/util-linux/util-linux.inc
+++ b/meta/packages/util-linux/util-linux.inc
@@ -1,12 +1,22 @@
 DESCRIPTION = "Util-linux is a suite of essential utilities for any Linux system."
 SECTION = "base"
-LICENSE = "GPL"
+
+# note that `lscpu' is under GPLv3+
+LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
+LICENSE_util-linux-lscpu = "GPLv3+"
+
+LIC_FILES_CHKSUM = "file://README.licensing;md5=1530e36fe1304d4535513de90a290df9 \
+                    file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+                    file://licenses/COPYING.GPL;md5=8ca43cbc842c2336e835926c2166c28b \
+                    file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
+                    file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+
 DEPENDS = "udev zlib ncurses virtual/libintl gettext"
 DEPENDS_virtclass-native = "zlib-native ncurses-native lzo-native gettext-native"
 
 inherit autotools
 
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${MAJOR_VERSION}/util-linux-ng-${PV}.tar.bz2 \
            file://MCONFIG \
            file://swapargs.h \
            file://defines.h \
@@ -23,7 +33,7 @@ EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elv
  --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
   --disable-login-utils --enable-write --enable-arch --enable-mount --with-fsprobe=builtin --enable-libuuid --enable-libblkid --enable-fsck"
 
-FILES_${PN}-doc += "/usr/share/misc/getopt/getopt-*.*"
+FILES_${PN}-doc += "/usr/share/getopt/getopt-*.*"
 
 FILES_util-linux-fdisk = "/sbin/fdisk.${PN}"
 FILES_util-linux-cfdisk = "/sbin/cfdisk"
diff --git a/meta/packages/util-linux/util-linux_2.17.bb b/meta/packages/util-linux/util-linux_2.17.2.bb
index b5d177fc7e..9efe64a6c6 100644
--- a/meta/packages/util-linux/util-linux_2.17.bb
+++ b/meta/packages/util-linux/util-linux_2.17.2.bb
@@ -1,3 +1,4 @@
+MAJOR_VERSION = "2.17"
 require util-linux.inc
 PR="r0"