diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-08-29 23:21:08 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-31 17:57:12 +0100 |
commit | ada48bbe8c48a424171ef57f334b8332e75772a0 (patch) | |
tree | c65614e353af6e281e095422ee812f1f78698a23 | |
parent | 269bea560c3becd2e1c21ac3931557b55bfc1866 (diff) | |
download | poky-ada48bbe8c48a424171ef57f334b8332e75772a0.tar.gz |
rpm: Do not require that ELF binaries are executable to be identifiable
There is nothing that requires, e.g., a DSO to be executable, but it
is still an ELF binary and should be identified as such.
(From OE-Core rev: 8d9cca4956ba1d8438e185af8baa2b64809d7c86)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_git.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch b/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch new file mode 100644 index 0000000000..c910a478ee --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From d65d6e8760afbd7f70b22a1f3297a037bc475fea Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Kjellerstedt <pkj@axis.com> | ||
3 | Date: Mon, 15 May 2017 10:21:08 +0200 | ||
4 | Subject: [PATCH 11/13] Do not require that ELF binaries are executable to be | ||
5 | identifiable | ||
6 | |||
7 | There is nothing that requires, e.g., a DSO to be executable, but it | ||
8 | is still an ELF binary and should be identified as such. | ||
9 | |||
10 | Upstream probably expects all ELF binaries to be marked as executable, | ||
11 | but rather than imposing such a limitation for OE, allow any file to | ||
12 | be identified as an ELF binary regardless of whether it is executable | ||
13 | or not. | ||
14 | |||
15 | Upstream-Status: Inappropriate | ||
16 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | ||
17 | --- | ||
18 | fileattrs/elf.attr | 1 - | ||
19 | 1 file changed, 1 deletion(-) | ||
20 | |||
21 | diff --git a/fileattrs/elf.attr b/fileattrs/elf.attr | ||
22 | index 595b33e09..bac52649d 100644 | ||
23 | --- a/fileattrs/elf.attr | ||
24 | +++ b/fileattrs/elf.attr | ||
25 | @@ -1,4 +1,3 @@ | ||
26 | %__elf_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private} | ||
27 | %__elf_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private} | ||
28 | %__elf_magic ^(setuid )?(setgid )?(sticky )?ELF (32|64)-bit.*$ | ||
29 | -%__elf_flags exeonly | ||
30 | -- | ||
31 | 2.12.0 | ||
32 | |||
diff --git a/meta/recipes-devtools/rpm/rpm_git.bb b/meta/recipes-devtools/rpm/rpm_git.bb index 7665d54cdc..15880377b8 100644 --- a/meta/recipes-devtools/rpm/rpm_git.bb +++ b/meta/recipes-devtools/rpm/rpm_git.bb | |||
@@ -35,6 +35,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm \ | |||
35 | file://0001-Fix-build-with-musl-C-library.patch \ | 35 | file://0001-Fix-build-with-musl-C-library.patch \ |
36 | file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \ | 36 | file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \ |
37 | file://0001-Add-PYTHON_ABI-when-searching-for-python-libraries.patch \ | 37 | file://0001-Add-PYTHON_ABI-when-searching-for-python-libraries.patch \ |
38 | file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \ | ||
38 | " | 39 | " |
39 | 40 | ||
40 | PV = "4.13.90+git${SRCPV}" | 41 | PV = "4.13.90+git${SRCPV}" |