diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-03-15 13:18:04 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-18 16:47:56 +0000 |
commit | 4957992f2e92c9d29bc3763aaf2b46ae66cbb3ac (patch) | |
tree | 3ed44599d7bb3927d6794fb1186c27dd0e66f21e /meta/recipes-core/util-linux/util-linux.inc | |
parent | 21d5d3cf5e2062f8d76ef052681c2111255c043b (diff) | |
download | poky-4957992f2e92c9d29bc3763aaf2b46ae66cbb3ac.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
(From OE-Core rev: ebd181cf6ce3fe233b61aef3af093228aa925f4d)
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.inc | 14 |
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 | |||
5 | 5 | ||
6 | SECTION = "base" | 6 | SECTION = "base" |
7 | 7 | ||
8 | # note that `lscpu' is under GPLv3+ | ||
9 | LICENSE = "GPLv2+ & LGPLv2.1+ & BSD" | 8 | LICENSE = "GPLv2+ & LGPLv2.1+ & BSD" |
10 | LICENSE_util-linux-lscpu = "GPLv3+" | ||
11 | 9 | ||
12 | LIC_FILES_CHKSUM = "file://README.licensing;md5=1530e36fe1304d4535513de90a290df9 \ | 10 | LIC_FILES_CHKSUM = "file://README.licensing;md5=1530e36fe1304d4535513de90a290df9 \ |
13 | file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | 11 | file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ |
@@ -27,11 +25,11 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${MAJOR_VERSION}/u | |||
27 | file://make_include \ | 25 | file://make_include \ |
28 | " | 26 | " |
29 | 27 | ||
30 | PACKAGES =+ "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff \ | 28 | PACKAGES =+ "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ |
31 | util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile \ | 29 | util-linux-swaponoff util-linux-losetup util-linux-umount \ |
32 | util-linux-libblkid util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ | 30 | util-linux-mount util-linux-readprofile util-linux-libblkid \ |
33 | util-linux-lscpu util-linux-uuidgen \ | 31 | util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ |
34 | " | 32 | util-linux-uuidgen util-linux-lscpu" |
35 | 33 | ||
36 | S = "${WORKDIR}/util-linux-ng-${PV}" | 34 | S = "${WORKDIR}/util-linux-ng-${PV}" |
37 | 35 | ||
@@ -49,13 +47,13 @@ FILES_util-linux-losetup = "${base_sbindir}/losetup.${PN}" | |||
49 | FILES_util-linux-mount = "${base_bindir}/mount.${PN}" | 47 | FILES_util-linux-mount = "${base_bindir}/mount.${PN}" |
50 | FILES_util-linux-umount = "${base_bindir}/umount.${PN}" | 48 | FILES_util-linux-umount = "${base_bindir}/umount.${PN}" |
51 | FILES_util-linux-readprofile = "${base_sbindir}/readprofile" | 49 | FILES_util-linux-readprofile = "${base_sbindir}/readprofile" |
52 | FILES_util-linux-lscpu = "${bindir}/lscpu" | ||
53 | FILES_util-linux-uuidgen = "${bindir}/uuidgen" | 50 | FILES_util-linux-uuidgen = "${bindir}/uuidgen" |
54 | 51 | ||
55 | FILES_util-linux-libblkid = "${libdir}/libblkid.so.*" | 52 | FILES_util-linux-libblkid = "${libdir}/libblkid.so.*" |
56 | FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.a ${libdir}/libblkid.la ${includedir}/blkid" | 53 | FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.a ${libdir}/libblkid.la ${includedir}/blkid" |
57 | FILES_util-linux-libuuid = "${libdir}/libuuid.so.*" | 54 | FILES_util-linux-libuuid = "${libdir}/libuuid.so.*" |
58 | FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid" | 55 | FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid" |
56 | FILES_util-linux-lscpu = "${bindir}/lscpu" | ||
59 | 57 | ||
60 | RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " | 58 | RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " |
61 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" | 59 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" |