diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-04 08:31:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-06 23:10:38 +0000 |
| commit | 79d320544202d719eeb5affd9b687505dcd9b725 (patch) | |
| tree | b3da22eb62f7fdb9b8bc4534ea31f3d65f4e35ce /meta/recipes-devtools/patchelf | |
| parent | 555981c10e6b7f5c2be7f2c3fefb89b1add72cab (diff) | |
| download | openembedded-core-contrib-79d320544202d719eeb5affd9b687505dcd9b725.tar.gz | |
patchelf: Add patch to handle large files
There were "maximum size exceeded" errors from patchelf when processing
qemu-native. There is an issue open for this upstream, add a patch
proposed there for this issue. "32" was increased to "64" to handle our
qemu-ppc binary.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/patchelf')
| -rw-r--r-- | meta/recipes-devtools/patchelf/patchelf/maxsize.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-devtools/patchelf/patchelf_0.8.bb | 3 |
2 files changed, 32 insertions, 1 deletions
diff --git a/meta/recipes-devtools/patchelf/patchelf/maxsize.patch b/meta/recipes-devtools/patchelf/patchelf/maxsize.patch new file mode 100644 index 00000000000..cc04a89e69c --- /dev/null +++ b/meta/recipes-devtools/patchelf/patchelf/maxsize.patch @@ -0,0 +1,30 @@ +From f6886c2c33a1cf8771163919f3d20f6340c0ce38 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra <eelco.dolstra@logicblox.com> +Date: Fri, 10 Jul 2015 18:12:37 +0200 +Subject: [PATCH] Quick fix for #47 + +https://github.com/NixOS/patchelf/issues/47 + +Avoid issues with holes in binaries such as qemu-pcc from qemu-native. + +Upstream-Status: Submitted +RP +2016/2/3 + +--- + src/patchelf.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/patchelf.cc b/src/patchelf.cc +index 8566ed9..df75593 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -248,7 +248,7 @@ static void readFile(string fileName, mode_t * fileMode) + if (stat(fileName.c_str(), &st) != 0) error("stat"); + fileSize = st.st_size; + *fileMode = st.st_mode; +- maxSize = fileSize + 8 * 1024 * 1024; ++ maxSize = fileSize + 64 * 1024 * 1024; + + contents = (unsigned char *) malloc(fileSize + maxSize); + if (!contents) abort();
\ No newline at end of file diff --git a/meta/recipes-devtools/patchelf/patchelf_0.8.bb b/meta/recipes-devtools/patchelf/patchelf_0.8.bb index c1b87f55394..8484a7e5892 100644 --- a/meta/recipes-devtools/patchelf/patchelf_0.8.bb +++ b/meta/recipes-devtools/patchelf/patchelf_0.8.bb @@ -1,4 +1,5 @@ -SRC_URI = "http://nixos.org/releases/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2" +SRC_URI = "http://nixos.org/releases/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2 \ + file://maxsize.patch" LICENSE = "GPLv3" SUMMARY = "Tool to allow editing of RPATH and interpreter fields in ELF binaries" |