diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2014-01-01 01:25:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-06 11:13:57 +0000 |
commit | 63281708fab30adc4ca1a506deefbf8a54dcce6d (patch) | |
tree | bf6b9b48314909bd062f4fba473708065cbd6c81 /meta/recipes-devtools/e2fsprogs/e2fsprogs/acinclude.m4 | |
parent | 5ddb7d4ebb135e288ab56b44aceabb3578ae9ed1 (diff) | |
download | poky-63281708fab30adc4ca1a506deefbf8a54dcce6d.tar.gz |
e2fsprogs: upgrade to 1.42.9
* Upgrade to 1.42.9
* Remove the following patches since they have been merged/fixed by
upstream:
- debugfs-extent-header.patch
- debugfs-sparse-copy.patch
- debugfs-too-short.patch
- e2fsprogs-fix-tests-f_extent_oobounds.patch
- fallocate.patch
* The populate-extfs.sh had been merged by the upstream, but I'd like to
go on using the previous one which is from our meta layer, they are a
little different, and the script would be dropped when we use the mke2fs
to populate the rootfs.
* Sumitted the patch for populate-extfs.sh (from Søren Holm) to upstream.
* Submitted fix-icache.patch to upstream, I wrongly thought it was not
applicable to the upstream, but it does.
* Join the do_install() and do_install_append() together.
(From OE-Core rev: 82cc941128f9eaf57c3a9a648fc58227f6c1956c)
Signed-off-by: Robert Yang <liezhi.yang@windriver.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/acinclude.m4')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/acinclude.m4 | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs/acinclude.m4 new file mode 100644 index 0000000000..4b00668476 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/acinclude.m4 | |||
@@ -0,0 +1,86 @@ | |||
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 | ] ) | ||