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>
This commit is contained in:
Saul Wold 2011-12-28 15:41:08 -08:00 committed by Richard Purdie
parent 70c18f205d
commit ece80fe035
44 changed files with 85 additions and 10 deletions

View File

@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [configuration]
Index: openswan-2.4.7/Makefile.inc Index: openswan-2.4.7/Makefile.inc
=================================================================== ===================================================================
--- openswan-2.4.7.orig/Makefile.inc 2006-12-25 18:05:40.608503250 +0100 --- openswan-2.4.7.orig/Makefile.inc 2006-12-25 18:05:40.608503250 +0100

View File

@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [configuration]
--- openswan-2.2.0.orig/programs/Makefile.program 2004-06-03 03:06:27.000000000 +0200 --- openswan-2.2.0.orig/programs/Makefile.program 2004-06-03 03:06:27.000000000 +0200
+++ openswan-2.2.0/programs/Makefile.program 2005-03-05 13:50:19.000000000 +0100 +++ openswan-2.2.0/programs/Makefile.program 2005-03-05 13:50:19.000000000 +0100
@@ -30,10 +30,6 @@ @@ -30,10 +30,6 @@

View File

@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [configuration]
diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile
--- openswan-2.4.7.orig/doc/Makefile 2005-11-08 23:32:45.000000000 +0200 --- openswan-2.4.7.orig/doc/Makefile 2005-11-08 23:32:45.000000000 +0200
+++ openswan-2.4.7/doc/Makefile 2006-12-06 22:46:54.732830840 +0200 +++ openswan-2.4.7/doc/Makefile 2006-12-06 22:46:54.732830840 +0200

View File

@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [configuration]
--- wbxml2-0.9.2/Makefile.am.old 2007-01-03 19:50:24.000000000 +0000 --- wbxml2-0.9.2/Makefile.am.old 2007-01-03 19:50:24.000000000 +0000
+++ wbxml2-0.9.2/Makefile.am 2007-01-03 19:50:39.000000000 +0000 +++ wbxml2-0.9.2/Makefile.am 2007-01-03 19:50:39.000000000 +0000
@@ -24,9 +24,9 @@ @@ -24,9 +24,9 @@

View File

@ -3,6 +3,8 @@
gcalctool/Makefile.am | 2 -- gcalctool/Makefile.am | 2 --
2 files changed, 1 insertion(+), 3 deletions(-) 2 files changed, 1 insertion(+), 3 deletions(-)
Upstream-Status: Inappropriate [configuration]
Index: gcalctool-5.8.17/gcalctool/Makefile.am Index: gcalctool-5.8.17/gcalctool/Makefile.am
=================================================================== ===================================================================
--- gcalctool-5.8.17.orig/gcalctool/Makefile.am 2005-12-19 15:46:57.000000000 +0000 --- gcalctool-5.8.17.orig/gcalctool/Makefile.am 2005-12-19 15:46:57.000000000 +0000

View File

@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [configuration]
--- fribidi-0.10.4/configure.in~ 2002-05-19 11:06:48.000000000 +0100 --- fribidi-0.10.4/configure.in~ 2002-05-19 11:06:48.000000000 +0100
+++ fribidi-0.10.4/configure.in 2004-08-03 17:42:28.000000000 +0100 +++ fribidi-0.10.4/configure.in 2004-08-03 17:42:28.000000000 +0100
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@

View File

@ -1,7 +1,8 @@
# #
# Patch managed by http://www.holgerschurig.de/patcher.html # Patch managed by http://www.holgerschurig.de/patcher.html
# #
Upstream-Status: Inappropriate [configuration]
--- openobex-1.2/apps/Makefile.am~disable-cable-test --- openobex-1.2/apps/Makefile.am~disable-cable-test
+++ openobex-1.2/apps/Makefile.am +++ openobex-1.2/apps/Makefile.am

View File

@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [configuration]
Index: openobex-1.5/acinclude.m4 Index: openobex-1.5/acinclude.m4
=================================================================== ===================================================================
--- openobex-1.5.orig/acinclude.m4 2009-02-08 18:30:22.000000000 +0000 --- openobex-1.5.orig/acinclude.m4 2009-02-08 18:30:22.000000000 +0000

View File

@ -1,4 +1,4 @@
UpstreamStatus: Pending Upstream-Status: Pending
Used the cross strip instead of host strip to avoid this build error: Used the cross strip instead of host strip to avoid this build error:

View File

@ -6,7 +6,7 @@ Subject: [PATCH] Disable building of alg-test
alg-test utility depends on linux/if_alg.h header that is only alg-test utility depends on linux/if_alg.h header that is only
available on kernels >= 2.6.39. available on kernels >= 2.6.39.
Upstream Status: Inappropriate [configuration] Upstream-Status: Inappropriate [configuration]
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
--- ---

View File

@ -3,7 +3,7 @@ will shut down all the networking when it starts without any configuration
which is usualy not what the users expects. This is particularly which is usualy not what the users expects. This is particularly
problematic with our qemu images and runtime testing using qemu. problematic with our qemu images and runtime testing using qemu.
Upstream Status: Inappropriate [Configuration] Upstream-Status: Inappropriate [Configuration]
RP 2011/12/12 RP 2011/12/12

View File

@ -11,6 +11,8 @@ CDPATH="${ZSH_VERSION+.}:" && cd . && perllibdir="automake-1.11.1/lib:./lib" "au
/bin/sh: automake-1.11.1/aclocal: No such file or directory /bin/sh: automake-1.11.1/aclocal: No such file or directory
make: *** [aclocal.m4] Error 127 make: *** [aclocal.m4] Error 127
Upstream-Status: Pending
Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Tom Rini <tom_rini@mentor.com>
Index: automake-1.11.1/m4/tar.m4 Index: automake-1.11.1/m4/tar.m4

View File

@ -1,4 +1,4 @@
UpstreamStatus: Inappropriate Upstream-Status: Inappropriate
This patch fixes populated dosfs image creation with directory This patch fixes populated dosfs image creation with directory
structures. Earlier it was causing segfault; and only image structures. Earlier it was causing segfault; and only image

View File

@ -4,7 +4,7 @@ broken images with the -d option. It can still be enabled on the commandline
at the users own risk. This changes us back to the 2.10 version's behaviour at the users own risk. This changes us back to the 2.10 version's behaviour
which was known to work well even with large images. which was known to work well even with large images.
Upstream Status: Inapprioriate [depends on other patches we apply] Upstream-Status: Inapproriate [depends on other patches we apply]
RP 2011/12/13 RP 2011/12/13

View File

@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [configuration]
--- trunk/libopkg/opkg_download.c 2011-03-10 16:41:29.000000000 +0800 --- trunk/libopkg/opkg_download.c 2011-03-10 16:41:29.000000000 +0800
+++ trunk/libopkg/opkg_download.c 2011-03-10 16:42:33.000000000 +0800 +++ trunk/libopkg/opkg_download.c 2011-03-10 16:42:33.000000000 +0800
@@ -162,6 +162,7 @@ @@ -162,6 +162,7 @@

View File

@ -1,3 +1,6 @@
Upstream-Status: Inappropriate [configuration]
Index: intltool-0.40.6/intltool.m4 Index: intltool-0.40.6/intltool.m4
=================================================================== ===================================================================
--- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800 --- intltool-0.40.6.orig/intltool.m4 2009-02-14 14:12:28.000000000 -0800

View File

@ -6,7 +6,7 @@ Subject: ipkg-utils: Make arfile.py handle six digit UIDs
as a single field. This makes things better than before as it now honors as a single field. This makes things better than before as it now honors
the fixed field widths. the fixed field widths.
Upsteam-status: Pending (there is no upstream after openmoko imploded) Upstream-Status: Pending (there is no upstream after openmoko imploded)
--- ipkg-utils/arfile.py.orig 2010-09-29 13:38:15.000000000 -0700 --- ipkg-utils/arfile.py.orig 2010-09-29 13:38:15.000000000 -0700
+++ ipkg-utils/arfile.py 2010-10-01 16:06:00.000000000 -0700 +++ ipkg-utils/arfile.py 2010-10-01 16:06:00.000000000 -0700

View File

@ -1,6 +1,8 @@
Due to disabling the LD_LIBRARY_PATH handling, we need to use a static Due to disabling the LD_LIBRARY_PATH handling, we need to use a static
libsqlite. libsqlite.
Upstream-Status: Inappropriate [configuration]
diff -ur git.orig/Makefile.in git/Makefile.in diff -ur git.orig/Makefile.in git/Makefile.in
--- git.orig/Makefile.in --- git.orig/Makefile.in
+++ git/Makefile.in +++ git/Makefile.in

View File

