remove nonworking e2fsprogs 1.36, add e2fsprogs 1.38

diff --git a/packages/e2fsprogs/e2fsprogs-native_1.36-WIP-0408.bb b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
similarity index 98%
rename from packages/e2fsprogs/e2fsprogs-native_1.36-WIP-0408.bb
rename to packages/e2fsprogs/e2fsprogs-native_1.38.bb
index 4477767..a6dd30f 100644 (file)
--- a/packages/e2fsprogs/e2fsprogs-native_1.36-WIP-0408.bb
+++ b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -4,6 +4,7 @@ inherit native
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 PACKAGES = ""
+DEPENDS = ""
 
 do_stage () {
        oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/

diff --git a/packages/e2fsprogs/e2fsprogs_1.36-WIP-0408.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
similarity index 82%
rename from packages/e2fsprogs/e2fsprogs_1.36-WIP-0408.bb
rename to packages/e2fsprogs/e2fsprogs_1.38.bb
index 3cd522a..c08cfc2 100644 (file)
--- a/packages/e2fsprogs/e2fsprogs_1.36-WIP-0408.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,29 +1,16 @@
 DESCRIPTION = "EXT2 Filesystem Utilities"
+HOMEPAGE = "http://e2fsprogs.sourceforge.net"
 LICENSE = "GPL"
 SECTION = "base"
-PRIORITY = "optional"
-PR = "r3"
+PR = "r0"
 
-DEPENDS = ""
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
+S = "${WORKDIR}/e2fsprogs-${PV}"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
-          file://ln.patch;patch=1 \
-          file://configure.patch;patch=1 \
-          file://m4.patch;patch=1 \
-          file://ldflags.patch;patch=1"
-S = "${WORKDIR}/e2fsprogs-1.35"
-
-inherit autotools gettext
+inherit autotools
 
 EXTRA_OECONF = "--enable-dynamic-e2fsck"
 
-sbindir = "/sbin"
-
-PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
-FILES_e2fsprogs-fsck = "${sbindir}/fsck"
-FILES_e2fsprogs-e2fsck = "${sbindir}/e2fsck ${sbindir}/fsck.ext2 ${sbindir}/fsck.ext3"
-FILES_e2fsprogs-mke2fs = "${sbindir}/mke2fs ${sbindir}/mkfs.ext2 ${sbindir}/mkfs.ext3"
-
 do_compile_prepend () {
        find ./ -print|xargs chmod u=rwX
        ( cd util; ${BUILD_CC} subst.c -o subst )
@@ -33,6 +20,7 @@ ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \
                 ext2_types.h ext2_fs.h ext2_io.h \
                 ext2fs.h"
 e2pheaders = "e2p.h"
+
 do_stage () {
        oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
        oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
@@ -45,3 +33,9 @@ do_stage () {
                install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
        done
 }
+
+sbindir = "/sbin"
+PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck "
+FILES_e2fsprogs-fsck = "${sbindir}/fsck"
+FILES_e2fsprogs-e2fsck = "${sbindir}/e2fsck ${sbindir}/fsck.ext2 ${sbindir}/fsck.ext3"
+FILES_e2fsprogs-mke2fs = "${sbindir}/mke2fs ${sbindir}/mkfs.ext2 ${sbindir}/mkfs.ext3"