From 978f04fc520938b231c236c00582360aea63b364 Mon Sep 17 00:00:00 2001 From: wangmy Date: Mon, 29 Nov 2021 23:00:54 +0800 Subject: [PATCH] patchelf: upgrade 0.13 -> 0.14.1 refresh handle-read-only-files.patch Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../patchelf/handle-read-only-files.patch | 15 +++++++++------ .../{patchelf_0.13.bb => patchelf_0.14.1.bb} | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) rename meta/recipes-devtools/patchelf/{patchelf_0.13.bb => patchelf_0.14.1.bb} (91%) diff --git a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch index 63080a42d4..8d9a50a697 100644 --- 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 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::sortShdrs() +@@ -534,9 +534,19 @@ void ElfFile::sortShdrs() static void writeFile(const std::string & fileName, const FileContents & contents) { @@ -39,10 +39,10 @@ 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"); @@ -50,3 +50,6 @@ index fd1e7b7..a941da1 100644 } +-- +2.25.1 + diff --git a/meta/recipes-devtools/patchelf/patchelf_0.13.bb b/meta/recipes-devtools/patchelf/patchelf_0.14.1.bb similarity index 91% rename from meta/recipes-devtools/patchelf/patchelf_0.13.bb rename to meta/recipes-devtools/patchelf/patchelf_0.14.1.bb index b24c74a149..2b63fbfbc3 100644 --- a/meta/recipes-devtools/patchelf/patchelf_0.13.bb +++ b/meta/recipes-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" -- 2.40.1