[OpenWrt-Devel] [Patch] Newer e2fsprogs

[Matthew M. Dean]

resent in gmails plain text mode

--- a/package/utils/e2fsprogs/Makefile (revision 43446)
+++ b/package/utils/e2fsprogs/Makefile (working copy)
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.42.4
-PKG_MD5SUM:=b6e296f210d642361b7394437ff0f318
+PKG_VERSION:=1.42.12
+PKG_MD5SUM:=68255f51be017a93f2f6402fab06c2bf
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -80,7 +80,8 @@
  --disable-uuidd  \
  --disable-tls  \
  --disable-nls  \
- --disable-rpath
+ --disable-rpath  \
+ --disable-defrag

 define Build/Prepare
  $(call Build/Prepare/Default)

--- /package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
(revision 43446)
+++ /package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
(working copy)
@@ -1,38 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -5038,7 +5038,7 @@ if test "${ac_cv_lib_blkid_blkid_get_cac
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lblkid $LIBBLKID $LIBS"
-+LIBS="-lblkid $LIBBLKID $LIBUUID $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-
---- a/misc/Makefile.in
-+++ b/misc/Makefile.in
-@@ -146,10 +146,10 @@ partinfo: partinfo.o
-  $(E) " LD $@"
-  $(Q) $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
-
--e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(LIBEXT2FS)
-+e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID)
$(DEPLIBUUID) $(LIBEXT2FS)
-  $(E) " LD $@"
-  $(Q) $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
--  $(LIBBLKID) $(LIBEXT2FS) $(LIBINTL)
-+  $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL)
-
- tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \
-   $(DEPLIBUUID) $(DEPLIBQUOTA) $(LIBEXT2FS)
-@@ -289,9 +289,9 @@ dumpe2fs.profiled: $(PROFILED_DUMPE2FS_O
-   $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \
-   $(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL)
-
--fsck: $(FSCK_OBJS) $(DEPLIBBLKID)
-+fsck: $(FSCK_OBJS) $(DEPLIBBLKID) $(DEPLIBUUID)
-  $(E) " LD $@"
-- $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
-+ $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID)
$(LIBUUID) $(LIBINTL)
-
- fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
-  $(E) " LD $@"

--- /package/utils/e2fsprogs/patches/002-no_malloc_h.patch (revision 43446)
+++ /package/utils/e2fsprogs/patches/002-no_malloc_h.patch (working copy)
@@ -1,10 +0,0 @@
---- a/util/symlinks.c
-+++ b/util/symlinks.c
-@@ -8,7 +8,6 @@
- #endif
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <string.h>
- #include <fcntl.h>
- #include <sys/param.h>

On Sun, Nov 30, 2014 at 5:15 PM, Matthew M. Dean <fireculex at gmail.com> wrote:
> Because the existing e2fsprogs is ~3 years old.
>
> Signed-off-by: Matthew M. Dean <fireculex at gmail.com>
>
> ===================================================================
> --- a/package/utils/e2fsprogs/Makefile (revision 43446)
> +++ b/package/utils/e2fsprogs/Makefile (working copy)
> @@ -8,8 +8,8 @@
>  include $(TOPDIR)/rules.mk
>
>  PKG_NAME:=e2fsprogs
> -PKG_VERSION:=1.42.4
> -PKG_MD5SUM:=b6e296f210d642361b7394437ff0f318
> +PKG_VERSION:=1.42.12
> +PKG_MD5SUM:=68255f51be017a93f2f6402fab06c2bf
>  PKG_RELEASE:=1
>
>  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
> @@ -80,7 +80,8 @@
>   --disable-uuidd  \
>   --disable-tls  \
>   --disable-nls  \
> - --disable-rpath
> + --disable-rpath  \
> + --disable-defrag
>
>  define Build/Prepare
>   $(call Build/Prepare/Default)
>
> --- /package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
> (revision 43446)
> +++ /package/utils/e2fsprogs/patches/001-link-against-libuuid.patch (working
> copy)
> @@ -1,38 +0,0 @@
> ---- a/configure
> -+++ b/configure
> -@@ -5038,7 +5038,7 @@ if test "${ac_cv_lib_blkid_blkid_get_cac
> -   $as_echo_n "(cached) " >&6
> - else
> -   ac_check_lib_save_LIBS=$LIBS
> --LIBS="-lblkid $LIBBLKID $LIBS"
> -+LIBS="-lblkid $LIBBLKID $LIBUUID $LIBS"
> - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> - /* end confdefs.h.  */
> -
> ---- a/misc/Makefile.in
> -+++ b/misc/Makefile.in
> -@@ -146,10 +146,10 @@ partinfo: partinfo.o
> -  $(E) " LD $@"
> -  $(Q) $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
> -
> --e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(LIBEXT2FS)
> -+e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBUUID)
> $(LIBEXT2FS)
> -  $(E) " LD $@"
> -  $(Q) $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
> --  $(LIBBLKID) $(LIBEXT2FS) $(LIBINTL)
> -+  $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL)
> -
> - tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \
> -   $(DEPLIBUUID) $(DEPLIBQUOTA) $(LIBEXT2FS)
> -@@ -289,9 +289,9 @@ dumpe2fs.profiled: $(PROFILED_DUMPE2FS_O
> -   $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \
> -   $(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL)
> -
> --fsck: $(FSCK_OBJS) $(DEPLIBBLKID)
> -+fsck: $(FSCK_OBJS) $(DEPLIBBLKID) $(DEPLIBUUID)
> -  $(E) " LD $@"
> -- $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
> -+ $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBUUID)
> $(LIBINTL)
> -
> - fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
> -  $(E) " LD $@"
>
> --- /package/utils/e2fsprogs/patches/002-no_malloc_h.patch (revision 43446)
> +++ /package/utils/e2fsprogs/patches/002-no_malloc_h.patch (working copy)
> @@ -1,10 +0,0 @@
> ---- a/util/symlinks.c
> -+++ b/util/symlinks.c
> -@@ -8,7 +8,6 @@
> - #endif
> - #include <stdio.h>
> - #include <stdlib.h>
> --#include <malloc.h>
> - #include <string.h>
> - #include <fcntl.h>
> - #include <sys/param.h>
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel