summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-devtools/patchelf
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-06-27 08:28:28 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-06-27 08:32:13 +0300
commitd25ed3241ddffad58c7a52e45e388e6c48d5123a (patch)
treeb097477c5b9204689d35c06f5761b1767093b338 /poky/meta/recipes-devtools/patchelf
parentc87764fefff10735006a31fab72d76c243a3eb40 (diff)
downloadopenbmc-d25ed3241ddffad58c7a52e45e388e6c48d5123a.tar.xz
poky: subtree update:26ae42ded7..5951cbcabe
Alex Kiernan (1): recipetool: Fix list concatenation when using edit Alexander Kanavin (4): apr-util: make gdbm optional gobject-introspection: add a patch to fix a build race icu: merge .inc into main recipe icu: make filtered data generation optional, serial and off by default Alexandru N. Onea (3): bitbake: perforce: add basic progress handler for perforce bitbake: perforce: add local path handling SRC_URI options bitbake: bitbake-user-manual: update perforce fetcher docs Andreas M?ller (1): meson.bbclass: avoid unexpected operating-system names Andreas Müller (6): boost: Add upstream patch to fix build on depending projects libinput: upgrade 1.15.5 -> 1.15.6 sqlite3: upgrade 3.32.2 -> 3.32.3 desktop-file-utils: upgrade 0.24 -> 0.26 file: upgrade 5.38 -> 5.39 ffmpeg: upgrade 4.2.3 -> 4.3 Andrej Valek (1): oeqa/runtime/cases/ptest: Make output content path absolute Andrew Geissler (1): meson: backport library ordering fix Armin Kuster (1): libuv: move from meta-oe to core for bind update Arthur She (1): igt-gpu-tools: add new package Changqing Li (1): mime.bbclass: fix post install scriptlet error Chen Qi (1): systemd-serialgetty: do not use BindsTo Daniel McGregor (3): sign_rpm.bbclass: ignore thread count systemd-conf: Accept MTU from DHCP buildhistory-collect-srcrevs: sort directories He Zhe (1): ltp: Fix copy_file_rang02 for 32-bit arches Hongxu Jia (1): libmodulemd: switch branch master -> main Jacob Kroon (5): bitbake: lib/bb/utils.py: Do not preserve TERM in the environment bitbake: bitbake-user-manual: Remove TERM from BB_HASHBASE_WHITELIST example bitbake.conf: Remove TERM from default BB_HASHBASE_WHITELIST grub: Remove native version of grub-efi distro_alias: Remove unused grub-efi distro aliases Jens Rehsack (1): u-boot: avoid blind merging all *.cfg Joe Slater (1): systemd: fix CVE-2020-13776 Joshua Watt (5): sstatesig: Account for all dataCaches being passed bitbake: bitbake: cache: Fix error message with bad multiconfig wic: Fix error message when reporting invalid offset classes/archiver: Create patched archive before configuring bitbake: cache: Bump cache version Konrad Weihmann (3): oeqa/runtime: Add OERequirePackage decorator bitbake: cookerdata: Add BBFILES_DYNAMIC inverse mode bitbake: bitbake-user-manual: Add BBFILES_DYNAMIC Mark Morton (2): New source files and Makefile update for Test Manual test-manual: Fixed codeblock formatting Martin Jansa (1): net-tools: backport a patch from upstream to use the same ifconfig format as debian/ubuntu Mingli Yu (3): python3: add the rdepends for python3-misc python3: add rdepends for python3-idle python3-dbusmock: add the missing rdepends Otavio Salvador (2): systemd: Sync systemd-serialgetty@.service with upstream mtd-utils: Fix return value of ubiformat Ovidiu Panait (2): dbus-test: Remove EXTRA_OECONF_X configs dbus,dbus-test: Move common parts to dbus.inc Paul Barker (2): bitbake: fetch2/gitsm: Mark srcrev as fetched once all submodules are processed bitbake: fetch2/gitsm: Make need_update() process submodules Paul Eggleton (5): graph-tool: switch to argparse graph-tool: add filter subcommand dpkg-native: rebase and reinstate fix for "tar: file changed as we read it" shadow-sysroot: drop unused SRC_URI checksums devtool: fix typo Peter Kjellerstedt (1): relocatable.bbclass: Avoid an exception if an empty pkgconfig dir exist Pierre-Jean Texier (3): diffoscope: upgrade 146 -> 147 ell: upgrade 0.31 -> 0.32 curl: upgrade 7.70.0 -> 7.71.0 Rasmus Villemoes (1): curl: add debug info Richard Purdie (15): buildhistory: Add simplistic file move detection bitbake: bin/bitbake: Update to next series release version perl: Fix host specific modules problems sanity.conf: Require bitbake 1.47.0 as the minimum version patchelf: Upgrade 0.10 -> 0.11 test-manual: Add SPDX license headers Makefile: Drop obsolete edison/denzil branch conditionals bitbake: tests/fetch: Switch from git.infradead.org to a YP mirror pseudo: Fix attr errors due to incorrect library resolution issues oeqa/selftest/runcmd: Add better debug for thread count mismatch failures oeqa/utils/command: Improve stdin handling in runCmd vulkan-headers: Fix upstream branch deletion issue recipes: Fix Upstream-Status Accepted -> Backport scripts/install-buildtools: Update to 3.2 M1 buildtools scripts/install-buildtools: Handle new format checksum files Robert P. J. Day (1): python: use official "pypi.org" URLs for HOMEPAGE Ross Burton (8): install-buildtools: fail if an error occurs install-buildtools: remove hardcoded x86-64 architecture install-buildtools: add option to disable checksum validation common-licenses: add BSD-2-Clause-Patent gstreamer1.0-plugins-bad: add support for vdpau go-binary-native: add binary Go to bootstrap tcmode-default: use go-binary-native by default go-native: merge bb/inc and add comment Ryan Rowe (1): python3: fix PGO for non-reproducible biniaries Sakib Sajal (1): qemu: uprev v4.2.0 -> v5.0.0 Samuli Piippo (2): cmake: allow chainloading of the toolchain file perl: use relative paths in the perl wrapper Steve Sakoman (1): buildtools-tarball: export OPENSSL_CONF in environment setup Tanu Kaskinen (1): pulseaudio: remove unnecessary libltdl copying Trevor Gamblin (1): python3-setuptools: patch entrypoints for faster initialization Tuomas Salokanto (1): recipetool: create: fix SRCBRANCH not being passed to params Valentin Longchamp (2): tools-profile: disable valgrind for powerpc soft-float valgrind: disable it for powerpc soft-float Wang Mingyu (5): powertop: upgrade 2.12 -> 2.13 man-db: upgrade 2.9.2 -> 2.9.3 valgrind: upgrade 3.16.0 -> 3.16.1 man-pages: upgrade 5.06 -> 5.07 harfbuzz: upgrade 2.6.7 -> 2.6.8 Yi Zhao (2): iptables: fix invalid symbolic link for ip6tables-apply iptables: split iptables-apply to its own package Yongxin Liu (1): linux-firmware: add ice for Intel E800 series driver Yuki Hoshino (1): sysvinit-inittab: Add support for tty devices with 10 or more number. akuster (9): bind: update to 9.11.19 adt-manual: Add SPDX license headers bsp-guide: Add SPDX license headers brief-yoctoprojectsqa: Add SPDX license headers dev-manual: Add SPDX License headers kernel-dev: Add SPDX license headers profile-manual: Add SPDX licence headers sdk-manual: Add SPDX license headers toaster-manaul: Add SPDX license headers haiqing (1): libpam: Remove option 'obscure' from common-password hongxu (1): kmod: add nativesdk support zangrc (1): ethtool:upgrade 5.6 -> 5.7 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I1190ca17297b1167286cfc06033e8485396c7cce
Diffstat (limited to 'poky/meta/recipes-devtools/patchelf')
-rw-r--r--poky/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch45
-rw-r--r--poky/meta/recipes-devtools/patchelf/patchelf/fix-phdrs.patch37
-rw-r--r--poky/meta/recipes-devtools/patchelf/patchelf/handle-read-only-files.patch18
-rw-r--r--poky/meta/recipes-devtools/patchelf/patchelf_0.11.bb (renamed from poky/meta/recipes-devtools/patchelf/patchelf_0.10.bb)4
4 files changed, 11 insertions, 93 deletions
diff --git a/poky/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch b/poky/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch
deleted file mode 100644
index a0988423f..000000000
--- a/poky/meta/recipes-devtools/patchelf/patchelf/fix-adjusting-startPage.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1630d3f846c7721b1e7cd3b005bb2b34816e1d0f Mon Sep 17 00:00:00 2001
-From: Ed Bartosh <ed.bartosh@linux.intel.com>
-Date: Fri, 21 Jul 2017 12:33:53 +0300
-Subject: [PATCH] patchelf: fix segfault for binaries linked by gold
-
-commit 1cc234fea5600190d872329aca60e2365cefc39e
-
-fix adjusting startPage
-
-startPage is adjusted unconditionally for all executables.
-This results in incorrect addresses assigned to INTERP and LOAD
-program headers, which breaks patched executable.
-
-Adjusting startPage variable only when startOffset > startPage
-should fix this.
-
-This change is related to the issue NixOS#10
-
-Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
-
-Github PR: https://github.com/NixOS/patchelf/pull/127
-
-Upstream-Status: Submitted
-
----
- src/patchelf.cc | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/patchelf.cc b/src/patchelf.cc
-index a63e3a11c61f..2483d25d78f1 100644
---- a/src/patchelf.cc
-+++ b/src/patchelf.cc
-@@ -756,10 +756,8 @@ void ElfFile<ElfFileParamNames>::rewriteSectionsLibrary()
- since DYN executables tend to start at virtual address 0, so
- rewriteSectionsExecutable() won't work because it doesn't have
- any virtual address space to grow downwards into. */
-- if (isExecutable) {
-- if (startOffset >= startPage) {
-- debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage);
-- }
-+ if (isExecutable && startOffset > startPage) {
-+ debug("shifting new PT_LOAD segment by %d bytes to work around a Linux kernel bug\n", startOffset - startPage);
- startPage = startOffset;
- }
-
diff --git a/poky/meta/recipes-devtools/patchelf/patchelf/fix-phdrs.patch b/poky/meta/recipes-devtools/patchelf/patchelf/fix-phdrs.patch
deleted file mode 100644
index d087bd785..000000000
--- a/poky/meta/recipes-devtools/patchelf/patchelf/fix-phdrs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-When running patchelf on some existing patchelf'd binaries to change to longer
-RPATHS, ldd would report the binaries as invalid. The output of objdump -x on
-those libraryies should show the top of the .dynamic section is getting trashed,
-something like:
-
-0x600000001 0x0000000000429000
-0x335000 0x0000000000335000
-0xc740 0x000000000000c740
-0x1000 0x0000000000009098
-SONAME libglib-2.0.so.0
-
-(which should be RPATH and DT_NEEDED entries)
-
-This was tracked down to the code which injects the PT_LOAD section.
-
-The issue is that if the program headers were previously relocated to the end
-of the file which was how patchelf operated previously, the relocation code
-wouldn't work properly on a second run as it now assumes they're located after
-the elf header. This change forces them back to immediately follow the elf
-header which is where the code has made space for them.
-
-Upstream-Status: Submitted [https://github.com/NixOS/patchelf/pull/202]
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-RP 2020/6/2
-
-Index: git/src/patchelf.cc
-===================================================================
---- git.orig/src/patchelf.cc
-+++ git/src/patchelf.cc
-@@ -762,6 +762,7 @@ void ElfFile<ElfFileParamNames>::rewrite
- }
-
- /* Add a segment that maps the replaced sections into memory. */
-+ wri(hdr->e_phoff, sizeof(Elf_Ehdr));
- phdrs.resize(rdi(hdr->e_phnum) + 1);
- wri(hdr->e_phnum, rdi(hdr->e_phnum) + 1);
- Elf_Phdr & phdr = phdrs[rdi(hdr->e_phnum) - 1];
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 03b0d18a8..bf721c1af 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,30 +14,32 @@ 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 0b4965adff83..b5db2aef0e8a 100644
---- a/src/patchelf.cc
-+++ b/src/patchelf.cc
-@@ -497,7 +497,17 @@ void ElfFile<ElfFileParamNames>::sortShdrs()
+Index: git/src/patchelf.cc
+===================================================================
+--- git.orig/src/patchelf.cc
++++ git/src/patchelf.cc
+@@ -499,9 +499,19 @@ void ElfFile<ElfFileParamNames>::sortShd
static void writeFile(std::string fileName, FileContents contents)
{
-- int fd = open(fileName.c_str(), O_TRUNC | O_WRONLY);
+ 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_TRUNC | O_WRONLY);
++ fd = open(fileName.c_str(), O_CREAT | O_TRUNC | O_WRONLY, 0777);
+
if (fd == -1)
error("open");
-@@ -511,6 +521,10 @@ static void writeFile(std::string fileName, FileContents contents)
+@@ -515,6 +525,10 @@ static void writeFile(std::string fileNa
if (close(fd) != 0)
error("close");
diff --git a/poky/meta/recipes-devtools/patchelf/patchelf_0.10.bb b/poky/meta/recipes-devtools/patchelf/patchelf_0.11.bb
index 84e640773..ba7ad404e 100644
--- a/poky/meta/recipes-devtools/patchelf/patchelf_0.10.bb
+++ b/poky/meta/recipes-devtools/patchelf/patchelf_0.11.bb
@@ -1,13 +1,11 @@
SRC_URI = "git://github.com/NixOS/patchelf;protocol=https \
file://handle-read-only-files.patch \
- file://fix-adjusting-startPage.patch \
- file://fix-phdrs.patch \
"
LICENSE = "GPLv3"
SUMMARY = "Tool to allow editing of RPATH and interpreter fields in ELF binaries"
-SRCREV = "e1e39f3639e39360ceebb2f7ed533cede4623070"
+SRCREV = "d6b2a72d9ec3bdfde4b1aacdada823ce388968bb"
S = "${WORKDIR}/git"