summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-12-19 17:43:57 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-06 11:14:01 +0000
commit3b0601ab271b7ba3fb1961b6e31d694f91931e40 (patch)
tree0813f6a59dabdb78446749eb5bcb87dd8f27a78c
parent12c181f5ed348bdd0dd24040ec749858b223ceee (diff)
downloadpoky-3b0601ab271b7ba3fb1961b6e31d694f91931e40.tar.gz
util-linux: remove non PN based -dev packages
All dev related items should be packaged in the core PN package not in seperate packages. (From OE-Core rev: 4bac11ffe389f10ca53b339a31eac167224dbc06) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 9f5fd01e34..aaa7ec3923 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -32,10 +32,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
32PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ 32PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \
33 util-linux-swaponoff util-linux-losetup util-linux-umount \ 33 util-linux-swaponoff util-linux-losetup util-linux-umount \
34 util-linux-mount util-linux-readprofile util-linux-libblkid \ 34 util-linux-mount util-linux-readprofile util-linux-libblkid \
35 util-linux-libmount util-linux-libmount-dev \ 35 util-linux-libmount util-linux-libuuid util-linux-uuidd \
36 util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
37 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ 36 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
38 util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-uuidd \ 37 util-linux-mkfs util-linux-mcookie util-linux-reset \
39 util-linux-mkfs.cramfs util-linux-fsck.cramfs \ 38 util-linux-mkfs.cramfs util-linux-fsck.cramfs \
40 util-linux-partx ${PN}-bash-completion" 39 util-linux-partx ${PN}-bash-completion"
41 40
@@ -77,11 +76,8 @@ FILES_util-linux-reset = "${base_bindir}/reset"
77FILES_util-linux-partx = "${sbindir}/partx" 76FILES_util-linux-partx = "${sbindir}/partx"
78 77
79FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" 78FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
80FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc"
81FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" 79FILES_util-linux-libmount = "${base_libdir}/libmount.so.*"
82FILES_util-linux-libmount-dev = "${libdir}/libmount.so ${libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc"
83FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" 80FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*"
84FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc"
85FILES_util-linux-lscpu = "${bindir}/lscpu" 81FILES_util-linux-lscpu = "${bindir}/lscpu"
86 82
87FILES_util-linux-fsck = "${base_sbindir}/fsck*" 83FILES_util-linux-fsck = "${base_sbindir}/fsck*"
@@ -107,6 +103,8 @@ RRECOMMENDS_${PN}_class-nativesdk = ""
107RDEPENDS_${PN}_class-native = "" 103RDEPENDS_${PN}_class-native = ""
108RDEPENDS_${PN}_class-nativesdk = "" 104RDEPENDS_${PN}_class-nativesdk = ""
109 105
106RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev"
107
110SYSTEMD_PACKAGES = "${PN}-uuidd" 108SYSTEMD_PACKAGES = "${PN}-uuidd"
111SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.service" 109SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.service"
112 110