diff options
Diffstat (limited to 'poky/meta/recipes-core/util-linux/util-linux.inc')
| -rw-r--r-- | poky/meta/recipes-core/util-linux/util-linux.inc | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/poky/meta/recipes-core/util-linux/util-linux.inc b/poky/meta/recipes-core/util-linux/util-linux.inc index 0b7db529f..a05c1cabb 100644 --- a/poky/meta/recipes-core/util-linux/util-linux.inc +++ b/poky/meta/recipes-core/util-linux/util-linux.inc @@ -35,7 +35,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \ util-linux-partx util-linux-hwclock util-linux-mountpoint \ util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit \ - util-linux-ionice util-linux-switch-root" + util-linux-ionice util-linux-switch-root util-linux-unshare" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'util-linux-runuser util-linux-su', '', d)}" @@ -46,7 +46,7 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \ --enable-kill --enable-last --enable-mesg --enable-partx \ --enable-raw --enable-rfkill --disable-login \ --disable-vipw --disable-newgrp --disable-chfn-chsh \ - --enable-write --enable-mount \ + --enable-write --enable-mount --enable-unshare \ --enable-libuuid --enable-libblkid --enable-fsck \ --disable-minix --disable-bfs --without-udev \ usrsbin_execdir='${sbindir}' \ @@ -75,7 +75,7 @@ FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/libmount/pylibmount.la" FILES_util-linux-agetty = "${base_sbindir}/agetty" FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" -FILES_util-linux-fstrim = "${base_sbindir}/fstrim" +FILES_util-linux-fstrim = "${base_sbindir}/fstrim.${BPN}" FILES_util-linux-cfdisk = "${base_sbindir}/cfdisk" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${base_sbindir}/swapoff.${BPN}" @@ -93,7 +93,7 @@ FILES_util-linux-findfs = "${sbindir}/findfs" FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-runuser = "${sbindir}/runuser" FILES_util-linux-prlimit = "${bindir}/prlimit" -FILES_util-linux-ionice = "${bindir}/ionice" +FILES_util-linux-ionice = "${bindir}/ionice.${BPN}" FILES_util-linux-su = "${bindir}/su.util-linux ${sysconfdir}/pam.d/su-l" CONFFILES_util-linux-su = "${sysconfdir}/pam.d/su-l" @@ -113,6 +113,7 @@ FILES_util-linux-sulogin = "${base_sbindir}/sulogin*" FILES_util-linux-mountpoint = "${base_bindir}/mountpoint.${BPN}" FILES_util-linux-switch-root = "${base_sbindir}/switch_root.${BPN}" +FILES_util-linux-unshare = "${bindir}/unshare.${BPN}" # Util-linux' blkid replaces the e2fsprogs one FILES_util-linux-blkid = "${base_sbindir}/blkid*" @@ -204,9 +205,12 @@ do_install_append_class-native () { ALTERNATIVE_PRIORITY = "80" -ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root switch_root" -ALTERNATIVE_${PN} += "hexdump last lastb logger mesg renice wall" -ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject nologin taskset" +ALTERNATIVE_${PN} = " \ + dmesg kill more mkswap blockdev pivot_root \ + hexdump last lastb logger mesg renice wall \ + setsid chrt flock utmpdump eject nologin taskset fallocate \ + fsfreeze nsenter cal rev \ +" ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" @@ -214,8 +218,11 @@ ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" -ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" +ALTERNATIVE_LINK_NAME[cal] = "${bindir}/cal" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" +ALTERNATIVE_LINK_NAME[fallocate] = "${bindir}/fallocate" +ALTERNATIVE_LINK_NAME[rev] = "${bindir}/rev" +ALTERNATIVE_LINK_NAME[fsfreeze] = "${sbindir}/fsfreeze" ALTERNATIVE_LINK_NAME[nologin] = "${base_sbindir}/nologin" ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 lastb.1 mesg.1 wall.1 nologin.8 sulogin.8 utmpdump.1 rfkill.8 kill.1 libblkid.3 blkid.8 findfs.8 fsck.8 uuid.3 eject.1 logger.1" @@ -244,6 +251,9 @@ ALTERNATIVE_LINK_NAME[hwclock] = "${base_sbindir}/hwclock" ALTERNATIVE_util-linux-fdisk = "fdisk" ALTERNATIVE_LINK_NAME[fdisk] = "${base_sbindir}/fdisk" +ALTERNATIVE_util-linux-fstrim = "fstrim" +ALTERNATIVE_LINK_NAME[fstrim] = "${base_sbindir}/fstrim" + ALTERNATIVE_util-linux-agetty = "getty" ALTERNATIVE_LINK_NAME[getty] = "${base_sbindir}/getty" ALTERNATIVE_TARGET[getty] = "${base_sbindir}/agetty" @@ -282,6 +292,15 @@ ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" ALTERNATIVE_util-linux-mountpoint = "mountpoint" ALTERNATIVE_LINK_NAME[mountpoint] = "${base_bindir}/mountpoint" +ALTERNATIVE_util-linux-unshare = "unshare" +ALTERNATIVE_LINK_NAME[unshare] = "${bindir}/unshare" + +ALTERNATIVE_util-linux-ionice = "ionice" +ALTERNATIVE_LINK_NAME[ionice] = "${bindir}/ionice" + +ALTERNATIVE_util-linux-switch-root = "switch_root" +ALTERNATIVE_LINK_NAME[switch_root] = "${base_sbindir}/switch_root" + BBCLASSEXTEND = "native nativesdk" python do_package_prepend () { |