@ -16,6 +16,9 @@ The python recipe building was failing because python-native
could not handle sys.lib var. sys.lib var is defined in the could not handle sys.lib var. sys.lib var is defined in the
multilib patch hence added this multilib.patch for python-native multilib patch hence added this multilib.patch for python-native
recipe. recipe.
Upstream-Status: Inappropriate [oe-specific]
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
Index: Python-2.7.2/Include/pythonrun.h Index: Python-2.7.2/Include/pythonrun.h

View File

@ -12,6 +12,9 @@ Date: Tue Jun 28 21:21:29 2011 +0800
2011/09/29 2011/09/29
Rebased for python 2.7.2 Rebased for python 2.7.2
Upstream-Status: Inappropriate [configuration]
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
Index: Python-2.7.2/Include/pythonrun.h Index: Python-2.7.2/Include/pythonrun.h

View File

@ -1,3 +1,5 @@
Upstream-Status: Pending
diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h
index 0e1bdd7..8b522bb 100644 index 0e1bdd7..8b522bb 100644
--- a/rpmdb/rpmdb.h --- a/rpmdb/rpmdb.h

View File

@ -1,3 +1,6 @@
Upstream-Status: Inappropriate [configuration]
Index: rpm-5.1.9/configure.ac Index: rpm-5.1.9/configure.ac
=================================================================== ===================================================================
--- rpm-5.1.9.orig/configure.ac 2009-04-18 17:47:02.000000000 +0100 --- rpm-5.1.9.orig/configure.ac 2009-04-18 17:47:02.000000000 +0100

View File

