diff options
author | wangmy <wangmy@fujitsu.com> | 2021-11-29 23:00:54 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-01 16:23:45 +0000 |
commit | f7050dee8b708417cd1a2264545db95d35970801 (patch) | |
tree | 73f986a32f8aa66d96d8b2db9355ff9ca725eed3 | |
parent | 205a60fa9862ccab3a2ce421c2a5fc553c63e29c (diff) | |
download | poky-f7050dee8b708417cd1a2264545db95d35970801.tar.gz |
patchelf: upgrade 0.13 -> 0.14.1
refresh handle-read-only-files.patch
(From OE-Core rev: 978f04fc520938b231c236c00582360aea63b364)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch | 15 | ||||
-rw-r--r-- | meta/recipes-devtools/patchelf/patchelf_0.14.1.bb (renamed from meta/recipes-devtools/patchelf/patchelf_0.13.bb) | 2 |
2 files changed, 10 insertions, 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 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 <fabio.berton@ossystems.com.br> | |||
15 | 1 file changed, 15 insertions(+), 1 deletion(-) | 15 | 1 file changed, 15 insertions(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/src/patchelf.cc b/src/patchelf.cc | 17 | diff --git a/src/patchelf.cc b/src/patchelf.cc |
18 | index fd1e7b7..a941da1 100644 | 18 | index 1aeae88..6b77afe 100644 |
19 | --- a/src/patchelf.cc | 19 | --- a/src/patchelf.cc |
20 | +++ b/src/patchelf.cc | 20 | +++ b/src/patchelf.cc |
21 | @@ -527,9 +527,19 @@ void ElfFile<ElfFileParamNames>::sortShdrs() | 21 | @@ -534,9 +534,19 @@ void ElfFile<ElfFileParamNames>::sortShdrs() |
22 | 22 | ||
23 | static void writeFile(const std::string & fileName, const FileContents & contents) | 23 | static void writeFile(const std::string & fileName, const FileContents & contents) |
24 | { | 24 | { |
@@ -39,10 +39,10 @@ index fd1e7b7..a941da1 100644 | |||
39 | if (fd == -1) | 39 | if (fd == -1) |
40 | error("open"); | 40 | error("open"); |
41 | 41 | ||
42 | @@ -543,6 +553,10 @@ static void writeFile(const std::string & fileName, const FileContents & content | 42 | @@ -564,6 +574,10 @@ static void writeFile(const std::string & fileName, const FileContents & content |
43 | 43 | if (errno == EINTR) | |
44 | if (close(fd) != 0) | 44 | return; |
45 | error("close"); | 45 | error("close"); |
46 | + | 46 | + |
47 | + if (chmod(fileName.c_str(), st.st_mode) != 0) | 47 | + if (chmod(fileName.c_str(), st.st_mode) != 0) |
48 | + error("chmod"); | 48 | + error("chmod"); |
@@ -50,3 +50,6 @@ index fd1e7b7..a941da1 100644 | |||
50 | } | 50 | } |
51 | 51 | ||
52 | 52 | ||
53 | -- | ||
54 | 2.25.1 | ||
55 | |||
diff --git a/meta/recipes-devtools/patchelf/patchelf_0.13.bb b/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" | |||
7 | SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \ | 7 | SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \ |
8 | file://handle-read-only-files.patch \ | 8 | file://handle-read-only-files.patch \ |
9 | " | 9 | " |
10 | SRCREV = "a949ff23315bbb5863627c4655fe216ecbf341a2" | 10 | SRCREV = "8f7b4a7a3648970fe55824cfee2afd3808626a3f" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||