summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-12-18 18:00:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-02 17:24:36 +0000
commit0ac5ca3fcf60d42337ea62c3006f3787a7978131 (patch)
treeb5e5909c499ff39d74815b7603125df2a85cb5cf /meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch
parent0d5475a3b28d9e2c9273967a03726bb6c427bd11 (diff)
downloadpoky-0ac5ca3fcf60d42337ea62c3006f3787a7978131.tar.gz
rpm: update to 4.14.0
Previously oe-core had a development snapshot of rpm, it's better to update to something more stable. Removed patches: 0001-Add-PYTHON_ABI-when-searching-for-python-libraries.patch (upstream is using pkg-config) 0001-When-nice-value-cannot-be-reset-issue-a-notice-inste.patch (functionality has been moved to a plugin, we disable plugins for rpm-native) 0012-Use-conditional-to-access-_docdir-in-macros.in.patch (merged upstream) Changed patches: 0001-Fix-build-with-musl-C-library.patch (one previous musl issue has been resolved upstream; another has been added) Rest of the patches are trivial rebases. Update the signing oe-selftest so that the reference output matches the upstream changes. (From OE-Core rev: b4613b6ce07c295c5d6de6861acf19315acaccb2) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch')
-rw-r--r--meta/recipes-devtools/rpm/files/0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch11
1 files changed, 6 insertions, 5 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
index c910a478ee..4ac5c38f06 100644
--- 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
@@ -1,7 +1,7 @@
1From d65d6e8760afbd7f70b22a1f3297a037bc475fea Mon Sep 17 00:00:00 2001 1From 5141d50d7b3d3c209a22c53deedb4ceef014401d Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com> 2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Mon, 15 May 2017 10:21:08 +0200 3Date: Mon, 15 May 2017 10:21:08 +0200
4Subject: [PATCH 11/13] Do not require that ELF binaries are executable to be 4Subject: [PATCH 09/15] Do not require that ELF binaries are executable to be
5 identifiable 5 identifiable
6 6
7There is nothing that requires, e.g., a DSO to be executable, but it 7There is nothing that requires, e.g., a DSO to be executable, but it
@@ -14,19 +14,20 @@ or not.
14 14
15Upstream-Status: Inappropriate 15Upstream-Status: Inappropriate
16Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> 16Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
17
17--- 18---
18 fileattrs/elf.attr | 1 - 19 fileattrs/elf.attr | 1 -
19 1 file changed, 1 deletion(-) 20 1 file changed, 1 deletion(-)
20 21
21diff --git a/fileattrs/elf.attr b/fileattrs/elf.attr 22diff --git a/fileattrs/elf.attr b/fileattrs/elf.attr
22index 595b33e09..bac52649d 100644 23index 5805dd0ee..3516f309d 100644
23--- a/fileattrs/elf.attr 24--- a/fileattrs/elf.attr
24+++ b/fileattrs/elf.attr 25+++ b/fileattrs/elf.attr
25@@ -1,4 +1,3 @@ 26@@ -1,4 +1,3 @@
26 %__elf_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private} 27 %__elf_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private}
27 %__elf_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private} 28 %__elf_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private}
28 %__elf_magic ^(setuid )?(setgid )?(sticky )?ELF (32|64)-bit.*$ 29 %__elf_magic ^(setuid,? )?(setgid,? )?(sticky )?ELF (32|64)-bit.*$
29-%__elf_flags exeonly 30-%__elf_flags exeonly
30-- 31--
312.12.0 322.14.2
32 33