@ -4,6 +4,8 @@ configure.ac:11: error: m4_divert_push: cannot change diversion to `GROW' inside
without this patch. without this patch.
Upstream-Status: Pending
Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 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 -ur rpm-5.1.10.orig/configure.ac rpm-5.1.10/configure.ac

View File

@ -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 we may have slightly different, but yet compatible versions. If we do end
up breaking things, we'll deal with it at that time. up breaking things, we'll deal with it at that time.
Upstream-Status: Pending
Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 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 -ur rpm-5.4.0.orig/autogen.sh rpm-5.4.0/autogen.sh

View File

@ -14,6 +14,8 @@ This patch changes the list of supported items to:
<arch>-<vendor>-<os> <arch>-<vendor>-<os>
<arch>-<vendor>-<os>-<extension> <arch>-<vendor>-<os>-<extension>
Upstream-Status: Pending
Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Index: rpm-5.4.0/lib/rpmrc.c Index: rpm-5.4.0/lib/rpmrc.c

View File

@ -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 to seed per-file dependency and other information in order to generate a
package from previously determined information. package from previously determined information.
Upstream-Status: Pending
Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
diff --git a/lib/rpmfc.c b/lib/rpmfc.c diff --git a/lib/rpmfc.c b/lib/rpmfc.c

View File

@ -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 problem is that it hasn't been installed yet! So small change causes
the libtool to instead use the build version. the libtool to instead use the build version.
Upstream-Status: Pending
Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
--- rpm-5.4.0/lib/Makefile.am.orig --- rpm-5.4.0/lib/Makefile.am.orig

View File

@ -1,3 +1,6 @@
Upstream-Status: Inappropriate [configuration]
diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in diff --git a/rpmdb/DB_CONFIG.in b/rpmdb/DB_CONFIG.in
index 8b94c94..e0b4689 100644 index 8b94c94..e0b4689 100644
--- a/rpmdb/DB_CONFIG.in --- a/rpmdb/DB_CONFIG.in

View File

@ -1,5 +1,7 @@
lib/order.c: Make the dependency loop messages into debug msgs lib/order.c: Make the dependency loop messages into debug msgs
Upstream-Status: Pending
Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 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 -urN rpm-5.4.0.orig/lib/order.c rpm-5.4.0/lib/order.c

View File

@ -1,5 +1,7 @@
Backport from RPM 5.4.1 CVS, disabled fsync. Backport from RPM 5.4.1 CVS, disabled fsync.
Upstream-Status: Backport
Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
diff -ur rpm-5.4.0.orig/CHANGES rpm-5.4.0/CHANGES diff -ur rpm-5.4.0.orig/CHANGES rpm-5.4.0/CHANGES

View File

@ -1,5 +1,7 @@
Fix up platform and related sysinfo file loading. 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. This ensures that RPM knows the compatible set of package types at all times.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

View File

@ -1,5 +1,7 @@
Workaround for a memory leak in --showrc. Workaround for a memory leak in --showrc.
Upstream-Status: Pending
Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 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 -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c

View File

@ -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 then enough for now.. also add an RPM_ERROR message in case we exceed the
new maximum. new maximum.
Upstream-Status: Pending
Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 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 -urN rpm-5.4.0.orig/rpmio/rpmbag.c rpm-5.4.0/rpmio/rpmbag.c

View File

@ -1,5 +1,5 @@
Source: None Source: None
Status: Needs to go Upstream Upstream-Status: Pending
Author: Khem Raj <raj.khem@gmail.com> Author: Khem Raj <raj.khem@gmail.com>
Date: 2011-03-03 Date: 2011-03-03
Description: Description:

View File

@ -2,6 +2,7 @@ sigmask is a macro which is dropped if BSD compatibility is
not enabled. So we check if the macro does not exist then not enabled. So we check if the macro does not exist then
we define it to __sigmask we define it to __sigmask
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: strace-4.5.20/signal.c Index: strace-4.5.20/signal.c

View File

@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [configuration]
Index: gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in Index: gobject-introspection-0.9.10/tools/g-ir-annotation-tool.in
=================================================================== ===================================================================
--- gobject-introspection-0.9.10.orig/tools/g-ir-annotation-tool.in --- gobject-introspection-0.9.10.orig/tools/g-ir-annotation-tool.in

View File

@ -1,7 +1,7 @@
Using @PYTHON@ for this path would result in the build system python being Using @PYTHON@ for this path would result in the build system python being
referred to. Instead we want to locate python from the environment. referred to. Instead we want to locate python from the environment.
Upstream Status: Inappropriate [configuration] Upstream-Status: Inappropriate [configuration]
diff -ruN libglade-2.6.4-orig//libglade-convert.in libglade-2.6.4/libglade-convert.in diff -ruN libglade-2.6.4-orig//libglade-convert.in libglade-2.6.4/libglade-convert.in
--- libglade-2.6.4-orig//libglade-convert.in 2011-09-22 10:18:28.991164003 +0800 --- libglade-2.6.4-orig//libglade-convert.in 2011-09-22 10:18:28.991164003 +0800

View File

@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [configuration]
Index: git/Makefile Index: git/Makefile
=================================================================== ===================================================================
--- git.orig/Makefile 2010-11-22 11:20:14.303472770 -0600 --- git.orig/Makefile 2010-11-22 11:20:14.303472770 -0600

View File

@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [configuration]
Index: git/Makefile Index: git/Makefile
=================================================================== ===================================================================
--- git.orig/Makefile 2011-11-02 14:52:17.243104779 -0700 --- git.orig/Makefile 2011-11-02 14:52:17.243104779 -0700

View File

@ -1,3 +1,6 @@
Upstream-Status: Inappropriate [configuration]
Index: tools/perf/Makefile Index: tools/perf/Makefile
=================================================================== ===================================================================
--- a/tools/perf/Makefile 2011-01-14 14:17:33.127008554 -0600 --- a/tools/perf/Makefile 2011-01-14 14:17:33.127008554 -0600

View File

@ -1,3 +1,6 @@
Upstream-Status: Pending
Index: git/util.h Index: git/util.h
=================================================================== ===================================================================
--- git.orig/util.h 2010-12-07 22:41:57.156243001 -0600 --- git.orig/util.h 2010-12-07 22:41:57.156243001 -0600

View File

@ -1,3 +1,5 @@
Upstream-Status: Pending
Index: git/util.h Index: git/util.h
=================================================================== ===================================================================
--- git.orig/util.h 2010-12-08 01:22:44.486243001 -0600 --- git.orig/util.h 2010-12-08 01:22:44.486243001 -0600

View File

@ -2,6 +2,8 @@ Allow LIB_INSTALL_DIR to be set by the the cmake configure invocation. We dont
easily have a way of determining something that patches ${LIB_SUFFIX} so we'll easily have a way of determining something that patches ${LIB_SUFFIX} so we'll
set LIB_INSTALL_DIR. set LIB_INSTALL_DIR.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Index: libmusicbrainz-3.0.3/CMakeLists.txt Index: libmusicbrainz-3.0.3/CMakeLists.txt

View File

@ -1,4 +1,4 @@
UpstreamStatus: Pending Upstream-Status: Pending
When LONG_MIN is passed to val, -val is undefined. This patch fixes When LONG_MIN is passed to val, -val is undefined. This patch fixes
it. See for details: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50066 it. See for details: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50066