misc recipes: migrate from e2fsprogs-libs to util-linux-ng/e2fsprogs

Signed-off-by: Marcin Juszkiewicz <marcin@buglabs.net>

diff --git a/recipes/cryptsetup/cryptsetup_1.0.5.bb b/recipes/cryptsetup/cryptsetup_1.0.5.bb
index 7c070dc..2bafbc4 100644 (file)
--- a/recipes/cryptsetup/cryptsetup_1.0.5.bb
+++ b/recipes/cryptsetup/cryptsetup_1.0.5.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "cryptsetup with luks support creates and manages encrypted contai
 HOMEPAGE = "http://luks.endorphin.org/"
 SECTION = "console"
 LICENSE = "GPL"
-DEPENDS = "e2fsprogs-libs device-mapper libgcrypt popt"
+DEPENDS = "util-linux-ng device-mapper libgcrypt popt"
 RRECOMMENDS = "kernel-module-aes \
                kernel-module-dm-crypt \
                kernel-module-md5 \

diff --git a/recipes/devlabel/devlabel_0.48.01.bb b/recipes/devlabel/devlabel_0.48.01.bb
index d26cc56..903be77 100644 (file)
--- a/recipes/devlabel/devlabel_0.48.01.bb
+++ b/recipes/devlabel/devlabel_0.48.01.bb
@@ -1,8 +1,8 @@
 SECTION = "base"
 HOMEPAGE = "http://linux.dell.com/devlabel/devlabel.html"
 DESCRIPTION = "tool for user-define static device labels"
-DEPENDS = "e2fsprogs-libs"
-RDEPENDS = "bash util-linux"
+DEPENDS = "util-linux-ng"
+RDEPENDS = "bash util-linux-ng"
 LICENSE = "GPL"
 PR = "r0"
 

diff --git a/recipes/e2tools/e2tools-native_0.0.16.bb b/recipes/e2tools/e2tools-native_0.0.16.bb
index f23a0b1..032698e 100644 (file)
--- a/recipes/e2tools/e2tools-native_0.0.16.bb
+++ b/recipes/e2tools/e2tools-native_0.0.16.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 require e2tools_${PV}.bb
 inherit native
 
-DEPENDS = "e2fsprogs-libs-native e2fsprogs-native"
+DEPENDS = "e2fsprogs-native"
 PACKAGES = ""
 
 e2links = "e2ln e2ls e2mkdir e2mv e2rm e2tail"

diff --git a/recipes/e2tools/e2tools_0.0.16.bb b/recipes/e2tools/e2tools_0.0.16.bb
index 7f98bdb..85d0635 100644 (file)
--- a/recipes/e2tools/e2tools_0.0.16.bb
+++ b/recipes/e2tools/e2tools_0.0.16.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 LICENSE = "GPL"
 DESCRIPTION = "A simple set of utilities for reading, writing, and \
 manipulating files in an ext2/ext3 filesystem."
-DEPENDS = "e2fsprogs-libs e2fsprogs"
+DEPENDS = "e2fsprogs"
 SRC_URI = "http://www.pobox.com/~sheff/sw/e2tools/e2tools-${PV}.tar.gz \
           file://autofoo.patch;patch=1"
 S = "${WORKDIR}/e2tools-${PV}"

diff --git a/recipes/gpephone/libcalenabler_1.0.bb b/recipes/gpephone/libcalenabler_1.0.bb
index c23e1b4..6d2a484 100644 (file)
--- a/recipes/gpephone/libcalenabler_1.0.bb
+++ b/recipes/gpephone/libcalenabler_1.0.bb
@@ -2,8 +2,8 @@ LICENSE     = "LiPS"
 DESCRIPTION = "LiPS calendar database backend library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
-DEPENDS     = "glib-2.0 e2fsprogs-libs sqlite3"
 PR          = "r1"
+DEPENDS     = "glib-2.0 util-linux-ng sqlite3"
 
 GPE_TARBALL_SUFFIX = "gz"
 

