diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2016-02-25 10:54:37 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 17:00:28 +0000 |
commit | 8ea55ba895286aac9c33918434d3b008101ecb46 (patch) | |
tree | 145ab33472c0a7f2f02867f320f6ed506eb3abba /meta/recipes-devtools/rpm/rpm/rpm-platform2.patch | |
parent | 6833c5d77b99ab3f07945ba8e0bbe03df3dc317c (diff) | |
download | poky-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.patch | 4 |
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 @@ | |||
1 | Fix up platform and related sysinfo file loading (part 2). | 1 | Fix up platform and related sysinfo file loading (part 2). |
2 | 2 | ||
3 | Upstream-Status: Pending | ||
4 | |||
5 | We need to ensure that we set the _gnu flag somehow. We do this by reading | 3 | We need to ensure that we set the _gnu flag somehow. We do this by reading |
6 | from the platform file, and setting a new _platform_gnu and related vars. | 4 | from 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_... | |||
11 | versions have not been defined. This preserves existing behavior, but | 9 | versions have not been defined. This preserves existing behavior, but |
12 | ensures reasonable defaults are always available. | 10 | ensures reasonable defaults are always available. |
13 | 11 | ||
12 | Upstream-Status: Submitted [RPM5 maintainer] | ||
13 | |||
14 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 14 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
15 | 15 | ||
16 | Index: rpm-5.4.14/lib/rpmrc.c | 16 | Index: rpm-5.4.14/lib/rpmrc.c |