patchelf: upgrade 0.13 -> 0.14.1

refresh handle-read-only-files.patch Signed-off-by: Wang Mingyu <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
openembedded · Dec 1, 2021 · 978f04f · 978f04f
1 parent ada5da0
commit 978f04f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch
@@ -15,10 +15,10 @@ Signed-off-by: Fabio Berton <[email protected]>
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/src/patchelf.cc b/src/patchelf.cc
-index fd1e7b7..a941da1 100644
+index 1aeae88..6b77afe 100644
 --- a/src/patchelf.cc
 +++ b/src/patchelf.cc
-@@ -527,9 +527,19 @@ void ElfFile<ElfFileParamNames>::sortShdrs()
+@@ -534,9 +534,19 @@ void ElfFile<ElfFileParamNames>::sortShdrs()
 
  static void writeFile(const std::string & fileName, const FileContents & contents)
  {
@@ -39,14 +39,17 @@ index fd1e7b7..a941da1 100644
      if (fd == -1)
          error("open");
 
-@@ -543,6 +553,10 @@ static void writeFile(const std::string & fileName, const FileContents & content
-
-     if (close(fd) != 0)
-         error("close");
+@@ -564,6 +574,10 @@ static void writeFile(const std::string & fileName, const FileContents & content
+     if (errno == EINTR)
+         return;
+     error("close");
 +
 +    if (chmod(fileName.c_str(), st.st_mode) != 0)
 +        error("chmod");
 +
  }
 
 
+-- 
+2.25.1
+
diff --git a/...ecipes-devtools/patchelf/patchelf_0.13.bb → ...ipes-devtools/patchelf/patchelf_0.14.1.bb b/...ecipes-devtools/patchelf/patchelf_0.13.bb → ...ipes-devtools/patchelf/patchelf_0.14.1.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv3"
 SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \
            file://handle-read-only-files.patch \
            "
-SRCREV = "a949ff23315bbb5863627c4655fe216ecbf341a2"
+SRCREV = "8f7b4a7a3648970fe55824cfee2afd3808626a3f"
 
 S = "${WORKDIR}/git"