diff --git a/recipes/gpephone/librecord2_0.1.bb b/recipes/gpephone/librecord2_0.1.bb
index 532cc26..8a57f39 100644 (file)
--- a/recipes/gpephone/librecord2_0.1.bb
+++ b/recipes/gpephone/librecord2_0.1.bb
@@ -2,7 +2,7 @@ LICENSE     = "LiPS"
 DESCRIPTION = "LiPS database API."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
-DEPENDS     = "glib-2.0 e2fsprogs-libs sqlite3"
+DEPENDS     = "glib-2.0 util-linux-ng sqlite3"
 PR          = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"

diff --git a/recipes/gpephone/librecord2_svn.bb b/recipes/gpephone/librecord2_svn.bb
index 378032d..e348376 100644 (file)
--- a/recipes/gpephone/librecord2_svn.bb
+++ b/recipes/gpephone/librecord2_svn.bb
@@ -2,7 +2,7 @@ LICENSE     = "LiPS"
 DESCRIPTION = "LiPS database API."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
-DEPENDS     = "glib-2.0 e2fsprogs-libs sqlite3"
+DEPENDS     = "glib-2.0 util-linux-ng sqlite3"
 PR          = "r0"
 PV = "0.1+svnr-${SRCREV}"
 

diff --git a/recipes/gpephone/librecord_0.1.bb b/recipes/gpephone/librecord_0.1.bb
index 532cc26..8a57f39 100644 (file)
--- a/recipes/gpephone/librecord_0.1.bb
+++ b/recipes/gpephone/librecord_0.1.bb
@@ -2,7 +2,7 @@ LICENSE     = "LiPS"
 DESCRIPTION = "LiPS database API."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
-DEPENDS     = "glib-2.0 e2fsprogs-libs sqlite3"
+DEPENDS     = "glib-2.0 util-linux-ng sqlite3"
 PR          = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"

diff --git a/recipes/gpephone/librecord_1.0.bb b/recipes/gpephone/librecord_1.0.bb
index 532cc26..8a57f39 100644 (file)
--- a/recipes/gpephone/librecord_1.0.bb
+++ b/recipes/gpephone/librecord_1.0.bb
@@ -2,7 +2,7 @@ LICENSE     = "LiPS"
 DESCRIPTION = "LiPS database API."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
-DEPENDS     = "glib-2.0 e2fsprogs-libs sqlite3"
+DEPENDS     = "glib-2.0 util-linux-ng sqlite3"
 PR          = "r0"
 
 GPE_TARBALL_SUFFIX = "bz2"

diff --git a/recipes/jfsutils/jfsutils.inc b/recipes/jfsutils/jfsutils.inc
index ef9766f..f537243 100755 (executable)
--- a/recipes/jfsutils/jfsutils.inc
+++ b/recipes/jfsutils/jfsutils.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://jfs.sourceforge.net/"
 LICENSE = "GPL"
 SECTION = "base"
 PR = "r0"
-DEPENDS = "e2fsprogs-libs"
+DEPENDS = "util-linux-ng"
 
 SRC_URI = "http://jfs.sourceforge.net/project/pub/${PN}-${PV}.tar.gz"
 

diff --git a/recipes/krb/krb5_1.6.3.bb b/recipes/krb/krb5_1.6.3.bb
index 9afef6b..b415d32 100644 (file)
--- a/recipes/krb/krb5_1.6.3.bb
+++ b/recipes/krb/krb5_1.6.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://web.mit.edu/Kerberos/"
 SECTION = "console/network"
 PR = "r6"
 LICENSE = "MIT"
-DEPENDS = "perl-native ncurses e2fsprogs-libs e2fsprogs-native"
+DEPENDS = "perl-native ncurses util-linux-ng e2fsprogs-native"
 
 inherit autotools binconfig
 

