From 3095f103f2d742eaa1e34828d3344129a6b6c6af Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 28 Jul 2005 22:12:15 +0000
Subject: remove nonworking e2fsprogs 1.36, add e2fsprogs 1.38

---
 .../e2fsprogs/e2fsprogs-native_1.36-WIP-0408.bb    | 19 ---------
 packages/e2fsprogs/e2fsprogs-native_1.38.bb        | 20 +++++++++
 packages/e2fsprogs/e2fsprogs_1.36-WIP-0408.bb      | 47 ----------------------
 packages/e2fsprogs/e2fsprogs_1.38.bb               | 41 +++++++++++++++++++
 4 files changed, 61 insertions(+), 66 deletions(-)
 delete mode 100644 packages/e2fsprogs/e2fsprogs-native_1.36-WIP-0408.bb
 create mode 100644 packages/e2fsprogs/e2fsprogs-native_1.38.bb
 delete mode 100644 packages/e2fsprogs/e2fsprogs_1.36-WIP-0408.bb
 create mode 100644 packages/e2fsprogs/e2fsprogs_1.38.bb

diff --git a/packages/e2fsprogs/e2fsprogs-native_1.36-WIP-0408.bb b/packages/e2fsprogs/e2fsprogs-native_1.36-WIP-0408.bb
deleted file mode 100644
index 44777675f3..0000000000
--- a/packages/e2fsprogs/e2fsprogs-native_1.36-WIP-0408.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SECTION = "base"
-include e2fsprogs_${PV}.bb
-inherit native
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-PACKAGES = ""
-
-do_stage () {
-	oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
-	oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/e2p
-	for h in ${e2pheaders}; do
-		install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h"
-	done
-	install -d ${STAGING_INCDIR}/ext2fs
-	for h in ${ext2fsheaders}; do
-		install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
-	done
-}
diff --git a/packages/e2fsprogs/e2fsprogs-native_1.38.bb b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
new file mode 100644
index 0000000000..a6dd30fb35
--- /dev/null
+++ b/packages/e2fsprogs/e2fsprogs-native_1.38.bb
@@ -0,0 +1,20 @@
+SECTION = "base"
+include e2fsprogs_${PV}.bb
+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}/
+	oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/e2p
+	for h in ${e2pheaders}; do
+		install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h"
+	done
+	install -d ${STAGING_INCDIR}/ext2fs
+	for h in ${ext2fsheaders}; do
+		install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
+	done
+}
diff --git a/packages/e2fsprogs/e2fsprogs_1.36-WIP-0408.bb b/packages/e2fsprogs/e2fsprogs_1.36-WIP-0408.bb
deleted file mode 100644
index 3cd522aa9a..0000000000
--- a/packages/e2fsprogs/e2fsprogs_1.36-WIP-0408.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "EXT2 Filesystem Utilities"
-LICENSE = "GPL"
-SECTION = "base"
-PRIORITY = "optional"
-PR = "r3"
-
-DEPENDS = ""
-
-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
-
-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 )
-}
-
-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}/
-	install -d ${STAGING_INCDIR}/e2p
-	for h in ${e2pheaders}; do
-		install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h"
-	done
-	install -d ${STAGING_INCDIR}/ext2fs
-	for h in ${ext2fsheaders}; do
-		install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
-	done
-}
diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
new file mode 100644
index 0000000000..c08cfc2c62
--- /dev/null
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "EXT2 Filesystem Utilities"
+HOMEPAGE = "http://e2fsprogs.sourceforge.net"
+LICENSE = "GPL"
+SECTION = "base"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
+S = "${WORKDIR}/e2fsprogs-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-dynamic-e2fsck"
+
+do_compile_prepend () {
+	find ./ -print|xargs chmod u=rwX
+	( cd util; ${BUILD_CC} subst.c -o subst )
+}
+
+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}/
+	install -d ${STAGING_INCDIR}/e2p
+	for h in ${e2pheaders}; do
+		install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h"
+	done
+	install -d ${STAGING_INCDIR}/ext2fs
+	for h in ${ext2fsheaders}; do
+		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"
-- 
cgit v1.2.3