diff options
Diffstat (limited to 'poky/meta/recipes-devtools/patchelf')
-rw-r--r-- | poky/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch | 36 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb (renamed from poky/meta/recipes-devtools/patchelf/patchelf_0.14.3.bb) | 4 |
2 files changed, 25 insertions, 15 deletions
diff --git a/poky/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch b/poky/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch index 8d9a50a697..b755a263a4 100644 --- a/poky/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch +++ b/poky/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch @@ -14,11 +14,11 @@ Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> src/patchelf.cc | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -diff --git a/src/patchelf.cc b/src/patchelf.cc -index 1aeae88..6b77afe 100644 ---- a/src/patchelf.cc -+++ b/src/patchelf.cc -@@ -534,9 +534,19 @@ void ElfFile<ElfFileParamNames>::sortShdrs() +Index: git/src/patchelf.cc +=================================================================== +--- git.orig/src/patchelf.cc ++++ git/src/patchelf.cc +@@ -534,9 +534,19 @@ void ElfFile<ElfFileParamNames>::sortShd static void writeFile(const std::string & fileName, const FileContents & contents) { @@ -39,17 +39,27 @@ index 1aeae88..6b77afe 100644 if (fd == -1) error("open"); -@@ -564,6 +574,10 @@ static void writeFile(const std::string & fileName, const FileContents & content - if (errno == EINTR) - return; - error("close"); +@@ -551,8 +561,6 @@ static void writeFile(const std::string + bytesWritten += portion; + } + +- if (close(fd) >= 0) +- return; + /* + * Just ignore EINTR; a retry loop is the wrong thing to do. + * +@@ -561,9 +569,11 @@ static void writeFile(const std::string + * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR + * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain + */ +- if (errno == EINTR) +- return; +- error("close"); ++ if ((close(fd) < 0) && errno != EINTR) ++ error("close"); + + if (chmod(fileName.c_str(), st.st_mode) != 0) + error("chmod"); -+ } --- -2.25.1 - diff --git a/poky/meta/recipes-devtools/patchelf/patchelf_0.14.3.bb b/poky/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb index 5d41c5edfe..0fa2c00f1d 100644 --- a/poky/meta/recipes-devtools/patchelf/patchelf_0.14.3.bb +++ b/poky/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb @@ -2,12 +2,12 @@ SUMMARY = "Tool to allow editing of RPATH and interpreter fields in ELF binaries DESCRIPTION = "PatchELF is a simple utility for modifying existing ELF executables and libraries." HOMEPAGE = "https://github.com/NixOS/patchelf" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \ file://handle-read-only-files.patch \ " -SRCREV = "bf3f37ec29edcdb3e2a163edaf84aeece39f8c9d" +SRCREV = "a35054504293f9ff64539850d1ed0bfd2f5399f2" S = "${WORKDIR}/git" |