From e010c6c9b6e65ac4bd4a86650dff142d4dc0d1e5 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 18 May 2009 12:37:10 +0100
Subject: e2fsprogs: 1.41.2 -> 1.42.5

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch  | 126 --------------------
 .../e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch  | 127 +++++++++++++++++++++
 meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb |  35 ------
 meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb |  35 ++++++
 meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb        |  62 ----------
 meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb        |  62 ++++++++++
 6 files changed, 224 insertions(+), 223 deletions(-)
 delete mode 100644 meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch
 create mode 100644 meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch
 delete mode 100644 meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
 create mode 100644 meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb
 delete mode 100644 meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb
 create mode 100644 meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb

(limited to 'meta/packages/e2fsprogs')

diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch
deleted file mode 100644
index 0de3cdbe1..000000000
--- a/meta/packages/e2fsprogs/e2fsprogs-1.41.2/no-hardlinks.patch
+++ /dev/null
@@ -1,126 +0,0 @@
----
- e2fsck/Makefile.in   |   24 ++++++++----------------
- lib/uuid/Makefile.in |    4 ++--
- misc/Makefile.in     |   30 ++++++++++--------------------
- 3 files changed, 20 insertions(+), 38 deletions(-)
-
-Index: e2fsprogs-1.41.2/misc/Makefile.in
-===================================================================
---- e2fsprogs-1.41.2.orig/misc/Makefile.in	2008-09-07 07:30:18.000000000 +0200
-+++ e2fsprogs-1.41.2/misc/Makefile.in	2008-10-08 10:54:50.000000000 +0200
-@@ -283,23 +283,17 @@ install: all $(SMANPAGES) $(UMANPAGES) i
- 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
- 	done
- 	@echo "	LINK $(root_sbindir)/mkfs.ext2"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
--		$(DESTDIR)$(root_sbindir)/mkfs.ext2
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext2)
- 	@echo "	LINK $(root_sbindir)/mkfs.ext3"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
--		$(DESTDIR)$(root_sbindir)/mkfs.ext3
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext3)
- 	@echo "	LINK $(root_sbindir)/mkfs.ext4"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
--		$(DESTDIR)$(root_sbindir)/mkfs.ext4
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext4)
- 	@echo "	LINK $(root_sbindir)/mkfs.ext4dev"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
--		$(DESTDIR)$(root_sbindir)/mkfs.ext4dev
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext4dev)
- 	@echo "	LINK $(root_sbindir)/e2label"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
--		$(DESTDIR)$(root_sbindir)/e2label
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs e2label)
- 	@echo "	LINK $(root_sbindir)/findfs"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
--		$(DESTDIR)$(root_sbindir)/findfs
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs findfs)
- 	@for i in $(UPROGS); do \
- 		echo "	INSTALL $(bindir)/$$i"; \
- 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
-@@ -318,17 +312,13 @@ install: all $(SMANPAGES) $(UMANPAGES) i
- 	@$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
- 		$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
- 	@echo "	LINK mkfs.ext2.8"
--	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
--		$(DESTDIR)$(man8dir)/mkfs.ext2.8
-+	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext2.8)
- 	@echo "	LINK mkfs.ext3.8"
--	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
--		$(DESTDIR)$(man8dir)/mkfs.ext3.8
-+	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8)
- 	@echo "	LINK mkfs.ext4.8"
--	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
--		$(DESTDIR)$(man8dir)/mkfs.ext4.8
-+	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext4.8)
- 	@echo "	LINK mkfs.ext4dev.8"
--	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
--		$(DESTDIR)$(man8dir)/mkfs.ext4dev.8
-+	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext4dev.8)
- 	@for i in $(UMANPAGES); do \
- 		for j in $(COMPRESS_EXT); do \
- 			$(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \
-Index: e2fsprogs-1.41.2/lib/uuid/Makefile.in
-===================================================================
---- e2fsprogs-1.41.2.orig/lib/uuid/Makefile.in	2008-02-19 05:33:10.000000000 +0100
-+++ e2fsprogs-1.41.2/lib/uuid/Makefile.in	2008-10-08 10:49:14.000000000 +0200
-@@ -146,9 +146,9 @@ install:: all installdirs 
- 	@$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
- 		$(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
- 	@echo "	LINK $(man3dir)/uuid_generate_random.3"
--	@$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
-+	@(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_random.3)
- 	@echo "	LINK $(man3dir)/uuid_generate_time.3"
--	@$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
-+	@(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_time.3)
- 	@echo "	INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
- 	@$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
- 
-Index: e2fsprogs-1.41.2/e2fsck/Makefile.in
-===================================================================
---- e2fsprogs-1.41.2.orig/e2fsck/Makefile.in	2008-09-12 12:59:20.000000000 +0200
-+++ e2fsprogs-1.41.2/e2fsck/Makefile.in	2008-10-08 10:58:05.000000000 +0200
-@@ -195,17 +195,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
- 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- 	done
- 	@echo "	LINK $(root_sbindir)/fsck.ext2"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
--			$(DESTDIR)$(root_sbindir)/fsck.ext2
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext2)
- 	@echo "	LINK $(root_sbindir)/fsck.ext3"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
--			$(DESTDIR)$(root_sbindir)/fsck.ext3
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3)
- 	@echo "	LINK $(root_sbindir)/fsck.ext4"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
--			$(DESTDIR)$(root_sbindir)/fsck.ext4
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext4)
- 	@echo "	LINK $(root_sbindir)/fsck.ext4dev"
--	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
--			$(DESTDIR)$(root_sbindir)/fsck.ext4dev
-+	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext4dev)
- 	@for i in $(MANPAGES); do \
- 		for j in $(COMPRESS_EXT); do \
- 			$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
-@@ -221,17 +217,13 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
- 		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
- 	done
- 	@echo "	LINK $(man8dir)/fsck.ext2.8"
--	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
--		$(DESTDIR)$(man8dir)/fsck.ext2.8
-+	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext2.8)
- 	@echo "	LINK $(man8dir)/fsck.ext3.8"
--	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
--		$(DESTDIR)$(man8dir)/fsck.ext3.8
-+	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8)
- 	@echo "	LINK $(man8dir)/fsck.ext4.8"
--	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
--		$(DESTDIR)$(man8dir)/fsck.ext4.8
-+	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext4.8)
- 	@echo "	LINK $(man8dir)/fsck.ext4.8"
--	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
--		$(DESTDIR)$(man8dir)/fsck.ext4dev.8
-+	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext4dev.8)
- 
- install-strip: install
- 	@for i in $(PROGS); do \
diff --git a/meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch b/meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch
new file mode 100644
index 000000000..65bb498ea
--- /dev/null
+++ b/meta/packages/e2fsprogs/e2fsprogs-1.41.5/no-hardlinks.patch
@@ -0,0 +1,127 @@
+---
+ e2fsck/Makefile.in   |   24 ++++++++----------------
+ lib/uuid/Makefile.in |    4 ++--
+ misc/Makefile.in     |   30 ++++++++++--------------------
+ 3 files changed, 20 insertions(+), 38 deletions(-)
+
+Index: e2fsprogs-1.41.5/misc/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.5.orig/misc/Makefile.in	2009-05-18 00:54:07.000000000 +0100
++++ e2fsprogs-1.41.5/misc/Makefile.in	2009-05-18 00:56:12.000000000 +0100
+@@ -394,24 +394,18 @@
+ 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
+ 	done
+ 	@echo "	LINK $(root_sbindir)/mkfs.ext2"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+-		$(DESTDIR)$(root_sbindir)/mkfs.ext2
++	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) mke2fs mkfs.ext2)
+ 	@echo "	LINK $(root_sbindir)/mkfs.ext3"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+-		$(DESTDIR)$(root_sbindir)/mkfs.ext3
++	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) mke2fs mkfs.ext3)
+ 	@echo "	LINK $(root_sbindir)/mkfs.ext4"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+-		$(DESTDIR)$(root_sbindir)/mkfs.ext4
++	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) mke2fs mkfs.ext4)
+ 	@echo "	LINK $(root_sbindir)/mkfs.ext4dev"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+-		$(DESTDIR)$(root_sbindir)/mkfs.ext4dev
++	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) mke2fs mkfs.ext4dev)
+ 	@echo "	LINK $(root_sbindir)/e2label"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+-		$(DESTDIR)$(root_sbindir)/e2label
++	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) tune2fs e2label)
+ 	@if test -n "$(FINDFS_LINK)"; then \
+ 		echo "  LINK $(root_sbindir)/findfs"; \
+-		$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+-			$(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \
++		(cd $(DESTDIR)$(root_sbindir) && $(LN_S) tune2fs $(FINDFS_LINK)); \
+ 	fi
+ 	@for i in $(UPROGS); do \
+ 		echo "	INSTALL $(bindir)/$$i"; \
+@@ -431,17 +425,13 @@
+ 	@$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
+ 		$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
+ 	@echo "	LINK mkfs.ext2.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+-		$(DESTDIR)$(man8dir)/mkfs.ext2.8
++	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext2.8)
+ 	@echo "	LINK mkfs.ext3.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+-		$(DESTDIR)$(man8dir)/mkfs.ext3.8
++	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8)
+ 	@echo "	LINK mkfs.ext4.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+-		$(DESTDIR)$(man8dir)/mkfs.ext4.8
++	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext4.8)
+ 	@echo "	LINK mkfs.ext4dev.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+-		$(DESTDIR)$(man8dir)/mkfs.ext4dev.8
++	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext4dev.8)
+ 	@for i in $(UMANPAGES); do \
+ 		for j in $(COMPRESS_EXT); do \
+ 			$(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \
+Index: e2fsprogs-1.41.5/lib/uuid/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.5.orig/lib/uuid/Makefile.in	2009-05-18 00:54:07.000000000 +0100
++++ e2fsprogs-1.41.5/lib/uuid/Makefile.in	2009-05-18 00:54:07.000000000 +0100
+@@ -146,9 +146,9 @@
+ 	@$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
+ 		$(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
+ 	@echo "	LINK $(man3dir)/uuid_generate_random.3"
+-	@$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
++	@(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_random.3)
+ 	@echo "	LINK $(man3dir)/uuid_generate_time.3"
+-	@$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
++	@(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_time.3)
+ 	@echo "	INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
+ 	@$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
+ 
+Index: e2fsprogs-1.41.5/e2fsck/Makefile.in
+===================================================================
+--- e2fsprogs-1.41.5.orig/e2fsck/Makefile.in	2009-05-18 00:54:07.000000000 +0100
++++ e2fsprogs-1.41.5/e2fsck/Makefile.in	2009-05-18 00:54:07.000000000 +0100
+@@ -195,17 +195,13 @@
+ 		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
+ 	done
+ 	@echo "	LINK $(root_sbindir)/fsck.ext2"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+-			$(DESTDIR)$(root_sbindir)/fsck.ext2
++	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext2)
+ 	@echo "	LINK $(root_sbindir)/fsck.ext3"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+-			$(DESTDIR)$(root_sbindir)/fsck.ext3
++	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3)
+ 	@echo "	LINK $(root_sbindir)/fsck.ext4"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+-			$(DESTDIR)$(root_sbindir)/fsck.ext4
++	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext4)
+ 	@echo "	LINK $(root_sbindir)/fsck.ext4dev"
+-	@$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+-			$(DESTDIR)$(root_sbindir)/fsck.ext4dev
++	@(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext4dev)
+ 	@for i in $(MANPAGES); do \
+ 		for j in $(COMPRESS_EXT); do \
+ 			$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
+@@ -221,17 +217,13 @@
+ 		$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
+ 	done
+ 	@echo "	LINK $(man8dir)/fsck.ext2.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+-		$(DESTDIR)$(man8dir)/fsck.ext2.8
++	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext2.8)
+ 	@echo "	LINK $(man8dir)/fsck.ext3.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+-		$(DESTDIR)$(man8dir)/fsck.ext3.8
++	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8)
+ 	@echo "	LINK $(man8dir)/fsck.ext4.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+-		$(DESTDIR)$(man8dir)/fsck.ext4.8
++	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext4.8)
+ 	@echo "	LINK $(man8dir)/fsck.ext4.8"
+-	@$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+-		$(DESTDIR)$(man8dir)/fsck.ext4dev.8
++	@(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext4dev.8)
+ 
+ install-strip: install
+ 	@for i in $(PROGS); do \
diff --git a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
deleted file mode 100644
index c3654206f..000000000
--- a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require e2fsprogs_${PV}.bb
-inherit native
-
-DEPENDS = "gettext-native"
-PR = "r2"
-
-do_stage () {
-	oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/
-	oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
-	oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
-	oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/
-	install -d ${STAGING_BINDIR_NATIVE}/
-	for b in ${e2miscbins}; do
-		install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b"
-	done
-	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
-	install -d ${STAGING_INCDIR}/blkid
-	for h in blkid.h blkid_types.h; do
-		install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
-	done
-	install -d ${STAGING_INCDIR}/uuid
-        install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h"
-        
-	install -d ${STAGING_LIBDIR}/pkgconfig
-	for pc in lib/*/*.pc; do
-		install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h"
-	done
-}
diff --git a/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb
new file mode 100644
index 000000000..c3654206f
--- /dev/null
+++ b/meta/packages/e2fsprogs/e2fsprogs-native_1.41.5.bb
@@ -0,0 +1,35 @@
+require e2fsprogs_${PV}.bb
+inherit native
+
+DEPENDS = "gettext-native"
+PR = "r2"
+
+do_stage () {
+	oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/
+	oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
+	oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
+	oe_libinstall -a -C lib libuuid ${STAGING_LIBDIR}/
+	install -d ${STAGING_BINDIR_NATIVE}/
+	for b in ${e2miscbins}; do
+		install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b"
+	done
+	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
+	install -d ${STAGING_INCDIR}/blkid
+	for h in blkid.h blkid_types.h; do
+		install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
+	done
+	install -d ${STAGING_INCDIR}/uuid
+        install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h"
+        
+	install -d ${STAGING_LIBDIR}/pkgconfig
+	for pc in lib/*/*.pc; do
+		install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h"
+	done
+}
diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb
deleted file mode 100644
index 77da0d579..000000000
--- a/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-require e2fsprogs.inc
-
-PR = "r11"
-
-SRC_URI += "file://no-hardlinks.patch;patch=1"
-
-PARALLEL_MAKE = ""
-
-EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs"
-EXTRA_OECONF_darwin = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs"
-EXTRA_OECONF_darwin8 = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs"
-
-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 ext3_extents.h"
-e2pheaders = "e2p.h"
-
-do_stage () {
-	oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/
-	oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
-	oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
-	oe_libinstall -a -C lib libuuid ${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
-	install -d ${STAGING_INCDIR}/blkid
-	for h in blkid.h blkid_types.h; do
-		install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
-	done
-	install -d ${STAGING_INCDIR}/uuid
-        install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h"
-        
-	install -d ${STAGING_LIBDIR}/pkgconfig
-	for pc in lib/*/*.pc; do
-		install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h"
-	done
-}
-
-# blkid used to be part of e2fsprogs but is useful outside, add it
-# as an RDEPENDS so that anything relying on it being in e2fsprogs
-# still works
-RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks"
-
-PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks libuuid"
-FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
-FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
-FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
-FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
-FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
-FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
-FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
-FILES_libuuid = "${libdir}/libuuid.so.*"
diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb
new file mode 100644
index 000000000..77da0d579
--- /dev/null
+++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.5.bb
@@ -0,0 +1,62 @@
+require e2fsprogs.inc
+
+PR = "r11"
+
+SRC_URI += "file://no-hardlinks.patch;patch=1"
+
+PARALLEL_MAKE = ""
+
+EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs"
+EXTRA_OECONF_darwin = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs"
+EXTRA_OECONF_darwin8 = "--enable-dynamic-e2fsck --sbindir=${base_sbindir} --enable-bsd-shlibs"
+
+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 ext3_extents.h"
+e2pheaders = "e2p.h"
+
+do_stage () {
+	oe_libinstall -a -C lib libblkid ${STAGING_LIBDIR}/
+	oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
+	oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
+	oe_libinstall -a -C lib libuuid ${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
+	install -d ${STAGING_INCDIR}/blkid
+	for h in blkid.h blkid_types.h; do
+		install -m 0644 lib/blkid/$h ${STAGING_INCDIR}/blkid/ || die "failed to install $h"
+	done
+	install -d ${STAGING_INCDIR}/uuid
+        install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ || die "failed to install $h"
+        
+	install -d ${STAGING_LIBDIR}/pkgconfig
+	for pc in lib/*/*.pc; do
+		install -m 0644 $pc ${STAGING_LIBDIR}/pkgconfig/ || die "failed to install $h"
+	done
+}
+
+# blkid used to be part of e2fsprogs but is useful outside, add it
+# as an RDEPENDS so that anything relying on it being in e2fsprogs
+# still works
+RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks"
+
+PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks libuuid"
+FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
+FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
+FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
+FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
+FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
+FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
+FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
+FILES_libuuid = "${libdir}/libuuid.so.*"
-- 
cgit v1.2.3