From 0dbd791e5b837a096f020635c773715bae7b15f5 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Sun, 15 May 2011 20:04:27 -0700 Subject: recipes: Add Upstream-Status to various recipe patches Add Upstream-Status tag to patches for the following recipes: openssh dbus-glib expat opensp sgml-common at cpio (GPLv3 version) libpam icu (From OE-Core rev: 0702602332ad63c2cfaa207516497bb0b75bfdf3) Signed-off-by: Scott Garman Signed-off-by: Richard Purdie --- meta/recipes-extended/at/at-3.1.12/configure.patch | 8 ++++++-- .../at/at-3.1.12/fix_parallel_build_error.patch | 4 ++++ meta/recipes-extended/cpio/cpio-2.11/statdef.patch | 8 ++++++-- meta/recipes-extended/pam/libpam/pam-no-innetgr.patch | 5 +++++ meta/recipes-extended/sudo/files/libtool.patch | 10 +++++++--- 5 files changed, 28 insertions(+), 7 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/at/at-3.1.12/configure.patch b/meta/recipes-extended/at/at-3.1.12/configure.patch index 2458ef357a..079a6b4497 100644 --- a/meta/recipes-extended/at/at-3.1.12/configure.patch +++ b/meta/recipes-extended/at/at-3.1.12/configure.patch @@ -1,5 +1,9 @@ -# Fix cross-compilation issues in configure.ac -# Derived from an OE patch for at-3.1.8 +Fix cross-compilation issues in configure.ac +Derived from an OE patch for at-3.1.8 + +Upstream-Status: Pending + +Signed-off-by: Scott Garman Index: at-3.1.12/configure.ac =================================================================== diff --git a/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch b/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch index 6383660e80..877be35aaf 100644 --- a/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch +++ b/meta/recipes-extended/at/at-3.1.12/fix_parallel_build_error.patch @@ -9,6 +9,10 @@ Fixed the issue by adding a dependancy in the makefile. Nitin 2010/09/02 +Upstream-Status: Pending + +Signed-off-by: Scott Garman + Index: at-3.1.12/Makefile.in =================================================================== --- at-3.1.12.orig/Makefile.in diff --git a/meta/recipes-extended/cpio/cpio-2.11/statdef.patch b/meta/recipes-extended/cpio/cpio-2.11/statdef.patch index dfa0d9150a..a6b8e82a0b 100644 --- a/meta/recipes-extended/cpio/cpio-2.11/statdef.patch +++ b/meta/recipes-extended/cpio/cpio-2.11/statdef.patch @@ -1,5 +1,9 @@ -# Avoid multiple stat definitions -# Patch taken from cpio mailing list posting 2010-03-19 +Avoid multiple stat definitions +Patch taken from cpio mailing list posting 2010-03-19 + +Upstream-Status: Pending + +Signed-off-by: Scott Garman diff -urN cpio-2.11.orig/src/filetypes.h cpio-2.11/src/filetypes.h --- cpio-2.11.orig/src/filetypes.h 2010-02-12 02:19:23.000000000 -0800 diff --git a/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch b/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch index e622a0d246..5e551ac48f 100644 --- a/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch +++ b/meta/recipes-extended/pam/libpam/pam-no-innetgr.patch @@ -2,6 +2,11 @@ innetgr may not be there so make sure that when innetgr is not present then we inform about it and not use it. -Khem + +Upstream-Status: Pending + +Signed-off-by: Scott Garman + Index: Linux-PAM-1.1.3/modules/pam_group/pam_group.c =================================================================== --- Linux-PAM-1.1.3.orig/modules/pam_group/pam_group.c diff --git a/meta/recipes-extended/sudo/files/libtool.patch b/meta/recipes-extended/sudo/files/libtool.patch index 2375fc60c3..22fda535d6 100644 --- a/meta/recipes-extended/sudo/files/libtool.patch +++ b/meta/recipes-extended/sudo/files/libtool.patch @@ -1,6 +1,10 @@ -# Fix path to libtool scripts so autoreconf can succeed. -# -# Signed-off-by: Scott Garman +Fix path to libtool scripts so autoreconf can succeed. + +Upstream-Status: Inappropriate [Other] +Workaround specific to our build system. + +Signed-off-by: Scott Garman + diff -urN sudo-1.7.4p4.orig//aclocal.m4 sudo-1.7.4p4//aclocal.m4 --- sudo-1.7.4p4.orig//aclocal.m4 2010-08-06 07:17:36.000000000 -0700 +++ sudo-1.7.4p4//aclocal.m4 2010-11-22 14:38:20.360957038 -0800 -- cgit v1.2.3-54-g00ecf