diff --git a/recipes/mtd/mtd-utils-native_1.2.0+git.bb b/recipes/mtd/mtd-utils-native_1.2.0+git.bb
index 85692a0..5d06844 100644 (file)
--- a/recipes/mtd/mtd-utils-native_1.2.0+git.bb
+++ b/recipes/mtd/mtd-utils-native_1.2.0+git.bb
@@ -4,4 +4,4 @@ DEFAULT_PREFERENCE_angstrom = "1"
 
 require mtd-utils_${PV}.bb
 require mtd-utils-native.inc
-DEPENDS += "e2fsprogs-libs-native"
+DEPENDS += "util-linux-ng-native"

diff --git a/recipes/mtd/mtd-utils-native_1.3.1.bb b/recipes/mtd/mtd-utils-native_1.3.1.bb
index 85692a0..5d06844 100644 (file)
--- a/recipes/mtd/mtd-utils-native_1.3.1.bb
+++ b/recipes/mtd/mtd-utils-native_1.3.1.bb
@@ -4,4 +4,4 @@ DEFAULT_PREFERENCE_angstrom = "1"
 
 require mtd-utils_${PV}.bb
 require mtd-utils-native.inc
-DEPENDS += "e2fsprogs-libs-native"
+DEPENDS += "util-linux-ng-native"

diff --git a/recipes/mtd/mtd-utils_1.2.0+git.bb b/recipes/mtd/mtd-utils_1.2.0+git.bb
index 06cbf1b..8ea5424 100644 (file)
--- a/recipes/mtd/mtd-utils_1.2.0+git.bb
+++ b/recipes/mtd/mtd-utils_1.2.0+git.bb
@@ -1,6 +1,6 @@
 require mtd-utils.inc
 
-DEPENDS += "e2fsprogs-libs"
+DEPENDS += "util-linux-ng"
 PR = "r4"
 
 ARM_INSTRUCTION_SET = "arm"

diff --git a/recipes/mtd/mtd-utils_1.3.1.bb b/recipes/mtd/mtd-utils_1.3.1.bb
index ee7f962..58fbc65 100644 (file)
--- a/recipes/mtd/mtd-utils_1.3.1.bb
+++ b/recipes/mtd/mtd-utils_1.3.1.bb
@@ -1,6 +1,6 @@
 require mtd-utils.inc
 
-DEPENDS += "e2fsprogs-libs"
+DEPENDS += "util-linux-ng"
 
 PARALLEL_MAKE = ""
 ARM_INSTRUCTION_SET = "arm"

diff --git a/recipes/networkmanager/networkmanager-0.7.inc b/recipes/networkmanager/networkmanager-0.7.inc
index 91c9190..6d3f9a2 100644 (file)
--- a/recipes/networkmanager/networkmanager-0.7.inc
+++ b/recipes/networkmanager/networkmanager-0.7.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "NetworkManager"
 SECTION = "net/misc"
 LICENSE = "GPL"
 PRIORITY = "optional"
-DEPENDS = "libnl dbus dbus-glib hal wireless-tools policykit gnutls e2fsprogs-libs ppp"
+DEPENDS = "libnl dbus dbus-glib hal wireless-tools policykit gnutls util-linux-ng ppp"
 RDEPENDS = "wpa-supplicant dhcp-client \
            ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \
            "

diff --git a/recipes/networkmanager/networkmanager-openvpn_0.7.1.bb b/recipes/networkmanager/networkmanager-openvpn_0.7.1.bb
index a0c313d..259474d 100644 (file)
--- a/recipes/networkmanager/networkmanager-openvpn_0.7.1.bb
+++ b/recipes/networkmanager/networkmanager-openvpn_0.7.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "NetworkManager"
 SECTION = "net/misc"
 LICENSE = "GPL"
 PRIORITY = "optional"
-DEPENDS = "networkmanager libnl dbus dbus-glib hal wireless-tools policykit gnutls e2fsprogs-libs ppp"
+DEPENDS = "networkmanager libnl dbus dbus-glib hal wireless-tools policykit gnutls util-linux-ng ppp"
 RDEPENDS = "wpa-supplicant dhcp-client \
            ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \
            "

