summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2019-02-05 02:32:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-12 14:04:30 +0000
commite8af5caec2a618ed67fbcf971680d4337b402581 (patch)
treede1d0ee65e04bd1d27b704a9e3d64a38627691f2 /meta/recipes-core/util-linux
parent2e608fd1b70f00d92028688df1efa948d318292c (diff)
downloadpoky-e8af5caec2a618ed67fbcf971680d4337b402581.tar.gz
util-linux: be more explicit about what files go into packages
Just using a wildcard leaves the reader wondering what is meant here. By being explicit we can describe exactly what is intended, i.e. the file name as resulting from the ALTERNATIVE and ALTERNATIVE_LINK_NAME mechanism. (From OE-Core rev: 1892acab58884aa3b94b49da2854299a6db22af7) Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 406af58502..e479fc24e1 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -88,7 +88,7 @@ FILES_util-linux-umount = "${base_bindir}/umount.${BPN}"
88FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" 88FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}"
89FILES_util-linux-uuidgen = "${bindir}/uuidgen" 89FILES_util-linux-uuidgen = "${bindir}/uuidgen"
90FILES_util-linux-uuidd = "${sbindir}/uuidd" 90FILES_util-linux-uuidd = "${sbindir}/uuidd"
91FILES_util-linux-rfkill = "${sbindir}/rfkill*" 91FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}"
92FILES_util-linux-partx = "${sbindir}/partx" 92FILES_util-linux-partx = "${sbindir}/partx"
93FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" 93FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}"
94FILES_util-linux-findfs = "${sbindir}/findfs" 94FILES_util-linux-findfs = "${sbindir}/findfs"
@@ -105,20 +105,20 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so
105FILES_util-linux-lsblk = "${bindir}/lsblk" 105FILES_util-linux-lsblk = "${bindir}/lsblk"
106FILES_util-linux-lscpu = "${bindir}/lscpu" 106FILES_util-linux-lscpu = "${bindir}/lscpu"
107 107
108FILES_util-linux-fsck = "${base_sbindir}/fsck*" 108FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}"
109FILES_util-linux-mkfs = "${sbindir}/mkfs" 109FILES_util-linux-mkfs = "${sbindir}/mkfs"
110 110
111FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" 111FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs"
112FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" 112FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs"
113 113
114FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" 114FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}"
115FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" 115FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}"
116 116
117FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" 117FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}"
118FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" 118FILES_util-linux-unshare = "${bindir}/unshare.${BPN}"
119 119
120# Util-linux' blkid replaces the e2fsprogs one 120# Util-linux' blkid replaces the e2fsprogs one
121FILES_util-linux-blkid = "${base_sbindir}/blkid*" 121FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}"
122RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" 122RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
123RREPLACES_util-linux-blkid = "e2fsprogs-blkid" 123RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
124 124