summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2016-03-22 16:49:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-25 10:29:16 +0000
commit688d9a617acb6d071aeeb9164f6ee2d10c22fb50 (patch)
tree3d836b98b33ed97a44e836ab62e6ba457cac7324 /meta
parent85ff75d589d73763c6962cd8767878a8d5dd744b (diff)
downloadpoky-688d9a617acb6d071aeeb9164f6ee2d10c22fb50.tar.gz
util-linux: split out util-linux-mountpoint
Allow mountpoint to be installed separately from the rest of util-linux, to conserve disk space, and to minimize the impact of switching to/from this version of mountpoint. (From OE-Core rev: ea643811f44774dd9038d76ff01e13f33478c9cb) Signed-off-by: Richard Tollerton <rich.tollerton@ni.com> Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 08ca040a2e..c2a91e1086 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -31,7 +31,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
31 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ 31 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
32 util-linux-mkfs util-linux-mcookie util-linux-reset \ 32 util-linux-mkfs util-linux-mcookie util-linux-reset \
33 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ 33 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
34 util-linux-partx util-linux-hwclock \ 34 util-linux-partx util-linux-hwclock util-linux-mountpoint \
35 util-linux-findfs util-linux-getopt util-linux-sulogin" 35 util-linux-findfs util-linux-getopt util-linux-sulogin"
36PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" 36PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}"
37PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" 37PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
@@ -100,6 +100,7 @@ FILES_util-linux-fsck.cramfs = "${sbindir}/fsck.cramfs"
100FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs" 100FILES_util-linux-mkfs.cramfs = "${sbindir}/mkfs.cramfs"
101 101
102FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" 102FILES_util-linux-sulogin = "${base_sbindir}/sulogin*"
103FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}"
103 104
104# Util-linux' blkid replaces the e2fsprogs one 105# Util-linux' blkid replaces the e2fsprogs one
105FILES_util-linux-blkid = "${base_sbindir}/blkid*" 106FILES_util-linux-blkid = "${base_sbindir}/blkid*"
@@ -114,7 +115,7 @@ RDEPENDS_util-linux-runuser += "libpam"
114RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin" 115RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup util-linux-sulogin"
115RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}" 116RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser', '', d)}"
116 117
117RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs " 118RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs util-linux-mountpoint"
118 119
119RRECOMMENDS_${PN}_class-native = "" 120RRECOMMENDS_${PN}_class-native = ""
120RRECOMMENDS_${PN}_class-nativesdk = "" 121RRECOMMENDS_${PN}_class-nativesdk = ""
@@ -146,7 +147,7 @@ do_install () {
146 147
147 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" 148 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
148 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root" 149 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root"
149 binprogs_a="dmesg getopt kill more umount mount login reset su" 150 binprogs_a="dmesg getopt kill more umount mount login reset su mountpoint"
150 151
151 if [ "${base_sbindir}" != "${sbindir}" ]; then 152 if [ "${base_sbindir}" != "${sbindir}" ]; then
152 mkdir -p ${D}${base_sbindir} 153 mkdir -p ${D}${base_sbindir}
@@ -264,6 +265,9 @@ ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt"
264ALTERNATIVE_util-linux-sulogin = "sulogin" 265ALTERNATIVE_util-linux-sulogin = "sulogin"
265ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" 266ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
266 267
268ALTERNATIVE_util-linux-mountpoint = "mountpoint"
269ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint"
270
267BBCLASSEXTEND = "native nativesdk" 271BBCLASSEXTEND = "native nativesdk"
268 272
269python do_package_prepend () { 273python do_package_prepend () {