summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2015-01-26 09:49:30 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:50 +0000
commit2b7d3110fc8e7c406cf3e14a3a122de3b22a2a73 (patch)
tree9f18b03f140539dd7862508c0a53dfe3388687a3
parent0962b29d48f1bca45f5a6bb1ec47d49106c3c9d8 (diff)
downloadpoky-2b7d3110fc8e7c406cf3e14a3a122de3b22a2a73.tar.gz
util-linux: move readprofile to match busybox
This change moves readprofile from /sbin -> /usr/sbin to match busybox, the change allows update-alternative to correctly setup the links [YOCTO #7225] (From OE-Core rev: 43424eb3c8bf03a2f9ec331b78dd4040dd39eacd) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 af30887d80..b4f51e9e4f 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -77,7 +77,7 @@ FILES_util-linux-losetup = "${base_sbindir}/losetup.${BPN}"
77FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" 77FILES_util-linux-mount = "${base_bindir}/mount.${BPN}"
78FILES_util-linux-mcookie = "${bindir}/mcookie" 78FILES_util-linux-mcookie = "${bindir}/mcookie"
79FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" 79FILES_util-linux-umount = "${base_bindir}/umount.${BPN}"
80FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}" 80FILES_util-linux-readprofile = "${sbindir}/readprofile.${BPN}"
81FILES_util-linux-uuidgen = "${bindir}/uuidgen" 81FILES_util-linux-uuidgen = "${bindir}/uuidgen"
82FILES_util-linux-uuidd = "${sbindir}/uuidd" 82FILES_util-linux-uuidd = "${sbindir}/uuidd"
83FILES_util-linux-reset = "${base_bindir}/reset" 83FILES_util-linux-reset = "${base_bindir}/reset"
@@ -139,8 +139,8 @@ do_install () {
139 mkdir -p ${D}${base_bindir} 139 mkdir -p ${D}${base_bindir}
140 140
141 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" 141 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
142 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev fstrim sulogin switch_root" 142 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root"
143 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt" 143 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt readprofile"
144 binprogs_a="dmesg kill more umount mount login reset su" 144 binprogs_a="dmesg kill more umount mount login reset su"
145 145
146 if [ "${base_sbindir}" != "${sbindir}" ]; then 146 if [ "${base_sbindir}" != "${sbindir}" ]; then
@@ -214,7 +214,7 @@ ALTERNATIVE_util-linux-umount = "umount"
214ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount" 214ALTERNATIVE_LINK_NAME[umount] = "${base_bindir}/umount"
215 215
216ALTERNATIVE_util-linux-readprofile = "readprofile" 216ALTERNATIVE_util-linux-readprofile = "readprofile"
217ALTERNATIVE_LINK_NAME[readprofile] = "${base_sbindir}/readprofile" 217ALTERNATIVE_LINK_NAME[readprofile] = "${sbindir}/readprofile"
218 218
219ALTERNATIVE_util-linux-losetup = "losetup" 219ALTERNATIVE_util-linux-losetup = "losetup"
220ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup" 220ALTERNATIVE_LINK_NAME[losetup] = "${base_sbindir}/losetup"