diff --git a/recipes/networkmanager/networkmanager-openvpn_0.8.bb b/recipes/networkmanager/networkmanager-openvpn_0.8.bb
index b01f8cb..4648199 100644 (file)
--- a/recipes/networkmanager/networkmanager-openvpn_0.8.bb
+++ b/recipes/networkmanager/networkmanager-openvpn_0.8.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "NetworkManager"
 SECTION = "net/misc"
 LICENSE = "GPL"
 PRIORITY = "optional"
-DEPENDS = "networkmanager libnl dbus dbus-glib hal wireless-tools policykit gnutls e2fsprogs-libs ppp libglade"
+DEPENDS = "networkmanager libnl dbus dbus-glib hal wireless-tools policykit gnutls util-linux-ng ppp libglade"
 RDEPENDS = "wpa-supplicant dhcp-client \
            ${@base_contains('COMBINED_FEATURES', '3gmodem', 'ppp', '', d)} \
            "

diff --git a/recipes/nfs-utils/nfs-utils_1.1.2.bb b/recipes/nfs-utils/nfs-utils_1.1.2.bb
index 3951c46..94ac3f5 100644 (file)
--- a/recipes/nfs-utils/nfs-utils_1.1.2.bb
+++ b/recipes/nfs-utils/nfs-utils_1.1.2.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 
 PR = "r7"
 
-DEPENDS = "e2fsprogs-libs tcp-wrappers libevent"
+DEPENDS = "util-linux-ng tcp-wrappers libevent"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
        file://nfs-utils-tools-unset-cflags.patch;patch=1 \

diff --git a/recipes/nilfs-utils/nilfs-utils_2.0.13.bb b/recipes/nilfs-utils/nilfs-utils_2.0.13.bb
index e45e028..4eea8c8 100644 (file)
--- a/recipes/nilfs-utils/nilfs-utils_2.0.13.bb
+++ b/recipes/nilfs-utils/nilfs-utils_2.0.13.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.nilfs.org/"
 
 # required for libuuid
-DEPENDS = "e2fsprogs-libs"
+DEPENDS = "util-linux-ng"
 
 RRECOMMENDS_${PN} = "nilfs-utils-mkfs nilfs-utils-stats"
 

diff --git a/recipes/pmount/pmount_0.9.17.bb b/recipes/pmount/pmount_0.9.17.bb
index f72534b..60cdced 100644 (file)
--- a/recipes/pmount/pmount_0.9.17.bb
+++ b/recipes/pmount/pmount_0.9.17.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://pmount.alioth.debian.org/"
 LICENSE = "GPLv2"
 PR = "r0"
 
-DEPENDS = "hal e2fsprogs-libs sysfsutils"
+DEPENDS = "hal util-linux-ng sysfsutils"
 RDEPENDS_${PN}-hal = "${PN}"
 RRECOMMENDS_${PN}-hal = "hal"
 

diff --git a/recipes/pmount/pmount_0.9.18.bb b/recipes/pmount/pmount_0.9.18.bb
index 71a823e..6b043bc 100644 (file)
--- a/recipes/pmount/pmount_0.9.18.bb
+++ b/recipes/pmount/pmount_0.9.18.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://pmount.alioth.debian.org/"
 LICENSE = "GPLv2"
 PR = "r1"
 
-DEPENDS = "hal e2fsprogs-libs sysfsutils"
+DEPENDS = "hal util-linux-ng sysfsutils"
 RDEPENDS_${PN}-hal = "${PN}"
 RRECOMMENDS_${PN}-hal = "hal"
 

diff --git a/recipes/pmount/pmount_0.9.19.bb b/recipes/pmount/pmount_0.9.19.bb
index 2bab217..35454b8 100644 (file)
--- a/recipes/pmount/pmount_0.9.19.bb
+++ b/recipes/pmount/pmount_0.9.19.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://pmount.alioth.debian.org/"
 LICENSE = "GPLv2"
 PR = "r0"
 
