From 51aa1c66ddedf3a6b915a464fe3f70924fd5a480 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 11 Aug 2022 21:58:04 +0200 Subject: patchelf: update 0.14.5 -> 0.15.0 Rebase handle-read-only-files.patch (From OE-Core rev: 0b2f8da3ff9cbbb6fc2ab75fbe09ad1fe745c53b) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../patchelf/patchelf/handle-read-only-files.patch | 30 ++++++++++------------ meta/recipes-devtools/patchelf/patchelf_0.14.5.bb | 18 ------------- meta/recipes-devtools/patchelf/patchelf_0.15.0.bb | 18 +++++++++++++ 3 files changed, 32 insertions(+), 34 deletions(-) delete mode 100644 meta/recipes-devtools/patchelf/patchelf_0.14.5.bb create mode 100644 meta/recipes-devtools/patchelf/patchelf_0.15.0.bb 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 b755a263a4..76ad8d9d4d 100644 --- a/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch +++ b/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch @@ -1,4 +1,4 @@ -From 682fb48c137b687477008b68863c2a0b73ed47d1 Mon Sep 17 00:00:00 2001 +From 38b3d65f4a79d39ad9cdf841f2b3b29fd0c961ca Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Fri, 9 Sep 2016 16:00:42 -0300 Subject: [PATCH] handle read-only files @@ -9,37 +9,32 @@ https://github.com/darealshinji/patchelf/commit/40e66392bc4b96e9b4eda496827d2634 Upstream-Status: Denied [https://github.com/NixOS/patchelf/pull/89] Signed-off-by: Fabio Berton - --- - src/patchelf.cc | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) + src/patchelf.cc | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) -Index: git/src/patchelf.cc -=================================================================== ---- git.orig/src/patchelf.cc -+++ git/src/patchelf.cc -@@ -534,9 +534,19 @@ void ElfFile::sortShd +diff --git a/src/patchelf.cc b/src/patchelf.cc +index 49accae..fb6c7ed 100644 +--- a/src/patchelf.cc ++++ b/src/patchelf.cc +@@ -378,8 +378,16 @@ void ElfFile::sortShdrs() static void writeFile(const std::string & fileName, const FileContents & contents) { + struct stat st; -+ int fd; + debug("writing %s\n", fileName.c_str()); -- int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777); + if (stat(fileName.c_str(), &st) != 0) + error("stat"); + + if (chmod(fileName.c_str(), 0600) != 0) + error("chmod"); + -+ fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777); -+ + int fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0777); if (fd == -1) error("open"); - -@@ -551,8 +561,6 @@ static void writeFile(const std::string +@@ -395,8 +403,6 @@ static void writeFile(const std::string & fileName, const FileContents & content bytesWritten += portion; } @@ -48,7 +43,7 @@ Index: git/src/patchelf.cc /* * Just ignore EINTR; a retry loop is the wrong thing to do. * -@@ -561,9 +569,11 @@ static void writeFile(const std::string +@@ -405,9 +411,11 @@ static void writeFile(const std::string & fileName, const FileContents & content * http://utcc.utoronto.ca/~cks/space/blog/unix/CloseEINTR * https://sites.google.com/site/michaelsafyan/software-engineering/checkforeintrwheninvokingclosethinkagain */ @@ -63,3 +58,6 @@ Index: git/src/patchelf.cc } +-- +2.30.2 + diff --git a/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb b/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb deleted file mode 100644 index 0fa2c00f1d..0000000000 --- a/meta/recipes-devtools/patchelf/patchelf_0.14.5.bb +++ /dev/null @@ -1,18 +0,0 @@ -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 = "GPL-3.0-only" - -SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \ - file://handle-read-only-files.patch \ - " -SRCREV = "a35054504293f9ff64539850d1ed0bfd2f5399f2" - -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -inherit autotools - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb b/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb new file mode 100644 index 0000000000..389a0a9f40 --- /dev/null +++ b/meta/recipes-devtools/patchelf/patchelf_0.15.0.bb @@ -0,0 +1,18 @@ +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 = "GPL-3.0-only" + +SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \ + file://handle-read-only-files.patch \ + " +SRCREV = "49008002562355b0e35075cbc1c42c645ff04e28" + +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit autotools + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf