summaryrefslogtreecommitdiff
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:12:32 +0000
commit4bac11ffe389f10ca53b339a31eac167224dbc06 (patch)
tree5686c49ecf2a17cc5b479ccdee56c9707934f25d
parent11f90a720194499447f9b6e738fd56d78a0c2fee (diff)
downloadopenembedded-core-4bac11ffe389f10ca53b339a31eac167224dbc06.tar.gz
openembedded-core-4bac11ffe389f10ca53b339a31eac167224dbc06.tar.bz2
openembedded-core-4bac11ffe389f10ca53b339a31eac167224dbc06.zip
util-linux: remove non PN based -dev packages
All dev related items should be packaged in the core PN package not in seperate packages. Signed-off-by: Saul Wold <sgw@linux.intel.com>
-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
PACKAGES =+ "util-linux-agetty 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-libmount util-linux-libmount-dev \
- util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
+ util-linux-libmount util-linux-libuuid util-linux-uuidd \
util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
- util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-uuidd \
+ util-linux-mkfs util-linux-mcookie util-linux-reset \
util-linux-mkfs.cramfs util-linux-fsck.cramfs \
util-linux-partx ${PN}-bash-completion"
@@ -77,11 +76,8 @@ FILES_util-linux-reset = "${base_bindir}/reset"
FILES_util-linux-partx = "${sbindir}/partx"
FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
-FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc"
FILES_util-linux-libmount = "${base_libdir}/libmount.so.*"
-FILES_util-linux-libmount-dev = "${libdir}/libmount.so ${libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc"
FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*"
-FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc"
FILES_util-linux-lscpu = "${bindir}/lscpu"
FILES_util-linux-fsck = "${base_sbindir}/fsck*"
@@ -107,6 +103,8 @@ RRECOMMENDS_${PN}_class-nativesdk = ""
RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN}_class-nativesdk = ""
+RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev"
+
SYSTEMD_PACKAGES = "${PN}-uuidd"
SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.service"