-DEPENDS = "hal e2fsprogs-libs"
+DEPENDS = "hal util-linux-ng"
 RDEPENDS_${PN}-hal = "${PN}"
 RRECOMMENDS_${PN}-hal = "hal"
 

diff --git a/recipes/testdisk/testdisk_6.5+6.6-WIP.bb b/recipes/testdisk/testdisk_6.5+6.6-WIP.bb
index 278c41c..7d6b777 100644 (file)
--- a/recipes/testdisk/testdisk_6.5+6.6-WIP.bb
+++ b/recipes/testdisk/testdisk_6.5+6.6-WIP.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "TestDisk is a powerful free data recovery software! It was primarily designed to help recover lost partitions and/or make non-booting disks bootable again when these symptoms are caused by faulty software, certain types of viruses or human error (such as accidentally deleting your Partition Table)."
 LICENSE = "GPLv2"
 
-DEPENDS = "jpeg ncurses e2fsprogs-libs"
+DEPENDS = "jpeg ncurses e2fsprogs"
 
 SRC_URI = "http://www.cgsecurity.org/testdisk-6.6-WIP.tar.bz2"
 S = "${WORKDIR}/testdisk-6.6-WIP"

diff --git a/recipes/xfsprogs/xfsprogs_2.8.16.bb b/recipes/xfsprogs/xfsprogs_2.8.16.bb
index 13c96ea..1cdf950 100644 (file)
--- a/recipes/xfsprogs/xfsprogs_2.8.16.bb
+++ b/recipes/xfsprogs/xfsprogs_2.8.16.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://oss.sgi.com/projects/xfs"
 LICENSE = "GPL"
 SECTION = "base"
 PR = "r2"
-DEPENDS = "e2fsprogs-libs"
+DEPENDS = "util-linux-ng"
 
 SRC_URI = "http://slackware.osuosl.org/slackware-12.0/source/a/xfsprogs/xfsprogs_2.8.16-1.tar.gz"
 

diff --git a/recipes/xfsprogs/xfsprogs_3.1.1.bb b/recipes/xfsprogs/xfsprogs_3.1.1.bb
index 6caf8dc..28c6ec4 100644 (file)
--- a/recipes/xfsprogs/xfsprogs_3.1.1.bb
+++ b/recipes/xfsprogs/xfsprogs_3.1.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://oss.sgi.com/projects/xfs"
 LICENSE = "GPL"
 SECTION = "base"
 PR = "r0"
-DEPENDS = "e2fsprogs-libs"
+DEPENDS = "util-linux-ng"
 
 SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-3.1.1.tar.gz;name=xfsprogstargz"
 SRC_URI[xfsprogstargz.md5sum] = "c2308b46ee707597ac50aae418d321b8"

diff --git a/recipes/xorg-lib/libsm_1.1.0.bb b/recipes/xorg-lib/libsm_1.1.0.bb
index 7a30898..9ac020a 100644 (file)
--- a/recipes/xorg-lib/libsm_1.1.0.bb
+++ b/recipes/xorg-lib/libsm_1.1.0.bb
@@ -1,8 +1,8 @@
 require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Session management library"
-DEPENDS += "libice xproto xtrans e2fsprogs-libs"
 PR = "r0"
+DEPENDS += "libice xproto xtrans util-linux-ng"
 PE = "1"
 
 XORG_PN = "libSM"

diff --git a/recipes/xorg-lib/libsm_1.1.1.bb b/recipes/xorg-lib/libsm_1.1.1.bb
index 7a30898..9ac020a 100644 (file)
--- a/recipes/xorg-lib/libsm_1.1.1.bb
+++ b/recipes/xorg-lib/libsm_1.1.1.bb
@@ -1,8 +1,8 @@
 require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Session management library"
-DEPENDS += "libice xproto xtrans e2fsprogs-libs"
 PR = "r0"
+DEPENDS += "libice xproto xtrans util-linux-ng"
 PE = "1"
 
 XORG_PN = "libSM"