Author: nbd Date: 2015-03-28 11:19:10 +0100 (Sat, 28 Mar 2015) New Revision: 45075
Added: trunk/package/utils/e2fsprogs/patches/001-com_err_version.patch Removed: trunk/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch trunk/package/utils/e2fsprogs/patches/002-no_malloc_h.patch trunk/package/utils/e2fsprogs/patches/003-com_err_version.patch Modified: trunk/package/utils/e2fsprogs/Makefile Log: e2fsprogs: update to the latest version, fixes musl build failure Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/utils/e2fsprogs/Makefile =================================================================== --- trunk/package/utils/e2fsprogs/Makefile 2015-03-28 10:19:04 UTC (rev 45074) +++ trunk/package/utils/e2fsprogs/Makefile 2015-03-28 10:19:10 UTC (rev 45075) @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs -PKG_VERSION:=1.42.4 -PKG_MD5SUM:=b6e296f210d642361b7394437ff0f318 -PKG_RELEASE:=2 +PKG_VERSION:=1.42.12 +PKG_MD5SUM:=68255f51be017a93f2f6402fab06c2bf +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/e2fsprogs Copied: trunk/package/utils/e2fsprogs/patches/001-com_err_version.patch (from rev 45074, trunk/package/utils/e2fsprogs/patches/003-com_err_version.patch) =================================================================== --- trunk/package/utils/e2fsprogs/patches/001-com_err_version.patch (rev 0) +++ trunk/package/utils/e2fsprogs/patches/001-com_err_version.patch 2015-03-28 10:19:10 UTC (rev 45075) @@ -0,0 +1,13 @@ +--- a/lib/et/Makefile.in ++++ b/lib/et/Makefile.in +@@ -25,8 +25,8 @@ SHARE_FILES= et_c.awk et_h.awk + LIBRARY= libcom_err + LIBDIR= et + +-ELF_VERSION = 2.1 +-ELF_SO_VERSION = 2 ++ELF_VERSION = 0.0 ++ELF_SO_VERSION = 0 + ELF_IMAGE = libcom_err + ELF_MYDIR = et + ELF_INSTALL_DIR = $(root_libdir) Deleted: trunk/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch =================================================================== --- trunk/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch 2015-03-28 10:19:04 UTC (rev 45074) +++ trunk/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch 2015-03-28 10:19:10 UTC (rev 45075) @@ -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 $@" Deleted: trunk/package/utils/e2fsprogs/patches/002-no_malloc_h.patch =================================================================== --- trunk/package/utils/e2fsprogs/patches/002-no_malloc_h.patch 2015-03-28 10:19:04 UTC (rev 45074) +++ trunk/package/utils/e2fsprogs/patches/002-no_malloc_h.patch 2015-03-28 10:19:10 UTC (rev 45075) @@ -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> Deleted: trunk/package/utils/e2fsprogs/patches/003-com_err_version.patch =================================================================== --- trunk/package/utils/e2fsprogs/patches/003-com_err_version.patch 2015-03-28 10:19:04 UTC (rev 45074) +++ trunk/package/utils/e2fsprogs/patches/003-com_err_version.patch 2015-03-28 10:19:10 UTC (rev 45075) @@ -1,13 +0,0 @@ ---- a/lib/et/Makefile.in -+++ b/lib/et/Makefile.in -@@ -25,8 +25,8 @@ SHARE_FILES= et_c.awk et_h.awk - LIBRARY= libcom_err - LIBDIR= et - --ELF_VERSION = 2.1 --ELF_SO_VERSION = 2 -+ELF_VERSION = 0.0 -+ELF_SO_VERSION = 0 - ELF_IMAGE = libcom_err - ELF_MYDIR = et - ELF_INSTALL_DIR = $(root_libdir) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
