* [PATCH 0/8] 13-May Consolidated Pulls
@ 2011-05-13 5:06 Saul Wold
2011-05-13 5:06 ` [PATCH 1/8] recipes: add Upstream-Status for multiple recipes Saul Wold
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: Saul Wold @ 2011-05-13 5:06 UTC (permalink / raw)
To: openembedded-core; +Cc: Ilya Yanok, Jingdong Lu
From: Saul Wold <sgw@linux.intel.com>
Richard,
Here is a set of patch upstream status updates along with some
GCC 4.6 fixes and a kern-tools SRCREV tweak from Bruce.
Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: sgw/stage
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Thanks,
Saul Wold <sgw@linux.intel.com>
---
Bruce Ashfield (1):
kern-tools: error if features are not found
Dexuan Cui (1):
recpies: add Upstream-Status for multiple recipes' patches
Dongxiao Xu (1):
recipes: add Upstream-Status for multiple recipes
Ilya Yanok (1):
qt4-tools-nativesdk: -arch is required for nativesdk build
Jingdong Lu (1):
bash: enable update-alternative to use bash as default shell
Nitin A Kamble (1):
gcc: fix target gcc runtime issue
Yu Ke (1):
recipes: Add Upstream-Status for multiple recipes
Zhai Edwin (1):
recipes: Add Upstream-Status to multiple recipes
.../libetpan/files/cxx-is-here.patch | 2 +
.../opensync/libopensync-0.37/build-in-src.patch | 2 +
.../opensync/libopensync-0.37/cmake.patch | 2 +
.../libopensync-0.37/no-python-check.patch | 2 +
.../libopensync-plugin-evolution2/0.37-fixes.patch | 2 +
.../libopensync-plugin-syncml/fixerror.patch | 2 +
.../opensync/libsyncml/build-in-src.patch | 2 +
.../telepathy/empathy/no-gnome-doc.patch | 2 +
.../gnome/gnome-settings-daemon/configurefix.patch | 2 +
.../gnome-settings-daemon/desktop-moblin.patch | 2 +
...-settings-daemon-2.24.0-catch-deviceadded.patch | 2 +
.../gnome-settings-daemon-fix-gthread.patch | 2 +
.../gnome-settings-daemon/mojito-cleanup.patch | 2 +
.../gnome/gnome-settings-daemon/mount-plugin.patch | 2 +
.../30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch | 2 +
.../recipes-gnome/wv/wv-1.2.0/pkgconfig.patch | 2 +
.../recipes-graphics/clutter/table/fixes.patch | 2 +
.../recipes-graphics/clutter/tidy/autofoo.patch | 2 +
.../clutter/tidy/tidy-enable-tests.patch | 2 +
.../libxklavier/libxklavier/pkgconfigfix.patch | 2 +
.../recipes-graphics/xorg-app/xev/diet-x11.patch | 2 +
.../xorg-lib/liblbxutil/mkg3states.patch | 2 +
.../recipes-graphics/xournal/files/ldflags.patch | 2 +
.../xournal/files/no-printing.diff | 2 +
.../recipes-sato/claws-mail/files/desktop.patch | 2 +
.../recipes-sato/claws-mail/files/fix-build.patch | 2 +
.../claws-mail/files/owl-window-menu.patch | 2 +
.../claws-mail/files/streamline-ui.patch | 2 +
.../clipboard-manager/files/daemonize.patch | 2 +
.../clipboard-manager/files/makefile.patch | 2 +
.../clipboard-manager/files/script.patch | 2 +
.../recipes-sato/epdfview/epdfview/owl-menus.patch | 2 +
.../recipes-sato/kf/files/fix-configure.patch | 2 +
.../recipes-sato/kf/files/fix-desktop-file.patch | 2 +
meta-demoapps/recipes-sato/kf/files/gcc4.patch | 2 +
.../eee-acpi-scripts/files/powerbtn.patch | 2 +
.../eee-acpi-scripts/files/remove-doc-check.patch | 2 +
meta/recipes-bsp/hostap/files/hostap-fw-load.patch | 2 +
.../lrzsz/lrzsz-0.12.20/autotools.patch | 2 +
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch | 2 +
.../recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch | 2 +
.../bluez/bluez-dtl1-workaround/COPYING.patch | 2 +
.../fix-dfutool-usb-declaration-mismatch.patch | 1 +
.../bluez/bluez4-4.82/hid2hci_usb_init.patch | 2 +
.../bluez/bluez4-4.82/sbc-thumb.patch | 1 +
.../galago/libgalago-0.5.2/mkdir.patch | 2 +
.../galago/libgalago-0.5.2/pkgconfig.patch | 2 +
.../gsm/files/0001-Introduce-ports.patch | 2 +
...ending-commands-before-restarting-the-mod.patch | 2 +
...-segment-incoming-usock-data-into-packets.patch | 2 +
.../0004-Handle-read-and-write-return-values.patch | 2 +
.../gsm/files/0005-Add-ask-ds-option-forSMS.patch | 2 +
.../gsm/files/024_sms-text-in-bracket.patch | 2 +
.../gsm/files/025_sms-status-report.patch | 2 +
...027_phonebook-find-and-read-range-support.patch | 2 +
...ell-phonebook-find-and-read-range-support.patch | 2 +
.../gsm/files/fix_machine_init.patch | 2 +
.../gsm/files/install-ts-headers.patch | 2 +
.../gsm/files/lgsm_send_fix_return_value.patch | 2 +
meta/recipes-connectivity/gypsy/files/fixups.patch | 2 +
.../libpcap/libpcap-1.1.1/aclocal.patch | 2 +
.../libpcap/libpcap-1.1.1/ieee80215-arphrd.patch | 2 +
.../ppp/ppp-2.4.5/cifdefroute.patch | 2 +
.../ppp/ppp-2.4.5/enable-ipv6.patch | 2 +
.../makefile-remove-hard-usr-reference.patch | 2 +
.../ppp/ppp-2.4.5/makefile.patch | 2 +
.../ppp/ppp-2.4.5/pppd-resolv-varrun.patch | 2 +
.../telepathy/libtelepathy/doublefix.patch | 2 +
.../telepathy/libtelepathy/prefer_python_2.5.patch | 2 +
.../telepathy-python-0.15.19/parallel_make.patch | 2 +
.../wireless-tools/wireless-tools/man.patch | 2 +
.../wpa_supplicant-0.5.7-always-scan.patch | 2 +
...a_supplicant-fix-deprecated-dbus-function.patch | 2 +
.../zeroconf/zeroconf/compilefix.patch | 2 +
.../glibc/glibc-2.10.1/arm-check-pf.patch | 2 +
.../glibc/glibc-2.10.1/arm-longlong.patch | 2 +
.../arm-lowlevellock-include-tls.patch | 2 +
.../glibc/glibc-2.10.1/arm-memcpy.patch | 2 +
.../glibc/glibc-2.10.1/dl-cache-libcmp.patch | 2 +
.../glibc/glibc-2.10.1/fhs-linux-paths.patch | 2 +
.../glibc-arm-IO-acquire-lock-fix.diff | 2 +
.../glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch | 2 +
.../glibc/glibc-2.10.1/glibc-check_pf.patch | 2 +
.../glibc/glibc-2.10.1/ldd-unbash.patch | 2 +
.../glibc/glibc-2.10.1/ldsocache-varrun.patch | 2 +
.../glibc/glibc-2.10.1/local-args6.diff | 2 +
.../glibc/glibc-2.10.1/march-i686.patch | 1 +
.../glibc/glibc-2.10.1/mips-rld-map-check.patch | 2 +
.../glibc/glibc-2.10.1/nptl-crosscompile.patch | 2 +
.../glibc/glibc-2.10.1/nscd-init.patch | 2 +
.../glibc/glibc-2.10.1/powerpc-sqrt-hack.diff | 2 +
.../recipes-core/glibc/glibc-2.10.1/rulesfix.patch | 2 +
meta/recipes-devtools/dpkg/dpkg/autofoo.patch | 2 +
.../dpkg/dpkg/check_snprintf.patch | 2 +
.../recipes-devtools/dpkg/dpkg/check_version.patch | 2 +
.../dpkg/dpkg/ignore_extra_fields.patch | 2 +
meta/recipes-devtools/dpkg/dpkg/nochroot.patch | 2 +
meta/recipes-devtools/dpkg/dpkg/noman.patch | 2 +
meta/recipes-devtools/dpkg/dpkg/noupdalt.patch | 2 +
meta/recipes-devtools/gcc/gcc-4.6.0.inc | 2 +-
meta/recipes-devtools/gcc/gcc-package-target.inc | 1 +
meta/recipes-devtools/gcc/gcc_4.3.3.bb | 2 +-
meta/recipes-devtools/gcc/gcc_4.5.1.bb | 2 +-
meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb | 2 +-
.../makedevs/makedevs-1.0.0/COPYING.patch | 2 +
.../opkg-utils/index-ignore-filenotfound.patch | 2 +
meta/recipes-devtools/opkg/opkg/add_vercmp.patch | 2 +
meta/recipes-devtools/opkg/opkg/headerfix.patch | 2 +
.../python/python-pygtk/fix-gtkunixprint.patch | 2 +
.../python/python-pygtk/nodocs.patch | 2 +
.../prevent_to_get_display_during_import.patch | 2 +
...t-and-use-GCC-atomic-builtins-for-locking.patch | 2 +
.../qemu/qemu-0.14.0/enable-i386-linux-user.patch | 2 +
.../fallback-to-safe-mmap_min_addr.patch | 2 +
.../qemu/qemu-0.14.0/fix-configure-checks.patch | 2 +
.../qemu/qemu-0.14.0/fix-nogl.patch | 2 +
.../qemu/qemu-0.14.0/glflags.patch | 2 +
.../qemu/qemu-0.14.0/init-info.patch | 2 +
.../qemu/qemu-0.14.0/larger_default_ram_size.patch | 2 +
.../qemu/qemu-0.14.0/linker-flags.patch | 3 +
.../qemu/qemu-0.14.0/no-strip.patch | 2 +
.../qemu/qemu-0.14.0/opengl-sdl-fix.patch | 2 +
.../qemu/qemu-0.14.0/qemu-git-qemugl-host.patch | 2 +
.../qemu/qemu-0.14.0/qemu-vmware-vga-depth.patch | 3 +
.../qemugl-allow-glxcontext-release.patch | 2 +
.../qemu/qemu-0.14.0/qemugl-fix.patch | 2 +
.../spice-qxl-locking-fix-for-qemu-kvm.patch | 2 +
.../tcf-agent/tcf-agent/fix_tcf-agent.init.patch | 2 +
.../tcf-agent/tcf-agent/terminals_agent.patch | 2 +
meta/recipes-extended/bash/bash.inc | 2 +-
meta/recipes-extended/bash/bash_4.1.bb | 2 +-
meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch | 2 +
.../files/debian/add-icmp-return-codes.diff | 2 +
.../iputils/files/debian/fix-arping-timeouts.diff | 2 +
.../files/debian/fix-dead-host-ping-stats.diff | 2 +
.../iputils/files/debian/targets.diff | 2 +
.../iputils/files/debian/use_gethostbyname2.diff | 2 +
.../minicom/minicom-2.4/gcc4-scope.patch | 2 +
.../minicom-2.4/rename-conflicting-functions.patch | 2 +
.../mktemp/files/disable-strip.patch | 2 +
.../rpcbind/rpcbind/fix_host_path.patch | 2 +
.../screen/screen-4.0.3/configure.patch | 2 +
.../fix_name_conflict_group_member.patch | 2 +
.../which/which-2.20/remove-declaration.patch | 2 +
...vices-from-inetd.conf-if-a-service-with-t.patch | 2 +
...arious-fixes-from-the-previous-maintainer.patch | 2 +
...uld-be-able-to-listen-on-IPv6-even-in-ine.patch | 2 +
.../gdk-pixbuf-2.22.1/configure_fix.patch | 2 +
.../gdk-pixbuf-2.22.1/hardcoded_libtool.patch | 2 +
.../gnome/gnome-common-2.28.0/omf.patch | 2 +
.../gnome/gnome-icon-theme/iconpath-option.patch | 3 +
.../gnome/gnome-mime-data/pkgconfig.patch | 2 +
.../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch | 2 +
.../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch | 2 +
.../gnome/libart-lgpl/Makefile.am.patch | 2 +
.../gnome/metacity/crosscompile.patch | 2 +
.../gtk+/gtk+-2.12.7/cellrenderer-cairo.patch | 2 +
.../gtk+/gtk+-2.12.7/combo-arrow-size.patch | 2 +
.../gtk+/gtk+-2.12.7/disable-print.patch | 2 +
.../gtk+/gtk+-2.12.7/entry-cairo.patch | 2 +
.../gtk+/gtk+-2.12.7/filechooser-default.patch | 2 +
.../gtk+/gtk+-2.12.7/filechooser-sizefix.patch | 2 +
.../gtk+/gtk+-2.12.7/filesystem-volumes.patch | 2 +
.../gtk+/gtk+-2.12.7/gtklabel-resize-patch | 2 +
.../gtk+/gtk+-2.12.7/hardcoded_libtool.patch | 2 +
.../gtk+/gtk+-2.12.7/menu-deactivate.patch | 2 +
meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch | 2 +
.../gtk+/gtk+-2.12.7/pangoxft2.10.6.diff | 2 +
.../gtk+/gtk+-2.12.7/range-no-redraw.patch | 3 +
.../gtk+/gtk+-2.12.7/run-iconcache.patch | 2 +
.../gtk+/gtk+-2.12.7/scrolled-placement.patch | 2 +
.../gtk+/gtk+-2.12.7/toggle-font.diff | 2 +
.../recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch | 2 +
...Duplicate-the-exec-string-returned-by-gtk.patch | 2 +
.../gtk+/gtk+-2.16.6/cellrenderer-cairo.patch | 2 +
.../gtk+-2.16.6/disable-gio-png-sniff-test.diff | 2 +
.../gtk+/gtk+-2.16.6/entry-cairo.patch | 2 +
.../gtk+/gtk+-2.16.6/hardcoded_libtool.patch | 2 +
meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch | 2 +
.../gtk+/gtk+-2.16.6/run-iconcache.patch | 2 +
.../gtk+/gtk+-2.16.6/toggle-font.diff | 2 +
.../recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch | 2 +
...Duplicate-the-exec-string-returned-by-gtk.patch | 2 +
.../gtk+/gtk+-2.22.1/cellrenderer-cairo.patch | 2 +
.../gtk+/gtk+-2.22.1/configurefix.patch | 2 +
.../recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch | 3 +
.../gtk+/gtk+-2.22.1/entry-cairo.patch | 2 +
.../gtk+/gtk+-2.22.1/hardcoded_libtool.patch | 2 +
meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch | 2 +
.../gtk+/gtk+-2.22.1/run-iconcache.patch | 2 +
.../gtk+/gtk+-2.22.1/toggle-font.diff | 2 +
.../recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch | 2 +
.../libglade/libglade-2.6.4/glade-cruft.patch | 2 +
.../libglade/libglade-2.6.4/no-deprecation.patch | 2 +
.../libglade/libglade-2.6.4/no-xml2.patch | 2 +
.../librsvg/librsvg-2.32.1/doc_Makefile.patch | 2 +
.../clutter/clutter-gst/autofoo-0.4.patch | 4 +
...-9db4a61a25677764bb927369c5c68ada958fb65c.patch | 4 +
.../clutter/clutter-gst/autofoo.patch | 4 +
.../clutter/clutter-gst/enable_tests-1.4.patch | 3 +
.../clutter/clutter-gst/enable_tests.patch | 3 +
.../clutter/clutter-gtk/disable_deprecated.patch | 2 +
.../clutter/clutter-gtk/enable_tests.patch | 2 +
.../clutter/clutter/build-fix.patch | 2 +
.../clutter/clutter/enable_tests-0.6.patch | 2 +
.../clutter/clutter/enable_tests-0.8.patch | 2 +
.../clutter/clutter/enable_tests-1.0.patch | 2 +
.../clutter/clutter/enable_tests-1.4.patch | 2 +
...-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch | 2 +
.../clutter/clutter/enable_tests.patch | 2 +
.../clutter/clutter/symconflict.patch | 2 +
.../clutter/clutter/test-conformance-fix.patch | 2 +
.../drm/libdrm-2.4.25/installtests.patch | 2 +-
.../fontconfig-2.8.0/fix-pkgconfig.patch | 2 +
.../freetype/freetype-2.4.4/no-hardcode.patch | 2 +
.../libmatchbox/files/16bppfixes-2.patch | 2 +
.../libmatchbox/files/16bppfixes.patch | 2 +
.../libmatchbox/files/autofoo.patch | 2 +
.../libmatchbox/files/configure_fixes.patch | 2 +
.../libmatchbox/files/fix-configure-for-1.9.patch | 2 +
.../libmatchbox/files/matchbox-start-fix.patch | 2 +
.../libxsettings-client/disable_Os_option.patch | 2 +
.../libxsettings-client/link-x11.patch | 2 +
.../matchbox-wm/matchbox-wm/configure_fix.patch | 2 +
.../mesa/qemugl/remove-x11r6-lib-dir.patch | 2 +
meta/recipes-graphics/mesa/qemugl/versionfix.patch | 2 +
.../mutter/mutter/crosscompile.patch | 2 +
...-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch | 2 +
.../mutter/mutter/fix_pkgconfig.patch | 2 +
meta/recipes-graphics/mutter/mutter/nodocs.patch | 2 +
meta/recipes-graphics/mutter/mutter/nozenity.patch | 2 +
.../tslib/tslib/32bitBE-support.patch | 3 +
.../recipes-graphics/tslib/tslib/fix_version.patch | 2 +
meta/recipes-graphics/tslib/tslib/multievent.patch | 2 +
.../x11-common/x11-common/gplv2-license.patch | 2 +
.../xserver-nodm-init/gplv2-license.patch | 2 +
.../recipes-graphics/x11vnc/files/endian-fix.patch | 2 +
.../x11vnc/files/starting-fix.patch | 3 +
.../xcb/libxcb/xcbincludedir.patch | 2 +
.../fix_watch_cursor.patch | 2 +
.../use-relative-symlinks.patch | 2 +
.../xorg-app/xdpyinfo/disable-xkb.patch | 2 +
.../xorg-app/xset/disable-xkb.patch | 2 +
.../xf86-video-omapfb/omap-blacklist-tv-out.patch | 4 +-
.../xf86-video-omapfb/omap-force-plain-mode.patch | 2 +
.../omap-revert-set-CRTC-limit.patch | 2 +
.../omap-revert-set-virtual-size.patch | 2 +
.../xorg-driver/xf86-video-omapfb/omapfb-neon.diff | 2 +
.../xorg-lib/libx11-1.3.4/include_fix.patch | 2 +
.../xorg-lib/libx11-1.3.4/nodolt.patch | 2 +
.../libx11-1.3.4/x11_disable_makekeys.patch | 2 +
.../xorg-lib/libx11-git/X18NCMSstubs.diff | 2 +
.../xorg-lib/libx11-git/fix-disable-xlocale.diff | 2 +
.../libx11-git/fix-utf8-wrong-define.patch | 1 +
.../xorg-lib/libx11-git/include_fix.patch | 2 +
.../xorg-lib/libx11-git/nodolt.patch | 2 +
.../xorg-lib/libx11-git/x11_disable_makekeys.patch | 2 +
.../recipes-graphics/xorg-lib/libx11-git/xim.patch | 55 -----
.../xorg-lib/libx11-trim/include_fix.patch | 2 +
.../xorg-lib/libx11-trim/nodolt.patch | 2 +
.../libx11-trim/x11_disable_makekeys.patch | 2 +
.../xorg-lib/libx11/X18NCMSstubs.diff | 2 +
.../xorg-lib/libx11/fix-disable-xlocale.diff | 2 +
.../xorg-lib/libx11/fix-utf8-wrong-define.patch | 1 +
.../xorg-lib/libx11/include_fix.patch | 2 +
meta/recipes-graphics/xorg-lib/libx11/nodolt.patch | 2 +
.../xorg-lib/libx11/x11_disable_makekeys.patch | 2 +
meta/recipes-graphics/xorg-lib/libx11/xim.patch | 55 -----
.../xorg-lib/libxcalibrate/fix-xcb.patch | 2 +
.../libxcomposite/change-include-order.patch | 2 +
.../xorg-lib/libxfont/no-scalable-crash.patch | 2 +
.../xorg-lib/xtrans/abstract_socket_fix.patch | 58 -----
.../xorg-proto/calibrateproto/fix.patch | 2 +
.../xtscal/xtscal/change-cross.patch | 2 +
meta/recipes-graphics/xtscal/xtscal/cleanup.patch | 2 +
.../xtscal/dso_linking_change_build_fix.patch | 2 +
.../kern-tools/kern-tools-native_git.bb | 2 +-
.../latencytop-0.5/latencytop-makefile.patch | 2 +
.../recipes-kernel/oprofile/oprofile/opstart.patch | 2 +
.../oprofile/oprofile/xml_callgraph_details.patch | 232 --------------------
.../stub_out_the_ncurses_calls_in_dump_mode.patch | 2 +
.../flac/flac-1.2.1/disable-xmms-plugin.patch | 1 +
.../flac/flac-1.2.1/flac-gcc43-fixes.patch | 1 +
.../gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff | 2 +
.../liba52/liba52/buildcleanup.patch | 2 +
.../libid3tag/libid3tag/addpkgconfig.patch | 2 +
.../fix_build_issue_for_gcc_4.5.0.patch | 2 +
.../pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch | 2 +
.../pulseaudio-0.9.22/autoconf_version.patch | 2 +
.../pulseaudio/pulseaudio-0.9.22/buildfix.patch | 2 +
.../pulseaudio-0.9.22/configure_silent_rules.patch | 2 +
.../pulseaudio-0.9.22/gcc4-compile-fix.patch | 2 +
.../pulseaudio/pulseaudio-0.9.22/tls_m4.patch | 2 +
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 3 +
.../eds/eds-dbus-2.20.0/no_iconv_test.patch | 2 +
.../eds/eds-dbus-2.20.0/oh-contact.patch | 2 +
.../eds/eds-dbus/new-contact-fix.patch | 2 +
meta/recipes-sato/eds/eds-dbus/nossl.patch | 2 +
meta/recipes-sato/eds/eds-dbus/oh-contact.patch | 2 +
meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch | 2 +
.../eds/eds-dbus/optional_imapx_provider.patch | 2 +
meta/recipes-sato/eds/eds-dbus/parallelmake.patch | 2 +
meta/recipes-sato/leafpad/files/owl-menu.patch | 2 +
.../matchbox-config-gtk/files/no-handed.patch | 2 +
.../files/dso_linking_change_build_fix.patch | 2 +
.../matchbox-desktop/files/window-resize-fix.patch | 2 +
.../matchbox-keyboard/files/configure_fix.patch | 2 +
.../matchbox-keyboard/files/single-instance.patch | 1 +
.../matchbox-panel-2/gcc-4.6.0-compile.patch | 2 +
.../recipes-sato/matchbox-panel-2/startup_fix.diff | 2 +
.../matchbox-stroke/files/configure_fix.patch | 2 +
.../files/dso_linking_change_build_fix.patch | 1 +
.../matchbox-stroke/files/single-instance.patch | 1 +
.../matchbox-theme-sato-2/png_rename.patch | 2 +
.../libowl-av/gst_change_state.patch | 2 +
.../owl-video-widget/libowl-av/make-382.patch | 2 +
.../owl-video/gtk_multithread_safe.patch | 2 +
.../owl-video-widget/owl-video/make-382.patch | 2 +
.../pcmanfm/files/cross-compile-fix.patch | 2 +
.../pcmanfm/files/owl-window-menu.patch | 2 +
.../contacts/contacts-owl-window-menu.patch | 2 +
meta/recipes-sato/pimlico/contacts/make-382.patch | 2 +
.../pimlico/dates/dates-owl-window-menu.patch | 2 +
.../dates/dso_linking_change_build_fix.patch | 2 +
meta/recipes-sato/pimlico/dates/make-382.patch | 2 +
.../sato-icon-theme/iconpath-option.patch | 2 +
.../settings-daemon/files/addsoundkeys.patch | 2 +
.../files/dso_linking_change_build_fix.patch | 2 +
.../web/web-webkit/link-with-g++.patch | 3 +
meta/recipes-sato/web/web-webkit/make-382.patch | 2 +
meta/recipes-sato/web/web/owl-window-menu.patch | 2 +
meta/recipes-sato/webkit/files/nodolt.patch | 3 +
meta/recipes-support/apr/apr-util/configfix.patch | 2 +
.../apr/apr-util/configure_fixes.patch | 2 +
.../apr/apr-util/configure_fixes.patch.old | 25 --
meta/recipes-support/apr/apr/buildconf_fix.patch | 2 +
meta/recipes-support/apr/apr/cleanup.patch | 2 +
meta/recipes-support/apr/apr/configfix.patch | 2 +
meta/recipes-support/apr/apr/configure_fixes.patch | 2 +
.../beecrypt/beecrypt/disable-icu-check.patch | 2 +
.../beecrypt/beecrypt/fix-security.patch | 3 +
.../db/db/arm-thumb-mutex_db5.patch | 2 +
.../gpgme/gpgme-1.3.0/disable_gpgconf_check.patch | 1 +
meta/recipes-support/libcroco/files/croco.patch | 2 +
.../liboil-0.3.17/fix-unaligned-whitelist.patch | 2 +
.../liboil/liboil-0.3.17/no-tests.patch | 2 +
.../libxslt/libxslt/pkgconfig_fix.patch | 2 +
.../neon/neon-0.29.5/pkgconfig.patch | 2 +
.../taglib/taglib-1.6.3/configuretweak.patch | 2 +
.../taglib/taglib-1.6.3/nolibtool.patch | 2 +
350 files changed, 690 insertions(+), 434 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/xim.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/xim.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch
delete mode 100644 meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch
delete mode 100644 meta/recipes-sato/webkit/files/fix_im.patch
delete mode 100644 meta/recipes-support/apr/apr-util/configure_fixes.patch.old
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/8] recipes: add Upstream-Status for multiple recipes
2011-05-13 5:06 [PATCH 0/8] 13-May Consolidated Pulls Saul Wold
@ 2011-05-13 5:06 ` Saul Wold
2011-05-13 5:06 ` [PATCH 2/8] recipes: Add " Saul Wold
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Saul Wold @ 2011-05-13 5:06 UTC (permalink / raw)
To: openembedded-core; +Cc: Ilya Yanok, Jingdong Lu
From: Dongxiao Xu <dongxiao.xu@intel.com>
hostap: add upstream status for hostap-fw-load.patch
lrzsz: add upstream status for lrzsz's patches
bluez: add upstream status for bluez's patches
bluez-dtl1-workaround: add upstream status for COPYING.patch
libgsmd: add upstream status for gsm's patches.
gypsy: add upstream status for gypsy's patch
libpcap: add upstream status for libpcap's patches
ppp: add upstream status for ppp's patches
libtelepathy: add upstream status for libtelepathy's patches
telepathy-python: add upstream status for telepahty-python's patches
wireless-tools: add upstream status for wireless-tools's patches
wpa-supplicant: add upstream status for wpa-supplicant
zeroconf: add upstream status for zeroconf's patch
glibc: add upstream status for glibc's patches
dpkg: add upstream status for dpkg's patches
makedevs: add upstream status for makedevs's patch
opkg: add upstream status for opkg's patches
opkg-utils: add upstream status for opkg-utils's patch
minicom: add upstream status for minicom patches
rpcbind: add upstream status for rpcbind's patch
which: add upstream status for which's patch
clutter-gst: add upstream status for clutter-gst's patches
flac: add upstream status for flac's patches
gst-ffmpeg: add upstream status for gst-ffmpeg's patch
liba52: add upstream status for liba52's patch
libid3tag: add upstream status for libid3tag
libmusicbrainz: add upstream status for libmusicbrainz's patch
pulseaudio: add upstream status for pulseaudio patches
db: add upstream status for db's patch
neon: add upstream status for neon's patch
taglib: add upstream status for taglib's patches
libetpan: add upstream status for libetpan's patch
libopensync: add upstream status for libopensync's patches
libopensync-plugin-evolution2: add upstream status for its patch
libopensync-plugin-syncml: add upstream status for its patch
libsyncml: add upstream status for libsyncml's patch
empathy: add upstream status for empathy's patch
wv: add upstream status for wv's patch
xournal: add upstream status for xournal's patch
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../libetpan/files/cxx-is-here.patch | 2 ++
.../opensync/libopensync-0.37/build-in-src.patch | 2 ++
.../opensync/libopensync-0.37/cmake.patch | 2 ++
.../libopensync-0.37/no-python-check.patch | 2 ++
.../libopensync-plugin-evolution2/0.37-fixes.patch | 2 ++
.../libopensync-plugin-syncml/fixerror.patch | 2 ++
.../opensync/libsyncml/build-in-src.patch | 2 ++
.../telepathy/empathy/no-gnome-doc.patch | 2 ++
.../recipes-gnome/wv/wv-1.2.0/pkgconfig.patch | 2 ++
.../recipes-graphics/xournal/files/ldflags.patch | 2 ++
.../xournal/files/no-printing.diff | 2 ++
meta/recipes-bsp/hostap/files/hostap-fw-load.patch | 2 ++
.../lrzsz/lrzsz-0.12.20/autotools.patch | 2 ++
meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch | 2 ++
.../recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch | 2 ++
.../bluez/bluez-dtl1-workaround/COPYING.patch | 2 ++
.../fix-dfutool-usb-declaration-mismatch.patch | 1 +
.../bluez/bluez4-4.82/hid2hci_usb_init.patch | 2 ++
.../bluez/bluez4-4.82/sbc-thumb.patch | 1 +
.../gsm/files/0001-Introduce-ports.patch | 2 ++
...ending-commands-before-restarting-the-mod.patch | 2 ++
...-segment-incoming-usock-data-into-packets.patch | 2 ++
.../0004-Handle-read-and-write-return-values.patch | 2 ++
.../gsm/files/0005-Add-ask-ds-option-forSMS.patch | 2 ++
.../gsm/files/024_sms-text-in-bracket.patch | 2 ++
.../gsm/files/025_sms-status-report.patch | 2 ++
...027_phonebook-find-and-read-range-support.patch | 2 ++
...ell-phonebook-find-and-read-range-support.patch | 2 ++
.../gsm/files/fix_machine_init.patch | 2 ++
| 2 ++
.../gsm/files/lgsm_send_fix_return_value.patch | 2 ++
meta/recipes-connectivity/gypsy/files/fixups.patch | 2 ++
.../libpcap/libpcap-1.1.1/aclocal.patch | 2 ++
.../libpcap/libpcap-1.1.1/ieee80215-arphrd.patch | 2 ++
.../ppp/ppp-2.4.5/cifdefroute.patch | 2 ++
.../ppp/ppp-2.4.5/enable-ipv6.patch | 2 ++
.../makefile-remove-hard-usr-reference.patch | 2 ++
.../ppp/ppp-2.4.5/makefile.patch | 2 ++
.../ppp/ppp-2.4.5/pppd-resolv-varrun.patch | 2 ++
.../telepathy/libtelepathy/doublefix.patch | 2 ++
.../telepathy/libtelepathy/prefer_python_2.5.patch | 2 ++
.../telepathy-python-0.15.19/parallel_make.patch | 2 ++
.../wireless-tools/wireless-tools/man.patch | 2 ++
.../wpa_supplicant-0.5.7-always-scan.patch | 2 ++
...a_supplicant-fix-deprecated-dbus-function.patch | 2 ++
.../zeroconf/zeroconf/compilefix.patch | 2 ++
.../glibc/glibc-2.10.1/arm-check-pf.patch | 2 ++
.../glibc/glibc-2.10.1/arm-longlong.patch | 2 ++
.../arm-lowlevellock-include-tls.patch | 2 ++
.../glibc/glibc-2.10.1/arm-memcpy.patch | 2 ++
.../glibc/glibc-2.10.1/dl-cache-libcmp.patch | 2 ++
.../glibc/glibc-2.10.1/fhs-linux-paths.patch | 2 ++
.../glibc-arm-IO-acquire-lock-fix.diff | 2 ++
.../glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch | 2 ++
.../glibc/glibc-2.10.1/glibc-check_pf.patch | 2 ++
.../glibc/glibc-2.10.1/ldd-unbash.patch | 2 ++
.../glibc/glibc-2.10.1/ldsocache-varrun.patch | 2 ++
.../glibc/glibc-2.10.1/local-args6.diff | 2 ++
.../glibc/glibc-2.10.1/march-i686.patch | 1 +
.../glibc/glibc-2.10.1/mips-rld-map-check.patch | 2 ++
.../glibc/glibc-2.10.1/nptl-crosscompile.patch | 2 ++
.../glibc/glibc-2.10.1/nscd-init.patch | 2 ++
.../glibc/glibc-2.10.1/powerpc-sqrt-hack.diff | 2 ++
.../recipes-core/glibc/glibc-2.10.1/rulesfix.patch | 2 ++
meta/recipes-devtools/dpkg/dpkg/autofoo.patch | 2 ++
.../dpkg/dpkg/check_snprintf.patch | 2 ++
.../recipes-devtools/dpkg/dpkg/check_version.patch | 2 ++
| 2 ++
meta/recipes-devtools/dpkg/dpkg/nochroot.patch | 2 ++
meta/recipes-devtools/dpkg/dpkg/noman.patch | 2 ++
meta/recipes-devtools/dpkg/dpkg/noupdalt.patch | 2 ++
.../makedevs/makedevs-1.0.0/COPYING.patch | 2 ++
.../opkg-utils/index-ignore-filenotfound.patch | 2 ++
meta/recipes-devtools/opkg/opkg/add_vercmp.patch | 2 ++
| 2 ++
.../minicom/minicom-2.4/gcc4-scope.patch | 2 ++
.../minicom-2.4/rename-conflicting-functions.patch | 2 ++
.../rpcbind/rpcbind/fix_host_path.patch | 2 ++
.../which/which-2.20/remove-declaration.patch | 2 ++
.../clutter/clutter-gst/autofoo-0.4.patch | 2 ++
...-9db4a61a25677764bb927369c5c68ada958fb65c.patch | 2 ++
.../clutter/clutter-gst/autofoo.patch | 2 ++
.../clutter/clutter-gst/enable_tests-1.4.patch | 3 +++
.../clutter/clutter-gst/enable_tests.patch | 3 +++
.../flac/flac-1.2.1/disable-xmms-plugin.patch | 1 +
.../flac/flac-1.2.1/flac-gcc43-fixes.patch | 1 +
.../gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff | 2 ++
.../liba52/liba52/buildcleanup.patch | 2 ++
.../libid3tag/libid3tag/addpkgconfig.patch | 2 ++
.../fix_build_issue_for_gcc_4.5.0.patch | 2 ++
.../pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch | 2 ++
.../pulseaudio-0.9.22/autoconf_version.patch | 2 ++
.../pulseaudio/pulseaudio-0.9.22/buildfix.patch | 2 ++
.../pulseaudio-0.9.22/configure_silent_rules.patch | 2 ++
.../pulseaudio-0.9.22/gcc4-compile-fix.patch | 2 ++
.../pulseaudio/pulseaudio-0.9.22/tls_m4.patch | 2 ++
.../db/db/arm-thumb-mutex_db5.patch | 2 ++
.../neon/neon-0.29.5/pkgconfig.patch | 2 ++
.../taglib/taglib-1.6.3/configuretweak.patch | 2 ++
.../taglib/taglib-1.6.3/nolibtool.patch | 2 ++
100 files changed, 197 insertions(+), 0 deletions(-)
diff --git a/meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch b/meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch
index d910daa..03d8da6 100644
--- a/meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch
+++ b/meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch
index 1810b33..fa61e15 100644
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
cmake/OpenSyncInternal.cmake.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
index 7ea4613..20d09cf 100644
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
opensync/CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch
index 04257bc..d59fddb 100644
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
index 4a1802c..9ef0353 100644
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake
===================================================================
--- libopensync-plugin-evolution2-0.36.orig/cmake/modules/FindOpenSync.cmake 2008-10-20 13:07:14.000000000 +0100
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
index 7dad889..9e7a260 100644
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [others]
+
Index: libopensync-plugin-syncml-0.38/src/syncml_callbacks.c
===================================================================
--- libopensync-plugin-syncml-0.38.orig/src/syncml_callbacks.c 2009-07-31 10:30:33.000000000 +0100
diff --git a/meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch b/meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch
index d8106bd..9947af0 100644
--- a/meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch
+++ b/meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
CMakeLists.txt | 4 ----
1 file changed, 4 deletions(-)
diff --git a/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch b/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
index 13e7943..ee15f4d 100644
--- a/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
+++ b/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
---
Makefile.am | 2 +-
configure.ac | 1 -
diff --git a/meta-demoapps/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch b/meta-demoapps/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch
index 136d893..0c0eddf 100644
--- a/meta-demoapps/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch
+++ b/meta-demoapps/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: wv-1.2.0/wv-1.0.pc.in
===================================================================
--- wv-1.2.0.orig/wv-1.0.pc.in 2008-03-19 22:25:18.000000000 +0000
diff --git a/meta-demoapps/recipes-graphics/xournal/files/ldflags.patch b/meta-demoapps/recipes-graphics/xournal/files/ldflags.patch
index 7f6585b..ec75e71 100644
--- a/meta-demoapps/recipes-graphics/xournal/files/ldflags.patch
+++ b/meta-demoapps/recipes-graphics/xournal/files/ldflags.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff b/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff
index 7a4724e..9fac498 100644
--- a/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff
+++ b/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -ru xournal-0.2/configure.in xournal-0.2.noprint/configure.in
--- xournal-0.2/configure.in 2006-01-29 22:25:10.000000000 +0000
+++ xournal-0.2.noprint/configure.in 2006-03-17 13:08:01.000000000 +0000
diff --git a/meta/recipes-bsp/hostap/files/hostap-fw-load.patch b/meta/recipes-bsp/hostap/files/hostap-fw-load.patch
index 88adee2..050bdc1 100644
--- a/meta/recipes-bsp/hostap/files/hostap-fw-load.patch
+++ b/meta/recipes-bsp/hostap/files/hostap-fw-load.patch
@@ -3,6 +3,8 @@
# Patch managed by http://www.holgerschurig.de/patcher.html
#
+Upstream-Status: Inappropriate [configuration]
+
--- hostap-utils-0.2.4/hostap_fw_load~hostap-fw-load
+++ hostap-utils-0.2.4/hostap_fw_load
@@ -6,9 +6,9 @@
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
index 73f5a06..3945198 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/autotools.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- lrzsz-0.12.20/acinclude.m4~autotools 1998-12-27 17:08:59.000000000 -0500
+++ lrzsz-0.12.20/acinclude.m4 2004-05-09 22:26:19.000000000 -0400
@@ -1,12 +1,11 @@
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
index 241ffd9..1a24a1f 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/gettext.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- lrzsz-0.12.20.safe/ABOUT-NLS 1998-04-26 09:22:30.000000000 -0400
+++ lrzsz-0.12.20/ABOUT-NLS 2004-09-12 14:40:34.323752952 -0400
@@ -1,14 +1,14 @@
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
index c553c8b..ace592c 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/makefile.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -ruN lrzsz-0.12.20_org/src/Makefile.in lrzsz-0.12.20_patch/src/Makefile.in
--- lrzsz-0.12.20_org/src/Makefile.in 1998-12-30 17:31:46.000000000 +0100
+++ lrzsz-0.12.20_patch/src/Makefile.in 2004-04-29 13:57:33.434909656 +0200
diff --git a/meta/recipes-connectivity/bluez/bluez-dtl1-workaround/COPYING.patch b/meta/recipes-connectivity/bluez/bluez-dtl1-workaround/COPYING.patch
index 95342e3..576081b 100644
--- a/meta/recipes-connectivity/bluez/bluez-dtl1-workaround/COPYING.patch
+++ b/meta/recipes-connectivity/bluez/bluez-dtl1-workaround/COPYING.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [others]
+
diff -ruN bluez-dtl1-workaround-1.0-orig/COPYING bluez-dtl1-workaround-1.0/COPYING
--- bluez-dtl1-workaround-1.0-orig/COPYING 1970-01-01 08:00:00.000000000 +0800
+++ bluez-dtl1-workaround-1.0/COPYING 2010-12-09 16:50:46.014910500 +0800
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
index 91c802b..27dead0 100644
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
+++ b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
@@ -3,6 +3,7 @@
# Date: Thu Jan 29 16:52:21 2009 +0000
#
# Acquired from OpenEmbedded
+Upstream-Status: Pending
Index: bluez-4.27/tools/dfutool.c
===================================================================
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
index ed15fd5..e8a58e5 100644
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
+++ b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
@@ -6,6 +6,8 @@
# data (e.g. ctx) which is used in subsequent calls to libusb
# We return immediately if usb_init() fails for some reason.
+Upstream-Status: Inappropriate [not used]
+
Index: bluez-4.24/tools/hid2hci.c
===================================================================
--- bluez-4.24.orig/tools/hid2hci.c 2008-10-25 23:40:34.000000000 -0700
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
index 4744236..881cb9c 100644
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
+++ b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
@@ -1,4 +1,5 @@
# Acquired from OpenEmbedded
+Upstream-Status: Inappropriate [embedded specific]
--- bluez/sbc/sbc_math.h~ 2008-03-05 20:18:03.000000000 +0000
+++ bluez/sbc/sbc_math.h 2008-10-27 13:39:27.000000000 +0000
diff --git a/meta/recipes-connectivity/gsm/files/0001-Introduce-ports.patch b/meta/recipes-connectivity/gsm/files/0001-Introduce-ports.patch
index b3ba3cb..2a954d6 100644
--- a/meta/recipes-connectivity/gsm/files/0001-Introduce-ports.patch
+++ b/meta/recipes-connectivity/gsm/files/0001-Introduce-ports.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
From 516d67c679101d1503dbd4c0613bcd6ff1b604e4 Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <balrog@zabor.org>
Date: Wed, 19 Sep 2007 14:03:28 +0200
diff --git a/meta/recipes-connectivity/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch b/meta/recipes-connectivity/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch
index 3683596..51d50b9 100644
--- a/meta/recipes-connectivity/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch
+++ b/meta/recipes-connectivity/gsm/files/0002-Flush-all-pending-commands-before-restarting-the-mod.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
From 1078f7aced63c6216bffe649930b97c9ccf9a16e Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <balrog@zabor.org>
Date: Wed, 19 Sep 2007 14:04:50 +0200
diff --git a/meta/recipes-connectivity/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch b/meta/recipes-connectivity/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch
index 984acc9..87aaf6b 100644
--- a/meta/recipes-connectivity/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch
+++ b/meta/recipes-connectivity/gsm/files/0003-Correctly-segment-incoming-usock-data-into-packets.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
From 8af1bb4a0d0df9baa80859c5f7f56cbd7634aded Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <balrog@zabor.org>
Date: Wed, 19 Sep 2007 14:06:19 +0200
diff --git a/meta/recipes-connectivity/gsm/files/0004-Handle-read-and-write-return-values.patch b/meta/recipes-connectivity/gsm/files/0004-Handle-read-and-write-return-values.patch
index f5e7a79..84a4aa1 100644
--- a/meta/recipes-connectivity/gsm/files/0004-Handle-read-and-write-return-values.patch
+++ b/meta/recipes-connectivity/gsm/files/0004-Handle-read-and-write-return-values.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
From 421b0fa14fefbd13a455c20380fecddda616b41a Mon Sep 17 00:00:00 2001
From: Andrzej Zaborowski <balrog@zabor.org>
Date: Wed, 19 Sep 2007 18:30:36 +0200
diff --git a/meta/recipes-connectivity/gsm/files/0005-Add-ask-ds-option-forSMS.patch b/meta/recipes-connectivity/gsm/files/0005-Add-ask-ds-option-forSMS.patch
index e9f49bd..faf0e8a 100644
--- a/meta/recipes-connectivity/gsm/files/0005-Add-ask-ds-option-forSMS.patch
+++ b/meta/recipes-connectivity/gsm/files/0005-Add-ask-ds-option-forSMS.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
diff --git a/include/gsmd/usock.h b/include/gsmd/usock.h
index 236ad78..66cdf48 100644
--- a/include/gsmd/usock.h
diff --git a/meta/recipes-connectivity/gsm/files/024_sms-text-in-bracket.patch b/meta/recipes-connectivity/gsm/files/024_sms-text-in-bracket.patch
index 32a1ca3..3aa13df 100644
--- a/meta/recipes-connectivity/gsm/files/024_sms-text-in-bracket.patch
+++ b/meta/recipes-connectivity/gsm/files/024_sms-text-in-bracket.patch
@@ -9,6 +9,8 @@ The patch introduces SMS message text in bracket and fixes a NULL pointer
reference on mailformed "ss" commands.
Signed-off-by: Jim Huang <jserv@openmoko.org>
+
+Upstream-Status: Inappropriate [not used]
---
src/util/shell.c | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-connectivity/gsm/files/025_sms-status-report.patch b/meta/recipes-connectivity/gsm/files/025_sms-status-report.patch
index 560e72e..a0f466a 100644
--- a/meta/recipes-connectivity/gsm/files/025_sms-status-report.patch
+++ b/meta/recipes-connectivity/gsm/files/025_sms-status-report.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
From: Erin Yueh <erin_yueh@openmoko.com>
Subject: [PATCH] SMS status report
diff --git a/meta/recipes-connectivity/gsm/files/027_phonebook-find-and-read-range-support.patch b/meta/recipes-connectivity/gsm/files/027_phonebook-find-and-read-range-support.patch
index ea0f12d..c94e4b2 100644
--- a/meta/recipes-connectivity/gsm/files/027_phonebook-find-and-read-range-support.patch
+++ b/meta/recipes-connectivity/gsm/files/027_phonebook-find-and-read-range-support.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
From: Sean Chiang <sean_chiang@openmoko.com>
Subject: [PATCH] Improvement for find and read phonebooks in gsmd
diff --git a/meta/recipes-connectivity/gsm/files/028_shell-phonebook-find-and-read-range-support.patch b/meta/recipes-connectivity/gsm/files/028_shell-phonebook-find-and-read-range-support.patch
index db07a5d..a531fa8 100644
--- a/meta/recipes-connectivity/gsm/files/028_shell-phonebook-find-and-read-range-support.patch
+++ b/meta/recipes-connectivity/gsm/files/028_shell-phonebook-find-and-read-range-support.patch
@@ -8,6 +8,8 @@ phonebook.
Signed-off-by: Jim Huang <jserv@openmoko.org>
+Upstream-Status: Inappropriate [not used]
+
Index: gsm/src/util/shell.c
===================================================================
--- gsm.orig/src/util/shell.c 2007-09-17 23:57:51.000000000 +0800
diff --git a/meta/recipes-connectivity/gsm/files/fix_machine_init.patch b/meta/recipes-connectivity/gsm/files/fix_machine_init.patch
index 9fb6466..1f135d5 100644
--- a/meta/recipes-connectivity/gsm/files/fix_machine_init.patch
+++ b/meta/recipes-connectivity/gsm/files/fix_machine_init.patch
@@ -2,6 +2,8 @@ Rebase the patch to latest version.
By Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Pending
+
diff -ruN gsm-orig/src/gsmd/gsmd.c gsm/src/gsmd/gsmd.c
--- gsm-orig/src/gsmd/gsmd.c 2010-11-25 10:14:22.000000000 +0800
+++ gsm/src/gsmd/gsmd.c 2010-11-25 10:14:52.000000000 +0800
--git a/meta/recipes-connectivity/gsm/files/install-ts-headers.patch b/meta/recipes-connectivity/gsm/files/install-ts-headers.patch
index 88e3b6d..b77b6d9 100644
--- a/meta/recipes-connectivity/gsm/files/install-ts-headers.patch
+++ b/meta/recipes-connectivity/gsm/files/install-ts-headers.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
Index: gsm/include/gsmd/Makefile.am
===================================================================
--- gsm.orig/include/gsmd/Makefile.am 2007-10-29 21:05:57.000000000 +0100
diff --git a/meta/recipes-connectivity/gsm/files/lgsm_send_fix_return_value.patch b/meta/recipes-connectivity/gsm/files/lgsm_send_fix_return_value.patch
index 00ba3a4..9ff1c9d 100644
--- a/meta/recipes-connectivity/gsm/files/lgsm_send_fix_return_value.patch
+++ b/meta/recipes-connectivity/gsm/files/lgsm_send_fix_return_value.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
--- gsm/src/libgsmd/libgsmd.c.orig 2007-09-25 00:41:56.000000000 -0500
+++ gsm/src/libgsmd/libgsmd.c 2007-09-25 00:43:44.000000000 -0500
@@ -210,7 +210,7 @@
diff --git a/meta/recipes-connectivity/gypsy/files/fixups.patch b/meta/recipes-connectivity/gypsy/files/fixups.patch
index 8bc8c5c..de4d92e 100644
--- a/meta/recipes-connectivity/gypsy/files/fixups.patch
+++ b/meta/recipes-connectivity/gypsy/files/fixups.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
docs/reference/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.1.1/aclocal.patch b/meta/recipes-connectivity/libpcap/libpcap-1.1.1/aclocal.patch
index 71fd8b9..469d122 100644
--- a/meta/recipes-connectivity/libpcap/libpcap-1.1.1/aclocal.patch
+++ b/meta/recipes-connectivity/libpcap/libpcap-1.1.1/aclocal.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -ruN libpcap-1.1.1-orig/aclocal.m4 libpcap-1.1.1/aclocal.m4
--- libpcap-1.1.1-orig/aclocal.m4 2010-06-29 10:46:32.815117569 +0800
+++ libpcap-1.1.1/aclocal.m4 2010-06-29 10:49:17.150149949 +0800
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch b/meta/recipes-connectivity/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch
index f29c7cb..8041d7a 100644
--- a/meta/recipes-connectivity/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch
+++ b/meta/recipes-connectivity/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: libpcap-1.0.0/pcap-linux.c
===================================================================
--- libpcap-1.0.0.orig/pcap-linux.c 2009-01-28 11:58:54.000000000 +0300
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch
index 6473a08..db4dbc2 100644
--- a/meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/cifdefroute.patch
@@ -2,6 +2,8 @@ This patch comes from OpenEmbedded.
The original patch is from Debian / SuSE to implement replacedefaultroute
Rebased it to fit ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Inappropriate [debian/suse patches]
+
diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
--- ppp-2.4.5-orig/pppd/ipcp.c 2010-06-30 15:51:12.050166398 +0800
+++ ppp-2.4.5/pppd/ipcp.c 2010-06-30 16:40:00.478716855 +0800
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch
index daa7f2e..e5fc3f4 100644
--- a/meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/enable-ipv6.patch
@@ -1,5 +1,7 @@
The patch comes from OpenEmbedded
+Upstream-Status: Inappropriate [enable feature]
+
--- ppp-2.4.3/pppd/Makefile.linux.orig 2005-10-28 21:07:40.396359250 +0100
+++ ppp-2.4.3/pppd/Makefile.linux 2005-10-28 21:07:54.217223000 +0100
@@ -62,7 +62,7 @@
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
index 9ba8688..8cc354a 100644
--- a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
@@ -1,6 +1,8 @@
The patch comes from OpenEmbedded.
Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
--- ppp-2.4.5-orig/pppd/Makefile.linux 2010-06-30 15:51:12.043682063 +0800
+++ ppp-2.4.5/pppd/Makefile.linux 2010-06-30 17:08:21.806363042 +0800
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch
index 94af5af..2d09baf 100644
--- a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile.patch
@@ -1,6 +1,8 @@
The patch comes from OpenEmbedded
Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
diff -ruN ppp-2.4.5-orig/chat/Makefile.linux ppp-2.4.5/chat/Makefile.linux
--- ppp-2.4.5-orig/chat/Makefile.linux 2010-06-30 15:51:12.050166398 +0800
+++ ppp-2.4.5/chat/Makefile.linux 2010-06-30 15:51:30.450118446 +0800
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch
index c4e61fd..a72414f 100644
--- a/meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/pppd-resolv-varrun.patch
@@ -1,6 +1,8 @@
The patch comes from OpenEmbedded
Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
+
diff -ruN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
--- ppp-2.4.5-orig/pppd/ipcp.c 2010-06-30 15:51:12.050166398 +0800
+++ ppp-2.4.5/pppd/ipcp.c 2010-06-30 17:02:33.930393283 +0800
diff --git a/meta/recipes-connectivity/telepathy/libtelepathy/doublefix.patch b/meta/recipes-connectivity/telepathy/libtelepathy/doublefix.patch
index 5ff1c43..a7737fb 100644
--- a/meta/recipes-connectivity/telepathy/libtelepathy/doublefix.patch
+++ b/meta/recipes-connectivity/telepathy/libtelepathy/doublefix.patch
@@ -2,6 +2,8 @@ Fix double reference to this file to work with recent autoconf+automake
RP 1/2/10
+Upstream-Status: Inappropriate [configuration]
+
Index: libtelepathy-0.3.3/src/Makefile.am
===================================================================
--- libtelepathy-0.3.3.orig/src/Makefile.am 2010-02-01 13:13:50.869038984 +0000
diff --git a/meta/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch b/meta/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch
index ec01567..37679ab 100644
--- a/meta/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch
+++ b/meta/recipes-connectivity/telepathy/libtelepathy/prefer_python_2.5.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libtelepathy-0.3.1/configure.ac
===================================================================
--- libtelepathy-0.3.1.orig/configure.ac 2007-11-22 19:05:56.000000000 +0000
diff --git a/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch b/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
index 145e17b..f1f3f56 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
+++ b/meta/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
@@ -5,6 +5,8 @@ src/_generated directory that tasks are based on.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Pending
+
diff -ruN telepathy-python-0.15.19-orig/src/Makefile.am telepathy-python-0.15.19/src/Makefile.am
--- telepathy-python-0.15.19-orig/src/Makefile.am 2011-03-10 08:51:49.000000000 +0800
+++ telepathy-python-0.15.19/src/Makefile.am 2011-03-10 08:54:45.000000000 +0800
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch b/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
index fd8cf42..8e16215 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/man.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- wireless_tools.26/Makefile.orig 2003-06-18 03:38:58.000000000 +0200
+++ wireless_tools.26/Makefile 2004-07-03 23:35:29.000000000 +0200
@@ -57,8 +57,8 @@
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-0.5.7-always-scan.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-0.5.7-always-scan.patch
index 25afd07..5485d55 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-0.5.7-always-scan.patch
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-0.5.7-always-scan.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
diff -up wpa_supplicant-0.5.7/wpa_supplicant.c.always-scan wpa_supplicant-0.5.7/wpa_supplicant.c
--- wpa_supplicant-0.5.7/wpa_supplicant.c.always-scan 2007-09-25 15:51:35.000000000 -0400
+++ wpa_supplicant-0.5.7/wpa_supplicant.c 2007-09-25 16:31:27.000000000 -0400
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-fix-deprecated-dbus-function.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-fix-deprecated-dbus-function.patch
index dbd5e4e..a1898c3 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-fix-deprecated-dbus-function.patch
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/wpa_supplicant-fix-deprecated-dbus-function.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
--- dbus_dict_helpers.c.array-fix 2006-12-18 12:31:11.000000000 -0500
+++ dbus_dict_helpers.c 2006-12-20 03:17:08.000000000 -0500
@@ -629,36 +629,55 @@ dbus_bool_t wpa_dbus_dict_open_read(DBus
diff --git a/meta/recipes-connectivity/zeroconf/zeroconf/compilefix.patch b/meta/recipes-connectivity/zeroconf/zeroconf/compilefix.patch
index b7b917d..328e574 100644
--- a/meta/recipes-connectivity/zeroconf/zeroconf/compilefix.patch
+++ b/meta/recipes-connectivity/zeroconf/zeroconf/compilefix.patch
@@ -3,6 +3,8 @@
RP - 4/9/09
+Upstream-Status: Pending
+
Index: zeroconf-0.9/zeroconf.c
===================================================================
--- zeroconf-0.9.orig/zeroconf.c 2009-09-04 10:05:25.000000000 +0100
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch
index b9c7226..b045405 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/arm-check-pf.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
Index: glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/check_pf.c
===================================================================
--- glibc-2.9.orig/ports/sysdeps/unix/sysv/linux/arm/check_pf.c 2009-06-19 20:45:32.451372131 +0400
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch
index 28aca83..ce67d7e 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/arm-longlong.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
--- glibc-2.4/stdlib/longlong.h.ark 2006-03-11 22:49:27.000000000 +0100
+++ glibc-2.4/stdlib/longlong.h 2006-03-11 22:55:12.000000000 +0100
@@ -206,6 +206,14 @@
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch
index 5c8062e..3f81295 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/arm-lowlevellock-include-tls.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
Index: glibc-2.9/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
===================================================================
--- glibc-2.9.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h 2009-06-19 20:54:35.446686910 +0400
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch b/meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch
index bc2b3da..f50d481 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/arm-memcpy.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
--- /dev/null 2004-02-02 20:32:13.000000000 +0000
+++ sysdeps/arm/memmove.S 2004-03-20 18:37:23.000000000 +0000
@@ -0,0 +1,251 @@
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch b/meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch
index 2fedfa6..199aaa6 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/dl-cache-libcmp.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
--- glibc-2.4/elf/Versions.ark 2006-03-11 23:30:09.000000000 +0100
+++ glibc-2.4/elf/Versions 2006-03-11 23:31:44.000000000 +0100
@@ -63,5 +63,7 @@
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch b/meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch
index 1f32f6d..91c6781 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/fhs-linux-paths.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
--- glibc-2.1.1/sysdeps/unix/sysv/linux/paths.h~ Thu May 27 13:16:33 1999
+++ glibc-2.1.1/sysdeps/unix/sysv/linux/paths.h Thu May 27 13:17:55 1999
@@ -71,7 +71,7 @@
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-IO-acquire-lock-fix.diff b/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-IO-acquire-lock-fix.diff
index a552cf0..843c5e8 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-IO-acquire-lock-fix.diff
+++ b/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-IO-acquire-lock-fix.diff
@@ -1,5 +1,7 @@
Arm needs a similar fix as http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
+Upstream-Status: Inappropriate [not used]
+
--- /tmp/stdio-lock.h 2008-03-04 18:51:15.555038993 +0100
+++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/bits/stdio-lock.h 2008-03-04 18:51:28.445035052 +0100
@@ -50,6 +50,8 @@
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch
index 7eb1717..9dba9d2 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/glibc-arm-no-asm-page.patch
@@ -1,5 +1,7 @@
http://sourceware.org/ml/libc-ports/2008-04/msg00005.html
+Upstream-Status: Inappropriate [not used]
+
Index: glibc-2.6.1/ports/sysdeps/unix/sysv/linux/arm/ioperm.c
===================================================================
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch b/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
index 3cff6bb..a0e55bf 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/glibc-check_pf.patch
@@ -51,6 +51,8 @@ CodeSourcery
* sysdeps/unix/sysv/linux/arm/check_pf.c: New file.
* sysdeps/unix/sysv/linux/arm/eabi/check_pf.c: New file.
+Upstream-Status: Inappropriate [not used]
+
Index: sysdeps/unix/sysv/linux/arm/check_pf.c
===================================================================
RCS file: sysdeps/unix/sysv/linux/arm/check_pf.c
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch b/meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch
index 2fb8854..1601310 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/ldd-unbash.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
--- glibc-2.5/elf/ldd.bash.in.org 2006-04-30 16:06:20.000000000 +0000
+++ glibc-2.5/elf/ldd.bash.in 2007-03-30 19:18:57.000000000 +0000
@@ -110,7 +110,7 @@
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch b/meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch
index 9994d4f..c303c64 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/ldsocache-varrun.patch
@@ -5,6 +5,8 @@ where /etc is JFFS2 or CRAMFS but /var is a ramdisk.
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
+Upstream-Status: Inappropriate [not used]
+
--- libc/sysdeps/generic/dl-cache.h~ldsocache-varrun
+++ libc/sysdeps/generic/dl-cache.h
@@ -29,7 +29,7 @@
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff b/meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff
index 28c957f..d6f3e0e 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff
+++ b/meta/recipes-core/glibc/glibc-2.10.1/local-args6.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
--- glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h.orig
+++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
@@ -73,6 +73,9 @@
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch b/meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch
index 0461603..687235c 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/march-i686.patch
@@ -4,6 +4,7 @@
* nptl/sysdeps/pthread/pt-initfini.c: Ditto.
+Upstream-Status: Inappropriate [not used]
Index: sysdeps/unix/sysv/linux/i386/sysdep.h
===================================================================
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/mips-rld-map-check.patch b/meta/recipes-core/glibc/glibc-2.10.1/mips-rld-map-check.patch
index ed08d7e..2599e16 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/mips-rld-map-check.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/mips-rld-map-check.patch
@@ -4,6 +4,8 @@ a binutils bug, but libc shouldn't segfault in this case.
see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615
+Upstream-Status: Inappropriate [not used]
+
9/19/2010 - added by Qing He <qing.he@intel.com>
---
diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch b/meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch
index 18a46ad..7e3d9bb 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/nptl-crosscompile.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
--- glibc-2.4/nptl/sysdeps/pthread/configure.in.ark 2006-03-12 00:41:40.000000000 +0100
+++ glibc-2.4/nptl/sysdeps/pthread/configure.in 2006-03-12 00:44:08.000000000 +0100
@@ -45,5 +45,6 @@
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch b/meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch
index 884609a..8017e49 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/nscd-init.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
--- nscd/nscd.init
+++ nscd/nscd.init
@@ -48,9 +48,8 @@
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff b/meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
index 1046efb..bbc75d1 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
+++ b/meta/recipes-core/glibc/glibc-2.10.1/powerpc-sqrt-hack.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
--- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-04-14 07:44:30.000000000 +0200
+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c 2006-12-08 12:53:32.202227000 +0100
diff --git a/meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch b/meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch
index 67bfc94..585bb62 100644
--- a/meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch
+++ b/meta/recipes-core/glibc/glibc-2.10.1/rulesfix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
Index: glibc-2.9/Makerules
===================================================================
--- glibc-2.9.orig/Makerules 2009-09-14 16:39:21.000000000 +0100
diff --git a/meta/recipes-devtools/dpkg/dpkg/autofoo.patch b/meta/recipes-devtools/dpkg/dpkg/autofoo.patch
index 691121e..2f1edce 100644
--- a/meta/recipes-devtools/dpkg/dpkg/autofoo.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/autofoo.patch
@@ -3,6 +3,8 @@
# Patch managed by http://www.holgerschurig.de/patcher.html
#
+Upstream-Status: Inappropriate [configuration]
+
--- dpkg-1.10.23/configure.in~autofoo
+++ dpkg-1.10.23/configure.in
@@ -227,21 +227,36 @@
diff --git a/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch b/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch
index 7673cf1..56eb0ca 100644
--- a/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -ruN dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 dpkg-1.15.8.5/m4/dpkg-funcs.m4
--- dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 2010-10-08 12:27:15.082131611 +0800
+++ dpkg-1.15.8.5/m4/dpkg-funcs.m4 2010-10-08 13:56:50.074284346 +0800
diff --git a/meta/recipes-devtools/dpkg/dpkg/check_version.patch b/meta/recipes-devtools/dpkg/dpkg/check_version.patch
index a09e136..524e715 100644
--- a/meta/recipes-devtools/dpkg/dpkg/check_version.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/check_version.patch
@@ -2,6 +2,8 @@ Adapt to linux-wrs kernel version, which has character '_' inside.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
+
diff -ruN dpkg-1.15.8.5-orig/lib/dpkg/parsehelp.c dpkg-1.15.8.5/lib/dpkg/parsehelp.c
--- dpkg-1.15.8.5-orig/lib/dpkg/parsehelp.c 2010-10-08 12:27:15.058572774 +0800
+++ dpkg-1.15.8.5/lib/dpkg/parsehelp.c 2010-10-09 11:18:15.484190771 +0800
--git a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
index 27b4f3b..0ff09e7 100644
--- a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [workaround]
+
diff -ruN dpkg-1.15.8.5-orig/dpkg-deb/build.c dpkg-1.15.8.5/dpkg-deb/build.c
--- dpkg-1.15.8.5-orig/dpkg-deb/build.c 2010-10-08 12:27:15.042083703 +0800
+++ dpkg-1.15.8.5/dpkg-deb/build.c 2010-10-08 12:31:53.822534277 +0800
diff --git a/meta/recipes-devtools/dpkg/dpkg/nochroot.patch b/meta/recipes-devtools/dpkg/dpkg/nochroot.patch
index 3a8beae..c7f2dfe 100644
--- a/meta/recipes-devtools/dpkg/dpkg/nochroot.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/nochroot.patch
@@ -2,6 +2,8 @@
src/help.c | 2 ++
1 file changed, 2 insertions(+)
+Upstream-Status: Inappropriate [configuration]
+
--- dpkg-1.13.22.orig/src/help.c
+++ dpkg-1.13.22/src/help.c
@@ -175,9 +175,11 @@ static const char* preexecscript(const c
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch
index d8fc9c4..58cb22a 100644
--- a/meta/recipes-devtools/dpkg/dpkg/noman.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
diff -ruN dpkg-1.15.8.5-orig/Makefile.am dpkg-1.15.8.5/Makefile.am
--- dpkg-1.15.8.5-orig/Makefile.am 2010-10-08 12:27:15.042083703 +0800
+++ dpkg-1.15.8.5/Makefile.am 2010-10-08 12:27:27.755148228 +0800
diff --git a/meta/recipes-devtools/dpkg/dpkg/noupdalt.patch b/meta/recipes-devtools/dpkg/dpkg/noupdalt.patch
index 023e99a..a9b3800 100644
--- a/meta/recipes-devtools/dpkg/dpkg/noupdalt.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/noupdalt.patch
@@ -2,6 +2,8 @@
scripts/Makefile.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
--- dpkg-1.13.22.orig/scripts/Makefile.am
+++ dpkg-1.13.22/scripts/Makefile.am
@@ -20,8 +20,7 @@ bin_SCRIPTS = \
diff --git a/meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch b/meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch
index 3208ad7..c63ab53 100644
--- a/meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch
+++ b/meta/recipes-devtools/makedevs/makedevs-1.0.0/COPYING.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inapropriate [others]
+
diff -ruN makedevs-1.0.0-orig/COPYING makedevs-1.0.0/COPYING
--- makedevs-1.0.0-orig/COPYING 1970-01-01 08:00:00.000000000 +0800
+++ makedevs-1.0.0/COPYING 2010-12-09 16:42:20.274984665 +0800
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
index e4a5481..3664df6 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/index-ignore-filenotfound.patch
@@ -5,6 +5,8 @@ error out.
RP - 26/8/09
+Upstream-Status: Inappropriate [embedded specific]
+
Index: opkg-utils/opkg-make-index
===================================================================
--- opkg-utils.orig/opkg-make-index 2009-08-26 17:21:26.000000000 +0100
diff --git a/meta/recipes-devtools/opkg/opkg/add_vercmp.patch b/meta/recipes-devtools/opkg/opkg/add_vercmp.patch
index 540be83..1203c54 100644
--- a/meta/recipes-devtools/opkg/opkg/add_vercmp.patch
+++ b/meta/recipes-devtools/opkg/opkg/add_vercmp.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [function not used]
+
Index: trunk/libopkg/opkg.c
===================================================================
--- trunk.orig/libopkg/opkg.c 2010-01-26 20:32:19.000000000 +0000
--git a/meta/recipes-devtools/opkg/opkg/headerfix.patch b/meta/recipes-devtools/opkg/opkg/headerfix.patch
index d0711ec..b3515a0 100644
--- a/meta/recipes-devtools/opkg/opkg/headerfix.patch
+++ b/meta/recipes-devtools/opkg/opkg/headerfix.patch
@@ -2,6 +2,8 @@ Without this, the FILE reference in this header can cause compile issues.
RP - 29/1/10
+Upstream-Status: Pending
+
Index: trunk/libopkg/pkg_dest.h
===================================================================
--- trunk.orig/libopkg/pkg_dest.h 2010-01-29 09:37:22.000000000 +0000
diff --git a/meta/recipes-extended/minicom/minicom-2.4/gcc4-scope.patch b/meta/recipes-extended/minicom/minicom-2.4/gcc4-scope.patch
index 5bd47bd..0660cb0 100644
--- a/meta/recipes-extended/minicom/minicom-2.4/gcc4-scope.patch
+++ b/meta/recipes-extended/minicom/minicom-2.4/gcc4-scope.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [others]
+
--- minicom-2.1/src/window.c.orig 2006-06-14 17:49:53.000000000 +0200
+++ minicom-2.1/src/window.c 2006-06-14 17:50:14.000000000 +0200
@@ -62,7 +62,7 @@
diff --git a/meta/recipes-extended/minicom/minicom-2.4/rename-conflicting-functions.patch b/meta/recipes-extended/minicom/minicom-2.4/rename-conflicting-functions.patch
index c344203..1a50f18 100644
--- a/meta/recipes-extended/minicom/minicom-2.4/rename-conflicting-functions.patch
+++ b/meta/recipes-extended/minicom/minicom-2.4/rename-conflicting-functions.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- minicom-2.3/src/minicom.c-orig 2009-06-08 14:49:07.000000000 +0200
+++ minicom-2.3/src/minicom.c 2009-06-08 14:50:23.000000000 +0200
@@ -63,6 +63,10 @@
diff --git a/meta/recipes-extended/rpcbind/rpcbind/fix_host_path.patch b/meta/recipes-extended/rpcbind/rpcbind/fix_host_path.patch
index 1b12d83..590b344 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/fix_host_path.patch
+++ b/meta/recipes-extended/rpcbind/rpcbind/fix_host_path.patch
@@ -2,6 +2,8 @@ This fixes the hardcoded HOST path
Signed-off-by: Saul Wold <saul.wold@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
--- rpcbind-0.2.0/src/Makefile.am 2010-09-02 11:47:16.725763886 -0700
+++ rpcbind-0.2.0_fixed/src/Makefile.am 2010-09-02 11:47:36.077763138 -0700
@@ -29,6 +29,6 @@
diff --git a/meta/recipes-extended/which/which-2.20/remove-declaration.patch b/meta/recipes-extended/which/which-2.20/remove-declaration.patch
index 09b8143..d3340a3 100644
--- a/meta/recipes-extended/which/which-2.20/remove-declaration.patch
+++ b/meta/recipes-extended/which/which-2.20/remove-declaration.patch
@@ -3,6 +3,8 @@ declared in unistd.h
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
+
diff -ruN which-2.20-orig/bash.c which-2.20/bash.c
--- which-2.20-orig/bash.c 2010-08-03 12:59:08.897088878 +0800
+++ which-2.20/bash.c 2010-08-03 13:17:23.406097212 +0800
diff --git a/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch b/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch
index 54df63d..4f2d50c 100644
--- a/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
---
doc/reference/Makefile.am | 2 +-
examples/Makefile.am | 2 +-
diff --git a/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch b/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
index 569b0d8..2b43c80 100644
--- a/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
---
doc/reference/Makefile.am | 2 +-
examples/Makefile.am | 2 +-
diff --git a/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch b/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch
index ad77d63..7d50624 100644
--- a/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [not used]
+
---
doc/reference/Makefile.am | 2 +-
examples/Makefile.am | 2 +-
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch
index f1f68ac..3fc1378 100644
--- a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch
@@ -1,6 +1,9 @@
Install example binary needed for core-image-clutter
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
Index: git/examples/Makefile.am
===================================================================
--- git.orig/examples/Makefile.am 2011-05-04 14:07:21.000000000 -0700
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
index e9dc8a2..6175a52 100644
--- a/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch
@@ -1,6 +1,9 @@
Install example binary needed for core-image-clutter
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
Index: git/examples/Makefile.am
===================================================================
--- git.orig/examples/Makefile.am 2011-01-31 10:14:23.000000000 +0800
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch b/meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch
index e2f4fa1..80769a8 100644
--- a/meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch
+++ b/meta/recipes-multimedia/flac/flac-1.2.1/disable-xmms-plugin.patch
@@ -1,4 +1,5 @@
# Acquired from OpenEmbedded
+Upstream-Status: Inappropriate [disable feature]
diff -ruN flac-1.2.1-orig/src/Makefile.am flac-1.2.1-new/src/Makefile.am
--- flac-1.2.1-orig/src/Makefile.am 2010-06-23 15:06:29.167865355 +0800
diff --git a/meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch b/meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch
index fdb6f13..9c528c2 100644
--- a/meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch
+++ b/meta/recipes-multimedia/flac/flac-1.2.1/flac-gcc43-fixes.patch
@@ -1,5 +1,6 @@
# Acquired from OpenEmbedded
# Fix no declaration of memcmp()
+Upstream-Status: Pending
diff -urN flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp
--- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2010-06-23 15:06:29.159481339 +0800
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff
index bffdb8a..5f08afe 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.11/lower-rank.diff
@@ -1,6 +1,8 @@
Lower the rank of ffmpeg plugin so codecs that hook into accelerated pieces (e.g. dsp or hw engines) can get picked over this
Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
+
--- /tmp/gstffmpegdec.c 2009-03-05 09:31:15.000000000 +0100
+++ gst-ffmpeg-0.10.6/ext/ffmpeg/gstffmpegdec.c 2009-03-05 09:33:09.000000000 +0100
@@ -2588,7 +2588,7 @@
diff --git a/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch b/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch
index a86c5a8..5168100 100644
--- a/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch
+++ b/meta/recipes-multimedia/liba52/liba52/buildcleanup.patch
@@ -4,6 +4,8 @@ around.
RP 23/2/10
+Upstream-Status: Inappropriate [configuration]
+
Index: a52dec-0.7.4/configure.in
===================================================================
--- a52dec-0.7.4.orig/configure.in 2010-02-23 14:51:50.000000000 +0000
diff --git a/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch b/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
index 07a8f6e..38d40c3 100644
--- a/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
+++ b/meta/recipes-multimedia/libid3tag/libid3tag/addpkgconfig.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libid3tag-0.15.1b/Makefile.am
===================================================================
--- libid3tag-0.15.1b.orig/Makefile.am 2009-07-29 09:29:20.000000000 +0100
diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/fix_build_issue_for_gcc_4.5.0.patch b/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/fix_build_issue_for_gcc_4.5.0.patch
index 80d4d8b..6fb45e1 100644
--- a/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/fix_build_issue_for_gcc_4.5.0.patch
+++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/fix_build_issue_for_gcc_4.5.0.patch
@@ -23,6 +23,8 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=504895
Date: 2010/07/28
Nitin A Kamble <nitin.a.kamble@intel.com>
+Upstream-Status: Inappropriate [debian patch]
+
Index: libmusicbrainz-3.0.2/src/utils_private.cpp
===================================================================
--- libmusicbrainz-3.0.2.orig/src/utils_private.cpp
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch
index f07ee67..4ce5a48 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/armv4+v5asm.patch
@@ -1,5 +1,7 @@
Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
+
Index: pulseaudio-0.9.21/src/pulsecore/svolume_arm.c
===================================================================
--- pulseaudio-0.9.21.orig/src/pulsecore/svolume_arm.c
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/autoconf_version.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/autoconf_version.patch
index 80d0003..86e3972 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/autoconf_version.patch
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/autoconf_version.patch
@@ -1,5 +1,7 @@
Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: pulseaudio-0.9.15/configure.ac
===================================================================
--- pulseaudio-0.9.15.orig/configure.ac 2009-04-14 00:09:53.000000000 +0100
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/buildfix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/buildfix.patch
index ea8d769..99ceff8 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/buildfix.patch
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/buildfix.patch
@@ -1,5 +1,7 @@
Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Pending
+
Index: pulseaudio-0.9.11/src/pulsecore/atomic.h
===================================================================
--- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/configure_silent_rules.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/configure_silent_rules.patch
index fd5abd5..d4a247a 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/configure_silent_rules.patch
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/configure_silent_rules.patch
@@ -1,5 +1,7 @@
Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: pulseaudio-0.9.19/configure.ac
===================================================================
--- pulseaudio-0.9.19.orig/configure.ac 2009-10-31 11:40:00.000000000 +0000
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/gcc4-compile-fix.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/gcc4-compile-fix.patch
index 2969cba..f8b07ea 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/gcc4-compile-fix.patch
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/gcc4-compile-fix.patch
@@ -5,6 +5,8 @@
|
Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Pending
+
Index: pulseaudio-0.9.6/src/pulsecore/core-util.c
===================================================================
--- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/tls_m4.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/tls_m4.patch
index a8292b2..bae0a25 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/tls_m4.patch
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/tls_m4.patch
@@ -1,5 +1,7 @@
Derived from OE by Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: pulseaudio-0.9.15/m4/tls.m4
===================================================================
--- pulseaudio-0.9.15.orig/m4/tls.m4 2008-08-19 23:25:02.000000000 +0200
diff --git a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
index 51d4854..40b13de 100644
--- a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
+++ b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
--- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600
+++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600
@@ -474,6 +474,25 @@
diff --git a/meta/recipes-support/neon/neon-0.29.5/pkgconfig.patch b/meta/recipes-support/neon/neon-0.29.5/pkgconfig.patch
index 6256d9a..1a2550c 100644
--- a/meta/recipes-support/neon/neon-0.29.5/pkgconfig.patch
+++ b/meta/recipes-support/neon/neon-0.29.5/pkgconfig.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
neon.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch b/meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch
index 07eb6d7..8b81fc7 100644
--- a/meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch
+++ b/meta/recipes-support/taglib/taglib-1.6.3/configuretweak.patch
@@ -5,6 +5,8 @@ Fix macros accordingly fixing build failures
RP 2/2/10
+Upstream-Status: Inappropriate [configuration]
+
Index: taglib-1.6.1/acinclude.m4
===================================================================
--- taglib-1.6.1.orig/acinclude.m4 2010-02-01 23:57:16.857788731 +0000
diff --git a/meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch b/meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch
index b072cbc..18237f2 100644
--- a/meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch
+++ b/meta/recipes-support/taglib/taglib-1.6.3/nolibtool.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: taglib-1.6.1/acinclude.m4
===================================================================
--- taglib-1.6.1.orig/acinclude.m4 2009-10-31 10:04:35.000000000 +0000
--
1.7.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/8] recipes: Add Upstream-Status for multiple recipes
2011-05-13 5:06 [PATCH 0/8] 13-May Consolidated Pulls Saul Wold
2011-05-13 5:06 ` [PATCH 1/8] recipes: add Upstream-Status for multiple recipes Saul Wold
@ 2011-05-13 5:06 ` Saul Wold
2011-05-13 5:06 ` [PATCH 3/8] recpies: add Upstream-Status for multiple recipes' patches Saul Wold
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Saul Wold @ 2011-05-13 5:06 UTC (permalink / raw)
To: openembedded-core; +Cc: Ilya Yanok, Jingdong Lu
From: Yu Ke <ke.yu@intel.com>
iputils: update patch Upstream-Status
mktemp: update patch Upstream-Status
xinetd: update Upstream-Status
libdrm: update patch Upstream-Status
qemugl: update patch Upstream-Status
x11-common: update patch Upstream-Status
xorg-app: update patch Upstream-Status
xorg-driver: update patch Upstream-Status
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../files/debian/add-icmp-return-codes.diff | 2 ++
.../iputils/files/debian/fix-arping-timeouts.diff | 2 ++
.../files/debian/fix-dead-host-ping-stats.diff | 2 ++
.../iputils/files/debian/targets.diff | 2 ++
.../iputils/files/debian/use_gethostbyname2.diff | 2 ++
.../mktemp/files/disable-strip.patch | 2 ++
...vices-from-inetd.conf-if-a-service-with-t.patch | 2 ++
...arious-fixes-from-the-previous-maintainer.patch | 2 ++
...uld-be-able-to-listen-on-IPv6-even-in-ine.patch | 2 ++
.../drm/libdrm-2.4.25/installtests.patch | 2 +-
.../mesa/qemugl/remove-x11r6-lib-dir.patch | 2 ++
meta/recipes-graphics/mesa/qemugl/versionfix.patch | 2 ++
.../x11-common/x11-common/gplv2-license.patch | 2 ++
.../xserver-nodm-init/gplv2-license.patch | 2 ++
.../xorg-app/xdpyinfo/disable-xkb.patch | 2 ++
.../xorg-app/xset/disable-xkb.patch | 2 ++
.../xf86-video-omapfb/omap-blacklist-tv-out.patch | 4 +++-
.../xf86-video-omapfb/omap-force-plain-mode.patch | 2 ++
.../omap-revert-set-CRTC-limit.patch | 2 ++
.../omap-revert-set-virtual-size.patch | 2 ++
.../xorg-driver/xf86-video-omapfb/omapfb-neon.diff | 2 ++
21 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff b/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
index 86bbf0d..40070c3 100644
--- a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
+++ b/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending [from other distro Debian]
+
Index: trunk/ping.c
===================================================================
--- trunk.orig/ping.c 2010-05-07 23:13:54.000000000 -0700
diff --git a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
index 9f05769..3e34788 100644
--- a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
+++ b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending [from other distro Debian]
+
Index: trunk/arping.c
===================================================================
--- trunk.orig/arping.c 2010-05-07 23:13:52.000000000 -0700
diff --git a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff b/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
index 2a92425..fda42bf 100644
--- a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
+++ b/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending [from other distro Debian]
+
Index: trunk/ping_common.c
===================================================================
--- trunk.orig/ping_common.c 2010-05-07 23:13:51.000000000 -0700
diff --git a/meta/recipes-extended/iputils/files/debian/targets.diff b/meta/recipes-extended/iputils/files/debian/targets.diff
index b5e907a..6b899cb 100644
--- a/meta/recipes-extended/iputils/files/debian/targets.diff
+++ b/meta/recipes-extended/iputils/files/debian/targets.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
Index: trunk/Makefile
===================================================================
--- trunk.orig/Makefile 2010-05-07 23:43:00.000000000 -0700
diff --git a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
index 7e6c97c..1d01e15 100644
--- a/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
+++ b/meta/recipes-extended/iputils/files/debian/use_gethostbyname2.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending [from other distro Debian]
+
Index: trunk/tracepath.c
===================================================================
--- trunk.orig/tracepath.c 2010-05-07 23:13:52.000000000 -0700
diff --git a/meta/recipes-extended/mktemp/files/disable-strip.patch b/meta/recipes-extended/mktemp/files/disable-strip.patch
index d6bc528..e06869e 100644
--- a/meta/recipes-extended/mktemp/files/disable-strip.patch
+++ b/meta/recipes-extended/mktemp/files/disable-strip.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff --git a/Makefile.in b/Makefile.in
index 37b3cc9..f1026f3 100644
--- a/Makefile.in
diff --git a/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch b/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
index 8602a88..cd6e6c1 100644
--- a/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
+++ b/meta/recipes-extended/xinetd/xinetd/Disable-services-from-inetd.conf-if-a-service-with-t.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending [from other distro Debian]
+
From d588b6530e1382a624898b3f4307f636c72c80a9 Mon Sep 17 00:00:00 2001
From: Pierre Habouzit <madcoder@debian.org>
Date: Wed, 28 Nov 2007 10:13:08 +0100
diff --git a/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch b/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
index d243692..8e59cdc 100644
--- a/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
+++ b/meta/recipes-extended/xinetd/xinetd/Various-fixes-from-the-previous-maintainer.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending [from other distro Debian]
+
From a3410b0bc81ab03a889d9ffc14e351badf8372f1 Mon Sep 17 00:00:00 2001
From: Pierre Habouzit <madcoder@debian.org>
Date: Mon, 26 Nov 2007 16:02:04 +0100
diff --git a/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch b/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
index 2b76fe3..2365ca1 100644
--- a/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
+++ b/meta/recipes-extended/xinetd/xinetd/xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending [from other distro Debian]
+
From f44b218ccc779ab3f4aed072390ccf129d94b58d Mon Sep 17 00:00:00 2001
From: David Madore <david@pleiades.stars>
Date: Mon, 24 Mar 2008 12:45:36 +0100
diff --git a/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch b/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
index 2704ee6..1f39719 100644
--- a/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
+++ b/meta/recipes-graphics/drm/libdrm-2.4.25/installtests.patch
@@ -1,6 +1,6 @@
tests: also install tests app
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [configuration]
Signed-off-by: Yu Ke <ke.yu@intel.com>
diff --git a/meta/recipes-graphics/mesa/qemugl/remove-x11r6-lib-dir.patch b/meta/recipes-graphics/mesa/qemugl/remove-x11r6-lib-dir.patch
index d14ce89..d24d045 100644
--- a/meta/recipes-graphics/mesa/qemugl/remove-x11r6-lib-dir.patch
+++ b/meta/recipes-graphics/mesa/qemugl/remove-x11r6-lib-dir.patch
@@ -2,6 +2,8 @@ Remove X11R6 lib directory
"-L/usr/X11R6/lib" is obsolate in poky. Poky currently use Xserver from X.org (X11R7.x), which puts lib in standard /usr/lib, so no need to specify the extra -L/usr/X11R6/lib. Meanwhile, the -L/usr/X11R6/lib will cause warning: library search path "/usr/X11R6/lib" is unsafe for cross-compilation. so better to remove it.
+Upstream-Status: Pending
+
Signed-off-by: Yu Ke <ke.yu@intel.com>
diff --git a/Makefile b/Makefile
diff --git a/meta/recipes-graphics/mesa/qemugl/versionfix.patch b/meta/recipes-graphics/mesa/qemugl/versionfix.patch
index a3d33e8..614b816 100644
--- a/meta/recipes-graphics/mesa/qemugl/versionfix.patch
+++ b/meta/recipes-graphics/mesa/qemugl/versionfix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: git/Makefile
===================================================================
--- git.orig/Makefile 2009-01-19 23:37:36.000000000 +0000
diff --git a/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch b/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch
index ec93253..eff975e 100644
--- a/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch
+++ b/meta/recipes-graphics/x11-common/x11-common/gplv2-license.patch
@@ -4,6 +4,8 @@ this is a local file recipe and the license file is missing.In order
to pass the license checksum checking, the license file is needed. So
this patch add the GPLv2 license file.
+Upstream-Status: Inappropriate [licensing]
+
Signed-off-by: Yu Ke <ke.yu@intel.com>
diff --git a/COPYING b/COPYING
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch b/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
index ec93253..eff975e 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/gplv2-license.patch
@@ -4,6 +4,8 @@ this is a local file recipe and the license file is missing.In order
to pass the license checksum checking, the license file is needed. So
this patch add the GPLv2 license file.
+Upstream-Status: Inappropriate [licensing]
+
Signed-off-by: Yu Ke <ke.yu@intel.com>
diff --git a/COPYING b/COPYING
diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
index 24af21f..b10143d 100644
--- a/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
+++ b/meta/recipes-graphics/xorg-app/xdpyinfo/disable-xkb.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- xdpyinfo-1.0.1/configure.ac.orig 2006-03-08 16:33:05.000000000 +0100
+++ xdpyinfo-1.0.1/configure.ac 2006-03-08 16:41:59.000000000 +0100
@@ -45,11 +45,15 @@
diff --git a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
index 2e728cf..97d13a3 100644
--- a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
+++ b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
@@ -1,5 +1,7 @@
add "-disable-xkb" option
+Upstream-Status: Pending
+
Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com>
diff --git a/configure.ac b/configure.ac
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch
index 506e174..9b1ee06 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-blacklist-tv-out.patch
@@ -5,7 +5,9 @@ Date: Wed Jan 26 13:21:12 2011 +0100
blacklist tv out
The tv-out gets added last and the driver tries to reconfigure dvi to TV resolutions, which fails. so blacklist it
-
+
+ Upstream-Status: Pending
+
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
diff --git a/src/omapfb-output-dss.c b/src/omapfb-output-dss.c
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch
index 201a8b9..bb298b0 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-force-plain-mode.patch
@@ -6,6 +6,8 @@ Date: Wed Jan 26 13:20:20 2011 +0100
The new DSS mode breaks XV, so force plain mode
+ Upstream-Status: Pending
+
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch
index 6a9e905..97bf022 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-CRTC-limit.patch
@@ -8,6 +8,8 @@ Date: Wed Jan 26 12:04:36 2011 +0100
Virtual size too big, revert the commit 9c4d7592dcb7dc20a48a6f941d9d94bd73d34153.
+ Upstream-Status: Pending
+
diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c
index 9aaa52f..cbeff35 100644
--- a/src/omapfb-crtc.c
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch
index a3fd0d5..8a6eef5 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omap-revert-set-virtual-size.patch
@@ -8,6 +8,8 @@ Date: Wed Jan 26 13:27:20 2011 +0100
This reverts commit 2653ef07883fbd1a5e7025f9300cf89b79ba429a.
+ Upstream-Status: Pending
+
diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c
index cbeff35..9655db2 100644
--- a/src/omapfb-crtc.c
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
index 325ca66..fb3ac8c 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/omapfb-neon.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- /tmp/image-format-conversions.h 2009-02-03 10:18:04.000000000 +0100
+++ git/src/image-format-conversions.h 2009-02-03 10:19:18.000000000 +0100
@@ -30,6 +30,8 @@
--
1.7.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/8] recpies: add Upstream-Status for multiple recipes' patches
2011-05-13 5:06 [PATCH 0/8] 13-May Consolidated Pulls Saul Wold
2011-05-13 5:06 ` [PATCH 1/8] recipes: add Upstream-Status for multiple recipes Saul Wold
2011-05-13 5:06 ` [PATCH 2/8] recipes: Add " Saul Wold
@ 2011-05-13 5:06 ` Saul Wold
2011-05-13 5:06 ` [PATCH 4/8] recipes: Add Upstream-Status to multiple recipes Saul Wold
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Saul Wold @ 2011-05-13 5:06 UTC (permalink / raw)
To: openembedded-core; +Cc: Ilya Yanok, Jingdong Lu
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 44305 bytes --]
From: Dexuan Cui <dexuan.cui@intel.com>
tcf-agent: update its patch's Upstream-Status
screen: update its patch's Upstream-Status
which (GPLv2): update its patch's Upstream-Status
gnome-vfs: update its patch's Upstream-Status
libart-lgpl: update its patch's Upstream-Status
librsvg: update its patch's Upstream-Status
fontconfig: update its patch's Upstream-Status
freetype: update its patch's Upstream-Status
libxsettings-client: update its patch's Upstream-Status
libxcb: update its patch's Upstream-Status
libx11: update its patch's Upstream-Status
- remove 2 unused xim.patch.
libx11-trim: update its patch's Upstream-Status
libxcalibrate: update its patch's Upstream-Status
libxcomposite: update its patch's Upstream-Status
libxfont: update its patch's Upstream-Status
xtrans: update its patch's Upstream-Status
- remove abstract_socket_fix.patch as it's not used at all for long.
calibrateproto: update its patch's Upstream-Status
latencytop: update its patch's Upstream-Status
powertop: update its patch's Upstream-Status
settings-daemon: update its patch's Upstream-Status
gnome-settings-daemon: update its patch's Upstream-Status
libxklavier: update its patch's Upstream-Status
liblbxutil: update its patch's Upstream-Status
oprofile: update its patch's Upstream-Status and remove an unused patch
- delete xml_callgraph_details.patch as it's not used at all.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
.../gnome/gnome-settings-daemon/configurefix.patch | 2 +
.../gnome-settings-daemon/desktop-moblin.patch | 2 +
...-settings-daemon-2.24.0-catch-deviceadded.patch | 2 +
.../gnome-settings-daemon-fix-gthread.patch | 2 +
.../gnome-settings-daemon/mojito-cleanup.patch | 2 +
.../gnome/gnome-settings-daemon/mount-plugin.patch | 2 +
.../libxklavier/libxklavier/pkgconfigfix.patch | 2 +
.../xorg-lib/liblbxutil/mkg3states.patch | 2 +
.../tcf-agent/tcf-agent/fix_tcf-agent.init.patch | 2 +
.../tcf-agent/tcf-agent/terminals_agent.patch | 2 +
.../screen/screen-4.0.3/configure.patch | 2 +
.../fix_name_conflict_group_member.patch | 2 +
.../gnome/gnome-vfs-2.24.4/gconftool-lossage.patch | 2 +
.../gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch | 2 +
.../gnome/libart-lgpl/Makefile.am.patch | 2 +
.../librsvg/librsvg-2.32.1/doc_Makefile.patch | 2 +
.../fontconfig-2.8.0/fix-pkgconfig.patch | 2 +
.../freetype/freetype-2.4.4/no-hardcode.patch | 2 +
.../libxsettings-client/disable_Os_option.patch | 2 +
.../libxsettings-client/link-x11.patch | 2 +
.../xcb/libxcb/xcbincludedir.patch | 2 +
.../xorg-lib/libx11-1.3.4/include_fix.patch | 2 +
.../xorg-lib/libx11-1.3.4/nodolt.patch | 2 +
.../libx11-1.3.4/x11_disable_makekeys.patch | 2 +
.../xorg-lib/libx11-git/X18NCMSstubs.diff | 2 +
.../xorg-lib/libx11-git/fix-disable-xlocale.diff | 2 +
.../libx11-git/fix-utf8-wrong-define.patch | 1 +
.../xorg-lib/libx11-git/include_fix.patch | 2 +
.../xorg-lib/libx11-git/nodolt.patch | 2 +
.../xorg-lib/libx11-git/x11_disable_makekeys.patch | 2 +
.../recipes-graphics/xorg-lib/libx11-git/xim.patch | 55 -----
.../xorg-lib/libx11-trim/include_fix.patch | 2 +
.../xorg-lib/libx11-trim/nodolt.patch | 2 +
.../libx11-trim/x11_disable_makekeys.patch | 2 +
.../xorg-lib/libx11/X18NCMSstubs.diff | 2 +
.../xorg-lib/libx11/fix-disable-xlocale.diff | 2 +
.../xorg-lib/libx11/fix-utf8-wrong-define.patch | 1 +
.../xorg-lib/libx11/include_fix.patch | 2 +
meta/recipes-graphics/xorg-lib/libx11/nodolt.patch | 2 +
.../xorg-lib/libx11/x11_disable_makekeys.patch | 2 +
meta/recipes-graphics/xorg-lib/libx11/xim.patch | 55 -----
.../xorg-lib/libxcalibrate/fix-xcb.patch | 2 +
.../libxcomposite/change-include-order.patch | 2 +
.../xorg-lib/libxfont/no-scalable-crash.patch | 2 +
.../xorg-lib/xtrans/abstract_socket_fix.patch | 58 -----
.../xorg-proto/calibrateproto/fix.patch | 2 +
.../latencytop-0.5/latencytop-makefile.patch | 2 +
.../recipes-kernel/oprofile/oprofile/opstart.patch | 2 +
.../oprofile/oprofile/xml_callgraph_details.patch | 232 --------------------
.../stub_out_the_ncurses_calls_in_dump_mode.patch | 2 +
.../settings-daemon/files/addsoundkeys.patch | 2 +
.../files/dso_linking_change_build_fix.patch | 2 +
52 files changed, 94 insertions(+), 400 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/xim.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/xim.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch
delete mode 100644 meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch
index 01b4f64..892946f 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: gnome-settings-daemon-2.26.1/configure.ac
===================================================================
--- gnome-settings-daemon-2.26.1.orig/configure.ac 2009-09-16 22:57:31.000000000 +0100
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch
index d3fd76c..b8f1661 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in~ 2009-04-24 20:59:51.000000000 -0700
+++ gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in 2009-04-24 20:59:51.000000000 -0700
@@ -2,7 +2,7 @@
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch
index 8e1d0ce..b9cf6e1 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
============================================================
Listen for DeviceAdded in addition to DeviceEnabled
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch
index d77063e..965da09 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: gnome-settings-daemon-2.25.90/configure.ac
===================================================================
--- gnome-settings-daemon-2.25.90.orig/configure.ac
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch
index 1aff2d6..79f2871 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c
index f84cfad..e8f474a 100644
--- a/plugins/housekeeping/gsd-housekeeping-manager.c
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch
index 67f056b..25dc36e 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
diff --git a/configure.ac b/configure.ac
index 135f2ce..ba737a5 100644
--- a/configure.ac
diff --git a/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch b/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
index 4aaafb2..f58f30b 100644
--- a/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
+++ b/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libxklavier-3.7/libxklavier.pc.in
===================================================================
--- libxklavier-3.7.orig/libxklavier.pc.in 2009-06-10 15:58:46.000000000 +0100
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch b/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
index 029d761..63c1847 100644
--- a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
+++ b/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
During the build process the mkg3states binary needs to be run. This patch
allows it to be built with the build systems gcc allowing this to work.
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
index fa9e458..60b0b27 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [poky-specific script]
+
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch
index b88b5e7..aed62fa 100644
--- a/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch
+++ b/meta/recipes-devtools/tcf-agent/tcf-agent/terminals_agent.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [source code; we'll remove it when upgrading tcf-agent in future]
+
Index: org.eclipse.tm.tcf.terminals.agent/terminals.c
===================================================================
--- org.eclipse.tm.tcf.terminals.agent/terminals.c (revision 0)
diff --git a/meta/recipes-extended/screen/screen-4.0.3/configure.patch b/meta/recipes-extended/screen/screen-4.0.3/configure.patch
index 1061a56..b29071d 100644
--- a/meta/recipes-extended/screen/screen-4.0.3/configure.patch
+++ b/meta/recipes-extended/screen/screen-4.0.3/configure.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
# The patch is borrowed from OE:
# http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=4ee790cc6974bdfe1c9b06c0567b1c56f56d6615
# and was rebased to screen-4.0.3's configure.in
diff --git a/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch b/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch
index 568d423..fb9b1a4 100644
--- a/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch
+++ b/meta/recipes-extended/which/which-2.18/fix_name_conflict_group_member.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [this is 2.18(GPLv2) specific]
+
# glibc also implements the function group_member. To avoid name conflict,
# here let us append a "_" to which's version.
#
diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
index 3dbc130..0f52136 100644
--- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
+++ b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gconftool-lossage.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000
+++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100
@@ -154,7 +154,7 @@
diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
index e25ecdd..dabec32 100644
--- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
+++ b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
removes kerberos completely to avoid conflicts with installed kerberos
--- configure.in.orig 2007-01-05 19:42:26.418541610 +0200
+++ configure.in 2007-01-05 19:42:56.604261797 +0200
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
index 28acbe1..190ba96 100644
--- a/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
+++ b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libart_lgpl-2.3.21/Makefile.am
===================================================================
--- libart_lgpl-2.3.21.orig/Makefile.am 2009-04-18 05:29:25.000000000 -0700
diff --git a/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch b/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch
index 217573b..860d7a9 100644
--- a/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch
+++ b/meta/recipes-gnome/librsvg/librsvg-2.32.1/doc_Makefile.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Automake complains about using += before setting with =
Signed-off-by: Saul Wold <sgw@linux.intel.com>
diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
index 7fec1e9..c8a3bf5 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
+++ b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
fontconfig.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch b/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch
index 44ae450..0f21d1f 100644
--- a/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch
+++ b/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- freetype-2.1.10/builds/unix/freetype-config.in.old 2006-05-01 12:39:20.000000000 +0100
+++ freetype-2.1.10/builds/unix/freetype-config.in 2006-05-01 12:39:34.000000000 +0100
@@ -16,7 +16,7 @@
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch
index 716f562..64b7efa 100644
--- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch
+++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Do not set Os optimization in target APP CFLAGS, since it may have potential
error if "--enable-target-optspace" is not set when configuring GCC.
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch
index ee12f0a..d08d0d5 100644
--- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch
+++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: Xsettings-client-0.10/Makefile.am
===================================================================
--- Xsettings-client-0.10.orig/Makefile.am 2008-02-07 14:49:54.000000000 +0000
diff --git a/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch b/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch
index cef6350..d858a63 100644
--- a/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch
+++ b/meta/recipes-graphics/xcb/libxcb/xcbincludedir.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- libxcb-1.0.orig/configure.ac 2006-11-23 15:33:01.000000000 +0000
+++ libxcb-1.0/configure.ac 2008-09-10 20:29:12.000000000 +0100
@@ -50,7 +50,7 @@
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
index c8aa085..eeb4175 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
index 011c23e..bf6c7d5 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- libX11-1.3.4.orig/configure.ac
+++ libX11-1.3.4/configure.ac
@@ -32,7 +32,6 @@
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
index 4036757..561b577 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
src/util/Makefile.am | 21 -----------------
1 file changed, 21 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
index 2dd27fc..b49fc22 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
---
configure.ac | 9 -
src/Makefile.am | 5
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
index 9dbf6da..7dcdd6a 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
@@ -701,7 +701,11 @@
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
index a098db1..26d3349 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
#
# Patch managed by http://www.holgerschurig.de/patcher.html
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
index 99ed571..b3bcbab 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
index ecf9625..cc05fdc 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libX11-1.2.1/configure.ac
===================================================================
--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
index 9cc2bbb..5dc6f06 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
src/util/Makefile.am | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch b/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch
deleted file mode 100644
index 0eab197..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/xim.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000
-+++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
-@@ -90,6 +90,52 @@
- return;
- }
-
-+XIM
-+XOpenIM (
-+ Display* display,
-+ struct _XrmHashBucketRec* rdb,
-+ char* res_name,
-+ char* res_class)
-+{
-+ return (XIM) NULL;
-+}
-+
-+Status
-+XCloseIM ( XIM im )
-+{
-+ return NULL;
-+}
-+
-+XIC
-+XCreateIC ( XIM im, ...)
-+{
-+ return NULL;
-+}
-+
-+void
-+XDestroyIC ( XIC ic )
-+{
-+ return;
-+}
-+
-+int
-+XmbLookupString (
-+ XIC ic,
-+ XKeyPressedEvent* ev,
-+ char* buffer,
-+ int nbytes,
-+ KeySym* keysym,
-+ Status* status)
-+{
-+ return XLookupNone;
-+}
-+
-+char *
-+XGetICValues( XIC ic, ...)
-+{
-+ return (char *) NULL;
-+}
-+
- XPointer
- _XimGetLocaleCode ( _Xconst char* encoding_name )
- {
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
index 99ed571..b3bcbab 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
index ecf9625..cc05fdc 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libX11-1.2.1/configure.ac
===================================================================
--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
index 6705782..0445835 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
src/util/Makefile.am | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
index 54b1727..2e86a48 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100
+++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100
@@ -83,6 +83,7 @@
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
index 9dbf6da..7dcdd6a 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
@@ -701,7 +701,11 @@
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
index a098db1..26d3349 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
@@ -1,3 +1,4 @@
+Upstream-Status: Pending
#
# Patch managed by http://www.holgerschurig.de/patcher.html
diff --git a/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
index 99ed571..b3bcbab 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
index ecf9625..cc05fdc 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libX11-1.2.1/configure.ac
===================================================================
--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
diff --git a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
index 6705782..0445835 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
---
src/util/Makefile.am | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11/xim.patch b/meta/recipes-graphics/xorg-lib/libx11/xim.patch
deleted file mode 100644
index 0eab197..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11/xim.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- libX11-6.2.1/src/X18NCMSstubs.c 2003-12-04 22:47:47.000000000 +0000
-+++ libX11-6.2.1/src/X18NCMSstubs.c-new 2005-12-09 12:09:03.000000000 +0000
-@@ -90,6 +90,52 @@
- return;
- }
-
-+XIM
-+XOpenIM (
-+ Display* display,
-+ struct _XrmHashBucketRec* rdb,
-+ char* res_name,
-+ char* res_class)
-+{
-+ return (XIM) NULL;
-+}
-+
-+Status
-+XCloseIM ( XIM im )
-+{
-+ return NULL;
-+}
-+
-+XIC
-+XCreateIC ( XIM im, ...)
-+{
-+ return NULL;
-+}
-+
-+void
-+XDestroyIC ( XIC ic )
-+{
-+ return;
-+}
-+
-+int
-+XmbLookupString (
-+ XIC ic,
-+ XKeyPressedEvent* ev,
-+ char* buffer,
-+ int nbytes,
-+ KeySym* keysym,
-+ Status* status)
-+{
-+ return XLookupNone;
-+}
-+
-+char *
-+XGetICValues( XIC ic, ...)
-+{
-+ return (char *) NULL;
-+}
-+
- XPointer
- _XimGetLocaleCode ( _Xconst char* encoding_name )
- {
diff --git a/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch b/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
index 0d7efc7..d614883 100644
--- a/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
+++ b/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
There is no extra reply data and if we say not to disgard it, xcb
throws fatal asserts.
diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
index 848beff..60331f6 100644
--- a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
+++ b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
This patch makes the build use its own Xcomposite.h over rather than an
older Xcomposite.h that might already be installed in the staging dir.
diff --git a/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch b/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch
index 90bded6..b3c58af 100644
--- a/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch
+++ b/meta/recipes-graphics/xorg-lib/libxfont/no-scalable-crash.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200
+++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200
@@ -695,6 +695,11 @@
diff --git a/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch b/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch
deleted file mode 100644
index 197da07..0000000
--- a/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 556a351de83fc6f401b02213dae95731553c216d Mon Sep 17 00:00:00 2001
-From: Loïc Minier <lool@dooz.org>
-Date: Mon, 24 Mar 2008 19:38:27 +0000
-Subject: Bug #10489: Don't retry unix socket connect()s on ENOENT.
-
-If the socket isn't there, it's not gonna magically appear. Either it's
-a server socket and you should have just waited for the SIGUSR1 from the
-server, or it's a stale reference to an ICE socket.
-
-However, do retry once, so fallback from abstract to filesystem namespace
-works.
-
-Originally Debian bug #385976.
----
-diff --git a/Xtranssock.c b/Xtranssock.c
-index 8a7d2ec..da4afe9 100644
---- a/Xtranssock.c
-+++ b/Xtranssock.c
-@@ -2146,8 +2146,13 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
- errno = olderrno;
-
- /*
-- * If the error was ENOENT, the server may be starting up
-- * and we should try again.
-+ * If the error was ENOENT, the server may be starting up; we used
-+ * to suggest to try again in this case with
-+ * TRANS_TRY_CONNECT_AGAIN, but this introduced problems for
-+ * processes still referencing stale sockets in their environment.
-+ * Hence, we now return a hard error, TRANS_CONNECT_FAILED, and it
-+ * is suggested that higher level stacks handle retries on their
-+ * level when they face a slow starting server.
- *
- * If the error was EWOULDBLOCK or EINPROGRESS then the socket
- * was non-blocking and we should poll using select
-@@ -2161,14 +2166,14 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
- else if (olderrno == EINTR)
- return TRANS_TRY_CONNECT_AGAIN;
- else if (olderrno == ENOENT) {
-- /*
-- * If opening as abstract socket failed, try again "normally"
-- */
-- if (abstract)
-+ /* If opening as abstract socket failed, try again normally */
-+ if (abstract) {
- ciptr->transptr->flags &= ~(TRANS_ABSTRACT);
-- return TRANS_TRY_CONNECT_AGAIN;
-- }
-- else {
-+ return TRANS_TRY_CONNECT_AGAIN;
-+ } else {
-+ return TRANS_CONNECT_FAILED;
-+ }
-+ } else {
- PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n",
- EGET(),0, 0);
-
---
-cgit v0.7.2-37-g538c
diff --git a/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch b/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
index 0c85cb0..ff8cb25 100644
--- a/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
+++ b/meta/recipes-graphics/xorg-proto/calibrateproto/fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Add missing length fields to the replies. Without these, sanity checking in recent X
breaks things.
diff --git a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
index b979f57..59a0b1f 100644
--- a/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
+++ b/meta/recipes-kernel/latencytop/latencytop-0.5/latencytop-makefile.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- a/Makefile 2010-07-20 18:51:32.000000000 +0800
+++ b/Makefile 2010-07-20 18:54:54.000000000 +0800
@@ -4,7 +4,8 @@
diff --git a/meta/recipes-kernel/oprofile/oprofile/opstart.patch b/meta/recipes-kernel/oprofile/oprofile/opstart.patch
index d61c300..c588deb 100644
--- a/meta/recipes-kernel/oprofile/oprofile/opstart.patch
+++ b/meta/recipes-kernel/oprofile/oprofile/opstart.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: oprofile/utils/Makefile.am
===================================================================
--- oprofile.orig/utils/Makefile.am 2005-03-31 18:20:41.000000000 +0100
diff --git a/meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch b/meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch
deleted file mode 100644
index e5ab3d9..0000000
--- a/meta/recipes-kernel/oprofile/oprofile/xml_callgraph_details.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-Work in Progress- This patch breaks output_symbol_bytes
----
- ChangeLog | 9 +++++++++
- libpp/callgraph_container.cpp | 10 ++++++++--
- libpp/callgraph_container.h | 14 ++++++++++----
- libpp/format_output.cpp | 30 +++++++++++++++++++++++++-----
- libpp/format_output.h | 6 +++---
- pp/opreport.cpp | 5 +++--
- pp/opreport_options.cpp | 4 ++--
- 7 files changed, 60 insertions(+), 18 deletions(-)
-
-Index: oprofile1/pp/opreport.cpp
-===================================================================
---- oprofile1.orig/pp/opreport.cpp 2007-05-24 15:32:20.000000000 +0100
-+++ oprofile1/pp/opreport.cpp 2007-05-24 20:07:14.000000000 +0100
-@@ -555,10 +555,11 @@ int opreport(options::spec const & spec)
-
- output_diff_symbols(pc1, pc2, multiple_apps);
- } else if (options::callgraph) {
-- callgraph_container cg_container;
-+ callgraph_container cg_container(options::debug_info,
-+ options::details);
- cg_container.populate(options::archive_path, iprofiles,
- options::extra_found_images,
-- options::debug_info, options::threshold,
-+ options::threshold,
- options::merge_by.lib, options::symbol_filter);
-
- output_cg_symbols(cg_container, multiple_apps);
-Index: oprofile1/ChangeLog
-===================================================================
---- oprofile1.orig/ChangeLog 2007-05-24 18:30:47.000000000 +0100
-+++ oprofile1/ChangeLog 2007-05-24 20:07:14.000000000 +0100
-@@ -1,5 +1,14 @@
- 2007-05-24 Richard Purdie <rpurdie@openedhand.com>
-
-+ * libpp/callgraph_container.cpp:
-+ * libpp/callgraph_container.h:
-+ * libpp/format_output.cpp:
-+ * libpp/format_output.h:
-+ * pp/opreport.cpp:
-+ * pp/opreport_options.cpp: Add callgraph XML detail support
-+
-+2007-05-24 Richard Purdie <rpurdie@openedhand.com>
-+
- * events/arm/xscale1/events:
- * events/arm/xscale2/events: Add extra Xscale PMU event definitions
-
-Index: oprofile1/libpp/callgraph_container.cpp
-===================================================================
---- oprofile1.orig/libpp/callgraph_container.cpp 2007-05-24 15:32:20.000000000 +0100
-+++ oprofile1/libpp/callgraph_container.cpp 2007-05-24 20:07:14.000000000 +0100
-@@ -391,15 +391,21 @@ const symbol_collection & arc_recorder::
- return cg_syms;
- }
-
-+callgraph_container::callgraph_container(bool debug_info, bool need_details)
-+ :
-+ pc(debug_info, need_details),
-+ debug_info(debug_info)
-+{
-+}
-+
-
- void callgraph_container::populate(string const & archive_path,
- list<inverted_profile> const & iprofiles,
-- extra_images const & extra, bool debug_info, double threshold,
-+ extra_images const & extra, double threshold,
- bool merge_lib, string_filter const & sym_filter)
- {
- // non callgraph samples container, we record sample at symbol level
- // not at vma level.
-- profile_container pc(debug_info, false);
-
- list<inverted_profile>::const_iterator it;
- list<inverted_profile>::const_iterator const end = iprofiles.end();
-Index: oprofile1/libpp/callgraph_container.h
-===================================================================
---- oprofile1.orig/libpp/callgraph_container.h 2007-05-24 15:32:20.000000000 +0100
-+++ oprofile1/libpp/callgraph_container.h 2007-05-24 20:07:14.000000000 +0100
-@@ -19,8 +19,8 @@
- #include "symbol.h"
- #include "symbol_functors.h"
- #include "string_filter.h"
-+#include "profile_container.h"
-
--class profile_container;
- class inverted_profile;
- class profile_t;
- class extra_images;
-@@ -103,6 +103,8 @@ private:
- */
- class callgraph_container {
- public:
-+ callgraph_container(bool debug_info, bool need_details);
-+
- /**
- * Populate the container, must be called once only.
- * @param archive_path oparchive prefix path
-@@ -118,9 +120,8 @@ public:
- */
- void populate(std::string const & archive_path,
- std::list<inverted_profile> const & iprofiles,
-- extra_images const & extra, bool debug_info,
-- double threshold, bool merge_lib,
-- string_filter const & sym_filter);
-+ extra_images const & extra, double threshold,
-+ bool merge_lib, string_filter const & sym_filter);
-
- /// return hint on how data must be displayed.
- column_flags output_hint() const;
-@@ -131,6 +132,9 @@ public:
- // return all the cg symbols
- const symbol_collection & get_symbols() const;
-
-+ // profile container callgraph is based on
-+ profile_container pc;
-+
- private:
- /**
- * Record caller/callee for one cg file
-@@ -162,6 +166,8 @@ private:
- profile_container const & pc, bool debug_info,
- bool merge_lib);
-
-+ bool debug_info;
-+
- /// record all main symbols
- void add_symbols(profile_container const & pc);
-
-Index: oprofile1/pp/opreport_options.cpp
-===================================================================
---- oprofile1.orig/pp/opreport_options.cpp 2007-05-24 15:32:20.000000000 +0100
-+++ oprofile1/pp/opreport_options.cpp 2007-05-24 20:07:14.000000000 +0100
-@@ -165,8 +165,8 @@ void check_options(bool diff)
-
- if (callgraph) {
- symbols = true;
-- if (details) {
-- cerr << "--callgraph is incompatible with --details" << endl;
-+ if (details && !xml) {
-+ cerr << "--callgraph is incompatible with --details without --xml" << endl;
- do_exit = true;
- }
-
-Index: oprofile1/libpp/format_output.cpp
-===================================================================
---- oprofile1.orig/libpp/format_output.cpp 2007-05-24 15:32:20.000000000 +0100
-+++ oprofile1/libpp/format_output.cpp 2007-05-24 20:07:14.000000000 +0100
-@@ -594,9 +594,9 @@ xml_formatter::
- xml_formatter(profile_container const * p,
- symbol_collection & s)
- :
-+ need_details(false),
- profile(p),
-- symbols(s),
-- need_details(false)
-+ symbols(s)
- {
- if (profile)
- counts.total = profile->samples_count();
-@@ -673,8 +673,8 @@ void xml_formatter::output_symbol_data(o
- if (name.size() > 0 && name[0] != '?') {
- output_attribute(out, datum, ff_vma, STARTING_ADDR);
-
-- if (need_details)
-- xml_support->output_symbol_bytes(bytes_out, symb, sd_it->second);
-+ //if (need_details)
-+ // xml_support->output_symbol_bytes(bytes_out, symb, sd_it->second);
- }
- out << close_element();
-
-@@ -843,7 +843,7 @@ output_attribute(ostream & out, field_da
- xml_cg_formatter::
- xml_cg_formatter(callgraph_container const * cg, symbol_collection & s)
- :
-- xml_formatter(0, s),
-+ xml_formatter(&cg->pc, s),
- callgraph(cg)
- {
- counts.total = callgraph->samples_count();
-@@ -946,6 +946,26 @@ output_symbol(ostream & out,
-
- out << init_attr(ID_REF, indx);
-
-+ if (need_details) {
-+ ostringstream details;
-+ symbol_details_t & sd = symbol_details[indx];
-+ size_t const detail_lo = sd.index;
-+
-+ string detail_str = output_symbol_details(symb, sd.index, lo, hi);
-+
-+ if (detail_str.size() > 0) {
-+ if (sd.id < 0)
-+ sd.id = indx;
-+ details << detail_str;
-+ }
-+
-+ if (sd.index > detail_lo) {
-+ sd.details = sd.details + details.str();
-+ out << init_attr(DETAIL_LO, detail_lo);
-+ out << init_attr(DETAIL_HI, sd.index-1);
-+ }
-+ }
-+
- out << close_element(NONE, true);
-
- out << open_element(CALLERS);
-Index: oprofile1/libpp/format_output.h
-===================================================================
---- oprofile1.orig/libpp/format_output.h 2007-05-24 15:32:20.000000000 +0100
-+++ oprofile1/libpp/format_output.h 2007-05-24 20:07:14.000000000 +0100
-@@ -249,6 +249,9 @@ public:
- // output SymbolData XML elements
- void output_symbol_data(std::ostream & out);
-
-+ /// true if we need to show details for each symbols
-+ bool need_details;
-+
- private:
- /// container we work from
- profile_container const * profile;
-@@ -256,9 +259,6 @@ private:
- // ordered collection of symbols associated with this profile
- symbol_collection & symbols;
-
-- /// true if we need to show details for each symbols
-- bool need_details;
--
- // count of DetailData items output so far
- size_t detail_count;
-
diff --git a/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch b/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
index e837765..ae4cf5d 100644
--- a/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
+++ b/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [this patch is 1.13 specific and 2.0 will be coming.]
+
Running PowerTop in Poky in dump mode (with --dump) always ends with a
segmentation fault.
diff --git a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
index e06f029..baf06d6 100644
--- a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
+++ b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: settings-daemon/settings-daemon.c
===================================================================
--- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100
diff --git a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
index 5fd96d4..5943744 100644
--- a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
+++ b/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
after gcc linking has changed, all the libraries must be explicitely specified to for linking.
This patch avoids this linking error:
--
1.7.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/8] recipes: Add Upstream-Status to multiple recipes
2011-05-13 5:06 [PATCH 0/8] 13-May Consolidated Pulls Saul Wold
` (2 preceding siblings ...)
2011-05-13 5:06 ` [PATCH 3/8] recpies: add Upstream-Status for multiple recipes' patches Saul Wold
@ 2011-05-13 5:06 ` Saul Wold
2011-05-13 5:06 ` [PATCH 5/8] bash: enable update-alternative to use bash as default shell Saul Wold
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Saul Wold @ 2011-05-13 5:06 UTC (permalink / raw)
To: openembedded-core; +Cc: Ilya Yanok, Jingdong Lu
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 113207 bytes --]
From: Zhai Edwin <edwin.zhai@intel.com>
gtk+: Add Upstream-Status
ed: Add Upstream-Status
gnome-common: Add Upstream-Status
libmatchbox: Add Upstream-Status
matchbox-wm: Add Upstream-Status
x11vnc: Add Upstream-Status
xtscal: Add Upstream-Status
eds-dbus: Add Upstream-Status
matchbox-desktop: Add Upstream-Status
matchbox-keyboard: Add Upstream-Status
matchbox-stroke: Add Upstream-Status
matchbox-theme-sato: Add Upstream-Status
owl-video-widget: Add Upstream-Status
beecrypt: Add Upstream-Status
gnome-icon-theme: Add Upstream-Status
tslib: Add Upstream-Status
libowl-av: Add Upstream-Status
sato-icon-theme: Add Upstream-Status
web-webkit: Add Upstream-Status
metacity: Add Upstream-Status
apr: Add Upstream-Status
gdk-pixbuf: Add Upstream-Status
pcmanfm: Add Upstream-Status
gpgme: Add Upstream-Status
eee-acpi-scripts: Add Upstream-Status
libgalago: Add Upstream-Status
python-pygtk: Add Upstream-Status
gnome-mime-data: Add Upstream-Status
clutter: Add Upstream-Status
clutter-gtk: Add Upstream-Status
tidy: Add Upstream-Status
mutter: Add Upstream-Status
xcursor-transparent-theme: Add Upstream-Status
leafpad: Add Upstream-Status
matchbox-config-gtk: Add Upstream-Status
contacts: Add Upstream-Status
dates: Add Upstream-Status
web: Add Upstream-Status
webkit: Add Upstream-Status
- Also removed empty fix_im.patch
apr-util: Add Upstream-Status
libcroco: Add Upstream-Status
liboil: Add Upstream-Status
libxslt: Add Upstream-Status
libglade: Add Upstream-Status
gnome-terminal: Add Upstream-Status
xev: Add Upstream-Status
claws-mail: Add Upstream-Status
clipboard-manager: Add Upstream-Status
epdfview: Add Upstream-Status
kf: Add Upstream-Status
qemu: Add Upstream-Status
clutter-gst: Add Upstream-Status
table: Add Upstream-Status
matchbox-panel-2: Add Upstream-Status
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch | 2 +
.../recipes-graphics/clutter/table/fixes.patch | 2 +
.../recipes-graphics/clutter/tidy/autofoo.patch | 2 +
.../clutter/tidy/tidy-enable-tests.patch | 2 +
.../recipes-graphics/xorg-app/xev/diet-x11.patch | 2 +
.../recipes-sato/claws-mail/files/desktop.patch | 2 +
.../recipes-sato/claws-mail/files/fix-build.patch | 2 +
| 2 +
.../claws-mail/files/streamline-ui.patch | 2 +
.../clipboard-manager/files/daemonize.patch | 2 +
.../clipboard-manager/files/makefile.patch | 2 +
.../clipboard-manager/files/script.patch | 2 +
| 2 +
.../recipes-sato/kf/files/fix-configure.patch | 2 +
.../recipes-sato/kf/files/fix-desktop-file.patch | 2 +
meta-demoapps/recipes-sato/kf/files/gcc4.patch | 2 +
.../eee-acpi-scripts/files/powerbtn.patch | 2 +
.../eee-acpi-scripts/files/remove-doc-check.patch | 2 +
.../galago/libgalago-0.5.2/mkdir.patch | 2 +
.../galago/libgalago-0.5.2/pkgconfig.patch | 2 +
.../python/python-pygtk/fix-gtkunixprint.patch | 2 +
.../python/python-pygtk/nodocs.patch | 2 +
.../prevent_to_get_display_during_import.patch | 2 +
...t-and-use-GCC-atomic-builtins-for-locking.patch | 2 +
.../qemu/qemu-0.14.0/enable-i386-linux-user.patch | 2 +
.../fallback-to-safe-mmap_min_addr.patch | 2 +
.../qemu/qemu-0.14.0/fix-configure-checks.patch | 2 +
.../qemu/qemu-0.14.0/fix-nogl.patch | 2 +
.../qemu/qemu-0.14.0/glflags.patch | 2 +
.../qemu/qemu-0.14.0/init-info.patch | 2 +
.../qemu/qemu-0.14.0/larger_default_ram_size.patch | 2 +
.../qemu/qemu-0.14.0/linker-flags.patch | 3 ++
.../qemu/qemu-0.14.0/no-strip.patch | 2 +
.../qemu/qemu-0.14.0/opengl-sdl-fix.patch | 2 +
.../qemu/qemu-0.14.0/qemu-git-qemugl-host.patch | 2 +
.../qemu/qemu-0.14.0/qemu-vmware-vga-depth.patch | 3 ++
.../qemugl-allow-glxcontext-release.patch | 2 +
.../qemu/qemu-0.14.0/qemugl-fix.patch | 2 +
.../spice-qxl-locking-fix-for-qemu-kvm.patch | 2 +
meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch | 2 +
.../gdk-pixbuf-2.22.1/configure_fix.patch | 2 +
.../gdk-pixbuf-2.22.1/hardcoded_libtool.patch | 2 +
.../gnome/gnome-common-2.28.0/omf.patch | 2 +
.../gnome/gnome-icon-theme/iconpath-option.patch | 3 ++
.../gnome/gnome-mime-data/pkgconfig.patch | 2 +
.../gnome/metacity/crosscompile.patch | 2 +
.../gtk+/gtk+-2.12.7/cellrenderer-cairo.patch | 2 +
.../gtk+/gtk+-2.12.7/combo-arrow-size.patch | 2 +
.../gtk+/gtk+-2.12.7/disable-print.patch | 2 +
.../gtk+/gtk+-2.12.7/entry-cairo.patch | 2 +
.../gtk+/gtk+-2.12.7/filechooser-default.patch | 2 +
.../gtk+/gtk+-2.12.7/filechooser-sizefix.patch | 2 +
.../gtk+/gtk+-2.12.7/filesystem-volumes.patch | 2 +
.../gtk+/gtk+-2.12.7/gtklabel-resize-patch | 2 +
.../gtk+/gtk+-2.12.7/hardcoded_libtool.patch | 2 +
| 2 +
meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch | 2 +
.../gtk+/gtk+-2.12.7/pangoxft2.10.6.diff | 2 +
.../gtk+/gtk+-2.12.7/range-no-redraw.patch | 3 ++
.../gtk+/gtk+-2.12.7/run-iconcache.patch | 2 +
.../gtk+/gtk+-2.12.7/scrolled-placement.patch | 2 +
.../gtk+/gtk+-2.12.7/toggle-font.diff | 2 +
.../recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch | 2 +
...Duplicate-the-exec-string-returned-by-gtk.patch | 2 +
.../gtk+/gtk+-2.16.6/cellrenderer-cairo.patch | 2 +
.../gtk+-2.16.6/disable-gio-png-sniff-test.diff | 2 +
.../gtk+/gtk+-2.16.6/entry-cairo.patch | 2 +
.../gtk+/gtk+-2.16.6/hardcoded_libtool.patch | 2 +
meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch | 2 +
.../gtk+/gtk+-2.16.6/run-iconcache.patch | 2 +
.../gtk+/gtk+-2.16.6/toggle-font.diff | 2 +
.../recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch | 2 +
...Duplicate-the-exec-string-returned-by-gtk.patch | 2 +
.../gtk+/gtk+-2.22.1/cellrenderer-cairo.patch | 2 +
.../gtk+/gtk+-2.22.1/configurefix.patch | 2 +
.../recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch | 3 ++
.../gtk+/gtk+-2.22.1/entry-cairo.patch | 2 +
.../gtk+/gtk+-2.22.1/hardcoded_libtool.patch | 2 +
meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch | 2 +
.../gtk+/gtk+-2.22.1/run-iconcache.patch | 2 +
.../gtk+/gtk+-2.22.1/toggle-font.diff | 2 +
.../recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch | 2 +
.../libglade/libglade-2.6.4/glade-cruft.patch | 2 +
.../libglade/libglade-2.6.4/no-deprecation.patch | 2 +
.../libglade/libglade-2.6.4/no-xml2.patch | 2 +
.../clutter/clutter-gst/autofoo-0.4.patch | 2 +
...-9db4a61a25677764bb927369c5c68ada958fb65c.patch | 2 +
.../clutter/clutter-gst/autofoo.patch | 2 +
.../clutter/clutter-gtk/disable_deprecated.patch | 2 +
.../clutter/clutter-gtk/enable_tests.patch | 2 +
.../clutter/clutter/build-fix.patch | 2 +
.../clutter/clutter/enable_tests-0.6.patch | 2 +
.../clutter/clutter/enable_tests-0.8.patch | 2 +
.../clutter/clutter/enable_tests-1.0.patch | 2 +
.../clutter/clutter/enable_tests-1.4.patch | 2 +
...-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch | 2 +
.../clutter/clutter/enable_tests.patch | 2 +
.../clutter/clutter/symconflict.patch | 2 +
.../clutter/clutter/test-conformance-fix.patch | 2 +
.../libmatchbox/files/16bppfixes-2.patch | 2 +
.../libmatchbox/files/16bppfixes.patch | 2 +
.../libmatchbox/files/autofoo.patch | 2 +
.../libmatchbox/files/configure_fixes.patch | 2 +
.../libmatchbox/files/fix-configure-for-1.9.patch | 2 +
.../libmatchbox/files/matchbox-start-fix.patch | 2 +
.../matchbox-wm/matchbox-wm/configure_fix.patch | 2 +
.../mutter/mutter/crosscompile.patch | 2 +
...-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch | 2 +
.../mutter/mutter/fix_pkgconfig.patch | 2 +
meta/recipes-graphics/mutter/mutter/nodocs.patch | 2 +
meta/recipes-graphics/mutter/mutter/nozenity.patch | 2 +
.../tslib/tslib/32bitBE-support.patch | 3 ++
.../recipes-graphics/tslib/tslib/fix_version.patch | 2 +
meta/recipes-graphics/tslib/tslib/multievent.patch | 2 +
.../recipes-graphics/x11vnc/files/endian-fix.patch | 2 +
.../x11vnc/files/starting-fix.patch | 3 ++
.../fix_watch_cursor.patch | 2 +
.../use-relative-symlinks.patch | 2 +
.../xtscal/xtscal/change-cross.patch | 2 +
meta/recipes-graphics/xtscal/xtscal/cleanup.patch | 2 +
.../xtscal/dso_linking_change_build_fix.patch | 2 +
.../eds/eds-dbus-2.20.0/no_iconv_test.patch | 2 +
.../eds/eds-dbus-2.20.0/oh-contact.patch | 2 +
.../eds/eds-dbus/new-contact-fix.patch | 2 +
meta/recipes-sato/eds/eds-dbus/nossl.patch | 2 +
meta/recipes-sato/eds/eds-dbus/oh-contact.patch | 2 +
meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch | 2 +
.../eds/eds-dbus/optional_imapx_provider.patch | 2 +
meta/recipes-sato/eds/eds-dbus/parallelmake.patch | 2 +
| 2 +
.../matchbox-config-gtk/files/no-handed.patch | 2 +
.../files/dso_linking_change_build_fix.patch | 2 +
.../matchbox-desktop/files/window-resize-fix.patch | 2 +
.../matchbox-keyboard/files/configure_fix.patch | 2 +
.../matchbox-keyboard/files/single-instance.patch | 1 +
.../matchbox-panel-2/gcc-4.6.0-compile.patch | 2 +
.../recipes-sato/matchbox-panel-2/startup_fix.diff | 2 +
.../matchbox-stroke/files/configure_fix.patch | 2 +
.../files/dso_linking_change_build_fix.patch | 1 +
.../matchbox-stroke/files/single-instance.patch | 1 +
.../matchbox-theme-sato-2/png_rename.patch | 2 +
.../libowl-av/gst_change_state.patch | 2 +
.../owl-video-widget/libowl-av/make-382.patch | 2 +
.../owl-video/gtk_multithread_safe.patch | 2 +
.../owl-video-widget/owl-video/make-382.patch | 2 +
.../pcmanfm/files/cross-compile-fix.patch | 2 +
| 2 +
| 2 +
meta/recipes-sato/pimlico/contacts/make-382.patch | 2 +
| 2 +
.../dates/dso_linking_change_build_fix.patch | 2 +
meta/recipes-sato/pimlico/dates/make-382.patch | 2 +
.../sato-icon-theme/iconpath-option.patch | 2 +
.../web/web-webkit/link-with-g++.patch | 3 ++
meta/recipes-sato/web/web-webkit/make-382.patch | 2 +
| 2 +
meta/recipes-sato/webkit/files/nodolt.patch | 3 ++
meta/recipes-support/apr/apr-util/configfix.patch | 2 +
.../apr/apr-util/configure_fixes.patch | 2 +
.../apr/apr-util/configure_fixes.patch.old | 25 --------------------
meta/recipes-support/apr/apr/buildconf_fix.patch | 2 +
meta/recipes-support/apr/apr/cleanup.patch | 2 +
meta/recipes-support/apr/apr/configfix.patch | 2 +
meta/recipes-support/apr/apr/configure_fixes.patch | 2 +
.../beecrypt/beecrypt/disable-icu-check.patch | 2 +
.../beecrypt/beecrypt/fix-security.patch | 3 ++
.../gpgme/gpgme-1.3.0/disable_gpgconf_check.patch | 1 +
meta/recipes-support/libcroco/files/croco.patch | 2 +
.../liboil-0.3.17/fix-unaligned-whitelist.patch | 2 +
.../liboil/liboil-0.3.17/no-tests.patch | 2 +
.../libxslt/libxslt/pkgconfig_fix.patch | 2 +
171 files changed, 346 insertions(+), 25 deletions(-)
delete mode 100644 meta/recipes-sato/webkit/files/fix_im.patch
delete mode 100644 meta/recipes-support/apr/apr-util/configure_fixes.patch.old
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch b/meta-demoapps/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
index 0358ed8..435cb6a 100644
--- a/meta-demoapps/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
@@ -3,6 +3,8 @@ From: Seán de Búrca <leftmostcat@gmail.com>
Date: Fri, 07 Aug 2009 00:38:52 +0000
Subject: Remove useless Plural-Forms line which breaks build with gnome-doc-utils master
+Upstream-Status: Inappropriate [configuration]
+
---
diff --git a/help/el/el.po b/help/el/el.po
index ab77264..635b68f 100644
diff --git a/meta-demoapps/recipes-graphics/clutter/table/fixes.patch b/meta-demoapps/recipes-graphics/clutter/table/fixes.patch
index a7cdc43..323bf13 100644
--- a/meta-demoapps/recipes-graphics/clutter/table/fixes.patch
+++ b/meta-demoapps/recipes-graphics/clutter/table/fixes.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: table/Makefile
===================================================================
--- table.orig/Makefile 2007-07-10 13:24:18.000000000 +0100
diff --git a/meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch b/meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch
index 7f54a33..51b4eea 100644
--- a/meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch
+++ b/meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: tidy/doc/reference/Makefile.am
===================================================================
--- tidy.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000
diff --git a/meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch b/meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch
index c5e1660..6942577 100644
--- a/meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch
+++ b/meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: trunk/tests/Makefile.am
===================================================================
--- trunk.orig/tests/Makefile.am 2008-03-04 12:22:10.000000000 +0000
diff --git a/meta-demoapps/recipes-graphics/xorg-app/xev/diet-x11.patch b/meta-demoapps/recipes-graphics/xorg-app/xev/diet-x11.patch
index 9f515e8..139838c 100644
--- a/meta-demoapps/recipes-graphics/xorg-app/xev/diet-x11.patch
+++ b/meta-demoapps/recipes-graphics/xorg-app/xev/diet-x11.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
---
xev.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta-demoapps/recipes-sato/claws-mail/files/desktop.patch b/meta-demoapps/recipes-sato/claws-mail/files/desktop.patch
index c5ed7a9..d5ca3db 100644
--- a/meta-demoapps/recipes-sato/claws-mail/files/desktop.patch
+++ b/meta-demoapps/recipes-sato/claws-mail/files/desktop.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: claws-mail-2.9.1/claws-mail.desktop
===================================================================
--- claws-mail-2.9.1.orig/claws-mail.desktop 2007-04-24 17:40:20.000000000 +0100
diff --git a/meta-demoapps/recipes-sato/claws-mail/files/fix-build.patch b/meta-demoapps/recipes-sato/claws-mail/files/fix-build.patch
index 2f30899..41ca1d6 100644
--- a/meta-demoapps/recipes-sato/claws-mail/files/fix-build.patch
+++ b/meta-demoapps/recipes-sato/claws-mail/files/fix-build.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Remove duplicate file entries as this breaks install with new Automake
JL 19/03/10
--git a/meta-demoapps/recipes-sato/claws-mail/files/owl-window-menu.patch b/meta-demoapps/recipes-sato/claws-mail/files/owl-window-menu.patch
index 54c6166..97807b2 100644
--- a/meta-demoapps/recipes-sato/claws-mail/files/owl-window-menu.patch
+++ b/meta-demoapps/recipes-sato/claws-mail/files/owl-window-menu.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: claws-mail-2.9.1/src/addressbook.c
===================================================================
--- claws-mail-2.9.1.orig/src/addressbook.c 2007-04-25 10:18:13.000000000 +0100
diff --git a/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch b/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch
index 29a52ff..81a2a6b 100644
--- a/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch
+++ b/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
Index: claws-mail-2.9.1/src/mainwindow.c
===================================================================
--- claws-mail-2.9.1.orig/src/mainwindow.c 2007-04-25 07:40:10.000000000 +0100
diff --git a/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch b/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch
index 51ce478..24c11a9 100644
--- a/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch
+++ b/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: 0.6.4/manager.c
===================================================================
--- 0.6.4.orig/manager.c 2007-06-28 12:23:37.000000000 +0100
diff --git a/meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch b/meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch
index 6e48da0..17cd742 100644
--- a/meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch
+++ b/meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: 0.6.4/Makefile.am
===================================================================
--- 0.6.4.orig/Makefile.am 2007-06-28 12:23:37.000000000 +0100
diff --git a/meta-demoapps/recipes-sato/clipboard-manager/files/script.patch b/meta-demoapps/recipes-sato/clipboard-manager/files/script.patch
index 09e6862..bdab05a 100644
--- a/meta-demoapps/recipes-sato/clipboard-manager/files/script.patch
+++ b/meta-demoapps/recipes-sato/clipboard-manager/files/script.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
Index: 0.6.4/clipboard.sh
===================================================================
--- 0.6.4.orig/clipboard.sh 2007-06-28 12:23:37.000000000 +0100
--git a/meta-demoapps/recipes-sato/epdfview/epdfview/owl-menus.patch b/meta-demoapps/recipes-sato/epdfview/epdfview/owl-menus.patch
index 755b71e..b7ca962 100644
--- a/meta-demoapps/recipes-sato/epdfview/epdfview/owl-menus.patch
+++ b/meta-demoapps/recipes-sato/epdfview/epdfview/owl-menus.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: epdfview-0.1.7/src/Makefile.am
===================================================================
--- epdfview-0.1.7.orig/src/Makefile.am 2010-07-13 12:30:44.014172385 +0100
diff --git a/meta-demoapps/recipes-sato/kf/files/fix-configure.patch b/meta-demoapps/recipes-sato/kf/files/fix-configure.patch
index fc1ad9a..ae6bf71 100644
--- a/meta-demoapps/recipes-sato/kf/files/fix-configure.patch
+++ b/meta-demoapps/recipes-sato/kf/files/fix-configure.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -urNd ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in kf-0.5.4.1/configure.in
--- ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in 2005-04-27 19:42:49.000000000 +0100
+++ kf-0.5.4.1/configure.in 2005-09-29 14:12:32.000000000 +0100
diff --git a/meta-demoapps/recipes-sato/kf/files/fix-desktop-file.patch b/meta-demoapps/recipes-sato/kf/files/fix-desktop-file.patch
index 7a0f7d1..c749616 100644
--- a/meta-demoapps/recipes-sato/kf/files/fix-desktop-file.patch
+++ b/meta-demoapps/recipes-sato/kf/files/fix-desktop-file.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Common subdirectories: kf-0.5.4.1.orig/data and kf-0.5.4.1/data
diff -u kf-0.5.4.1.orig/kf.desktop kf-0.5.4.1/kf.desktop
--- kf-0.5.4.1.orig/kf.desktop 2005-04-19 22:08:44.000000000 +0100
diff --git a/meta-demoapps/recipes-sato/kf/files/gcc4.patch b/meta-demoapps/recipes-sato/kf/files/gcc4.patch
index 58727ea..9e16529 100644
--- a/meta-demoapps/recipes-sato/kf/files/gcc4.patch
+++ b/meta-demoapps/recipes-sato/kf/files/gcc4.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: kf-0.5.4.1/src/jispman.c
===================================================================
--- kf-0.5.4.1.orig/src/jispman.c 2006-12-03 15:33:47.000000000 +0100
diff --git a/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch b/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch
index 3f79c3e..403e556 100644
--- a/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch
+++ b/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch
@@ -3,6 +3,8 @@
events/powerbtn | 2 ++
2 files changed, 5 insertions(+)
+Upstream-Status: Inappropriate [enable feature]
+
Index: git/events/powerbtn
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch b/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
index 3e80b7f..fc2c291 100644
--- a/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
+++ b/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
@@ -5,6 +5,8 @@
actions/volume.sh | 3 ---
4 files changed, 12 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: git/eeepc-acpi-scripts/hotkey.sh
===================================================================
--- git.orig/eeepc-acpi-scripts/hotkey.sh 2010-11-28 16:02:17.000000000 +0800
diff --git a/meta/recipes-connectivity/galago/libgalago-0.5.2/mkdir.patch b/meta/recipes-connectivity/galago/libgalago-0.5.2/mkdir.patch
index f893bff..4f18686 100644
--- a/meta/recipes-connectivity/galago/libgalago-0.5.2/mkdir.patch
+++ b/meta/recipes-connectivity/galago/libgalago-0.5.2/mkdir.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libgalago-0.5.2/po/Makefile.in.in
===================================================================
--- libgalago-0.5.2.orig/po/Makefile.in.in 2006-06-06 09:59:17.000000000 +0100
diff --git a/meta/recipes-connectivity/galago/libgalago-0.5.2/pkgconfig.patch b/meta/recipes-connectivity/galago/libgalago-0.5.2/pkgconfig.patch
index 33d4daa..6fbf552 100644
--- a/meta/recipes-connectivity/galago/libgalago-0.5.2/pkgconfig.patch
+++ b/meta/recipes-connectivity/galago/libgalago-0.5.2/pkgconfig.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libgalago-0.5.2/libgalago.pc.in
===================================================================
--- libgalago-0.5.2.orig/libgalago.pc.in 2006-05-17 08:53:26.000000000 +0100
diff --git a/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch b/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch
index dca19ce..6d2f64b 100644
--- a/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch
+++ b/meta/recipes-devtools/python/python-pygtk/fix-gtkunixprint.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: pygtk-2.10.0/gtk/gtkunixprint.override
===================================================================
--- pygtk-2.10.0.orig/gtk/gtkunixprint.override
diff --git a/meta/recipes-devtools/python/python-pygtk/nodocs.patch b/meta/recipes-devtools/python/python-pygtk/nodocs.patch
index c358104..f07309a 100644
--- a/meta/recipes-devtools/python/python-pygtk/nodocs.patch
+++ b/meta/recipes-devtools/python/python-pygtk/nodocs.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: pygtk-2.17.0/Makefile.am
===================================================================
--- pygtk-2.17.0.orig/Makefile.am
diff --git a/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch b/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch
index 9340f82..833038e 100644
--- a/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch
+++ b/meta/recipes-devtools/python/python-pygtk/prevent_to_get_display_during_import.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: pygtk-2.10.4/gtk/__init__.py
===================================================================
--- pygtk-2.10.4.orig/gtk/__init__.py 2007-11-27 19:27:05.000000000 -0300
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/Detect-and-use-GCC-atomic-builtins-for-locking.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/Detect-and-use-GCC-atomic-builtins-for-locking.patch
index dc69bfb..eb107b8 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/Detect-and-use-GCC-atomic-builtins-for-locking.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/Detect-and-use-GCC-atomic-builtins-for-locking.patch
@@ -8,6 +8,8 @@ Subject: [PATCH] Detect and use GCC atomic builtins for locking
qemu-lock.h | 13 +++++++++++++
2 files changed, 30 insertions(+), 0 deletions(-)
+Upstream-Status: Pending
+
Index: qemu-0.14.0/configure
===================================================================
--- qemu-0.14.0.orig/configure
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/enable-i386-linux-user.patch
index 3cf0953..bb0d6a3 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/enable-i386-linux-user.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/enable-i386-linux-user.patch
@@ -2,6 +2,8 @@ Enable i386-linux-user
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- qemu-0.14.0.orig/Makefile.target
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/fallback-to-safe-mmap_min_addr.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/fallback-to-safe-mmap_min_addr.patch
index 4b1a64f..2075386 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/fallback-to-safe-mmap_min_addr.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/fallback-to-safe-mmap_min_addr.patch
@@ -8,6 +8,8 @@ Subject: [PATCH] linux-user: use default mmap_min_addr 65536 when /proc/sys/vm/m
linux-user/main.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
+Upstream-Status: Pending
+
Index: qemu-0.14.0/linux-user/main.c
===================================================================
--- qemu-0.14.0.orig/linux-user/main.c
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/fix-configure-checks.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/fix-configure-checks.patch
index 574b430..96881bb 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/fix-configure-checks.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/fix-configure-checks.patch
@@ -6,6 +6,8 @@ added and files in the sysroot can be found.
Patch from Paul Eggleton, Comments by RP 28/11/10
+Upstream-Status: Inappropriate [embedded specific]
+
Index: qemu-0.14.0/configure
===================================================================
--- qemu-0.14.0.orig/configure
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/fix-nogl.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/fix-nogl.patch
index 0219cc8..83b2752 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/fix-nogl.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/fix-nogl.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- qemu-0.14.0.orig/Makefile.target
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/glflags.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/glflags.patch
index f99c6d1..0ad5551 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/glflags.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/glflags.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- qemu-0.14.0.orig/Makefile.target 2011-04-04 12:12:19.142871742 +0100
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch
index 8df60e8..2250444 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/init-info.patch
@@ -2,6 +2,8 @@
# makes info.info.x11.display zero and avoids the calls to
# opengl_exec_set_parent_window, one of which is crashing.
+Upstream-Status: Pending
+
Index: qemu-0.14.0/ui/sdl.c
===================================================================
--- qemu-0.14.0.orig/ui/sdl.c
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/larger_default_ram_size.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/larger_default_ram_size.patch
index 8928bd5..711c360 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/larger_default_ram_size.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/larger_default_ram_size.patch
@@ -5,6 +5,8 @@ It has not been applied to upstream qemu
Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
Index: qemu-0.14.0/vl.c
===================================================================
--- qemu-0.14.0.orig/vl.c
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/linker-flags.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/linker-flags.patch
index 470cf80..c0d1e55 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/linker-flags.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/linker-flags.patch
@@ -7,6 +7,9 @@ More information is available on the Fedora Wiki:
https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
JL - 15/06/10
+
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- qemu-0.14.0.orig/Makefile.target
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/no-strip.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/no-strip.patch
index cf0d659..d6a4377 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/no-strip.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/no-strip.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/Makefile
===================================================================
--- qemu-0.14.0.orig/Makefile
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/opengl-sdl-fix.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/opengl-sdl-fix.patch
index 1f34f07..e73bb7b 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/opengl-sdl-fix.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/opengl-sdl-fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -u -r qemu-0.14.0/Makefile.target qemu-0.14.0-fixed/Makefile.target
--- qemu-0.14.0/Makefile.target 2011-04-26 21:22:17.627637741 -0700
+++ qemu-0.14.0-fixed/Makefile.target 2011-04-26 21:23:02.767637747 -0700
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/qemu-git-qemugl-host.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/qemu-git-qemugl-host.patch
index 92467a7..bbc9c9e 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/qemu-git-qemugl-host.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/qemu-git-qemugl-host.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [other] - qemugl patch need huge changes for upstream
+
Index: qemu-0.14.0/Makefile.target
===================================================================
--- qemu-0.14.0.orig/Makefile.target
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/qemu-vmware-vga-depth.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/qemu-vmware-vga-depth.patch
index 42ec98f..c4c5424 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/qemu-vmware-vga-depth.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/qemu-vmware-vga-depth.patch
@@ -1,6 +1,9 @@
# fix VMware VGA driver depth calculation error, which may cause segmentation fault
#
# ktian1, 06/29/2010
+
+Upstream-Status: Pending
+
Index: qemu-0.14.0/console.h
===================================================================
--- qemu-0.14.0.orig/console.h
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-allow-glxcontext-release.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-allow-glxcontext-release.patch
index 478b204..d808eaa 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-allow-glxcontext-release.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-allow-glxcontext-release.patch
@@ -10,6 +10,8 @@ committer Andrzej Zaborowski <andrew.zaborowski@intel.com> Tue, 16 Jun 2009 22:2
target-i386/opengl_exec.c | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: qemu-0.14.0/target-i386/opengl_exec.c
===================================================================
--- qemu-0.14.0.orig/target-i386/opengl_exec.c
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-fix.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-fix.patch
index 029aacf..76aae2f 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-fix.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/qemugl-fix.patch
@@ -9,6 +9,8 @@ Upstream-Status: other (logical part of qemu-git-qemugl-host.patch)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [other] - depends on qemu gl patch
+
Index: qemu-0.14.0/target-i386/opengl_func.h
===================================================================
--- qemu-0.14.0.orig/target-i386/opengl_func.h 2011-04-08 16:43:46.000000000 +0800
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/spice-qxl-locking-fix-for-qemu-kvm.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/spice-qxl-locking-fix-for-qemu-kvm.patch
index 87d5927..4113fc2 100644
--- a/meta/recipes-devtools/qemu/qemu-0.14.0/spice-qxl-locking-fix-for-qemu-kvm.patch
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/spice-qxl-locking-fix-for-qemu-kvm.patch
@@ -3,6 +3,8 @@ Author: Gerd Hoffmann <kraxel@redhat.com>
Source: upstream, http://patchwork.ozlabs.org/patch/84704/
Forwarding: not-needed
+Upstream-Status: Pending
+
Index: qemu-0.14.0/hw/qxl.c
===================================================================
--- qemu-0.14.0.orig/hw/qxl.c
diff --git a/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch b/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch
index 4c92aa2..d30b393 100644
--- a/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch
+++ b/meta/recipes-extended/ed/ed-1.5/ed-1.2-build.patch
@@ -9,6 +9,8 @@ http://lists.gnu.org/archive/html/bug-ed/2008-12/msg00001.html
ed had already taken GPLv3 when this patch out, so it should be GPLv3.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Pending
+
Index: ed-1.5/configure
===================================================================
--- ed-1.5.orig/configure 2010-08-30 07:34:49.000000000 -0700
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch
index bbf239c..b141690 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch
@@ -4,6 +4,8 @@ This patch simple disables it.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
+
Index: gdk-pixbuf-2.22.1/configure.ac
===================================================================
--- gdk-pixbuf-2.22.1.orig/configure.ac 2010-11-25 16:26:41.000000000 +0800
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/hardcoded_libtool.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/hardcoded_libtool.patch
index ae16927..ecca62a 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/hardcoded_libtool.patch
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/hardcoded_libtool.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: gdk-pixbuf-2.22.1/configure.ac
===================================================================
--- gdk-pixbuf-2.22.1.orig/configure.ac 2010-11-26 09:06:34.000000000 +0800
diff --git a/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch b/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
index 0d85b00..0f9b13c 100644
--- a/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
+++ b/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- gnome-common-2.4.0/doc-build/omf.make 2003-05-24 08:16:25.000000000 -0700
+++ gnome-common-2.4.0.new/doc-build/omf.make 2004-11-15 14:01:12.185155192 -0700
@@ -43,7 +43,9 @@
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch b/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
index 8a16d00..f840fca 100644
--- a/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
+++ b/meta/recipes-gnome/gnome/gnome-icon-theme/iconpath-option.patch
@@ -4,6 +4,9 @@ pkg-config will only search the target sysroot and we want the native script. Th
patch adds an option to allow the path to the tool to be specified.
RP - 12/8/10"
+
+Upstream-Status: Pending
+
Index: gnome-icon-theme-2.31.0/configure.ac
===================================================================
--- gnome-icon-theme-2.31.0.orig/configure.ac 2010-12-01 11:00:22.000000000 +0800
diff --git a/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch b/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch
index de287e5..0903425 100644
--- a/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch
+++ b/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: gnome-mime-data-2.18.0/Makefile.am
===================================================================
--- gnome-mime-data-2.18.0.orig/Makefile.am 2009-06-11 17:27:48.000000000 +0100
diff --git a/meta/recipes-gnome/gnome/metacity/crosscompile.patch b/meta/recipes-gnome/gnome/metacity/crosscompile.patch
index 8d86134..7a1942a 100644
--- a/meta/recipes-gnome/gnome/metacity/crosscompile.patch
+++ b/meta/recipes-gnome/gnome/metacity/crosscompile.patch
@@ -3,6 +3,8 @@ rather than target binary in cross-compile environment.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
+
Index: metacity-2.30.3/src/Makefile.am
===================================================================
--- metacity-2.30.3.orig/src/Makefile.am 2010-09-05 00:09:52.000000000 +0800
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch
index 4439e69..2524b99 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/cellrenderer-cairo.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: gtk/gtkcellrenderer.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch
index d44c454..62d2355 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/combo-arrow-size.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: gtk/gtkcombobox.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcombobox.c,v
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch
index 13cbd91..78903cf 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/disable-print.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- gtk+-2.12.0/configure.in~ 2006-07-05 18:11:44.000000000 +0200
+++ gtk+-2.12.0/configure.in 2006-07-05 18:11:44.000000000 +0200
@@ -1554,22 +1554 @@
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch
index 3313e7f..3083b77 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/entry-cairo.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: gtk/gtkentry.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch
index 146316c..816594f 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-default.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: gtk+-2.12.5/gtk/gtkfilechooserdefault.c
================ ===================================================
--- gtk+-2.12.5/gtk/gtkfilechooserdefault.c (revision 19337)
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-sizefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
index 694b059..0973eca 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
--- gtk+-2.12.7.orig/gtk/gtkfilechooserdialog.c
+++ gtk+-2.12.7/gtk/gtkfilechooserdialog.c
@@ -165,10 +165,10 @@
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/filesystem-volumes.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filesystem-volumes.patch
index 826fd6b..3330f7b 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/filesystem-volumes.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/filesystem-volumes.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: gtk+-2.12.3/gtk/gtkfilesystemunix.c
===================================================================
--- gtk+-2.12.3.orig/gtk/gtkfilesystemunix.c 2007-12-04 16:52:08.000000000 +0000
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/gtklabel-resize-patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/gtklabel-resize-patch
index df29656..40af10c 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/gtklabel-resize-patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/gtklabel-resize-patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100
@@ -1623,6 +1623,7 @@
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/hardcoded_libtool.patch
index 1c2cd05..09ced4b 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/hardcoded_libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/hardcoded_libtool.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
--- /tmp/configure.in 2007-01-08 17:50:49.000000000 +0100
+++ gtk+-2.10.7/configure.in 2007-01-08 17:52:33.495251000 +0100
@@ -371,7 +371,7 @@
--git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch
index cfb8849..e8bc370 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
--- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200
+++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200
@@ -42,7 +42,7 @@
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch
index 0fc4c48..67d4f74 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/no-demos.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100
+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100
@@ -1,6 +1,6 @@
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff b/meta/recipes-gnome/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff
index 63828ce..fa5e4fc 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/pangoxft2.10.6.diff
@@ -13,6 +13,8 @@ performance figures compared to GTK+ 2.10.6 with pangocairo too
a python/cairo script to get some nice graphics from a torture test
session with several GTK+s, hope to get it ready soon.
+Upstream-Status: Inappropriate [enable feature]
+
Index: gtk+-2.10.6/configure.in
===================================================================
--- gtk+-2.10.6.orig/configure.in 2006-10-30 12:59:28.000000000 +0000
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/range-no-redraw.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/range-no-redraw.patch
index 14387b8..d577dc6 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/range-no-redraw.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/range-no-redraw.patch
@@ -1,4 +1,7 @@
5f084ea0849d5967a3c22821542ecaaa8accb398
+
+Upstream-Status: Inappropriate [enable feature]
+
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index bd95351..64e0e59 100644
--- gtk/gtkrange.c
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/run-iconcache.patch
index ac15e9a..f35884c 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/run-iconcache.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/run-iconcache.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100
+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100
@@ -1128,11 +1128,11 @@
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/scrolled-placement.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/scrolled-placement.patch
index a0b50c8..1e3ab52 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/scrolled-placement.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/scrolled-placement.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: gdk/x11/gdksettings.c
===================================================================
--- gdk/x11/gdksettings.c (revision 18493)
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.12.7/toggle-font.diff
index 59ad150..e1050bd 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/toggle-font.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/toggle-font.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: gtk/gtkcellrenderertoggle.c
===================================================================
--- gtk/gtkcellrenderertoggle.c (revision 18523)
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch
index b63e262..98d3353 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.12.7/xsettings.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004
+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004
@@ -2827,10 +2827,9 @@
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
index e0d6ab9..7d39a77 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
@@ -13,6 +13,8 @@ since the internal value is returned without being duplicated.
gtk/gtkrecentmanager.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
+Upstream-Status: Pending
+
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index 317b3d5..d062572 100644
--- a/gtk/gtkrecentmanager.c
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
index 4439e69..2524b99 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/cellrenderer-cairo.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: gtk/gtkcellrenderer.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkcellrenderer.c,v
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff b/meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
index 5c64ac0..c777b8e 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/disable-gio-png-sniff-test.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
Index: gtk+-2.14.2/configure.in
===================================================================
--- gtk+-2.14.2.orig/configure.in 2008-09-23 16:32:42.000000000 +0100
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch
index 3313e7f..3083b77 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/entry-cairo.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: gtk/gtkentry.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
index 82fbbac..e5bbe73 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/hardcoded_libtool.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
Index: gtk+-2.14.2/configure.in
===================================================================
--- gtk+-2.14.2.orig/configure.in 2008-09-23 15:52:44.000000000 +0100
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch
index 0fc4c48..67d4f74 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/no-demos.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100
+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100
@@ -1,6 +1,6 @@
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch
index ac15e9a..f35884c 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/run-iconcache.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100
+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100
@@ -1128,11 +1128,11 @@
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff
index 59ad150..e1050bd 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/toggle-font.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: gtk/gtkcellrenderertoggle.c
===================================================================
--- gtk/gtkcellrenderertoggle.c (revision 18523)
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch
index b63e262..98d3353 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.16.6/xsettings.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004
+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004
@@ -2827,10 +2827,9 @@
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
index ee55f9c..354f0ab 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.22.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
@@ -13,6 +13,8 @@ since the internal value is returned without being duplicated.
gtk/gtkrecentmanager.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
+Upstream-Status: Pending
+
Index: gtk+-2.21.2/gtk/gtkrecentmanager.c
===================================================================
--- gtk+-2.21.2.orig/gtk/gtkrecentmanager.c 2010-06-22 18:11:30.000000000 +0800
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch
index 92ce643..ba89329 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: gtk/gtkcellrenderer.c
===================================================================
--- gtk/gtkcellrenderer.c.orig 2010-06-22 17:21:22.000000000 +0800
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch
index 7f6c73b..2803691 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: gtk+-2.21.2/docs/faq/Makefile.am
===================================================================
--- gtk+-2.21.2.orig/docs/faq/Makefile.am 2010-04-09 10:29:53.000000000 +0800
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch
index c2e3ae7..74e479f 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch
@@ -5,6 +5,9 @@ embedded applications, just don't build them.
Thanks to Joshua Lock for suggesting this approach.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
+Upstream-Status: Inappropriate [embedded specific]
+
diff -urN gtk+-2.22.1.orig/docs/Makefile.am gtk+-2.22.1/docs/Makefile.am
--- gtk+-2.22.1.orig/docs/Makefile.am 2010-11-15 04:13:09.000000000 -0800
+++ gtk+-2.22.1/docs/Makefile.am 2011-02-23 19:25:16.914815097 -0800
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/entry-cairo.patch
index 3313e7f..3083b77 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.22.1/entry-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/entry-cairo.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: gtk/gtkentry.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkentry.c,v
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch
index 7937ef2..e32ce3f 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
Index: gtk+-2.23.2/configure.in
===================================================================
--- gtk+-2.23.2.orig/configure.in 2010-11-10 22:22:47.000000000 +0800
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch
index 2170016..abd348e 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: gtk+-2.23.2/Makefile.am
===================================================================
--- gtk+-2.23.2.orig/Makefile.am 2010-11-10 20:34:42.000000000 +0800
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/run-iconcache.patch
index 518875e..597ba32 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.22.1/run-iconcache.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/run-iconcache.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: gtk+-2.21.2/gtk/Makefile.am
===================================================================
--- gtk+-2.21.2.orig/gtk/Makefile.am 2010-06-22 17:21:41.000000000 +0800
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.22.1/toggle-font.diff
index 4853628..340d120 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.22.1/toggle-font.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/toggle-font.diff
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: gtk/gtkcellrenderertoggle.c
===================================================================
--- gtk/gtkcellrenderertoggle.c.orig 2010-06-22 18:11:33.000000000 +0800
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch
index 84231e9..d0a970a 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: gtk+-2.21.2/gdk/x11/gdkevents-x11.c
===================================================================
--- gtk+-2.21.2.orig/gdk/x11/gdkevents-x11.c 2010-06-22 17:28:04.000000000 +0800
diff --git a/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch b/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch
index 0fceccf..c5d5864 100644
--- a/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch
+++ b/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
diff -ur libglade-2.4.0~/configure.in libglade-2.4.0/configure.in
--- libglade-2.4.0~/configure.in 2004-05-17 12:38:31.000000000 +0100
+++ libglade-2.4.0/configure.in 2004-07-28 16:53:09.000000000 +0100
diff --git a/meta/recipes-gnome/libglade/libglade-2.6.4/no-deprecation.patch b/meta/recipes-gnome/libglade/libglade-2.6.4/no-deprecation.patch
index 514c761..fdea2b0 100644
--- a/meta/recipes-gnome/libglade/libglade-2.6.4/no-deprecation.patch
+++ b/meta/recipes-gnome/libglade/libglade-2.6.4/no-deprecation.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- libglade-2.5.1/glade/Makefile.am.old 2006-04-25 21:03:25.000000000 +0100
+++ libglade-2.5.1/glade/Makefile.am 2006-04-25 21:03:45.000000000 +0100
@@ -30,10 +30,6 @@
diff --git a/meta/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch b/meta/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch
index 1c2e215..dc4c092 100644
--- a/meta/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch
+++ b/meta/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -urN libglade-2.4.2.orig/configure.in libglade-2.4.2/configure.in
--- libglade-2.4.2.orig/configure.in 2005-02-11 12:42:58.000000000 +0100
+++ libglade-2.4.2/configure.in 2005-03-22 01:22:00.000000000 +0100
diff --git a/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch b/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch
index 4f2d50c..e22d2db 100644
--- a/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst/autofoo-0.4.patch
@@ -5,6 +5,8 @@ Upstream-Status: Inappropriate [not used]
examples/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: clutter-gst/examples/Makefile.am
===================================================================
--- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000
diff --git a/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch b/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
index 2b43c80..8b3d84d 100644
--- a/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst/autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch
@@ -5,6 +5,8 @@ Upstream-Status: Inappropriate [not used]
examples/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: clutter-gst/examples/Makefile.am
===================================================================
--- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000
diff --git a/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch b/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch
index 7d50624..b557c6e 100644
--- a/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch
+++ b/meta/recipes-graphics/clutter/clutter-gst/autofoo.patch
@@ -5,6 +5,8 @@ Upstream-Status: Inappropriate [not used]
examples/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: git/examples/Makefile.am
===================================================================
--- git.orig/examples/Makefile.am 2009-06-30 16:41:53.000000000 +0100
diff --git a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
index d11c34e..f44755b 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
+++ b/meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch
@@ -4,6 +4,8 @@ This patch enables the macros that clutter-gtk is still using
Signed-off-by: Saul Wold <sgw@linux.intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: git/clutter-gtk/Makefile.am
===================================================================
--- git.orig/clutter-gtk/Makefile.am 2011-05-04 14:07:20.000000000 -0700
diff --git a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
index 8e3e552..bedf80e 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
+++ b/meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch
@@ -2,6 +2,8 @@ Install the test binary needed for core-image-clutter
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: git/examples/Makefile.am
===================================================================
--- git.orig/examples/Makefile.am 2011-05-04 14:07:20.000000000 -0700
diff --git a/meta/recipes-graphics/clutter/clutter/build-fix.patch b/meta/recipes-graphics/clutter/clutter/build-fix.patch
index 68cf84e..08c1845 100644
--- a/meta/recipes-graphics/clutter/clutter/build-fix.patch
+++ b/meta/recipes-graphics/clutter/clutter/build-fix.patch
@@ -2,6 +2,8 @@ Installing the same file twice causes an error in Automake 1.11
JL 19/03/10
+Upstream-Status: Pending
+
Index: git/clutter/Makefile.am
===================================================================
--- git.orig/clutter/Makefile.am 2010-03-19 11:37:51.000000000 +0000
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
index 544a7e5..8cff0c5 100644
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
@@ -4,6 +4,8 @@
tests/test-text.c | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: clutter-0-6/tests/Makefile.am
===================================================================
--- clutter.orig/tests/Makefile.am 2007-11-06 12:29:17.000000000 +0000
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
index 4f449b1..d3c196f 100644
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
@@ -4,6 +4,8 @@
tests/test-text.c | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: clutter/tests/Makefile.am
===================================================================
--- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
index 953edf6..16460b1 100644
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
@@ -4,6 +4,8 @@
tests/test-text.c | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: git/tests/interactive/Makefile.am
===================================================================
--- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
index 52fdcb4..2ff7697 100644
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: git/tests/interactive/Makefile.am
===================================================================
--- git.orig/tests/interactive/Makefile.am 2011-01-28 14:06:29.000000000 +0800
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
index 953edf6..16460b1 100644
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
@@ -4,6 +4,8 @@
tests/test-text.c | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: git/tests/interactive/Makefile.am
===================================================================
--- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests.patch b/meta/recipes-graphics/clutter/clutter/enable_tests.patch
index f4af7c9..480b208 100644
--- a/meta/recipes-graphics/clutter/clutter/enable_tests.patch
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests.patch
@@ -4,6 +4,8 @@
tests/test-text.c | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: git/tests/interactive/Makefile.am
===================================================================
--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000
diff --git a/meta/recipes-graphics/clutter/clutter/symconflict.patch b/meta/recipes-graphics/clutter/clutter/symconflict.patch
index 7685c21..05f3d27 100644
--- a/meta/recipes-graphics/clutter/clutter/symconflict.patch
+++ b/meta/recipes-graphics/clutter/clutter/symconflict.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: git/tests/test-depth.c
===================================================================
--- git.orig/tests/test-depth.c 2009-05-24 14:54:40.000000000 +0100
diff --git a/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch b/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
index ce412ff..ccc6c2a 100644
--- a/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
+++ b/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
@@ -30,6 +30,8 @@ Date: Mon Oct 11 16:16:45 2010 +0100
http://bugzilla.clutter-project.org/show_bug.cgi?id=2363
+Upstream-Status: Backport
+
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 3036639..1e723e7 100644
--- a/tests/conform/Makefile.am
diff --git a/meta/recipes-graphics/libmatchbox/files/16bppfixes-2.patch b/meta/recipes-graphics/libmatchbox/files/16bppfixes-2.patch
index ab9cdc7..9bcd582 100644
--- a/meta/recipes-graphics/libmatchbox/files/16bppfixes-2.patch
+++ b/meta/recipes-graphics/libmatchbox/files/16bppfixes-2.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- libmatchbox/libmb/mbpixbuf.c.orig 2007-05-04 14:41:55.000000000 +0100
+++ libmatchbox/libmb/mbpixbuf.c 2007-05-04 14:41:55.000000000 +0100
@@ -710,46 +710,19 @@
diff --git a/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch b/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch
index 09a0347..284318c 100644
--- a/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch
+++ b/meta/recipes-graphics/libmatchbox/files/16bppfixes.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
Index: libmb/mbpixbuf.c
===================================================================
--- libmatchbox/libmb.orig/mbpixbuf.c 2006-02-01 12:45:55.000000000 +0000
diff --git a/meta/recipes-graphics/libmatchbox/files/autofoo.patch b/meta/recipes-graphics/libmatchbox/files/autofoo.patch
index ad3be57..78849a4 100644
--- a/meta/recipes-graphics/libmatchbox/files/autofoo.patch
+++ b/meta/recipes-graphics/libmatchbox/files/autofoo.patch
@@ -3,6 +3,8 @@
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
+Upstream-Status: Inappropriate [configuration]
+
--- libmatchbox-1.5/configure.ac~autofoo 2004-12-21 12:56:46.000000000 -0500
+++ libmatchbox-1.5/configure.ac 2005-01-18 16:40:04.421179624 -0500
@@ -1,10 +1,10 @@
diff --git a/meta/recipes-graphics/libmatchbox/files/configure_fixes.patch b/meta/recipes-graphics/libmatchbox/files/configure_fixes.patch
index 083d32a..30fd67b 100644
--- a/meta/recipes-graphics/libmatchbox/files/configure_fixes.patch
+++ b/meta/recipes-graphics/libmatchbox/files/configure_fixes.patch
@@ -3,6 +3,8 @@
libmb.pc.in | 2 +-
2 files changed, 8 insertions(+), 9 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: libmatchbox-1.9/configure.ac
===================================================================
--- libmatchbox-1.9.orig/configure.ac 2007-11-11 22:26:43.000000000 +0000
diff --git a/meta/recipes-graphics/libmatchbox/files/fix-configure-for-1.9.patch b/meta/recipes-graphics/libmatchbox/files/fix-configure-for-1.9.patch
index 990b738..2f147eb 100644
--- a/meta/recipes-graphics/libmatchbox/files/fix-configure-for-1.9.patch
+++ b/meta/recipes-graphics/libmatchbox/files/fix-configure-for-1.9.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -urNd ../libmatchbox-1.6-r1/libmatchbox-1.6/configure.ac libmatchbox-1.6/configure.ac
--- ../libmatchbox-1.6-r1/libmatchbox-1.6/configure.ac 2005-01-11 21:47:39 +00:00
+++ libmatchbox-1.6/configure.ac 2005-03-14 03:06:25 +00:00
diff --git a/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch b/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
index 04460a3..058342c 100644
--- a/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
+++ b/meta/recipes-graphics/libmatchbox/files/matchbox-start-fix.patch
@@ -6,6 +6,8 @@ on x86-64. This patch forces a NULL pointer as terminator to fix it.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Pending
+
Index: libmatchbox-1.9/libmb/mbexp.c
===================================================================
--- libmatchbox-1.9.orig/libmb/mbexp.c 2010-08-28 06:33:25.000000000 +0800
diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch b/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
index 52cea0e..800bf3b 100644
--- a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
+++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: matchbox-window-manager/configure.ac
===================================================================
--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
diff --git a/meta/recipes-graphics/mutter/mutter/crosscompile.patch b/meta/recipes-graphics/mutter/mutter/crosscompile.patch
index b27383b..da73e7b 100644
--- a/meta/recipes-graphics/mutter/mutter/crosscompile.patch
+++ b/meta/recipes-graphics/mutter/mutter/crosscompile.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [embedded specific]
+
Index: git/configure.in
===================================================================
--- git.orig/configure.in 2009-01-27 14:49:10.000000000 +0000
diff --git a/meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
index 3714383..695f94c 100644
--- a/meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
+++ b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig-7adb574bb3fa3880eb85dbc86e580cf3452d57c4.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: git/src/metacity-plugins.pc.in
===================================================================
--- git.orig/src/metacity-plugins.pc.in 2008-12-17 22:42:19.000000000 +0000
diff --git a/meta/recipes-graphics/mutter/mutter/fix_pkgconfig.patch b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig.patch
index 5ac5ecc..de0dded 100644
--- a/meta/recipes-graphics/mutter/mutter/fix_pkgconfig.patch
+++ b/meta/recipes-graphics/mutter/mutter/fix_pkgconfig.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: git/src/mutter-plugins.pc.in
===================================================================
--- git.orig/src/mutter-plugins.pc.in 2009-07-03 17:30:39.000000000 +0100
diff --git a/meta/recipes-graphics/mutter/mutter/nodocs.patch b/meta/recipes-graphics/mutter/mutter/nodocs.patch
index 98f43be..ceb0609 100644
--- a/meta/recipes-graphics/mutter/mutter/nodocs.patch
+++ b/meta/recipes-graphics/mutter/mutter/nodocs.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: git/Makefile.am
===================================================================
--- git.orig/Makefile.am 2009-01-27 13:26:12.000000000 +0000
diff --git a/meta/recipes-graphics/mutter/mutter/nozenity.patch b/meta/recipes-graphics/mutter/mutter/nozenity.patch
index 06f5909..fa32b63 100644
--- a/meta/recipes-graphics/mutter/mutter/nozenity.patch
+++ b/meta/recipes-graphics/mutter/mutter/nozenity.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: git/configure.in
===================================================================
--- git.orig/configure.in 2009-06-16 13:12:17.000000000 +0100
diff --git a/meta/recipes-graphics/tslib/tslib/32bitBE-support.patch b/meta/recipes-graphics/tslib/tslib/32bitBE-support.patch
index 3262f16..49232ef 100644
--- a/meta/recipes-graphics/tslib/tslib/32bitBE-support.patch
+++ b/meta/recipes-graphics/tslib/tslib/32bitBE-support.patch
@@ -5,6 +5,9 @@
## DP: See bug #496759 - being tested upstream for 32bit BE devices
@DPATCH@
+
+Upstream-Status: Pending
+
diff -urNad tslib-1.0~/plugins/input-raw.c tslib-1.0/plugins/input-raw.c
--- tslib-1.0~/plugins/input-raw.c 2008-12-09 10:56:47.000000000 +0000
+++ tslib-1.0/plugins/input-raw.c 2008-12-09 11:05:41.000000000 +0000
diff --git a/meta/recipes-graphics/tslib/tslib/fix_version.patch b/meta/recipes-graphics/tslib/tslib/fix_version.patch
index d6a0ebd..c3d658e 100644
--- a/meta/recipes-graphics/tslib/tslib/fix_version.patch
+++ b/meta/recipes-graphics/tslib/tslib/fix_version.patch
@@ -2,6 +2,8 @@
configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
+Upstream-Status: Inappropriate [configuration]
+
Index: tslib-1.0/configure.ac
===================================================================
--- tslib-1.0.orig/configure.ac 2006-08-24 22:02:55.000000000 +0100
diff --git a/meta/recipes-graphics/tslib/tslib/multievent.patch b/meta/recipes-graphics/tslib/tslib/multievent.patch
index 854e7af..e6803f5 100644
--- a/meta/recipes-graphics/tslib/tslib/multievent.patch
+++ b/meta/recipes-graphics/tslib/tslib/multievent.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- tslib/plugins/linear.c~multievent
+++ tslib/plugins/linear.c
@@ -39,14 +39,12 @@
diff --git a/meta/recipes-graphics/x11vnc/files/endian-fix.patch b/meta/recipes-graphics/x11vnc/files/endian-fix.patch
index 0b5e470..f2a538b 100644
--- a/meta/recipes-graphics/x11vnc/files/endian-fix.patch
+++ b/meta/recipes-graphics/x11vnc/files/endian-fix.patch
@@ -6,6 +6,8 @@ instead of LIBVNCSERVER_WORDS_BIGENDIAN, which cuase issue in mips.
Signed-off-by: Yu Ke <ke.yu@intel.com>
+Upstream-Status: Pending
+
diff --git a/libvncserver/main.c b/libvncserver/main.c
index b6bd930..8bbb7bf 100644
--- a/libvncserver/main.c
diff --git a/meta/recipes-graphics/x11vnc/files/starting-fix.patch b/meta/recipes-graphics/x11vnc/files/starting-fix.patch
index f59e801..11c55e6 100644
--- a/meta/recipes-graphics/x11vnc/files/starting-fix.patch
+++ b/meta/recipes-graphics/x11vnc/files/starting-fix.patch
@@ -3,6 +3,9 @@ Removing these 2 parameters makes x11vnc works well on poky sato image.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop
===================================================================
--- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.000000000 +0800
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
index 73a5b2a..722bda3 100644
--- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
+++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am
--- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am 2003-10-30 13:13:59.000000000 +0100
+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2005-12-20 23:35:17.000000000 +0100
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
index df28dfb..ae9640c 100644
--- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
+++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
diff -ur xcursor-transparent-theme-0.1.1~/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am
--- xcursor-transparent-theme-0.1.1~/cursors/Makefile.am 2003-10-30 12:13:59.000000000 +0000
+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2004-07-27 12:56:24.000000000 +0100
diff --git a/meta/recipes-graphics/xtscal/xtscal/change-cross.patch b/meta/recipes-graphics/xtscal/xtscal/change-cross.patch
index 3ecd36b..1da7717 100644
--- a/meta/recipes-graphics/xtscal/xtscal/change-cross.patch
+++ b/meta/recipes-graphics/xtscal/xtscal/change-cross.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
--- tmp/main.c.orig 2007-01-02 15:39:54.000000000 +0000
+++ tmp/main.c 2007-01-02 15:39:54.000000000 +0000
@@ -131,9 +131,10 @@
diff --git a/meta/recipes-graphics/xtscal/xtscal/cleanup.patch b/meta/recipes-graphics/xtscal/xtscal/cleanup.patch
index ce674ed..f7b0854 100644
--- a/meta/recipes-graphics/xtscal/xtscal/cleanup.patch
+++ b/meta/recipes-graphics/xtscal/xtscal/cleanup.patch
@@ -7,6 +7,8 @@
xtscal.in | 19 -----
6 files changed, 14 insertions(+), 455 deletions(-)
+Upstream-Status: Pending
+
Index: xtscal-0.6.3/xtscal.in
===================================================================
--- xtscal-0.6.3.orig/xtscal.in 2004-09-10 20:10:36.000000000 +0100
diff --git a/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch b/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch
index 3ca14d7..3e4533f 100644
--- a/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch
+++ b/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch
@@ -10,6 +10,8 @@ This patch avoids this linking error:
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/11
+Upstream-Status: Pending
+
Index: xtscal-0.6.3/configure.ac
===================================================================
--- xtscal-0.6.3.orig/configure.ac
diff --git a/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch b/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch
index 4a034b6..493b70d 100644
--- a/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch
+++ b/meta/recipes-sato/eds/eds-dbus-2.20.0/no_iconv_test.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: trunk/configure.in
===================================================================
--- trunk.orig/configure.in 2005-09-28 17:34:08.000000000 +0000
diff --git a/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch b/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch
index e5c0f51..fd83b57 100644
--- a/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch
+++ b/meta/recipes-sato/eds/eds-dbus-2.20.0/oh-contact.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: addressbook/libedata-book/ximian-vcard.h
===================================================================
--- addressbook/libedata-book/ximian-vcard.h (revision 578)
diff --git a/meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch b/meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch
index d34cc55..22c293d 100644
--- a/meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch
+++ b/meta/recipes-sato/eds/eds-dbus/new-contact-fix.patch
@@ -5,6 +5,8 @@ the data base if not exist, but use it without proper initialization.
This patch fix it.
+Upstream-Status: Submitted
+
Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>
Index: git/addressbook/backends/file/e-book-backend-file.c
===================================================================
diff --git a/meta/recipes-sato/eds/eds-dbus/nossl.patch b/meta/recipes-sato/eds/eds-dbus/nossl.patch
index 30568ff..67b6d07 100644
--- a/meta/recipes-sato/eds/eds-dbus/nossl.patch
+++ b/meta/recipes-sato/eds/eds-dbus/nossl.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
Index: git/camel/Makefile.am
===================================================================
--- git.orig/camel/Makefile.am 2010-02-05 15:25:09.000000000 +0000
diff --git a/meta/recipes-sato/eds/eds-dbus/oh-contact.patch b/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
index fdd7e4b..9817991 100644
--- a/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
+++ b/meta/recipes-sato/eds/eds-dbus/oh-contact.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: addressbook/libedata-book/ximian-vcard.h
===================================================================
--- addressbook/libedata-book/ximian-vcard.h.orig 2010-02-05 14:57:14.000000000 +0000
diff --git a/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch b/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
index 8b60069..7ef2956 100644
--- a/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
+++ b/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
@@ -3,6 +3,8 @@ This avoid build error due to defination missing.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: git/configure.ac
===================================================================
--- git.orig/configure.ac 2010-12-16 10:25:24.000000000 +0800
diff --git a/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch b/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
index 128307a..d9b0940 100644
--- a/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
+++ b/meta/recipes-sato/eds/eds-dbus/optional_imapx_provider.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
Index: git/camel/providers/Makefile.am
===================================================================
--- git.orig/camel/providers/Makefile.am 2010-07-06 18:49:34.000000000 +0800
diff --git a/meta/recipes-sato/eds/eds-dbus/parallelmake.patch b/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
index 08cfac0..ee004a9 100644
--- a/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
+++ b/meta/recipes-sato/eds/eds-dbus/parallelmake.patch
@@ -4,6 +4,8 @@ commit 6118d5891fee776a087855c335a73c79fdaf036c
RP 16/3/10
+Upstream-Status: Pending
+
Index: git/git.mk
===================================================================
--- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000
--git a/meta/recipes-sato/leafpad/files/owl-menu.patch b/meta/recipes-sato/leafpad/files/owl-menu.patch
index acfc880..2ebf74a 100644
--- a/meta/recipes-sato/leafpad/files/owl-menu.patch
+++ b/meta/recipes-sato/leafpad/files/owl-menu.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
--- tmp/src/menu.c.orig 2007-04-23 12:08:41.000000000 +0100
+++ tmp/src/menu.c 2007-04-23 12:08:41.000000000 +0100
@@ -152,7 +152,7 @@
diff --git a/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
index 9ab51ec..8256949 100644
--- a/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
+++ b/meta/recipes-sato/matchbox-config-gtk/files/no-handed.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: appearance/mb-appearance.c
===================================================================
--- appearance/mb-appearance.c (revision 1614)
diff --git a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
index 54f3670..0edb55e 100644
--- a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
+++ b/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
@@ -11,6 +11,8 @@ This patch avoids this linking error:
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/11
+Upstream-Status: Pending
+
Index: matchbox-desktop-2/configure.ac
===================================================================
--- matchbox-desktop-2.orig/configure.ac
diff --git a/meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch b/meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch
index 87fbd50..8970ac8 100644
--- a/meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch
+++ b/meta/recipes-sato/matchbox-desktop/files/window-resize-fix.patch
@@ -16,6 +16,8 @@ Date: Sun Mar 6 17:58:45 2011 +0800
Signed-off-by: Yu Ke <ke.yu@intel.com>
+Upstream-Status: Pending
+
diff --git a/src/desktop.c b/src/desktop.c
index d4fc2fb..5aa2cfc 100644
--- a/src/desktop.c
diff --git a/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch b/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
index 52cea0e..800bf3b 100644
--- a/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
+++ b/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: matchbox-window-manager/configure.ac
===================================================================
--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
diff --git a/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch b/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch
index d0adc47..18b6c41 100644
--- a/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch
+++ b/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch
@@ -9,6 +9,7 @@ on demand.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
Index: matchbox-keyboard/matchbox-keyboard.desktop
===================================================================
diff --git a/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch b/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch
index 54ca74d..71a4727 100644
--- a/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch
+++ b/meta/recipes-sato/matchbox-panel-2/gcc-4.6.0-compile.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [other] - need clean up
+
diff -ur git.ORIG/applets/startup/startup.c git/applets/startup/startup.c
--- git.ORIG/applets/startup/startup.c 2011-04-28 08:13:25.000000000 -0600
+++ git/applets/startup/startup.c 2011-04-28 09:36:48.521990746 -0600
diff --git a/meta/recipes-sato/matchbox-panel-2/startup_fix.diff b/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
index 9262d33..d9a0876 100644
--- a/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
+++ b/meta/recipes-sato/matchbox-panel-2/startup_fix.diff
@@ -2,6 +2,8 @@ Fixed the compile error caused by typo, upstream also need this.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Pending
+
Index: matchbox-panel-2/applets/startup/startup.c
===================================================================
--- matchbox-panel-2/applets/startup/startup.c (revision 2109)
diff --git a/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch b/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch
index 52cea0e..800bf3b 100644
--- a/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch
+++ b/meta/recipes-sato/matchbox-stroke/files/configure_fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: matchbox-window-manager/configure.ac
===================================================================
--- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000
diff --git a/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
index dd45341..cbfa7de 100644
--- a/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
+++ b/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
@@ -13,6 +13,7 @@ This patch avoids these linking errors:
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/11
+Upstream-Status: Pending
Index: matchbox-stroke/configure.ac
===================================================================
diff --git a/meta/recipes-sato/matchbox-stroke/files/single-instance.patch b/meta/recipes-sato/matchbox-stroke/files/single-instance.patch
index f4fec07..239aadb 100644
--- a/meta/recipes-sato/matchbox-stroke/files/single-instance.patch
+++ b/meta/recipes-sato/matchbox-stroke/files/single-instance.patch
@@ -6,6 +6,7 @@ in matchbox-desktop.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
Index: matchbox-stroke/matchbox-stroke.desktop
===================================================================
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch
index b12e920..d8f264f 100644
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2/png_rename.patch
@@ -2,6 +2,8 @@ Background Image name was changed from background.png to template.png
Signed-off-by: Saul Wold <sgw@linux.intel.com>
+Upstream-Status: Pending
+
Index: matchbox-sato/Sato/matchbox2/Makefile.am
===================================================================
--- matchbox-sato.orig/Sato/matchbox2/Makefile.am 2010-12-29 13:08:43.000000000 -0800
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch b/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
index cc09587..5bc279a 100644
--- a/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
+++ b/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
@@ -9,6 +9,8 @@ We will revisit it in next period.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Pending
+
diff -ruN libowl-av-orig/libowl-av/owl-tag-reader.c libowl-av/libowl-av/owl-tag-reader.c
--- libowl-av-orig/libowl-av/owl-tag-reader.c 2010-10-12 14:30:26.000000000 +0800
+++ libowl-av/libowl-av/owl-tag-reader.c 2010-10-12 14:32:39.000000000 +0800
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch b/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
index 6ba37fb..a8be781 100644
--- a/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
+++ b/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libowl-av/Makefile.am
===================================================================
--- libowl-av.orig/Makefile.am
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch b/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
index e153c5e..437f72b 100644
--- a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
+++ b/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
@@ -7,6 +7,8 @@ multi-thread operation.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+Upstream-Status: Pending
+
diff -ruN video-orig/src/video.c video/src/video.c
--- video-orig/src/video.c 2010-10-15 16:07:26.522346398 +0800
+++ video/src/video.c 2010-10-15 16:25:51.780296717 +0800
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch b/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
index 7d8aff7..d219c31 100644
--- a/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
+++ b/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
@@ -2,6 +2,8 @@ Make 3.82 is much stricter and demands tabs. Obey.
JL - 15/12/10
+Upstream-Status: Inappropriate [configuration]
+
Index: video/Makefile.am
===================================================================
--- video.orig/Makefile.am
diff --git a/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch b/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch
index 2f654a5..0118081 100644
--- a/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch
+++ b/meta/recipes-sato/pcmanfm/files/cross-compile-fix.patch
@@ -4,6 +4,8 @@ remove it to work aound this issue.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
+
Index: pcmanfm-0.9.7/data/ui/Makefile.am
===================================================================
--- pcmanfm-0.9.7.orig/data/ui/Makefile.am 2010-07-29 15:10:18.000000000 +0800
--git a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
index f3d4e61..0826a16 100644
--- a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
+++ b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
@@ -3,6 +3,8 @@ enable owl menu
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [enable feature]
+
Index: pcmanfm-0.9.7/configure.ac
===================================================================
--- pcmanfm-0.9.7.orig/configure.ac 2010-07-27 10:28:12.000000000 +0800
--git a/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch b/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
index 4b9238b..5323876 100644
--- a/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
+++ b/meta/recipes-sato/pimlico/contacts/contacts-owl-window-menu.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: contacts-0.9/src/contacts-gtk.c
===================================================================
--- contacts-0.9.orig/src/contacts-gtk.c 2008-06-06 12:56:08.000000000 +0100
diff --git a/meta/recipes-sato/pimlico/contacts/make-382.patch b/meta/recipes-sato/pimlico/contacts/make-382.patch
index f85d6b2..a7cfee3 100644
--- a/meta/recipes-sato/pimlico/contacts/make-382.patch
+++ b/meta/recipes-sato/pimlico/contacts/make-382.patch
@@ -2,6 +2,8 @@ Fix for stricter parser in make 3.82. This fix has been pushed to upstream git.
JL - 15/12/10
+Upstream-Status: Accepted
+
Index: git/Makefile.am
===================================================================
--- git.orig/Makefile.am
--git a/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch b/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
index d590165..714623e 100644
--- a/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
+++ b/meta/recipes-sato/pimlico/dates/dates-owl-window-menu.patch
@@ -4,6 +4,8 @@
src/dates_platform.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
+Upstream-Status: Inappropriate [enable feature]
+
Index: git/src/dates_gtk.c
===================================================================
--- git.orig/src/dates_gtk.c 2009-08-18 12:44:56.000000000 +0100
diff --git a/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch b/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch
index 07a0264..eccc782 100644
--- a/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch
+++ b/meta/recipes-sato/pimlico/dates/dso_linking_change_build_fix.patch
@@ -30,6 +30,8 @@ file, libtool should have added these needed libraries in there.
Nitin A Kamble <nitin.a.kamble@intel.com>
Date: 2011/01/19
+Upstream-Status: Pending
+
Index: git/src/Makefile.am
===================================================================
--- git.orig/src/Makefile.am
diff --git a/meta/recipes-sato/pimlico/dates/make-382.patch b/meta/recipes-sato/pimlico/dates/make-382.patch
index 9147361..fad3c58 100644
--- a/meta/recipes-sato/pimlico/dates/make-382.patch
+++ b/meta/recipes-sato/pimlico/dates/make-382.patch
@@ -3,6 +3,8 @@ in upstream git.
JL - 15/12/10
+Upstream-Status: Accepted
+
Index: git/Makefile.am
===================================================================
--- git.orig/Makefile.am
diff --git a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch
index cfa6a0d..b392a93 100644
--- a/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch
+++ b/meta/recipes-sato/sato-icon-theme/sato-icon-theme/iconpath-option.patch
@@ -3,6 +3,8 @@ patch adds an option to allow the path to the tool to be specified.
RP - 12/8/10
+Upstream-Status: Pending
+
Index: sato-icon-theme-0.4.1/configure.ac
===================================================================
--- sato-icon-theme-0.4.1.orig/configure.ac 2010-08-12 12:23:25.000000000 +0100
diff --git a/meta/recipes-sato/web/web-webkit/link-with-g++.patch b/meta/recipes-sato/web/web-webkit/link-with-g++.patch
index 50d6e93..e0c6784 100644
--- a/meta/recipes-sato/web/web-webkit/link-with-g++.patch
+++ b/meta/recipes-sato/web/web-webkit/link-with-g++.patch
@@ -3,6 +3,9 @@ linking. The easiest way to achieve this is to add a dummy cpp file.
This also means we have to add AC_PROG_CXX else libtool 2.2.2 gets upset.
RP - 14/4/08
+
+Upstream-Status: Inappropriate [configuration]
+
--- webkit.orig/src/Makefile.am
+++ webkit/src/Makefile.am
@@ -1,11 +1,11 @@
diff --git a/meta/recipes-sato/web/web-webkit/make-382.patch b/meta/recipes-sato/web/web-webkit/make-382.patch
index 253743d..3689435 100644
--- a/meta/recipes-sato/web/web-webkit/make-382.patch
+++ b/meta/recipes-sato/web/web-webkit/make-382.patch
@@ -2,6 +2,8 @@ Make 3.82 does not allow 8 spaces instead of a tab
JL - 15/12/10
+Upstream-Status: Inappropriate [configuration]
+
Index: webkit/Makefile.am
===================================================================
--- webkit.orig/Makefile.am
--git a/meta/recipes-sato/web/web/owl-window-menu.patch b/meta/recipes-sato/web/web/owl-window-menu.patch
index 8b46c32..1e5916a 100644
--- a/meta/recipes-sato/web/web/owl-window-menu.patch
+++ b/meta/recipes-sato/web/web/owl-window-menu.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
Index: trunk/src/web_main.c
===================================================================
--- trunk.orig/src/web_main.c 2007-12-18 15:04:13.000000000 -0800
diff --git a/meta/recipes-sato/webkit/files/fix_im.patch b/meta/recipes-sato/webkit/files/fix_im.patch
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/recipes-sato/webkit/files/nodolt.patch b/meta/recipes-sato/webkit/files/nodolt.patch
index 5331367..e713e8b 100644
--- a/meta/recipes-sato/webkit/files/nodolt.patch
+++ b/meta/recipes-sato/webkit/files/nodolt.patch
@@ -1,6 +1,9 @@
Dolt cause build error on some platform, so disable it.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Upstream-Status: Inappropriate [configuration]
+
Index: webkit-gtk-1.3.7+svnr72836-r72836-r0/configure.ac
===================================================================
--- webkit-gtk-1.3.7+svnr72836-r72836-r0.orig/configure.ac 2011-01-21 11:11:07.000000000 +0800
diff --git a/meta/recipes-support/apr/apr-util/configfix.patch b/meta/recipes-support/apr/apr-util/configfix.patch
index a8953e5..dbb1148 100644
--- a/meta/recipes-support/apr/apr-util/configfix.patch
+++ b/meta/recipes-support/apr/apr-util/configfix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-util-1.3.4/apu-config.in
===================================================================
--- apr-util-1.3.4.orig/apu-config.in 2009-01-12 17:08:06.000000000 +0000
diff --git a/meta/recipes-support/apr/apr-util/configure_fixes.patch b/meta/recipes-support/apr/apr-util/configure_fixes.patch
index 0b2a090..1925236 100644
--- a/meta/recipes-support/apr/apr-util/configure_fixes.patch
+++ b/meta/recipes-support/apr/apr-util/configure_fixes.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-util-1.3.4/configure.in
===================================================================
--- apr-util-1.3.4.orig/configure.in
diff --git a/meta/recipes-support/apr/apr-util/configure_fixes.patch.old b/meta/recipes-support/apr/apr-util/configure_fixes.patch.old
deleted file mode 100644
index 16f88b3..0000000
--- a/meta/recipes-support/apr/apr-util/configure_fixes.patch.old
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: apr-util-1.2.12/configure.in
-===================================================================
---- apr-util-1.2.12.orig/configure.in 2008-03-08 19:15:00.000000000 +0000
-+++ apr-util-1.2.12/configure.in 2008-03-08 19:15:13.000000000 +0000
-@@ -8,13 +8,13 @@
- AC_CONFIG_HEADER(include/private/apu_config.h)
- AC_CONFIG_AUX_DIR(build)
-
--sinclude(build/apu-conf.m4)
--sinclude(build/apu-iconv.m4)
--sinclude(build/apu-hints.m4)
--sinclude(build/apr_common.m4)
--sinclude(build/find_apr.m4)
--sinclude(build/dbm.m4)
--sinclude(build/dbd.m4)
-+#sinclude(build/apu-conf.m4)
-+#sinclude(build/apu-iconv.m4)
-+#sinclude(build/apu-hints.m4)
-+#sinclude(build/apr_common.m4)
-+#sinclude(build/find_apr.m4)
-+#sinclude(build/dbm.m4)
-+#sinclude(build/dbd.m4)
-
- dnl Generate ./config.nice for reproducing runs of configure
- dnl
diff --git a/meta/recipes-support/apr/apr/buildconf_fix.patch b/meta/recipes-support/apr/apr/buildconf_fix.patch
index 641340b..2c9d62e 100644
--- a/meta/recipes-support/apr/apr/buildconf_fix.patch
+++ b/meta/recipes-support/apr/apr/buildconf_fix.patch
@@ -4,6 +4,8 @@ so fall back to old detection.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-1.4.2/buildconf
===================================================================
--- apr-1.4.2.orig/buildconf 2009-11-13 06:19:49.000000000 +0800
diff --git a/meta/recipes-support/apr/apr/cleanup.patch b/meta/recipes-support/apr/apr/cleanup.patch
index 47f1c42..b6784e0 100644
--- a/meta/recipes-support/apr/apr/cleanup.patch
+++ b/meta/recipes-support/apr/apr/cleanup.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-1.4.2/build/buildcheck.sh
===================================================================
--- apr-1.4.2.orig/build/buildcheck.sh 2009-11-13 08:27:16.000000000 +0800
diff --git a/meta/recipes-support/apr/apr/configfix.patch b/meta/recipes-support/apr/apr/configfix.patch
index 995555e..605c4f6 100644
--- a/meta/recipes-support/apr/apr/configfix.patch
+++ b/meta/recipes-support/apr/apr/configfix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-1.3.3/apr-config.in
===================================================================
--- apr-1.3.3.orig/apr-config.in 2009-01-12 15:16:31.000000000 +0000
diff --git a/meta/recipes-support/apr/apr/configure_fixes.patch b/meta/recipes-support/apr/apr/configure_fixes.patch
index 86ceb8c..0514000 100644
--- a/meta/recipes-support/apr/apr/configure_fixes.patch
+++ b/meta/recipes-support/apr/apr/configure_fixes.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-1.3.3/configure.in
===================================================================
--- apr-1.3.3.orig/configure.in
diff --git a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
index 4a2f414..91b1fa6 100644
--- a/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
+++ b/meta/recipes-support/beecrypt/beecrypt/disable-icu-check.patch
@@ -1,6 +1,8 @@
We are unable to run code at configure time in a cross environemnt, but as we
control the build we can be fairly certain this dependency is met.
+Upstream-Status: Inappropriate [embedded specific]
+
JL 05/07/10
Index: beecrypt-4.2.1/configure.ac
===================================================================
diff --git a/meta/recipes-support/beecrypt/beecrypt/fix-security.patch b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
index f28e393..6cb0c00 100644
--- a/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
+++ b/meta/recipes-support/beecrypt/beecrypt/fix-security.patch
@@ -3,6 +3,9 @@ project:
http://www.mail-archive.com/fink-commits@lists.sourceforge.net/msg75742.html
JL 05/07/10
+
+Upstream-Status: Pending
+
Index: beecrypt-4.2.1/include/beecrypt/c++/beeyond/BeeCertificate.h
===================================================================
--- beecrypt-4.2.1.orig/include/beecrypt/c++/beeyond/BeeCertificate.h 2010-11-26 17:22:57.000000000 +0800
diff --git a/meta/recipes-support/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch
index f56f35b..df09530 100644
--- a/meta/recipes-support/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch
+++ b/meta/recipes-support/gpgme/gpgme-1.3.0/disable_gpgconf_check.patch
@@ -13,6 +13,7 @@ non-cross-compile environment.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [embedded specific]
Index: gpgme-1.3.0/configure.ac
===================================================================
diff --git a/meta/recipes-support/libcroco/files/croco.patch b/meta/recipes-support/libcroco/files/croco.patch
index 572f9de..88bdb09 100644
--- a/meta/recipes-support/libcroco/files/croco.patch
+++ b/meta/recipes-support/libcroco/files/croco.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
--- opie/configure.in.old 2006-05-19 20:57:30.000000000 +0100
+++ opie/configure.in 2006-05-19 20:57:56.000000000 +0100
@@ -131,8 +131,8 @@
diff --git a/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch b/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
index 79d53b6..c8e3c1f 100644
--- a/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
+++ b/meta/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
@@ -4,6 +4,8 @@ configure: fix whitelisting of x86_64 unaligned memory access
Fix typo in whitelist so cross-compile works for x86_64.
+Upstream-Status: Inappropriate [configuration]
+
--- liboil-0.3.17/m4/as-unaligned-access.m4.orig 2009-02-26 14:40:08.000000000 -0500
+++ liboil-0.3.17/m4/as-unaligned-access.m4 2010-11-03 12:19:55.000000000 -0400
@@ -9,7 +9,7 @@
diff --git a/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch b/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch
index 00cf5d7..892d441 100644
--- a/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch
+++ b/meta/recipes-support/liboil/liboil-0.3.17/no-tests.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
--- liboil-0.3.9/liboil/liboilfunction.c.old 2006-09-18 13:03:20.000000000 +0100
+++ liboil-0.3.9/liboil/liboilfunction.c 2006-09-18 13:04:10.000000000 +0100
@@ -345,7 +345,9 @@
diff --git a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
index d216638..6386889 100644
--- a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
+++ b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: libxslt-1.1.22/libexslt.pc.in
===================================================================
--- libxslt-1.1.22.orig/libexslt.pc.in 2008-03-19 16:52:20.000000000 +0000
--
1.7.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/8] bash: enable update-alternative to use bash as default shell
2011-05-13 5:06 [PATCH 0/8] 13-May Consolidated Pulls Saul Wold
` (3 preceding siblings ...)
2011-05-13 5:06 ` [PATCH 4/8] recipes: Add Upstream-Status to multiple recipes Saul Wold
@ 2011-05-13 5:06 ` Saul Wold
2011-05-13 5:06 ` [PATCH 6/8] kern-tools: error if features are not found Saul Wold
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Saul Wold @ 2011-05-13 5:06 UTC (permalink / raw)
To: openembedded-core; +Cc: Ilya Yanok, Jingdong Lu
From: Jingdong Lu <jingdong.lu@windriver.com>
Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
---
meta/recipes-extended/bash/bash.inc | 2 +-
meta/recipes-extended/bash/bash_4.1.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index e218304..d55e517 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -7,7 +7,7 @@ LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "ncurses bison-native"
-inherit autotools gettext
+inherit autotools gettext update-alternatives
PARALLEL_MAKE = ""
diff --git a/meta/recipes-extended/bash/bash_4.1.bb b/meta/recipes-extended/bash/bash_4.1.bb
index bf8cdad..c146014 100644
--- a/meta/recipes-extended/bash/bash_4.1.bb
+++ b/meta/recipes-extended/bash/bash_4.1.bb
@@ -1,6 +1,6 @@
require bash.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
${GNU_MIRROR}/bash/bash-4.1-patches/bash41-001;apply=yes;striplevel=0;name=patch001 \
--
1.7.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6/8] kern-tools: error if features are not found
2011-05-13 5:06 [PATCH 0/8] 13-May Consolidated Pulls Saul Wold
` (4 preceding siblings ...)
2011-05-13 5:06 ` [PATCH 5/8] bash: enable update-alternative to use bash as default shell Saul Wold
@ 2011-05-13 5:06 ` Saul Wold
2011-05-13 5:06 ` [PATCH 7/8] gcc: fix target gcc runtime issue Saul Wold
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Saul Wold @ 2011-05-13 5:06 UTC (permalink / raw)
To: openembedded-core; +Cc: Ilya Yanok, Jingdong Lu
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Fixes bug: [YOCTO #955]
Updating the SRCREV to pickup the kern-tools change:
[
updateme: error if features are not found
Rather than silently dropping addon features, we emit a warning
and then exit with a failure code. The caller can then abort a
build and not simply miss features.
Passing --no-strict to the script disables this new functionality
if for some reason a feature description is missing on purpose.
]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
.../kern-tools/kern-tools-native_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index c808e17..829d105 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
DEPENDS = "git-native guilt-native"
-SRCREV = "ab49d8e48b7e66d1b4f924385d65d062d25e44f7"
+SRCREV = "ecbdf3cdf6705a63dcb3c50bb24c311046f0b35c"
PR = r10
PV = "0.1+git${SRCPV}"
--
1.7.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 7/8] gcc: fix target gcc runtime issue
2011-05-13 5:06 [PATCH 0/8] 13-May Consolidated Pulls Saul Wold
` (5 preceding siblings ...)
2011-05-13 5:06 ` [PATCH 6/8] kern-tools: error if features are not found Saul Wold
@ 2011-05-13 5:06 ` Saul Wold
2011-05-13 5:06 ` [PATCH 8/8] qt4-tools-nativesdk: -arch is required for nativesdk build Saul Wold
2011-05-13 9:29 ` [PATCH 0/8] 13-May Consolidated Pulls Richard Purdie
8 siblings, 0 replies; 10+ messages in thread
From: Saul Wold @ 2011-05-13 5:06 UTC (permalink / raw)
To: openembedded-core; +Cc: Ilya Yanok, Jingdong Lu
From: Nitin A Kamble <nitin.a.kamble@intel.com>
The liblto_plugin.so file is not packages for the target recipe causing this
gcc failure on the target.
gcc: fatal error: -fuse-linker-plugin, but liblto_plugin.so not found
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-devtools/gcc/gcc-4.6.0.inc | 2 +-
meta/recipes-devtools/gcc/gcc-package-target.inc | 1 +
meta/recipes-devtools/gcc/gcc_4.3.3.bb | 2 +-
meta/recipes-devtools/gcc/gcc_4.5.1.bb | 2 +-
meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.0.inc b/meta/recipes-devtools/gcc/gcc-4.6.0.inc
index 2c30d43..fb5c70d 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.0.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.0.inc
@@ -7,7 +7,7 @@ require gcc-common.inc
require gcc-4_6-branch-backports.inc
-PR = "r1"
+PR = "r2"
DEPENDS =+ "mpfr gmp libmpc"
NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native"
diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
index e7f1b80..afbcf0d 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -12,6 +12,7 @@ FILES_${PN} = "\
${bindir}/${TARGET_PREFIX}gcc \
${bindir}/${TARGET_PREFIX}gccbug \
${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \
${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
diff --git a/meta/recipes-devtools/gcc/gcc_4.3.3.bb b/meta/recipes-devtools/gcc/gcc_4.3.3.bb
index f0471d4..ba6e7b2 100644
--- a/meta/recipes-devtools/gcc/gcc_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc_4.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r11"
+PR = "r12"
require gcc-${PV}.inc
require gcc-configure-target.inc
diff --git a/meta/recipes-devtools/gcc/gcc_4.5.1.bb b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
index a193b38..e04f443 100644
--- a/meta/recipes-devtools/gcc/gcc_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc_4.5.1.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
require gcc-${PV}.inc
require gcc-configure-target.inc
require gcc-package-target.inc
diff --git a/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
index cc7540a..2df12ef 100644
--- a/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
+++ b/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
require gcc-${PV}.inc
require gcc-configure-target.inc
--
1.7.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 8/8] qt4-tools-nativesdk: -arch is required for nativesdk build
2011-05-13 5:06 [PATCH 0/8] 13-May Consolidated Pulls Saul Wold
` (6 preceding siblings ...)
2011-05-13 5:06 ` [PATCH 7/8] gcc: fix target gcc runtime issue Saul Wold
@ 2011-05-13 5:06 ` Saul Wold
2011-05-13 9:29 ` [PATCH 0/8] 13-May Consolidated Pulls Richard Purdie
8 siblings, 0 replies; 10+ messages in thread
From: Saul Wold @ 2011-05-13 5:06 UTC (permalink / raw)
To: openembedded-core; +Cc: Ilya Yanok, Jingdong Lu
From: Ilya Yanok <yanok@emcraft.com>
We need to pass correct -arch option to configure to fix building in
case of SDK_ARCH != BUILD_ARCH.
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
---
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index f273c9f..5faf40c 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -25,6 +25,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
+require qt4_arch.inc
+
# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
EXTRA_OECONF = "-prefix ${prefix} \
-qt-libjpeg -qt-gif -system-zlib \
@@ -37,6 +39,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
-verbose -release -fast -static \
-platform ${TARGET_OS}-oe-g++ \
-xplatform ${TARGET_OS}-oe-g++ \
+ -arch ${@qt_arch(d)} \
-embedded -no-freetype -no-glib -no-iconv \
-qt3support \
-I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include \
--
1.7.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 0/8] 13-May Consolidated Pulls
2011-05-13 5:06 [PATCH 0/8] 13-May Consolidated Pulls Saul Wold
` (7 preceding siblings ...)
2011-05-13 5:06 ` [PATCH 8/8] qt4-tools-nativesdk: -arch is required for nativesdk build Saul Wold
@ 2011-05-13 9:29 ` Richard Purdie
8 siblings, 0 replies; 10+ messages in thread
From: Richard Purdie @ 2011-05-13 9:29 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Jingdong Lu, Ilya Yanok
On Thu, 2011-05-12 at 22:06 -0700, Saul Wold wrote:
> From: Saul Wold <sgw@linux.intel.com>
>
> Richard,
>
> Here is a set of patch upstream status updates along with some
> GCC 4.6 fixes and a kern-tools SRCREV tweak from Bruce.
>
>
>
> Pull URL: git://git.openembedded.org/openembedded-core-contrib
> Branch: sgw/stage
> Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-05-13 9:32 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-13 5:06 [PATCH 0/8] 13-May Consolidated Pulls Saul Wold
2011-05-13 5:06 ` [PATCH 1/8] recipes: add Upstream-Status for multiple recipes Saul Wold
2011-05-13 5:06 ` [PATCH 2/8] recipes: Add " Saul Wold
2011-05-13 5:06 ` [PATCH 3/8] recpies: add Upstream-Status for multiple recipes' patches Saul Wold
2011-05-13 5:06 ` [PATCH 4/8] recipes: Add Upstream-Status to multiple recipes Saul Wold
2011-05-13 5:06 ` [PATCH 5/8] bash: enable update-alternative to use bash as default shell Saul Wold
2011-05-13 5:06 ` [PATCH 6/8] kern-tools: error if features are not found Saul Wold
2011-05-13 5:06 ` [PATCH 7/8] gcc: fix target gcc runtime issue Saul Wold
2011-05-13 5:06 ` [PATCH 8/8] qt4-tools-nativesdk: -arch is required for nativesdk build Saul Wold
2011-05-13 9:29 ` [PATCH 0/8] 13-May Consolidated Pulls Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.