e2fsprogs: move libblkid/libuuid/fsck to util-linux-ng + new staging/native

Dropped libblkid, libuuid and fsck binary and use those which are in
util-linux-ng.

There are more and more applications/libraries which require libblkid
2.xx - for example recent HAL.

Unified recipes, moved to new staging, used BBCLASSEXTEND for native.

Signed-off-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>

9 files changed, 123 insertions, 503 deletions

diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
deleted file mode 100644
index cef0aa41e8..0000000000
--- a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SECTION = "base"
-require e2fsprogs.inc
-inherit native
-
-PR = "r3"
-
-SRC_URI += "file://no-hardlinks.patch;patch=1 \
-	    file://mkinstalldirs.patch;patch=1 \
-            file://file-open-mode.patch;patch=1 \
-            "
-
-EXTRA_OECONF = ""
-
-PACKAGES = ""
-DEPENDS = ""
-
-do_stage () {
-        oe_runmake install
-        install ${S}/lib/et/compile_et ${STAGING_BINDIR_NATIVE}
-}
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
deleted file mode 100644
index 4ff399b10f..0000000000
--- a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SECTION = "base"
-require e2fsprogs.inc
-inherit native
-
-PR = "r2"
-DEFAULT_PREFERENCE = "-1"
-
-EXTRA_OECONF = ""
-
-PACKAGES = ""
-DEPENDS = ""
-
-do_stage () {
-	oe_runmake install
-	install -d ${STAGING_BINDIR_NATIVE}/
-	for b in ${e2miscbins}; do
-	install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b"
-	done
-}
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
deleted file mode 100644
index 295136328e..0000000000
--- a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "base"
-require e2fsprogs.inc
-inherit native
-
-SRC_URI += "file://mkinstalldirs.patch;patch=1"
-
-EXTRA_OECONF = ""
-
-PACKAGES = ""
-DEPENDS = ""
-
-do_stage () {
-	autotools_stage_all
-	install -d ${STAGING_BINDIR_NATIVE}/
-	for b in ${e2miscbins}; do
-		install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b"
-	done
-}
diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.9.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.9.bb
deleted file mode 100644
index c4a26e2054..0000000000
--- a/recipes/e2fsprogs/e2fsprogs-native_1.41.9.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SECTION = "base"
-require e2fsprogs.inc
-inherit native
-
-EXTRA_OECONF = ""
-
-PACKAGES = ""
-DEPENDS = ""
-
-do_configure() {
-        oe_runconf
-}
-
-do_stage () {
-	autotools_stage_all
-	install -d ${STAGING_BINDIR_NATIVE}/
-	for b in ${e2miscbins}; do
-		install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b"
-	done
-}
diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc
index 6821d71004..2ff3e10896 100644
--- a/recipes/e2fsprogs/e2fsprogs.inc
+++ b/recipes/e2fsprogs/e2fsprogs.inc
@@ -2,21 +2,137 @@ DESCRIPTION = "EXT2 Filesystem Utilities"
 HOMEPAGE = "http://e2fsprogs.sf.net"
 LICENSE = "GPL"
 SECTION = "base"
+DEPENDS = "gettext-native util-linux-ng"
+DEPENDS_virtclass-native = "gettext-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
 
 S = "${WORKDIR}/e2fsprogs-${PV}"
 
+INC_PR = "r21a"
+
 inherit autotools
 
 #if uclibc ntpl is merged into trunk we can enable tls for armv4 again
 EXTRA_OECONF = "${@['','--disable-tls'][bb.data.getVar('ARM_ABI', d, 1) == 'oabi' and \
 		bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 ]} \
-		--enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}"
+		--enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir} \
+		--disable-libuuid --disable-libblkid --disable-fsck"
 
 PARALLEL_MAKE = ""
 
