4 files changed, 54 insertions, 36 deletions

diff --git a/meta/packages/util-linux/util-linux-native_2.12r.bb b/meta/packages/util-linux/util-linux-native_2.15.bb
index 27c053000d..7a931786db 100644
--- a/meta/packages/util-linux/util-linux-native_2.12r.bb
+++ b/meta/packages/util-linux/util-linux-native_2.15.bb
@@ -5,7 +5,7 @@ DEPENDS = "zlib-native ncurses-native"
 
 inherit autotools native
 
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-${PV}.tar.bz2 \
            file://gcc34.patch;patch=1 \
            file://MCONFIG \
            file://make_include \
@@ -13,7 +13,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.b
            file://fdiskbsdlabel_thumb.diff;patch=1 \
            file://defines.h"
 
-S="${WORKDIR}/util-linux-${PV}"
+S="${WORKDIR}/util-linux-ng-${PV}"
 
 EXTRA_OEMAKE="'OPT=${BUILD_CFLAGS}' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'LDFLAGS=${BUILD_LDFLAGS}' SBINDIR=${base_sbindir} USRSBINDIR=${base_sbindir} LOGDIR=${localstatedir}/log VARPATH=${localstatedir} LOCALEDIR=${datadir}/locale"
 
diff --git a/meta/packages/util-linux/util-linux.inc b/meta/packages/util-linux/util-linux.inc
index a5ff009669..75177c8f28 100644
--- a/meta/packages/util-linux/util-linux.inc
+++ b/meta/packages/util-linux/util-linux.inc
@@ -1,21 +1,27 @@
 DESCRIPTION = "Util-linux is a suite of essential utilities for any Linux system."
 SECTION = "base"
 LICENSE = "GPL"
-DEPENDS = "zlib ncurses"
+DEPENDS = "udev zlib ncurses virtual/libintl"
 
 inherit autotools
 
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \
-           file://gcc34.patch;patch=1 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-${PV}.tar.bz2 \
            file://MCONFIG \
            file://make_include \
            file://swapargs.h \
            file://fdiskbsdlabel_thumb.diff;patch=1 \
            file://umount.diff;patch=1 \
            file://defines.h"
+#           file://gcc34.patch;patch=1 \
 
 PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile "
 
+S = "${WORKDIR}/util-linux-ng-${PV}"
+
+EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
+ --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
+  --disable-login-utils --enable-write --enable-arch --enable-mount --with-fsprobe=builtin"
+
 FILES_${PN}-doc += "/usr/share/misc/getopt/getopt-*.*"
 
 FILES_util-linux-fdisk = "/sbin/fdisk.${PN}"
@@ -72,17 +78,19 @@ do_install () {
                 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \
                 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install
 
-        test -f ${D}${base_sbindir}/pivot_root && \
-        mv ${D}${base_sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN}
-        mv ${D}${base_bindir}/dmesg ${D}${base_bindir}/dmesg.${PN}
-        mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN}
-        mv ${D}${base_bindir}/more ${D}${base_bindir}/more.${PN}
-        mv ${D}${base_sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN}
-        mv ${D}${base_sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN}
-        mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
-        mv ${D}${base_sbindir}/sln ${D}${base_sbindir}/sln.${PN}
-        mv ${D}${base_sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN}
-        mv ${D}${base_sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN}
+        install -d ${D}${base_bindir}
+        install -d ${D}${base_sbindir}
+        test -f ${D}${sbindir}/pivot_root && \
+        mv ${D}${sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN}
+        mv ${D}${bindir}/dmesg ${D}${base_bindir}/dmesg.${PN}
+        mv ${D}${bindir}/kill ${D}${base_bindir}/kill.${PN}
+        mv ${D}${bindir}/more ${D}${base_bindir}/more.${PN}
+        mv ${D}${sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN}
+        mv ${D}${sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN}
+        mv ${D}${sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
+#       mv ${D}${sbindir}/sln ${D}${base_sbindir}/sln.${PN}
+        mv ${D}${sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN}
+        mv ${D}${sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN}
         mv ${D}${bindir}/hexdump ${D}${bindir}/hexdump.${PN}
         mv ${D}${bindir}/last ${D}${bindir}/last.${PN}
         mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN}
@@ -90,17 +98,27 @@ do_install () {
         mv ${D}${bindir}/renice ${D}${bindir}/renice.${PN}
         mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN}
 
