diff options
author | André Draszik <andre.draszik@jci.com> | 2019-02-05 02:32:30 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-12 14:04:30 +0000 |
commit | e8af5caec2a618ed67fbcf971680d4337b402581 (patch) | |
tree | de1d0ee65e04bd1d27b704a9e3d64a38627691f2 /meta/recipes-core/util-linux | |
parent | 2e608fd1b70f00d92028688df1efa948d318292c (diff) | |
download | poky-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.inc | 8 |
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}" | |||
88 | FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" | 88 | FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}" |
89 | FILES_util-linux-uuidgen = "${bindir}/uuidgen" | 89 | FILES_util-linux-uuidgen = "${bindir}/uuidgen" |
90 | FILES_util-linux-uuidd = "${sbindir}/uuidd" | 90 | FILES_util-linux-uuidd = "${sbindir}/uuidd" |
91 | FILES_util-linux-rfkill = "${sbindir}/rfkill*" | 91 | FILES_util-linux-rfkill = "${sbindir}/rfkill.${BPN}" |
92 | FILES_util-linux-partx = "${sbindir}/partx" | 92 | FILES_util-linux-partx = "${sbindir}/partx" |
93 | FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" | 93 | FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" |
94 | FILES_util-linux-findfs = "${sbindir}/findfs" | 94 | FILES_util-linux-findfs = "${sbindir}/findfs" |
@@ -105,20 +105,20 @@ FILES_util-linux-pylibmount = "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.so | |||
105 | FILES_util-linux-lsblk = "${bindir}/lsblk" | 105 | FILES_util-linux-lsblk = "${bindir}/lsblk" |
106 | FILES_util-linux-lscpu = "${bindir}/lscpu" | 106 | FILES_util-linux-lscpu = "${bindir}/lscpu" |
107 | 107 | ||
108 | FILES_util-linux-fsck = "${base_sbindir}/fsck*" | 108 | FILES_util-linux-fsck = "${base_sbindir}/fsck.${BPN}" |
109 | FILES_util-linux-mkfs = "${sbindir}/mkfs" | 109 | FILES_util-linux-mkfs = "${sbindir}/mkfs" |
110 | 110 | ||
111 | FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" | 111 | FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs" |
112 | FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" | 112 | FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" |
113 | 113 | ||
114 | FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" | 114 | FILES_util-linux-sulogin = "${base_sbindir}/sulogin.${BPN}" |
115 | FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" | 115 | FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" |
116 | 116 | ||
117 | FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" | 117 | FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" |
118 | FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" | 118 | FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" |
119 | 119 | ||
120 | # Util-linux' blkid replaces the e2fsprogs one | 120 | # Util-linux' blkid replaces the e2fsprogs one |
121 | FILES_util-linux-blkid = "${base_sbindir}/blkid*" | 121 | FILES_util-linux-blkid = "${base_sbindir}/blkid.${BPN}" |
122 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" | 122 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" |
123 | RREPLACES_util-linux-blkid = "e2fsprogs-blkid" | 123 | RREPLACES_util-linux-blkid = "e2fsprogs-blkid" |
124 | 124 | ||