aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-01-21 18:01:25 +0800
committerSaul Wold <sgw@linux.intel.com>2011-01-24 14:09:12 -0800
commita9cb5cb0413db5b0acdfc9fd0e1b2aaeeefeed75 (patch)
tree82d4dea55b783c32d9cd5eebb0a18f1e72423140 /meta/recipes-core
parent8ee25e24622ac5eb9d204dfbf12a2e79fdac20c8 (diff)
downloadopenembedded-core-contrib-a9cb5cb0413db5b0acdfc9fd0e1b2aaeeefeed75.tar.gz
openembedded-core-contrib-a9cb5cb0413db5b0acdfc9fd0e1b2aaeeefeed75.tar.bz2
openembedded-core-contrib-a9cb5cb0413db5b0acdfc9fd0e1b2aaeeefeed75.zip
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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc5
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.17.2.bb2
2 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 42881093fd..f6beb918ab 100644
--- 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 d0b1b41ed4..082b3f09d3 100644
--- 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"