e2fsprogs: fix for newer gettext and add 1.41.2

* add the same patch as in e2fsprogs-libs
* add version 1.41.2, but let 1.38 be the default
* bump PR on 1.38

4 files changed, 119 insertions, 2 deletions

diff --git a/packages/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch b/packages/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
new file mode 100644
index 0000000000..a838dceff9
--- /dev/null
+++ b/packages/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
@@ -0,0 +1,13 @@
+Index: e2fsprogs-1.38/MCONFIG.in
+===================================================================
+--- e2fsprogs-1.38.orig/MCONFIG.in	2008-10-12 22:09:11.946856497 +0200
++++ e2fsprogs-1.38/MCONFIG.in	2008-10-12 22:09:30.540187422 +0200
+@@ -59,7 +59,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
++MKINSTALLDIRS = @MKDIR_P@
+ 
+ #
+ # Library definitions
diff --git a/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb b/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
new file mode 100644
index 0000000000..e111ac9b61
--- /dev/null
+++ b/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
@@ -0,0 +1,15 @@
+SECTION = "base"
+require e2fsprogs.inc
+inherit native
+
+PR = "r1"
+
+EXTRA_OECONF = ""
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+PACKAGES = ""
+DEPENDS = ""
+
+do_stage () {
+        oe_runmake install
+}
diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index 5ffc4598ad..f3d952afee 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,8 +1,10 @@
 require e2fsprogs.inc
 
-PR = "r13"
+PR = "r14"
 
-SRC_URI += "file://no-hardlinks.patch;patch=1"
+SRC_URI += "file://no-hardlinks.patch;patch=1 \
+	    file://mkinstalldirs.patch;patch=1 \
+	   "
 
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
diff --git a/packages/e2fsprogs/e2fsprogs_1.41.2.bb b/packages/e2fsprogs/e2fsprogs_1.41.2.bb
new file mode 100644
index 0000000000..1b139d2a9c
--- /dev/null
+++ b/packages/e2fsprogs/e2fsprogs_1.41.2.bb
@@ -0,0 +1,87 @@
+require e2fsprogs.inc
+
+PR = "r0"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "file://no-hardlinks.patch;patch=1"
+
+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"
+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}/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-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}
+}
+