-e2miscbins = "mke2fs badblocks tune2fs dumpe2fs blkid logsave e2image fsck \
+do_compile_prepend () {
+	find ./ -print|xargs chmod u=rwX
+	( cd util; ${BUILD_CC} subst.c -o subst )
+}
+
+e2miscbins = "mke2fs badblocks tune2fs dumpe2fs blkid logsave e2image \
               e2undo chattr lsattr uuidgen mklost+found filefrag uuidd e2initrd_helper"
 
+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_install_append () {
+	oe_libinstall -a -C lib libe2p    ${D}${libdir}/
+	oe_libinstall -a -C lib libext2fs ${D}${libdir}/
+
+	install -d ${D}${includedir}/e2p
+	for h in ${e2pheaders}; do
+		install -m 0644 lib/e2p/$h ${D}${includedir}/e2p/ || die "failed to install $h"
+	done
+
+	install -d ${D}${includedir}/ext2fs
+	for h in ${ext2fsheaders}; do
+		install -m 0644 lib/ext2fs/$h ${D}${includedir}/ext2fs/ || die "failed to install $h"
+	done
+
+	mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
+	rm ${D}${base_sbindir}/fsck.ext2
+	rm ${D}${base_sbindir}/fsck.ext3
+	rm ${D}${base_sbindir}/fsck.ext4*
+	mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN}
+	rm ${D}${base_sbindir}/mkfs.ext2
+	rm ${D}${base_sbindir}/mkfs.ext3
+	rm ${D}${base_sbindir}/mkfs.ext4*
+
+	cd ${D}/${base_sbindir}
+	ln -sf ./e2fsck.${PN} fsck.ext2.${PN}
+	ln -sf ./e2fsck.${PN} fsck.ext3.${PN}
+	ln -sf ./e2fsck.${PN} fsck.ext4.${PN}
+	ln -sf ./e2fsck.${PN} fsck.ext4dev.${PN}
+	ln -sf ./mke2fs.${PN} mkfs.ext2.${PN}
+	ln -sf ./mke2fs.${PN} mkfs.ext3.${PN}
+	ln -sf ./mke2fs.${PN} mkfs.ext4.${PN}
+	ln -sf ./mke2fs.${PN} mkfs.ext4dev.${PN}
+
+	ln -sf ./tune2fs findfs
+	ln -sf ./tune2fs e2label
+
+	mv ${D}${bindir}/chattr ${D}${bindir}/chattr.${PN}
+}
+
+pkg_postinst_e2fsprogs () {
+	update-alternatives --install ${base_bindir}/chattr chattr chattr.${PN} 100
+}
+
+pkg_prerm_e2fsprogs () {
+	update-alternatives --remove chattr chattr.${PN}
+}
+
+
+pkg_postinst_e2fsprogs-blkid () {
+    update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100
+}
+
+pkg_prerm_e2fsprogs-blkid () {
+    update-alternatives --remove blkid blkid.${PN}
+}
+
+pkg_postinst_e2fsprogs-e2fsck () {
+	update-alternatives --install ${base_sbindir}/e2fsck e2fsck e2fsck.${PN} 100
+	update-alternatives --install ${base_sbindir}/fsck.ext2 fsck.ext2 fsck.ext2.${PN} 100
+	update-alternatives --install ${base_sbindir}/fsck.ext3 fsck.ext3 fsck.ext3.${PN} 100
+	update-alternatives --install ${base_sbindir}/fsck.ext4 fsck.ext4 fsck.ext4.${PN} 100
+	update-alternatives --install ${base_sbindir}/fsck.ext4dev fsck.ext4dev fsck.ext4dev.${PN} 100
+}
+
+pkg_prerm_e2fsprogs-e2fsck () {
+	update-alternatives --remove e2fsck e2fsck.${PN}
+	update-alternatives --remove fsck.ext2 fsck.ext2.${PN}
+	update-alternatives --remove fsck.ext3 fsck.ext3.${PN}
+	update-alternatives --remove fsck.ext4 fsck.ext4.${PN}
+	update-alternatives --remove fsck.ext4dev fsck.ext4dev.${PN}
+}
+
+pkg_postinst_e2fsprogs-mke2fs () {
+	update-alternatives --install ${base_sbindir}/mke2fs mke2fs mke2fs.${PN} 100
+	update-alternatives --install ${base_sbindir}/mkfs.ext2 mkfs.ext2 mkfs.ext2.${PN} 100
+	update-alternatives --install ${base_sbindir}/mkfs.ext3 mkfs.ext3 mkfs.ext3.${PN} 100
+	update-alternatives --install ${base_sbindir}/mkfs.ext4 mkfs.ext4 mkfs.ext4.${PN} 100
+	update-alternatives --install ${base_sbindir}/mkfs.ext4dev mkfs.ext4dev mkfs.ext4dev.${PN} 100
+}
+
+pkg_prerm_e2fsprogs-mke2fs () {
+	update-alternatives --remove mke2fs mke2fs.${PN}
+	update-alternatives --remove mkfs.ext2 mkfs.ext2.${PN}
+	update-alternatives --remove mkfs.ext3 mkfs.ext3.${PN}
+	update-alternatives --remove mkfs.ext4 mkfs.ext4.${PN}
+	update-alternatives --remove mkfs.ext4dev mkfs.ext4dev.${PN}
+}
+
+# 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 = "util-linux-ng e2fsprogs-badblocks"
+
+FILES_${PN} += "${libdir}/e2initrd_helper"
+
+PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks"
+FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck.${PN} ${base_sbindir}/fsck.ext*.${PN}"
+FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.${PN} ${base_sbindir}/mkfs.ext*.${PN}"
+FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
+FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
 
