diff options
author | Qing He <qing.he@intel.com> | 2011-01-21 18:01:25 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-01-24 14:09:12 -0800 |
commit | a9cb5cb0413db5b0acdfc9fd0e1b2aaeeefeed75 (patch) | |
tree | 82d4dea55b783c32d9cd5eebb0a18f1e72423140 /meta | |
parent | 8ee25e24622ac5eb9d204dfbf12a2e79fdac20c8 (diff) | |
download | poky-a9cb5cb0413db5b0acdfc9fd0e1b2aaeeefeed75.tar.gz |
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')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 5 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.17.2.bb | 2 |
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 | |||
29 | 29 | ||
30 | PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff \ | 30 | PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff \ |
31 | util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile \ | 31 | util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile \ |
32 | util-linux-libblkid util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev " | 32 | util-linux-libblkid util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ |
33 | util-linux-lscpu \ | ||
34 | " | ||
33 | 35 | ||
34 | PACKAGES_virtclass-native = "" | 36 | PACKAGES_virtclass-native = "" |
35 | 37 | ||
@@ -49,6 +51,7 @@ FILES_util-linux-losetup = "/sbin/losetup.${PN}" | |||
49 | FILES_util-linux-mount = "/bin/mount.${PN}" | 51 | FILES_util-linux-mount = "/bin/mount.${PN}" |
50 | FILES_util-linux-umount = "/bin/umount.${PN}" | 52 | FILES_util-linux-umount = "/bin/umount.${PN}" |
51 | FILES_util-linux-readprofile = "/sbin/readprofile" | 53 | FILES_util-linux-readprofile = "/sbin/readprofile" |
54 | FILES_util-linux-lscpu = "/usr/bin/lscpu" | ||
52 | 55 | ||
53 | FILES_util-linux-libblkid = "/usr/lib/libblkid.so.*" | 56 | FILES_util-linux-libblkid = "/usr/lib/libblkid.so.*" |
54 | FILES_util-linux-libblkid-dev = "/usr/lib/libblkid.so /usr/lib/libblkid.a /usr/lib/libblkid.la /usr/include/blkid" | 57 | 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 @@ | |||
1 | MAJOR_VERSION = "2.17" | 1 | MAJOR_VERSION = "2.17" |
2 | require util-linux.inc | 2 | require util-linux.inc |
3 | PR = "r3" | 3 | PR = "r4" |
4 | 4 | ||
5 | SRC_URI += "file://uclibc-compile.patch \ | 5 | SRC_URI += "file://uclibc-compile.patch \ |
6 | file://util-linux-ng-replace-siginterrupt.patch" | 6 | file://util-linux-ng-replace-siginterrupt.patch" |