-        mv ${D}${base_sbindir}/losetup ${D}${base_sbindir}/losetup.${PN}
-        mv ${D}${base_sbindir}/swapon ${D}${base_sbindir}/swapon.${PN}
-        mv ${D}${base_bindir}/umount ${D}${base_bindir}/umount.${PN}
-        mv ${D}${base_bindir}/mount ${D}${base_bindir}/mount.${PN}
-        mv ${D}${base_sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN}
-
-        checklink swapon ${D}${base_sbindir}/swapoff ".${PN}"
-        checklink shutdown ${D}${base_sbindir}/reboot ".${PN}"
-        checklink shutdown ${D}${base_sbindir}/halt ".${PN}"
-        checklink shutdown ${D}${base_sbindir}/fastboot ""
-        checklink shutdown ${D}${base_sbindir}/fasthalt ""
+        mv ${D}${sbindir}/losetup ${D}${base_sbindir}/losetup.${PN}
+        mv ${D}${sbindir}/swapon ${D}${base_sbindir}/swapon.${PN}
+        mv ${D}${bindir}/umount ${D}${base_bindir}/umount.${PN}
+        mv ${D}${bindir}/mount ${D}${base_bindir}/mount.${PN}
+        mv ${D}${sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN}
+
+        mv ${D}${sbindir}/agetty ${D}${base_sbindir}/ 
+        mv ${D}${sbindir}/blockdev ${D}${base_sbindir}/
+        mv ${D}${sbindir}/cfdisk ${D}${base_sbindir}/
+        mv ${D}${sbindir}/ctrlaltdel ${D}${base_sbindir}/
+
+        mv ${D}${sbindir}/readprofile ${D}${sbindir}/readprofile.${PN}
+        
+        install -d ${D}${sysconfdir}/default/
+        echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
+
+        ln -sf ${sbindir}/swapon ${D}${sbindir}/swapoff.${PN}
+        ln -sf ${sbindir}/shutdown ${D}${sbindir}/reboot.${PN}
+        ln -sf ${sbindir}/shutdown ${D}${sbindir}/halt.${PN}
+        ln -sf ${sbindir}/shutdown ${D}${sbindir}/fastboot
+        ln -sf ${sbindir}/shutdown ${D}${sbindir}/fasthalt
 }
 
 pkg_postinst_${PN} () {
@@ -110,7 +128,7 @@ pkg_postinst_${PN} () {
         update-alternatives --install ${base_sbindir}/mkswap mkswap mkswap.${PN} 100
         test -x ${base_sbindir}/pivot_root.${PN} && \
         update-alternatives --install ${base_sbindir}/pivot_root pivot_root pivot_root.${PN} 100
-        update-alternatives --install ${base_sbindir}/sln sln sln.${PN} 100
+#       update-alternatives --install ${base_sbindir}/sln sln sln.${PN} 100
         update-alternatives --install ${base_sbindir}/mkfs.minix mkfs.minix mkfs.minix.${PN} 100
         update-alternatives --install ${base_sbindir}/fsck.minix fsck.minix fsck.minix.${PN} 100
         update-alternatives --install ${bindir}/hexdump hexdump hexdump.${PN} 100
@@ -139,7 +157,7 @@ pkg_prerm_${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 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}
diff --git a/meta/packages/util-linux/util-linux_2.12r.bb b/meta/packages/util-linux/util-linux_2.12r.bb
deleted file mode 100644
index 334c7b243d..0000000000
--- a/meta/packages/util-linux/util-linux_2.12r.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require util-linux.inc
-
-SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1"
-SRC_URI += "file://glibc-fix.patch;patch=1"
-SRC_URI += "file://debian-bug392236.patch;patch=1"
-
-PR = "r11"
diff --git a/meta/packages/util-linux/util-linux_2.15.bb b/meta/packages/util-linux/util-linux_2.15.bb
new file mode 100644
index 0000000000..3e0b3cf053
--- /dev/null
+++ b/meta/packages/util-linux/util-linux_2.15.bb
@@ -0,0 +1,7 @@
+require util-linux.inc
+
+SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1"
+#SRC_URI += "file://glibc-fix.patch;patch=1"
+#SRC_URI += "file://debian-bug392236.patch;patch=1"
+
+PR = "r11"