+BBCLASSEXTEND = "native"
diff --git a/recipes/e2fsprogs/e2fsprogs_1.38.bb b/recipes/e2fsprogs/e2fsprogs_1.38.bb
index 8ec469a84a..12fee951ef 100644
--- a/recipes/e2fsprogs/e2fsprogs_1.38.bb
+++ b/recipes/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,6 +1,6 @@
 require e2fsprogs.inc
 
-PR = "r20"
+PR = "${INC_PR}"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1 \
 	    file://mkinstalldirs.patch;patch=1 \
@@ -8,93 +8,3 @@ SRC_URI += "file://no-hardlinks.patch;patch=1 \
            "
 
 TARGET_CC_ARCH += "${LDFLAGS}"
-
-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
-	autotools_stage_all
-}
-
-# 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"
-FILES_e2fsprogs-blkid = "${base_sbindir}/blkid.${PN}"
-FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
-FILES_e2fsprogs-fsck = "${base_sbindir}/fsck.${PN}"
-FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck.${PN} ${base_sbindir}/fsck.ext*.${PN}"
-FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.${PN} ${base_sbindir}/mkfs.ext*.${PN}"
-FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
-FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
-
-do_install_append () {
-	mv ${D}${base_sbindir}/fsck ${D}${base_sbindir}/fsck.${PN}
-	mv ${D}${base_sbindir}/blkid ${D}${base_sbindir}/blkid.${PN}
-	mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
-	mv ${D}${base_sbindir}/fsck.ext2 ${D}${base_sbindir}/fsck.ext2.${PN}
-	mv ${D}${base_sbindir}/fsck.ext3 ${D}${base_sbindir}/fsck.ext3.${PN}
-	mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN}
-	mv ${D}${base_sbindir}/mkfs.ext2 ${D}${base_sbindir}/mkfs.ext2.${PN}
-	mv ${D}${base_sbindir}/mkfs.ext3 ${D}${base_sbindir}/mkfs.ext3.${PN}
-}
-
-pkg_postinst_e2fsprogs-fsck () {
-	update-alternatives --install ${base_sbindir}/fsck fsck fsck.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-fsck () {
-	update-alternatives --remove fsck fsck.${PN}
-}
-
-pkg_postinst_e2fsprogs-blkid () {
-    update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-blkid () {
-    update-alternatives --remove blkid blkid.${PN}
-}
-
-pkg_postinst_e2fsprogs-e2fsck () {
-	update-alternatives --install ${base_sbindir}/e2fsck e2fsck e2fsck.${PN} 100
-	update-alternatives --install ${base_sbindir}/fsck.ext2 fsck.ext2 fsck.ext2.${PN} 100
-	update-alternatives --install ${base_sbindir}/fsck.ext3 fsck.ext3 fsck.ext3.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-e2fsck () {
-	update-alternatives --remove e2fsck e2fsck.${PN}
-	update-alternatives --remove fsck.ext2 fsck.ext2.${PN}
-	update-alternatives --remove fsck.ext3 fsck.ext3.${PN}
-}
-
-pkg_postinst_e2fsprogs-mke2fs () {
-	update-alternatives --install ${base_sbindir}/mke2fs mke2fs mke2fs.${PN} 100
-	update-alternatives --install ${base_sbindir}/mkfs.ext2 mkfs.ext2 mkfs.ext2.${PN} 100
-	update-alternatives --install ${base_sbindir}/mkfs.ext3 mkfs.ext3 mkfs.ext3.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-mke2fs () {
-	update-alternatives --remove mke2fs mke2fs.${PN}
-	update-alternatives --remove mkfs.ext2 mkfs.ext2.${PN}
-	update-alternatives --remove mkfs.ext3 mkfs.ext3.${PN}
-}
-
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
index c2b92323c4..e337dde42b 100644
--- a/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
+++ b/recipes/e2fsprogs/e2fsprogs_1.41.4.bb
@@ -1,96 +1,5 @@
 require e2fsprogs.inc
 
-SRC_URI += "file://mkinstalldirs.patch;patch=1"
-
-DEPENDS += "gettext-native"
-
-PR = "r3"
-
-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
-	autotools_stage_all
-}
-
-# 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"
-FILES_e2fsprogs-blkid = "${base_sbindir}/blkid.${PN}"
-FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
-FILES_e2fsprogs-fsck = "${base_sbindir}/fsck.${PN}"
-FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck.${PN} ${base_sbindir}/fsck.ext*.${PN}"
-FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.${PN} ${base_sbindir}/mkfs.ext*.${PN}"
-FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
-FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
-
-do_install_append () {
-	mv ${D}${base_sbindir}/fsck ${D}${base_sbindir}/fsck.${PN}
-	mv ${D}${base_sbindir}/blkid ${D}${base_sbindir}/blkid.${PN}
-	mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
-	mv ${D}${base_sbindir}/fsck.ext2 ${D}${base_sbindir}/fsck.ext2.${PN}
-	mv ${D}${base_sbindir}/fsck.ext3 ${D}${base_sbindir}/fsck.ext3.${PN}
-	mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN}
-	mv ${D}${base_sbindir}/mkfs.ext2 ${D}${base_sbindir}/mkfs.ext2.${PN}
-	mv ${D}${base_sbindir}/mkfs.ext3 ${D}${base_sbindir}/mkfs.ext3.${PN}
-}
+PR = "${INC_PR}"
 
-pkg_postinst_e2fsprogs-fsck () {
-	update-alternatives --install ${base_sbindir}/fsck fsck fsck.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-fsck () {
-	update-alternatives --remove fsck fsck.${PN}
-}
-
-pkg_postinst_e2fsprogs-blkid () {
-    update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-blkid () {
-    update-alternatives --remove blkid blkid.${PN}
-}
-
-pkg_postinst_e2fsprogs-e2fsck () {
-	update-alternatives --install ${base_sbindir}/e2fsck e2fsck e2fsck.${PN} 100
-	update-alternatives --install ${base_sbindir}/fsck.ext2 fsck.ext2 fsck.ext2.${PN} 100
-	update-alternatives --install ${base_sbindir}/fsck.ext3 fsck.ext3 fsck.ext3.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-e2fsck () {
-	update-alternatives --remove e2fsck e2fsck.${PN}
-	update-alternatives --remove fsck.ext2 fsck.ext2.${PN}
-	update-alternatives --remove fsck.ext3 fsck.ext3.${PN}
-}
-
-pkg_postinst_e2fsprogs-mke2fs () {
-	update-alternatives --install ${base_sbindir}/mke2fs mke2fs mke2fs.${PN} 100
-	update-alternatives --install ${base_sbindir}/mkfs.ext2 mkfs.ext2 mkfs.ext2.${PN} 100
-	update-alternatives --install ${base_sbindir}/mkfs.ext3 mkfs.ext3 mkfs.ext3.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-mke2fs () {
-	update-alternatives --remove mke2fs mke2fs.${PN}
-	update-alternatives --remove mkfs.ext2 mkfs.ext2.${PN}
-	update-alternatives --remove mkfs.ext3 mkfs.ext3.${PN}
-}
+SRC_URI += "file://mkinstalldirs.patch;patch=1"
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb
index 04b5d1daf5..e337dde42b 100644
--- a/recipes/e2fsprogs/e2fsprogs_1.41.5.bb
+++ b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb
@@ -1,125 +1,5 @@
 require e2fsprogs.inc
 
-PR = "r1"
+PR = "${INC_PR}"
 
 SRC_URI += "file://mkinstalldirs.patch;patch=1"
-
-DEPENDS += "gettext-native"
-
-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
-	autotools_stage_all
-}
-
-# 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"
-
-FILES_${PN} += "${libdir}/e2initrd_helper"
-
-PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
-FILES_e2fsprogs-blkid = "${base_sbindir}/blkid.${PN}"
-FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
-FILES_e2fsprogs-fsck = "${base_sbindir}/fsck.${PN}"
-FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck.${PN} ${base_sbindir}/fsck.ext*.${PN}"
-FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.${PN} ${base_sbindir}/mkfs.ext*.${PN}"
-FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
-FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
-
-do_install_append () {
-	mv ${D}${base_sbindir}/fsck ${D}${base_sbindir}/fsck.${PN}
-	mv ${D}${base_sbindir}/blkid ${D}${base_sbindir}/blkid.${PN}
-	mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
-	rm ${D}${base_sbindir}/fsck.ext2
-	rm ${D}${base_sbindir}/fsck.ext3
-	rm ${D}${base_sbindir}/fsck.ext4*
-	mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN}
-	rm ${D}${base_sbindir}/mkfs.ext2
-	rm ${D}${base_sbindir}/mkfs.ext3
-	rm ${D}${base_sbindir}/mkfs.ext4*
-
-	cd ${D}/${base_sbindir}
-	ln -sf ./e2fsck.${PN} fsck.ext2.${PN}
-	ln -sf ./e2fsck.${PN} fsck.ext3.${PN}
-	ln -sf ./e2fsck.${PN} fsck.ext4.${PN}
-	ln -sf ./e2fsck.${PN} fsck.ext4dev.${PN}
-	ln -sf ./mke2fs.${PN} mkfs.ext2.${PN}
-	ln -sf ./mke2fs.${PN} mkfs.ext3.${PN}
-	ln -sf ./mke2fs.${PN} mkfs.ext4.${PN}
-	ln -sf ./mke2fs.${PN} mkfs.ext4dev.${PN}
-
-	ln -sf ./tune2fs findfs
-	ln -sf ./tune2fs e2label
-}
-
-pkg_postinst_e2fsprogs () {
-	update-alternatives --install ${base_bindir}/chattr chattr chattr.${PN} 100
-}
-
-pkg_postinst_e2fsprogs-fsck () {
-	update-alternatives --install ${base_sbindir}/fsck fsck fsck.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-fsck () {
-	update-alternatives --remove fsck fsck.${PN}
-}
-
-pkg_postinst_e2fsprogs-blkid () {
-    update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-blkid () {
-    update-alternatives --remove blkid blkid.${PN}
-}
-
-pkg_postinst_e2fsprogs-e2fsck () {
-	update-alternatives --install ${base_sbindir}/e2fsck e2fsck e2fsck.${PN} 100
-	update-alternatives --install ${base_sbindir}/fsck.ext2 fsck.ext2 fsck.ext2.${PN} 100
-	update-alternatives --install ${base_sbindir}/fsck.ext3 fsck.ext3 fsck.ext3.${PN} 100
-	update-alternatives --install ${base_sbindir}/fsck.ext4 fsck.ext4 fsck.ext4.${PN} 100
-	update-alternatives --install ${base_sbindir}/fsck.ext4dev fsck.ext4dev fsck.ext4dev.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-e2fsck () {
-	update-alternatives --remove e2fsck e2fsck.${PN}
-	update-alternatives --remove fsck.ext2 fsck.ext2.${PN}
-	update-alternatives --remove fsck.ext3 fsck.ext3.${PN}
-	update-alternatives --remove fsck.ext4 fsck.ext4.${PN}
-	update-alternatives --remove fsck.ext4dev fsck.ext4dev.${PN}
-}
-
-pkg_postinst_e2fsprogs-mke2fs () {
-	update-alternatives --install ${base_sbindir}/mke2fs mke2fs mke2fs.${PN} 100
-	update-alternatives --install ${base_sbindir}/mkfs.ext2 mkfs.ext2 mkfs.ext2.${PN} 100
-	update-alternatives --install ${base_sbindir}/mkfs.ext3 mkfs.ext3 mkfs.ext3.${PN} 100
-	update-alternatives --install ${base_sbindir}/mkfs.ext4 mkfs.ext4 mkfs.ext4.${PN} 100
-	update-alternatives --install ${base_sbindir}/mkfs.ext4dev mkfs.ext4dev mkfs.ext4dev.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-mke2fs () {
-	update-alternatives --remove mke2fs mke2fs.${PN}
-	update-alternatives --remove mkfs.ext2 mkfs.ext2.${PN}
-	update-alternatives --remove mkfs.ext3 mkfs.ext3.${PN}
-	update-alternatives --remove mkfs.ext4 mkfs.ext4.${PN}
-	update-alternatives --remove mkfs.ext4dev mkfs.ext4dev.${PN}
-}
diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.9.bb b/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
index ada93bd9c1..7fbdee6571 100644
--- a/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
+++ b/recipes/e2fsprogs/e2fsprogs_1.41.9.bb
@@ -1,125 +1,7 @@
 require e2fsprogs.inc
 
-DEPENDS += "gettext-native"
+PR = "${INC_PR}"
 
 do_configure() {
         oe_runconf
 }
-
-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
-	autotools_stage_all
-}
-
-# 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"
-
-FILES_${PN} += "${libdir}/e2initrd_helper"
-
-PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
-FILES_e2fsprogs-blkid = "${base_sbindir}/blkid.${PN}"
-FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
-FILES_e2fsprogs-fsck = "${base_sbindir}/fsck.${PN}"
-FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck.${PN} ${base_sbindir}/fsck.ext*.${PN}"
-FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.${PN} ${base_sbindir}/mkfs.ext*.${PN}"
-FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
-FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
-
-do_install_append () {
-	mv ${D}${base_sbindir}/fsck ${D}${base_sbindir}/fsck.${PN}
-	mv ${D}${base_sbindir}/blkid ${D}${base_sbindir}/blkid.${PN}
-	mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN}
-	rm ${D}${base_sbindir}/fsck.ext2
-	rm ${D}${base_sbindir}/fsck.ext3
-	rm ${D}${base_sbindir}/fsck.ext4*
-	mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN}
-	rm ${D}${base_sbindir}/mkfs.ext2
-	rm ${D}${base_sbindir}/mkfs.ext3
-	rm ${D}${base_sbindir}/mkfs.ext4*
-
-	cd ${D}/${base_sbindir}
-	ln -sf ./e2fsck.${PN} fsck.ext2.${PN}
-	ln -sf ./e2fsck.${PN} fsck.ext3.${PN}
-	ln -sf ./e2fsck.${PN} fsck.ext4.${PN}
-	ln -sf ./e2fsck.${PN} fsck.ext4dev.${PN}
-	ln -sf ./mke2fs.${PN} mkfs.ext2.${PN}
-	ln -sf ./mke2fs.${PN} mkfs.ext3.${PN}
-	ln -sf ./mke2fs.${PN} mkfs.ext4.${PN}
-	ln -sf ./mke2fs.${PN} mkfs.ext4dev.${PN}
-
-	ln -sf ./tune2fs findfs
-	ln -sf ./tune2fs e2label
-}
-
-pkg_postinst_e2fsprogs () {
-	update-alternatives --install ${base_bindir}/chattr chattr chattr.${PN} 100
-}
-
-pkg_postinst_e2fsprogs-fsck () {
-	update-alternatives --install ${base_sbindir}/fsck fsck fsck.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-fsck () {
-	update-alternatives --remove fsck fsck.${PN}
-}
-
-pkg_postinst_e2fsprogs-blkid () {
-    update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-blkid () {
-    update-alternatives --remove blkid blkid.${PN}
-}
-
-pkg_postinst_e2fsprogs-e2fsck () {
-	update-alternatives --install ${base_sbindir}/e2fsck e2fsck e2fsck.${PN} 100
-	update-alternatives --install ${base_sbindir}/fsck.ext2 fsck.ext2 fsck.ext2.${PN} 100
-	update-alternatives --install ${base_sbindir}/fsck.ext3 fsck.ext3 fsck.ext3.${PN} 100
-	update-alternatives --install ${base_sbindir}/fsck.ext4 fsck.ext4 fsck.ext4.${PN} 100
-	update-alternatives --install ${base_sbindir}/fsck.ext4dev fsck.ext4dev fsck.ext4dev.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-e2fsck () {
-	update-alternatives --remove e2fsck e2fsck.${PN}
-	update-alternatives --remove fsck.ext2 fsck.ext2.${PN}
-	update-alternatives --remove fsck.ext3 fsck.ext3.${PN}
-	update-alternatives --remove fsck.ext4 fsck.ext4.${PN}
-	update-alternatives --remove fsck.ext4dev fsck.ext4dev.${PN}
-}
-
-pkg_postinst_e2fsprogs-mke2fs () {
-	update-alternatives --install ${base_sbindir}/mke2fs mke2fs mke2fs.${PN} 100
-	update-alternatives --install ${base_sbindir}/mkfs.ext2 mkfs.ext2 mkfs.ext2.${PN} 100
-	update-alternatives --install ${base_sbindir}/mkfs.ext3 mkfs.ext3 mkfs.ext3.${PN} 100
-	update-alternatives --install ${base_sbindir}/mkfs.ext4 mkfs.ext4 mkfs.ext4.${PN} 100
-	update-alternatives --install ${base_sbindir}/mkfs.ext4dev mkfs.ext4dev mkfs.ext4dev.${PN} 100
-}
-
-pkg_prerm_e2fsprogs-mke2fs () {
-	update-alternatives --remove mke2fs mke2fs.${PN}
-	update-alternatives --remove mkfs.ext2 mkfs.ext2.${PN}
-	update-alternatives --remove mkfs.ext3 mkfs.ext3.${PN}
-	update-alternatives --remove mkfs.ext4 mkfs.ext4.${PN}
-	update-alternatives --remove mkfs.ext4dev mkfs.ext4dev.${PN}
-}