summaryrefslogtreecommitdiff
path: root/package/e2fsprogs
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-08-24 21:43:54 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-08-24 21:43:54 +0200
commite4dbe84c912c159c26e3d2aae013b562bef2aacb (patch)
treef66b5ef97815681a48d812d85990a45c76a6fe7b /package/e2fsprogs
parent23e555f88fff92f46957653b095a430ace5526f6 (diff)
parente74eccf3fa0585abfbe52154646812d20f2560a2 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/e2fsprogs')
-rw-r--r--package/e2fsprogs/Config.in10
-rw-r--r--package/e2fsprogs/Makefile15
-rw-r--r--package/e2fsprogs/patches/patch-misc_Makefile_in12
3 files changed, 20 insertions, 17 deletions
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 0dff689d1..011b3b257 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -1,9 +1,10 @@
config ADK_PACKAGE_E2FSPROGS
- prompt "e2fsprogs......................... Ext2/3 filesystem utilities"
+ prompt "e2fsprogs......................... Ext2/3/4 filesystem utilities"
tristate
default n
select ADK_PACKAGE_LIBUUID
select ADK_PACKAGE_LIBCOM_ERR
+ select ADK_PACKAGE_LIBBLKID
help
This package contains essential ext2 filesystem utilities which consists of
e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2
@@ -18,6 +19,13 @@ config ADK_PACKAGE_LIBUUID
default n
help
+config ADK_PACKAGE_LIBBLKID
+ prompt "libblkid........................ BlockID library"
+ depends on ADK_PACKAGE_E2FSPROGS
+ tristate
+ default n
+ help
+
config ADK_PACKAGE_LIBCOM_ERR
prompt "libcom_err...................... Common error library"
depends on ADK_PACKAGE_E2FSPROGS
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index fad66f179..c6d924b84 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= e2fsprogs
-PKG_VERSION:= 1.41.5
+PKG_VERSION:= 1.41.9
PKG_RELEASE:= 1
-PKG_MD5SUM:= e218df6c84fc17c1126d31de9472a76c
+PKG_MD5SUM:= 52f60a9e19a02f142f5546f1b5681927
PKG_DESCR:= Ext2/3/4 filesystem utilities
PKG_SECTION:= admin
PKG_URL:= http://e2fsprogs.sourceforge.net
@@ -16,19 +16,22 @@ PKG_DESCR_1:= UUID library
PKG_SECTION_1:= libs
PKG_DESCR_2:= Common error library
PKG_SECTION_2:= libs
+PKG_DESCR_3:= Libblkid
+PKG_SECTION_3:= libs
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION_1}))
$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION_3}))
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-elf-shlibs \
--disable-tls \
--enable-dynamic-e2fsck
BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+INSTALL_STYLE= auto
INSTALL_TARGET+= install-libs
pre-build:
@@ -44,8 +47,12 @@ post-install:
${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin/
${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_E2FSPROGS}/usr/sbin/
${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_E2FSPROGS}/usr/sbin/
- ${CP} ${WRKINST}/usr/lib/lib{blkid,e2p,ext2fs}.so.* \
+ ${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \
${IDIR_E2FSPROGS}/usr/lib/
+ # subpackage libblkid
+ ${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/libblkid.so.* \
+ ${IDIR_LIBBLKID}/usr/lib/
# subpackage libcom_err
${INSTALL_DIR} ${IDIR_LIBCOM_ERR}/usr/lib
${CP} ${WRKINST}/usr/lib/libcom_err.so.* \
diff --git a/package/e2fsprogs/patches/patch-misc_Makefile_in b/package/e2fsprogs/patches/patch-misc_Makefile_in
deleted file mode 100644
index f79bd78d7..000000000
--- a/package/e2fsprogs/patches/patch-misc_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- e2fsprogs-1.41.3.orig/misc/Makefile.in 2008-10-07 16:22:39.000000000 +0200
-+++ e2fsprogs-1.41.3/misc/Makefile.in 2009-01-13 14:16:03.661864854 +0100
-@@ -113,7 +113,7 @@ tune2fs.static: $(TUNE2FS_OBJS) $(STATIC
- blkid: $(BLKID_OBJS) $(DEPLIBBLKID) $(LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \
-- $(LIBEXT2FS)
-+ $(LIBEXT2FS) $(LIBCOM_ERR)
-
- e2image: $(E2IMAGE_OBJS) $(DEPLIBS)
- @echo " LD $@"