diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
commit | 46b2bb3001ce838ba2483a08418587d8a027f3a9 (patch) | |
tree | b2b618839b5afcc859fcb90556e6f199d9a9a10c /package/e2fsprogs | |
parent | 88d3e6d6c572143bd95a589a44e30bfefd616b88 (diff) | |
parent | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/e2fsprogs')
-rw-r--r-- | package/e2fsprogs/Makefile | 20 | ||||
-rw-r--r-- | package/e2fsprogs/patches/patch-debugfs_dump_c.orig | 10 | ||||
-rw-r--r-- | package/e2fsprogs/patches/patch-e2fsck_Makefile_in | 20 | ||||
-rw-r--r-- | package/e2fsprogs/patches/patch-e2fsprogs_spec | 11 | ||||
-rw-r--r-- | package/e2fsprogs/patches/patch-misc_e2undo_c | 11 |
5 files changed, 48 insertions, 24 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 1eb65d222..7b22a922d 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs PKG_VERSION:= 1.41.14 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 05f70470aea2ef7efbb0845b2b116720 PKG_DESCR:= Ext2/3/4 filesystem utilities PKG_SECTION:= fs @@ -15,7 +15,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} PKG_CFLINE_E2FSPROGS:= default y if ADK_TARGET_ROOTFS_CF -PKG_SUBPKGS:= E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID +PKG_SUBPKGS:= E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC PKGSD_LIBUUID:= UUID library PKGSC_LIBUUID:= libs PKGSD_LIBCOM_ERR:= Common error library @@ -24,6 +24,8 @@ PKGSD_LIBSS:= Subsystem command parsing library PKGSC_LIBSS:= libs PKGSD_LIBBLKID:= Libblkid PKGSC_LIBBLKID:= libs +PKGSD_E2FSCK_STATIC:= Static build of e2fsck +PKGSC_E2FSCK_STATIC:= fs include ${TOPDIR}/mk/package.mk @@ -32,9 +34,11 @@ $(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKGS $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR})) $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS})) $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID})) +$(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC})) -CONFIGURE_ARGS+= --enable-elf-shlibs --disable-tls +CONFIGURE_ARGS+= --enable-elf-shlibs --disable-rpath INSTALL_TARGET+= install-libs +TLDFLAGS+= -lpthread pre-build: ${MAKE} -C ${WRKBUILD}/util \ @@ -44,7 +48,14 @@ pre-build: CPPFLAGS="" \ subst +post-build: + ${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static + ${INSTALL_DIR} ${WRKINST}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin/ + post-install: + ${INSTALL_DIR} ${IDIR_E2FSPROGS}/etc + ${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_E2FSPROGS}/etc/ ${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib ${IDIR_E2FSPROGS}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin/ cd $(IDIR_E2FSPROGS)/usr/sbin && ln -sf e2fsck fsck.ext2 @@ -73,5 +84,8 @@ post-install: ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ ${STAGING_TARGET_DIR}/usr/include/uuid ${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_HOST_DIR}/bin + ${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck.static \ + ${IDIR_E2FSCK_STATIC}/usr/sbin/e2fsck include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/e2fsprogs/patches/patch-debugfs_dump_c.orig b/package/e2fsprogs/patches/patch-debugfs_dump_c.orig deleted file mode 100644 index 7e9b233fa..000000000 --- a/package/e2fsprogs/patches/patch-debugfs_dump_c.orig +++ /dev/null @@ -1,10 +0,0 @@ ---- e2fsprogs-1.41.14.orig/debugfs/dump.c 2009-08-13 03:39:57.000000000 +0200 -+++ e2fsprogs-1.41.14/debugfs/dump.c 2010-12-25 22:27:59.000000000 +0100 -@@ -19,7 +19,6 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> --#include <utime.h> - #ifdef HAVE_GETOPT_H - #include <getopt.h> - #else diff --git a/package/e2fsprogs/patches/patch-e2fsck_Makefile_in b/package/e2fsprogs/patches/patch-e2fsck_Makefile_in new file mode 100644 index 000000000..ac7dc5e86 --- /dev/null +++ b/package/e2fsprogs/patches/patch-e2fsck_Makefile_in @@ -0,0 +1,20 @@ +--- e2fsprogs-1.41.14.orig/e2fsck/Makefile.in 2010-12-22 16:49:20.000000000 +0100 ++++ e2fsprogs-1.41.14/e2fsck/Makefile.in 2011-01-11 00:34:19.000000000 +0100 +@@ -16,7 +16,7 @@ MANPAGES= e2fsck.8 + FMANPAGES= e2fsck.conf.5 + XTRA_CFLAGS= -DRESOURCE_TRACK -I. + +-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL) $(LIBE2P) ++LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBUUID) $(LIBBLKID) $(LIBINTL) $(LIBE2P) + DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) \ + $(DEPLIBE2P) + +@@ -119,7 +119,7 @@ e2fsck: $(OBJS) $(DEPLIBS) + + e2fsck.static: $(OBJS) $(STATIC_DEPLIBS) + $(E) " LD $@" +- $(Q) $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) ++ $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) + + e2fsck.profiled: $(PROFILED_OBJS) $(PROFILED_DEPLIBS) + $(E) " LD $@" diff --git a/package/e2fsprogs/patches/patch-e2fsprogs_spec b/package/e2fsprogs/patches/patch-e2fsprogs_spec deleted file mode 100644 index ad10f98dc..000000000 --- a/package/e2fsprogs/patches/patch-e2fsprogs_spec +++ /dev/null @@ -1,11 +0,0 @@ ---- e2fsprogs-1.41.14.orig/e2fsprogs.spec 2010-12-13 14:57:34.000000000 +0100 -+++ e2fsprogs-1.41.14/e2fsprogs.spec 2010-12-25 22:24:46.000000000 +0100 -@@ -5,7 +5,7 @@ - - Summary: Utilities for managing ext2/ext3/ext4 filesystems - Name: e2fsprogs --Version: 1.41.13 -+Version: 1.41.14 - Release: 0 - License: GPLv2 - Group: System Environment/Base diff --git a/package/e2fsprogs/patches/patch-misc_e2undo_c b/package/e2fsprogs/patches/patch-misc_e2undo_c new file mode 100644 index 000000000..2d1441220 --- /dev/null +++ b/package/e2fsprogs/patches/patch-misc_e2undo_c @@ -0,0 +1,11 @@ + optind seems to need unistd.h, not only getopt.h +--- e2fsprogs-1.41.12.orig/misc/e2undo.c 2010-05-14 00:59:49.000000000 +0200 ++++ e2fsprogs-1.41.12/misc/e2undo.c 2010-10-18 12:03:49.329511558 +0200 +@@ -19,6 +19,7 @@ + #if HAVE_ERRNO_H + #include <errno.h> + #endif ++#include <unistd.h> + #include "ext2fs/tdb.h" + #include "ext2fs/ext2fs.h" + #include "nls-enable.h" |