summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2016-02-25 10:54:37 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 17:00:28 +0000
commit8ea55ba895286aac9c33918434d3b008101ecb46 (patch)
tree145ab33472c0a7f2f02867f320f6ed506eb3abba /meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
parent6833c5d77b99ab3f07945ba8e0bbe03df3dc317c (diff)
downloadpoky-8ea55ba895286aac9c33918434d3b008101ecb46.tar.gz
rpm: A number of the patches have been submitted upstream
Note the upstream submission in the patches. (From OE-Core rev: 9672f7620a365d29afca81d357d1d4d5fcedb3ed) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-platform2.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform2.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
index fed54e5f11..b9675c71be 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
@@ -1,7 +1,5 @@
1Fix up platform and related sysinfo file loading (part 2). 1Fix up platform and related sysinfo file loading (part 2).
2 2
3Upstream-Status: Pending
4
5We need to ensure that we set the _gnu flag somehow. We do this by reading 3We need to ensure that we set the _gnu flag somehow. We do this by reading
6from the platform file, and setting a new _platform_gnu and related vars. 4from the platform file, and setting a new _platform_gnu and related vars.
7 5
@@ -11,6 +9,8 @@ values. The macros file uses the configure time defaults in _platform_...
11versions have not been defined. This preserves existing behavior, but 9versions have not been defined. This preserves existing behavior, but
12ensures reasonable defaults are always available. 10ensures reasonable defaults are always available.
13 11
12Upstream-Status: Submitted [RPM5 maintainer]
13
14Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 14Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
15 15
16Index: rpm-5.4.14/lib/rpmrc.c 16Index: rpm-5.4.14/lib/rpmrc.c