From 28d8cbe2cd1c6e93dbd45fcc40110acfc9bce9aa Mon Sep 17 00:00:00 2001 From: Andrei Dinu Date: Thu, 4 Jul 2013 07:05:04 +0000 Subject: e2fsprogs: upgrade to 1.42.8 upgrade from 1.42.7 -> 1.42.8 (From OE-Core rev: 76a373c64f1b1da02fccbc51f9aaff6082effef9) Signed-off-by: Andrei Dinu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../e2fsprogs/e2fsprogs-1.42.7/acinclude.m4 | 86 ---------------------- .../e2fsprogs/e2fsprogs-1.42.7/fallocate.patch | 22 ------ .../e2fsprogs/e2fsprogs-1.42.7/mkdir.patch | 30 -------- .../e2fsprogs-1.42.7/remove.ldconfig.call.patch | 44 ----------- 4 files changed, 182 deletions(-) delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/acinclude.m4 delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/fallocate.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/mkdir.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/remove.ldconfig.call.patch (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7') diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/acinclude.m4 deleted file mode 100644 index 4b00668476..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/acinclude.m4 +++ /dev/null @@ -1,86 +0,0 @@ -# Extracted from the package's shipped aclocal.m4. Custom macros should be in -# acinclude.m4 so running aclocal doesn't blow them away. -# -# RP 1/6/2010 - -# =========================================================================== -# http://www.nongnu.org/autoconf-archive/check_gnu_make.html -# =========================================================================== -# -# SYNOPSIS -# -# CHECK_GNU_MAKE() -# -# DESCRIPTION -# -# This macro searches for a GNU version of make. If a match is found, the -# makefile variable `ifGNUmake' is set to the empty string, otherwise it -# is set to "#". This is useful for including a special features in a -# Makefile, which cannot be handled by other versions of make. The -# variable _cv_gnu_make_command is set to the command to invoke GNU make -# if it exists, the empty string otherwise. -# -# Here is an example of its use: -# -# Makefile.in might contain: -# -# # A failsafe way of putting a dependency rule into a makefile -# $(DEPEND): -# $(CC) -MM $(srcdir)/*.c > $(DEPEND) -# -# @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND))) -# @ifGNUmake@ include $(DEPEND) -# @ifGNUmake@ endif -# -# Then configure.in would normally contain: -# -# CHECK_GNU_MAKE() -# AC_OUTPUT(Makefile) -# -# Then perhaps to cause gnu make to override any other make, we could do -# something like this (note that GNU make always looks for GNUmakefile -# first): -# -# if ! test x$_cv_gnu_make_command = x ; then -# mv Makefile GNUmakefile -# echo .DEFAULT: > Makefile ; -# echo \ $_cv_gnu_make_command \$@ >> Makefile; -# fi -# -# Then, if any (well almost any) other make is called, and GNU make also -# exists, then the other make wraps the GNU make. -# -# LICENSE -# -# Copyright (c) 2008 John Darrington -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. -# -# Note: Modified by Ted Ts'o to add @ifNotGNUMake@ - -AC_DEFUN( - [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command, - _cv_gnu_make_command='' ; -dnl Search all the common names for GNU make - for a in "$MAKE" make gmake gnumake ; do - if test -z "$a" ; then continue ; fi ; - if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then - _cv_gnu_make_command=$a ; - break; - fi - done ; - ) ; -dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise - if test "x$_cv_gnu_make_command" != "x" ; then - ifGNUmake='' ; - ifNotGNUmake='#' ; - else - ifGNUmake='#' ; - ifNotGNUmake='' ; - AC_MSG_RESULT("Not found"); - fi - AC_SUBST(ifGNUmake) - AC_SUBST(ifNotGNUmake) -] ) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/fallocate.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/fallocate.patch deleted file mode 100644 index d074c15cfd..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/fallocate.patch +++ /dev/null @@ -1,22 +0,0 @@ -We assume that fallocate is supported somehow -but we need to check if we have fallocate() -this problem shows up on uclibc systems since -uclibc does not have fallocate() implemented - -Upstream-Status: Pending - -Signed-off-by: Khem Raj - -Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c -=================================================================== ---- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c 2012-01-17 17:24:34.290780625 -0800 -+++ e2fsprogs-1.42/lib/ext2fs/unix_io.c 2012-01-17 17:25:37.338783680 -0800 -@@ -895,7 +895,7 @@ - goto unimplemented; - #endif - } else { --#ifdef FALLOC_FL_PUNCH_HOLE -+#if defined FALLOC_FL_PUNCH_HOLE && defined HAVE_FALLOCATE - /* - * If we are not on block device, try to use punch hole - * to reclaim free space. diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/mkdir.patch deleted file mode 100644 index aa7a2981b4..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/mkdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mei Lei - -Index: e2fsprogs-1.41.5/po/Makefile.in.in -=================================================================== ---- e2fsprogs-1.41.5.orig/po/Makefile.in.in 2009-02-14 13:49:08.000000000 +0000 -+++ e2fsprogs-1.41.5/po/Makefile.in.in 2009-08-19 17:52:31.000000000 +0100 -@@ -30,7 +30,7 @@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS = @MKINSTALLDIRS@ --mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) -+mkinstalldirs = $(MKINSTALLDIRS) - - GMSGFMT = @GMSGFMT@ - MSGFMT = @MSGFMT@ -Index: e2fsprogs-1.41.5/configure.in -=================================================================== ---- e2fsprogs-1.41.5.orig/configure.in 2009-08-19 17:53:50.000000000 +0100 -+++ e2fsprogs-1.41.5/configure.in 2009-08-19 17:48:38.000000000 +0100 -@@ -970,6 +970,8 @@ - fi - AC_SUBST(BUILD_CFLAGS) - AC_SUBST(BUILD_LDFLAGS) -+MKINSTALLDIRS="mkdir -p" -+AC_SUBST(MKINSTALLDIRS) - dnl - dnl Make our output files, being sure that we create the some miscellaneous - dnl directories diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/remove.ldconfig.call.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/remove.ldconfig.call.patch deleted file mode 100644 index f3e6eb778f..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7/remove.ldconfig.call.patch +++ /dev/null @@ -1,44 +0,0 @@ -From b139e03ac2f72e644e547c7ee9b1514383af4d97 Mon Sep 17 00:00:00 2001 -From: Andrei Dinu -Date: Wed, 30 Jan 2013 15:22:04 +0200 -Subject: [PATCH] When /etc/ld.so.cache is writeable by user running bitbake - then it creates invalid cache (in my case libstdc++.so - cannot be found after building zlib(-native) and I have to - call touch */libstdc++.so && /sbin/ldconfig to fix it. - -So remove ldconfig call from make install-libs - -Patch authored by Martin Jansa. - -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Scott Garman -Signed-off-by: Andrei Dinu ---- - lib/Makefile.elf-lib | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib -index 78479d3..4a4a5ac 100644 ---- a/lib/Makefile.elf-lib -+++ b/lib/Makefile.elf-lib -@@ -50,8 +50,6 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib $(DEP_INSTALL_SYMLINK) - $(E) " SYMLINK $(libdir)/$(ELF_IMAGE).so" - $(Q) $(INSTALL_SYMLINK) $(ELF_INSTALL_DIR)/$(ELF_SONAME) \ - $(libdir)/$(ELF_IMAGE).so $(DESTDIR) -- $(E) " LDCONFIG" -- $(Q) -$(LDCONFIG) - - install-strip: install - $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)" -@@ -67,7 +65,6 @@ uninstall-shlibs uninstall:: - $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \ - $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \ - $(DESTDIR)$(libdir)/$(ELF_IMAGE).so -- -$(LDCONFIG) - - clean:: - $(RM) -rf elfshared --- -1.7.9.5 - -- cgit v1.2.3-54-g00ecf