diff options
Diffstat (limited to 'recipes/util-linux-ng/util-linux-ng.inc')
| -rw-r--r-- | recipes/util-linux-ng/util-linux-ng.inc | 83 |
1 files changed, 48 insertions, 35 deletions
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 7f4333ba9d..1c6e8a89e0 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -7,17 +7,20 @@ inherit autotools DEFAULT_PREFERENCE = "-1" -INC_PR = "r9" +INC_PR = "r16" # allows for a release candidate RC ?= "" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}${RC}.tar.bz2" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}${RC}.tar.bz2;name=archive" SRC_URI_append_chinook-compat = " file://chinook_libtool.patch;patch=1 " -PACKAGES =+ "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-swaponoff util-linux-ng-losetup util-linux-ng-umount util-linux-ng-mount util-linux-ng-readprofile " -PACKAGES_DYNAMIC = "libblkid*" +PACKAGES =+ "${PN}-fdisk ${PN}-cfdisk ${PN}-sfdisk ${PN}-swaponoff \ + ${PN}-losetup ${PN}-umount ${PN}-mount ${PN}-readprofile \ + ${PN}-fsck ${PN}-blkid ${PN}-mountall" + +PACKAGES_DYNAMIC = "libblkid* libuuid*" # Provide old util-linux names (several recipes still use DEPENDS or RDEPENDS = "util-linux"): PROVIDES = "util-linux" @@ -30,6 +33,8 @@ RPROVIDES_util-linux-ng-losetup = "util-linux-losetup" RPROVIDES_util-linux-ng-umount = "util-linux-umount" RPROVIDES_util-linux-ng-mount = "util-linux-mount" RPROVIDES_util-linux-ng-readprofile = "util-linux-readprofile" +RPROVIDES_util-linux-ng-fsck = "e2fsprogs-fsck" +RPROVIDES_util-linux-ng-blkid = "e2fsprogs-blkid" FILES_${PN}-doc += "/usr/share/misc/getopt/getopt-*.*" FILES_${PN} = "${bindir} ${sbindir} ${base_bindir} ${base_sbindir}" @@ -44,18 +49,23 @@ FILES_util-linux-ng-mount = "${base_bindir}/mount.${PN} ${sysconfdir}/default/mo FILES_util-linux-ng-umount = "${base_bindir}/umount.${PN}" # Moved to ${base_sbindir} by do_install: FILES_util-linux-ng-readprofile = "${base_sbindir}/readprofile.${PN}" +FILES_util-linux-ng-fsck = "${base_sbindir}/fsck.${PN}" +FILES_util-linux-ng-blkid = "${sbindir}/blkid" +FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}" -PACKAGES =+ "${PN}-mountall" -FILES_${PN}-mountall = "${sysconfdir}/default/mountall" +RREPLACES_util-linux-ng-blkid = "e2fsprogs-blkid" RREPLACES_${PN}-mountall = "busybox-mountall" -RRECOMMENDS_${PN} = "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-mount util-linux-ng-readprofile " -RDEPENDS_${PN} = "${PN}-mountall util-linux-ng-umount util-linux-ng-swaponoff util-linux-ng-losetup" +RRECOMMENDS_${PN} = "${PN}-fdisk ${PN}-cfdisk ${PN}-sfdisk ${PN}-mount ${PN}-readprofile" +RDEPENDS_${PN} = "${PN}-mountall ${PN}-umount ${PN}-swaponoff ${PN}-losetup ${PN}-fsck ${PN}-blkid" EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown \ --enable-kill --enable-last --enable-mesg --enable-raw --enable-login-utils \ --enable-arch --enable-init --enable-partx --enable-schedutils \ ---with-fsprobe=builtin" +--with-fsprobe=builtin --enable-libuuid --enable-libblkid \ +--enable-fsck" + +LDFLAGS_append_libc-uclibc = " -lintl" S = "${WORKDIR}/util-linux-ng-${PV}${RC}" @@ -69,10 +79,6 @@ do_configure_prepend_chinook-compat () { do_compile () { set -e -# install ${WORKDIR}/MCONFIG ${S}/MCONFIG -# install ${WORKDIR}/make_include ${S}/make_include -# install ${WORKDIR}/swapargs.h ${S}/mount/swapargs.h -# install ${WORKDIR}/defines.h ${S}/defines.h oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ 'LDFLAGS=${LDFLAGS}' @@ -110,10 +116,10 @@ do_install () { 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install mkdir -p ${D}${base_bindir} - sbinprogs="agetty blockdev ctrlaltdel cfdisk" - sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk readprofile" - usrbinprogs_a="hexdump last logger mesg renice wall" - binprogs_a="dmesg kill more umount mount" + sbinprogs="agetty blockdev ctrlaltdel cfdisk vipw vigr" + sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck" + usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall" + binprogs_a="dmesg kill more umount mount login" if [ "${base_sbindir}" != "${sbindir}" ]; then mkdir -p ${D}${base_sbindir} @@ -152,7 +158,7 @@ do_install () { done install -d ${D}${sysconfdir}/default/ - echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall + echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall.${PN} rm ${D}${sbindir}/swapoff -f ln -sf ${base_sbindir}/swapon.${PN} ${D}${base_sbindir}/swapoff.${PN} @@ -188,6 +194,12 @@ pkg_postinst_${PN} () { update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 100 update-alternatives --install ${bindir}/renice renice renice.${PN} 100 update-alternatives --install ${bindir}/wall wall wall.${PN} 100 + update-alternatives --install ${bindir}/chfn chfn chfn.${PN} 100 + update-alternatives --install ${bindir}/newgrp newgrp newgrp.${PN} 100 + update-alternatives --install ${bindir}/chsh chsh chsh.${PN} 100 + update-alternatives --install ${base_bindir}/login login login.${PN} 100 + update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 100 + update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 100 # There seems to be problem, atleast on nslu2, with these, until they are # fixed the busybox ones have higher priority @@ -200,23 +212,10 @@ pkg_postinst_${PN} () { pkg_prerm_${PN} () { test -x ${base_sbindir}/pivot_root.${PN} && \ update-alternatives --remove pivot_root pivot_root.${PN} - update-alternatives --remove dmesg dmesg.${PN} - update-alternatives --remove kill kill.${PN} - update-alternatives --remove more more.${PN} - update-alternatives --remove halt halt.${PN} - update-alternatives --remove hwclock hwclock.${PN} - update-alternatives --remove mkswap mkswap.${PN} - update-alternatives --remove reboot reboot.${PN} - update-alternatives --remove shutdown shutdown.${PN} - update-alternatives --remove sln sln.${PN} - update-alternatives --remove mkfs.minix mkfs.minix.${PN} - update-alternatives --remove fsck.minix fsck.minix.${PN} - update-alternatives --remove hexdump hexdump.${PN} - update-alternatives --remove last last.${PN} - update-alternatives --remove logger logger.${PN} - update-alternatives --remove mesg mesg.${PN} - update-alternatives --remove renice renice.${PN} - update-alternatives --remove wall wall.${PN} + + for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hecdump last logger mesg renice wall vipw vigr chfn newgrp chsh login ; do + update-alternatives --remove $i $i.${PN} + done } pkg_postinst_util-linux-ng-fdisk () { @@ -269,3 +268,17 @@ pkg_prerm_util-linux-ng-readprofile () { update-alternatives --remove readprofile readprofile.${PN} 100 } +pkg_postinst_util-linux-ng-mountall () { + update-alternatives --install ${sysconfdir}/default/mountall default_mountall mountall.${PN} 100 +} +pkg_prerm_util-linux-ng-mountall () { + update-alternatives --remove default_mountall mountall.${PN} +} + +pkg_postinst_util-linux-ng-fsck () { + update-alternatives --install ${base_sbindir}/fsck fsck fsck.${PN} 100 +} + +pkg_prerm_util-linux-ng-fsck () { + update-alternatives --remove fsck fsck.${PN} +} |