aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux/util-linux.inc
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-03-15 13:18:04 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-18 16:38:11 +0000
commitebd181cf6ce3fe233b61aef3af093228aa925f4d (patch)
tree0b043218ceb39aafea9adb058754b25af45e79f7 /meta/recipes-core/util-linux/util-linux.inc
parent543577c25b5a4e89a3ab15ee28e754b71c2a43d5 (diff)
downloadopenembedded-core-contrib-ebd181cf6ce3fe233b61aef3af093228aa925f4d.tar.gz
util-linux: Setup for GPLv2 Recipe
* add task to remove the GPLv3 lscpu code * Add patch to remove the reference to lscpu in Makfiles Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux.inc')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc14
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 6f8bcb34bc..861747d1f0 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -5,9 +5,7 @@ disk partitioning, kernel message management, filesystem creation, and system lo
SECTION = "base"
-# 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 \
@@ -27,11 +25,11 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${MAJOR_VERSION}/u
file://make_include \
"
-PACKAGES =+ "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-lscpu util-linux-uuidgen \
- "
+PACKAGES =+ "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-uuidgen util-linux-lscpu"
S = "${WORKDIR}/util-linux-ng-${PV}"
@@ -49,13 +47,13 @@ FILES_util-linux-losetup = "${base_sbindir}/losetup.${PN}"
FILES_util-linux-mount = "${base_bindir}/mount.${PN}"
FILES_util-linux-umount = "${base_bindir}/umount.${PN}"
FILES_util-linux-readprofile = "${base_sbindir}/readprofile"
-FILES_util-linux-lscpu = "${bindir}/lscpu"
FILES_util-linux-uuidgen = "${bindir}/uuidgen"
FILES_util-linux-libblkid = "${libdir}/libblkid.so.*"
FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.a ${libdir}/libblkid.la ${includedir}/blkid"
FILES_util-linux-libuuid = "${libdir}/libuuid.so.*"
FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid"
+FILES_util-linux-lscpu = "${bindir}/lscpu"
RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"