summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch32
-rw-r--r--meta/recipes-devtools/rpm/rpm_git.bb1
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 @@
1From d65d6e8760afbd7f70b22a1f3297a037bc475fea Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Mon, 15 May 2017 10:21:08 +0200
4Subject: [PATCH 11/13] Do not require that ELF binaries are executable to be
5 identifiable
6
7There is nothing that requires, e.g., a DSO to be executable, but it
8is still an ELF binary and should be identified as such.
9
10Upstream probably expects all ELF binaries to be marked as executable,
11but rather than imposing such a limitation for OE, allow any file to
12be identified as an ELF binary regardless of whether it is executable
13or not.
14
15Upstream-Status: Inappropriate
16Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
17---
18 fileattrs/elf.attr | 1 -
19 1 file changed, 1 deletion(-)
20
21diff --git a/fileattrs/elf.attr b/fileattrs/elf.attr
22index 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--
312.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
40PV = "4.13.90+git${SRCPV}" 41PV = "4.13.90+git${SRCPV}"