summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-03-15 14:12:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-21 15:33:03 +0000
commita731d22551f576f84c43d5d88f56113c4652c317 (patch)
treeb0c4c623e07e5e0640f1aaeb55dbb67d874938e2 /meta
parent35ada8fe03f14cff78ec6f4e1277c5840e08b334 (diff)
downloadpoky-a731d22551f576f84c43d5d88f56113c4652c317.tar.gz
e2fsprogs: upgrade to 1.42.1
Includes minor tweaks to the formatting of some patch headers and the addition of a SOB line where needed. (From OE-Core rev: bb9af542bc69f417d414d92ebf46a9412944c1e1) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4 (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4)0
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch)4
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch)1
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch)11
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb)6
5 files changed, 14 insertions, 8 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4
index 4b00668476..4b00668476 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/acinclude.m4
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch
index 4d952a5df7..d074c15cfd 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/fallocate.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/fallocate.patch
@@ -3,10 +3,10 @@ but we need to check if we have fallocate()
3this problem shows up on uclibc systems since 3this problem shows up on uclibc systems since
4uclibc does not have fallocate() implemented 4uclibc does not have fallocate() implemented
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending 6Upstream-Status: Pending
9 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c 10Index: e2fsprogs-1.42/lib/ext2fs/unix_io.c
11=================================================================== 11===================================================================
12--- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c 2012-01-17 17:24:34.290780625 -0800 12--- e2fsprogs-1.42.orig/lib/ext2fs/unix_io.c 2012-01-17 17:24:34.290780625 -0800
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch
index e91ffa96c4..aa7a2981b4 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/mkdir.patch
@@ -1,4 +1,5 @@
1Upstream-Status: Inappropriate [configuration] 1Upstream-Status: Inappropriate [configuration]
2
2Signed-off-by: Mei Lei <lei.mei@intel.com> 3Signed-off-by: Mei Lei <lei.mei@intel.com>
3 4
4Index: e2fsprogs-1.41.5/po/Makefile.in.in 5Index: e2fsprogs-1.41.5/po/Makefile.in.in
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch
index 0e5fd7d3fb..7be4c3e544 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/remove.ldconfig.call.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42.1/remove.ldconfig.call.patch
@@ -1,11 +1,16 @@
1When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache 1When /etc/ld.so.cache is writeable by user running bitbake then it
2(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call 2creates invalid cache (in my case libstdc++.so cannot be found after
3touch */libstdc++.so && /sbin/ldconfig to fix it. 3building zlib(-native) and I have to call touch */libstdc++.so &&
4/sbin/ldconfig to fix it.
4 5
5So remove ldconfig call from make install-libs 6So remove ldconfig call from make install-libs
6 7
8Patch authored by Martin Jansa.
9
7Upstream-Status: Inappropriate [disable feature] 10Upstream-Status: Inappropriate [disable feature]
8 11
12Signed-off-by: Scott Garman <scott.a.garman@intel.com>
13
9diff -uNr e2fsprogs-1.42.orig/lib/Makefile.elf-lib e2fsprogs-1.42/lib/Makefile.elf-lib 14diff -uNr e2fsprogs-1.42.orig/lib/Makefile.elf-lib e2fsprogs-1.42/lib/Makefile.elf-lib
10--- e2fsprogs-1.42.orig/lib/Makefile.elf-lib 2010-06-14 05:07:36.000000000 +0200 15--- e2fsprogs-1.42.orig/lib/Makefile.elf-lib 2010-06-14 05:07:36.000000000 +0200
11+++ e2fsprogs-1.42/lib/Makefile.elf-lib 2012-02-23 14:26:07.021272275 +0100 16+++ e2fsprogs-1.42/lib/Makefile.elf-lib 2012-02-23 14:26:07.021272275 +0100
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
index 6e3f7b8377..6df7cea320 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
@@ -1,14 +1,14 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r4" 3PR = "r0"
4 4
5SRC_URI += "file://fallocate.patch \ 5SRC_URI += "file://fallocate.patch \
6 file://acinclude.m4 \ 6 file://acinclude.m4 \
7 file://remove.ldconfig.call.patch \ 7 file://remove.ldconfig.call.patch \
8" 8"
9 9
10SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610" 10SRC_URI[md5sum] = "8ed1501ae6746e2e735bdd1407211dc9"
11SRC_URI[sha256sum] = "55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46" 11SRC_URI[sha256sum] = "0f1fdc10c6289b6750714490837df9aab691f352d33f5ecb64507704df6ff991"
12 12
13EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd" 13EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd"
14EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" 14EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"