diff options
| author | Andrei Dinu <andrei.adrianx.dinu@intel.com> | 2013-07-04 07:05:04 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-10 09:41:51 +0100 |
| commit | 28d8cbe2cd1c6e93dbd45fcc40110acfc9bce9aa (patch) | |
| tree | 326cd164cabc2ee2e70c34dd54a2ad9674764ec9 /meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7 | |
| parent | 2c4c06d601135edc96771f7411b58f58ce563a08 (diff) | |
| download | poky-28d8cbe2cd1c6e93dbd45fcc40110acfc9bce9aa.tar.gz | |
e2fsprogs: upgrade to 1.42.8
upgrade from 1.42.7 -> 1.42.8
(From OE-Core rev: 76a373c64f1b1da02fccbc51f9aaff6082effef9)
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.7')
4 files changed, 0 insertions, 182 deletions
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 @@ | |||
| 1 | # Extracted from the package's shipped aclocal.m4. Custom macros should be in | ||
| 2 | # acinclude.m4 so running aclocal doesn't blow them away. | ||
| 3 | # | ||
| 4 | # RP 1/6/2010 | ||
| 5 | |||
| 6 | # =========================================================================== | ||
| 7 | # http://www.nongnu.org/autoconf-archive/check_gnu_make.html | ||
| 8 | # =========================================================================== | ||
| 9 | # | ||
| 10 | # SYNOPSIS | ||
| 11 | # | ||
| 12 | # CHECK_GNU_MAKE() | ||
| 13 | # | ||
| 14 | # DESCRIPTION | ||
| 15 | # | ||
| 16 | # This macro searches for a GNU version of make. If a match is found, the | ||
| 17 | # makefile variable `ifGNUmake' is set to the empty string, otherwise it | ||
| 18 | # is set to "#". This is useful for including a special features in a | ||
| 19 | # Makefile, which cannot be handled by other versions of make. The | ||
| 20 | # variable _cv_gnu_make_command is set to the command to invoke GNU make | ||
| 21 | # if it exists, the empty string otherwise. | ||
| 22 | # | ||
| 23 | # Here is an example of its use: | ||
| 24 | # | ||
| 25 | # Makefile.in might contain: | ||
| 26 | # | ||
| 27 | # # A failsafe way of putting a dependency rule into a makefile | ||
| 28 | # $(DEPEND): | ||
| 29 | # $(CC) -MM $(srcdir)/*.c > $(DEPEND) | ||
| 30 | # | ||
| 31 | # @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND))) | ||
| 32 | # @ifGNUmake@ include $(DEPEND) | ||
| 33 | # @ifGNUmake@ endif | ||
| 34 | # | ||
| 35 | # Then configure.in would normally contain: | ||
| 36 | # | ||
| 37 | # CHECK_GNU_MAKE() | ||
| 38 | # AC_OUTPUT(Makefile) | ||
| 39 | # | ||
| 40 | # Then perhaps to cause gnu make to override any other make, we could do | ||
| 41 | # something like this (note that GNU make always looks for GNUmakefile | ||
| 42 | # first): | ||
| 43 | # | ||
| 44 | # if ! test x$_cv_gnu_make_command = x ; then | ||
| 45 | # mv Makefile GNUmakefile | ||
| 46 | # echo .DEFAULT: > Makefile ; | ||
| 47 | # echo \ $_cv_gnu_make_command \$@ >> Makefile; | ||
| 48 | # fi | ||
| 49 | # | ||
| 50 | # Then, if any (well almost any) other make is called, and GNU make also | ||
| 51 | # exists, then the other make wraps the GNU make. | ||
| 52 | # | ||
| 53 | # LICENSE | ||
| 54 | # | ||
| 55 | # Copyright (c) 2008 John Darrington <j.darrington@elvis.murdoch.edu.au> | ||
| 56 | # | ||
| 57 | # Copying and distribution of this file, with or without modification, are | ||
| 58 | # permitted in any medium without royalty provided the copyright notice | ||
| 59 | # and this notice are preserved. | ||
| 60 | # | ||
| 61 | # Note: Modified by Ted Ts'o to add @ifNotGNUMake@ | ||
| 62 | |||
| 63 | AC_DEFUN( | ||
| 64 | [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command, | ||
| 65 | _cv_gnu_make_command='' ; | ||
| 66 | dnl Search all the common names for GNU make | ||
| 67 | for a in "$MAKE" make gmake gnumake ; do | ||
| 68 | if test -z "$a" ; then continue ; fi ; | ||
| 69 | if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then | ||
| 70 | _cv_gnu_make_command=$a ; | ||
| 71 | break; | ||
| 72 | fi | ||
| 73 | done ; | ||
| 74 | ) ; | ||
| 75 | dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise | ||
| 76 | if test "x$_cv_gnu_make_command" != "x" ; then | ||
| 77 | ifGNUmake='' ; | ||
| 78 | ifNotGNUmake='#' ; | ||
| 79 | else | ||
| 80 | ifGNUmake='#' ; | ||
| 81 | ifNotGNUmake='' ; | ||
| 82 | AC_MSG_RESULT("Not found"); | ||
| 83 | fi | ||
| 84 | AC_SUBST(ifGNUmake) | ||
| 85 | AC_SUBST(ifNotGNUmake) | ||
| 86 | ] ) | ||
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 @@ | |||
| 1 | We assume that fallocate is supported somehow | ||
| 2 | but we need to check if we have fallocate() | ||
| 3 | this problem shows up on uclibc systems since | ||
| 4 | uclibc does not have fallocate() implemented | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | |||
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 9 | |||
| 10 | Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c | ||
| 11 | =================================================================== | ||
| 12 | --- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c 2012-01-17 17:24:34.290780625 -0800 | ||
| 13 | +++ e2fsprogs-1.42/lib/ext2fs/unix_io.c 2012-01-17 17:25:37.338783680 -0800 | ||
| 14 | @@ -895,7 +895,7 @@ | ||
| 15 | goto unimplemented; | ||
| 16 | #endif | ||
| 17 | } else { | ||
| 18 | -#ifdef FALLOC_FL_PUNCH_HOLE | ||
| 19 | +#if defined FALLOC_FL_PUNCH_HOLE && defined HAVE_FALLOCATE | ||
| 20 | /* | ||
| 21 | * If we are not on block device, try to use punch hole | ||
| 22 | * 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 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | |||
| 3 | Signed-off-by: Mei Lei <lei.mei@intel.com> | ||
| 4 | |||
| 5 | Index: e2fsprogs-1.41.5/po/Makefile.in.in | ||
| 6 | =================================================================== | ||
| 7 | --- e2fsprogs-1.41.5.orig/po/Makefile.in.in 2009-02-14 13:49:08.000000000 +0000 | ||
| 8 | +++ e2fsprogs-1.41.5/po/Makefile.in.in 2009-08-19 17:52:31.000000000 +0100 | ||
| 9 | @@ -30,7 +30,7 @@ | ||
| 10 | INSTALL = @INSTALL@ | ||
| 11 | INSTALL_DATA = @INSTALL_DATA@ | ||
| 12 | MKINSTALLDIRS = @MKINSTALLDIRS@ | ||
| 13 | -mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) | ||
| 14 | +mkinstalldirs = $(MKINSTALLDIRS) | ||
| 15 | |||
| 16 | GMSGFMT = @GMSGFMT@ | ||
| 17 | MSGFMT = @MSGFMT@ | ||
| 18 | Index: e2fsprogs-1.41.5/configure.in | ||
| 19 | =================================================================== | ||
| 20 | --- e2fsprogs-1.41.5.orig/configure.in 2009-08-19 17:53:50.000000000 +0100 | ||
| 21 | +++ e2fsprogs-1.41.5/configure.in 2009-08-19 17:48:38.000000000 +0100 | ||
| 22 | @@ -970,6 +970,8 @@ | ||
| 23 | fi | ||
| 24 | AC_SUBST(BUILD_CFLAGS) | ||
| 25 | AC_SUBST(BUILD_LDFLAGS) | ||
| 26 | +MKINSTALLDIRS="mkdir -p" | ||
| 27 | +AC_SUBST(MKINSTALLDIRS) | ||
| 28 | dnl | ||
| 29 | dnl Make our output files, being sure that we create the some miscellaneous | ||
| 30 | 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 @@ | |||
| 1 | From b139e03ac2f72e644e547c7ee9b1514383af4d97 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andrei Dinu <andrei.adrianx.dinu@intel.com> | ||
| 3 | Date: Wed, 30 Jan 2013 15:22:04 +0200 | ||
| 4 | Subject: [PATCH] When /etc/ld.so.cache is writeable by user running bitbake | ||
| 5 | then it creates invalid cache (in my case libstdc++.so | ||
| 6 | cannot be found after building zlib(-native) and I have to | ||
| 7 | call touch */libstdc++.so && /sbin/ldconfig to fix it. | ||
| 8 | |||
| 9 | So remove ldconfig call from make install-libs | ||
| 10 | |||
| 11 | Patch authored by Martin Jansa. | ||
| 12 | |||
| 13 | Upstream-Status: Inappropriate [disable feature] | ||
| 14 | |||
| 15 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
| 16 | Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> | ||
| 17 | --- | ||
| 18 | lib/Makefile.elf-lib | 3 --- | ||
| 19 | 1 file changed, 3 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib | ||
| 22 | index 78479d3..4a4a5ac 100644 | ||
| 23 | --- a/lib/Makefile.elf-lib | ||
| 24 | +++ b/lib/Makefile.elf-lib | ||
| 25 | @@ -50,8 +50,6 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib $(DEP_INSTALL_SYMLINK) | ||
| 26 | $(E) " SYMLINK $(libdir)/$(ELF_IMAGE).so" | ||
| 27 | $(Q) $(INSTALL_SYMLINK) $(ELF_INSTALL_DIR)/$(ELF_SONAME) \ | ||
| 28 | $(libdir)/$(ELF_IMAGE).so $(DESTDIR) | ||
| 29 | - $(E) " LDCONFIG" | ||
| 30 | - $(Q) -$(LDCONFIG) | ||
| 31 | |||
| 32 | install-strip: install | ||
| 33 | $(E) " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)" | ||
| 34 | @@ -67,7 +65,6 @@ uninstall-shlibs uninstall:: | ||
| 35 | $(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \ | ||
| 36 | $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME) \ | ||
| 37 | $(DESTDIR)$(libdir)/$(ELF_IMAGE).so | ||
| 38 | - -$(LDCONFIG) | ||
| 39 | |||
| 40 | clean:: | ||
| 41 | $(RM) -rf elfshared | ||
| 42 | -- | ||
| 43 | 1.7.9.5 | ||
| 44 | |||
