summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-01-12 14:27:07 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:53:23 +0000
commit464a2d66a465d49114c1e3748490657910dcc3a5 (patch)
tree5b7f712b4597c1a6a54a02980f59d76b26db0f3e
parent6ce82eac3b398816f7c11dbfa90d24517a792839 (diff)
downloadpoky-464a2d66a465d49114c1e3748490657910dcc3a5.tar.gz
e2fsprogs: upgrade to 1.42
Refactored quotefix.patch to apply cleanly. (From OE-Core rev: 1749f35bc92acd971eda245b93781305f79c2bef) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch47
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4 (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/acinclude.m4)0
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/mkdir.patch)0
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/quotefix.patch44
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs.inc2
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb)7
6 files changed, 48 insertions, 52 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch
deleted file mode 100644
index f260f034fa..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2Signed-off-by: Mei Lei <lei.mei@intel.com>
3
4
5These macros are underquoted and break with recent autoconf+automake
6combinations.
7
8RP 1/2/10
9
10Index: e2fsprogs-1.41.5/configure.in
11===================================================================
12--- e2fsprogs-1.41.5.orig/configure.in 2010-02-01 11:40:10.547790252 +0000
13+++ e2fsprogs-1.41.5/configure.in 2010-02-01 11:44:51.577876485 +0000
14@@ -397,11 +397,11 @@
15 AC_MSG_ERROR([pkg-config not installed; please install it.])
16 fi
17
18- AC_CHECK_LIB(blkid, blkid_get_cache,
19+ [AC_CHECK_LIB(blkid, blkid_get_cache,
20 [LIBBLKID=`$PKG_CONFIG --libs blkid`;
21 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
22 [AC_MSG_ERROR([external blkid library not found])],
23- [$LIBBLKID])
24+ [$LIBBLKID])]
25 BLKID_CMT=#
26 AC_MSG_RESULT([Disabling private blkid library])
27 else
28@@ -786,15 +786,15 @@
29 dnl
30 SEM_INIT_LIB=''
31 AC_CHECK_FUNC(sem_init, ,
32- AC_CHECK_LIB(pthread, sem_init,
33+ [AC_CHECK_LIB(pthread, sem_init,
34 AC_DEFINE(HAVE_SEM_INIT)
35 SEM_INIT_LIB=-lpthread,
36- AC_CHECK_LIB(rt, sem_init,
37+ [AC_CHECK_LIB(rt, sem_init,
38 AC_DEFINE(HAVE_SEM_INIT)
39 SEM_INIT_LIB=-lrt,
40- AC_CHECK_LIB(posix4, sem_init,
41+ [AC_CHECK_LIB(posix4, sem_init,
42 AC_DEFINE(HAVE_SEM_INIT)
43- SEM_INIT_LIB=-lposix4))))dnl
44+ SEM_INIT_LIB=-lposix4)])])])dnl
45 AC_SUBST(SEM_INIT_LIB)
46 dnl
47 dnl Check for unified diff
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4
index 4b00668476..4b00668476 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/acinclude.m4
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch
index e91ffa96c4..e91ffa96c4 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/mkdir.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/quotefix.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/quotefix.patch
new file mode 100644
index 0000000000..e576f35ccc
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/quotefix.patch
@@ -0,0 +1,44 @@
1Upstream-Status: Pending
2
3These macros are underquoted and break with recent autoconf+automake
4combinations. - RP 2010-01-02
5
6Signed-off-by: Scott Garman <scott.a.garman@intel.com>
7
8diff -urN e2fsprogs-1.42.orig//configure.in e2fsprogs-1.42/configure.in
9--- e2fsprogs-1.42.orig//configure.in 2011-11-28 09:28:22.000000000 -0800
10+++ e2fsprogs-1.42/configure.in 2012-01-12 14:42:54.820531407 -0800
11@@ -439,11 +439,11 @@
12 AC_MSG_ERROR([pkg-config not installed; please install it.])
13 fi
14
15- AC_CHECK_LIB(uuid, uuid_generate,
16+ [AC_CHECK_LIB(uuid, uuid_generate,
17 [LIBUUID=`$PKG_CONFIG --libs uuid`;
18 STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`],
19 [AC_MSG_ERROR([external uuid library not found])],
20- [$LIBUUID])
21+ [$LIBUUID])]
22 UUID_CMT=#
23 AC_MSG_RESULT([Disabling private uuid library])
24 else
25@@ -939,15 +939,15 @@
26 AH_TEMPLATE([HAVE_SEM_INIT], [Define to 1 if sem_init() exists])
27 SEM_INIT_LIB=''
28 AC_CHECK_FUNC(sem_init, ,
29- AC_CHECK_LIB(pthread, sem_init,
30+ [AC_CHECK_LIB(pthread, sem_init,
31 AC_DEFINE(HAVE_SEM_INIT, 1)
32 SEM_INIT_LIB=-lpthread,
33- AC_CHECK_LIB(rt, sem_init,
34+ [AC_CHECK_LIB(rt, sem_init,
35 AC_DEFINE(HAVE_SEM_INIT, 1)
36 SEM_INIT_LIB=-lrt,
37- AC_CHECK_LIB(posix4, sem_init,
38+ [AC_CHECK_LIB(posix4, sem_init,
39 AC_DEFINE(HAVE_SEM_INIT, 1)
40- SEM_INIT_LIB=-lposix4))))dnl
41+ SEM_INIT_LIB=-lposix4)])])])dnl
42 AC_SUBST(SEM_INIT_LIB)
43 dnl
44 dnl Check for unified diff
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index 1a1a7b8836..527e701d18 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -21,7 +21,7 @@ SECTION = "base"
21DEPENDS = "util-linux" 21DEPENDS = "util-linux"
22 22
23SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ 23SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
24 file://mkdir.patch;apply=yes" 24 file://mkdir.patch"
25 25
26inherit autotools gettext 26inherit autotools gettext
27 27
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
index a956247a18..9ff85a2d51 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
@@ -1,13 +1,12 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r4" 3PR = "r0"
4 4
5SRC_URI += "file://quotefix.patch \ 5SRC_URI += "file://quotefix.patch \
6 file://acinclude.m4" 6 file://acinclude.m4"
7 7
8SRC_URI[md5sum] = "05f70470aea2ef7efbb0845b2b116720" 8SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610"
9SRC_URI[sha256sum] = "3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aad7b176" 9SRC_URI[sha256sum] = "55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46"
10#file://no-hardlinks.patch
11 10
12PARALLEL_MAKE = "" 11PARALLEL_MAKE = ""
13 12