summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-12-28 15:41:08 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:31 +0000
commitece80fe035c49a192abbca2dd00e50699e786e95 (patch)
tree605be2dd67546c867b234c78148b393686021061 /meta/recipes-devtools/rpm
parent70c18f205d07384548dcaff904f7f854e9c51cc5 (diff)
downloadpoky-ece80fe035c49a192abbca2dd00e50699e786e95.tar.gz
Add Upstream-Status to patches
(From OE-Core rev: 169e55d802883df763dbff4a4737e05e96358fa3) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r--meta/recipes-devtools/rpm/rpm/header-include-fix.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch3
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-autogen.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch3
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-showrc.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch2
14 files changed, 29 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/header-include-fix.patch b/meta/recipes-devtools/rpm/rpm/header-include-fix.patch
index 92c534e582..6aa072d7c8 100644
--- a/meta/recipes-devtools/rpm/rpm/header-include-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/header-include-fix.patch
@@ -1,3 +1,5 @@
1Upstream-Status: Pending
2
1diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h 3diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
2index 0e1bdd7..8b522bb 100644 4index 0e1bdd7..8b522bb 100644
3--- a/rpmdb/rpmdb.h 5--- a/rpmdb/rpmdb.h
diff --git a/meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch b/meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch
index 69b7130b9b..3663692d2d 100644
--- a/meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch
+++ b/meta/recipes-devtools/rpm/rpm/remove-compiled-tests.patch
@@ -1,3 +1,6 @@
1
2Upstream-Status: Inappropriate [configuration]
3
1Index: rpm-5.1.9/configure.ac 4Index: rpm-5.1.9/configure.ac
2=================================================================== 5===================================================================
3--- rpm-5.1.9.orig/configure.ac 2009-04-18 17:47:02.000000000 +0100 6--- rpm-5.1.9.orig/configure.ac 2009-04-18 17:47:02.000000000 +0100
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch b/meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch
index 30c5f7b183..5e93517ad1 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-autoconf.patch
@@ -4,6 +4,8 @@ configure.ac:11: error: m4_divert_push: cannot change diversion to `GROW' inside
4 4
5without this patch. 5without this patch.
6 6
7Upstream-Status: Pending
8
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8 10
9diff -ur rpm-5.1.10.orig/configure.ac rpm-5.1.10/configure.ac 11diff -ur rpm-5.1.10.orig/configure.ac rpm-5.1.10/configure.ac
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch b/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch
index 323bb7151e..5fe6ded811 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-autogen.patch
@@ -2,6 +2,8 @@ Remove the sanity checking from the rpm autogen.sh. This is required because
2we may have slightly different, but yet compatible versions. If we do end 2we may have slightly different, but yet compatible versions. If we do end
3up breaking things, we'll deal with it at that time. 3up breaking things, we'll deal with it at that time.
4 4
5Upstream-Status: Pending
6
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6 8
7diff -ur rpm-5.4.0.orig/autogen.sh rpm-5.4.0/autogen.sh 9diff -ur rpm-5.4.0.orig/autogen.sh rpm-5.4.0/autogen.sh
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch b/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
index 36190585ca..3aac1164d6 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-canonarch.patch
@@ -14,6 +14,8 @@ This patch changes the list of supported items to:
14 <arch>-<vendor>-<os> 14 <arch>-<vendor>-<os>
15 <arch>-<vendor>-<os>-<extension> 15 <arch>-<vendor>-<os>-<extension>
16 16
17Upstream-Status: Pending
18
17Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 19Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
18 20
19Index: rpm-5.4.0/lib/rpmrc.c 21Index: rpm-5.4.0/lib/rpmrc.c
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch b/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch
index d1e4bf695c..1f948cd65a 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch
@@ -7,6 +7,8 @@ Note: this is a temporary workaround. Eventually we will want to have a way
7to seed per-file dependency and other information in order to generate a 7to seed per-file dependency and other information in order to generate a
8package from previously determined information. 8package from previously determined information.
9 9
10Upstream-Status: Pending
11
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 12Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11 13
12diff --git a/lib/rpmfc.c b/lib/rpmfc.c 14diff --git a/lib/rpmfc.c b/lib/rpmfc.c
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch
index 829399c95e..b5ff2637c2 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch
@@ -2,6 +2,8 @@ During installation, the libtool relink attempts to link to -lrpm...
2The problem is that it hasn't been installed yet! So small change causes 2The problem is that it hasn't been installed yet! So small change causes
3the libtool to instead use the build version. 3the libtool to instead use the build version.
4 4
5Upstream-Status: Pending
6
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6 8
7--- rpm-5.4.0/lib/Makefile.am.orig 9--- rpm-5.4.0/lib/Makefile.am.orig
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch b/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
index aafa416881..babafb3d72 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-log-auto-rm.patch
@@ -1,3 +1,6 @@
1
2Upstream-Status: Inappropriate [configuration]
3
1diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in 4diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in
2index 8b94c94..e0b4689 100644 5index 8b94c94..e0b4689 100644
3--- a/rpmdb/DB_CONFIG.in 6--- a/rpmdb/DB_CONFIG.in
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
index 4aded7518e..d81e25ac4e 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
@@ -1,5 +1,7 @@
1lib/order.c: Make the dependency loop messages into debug msgs 1lib/order.c: Make the dependency loop messages into debug msgs
2 2
3Upstream-Status: Pending
4
3Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
4 6
5diff -urN rpm-5.4.0.orig/lib/order.c rpm-5.4.0/lib/order.c 7diff -urN rpm-5.4.0.orig/lib/order.c rpm-5.4.0/lib/order.c
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch b/meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch
index 33039ad990..f6e58283be 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch
@@ -1,5 +1,7 @@
1Backport from RPM 5.4.1 CVS, disabled fsync. 1Backport from RPM 5.4.1 CVS, disabled fsync.
2 2
3Upstream-Status: Backport
4
3Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
4 6
5diff -ur rpm-5.4.0.orig/CHANGES rpm-5.4.0/CHANGES 7diff -ur rpm-5.4.0.orig/CHANGES rpm-5.4.0/CHANGES
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
index 09a1c13048..7b81857837 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
@@ -1,5 +1,7 @@
1Fix up platform and related sysinfo file loading. 1Fix up platform and related sysinfo file loading.
2 2
3Upstream-Status: Pending
4
3This ensures that RPM knows the compatible set of package types at all times. 5This ensures that RPM knows the compatible set of package types at all times.
4 6
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 7Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch b/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch
index 5051ce604b..b38b34d9db 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch
@@ -1,5 +1,7 @@
1Workaround for a memory leak in --showrc. 1Workaround for a memory leak in --showrc.
2 2
3Upstream-Status: Pending
4
3Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
4 6
5diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c 7diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch b/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch
index 5c1819c367..d6f43a2c06 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-solvedb.patch
@@ -4,6 +4,8 @@ Previously the max was set to 5, up this to 20... this should be more
4then enough for now.. also add an RPM_ERROR message in case we exceed the 4then enough for now.. also add an RPM_ERROR message in case we exceed the
5new maximum. 5new maximum.
6 6
7Upstream-Status: Pending
8
7Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 9Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
8 10
9diff -urN rpm-5.4.0.orig/rpmio/rpmbag.c rpm-5.4.0/rpmio/rpmbag.c 11diff -urN rpm-5.4.0.orig/rpmio/rpmbag.c rpm-5.4.0/rpmio/rpmbag.c
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch b/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
index 9e7bba0475..dd8d8bd5de 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-tools-mtree-LDFLAGS.patch
@@ -1,5 +1,5 @@
1Source: None 1Source: None
2Status: Needs to go Upstream 2Upstream-Status: Pending
3Author: Khem Raj <raj.khem@gmail.com> 3Author: Khem Raj <raj.khem@gmail.com>
4Date: 2011-03-03 4Date: 2011-03-03
5Description: 5Description: