diff options
Diffstat (limited to 'meta/recipes-devtools/rpm')
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 92c534e58..6aa072d7c 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 @@ +Upstream-Status: Pending + diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h index 0e1bdd7..8b522bb 100644 --- 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 69b7130b9..3663692d2 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 @@ + +Upstream-Status: Inappropriate [configuration] + Index: rpm-5.1.9/configure.ac =================================================================== --- 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 30c5f7b18..5e93517ad 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 without this patch. +Upstream-Status: Pending + Signed-off-by: Mark Hatle <mark.hatle@windriver.com> diff -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 323bb7151..5fe6ded81 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 we may have slightly different, but yet compatible versions. If we do end up breaking things, we'll deal with it at that time. +Upstream-Status: Pending + Signed-off-by: Mark Hatle <mark.hatle@windriver.com> diff -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 36190585c..3aac1164d 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: <arch>-<vendor>-<os> <arch>-<vendor>-<os>-<extension> +Upstream-Status: Pending + Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Index: 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 d1e4bf695..1f948cd65 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 to seed per-file dependency and other information in order to generate a package from previously determined information. +Upstream-Status: Pending + Signed-off-by: Mark Hatle <mark.hatle@windriver.com> diff --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 829399c95..b5ff2637c 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... The problem is that it hasn't been installed yet! So small change causes the libtool to instead use the build version. +Upstream-Status: Pending + Signed-off-by: Mark Hatle <mark.hatle@windriver.com> --- 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 aafa41688..babafb3d7 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 @@ + +Upstream-Status: Inappropriate [configuration] + diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in index 8b94c94..e0b4689 100644 --- 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 4aded7518..d81e25ac4 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 @@ lib/order.c: Make the dependency loop messages into debug msgs +Upstream-Status: Pending + Signed-off-by: Mark Hatle <mark.hatle@windriver.com> diff -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 33039ad99..f6e58283b 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-nofsync.patch @@ -1,5 +1,7 @@ Backport from RPM 5.4.1 CVS, disabled fsync. +Upstream-Status: Backport + Signed-off-by: Mark Hatle <mark.hatle@windriver.com> diff -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 09a1c1304..7b8185783 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch @@ -1,5 +1,7 @@ Fix up platform and related sysinfo file loading. +Upstream-Status: Pending + This ensures that RPM knows the compatible set of package types at all times. Signed-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 5051ce604..b38b34d9d 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch @@ -1,5 +1,7 @@ Workaround for a memory leak in --showrc. +Upstream-Status: Pending + Signed-off-by: Mark Hatle <mark.hatle@windriver.com> diff -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 5c1819c36..d6f43a2c0 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 then enough for now.. also add an RPM_ERROR message in case we exceed the new maximum. +Upstream-Status: Pending + Signed-off-by: Mark Hatle <mark.hatle@windriver.com> diff -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 9e7bba047..dd8d8bd5d 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 @@ Source: None -Status: Needs to go Upstream +Upstream-Status: Pending Author: Khem Raj <raj.khem@gmail.com> Date: 2011-03-03 Description: |