* [PATCH 00/31] Numerous patches to resolve yocto-compat-layer
@ 2017-09-06 19:22 Mark Hatle
2017-09-06 19:22 ` [PATCH 01/31] iproute2: Move tipc enablement to oe-core Mark Hatle
` (31 more replies)
0 siblings, 32 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:22 UTC (permalink / raw)
To: openembedded-devel
This patch set attempts to address the 'yocto-compat-layer.py' failures.
Many of the patches seem like obvious fixes or changes to me.. however some
of them are clearly dubious.
I would not suggestion treating this as a single take them all or take none,
but as individual changes.. (a few of them may require prior changes...)
Besides the standard git summary (below), I have attempted to summaries the
individual patches here to help with review:
[01/31] iproute2: Move tipc enablement to oe-core
[02/31] libml: Move to oe-core
- I will be sending up a corresponding patch to oe-core for these. See the
other email ( iproute2: Move tipc enablement to oe-core ) for a description
of why this is necessary.
[03/31] openipmi: Move to meta-networking requires net-snmp
- openipmi in meta-oe requires net-snmp, but meta-oe doesn't depend on
meta-networking. Easiest resolution was to move it.
[04/31] glmark2: Set required distro features to opengl
- Should be one of the 'obvious' fixes
[05/31] openlmi-tools: Only build if the necessary python
- This is one of the dubious patches. I could not figure out an appropriate
place to 'move' this to that requires meta-python -- as the item itself does
not appear to be appriopriate to put into meta-python.
[06/31] xorg-drivers: Add opengl distro flag requirement to ati
[07/31] boinc-client: Add distro flag, requires opengl
- Another set of the 'obvious' fixes
[08/31] networkmanager-openvpn: requires openvpn from meta-networking
- requires openvpn from meta-networking, but meta-oe doesn't depend on
meta-networking. Easiest resolution was to move it.
[09/31] telepathy-python: Move to meta-python, requires python-dbus
- This seems like a reasonable move to meta-python
[10/31] networkmanager: Move to meta-networking, requires dnsmasq
- This moves the rest of networkmanager to meta-networking
[11/31] python-ldap: Move to meta-networking, requires cyrus-sasl
- I originally was going to move to meta-python, but that doesn't depend on
meta-networking... so move it there instead
[12/31] python-networkmanager: Move to networking, requires networkmanager
- Due to the prior moves, move this as well to meta-networking
[13/31] corosync: Requires net-snmp from meta-networking
- Again move to meta-networking due to dep
[14/31] pywbem: Requires python-m2crypto-native (and others)
- This is one I'm not sure if it's the right thing or not.. but it does
require meta-python.. so move it.
[15/31] dlm: requires corosync, from meta-networking
- Again move to meta-networking due to prior move
[16/31] open-vm-tools: only build if meta-networking and meta-filesystems
- open-vm-tools requires libdnet (meta-networking) and fuse (meta-filesystem)
I think this is a dubious way to 'fix' the issue, but I really couldn't think
of a better way.
[17/31] miniupnpd: Move to meta-networking, requires libnetfilter-conntrack
- Move to meta-networking due to dependency...
[18/31] enable_gnome.conf: Move the AVAHI_GTK setting
- The yp-compat script does not allow a layer to modify the system wide
configuration (including modifying other recipe behavior). The AVHAI_GTK
changes the behavior of that recipe, which is detected by the script. So
I choose to move this to a configuration file that will need to be required
by the user IF they want avahi to use GTK. I'm not happy with this, but I
don't see any other way to meet the requirements.
[19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
- Similar to the above, but with PACKAGECONFIG this time.
[20/31] libart-lgpg: Obsolete, replaced by version in oe-core
- OE core already has this version, remove it.
[21/31] pinpoint: Add dependency on opengl for cogl
- Add the required distro flag...
[22/31] vim: Remove xfce vim bbappend
- This breaks the same rule as 18 and 19. I didn't see a way to 'fix it',
so I just removed the change.
[23/31] layer.conf: Add meta-networking for the networkmanager
- add meta-networking as a dependency to meta-gnome for networkmanager
this is due to the move above
[24/31] meta-xfce: depend on meta-multimedia
- There was a duplicate openembedded-layer entry, but I think it was
supposed to be for meta-multimedia. This resolves a bunch of dependency
errors.
[25/31] mpv: Requires ffmpeg which has a LICENSE_FLAGS =
[26/31] recipes-multimedia: Add LICENSE_FLAGS
[27/31] recipes-multimedia: Add LICENSE_FLAGS
- Above items all get LICENSE_FLAGS added to match their dependencies. This
resolves a dependency issue where the required item(s) are not avaialable.
[28/31] libmtp: remove 'mtp-tools' from PACKAGES
- This is a real bug in mtp-tools, and needs to be fixed.
[29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
- There is no 'fix' for xfce4-mixer using gstreamer-0.10, so remove it...
[30/31] florence: update 0.6.3
- Use Andreas Muller's patch from Oct 2016 to git rid of the gstreamer-0.10
dependency. Resolve the issue with requiring gtk+3.
[31/31] gstreamer-0.10: Remove as all users are gone and it is
- Remove gstreamer-0.10 as all of the users are now gone. (This resolves
various preferred provider issues I observed..)
Andreas Müller (1):
florence: update 0.6.3
Mark Hatle (30):
iproute2: Move tipc enablement to oe-core
libml: Move to oe-core
openipmi: Move to meta-networking requires net-snmp
glmark2: Set required distro features to opengl
openlmi-tools: Only build if the necessary python pieces are available
xorg-drivers: Add opengl distro flag requirement to ati and nouveau
boinc-client: Add distro flag, requires opengl
networkmanager-openvpn: requires openvpn from meta-networking
telepathy-python: Move to meta-python, requires python-dbus
networkmanager: Move to meta-networking, requires dnsmasq
python-ldap: Move to meta-networking, requires cyrus-sasl
python-networkmanager: Move to networking, requires networkmanager
corosync: Requires net-snmp from meta-networking
pywbem: Requires python-m2crypto-native (and others) from meta-python
dlm: requires corosync, from meta-networking
open-vm-tools: only build if meta-networking and meta-filesystems is
available
miniupnpd: Move to meta-networking, requires libnetfilter-conntrack
enable_gnome.conf: Move the AVAHI_GTK setting
glade3: Move PACKAGECONFIG setting to enable_gnome.conf
libart-lgpg: Obsolete, replaced by version in oe-core
pinpoint: Add dependency on opengl for cogl
vim: Remove xfce vim bbappend
layer.conf: Add meta-networking for the networkmanager
meta-xfce: depend on meta-multimedia
mpv: Requires ffmpeg which has a LICENSE_FLAGS = commercial set
recipes-multimedia: Add LICENSE_FLAGS
recipes-multimedia: Add LICENSE_FLAGS
libmtp: remove 'mtp-tools' from PACKAGES
xfce4-mixer: Remove, gstreamer-0.10 is obsolete
gstreamer-0.10: Remove as all users are gone and it is obsolete
meta-gnome/README | 5 +
meta-gnome/conf/enable_gnome.conf | 3 +
meta-gnome/conf/layer.conf | 4 +-
meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb | 5 +-
.../recipes-devtools/glade/glade3_%.bbappend | 1 -
.../libart-lgpl/libart-lgpl/Makefile.am.patch | 17 -
.../libart-lgpl/libart-lgpl/aarch64/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/aarch64be/art_config.h | 10 -
.../libart-lgpl/aarch64be_32/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/arm/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/armeb/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/i386/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/i586/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/i686/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/mips/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/mips64/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/mips64el/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/mipsel/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/powerpc/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/powerpc64/art_config.h | 10 -
.../libart-lgpl/libart-lgpl/x86_64/art_config.h | 10 -
.../libart-lgpl/libart-lgpl_2.3.21.bb | 28 -
.../florence/files/fix-no-atspi-compile.patch | 30 -
.../recipes-support/florence/florence_0.5.4.bb | 20 -
.../recipes-support/florence/florence_0.6.3.bb | 19 +
.../miniupnpd/miniupnpd_2.0.bb | 37 --
.../gst-ffmpeg-0.10.13/lower-rank.diff | 16 -
.../gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb | 14 -
.../gst-fluendo-mpegdemux_0.10.85.bb | 12 -
.../gstreamer-0.10/gst-fluendo.inc | 14 -
.../gstreamer-0.10/gst-meta-base_0.10.bb | 73 ---
.../gstreamer-0.10/gst-openmax/gcc_4.6.patch | 18 -
.../gstreamer-0.10/gst-openmax/ptr-array.patch | 46 --
.../gstreamer-0.10/gst-openmax_0.10.1.bb | 35 --
.../gst-plugins-bad/buffer-overflow-mp4.patch | 36 --
.../gstreamer-0.10/gst-plugins-bad_0.10.23.bb | 61 --
...l.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch | 32 --
...le-Fix-build-on-x86-if-emmintrin.h-is-ava.patch | 37 --
.../configure.ac-fix-subparse-plugin.patch | 27 -
.../gst-plugins-base-tremor.patch | 20 -
.../gstreamer-0.10/gst-plugins-base_0.10.36.bb | 44 --
...-conditional-gl-framebuffer-undefined-use.patch | 35 --
.../gst-plugins-gl/rpi-egl-gles2-dep.patch | 22 -
.../gstreamer-0.10/gst-plugins-gl_0.10.3.bb | 27 -
...ild-with-recent-kernels-the-v4l2_buffer-i.patch | 33 --
...define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch | 45 --
.../0407-mulawdec-fix-integer-overrun.patch | 47 --
.../gstreamer-0.10/gst-plugins-good_0.10.31.bb | 47 --
...sate-for-libcdio-s-recent-cd-text-api-cha.patch | 193 -------
.../0002-Fix-opencore-include-paths.patch | 58 --
.../gstreamer-0.10/gst-plugins-ugly_0.10.19.bb | 35 --
.../gstreamer-0.10/gst-plugins.inc | 29 -
...ecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch | 34 --
.../gstreamer-0.10/gst-rtsp_0.10.8.bb | 18 -
...ix-self-comparison-always-evaluates-to-tr.patch | 32 --
...01-parse-make-grammar.y-work-with-Bison-3.patch | 35 --
...2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch | 32 --
.../gstreamer-0.10.36/check_fix.patch | 19 -
.../gst-inspect-check-error.patch | 16 -
.../gstreamer-0.10.36/gstregistrybinary.c | 487 ----------------
.../gstreamer-0.10.36/gstregistrybinary.h | 194 -------
.../gstreamer-0.10/gstreamer_0.10.36.bb | 53 --
.../recipes-multimedia/musicpd/mpd_0.19.21.bb | 3 +
.../recipes-multimedia/sox/sox_14.4.0.bb | 3 +
.../streamripper/streamripper_1.64.6.bb | 3 +
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 3 +
.../iproute2/iproute2_%.bbappend | 2 -
.../miniupnpd/miniupnpd_2.0.bb | 37 ++
.../networkmanager/networkmanager-openvpn_1.2.8.bb | 39 ++
...adjust-net-headers-for-musl-compatibility.patch | 82 +++
.../0001-check-for-strndupa-before-using-it.patch | 67 +++
...dns-resolved-add-systemd-resolved-backend.patch | 621 +++++++++++++++++++++
...ed-also-check-for-etc-resolv-conf.systemd.patch | 29 +
...o-run-sbin-dhclient-to-get-the-version-nu.patch | 36 ++
...stemd-xlocale.h-is-dropped-by-newer-glibc.patch | 29 +
.../0002-Fix-nm-version-macro-includes.patch | 58 ++
...et-util.h-Include-linux-sockios.h-on-musl.patch | 30 +
...-string-in-g_dbus_message_new_method_erro.patch | 67 +++
.../networkmanager/0003-Define-ETH_ALEN.patch | 39 ++
...Define-missing-features-to-cater-for-musl.patch | 93 +++
...emove-net-ethernet.h-seems-to-be-over-spe.patch | 36 ++
.../networkmanager/networkmanager_1.4.4.bb | 132 +++++
.../python-networkmanager_2.0.1.bb | 13 +
.../recipes-devtools/python/python-ldap_2.4.41.bb | 29 +
.../recipes-extended/corosync/corosync_2.4.2.bb | 78 +++
.../respect-ldflags-also-from-bin_ldflags.patch | 36 ++
meta-networking/recipes-extended/dlm/dlm_4.0.2.bb | 51 ++
.../recipes-filter/libmnl/libmnl_1.0.4.bb | 13 -
...ame-struct-parameter-printf-for-namespace.patch | 618 ++++++++++++++++++++
.../files/do-not-install-pyc-and-pyo.patch | 25 +
.../fix-symlink-install-error-in-cmdlang.patch | 22 +
.../openipmi/files/include_sys_types.patch | 17 +
.../files/ipmi-init-fix-the-arguments.patch | 41 ++
.../recipes-support/openipmi/files/ipmi.service | 12 +
.../recipes-support/openipmi/files/openipmi-helper | 512 +++++++++++++++++
.../files/openipmi-no-openipmigui-man.patch | 26 +
...openipmi-remove-host-path-from-la_LDFLAGS.patch | 50 ++
.../recipes-support/openipmi/openipmi_2.0.24.bb | 110 ++++
meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 4 +-
.../recipes-connectivity/libmtp/libmtp_1.1.5.bb | 4 +-
.../networkmanager/networkmanager-openvpn_1.2.8.bb | 39 --
...adjust-net-headers-for-musl-compatibility.patch | 82 ---
.../0001-check-for-strndupa-before-using-it.patch | 67 ---
...dns-resolved-add-systemd-resolved-backend.patch | 621 ---------------------
...ed-also-check-for-etc-resolv-conf.systemd.patch | 29 -
...o-run-sbin-dhclient-to-get-the-version-nu.patch | 36 --
...stemd-xlocale.h-is-dropped-by-newer-glibc.patch | 29 -
.../0002-Fix-nm-version-macro-includes.patch | 58 --
...et-util.h-Include-linux-sockios.h-on-musl.patch | 30 -
...-string-in-g_dbus_message_new_method_erro.patch | 67 ---
.../networkmanager/0003-Define-ETH_ALEN.patch | 39 --
...Define-missing-features-to-cater-for-musl.patch | 93 ---
...emove-net-ethernet.h-seems-to-be-over-spe.patch | 36 --
.../networkmanager/networkmanager_1.4.4.bb | 132 -----
.../telepathy-python-0.15.19/parallel_make.patch | 43 --
.../remove_duplicate_install.patch | 26 -
.../telepathy-python_fix_for_automake_1.12.patch | 26 -
.../telepathy/telepathy-python_0.15.19.bb | 32 --
.../recipes-extended/boinc/boinc-client_7.6.33.bb | 4 +-
.../recipes-extended/corosync/corosync_2.4.2.bb | 78 ---
.../respect-ldflags-also-from-bin_ldflags.patch | 36 --
meta-oe/recipes-extended/dlm/dlm_4.0.2.bb | 51 --
.../openlmi/openlmi-tools_0.10.5.bb | 5 +
meta-oe/recipes-extended/pywbem/pywbem_0.8.0.bb | 36 --
.../xorg-driver/xf86-video-ati_7.8.0.bb | 3 +
.../xorg-driver/xf86-video-nouveau_1.0.15.bb | 4 +
meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb | 3 +
.../open-vm-tools/open-vm-tools_10.1.5.bb | 7 +
...ame-struct-parameter-printf-for-namespace.patch | 618 --------------------
.../files/do-not-install-pyc-and-pyo.patch | 25 -
.../fix-symlink-install-error-in-cmdlang.patch | 22 -
.../openipmi/files/include_sys_types.patch | 17 -
.../files/ipmi-init-fix-the-arguments.patch | 41 --
.../recipes-support/openipmi/files/ipmi.service | 12 -
.../recipes-support/openipmi/files/openipmi-helper | 512 -----------------
.../files/openipmi-no-openipmigui-man.patch | 26 -
...openipmi-remove-host-path-from-la_LDFLAGS.patch | 50 --
.../recipes-support/openipmi/openipmi_2.0.24.bb | 110 ----
.../python-networkmanager_2.0.1.bb | 13 -
.../telepathy-python-0.15.19/parallel_make.patch | 43 ++
.../remove_duplicate_install.patch | 26 +
.../telepathy-python_fix_for_automake_1.12.patch | 26 +
.../telepathy/telepathy-python_0.15.19.bb | 32 ++
.../recipes-devtools/python/python-ldap_2.4.41.bb | 29 -
.../recipes-extended/pywbem/pywbem_0.8.0.bb | 36 ++
meta-xfce/conf/layer.conf | 2 +-
.../recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb | 14 -
.../packagegroups/packagegroup-xfce-multimedia.bb | 4 +
.../xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb | 3 +
meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb | 3 +
meta-xfce/recipes-support/vim/vim_%.bbappend | 6 -
.../packagegroups/packagegroup-xfce-extended.bb | 1 -
152 files changed, 3283 insertions(+), 5465 deletions(-)
create mode 100644 meta-gnome/conf/enable_gnome.conf
delete mode 100644 meta-gnome/recipes-devtools/glade/glade3_%.bbappend
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/Makefile.am.patch
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64be/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64be_32/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/arm/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/armeb/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i386/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i586/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i686/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips64/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips64el/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mipsel/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/powerpc/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/powerpc64/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/x86_64/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb
delete mode 100644 meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch
delete mode 100644 meta-gnome/recipes-support/florence/florence_0.5.4.bb
create mode 100644 meta-gnome/recipes-support/florence/florence_0.6.3.bb
delete mode 100644 meta-multimedia/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
delete mode 100644 meta-networking/recipes-connectivity/iproute2/iproute2_%.bbappend
create mode 100644 meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
create mode 100644 meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb
create mode 100644 meta-networking/recipes-devtools/python/python-ldap_2.4.41.bb
create mode 100644 meta-networking/recipes-extended/corosync/corosync_2.4.2.bb
create mode 100644 meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
create mode 100644 meta-networking/recipes-extended/dlm/dlm_4.0.2.bb
delete mode 100644 meta-networking/recipes-filter/libmnl/libmnl_1.0.4.bb
create mode 100644 meta-networking/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch
create mode 100644 meta-networking/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch
create mode 100644 meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
create mode 100644 meta-networking/recipes-support/openipmi/files/include_sys_types.patch
create mode 100644 meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
create mode 100644 meta-networking/recipes-support/openipmi/files/ipmi.service
create mode 100755 meta-networking/recipes-support/openipmi/files/openipmi-helper
create mode 100644 meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
create mode 100644 meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
create mode 100644 meta-networking/recipes-support/openipmi/openipmi_2.0.24.bb
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
delete mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
delete mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
delete mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
delete mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
delete mode 100644 meta-oe/recipes-extended/corosync/corosync_2.4.2.bb
delete mode 100644 meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
delete mode 100644 meta-oe/recipes-extended/dlm/dlm_4.0.2.bb
delete mode 100644 meta-oe/recipes-extended/pywbem/pywbem_0.8.0.bb
delete mode 100644 meta-oe/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch
delete mode 100644 meta-oe/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch
delete mode 100644 meta-oe/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
delete mode 100644 meta-oe/recipes-support/openipmi/files/include_sys_types.patch
delete mode 100644 meta-oe/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
delete mode 100644 meta-oe/recipes-support/openipmi/files/ipmi.service
delete mode 100755 meta-oe/recipes-support/openipmi/files/openipmi-helper
delete mode 100644 meta-oe/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
delete mode 100644 meta-oe/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
delete mode 100644 meta-oe/recipes-support/openipmi/openipmi_2.0.24.bb
delete mode 100644 meta-python/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb
create mode 100644 meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
create mode 100644 meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
create mode 100644 meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
create mode 100644 meta-python/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
delete mode 100644 meta-python/recipes-devtools/python/python-ldap_2.4.41.bb
create mode 100644 meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb
delete mode 100644 meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
delete mode 100644 meta-xfce/recipes-support/vim/vim_%.bbappend
--
1.8.3.1
^ permalink raw reply [flat|nested] 55+ messages in thread
* [PATCH 01/31] iproute2: Move tipc enablement to oe-core
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
@ 2017-09-06 19:22 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 02/31] libml: Move " Mark Hatle
` (30 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:22 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-networking/recipes-connectivity/iproute2/iproute2_%.bbappend | 2 --
1 file changed, 2 deletions(-)
delete mode 100644 meta-networking/recipes-connectivity/iproute2/iproute2_%.bbappend
diff --git a/meta-networking/recipes-connectivity/iproute2/iproute2_%.bbappend b/meta-networking/recipes-connectivity/iproute2/iproute2_%.bbappend
deleted file mode 100644
index 0869f7f..0000000
--- a/meta-networking/recipes-connectivity/iproute2/iproute2_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# For tipcutils
-PACKAGECONFIG_append = " tipc"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 02/31] libml: Move to oe-core
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
2017-09-06 19:22 ` [PATCH 01/31] iproute2: Move tipc enablement to oe-core Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 03/31] openipmi: Move to meta-networking requires net-snmp Mark Hatle
` (29 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Moved to oe-core, remove this version.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-networking/recipes-filter/libmnl/libmnl_1.0.4.bb | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 meta-networking/recipes-filter/libmnl/libmnl_1.0.4.bb
diff --git a/meta-networking/recipes-filter/libmnl/libmnl_1.0.4.bb b/meta-networking/recipes-filter/libmnl/libmnl_1.0.4.bb
deleted file mode 100644
index b458799..0000000
--- a/meta-networking/recipes-filter/libmnl/libmnl_1.0.4.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "Minimalistic user-space Netlink utility library"
-DESCRIPTION = "Minimalistic user-space library oriented to Netlink developers, providing \
- functions for common tasks in parsing, validating, and constructing both the Netlink header and TLVs."
-HOMEPAGE = "http://www.netfilter.org/projects/libmnl/index.html"
-SECTION = "libs"
-LICENSE = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI = "http://www.netfilter.org/projects/libmnl/files/libmnl-${PV}.tar.bz2;name=tar"
-SRC_URI[tar.md5sum] = "be9b4b5328c6da1bda565ac5dffadb2d"
-SRC_URI[tar.sha256sum] = "171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81"
-
-inherit autotools pkgconfig
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 03/31] openipmi: Move to meta-networking requires net-snmp
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
2017-09-06 19:22 ` [PATCH 01/31] iproute2: Move tipc enablement to oe-core Mark Hatle
2017-09-06 19:23 ` [PATCH 02/31] libml: Move " Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 04/31] glmark2: Set required distro features to opengl Mark Hatle
` (28 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
...ame-struct-parameter-printf-for-namespace.patch | 618 +++++++++++++++++++++
.../files/do-not-install-pyc-and-pyo.patch | 25 +
.../fix-symlink-install-error-in-cmdlang.patch | 22 +
.../openipmi/files/include_sys_types.patch | 17 +
.../files/ipmi-init-fix-the-arguments.patch | 41 ++
.../recipes-support/openipmi/files/ipmi.service | 12 +
.../recipes-support/openipmi/files/openipmi-helper | 512 +++++++++++++++++
.../files/openipmi-no-openipmigui-man.patch | 26 +
...openipmi-remove-host-path-from-la_LDFLAGS.patch | 50 ++
.../recipes-support/openipmi/openipmi_2.0.24.bb | 110 ++++
...ame-struct-parameter-printf-for-namespace.patch | 618 ---------------------
.../files/do-not-install-pyc-and-pyo.patch | 25 -
.../fix-symlink-install-error-in-cmdlang.patch | 22 -
.../openipmi/files/include_sys_types.patch | 17 -
.../files/ipmi-init-fix-the-arguments.patch | 41 --
.../recipes-support/openipmi/files/ipmi.service | 12 -
.../recipes-support/openipmi/files/openipmi-helper | 512 -----------------
.../files/openipmi-no-openipmigui-man.patch | 26 -
...openipmi-remove-host-path-from-la_LDFLAGS.patch | 50 --
.../recipes-support/openipmi/openipmi_2.0.24.bb | 110 ----
20 files changed, 1433 insertions(+), 1433 deletions(-)
create mode 100644 meta-networking/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch
create mode 100644 meta-networking/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch
create mode 100644 meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
create mode 100644 meta-networking/recipes-support/openipmi/files/include_sys_types.patch
create mode 100644 meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
create mode 100644 meta-networking/recipes-support/openipmi/files/ipmi.service
create mode 100755 meta-networking/recipes-support/openipmi/files/openipmi-helper
create mode 100644 meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
create mode 100644 meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
create mode 100644 meta-networking/recipes-support/openipmi/openipmi_2.0.24.bb
delete mode 100644 meta-oe/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch
delete mode 100644 meta-oe/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch
delete mode 100644 meta-oe/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
delete mode 100644 meta-oe/recipes-support/openipmi/files/include_sys_types.patch
delete mode 100644 meta-oe/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
delete mode 100644 meta-oe/recipes-support/openipmi/files/ipmi.service
delete mode 100755 meta-oe/recipes-support/openipmi/files/openipmi-helper
delete mode 100644 meta-oe/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
delete mode 100644 meta-oe/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
delete mode 100644 meta-oe/recipes-support/openipmi/openipmi_2.0.24.bb
diff --git a/meta-networking/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch b/meta-networking/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch
new file mode 100644
index 0000000..25057fb
--- /dev/null
+++ b/meta-networking/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch
@@ -0,0 +1,618 @@
+From 8b51a6bf5a4829d8add535a098c0c06a049a9958 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 26 Aug 2017 22:50:57 -0700
+Subject: [PATCH] lanserv: Rename struct parameter printf for namespace
+ collision
+
+This comes to fore when we use hardening flags where printf
+is treated as macro and gets replaced with printf_chk
+
+Fixes errors like
+
+error: no member named '__printf_chk' in 'struct emu_out_s'
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lanserv/OpenIPMI/serv.h | 2 +-
+ lanserv/emu_cmd.c | 132 ++++++++++++++++++++++++------------------------
+ lanserv/ipmi_sim.c | 10 ++--
+ 3 files changed, 72 insertions(+), 72 deletions(-)
+
+diff --git a/lanserv/OpenIPMI/serv.h b/lanserv/OpenIPMI/serv.h
+index d12d63a..8555c85 100644
+--- a/lanserv/OpenIPMI/serv.h
++++ b/lanserv/OpenIPMI/serv.h
+@@ -522,7 +522,7 @@ uint8_t ipmb_checksum(uint8_t *data, int size, uint8_t start);
+ typedef struct emu_data_s emu_data_t;
+ typedef struct emu_out_s
+ {
+- void (*printf)(struct emu_out_s *out, char *format, ...);
++ void (*eprintf)(struct emu_out_s *out, char *format, ...);
+ void *data;
+ } emu_out_t;
+
+diff --git a/lanserv/emu_cmd.c b/lanserv/emu_cmd.c
+index ca44032..54b6f7b 100644
+--- a/lanserv/emu_cmd.c
++++ b/lanserv/emu_cmd.c
+@@ -76,7 +76,7 @@ emu_get_uchar(emu_out_t *out, char **toks, unsigned char *val, char *errstr,
+ if (empty_ok)
+ return ENOSPC;
+ if (errstr)
+- out->printf(out, "**No %s given\n", errstr);
++ out->eprintf(out, "**No %s given\n", errstr);
+ return EINVAL;
+ }
+ if (str[0] == '\'') {
+@@ -86,7 +86,7 @@ emu_get_uchar(emu_out_t *out, char **toks, unsigned char *val, char *errstr,
+ *val = strtoul(str, &tmpstr, 0);
+ if (*tmpstr != '\0') {
+ if (errstr)
+- out->printf(out, "**Invalid %s given\n", errstr);
++ out->eprintf(out, "**Invalid %s given\n", errstr);
+ return EINVAL;
+ }
+
+@@ -108,7 +108,7 @@ emu_get_uchar_with_vals(emu_out_t *out, char **toks,
+ if (empty_ok)
+ return ENOSPC;
+ if (errstr)
+- out->printf(out, "**No %s given\n", errstr);
++ out->eprintf(out, "**No %s given\n", errstr);
+ return EINVAL;
+ }
+ if (str[0] == '\'') {
+@@ -131,7 +131,7 @@ emu_get_uchar_with_vals(emu_out_t *out, char **toks,
+ *val = strtoul(str, &tmpstr, 0);
+ if (*tmpstr != '\0') {
+ if (errstr)
+- out->printf(out, "**Invalid %s given\n", errstr);
++ out->eprintf(out, "**Invalid %s given\n", errstr);
+ return EINVAL;
+ }
+ out:
+@@ -150,12 +150,12 @@ emu_get_bitmask(emu_out_t *out, char **toks, uint16_t *val, char *errstr,
+ if (empty_ok)
+ return ENOSPC;
+ if (errstr)
+- out->printf(out, "**No %s given\n", errstr);
++ out->eprintf(out, "**No %s given\n", errstr);
+ return EINVAL;
+ }
+ if (strlen(str) != size) {
+ if (errstr)
+- out->printf(out, "**invalid number of bits in %s\n", errstr);
++ out->eprintf(out, "**invalid number of bits in %s\n", errstr);
+ return EINVAL;
+ }
+ *val = 0;
+@@ -166,7 +166,7 @@ emu_get_bitmask(emu_out_t *out, char **toks, uint16_t *val, char *errstr,
+ *val |= 1 << i;
+ } else {
+ if (errstr)
+- out->printf(out, "**Invalid bit value '%c' in %s\n", str[j],
++ out->eprintf(out, "**Invalid bit value '%c' in %s\n", str[j],
+ errstr);
+ return EINVAL;
+ }
+@@ -184,13 +184,13 @@ emu_get_uint(emu_out_t *out, char **toks, unsigned int *val, char *errstr)
+ str = mystrtok(NULL, " \t\n", toks);
+ if (!str) {
+ if (errstr)
+- out->printf(out, "**No %s given\n", errstr);
++ out->eprintf(out, "**No %s given\n", errstr);
+ return EINVAL;
+ }
+ *val = strtoul(str, &tmpstr, 0);
+ if (*tmpstr != '\0') {
+ if (errstr)
+- out->printf(out, "**Invalid %s given\n", errstr);
++ out->eprintf(out, "**Invalid %s given\n", errstr);
+ return EINVAL;
+ }
+
+@@ -206,7 +206,7 @@ emu_get_bytes(emu_out_t *out, char **tokptr, unsigned char *data, char *errstr,
+
+ if (!tok) {
+ if (errstr)
+- out->printf(out, "**No %s given\n", errstr);
++ out->eprintf(out, "**No %s given\n", errstr);
+ return EINVAL;
+ }
+ if (*tok == '"') {
+@@ -215,7 +215,7 @@ emu_get_bytes(emu_out_t *out, char **tokptr, unsigned char *data, char *errstr,
+ tok++;
+ end = strlen(tok) - 1;
+ if (tok[end] != '"') {
+- out->printf(out, "**ASCII %s doesn't end in '\"'", errstr);
++ out->eprintf(out, "**ASCII %s doesn't end in '\"'", errstr);
+ return EINVAL;
+ }
+ if (end > (len - 1))
+@@ -228,7 +228,7 @@ emu_get_bytes(emu_out_t *out, char **tokptr, unsigned char *data, char *errstr,
+ char c[3];
+ /* HEX pw */
+ if (strlen(tok) != 32) {
+- out->printf(out, "**HEX %s not 32 HEX characters long", errstr);
++ out->eprintf(out, "**HEX %s not 32 HEX characters long", errstr);
+ return EINVAL;
+ }
+ c[2] = '\0';
+@@ -239,7 +239,7 @@ emu_get_bytes(emu_out_t *out, char **tokptr, unsigned char *data, char *errstr,
+ tok++;
+ data[i] = strtoul(c, &end, 16);
+ if (*end != '\0') {
+- out->printf(out, "**Invalid HEX character in %s", errstr);
++ out->eprintf(out, "**Invalid HEX character in %s", errstr);
+ return -1;
+ }
+ }
+@@ -263,12 +263,12 @@ read_command_file(emu_out_t *out, emu_data_t *emu, const char *command_file)
+
+ buffer = malloc(INPUT_BUFFER_SIZE);
+ if (!buffer) {
+- out->printf(out, "Could not allocate buffer memory\n");
++ out->eprintf(out, "Could not allocate buffer memory\n");
+ rv = ENOMEM;
+ goto out;
+ }
+ while (fgets(buffer+pos, INPUT_BUFFER_SIZE-pos, f)) {
+- out->printf(out, "%s", buffer+pos);
++ out->eprintf(out, "%s", buffer+pos);
+ if (buffer[pos] == '#')
+ continue;
+ pos = strlen(buffer);
+@@ -318,7 +318,7 @@ sel_enable(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ rv = ipmi_mc_enable_sel(mc, max_records, flags);
+ if (rv)
+- out->printf(out, "**Unable to enable sel, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to enable sel, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -343,9 +343,9 @@ sel_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ rv = ipmi_mc_add_to_sel(mc, record_type, data, &r);
+ if (rv)
+- out->printf(out, "**Unable to add to sel, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to add to sel, error 0x%x\n", rv);
+ else
+- out->printf(out, "Added record %d\n", r);
++ out->eprintf(out, "Added record %d\n", r);
+ return rv;
+ }
+
+@@ -361,14 +361,14 @@ main_sdr_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ if (rv == ENOSPC)
+ break;
+ if (rv) {
+- out->printf(out, "**Error 0x%x in data byte %d\n", rv, i);
++ out->eprintf(out, "**Error 0x%x in data byte %d\n", rv, i);
+ return rv;
+ }
+ }
+
+ rv = ipmi_mc_add_main_sdr(mc, data, i);
+ if (rv)
+- out->printf(out, "**Unable to add to sdr, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to add to sdr, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -389,14 +389,14 @@ device_sdr_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ if (rv == ENOSPC)
+ break;
+ if (rv) {
+- out->printf(out, "**Error 0x%x in data byte %d\n", rv, i);
++ out->eprintf(out, "**Error 0x%x in data byte %d\n", rv, i);
+ return rv;
+ }
+ }
+
+ rv = ipmi_mc_add_device_sdr(mc, lun, data, i);
+ if (rv)
+- out->printf(out, "**Unable to add to sdr, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to add to sdr, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -439,7 +439,7 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ while (tok) {
+ if (strcmp(tok, "poll") == 0) {
+ if (handler) {
+- out->printf(out, "**poll given twice in sensor\n", tok);
++ out->eprintf(out, "**poll given twice in sensor\n", tok);
+ return -1;
+ }
+
+@@ -449,27 +449,27 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ tok = mystrtok(NULL, " \t\n", toks);
+ if (!tok) {
+- out->printf(out, "**No polled sensor handler given\n", tok);
++ out->eprintf(out, "**No polled sensor handler given\n", tok);
+ return -1;
+ }
+
+ handler = ipmi_sensor_find_handler(tok);
+ if (!handler) {
+- out->printf(out, "**Invalid sensor handler: %s\n", tok);
++ out->eprintf(out, "**Invalid sensor handler: %s\n", tok);
+ return -1;
+ }
+
+ rv = handler->init(mc, lun, num, toks, handler->cb_data, &rcb_data,
+ &errstr);
+ if (rv) {
+- out->printf(out, "**Error initializing sensor handler: %s\n",
++ out->eprintf(out, "**Error initializing sensor handler: %s\n",
+ errstr);
+ return rv;
+ }
+ } else if (strcmp(tok, "event-only") == 0) {
+ event_only = 1;
+ } else {
+- out->printf(out, "**Unknown sensor option: %s\n", tok);
++ out->eprintf(out, "**Unknown sensor option: %s\n", tok);
+ return -1;
+ }
+
+@@ -477,7 +477,7 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ }
+
+ if (handler && event_only) {
+- out->printf(out, "**An event-only sensor cannot be polled\n");
++ out->eprintf(out, "**An event-only sensor cannot be polled\n");
+ return -1;
+ }
+
+@@ -488,7 +488,7 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ if (!rv && handler->postinit) {
+ rv = handler->postinit(rcb_data, &errstr);
+ if (rv) {
+- out->printf(out, "**Error in sensor handler postinit: %s\n",
++ out->eprintf(out, "**Error in sensor handler postinit: %s\n",
+ errstr);
+ }
+ }
+@@ -496,7 +496,7 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ rv = ipmi_mc_add_sensor(mc, lun, num, type, code, event_only);
+ }
+ if (rv)
+- out->printf(out, "**Unable to add to sensor, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to add to sensor, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -532,7 +532,7 @@ sensor_set_bit(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ rv = ipmi_mc_sensor_set_bit(mc, lun, num, bit, value, gen_event);
+ if (rv)
+- out->printf(out, "**Unable to set sensor bit, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to set sensor bit, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -563,7 +563,7 @@ sensor_set_bit_clr_rest(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **
+
+ rv = ipmi_mc_sensor_set_bit_clr_rest(mc, lun, num, bit, gen_event);
+ if (rv)
+- out->printf(out, "**Unable to set sensor bit, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to set sensor bit, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -594,7 +594,7 @@ sensor_set_value(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ rv = ipmi_mc_sensor_set_value(mc, lun, num, value, gen_event);
+ if (rv)
+- out->printf(out, "**Unable to set sensor value, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to set sensor value, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -637,7 +637,7 @@ sensor_set_hysteresis(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **to
+ rv = ipmi_mc_sensor_set_hysteresis(mc, lun, num, support, positive,
+ negative);
+ if (rv)
+- out->printf(out, "**Unable to set sensor hysteresis, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to set sensor hysteresis, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -682,7 +682,7 @@ sensor_set_threshold(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **tok
+ rv = ipmi_mc_sensor_set_threshold(mc, lun, num, support,
+ enabled, 1, thresholds);
+ if (rv)
+- out->printf(out, "**Unable to set sensor thresholds, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to set sensor thresholds, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -759,7 +759,7 @@ sensor_set_event_support(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char *
+ assert_support, deassert_support,
+ assert_enabled, deassert_enabled);
+ if (rv)
+- out->printf(out, "**Unable to set sensor thresholds, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to set sensor thresholds, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -819,7 +819,7 @@ mc_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ else if (strcmp("persist_sdr", tok) == 0)
+ flags |= IPMI_MC_PERSIST_SDR;
+ else {
+- out->printf(out, "**Invalid MC flag: %s\n", tok);
++ out->eprintf(out, "**Invalid MC flag: %s\n", tok);
+ return -1;
+ }
+ }
+@@ -833,7 +833,7 @@ mc_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ device_revision, major_fw_rev, minor_fw_rev,
+ device_support, mfg_id, product_id, flags);
+ if (rv)
+- out->printf(out, "**Unable to add the MC, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to add the MC, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -890,7 +890,7 @@ mc_set_power(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ rv = ipmi_mc_set_power(mc, power, gen_int);
+ if (rv)
+- out->printf(out, "**Unable to set power, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to set power, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -916,7 +916,7 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ tok = mystrtok(NULL, " \t\n", toks);
+ if (!tok) {
+- out->printf(out, "**No FRU data type given");
++ out->eprintf(out, "**No FRU data type given");
+ return -1;
+ }
+ if (strcmp(tok, "file") == 0) {
+@@ -929,13 +929,13 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ rv = get_delim_str(toks, &frufn, &errstr);
+ if (rv) {
+- out->printf(out, "**Error with FRU filename: %d", strerror(rv));
++ out->eprintf(out, "**Error with FRU filename: %d", strerror(rv));
+ return rv;
+ }
+ rv = ipmi_mc_add_fru_file(mc, devid, length, file_offset,
+ (void *) frufn);
+ if (rv)
+- out->printf(out, "**Unable to add FRU file, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to add FRU file, error 0x%x\n", rv);
+
+ } else if (strcmp(tok, "data") == 0) {
+ for (i=0; i<length; i++) {
+@@ -943,14 +943,14 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ if (rv == ENOSPC)
+ break;
+ if (rv) {
+- out->printf(out, "**Error 0x%x in data byte %d\n", rv, i);
++ out->eprintf(out, "**Error 0x%x in data byte %d\n", rv, i);
+ return rv;
+ }
+ }
+
+ rv = emu_get_uchar(out, toks, &data[i], "data byte", 1);
+ if (rv != ENOSPC) {
+- out->printf(out, "**Error: input data too long for FRU\n", rv, i);
++ out->eprintf(out, "**Error: input data too long for FRU\n", rv, i);
+ return EINVAL;
+ }
+
+@@ -958,9 +958,9 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ rv = ipmi_mc_add_fru_data(mc, devid, length, NULL, data);
+ if (rv)
+- out->printf(out, "**Unable to add FRU data, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to add FRU data, error 0x%x\n", rv);
+ } else {
+- out->printf(out, "**FRU type not given, need file or data\n");
++ out->eprintf(out, "**FRU type not given, need file or data\n");
+ rv = EINVAL;
+ }
+ return rv;
+@@ -981,28 +981,28 @@ mc_dump_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ rv = ipmi_mc_get_fru_data_len(mc, devid, &length);
+ if (rv) {
+- out->printf(out, "**Unable to dump FRU data, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to dump FRU data, error 0x%x\n", rv);
+ goto out;
+ }
+
+ data = malloc(length);
+ if (!data) {
+- out->printf(out, "**Unable to dump FRU data, out of memory\n", rv);
++ out->eprintf(out, "**Unable to dump FRU data, out of memory\n", rv);
+ goto out;
+ }
+
+ rv = ipmi_mc_get_fru_data(mc, devid, length, data);
+ if (rv) {
+- out->printf(out, "**Unable to dump FRU data, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to dump FRU data, error 0x%x\n", rv);
+ goto out;
+ }
+
+ for (i=0; i<length; i++) {
+ if ((i > 0) && ((i % 8) == 0))
+- out->printf(out, "\n");
+- out->printf(out, " 0x%2.2x", data[i]);
++ out->eprintf(out, "\n");
++ out->eprintf(out, " 0x%2.2x", data[i]);
+ }
+- out->printf(out, "\n");
++ out->eprintf(out, "\n");
+
+ out:
+ if (data)
+@@ -1021,7 +1021,7 @@ mc_setbmc(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ return rv;
+ rv = ipmi_emu_set_bmc_mc(emu, ipmb);
+ if (rv)
+- out->printf(out, "**Invalid IPMB address\n");
++ out->eprintf(out, "**Invalid IPMB address\n");
+ return rv;
+ }
+
+@@ -1032,7 +1032,7 @@ atca_enable(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ rv = ipmi_emu_atca_enable(emu);
+ if (rv)
+- out->printf(out, "**Unable to enable ATCA mode, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to enable ATCA mode, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -1056,7 +1056,7 @@ atca_set_site(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ rv = ipmi_emu_atca_set_site(emu, hw_address, site_type, site_number);
+ if (rv)
+- out->printf(out, "**Unable to set site type, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to set site type, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -1072,7 +1072,7 @@ mc_set_num_leds(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ rv = ipmi_mc_set_num_leds(mc, count);
+ if (rv)
+- out->printf(out, "**Unable to set number of LEDs, error 0x%x\n", rv);
++ out->eprintf(out, "**Unable to set number of LEDs, error 0x%x\n", rv);
+ return rv;
+ }
+
+@@ -1085,7 +1085,7 @@ read_cmds(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ err = get_delim_str(toks, &filename, &errstr);
+ if (err) {
+- out->printf(out, "Could not get include filename: %s\n", errstr);
++ out->eprintf(out, "Could not get include filename: %s\n", errstr);
+ return err;
+ }
+
+@@ -1097,7 +1097,7 @@ read_cmds(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ {
+ char *nf = malloc(strlen(BASE_CONF_STR) + strlen(filename) + 2);
+ if (!nf) {
+- out->printf(out, "Out of memory in include\n", errstr);
++ out->eprintf(out, "Out of memory in include\n", errstr);
+ goto out_err;
+ }
+ strcpy(nf, BASE_CONF_STR);
+@@ -1107,7 +1107,7 @@ read_cmds(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ filename = nf;
+ err = read_command_file(out, emu, filename);
+ if (err) {
+- out->printf(out, "Could not read include file %s\n", filename);
++ out->eprintf(out, "Could not read include file %s\n", filename);
+ }
+ }
+
+@@ -1147,7 +1147,7 @@ debug_cmd(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ } else if (strcmp(tok, "sol") == 0) {
+ level |= DEBUG_SOL;
+ } else {
+- out->printf(out, "Invalid debug level '%s', options are 'raw' and 'msg'\n",
++ out->eprintf(out, "Invalid debug level '%s', options are 'raw' and 'msg'\n",
+ tok);
+ return EINVAL;
+ }
+@@ -1168,7 +1168,7 @@ persist_cmd(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+ } else if (strcmp(tok, "off") == 0) {
+ persist_enable = 0;
+ } else {
+- out->printf(out, "Invalid persist vale '%s', options are 'on' and 'off'\n",
++ out->eprintf(out, "Invalid persist vale '%s', options are 'on' and 'off'\n",
+ tok);
+ return EINVAL;
+ }
+@@ -1194,18 +1194,18 @@ do_define(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
+
+ name = mystrtok(NULL, " \t\n", toks);
+ if (!name) {
+- out->printf(out, "No variable name given for define\n");
++ out->eprintf(out, "No variable name given for define\n");
+ return EINVAL;
+ }
+ err = get_delim_str(toks, &value, &errstr);
+ if (err) {
+- out->printf(out, "Could not get variable %s value: %s\n", name, errstr);
++ out->eprintf(out, "Could not get variable %s value: %s\n", name, errstr);
+ return err;
+ }
+ err = add_variable(name, value);
+ if (err) {
+ free(value);
+- out->printf(out, "Out of memory setting variable %s\n", name);
++ out->eprintf(out, "Out of memory setting variable %s\n", name);
+ return err;
+ }
+ return 0;
+@@ -1301,7 +1301,7 @@ ipmi_emu_cmd(emu_out_t *out, emu_data_t *emu, char *cmd_str)
+ return rv;
+ rv = ipmi_emu_get_mc_by_addr(emu, ipmb, &mc);
+ if (rv) {
+- out->printf(out, "**Invalid MC address\n");
++ out->eprintf(out, "**Invalid MC address\n");
+ return rv;
+ }
+ }
+@@ -1312,7 +1312,7 @@ ipmi_emu_cmd(emu_out_t *out, emu_data_t *emu, char *cmd_str)
+ }
+ }
+
+- out->printf(out, "**Unknown command: %s\n", cmd);
++ out->eprintf(out, "**Unknown command: %s\n", cmd);
+
+ out:
+ return rv;
+diff --git a/lanserv/ipmi_sim.c b/lanserv/ipmi_sim.c
+index 9472cce..30c4f27 100644
+--- a/lanserv/ipmi_sim.c
++++ b/lanserv/ipmi_sim.c
+@@ -607,8 +607,8 @@ isim_log(sys_data_t *sys, int logtype, msg_t *msg, const char *format,
+
+ con = data->consoles;
+ while (con) {
+- con->out.printf(&con->out, "%s", str);
+- con->out.printf(&con->out, "\n");
++ con->out.eprintf(&con->out, "%s", str);
++ con->out.eprintf(&con->out, "\n");
+ con = con->next;
+ }
+ #if HAVE_SYSLOG
+@@ -956,7 +956,7 @@ console_bind_ready(int fd, void *cb_data, os_hnd_fd_id_t *id)
+ newcon->shutdown_on_close = 0;
+ newcon->telnet = 1;
+ newcon->tn_pos = 0;
+- newcon->out.printf = emu_printf;
++ newcon->out.eprintf = emu_printf;
+ newcon->out.data = newcon;
+
+ setsockopt(rv, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val));
+@@ -1463,10 +1463,10 @@ main(int argc, const char *argv[])
+ stdio_console.telnet = 0;
+ stdio_console.tn_pos = 0;
+ if (nostdio) {
+- stdio_console.out.printf = dummy_printf;
++ stdio_console.out.eprintf = dummy_printf;
+ stdio_console.out.data = &stdio_console;
+ } else {
+- stdio_console.out.printf = emu_printf;
++ stdio_console.out.eprintf = emu_printf;
+ stdio_console.out.data = &stdio_console;
+ }
+ stdio_console.next = NULL;
+--
+2.14.1
+
diff --git a/meta-networking/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch b/meta-networking/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch
new file mode 100644
index 0000000..d4e02be
--- /dev/null
+++ b/meta-networking/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch
@@ -0,0 +1,25 @@
+Do not install pyc and pyo for python module
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ swig/python/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/swig/python/Makefile.am b/swig/python/Makefile.am
+index da95a81..97a62bf 100644
+--- a/swig/python/Makefile.am
++++ b/swig/python/Makefile.am
+@@ -33,8 +33,6 @@ CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc
+ install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo
+ $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR)
+ $(INSTALL_DATA) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
+- $(INSTALL_DATA) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
+- $(INSTALL_DATA) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
+ if test "x$(PYTHON_GUI_DIR)" = "xopenipmigui"; then \
+ $(INSTALL) -d $(DESTDIR)$(bindir); \
+ $(INSTALL_SCRIPT) $(srcdir)/openipmigui.py "$(DESTDIR)$(bindir)/openipmigui";\
+--
+1.9.1
+
diff --git a/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch b/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
new file mode 100644
index 0000000..9a568b2
--- /dev/null
+++ b/meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
@@ -0,0 +1,22 @@
+Author: Aws Ismail <aws.ismail@windriver.com>
+Date: Thu Jun 7 16:00:13 2012 -0400
+
+ This patch fixes the error during the install stage when
+ creating a symbolic link for opeipmish in openipmi/cmdlang
+
+ Upstream-Status: Pending
+
+ Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
+
+diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
+index 92d6e83..f6039f9 100644
+--- a/cmdlang/Makefile.am
++++ b/cmdlang/Makefile.am
+@@ -36,6 +36,7 @@ CLEANFILES = libOpenIPMIcmdlang.map
+ # compatability.
+ install-data-local:
+ rm -f $(DESTDIR)$(bindir)/ipmish
++ mkdir -p $(DESTDIR)$(bindir)/
+ $(LN_S) openipmish $(DESTDIR)$(bindir)/ipmish
+
+ uninstall-local:
diff --git a/meta-networking/recipes-support/openipmi/files/include_sys_types.patch b/meta-networking/recipes-support/openipmi/files/include_sys_types.patch
new file mode 100644
index 0000000..58ec5d8
--- /dev/null
+++ b/meta-networking/recipes-support/openipmi/files/include_sys_types.patch
@@ -0,0 +1,17 @@
+include sys/types.h for u_int32_t
+
+ui.c:340:5: error: unknown type name 'u_int32_t'; did you mean 'uint32_t'?
+ u_int32_t addr;
+ ^~~~~~~~~
+Index: OpenIPMI-2.0.22/ui/ui.c
+===================================================================
+--- OpenIPMI-2.0.22.orig/ui/ui.c
++++ OpenIPMI-2.0.22/ui/ui.c
+@@ -42,6 +42,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ #include <ctype.h>
+
+ #include <OpenIPMI/selector.h>
diff --git a/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch b/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
new file mode 100644
index 0000000..51a398b
--- /dev/null
+++ b/meta-networking/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
@@ -0,0 +1,41 @@
+Subject: [PATCH] ipmi-init: fix the arguments
+
+The functions success/failure/warning defined in /etc/init.d/functions
+(provided by initscripts) only accepts numeric argument as return code,
+not a string.
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ ipmi.init | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ipmi.init b/ipmi.init
+index 2ebcd94..d8161c5 100644
+--- a/ipmi.init
++++ b/ipmi.init
+@@ -45,17 +45,17 @@ elif [ -r /etc/init.d/functions ]; then
+ case "$ACTION" in
+ success)
+ echo -n $*
+- success "$*"
++ success 0
+ echo
+ ;;
+ failure)
+ echo -n $*
+- failure "$*"
++ failure 1
+ echo
+ ;;
+ warning)
+ echo -n $*
+- warning "$*"
++ warning 0
+ echo
+ ;;
+ *)
+--
+1.9.1
+
diff --git a/meta-networking/recipes-support/openipmi/files/ipmi.service b/meta-networking/recipes-support/openipmi/files/ipmi.service
new file mode 100644
index 0000000..6fe1378
--- /dev/null
+++ b/meta-networking/recipes-support/openipmi/files/ipmi.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=IPMI Driver
+After=network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=@LIBEXECDIR@/openipmi-helper start
+ExecStop=@LIBEXECDIR@/openipmi-helper stop-all
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-networking/recipes-support/openipmi/files/openipmi-helper b/meta-networking/recipes-support/openipmi/files/openipmi-helper
new file mode 100755
index 0000000..4cebfb9
--- /dev/null
+++ b/meta-networking/recipes-support/openipmi/files/openipmi-helper
@@ -0,0 +1,512 @@
+#!/bin/sh
+#############################################################################
+#
+# ipmi: OpenIPMI Driver helper script
+#
+# Authors: Jan Safranek <jsafrane@redhat.com>
+#
+# Based on IPMI init script by:
+# Matt Domsch <Matt_Domsch@dell.com>
+# Chris Poblete <Chris_Poblete@dell.com>
+#
+# Status return code bits
+# no bits set = no errors
+# bit 0 set = minimum modules aren't loaded
+# bit 1 set = requested feature module isn't loaded
+# bit 2 set = /dev/ipmi0 (or /dev/imb if using that instead) doesn't exist
+# bit 3 set = /dev/watchdog doesn't exist
+# bit 4 set = lockfile doesn't exist
+# bit 5 set = modules are loaded even when asked to be unloaded
+
+CONFIGFILE=/etc/sysconfig/ipmi
+# source config info
+[ -r ${CONFIGFILE} ] && . ${CONFIGFILE}
+
+#############################################################################
+# GLOBALS
+#############################################################################
+MODULE_NAME="ipmi"
+INTF_NUM=0
+
+IPMI_SMB_MODULE_NAME="ipmi_smb"
+IPMI_SI_MODULE_NAME="ipmi_si"
+kernel=`uname -r | cut -d. -f1-2`
+if [ "${kernel}" == "2.4" ]; then
+ IPMI_SMB_MODULE_NAME="ipmi_smb_intf"
+ IPMI_SI_MODULE_NAME="ipmi_si_drv"
+fi
+
+MODULES_INTERFACES=""
+[ "${DEV_IPMI}" = "yes" ] && MODULES_INTERFACES="${MODULES_INTERFACES} ipmi_devintf"
+[ "${IPMI_IMB}" = "yes" ] && MODULES_INTERFACES="${MODULES_INTERFACES} ipmi_imb"
+
+MODULES_FEATURES=""
+[ "${IPMI_WATCHDOG}" = "yes" ] && MODULES_FEATURES="${MODULES_FEATURES} ipmi_watchdog"
+[ "${IPMI_POWEROFF}" = "yes" ] && MODULES_FEATURES="${MODULES_FEATURES} ipmi_poweroff"
+
+MODULES_HW=""
+[ "${IPMI_SI}" = "yes" ] && MODULES_HW="${MODULES_HW} ${IPMI_SI_MODULE_NAME}"
+[ "${IPMI_SMB}" = "yes" ] && MODULES_HW="${MODULES_HW} ${IPMI_SMB_MODULE_NAME}"
+
+MODULES_BASE="ipmi_msghandler"
+MODULES="${MODULES_INTERFACES} ${MODULES_FEATURES} ${MODULES_HW} ${MODULES_BASE}"
+
+RETVAL=0
+LOCKFILE=/var/lock/subsys/ipmi
+DEV_IPMI_TIMEOUT=150
+
+UDEV_EXISTS=0
+if [ -e /sbin/udev -o -e /sbin/udevd ]; then
+ UDEV_EXISTS=1
+fi
+
+#############################################################################
+# NOTES:
+# * /dev/ipmi0 is unconditionally deleted here on ipmi_devintf unload,
+# because SLES9 and RHEL4 kernels don't send a message for udev to delete
+# it for us.
+#
+#############################################################################
+
+modules_loaded_verbose()
+{
+ OnePlusLoaded=0
+ OnePlusUnloaded=0
+ for m in $@; do
+ if /sbin/lsmod | grep $m >/dev/null 2>&1 ; then
+ echo "$m module loaded."
+ OnePlusLoaded=1
+ else
+ echo "$m module not loaded."
+ OnePlusUnloaded=1
+ fi
+ done
+}
+
+modules_loaded()
+{
+ OnePlusLoaded=0
+ OnePlusUnloaded=0
+ for m in $@; do
+ if /sbin/lsmod | grep $m >/dev/null 2>&1 ; then
+ OnePlusLoaded=1
+ else
+ OnePlusUnloaded=1
+ fi
+ done
+}
+
+device_node_exists ()
+{
+ if [ -e "$1" ]; then
+ echo "$1 exists."
+ return 1
+ fi
+ echo "$1 does not exist."
+ return 0
+}
+
+minimum_modules_loaded()
+{
+ rc_base=1
+ rc_hw=1
+ modules_loaded_verbose "${MODULES_BASE}"
+ [ ${OnePlusLoaded} -eq 0 ] && rc_base=0
+
+ modules_loaded_verbose "${MODULES_HW}"
+ [ ${OnePlusLoaded} -eq 0 ] && rc_hw=0
+
+ return $((rc_base && rc_hw))
+}
+
+#############################################################################
+
+load_si()
+{
+ if [ "${IPMI_SI}" = "yes" ]; then
+ modprobe ${IPMI_SI_MODULE_NAME} > /dev/null 2>&1
+ modules_loaded ${IPMI_SI_MODULE_NAME}
+ [ ${OnePlusLoaded} -ne 1 ] && RETVAL=$((RETVAL | 1))
+ fi
+}
+
+load_smb()
+{
+ if [ "${IPMI_SMB}" = "yes" ]; then
+ modprobe ${IPMI_SMB_MODULE_NAME} > /dev/null 2>&1
+ modules_loaded ${IPMI_SMB_MODULE_NAME}
+ [ ${OnePlusLoaded} -ne 1 ] && RETVAL=$((RETVAL | 1))
+ fi
+}
+
+load_hw_modules()
+{
+ load_si
+ load_smb
+}
+
+start_watchdog_common()
+{
+ load_hw_modules
+ modprobe ipmi_watchdog ${IPMI_WATCHDOG_OPTIONS} > /dev/null 2>&1
+ modules_loaded ipmi_watchdog
+ [ ${OnePlusUnloaded} -ne 0 ] &&
+ RETVAL=$((RETVAL | 2)) &&
+ echo "Watchdog startup failed: cannot load ipmi_watchdog module" &&
+ return
+ if [ ${UDEV_EXISTS} -eq 0 -a ! -e /dev/watchdog ]; then
+ mknod -m 0600 /dev/watchdog c 10 130
+ [ $? -ne 0 ] &&
+ RETVAL=$((RETVAL | 8)) &&
+ echo "Watchdog startup failed: cannot create /dev/watchdog" &&
+ return
+ fi
+}
+
+start_watchdog_quiet()
+{
+ [ "${IPMI_WATCHDOG}" != "yes" ] &&
+ return
+ start_watchdog_common
+}
+
+start_watchdog()
+{
+ [ "${IPMI_WATCHDOG}" != "yes" ] &&
+ RETVAL=$((RETVAL | 2)) &&
+ echo "Watchdog not configured" &&
+ return
+ start_watchdog_common
+}
+
+stop_watchdog()
+{
+ modprobe -q -r ipmi_watchdog > /dev/null 2>&1
+ modules_loaded ipmi_watchdog
+ if [ ${OnePlusLoaded} -ne 0 ]; then
+ RETVAL=$((RETVAL | 32))
+ echo "Watchog shutdown failed: cannot unload ipmi_watchdog module"
+ else
+ if [ "${IPMI_WATCHDOG}" = "yes" ]; then
+ [ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog
+ fi
+ fi
+}
+
+stop_watchdog_quiet()
+{
+ modprobe -q -r ipmi_watchdog > /dev/null 2>&1
+ modules_loaded ipmi_watchdog
+ if [ ${OnePlusLoaded} -ne 0 ]; then
+ RETVAL=$((RETVAL | 32))
+ else
+ if [ "${IPMI_WATCHDOG}" = "yes" ]; then
+ [ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog
+ fi
+ fi
+}
+
+start_powercontrol_common()
+{
+ local poweroff_opts=""
+ load_hw_modules
+ if [ "${IPMI_POWERCYCLE}" == "yes" ]; then
+ modinfo ipmi_poweroff 2>/dev/null | grep poweroff_control > /dev/null 2>&1 && \
+ poweroff_opts="poweroff_control=2"
+ modinfo ipmi_poweroff 2>/dev/null | grep poweroff_powercycle > /dev/null 2>&1 && \
+ poweroff_opts="poweroff_powercycle=1"
+ fi
+ modprobe ipmi_poweroff "${poweroff_opts}" > /dev/null 2>&1
+ modules_loaded ipmi_poweroff
+ [ ${OnePlusUnloaded} -ne 0 ] &&
+ RETVAL=$((RETVAL | 2)) &&
+ echo "Powercontroll startup failed: cannot load ipmi_poweroff module" &&
+ return
+}
+
+start_powercontrol_quiet()
+{
+ [ "${IPMI_POWEROFF}" != "yes" ] &&
+ return
+ start_powercontrol_common
+}
+
+start_powercontrol()
+{
+ [ "${IPMI_POWEROFF}" != "yes" ] &&
+ RETVAL=$((RETVAL | 2)) &&
+ echo "Powercontroll not configured" &&
+ return
+ start_powercontrol_common
+}
+
+stop_powercontrol()
+{
+ modprobe -q -r ipmi_poweroff > /dev/null 2>&1
+ modules_loaded ipmi_poweroff
+ if [ ${OnePlusLoaded} -ne 0 ]; then
+ RETVAL=$((RETVAL | 32))
+ echo "Powercontroll shutdown failed: cannot unload ipmi_poweroff module"
+ fi
+}
+
+stop_powercontrol_quiet()
+{
+ modprobe -q -r ipmi_poweroff > /dev/null 2>&1
+ modules_loaded ipmi_poweroff
+ [ ${OnePlusLoaded} -ne 0 ] && RETVAL=$((RETVAL | 32))
+}
+
+#############################################################################
+unload_all_ipmi_modules()
+{
+ stop_watchdog_quiet
+ stop_powercontrol_quiet
+ for m in ${MODULES}; do
+ modprobe -q -r ${m} > /dev/null 2>&1
+ done
+ # delete interface node ONLY if ipmi_devintf is unloaded
+ [ `lsmod | grep -c "ipmi_devintf"` -eq 0 ] &&
+ rm -f "/dev/ipmi${INTF_NUM}"
+}
+
+unload_ipmi_modules_leave_features()
+{
+ for m in ${MODULES_INTERFACES}; do
+ modprobe -q -r ${m} > /dev/null 2>&1
+ done
+ # delete interface node ONLY if ipmi_devintf is unloaded
+ [ `lsmod | grep -c "ipmi_devintf"` -eq 0 ] &&
+ rm -f "/dev/ipmi${INTF_NUM}"
+ lsmod | egrep -q "ipmi_(poweroff|watchdog)" > /dev/null 2>&1
+ if [ "$?" -ne "0" ]; then
+ stop_watchdog_quiet
+ stop_powercontrol_quiet
+ for m in ${MODULES}; do
+ modprobe -q -r ${m} > /dev/null 2>&1
+ done
+ fi
+}
+
+#############################################################################
+load_ipmi_modules ()
+{
+ local locdelay
+ modprobe ipmi_msghandler > /dev/null 2>&1
+ modules_loaded ipmi_msghandler
+ [ ${OnePlusLoaded} -ne 1 ] && unload_all_ipmi_modules && RETVAL=$((RETVAL | 1)) && return
+ load_hw_modules
+ [ $((RETVAL & 1)) -eq 1 ] && unload_all_ipmi_modules && RETVAL=$((RETVAL | 1)) && return
+
+ if [ "${DEV_IPMI}" = "yes" ]; then
+ modprobe ipmi_devintf > /dev/null 2>&1
+ modules_loaded ipmi_devintf
+ RETVAL=$((RETVAL & ~2))
+ [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
+ if [ ${OnePlusLoaded} -eq 1 ]; then
+ if [ ${UDEV_EXISTS} -eq 0 ]; then
+ DEVMAJOR=`cat /proc/devices | awk '/ipmidev/{print $1}'`
+ rm -f /dev/ipmi${INTF_NUM}
+ mknod -m 0600 /dev/ipmi${INTF_NUM} c ${DEVMAJOR} 0 || RETVAL=$((RETVAL | 4))
+ fi
+
+ # udev can take several seconds to create /dev/ipmi0,
+ # but it happens asynchronously, so delay here
+ locdelay=${DEV_IPMI_TIMEOUT}
+ while [ ! -e /dev/ipmi${INTF_NUM} -a ${locdelay} -gt 0 ]; do
+ locdelay=$((locdelay - 1))
+ sleep 0.1
+ done
+ fi
+ fi
+
+ if [ "${IPMI_IMB}" = "yes" ]; then
+ modprobe ipmi_imb > /dev/null 2>&1
+ modules_loaded ipmi_imb
+ RETVAL=$((RETVAL & ~2))
+ [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
+ if [ ${OnePlusLoaded} -eq 1 ]; then
+ DEVMAJOR=`cat /proc/devices | awk '/imb/{print $1}'`
+ rm -f /dev/imb
+ mknod -m 0600 /dev/imb c ${DEVMAJOR} 0 || RETVAL=$((RETVAL | 4))
+ fi
+ fi
+
+ # Per Corey Minyard, essentially no one uses ipmi_radisys
+ # and we don't want to encourage its further use
+ # so it won't be handled here.
+ return
+}
+
+#############################################################################
+start()
+{
+ load_ipmi_modules
+ if [ ${RETVAL} -eq 0 ]; then
+ touch ${LOCKFILE}
+ else
+ if [ $((RETVAL & 1)) -eq 1 ]; then
+ echo "Startup failed."
+ else
+ touch ${LOCKFILE} && echo "Warning!?"
+ fi
+ fi
+ start_watchdog_quiet
+ start_powercontrol_quiet
+}
+
+#############################################################################
+stop()
+{
+ unload_ipmi_modules_leave_features
+ modules_loaded ${MODULES_INTERFACES}
+ if [ ${OnePlusLoaded} -ne 0 ]; then
+ RETVAL=$((RETVAL | 32))
+ echo "Shutdown failed, something may be in use"
+ else
+ rm -f ${LOCKFILE}
+ fi
+}
+
+stop_all()
+{
+ unload_all_ipmi_modules
+ modules_loaded ${MODULES}
+ if [ ${OnePlusLoaded} -ne 0 ]; then
+ RETVAL=$((RETVAL | 32))
+ echo "Shutdown failed, something may be in use"
+ else
+ rm -f ${LOCKFILE}
+ fi
+}
+
+#############################################################################
+restart()
+{
+ stop_all
+ RETVAL=0
+ start
+}
+
+#############################################################################
+
+reload()
+{
+ stop_all
+ RETVAL=0
+ start
+}
+
+#############################################################################
+
+status_all()
+{
+ minimum_modules_loaded
+ [ $? -eq 0 ] && RETVAL=$((RETVAL | 1))
+
+ modules_loaded_verbose ${MODULES_FEATURES} ${MODULES_INTERFACES}
+ [ ${OnePlusUnloaded} -ne 0 ] && RETVAL=$((RETVAL | 2))
+
+ if [ "${DEV_IPMI}" = "yes" ]; then
+ device_node_exists /dev/ipmi${INTF_NUM}
+ [ $? -eq 0 ] && RETVAL=$((RETVAL | 4))
+ fi
+
+ if [ "${IPMI_IMB}" = "yes" ]; then
+ device_node_exists /dev/imb
+ [ $? -eq 0 ] && RETVAL=$((RETVAL | 4))
+ fi
+
+ if [ "${IPMI_WATCHDOG}" = "yes" ]; then
+ device_node_exists /dev/watchdog
+ [ $? -eq 0 ] && RETVAL=$((RETVAL | 8))
+ fi
+
+ [ ! -e ${LOCKFILE} ] && RETVAL=$((RETVAL | 16))
+}
+
+status()
+{
+ minimum_modules_loaded
+ [ $? -eq 0 ] && RETVAL=$((RETVAL | 1))
+
+ if [ "${DEV_IPMI}" = "yes" ]; then
+ modules_loaded_verbose ipmi_devintf
+ [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
+
+ device_node_exists /dev/ipmi${INTF_NUM}
+ [ $? -eq 0 ] && RETVAL=$((RETVAL | 4))
+ fi
+
+ if [ "${IPMI_IMB}" = "yes" ]; then
+ device_node_exists /dev/imb
+ [ $? -eq 0 ] && RETVAL=$((RETVAL | 4))
+ fi
+}
+
+status_watchdog()
+{
+ minimum_modules_loaded
+ [ $? -eq 0 ] && RETVAL=$((RETVAL | 1))
+
+ modules_loaded_verbose ipmi_watchdog
+ [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
+
+ device_node_exists /dev/watchdog
+ [ $? -eq 0 ] && RETVAL=$((RETVAL | 8))
+}
+
+status_powercontrol()
+{
+ minimum_modules_loaded
+ [ $? -eq 0 ] && RETVAL=$((RETVAL | 1))
+
+ modules_loaded_verbose ipmi_powercontrol
+ [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
+}
+
+#############################################################################
+usage ()
+{
+ echo $"Usage: $0 {start|stop|status" 1>&2
+ echo $" restart|condrestart|try-restart|reload|force-reload" 1>&2
+ echo $" start-watchdog|stop-watchdog|status-watchdog" 1>&2
+ echo $" start-powercontrol|stop-powercontrol|status-powercontrol" 1>&2
+ echo $" stop-all|status-all}" 1>&2
+ RETVAL=2
+}
+
+condrestart ()
+{
+ [ -e ${LOCKFILE} ] && restart
+}
+
+#############################################################################
+# MAIN
+#############################################################################
+case "$1" in
+ start) start ;;
+ stop) stop ;;
+ restart) restart ;;
+ force-reload) reload ;;
+ reload) reload ;;
+ status) status ;;
+ status-all) status_all ;;
+ condrestart) condrestart ;;
+ try-restart) condrestart ;;
+ start-watchdog) start_watchdog ;;
+ stop-watchdog) stop_watchdog ;;
+ status-watchdog) status_watchdog ;;
+ start-powercontrol) start_powercontrol ;;
+ stop-powercontrol) stop_powercontrol ;;
+ status-powercontrol) status_powercontrol ;;
+ stop-all) stop_all ;;
+ *) usage ;;
+esac
+
+exit ${RETVAL}
+
+#############################################################################
+# end of file
+#############################################################################
+
diff --git a/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch b/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
new file mode 100644
index 0000000..1fa68f9
--- /dev/null
+++ b/meta-networking/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
@@ -0,0 +1,26 @@
+Author: Aws Ismail <aws.ismail@windriver.com>
+Date: Thu Jun 7 12:28:34 2012 -0400
+
+ This patch was carried over from WRL4.3 (openipmi v2.0.16)
+
+ It was updated for openipmi v2.0.19
+
+ Disable making openipmigui man page since we don't need it
+
+ Upstream-Status: Pending
+
+ Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
+ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 632f55b..5ce79f5 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -1,6 +1,6 @@
+
+ man_MANS = ipmi_ui.1 openipmicmd.1 openipmish.1 ipmi_cmdlang.7 \
+- openipmigui.1 openipmi_conparms.7 solterm.1 rmcp_ping.1 \
++ openipmi_conparms.7 solterm.1 rmcp_ping.1 \
+ openipmi_eventd.1
+
+ EXTRA_DIST = $(man_MANS)
diff --git a/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch b/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
new file mode 100644
index 0000000..83485a9
--- /dev/null
+++ b/meta-networking/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
@@ -0,0 +1,50 @@
+From aa0dc0783a6ff5fb56c914b640836223e3c192bb Mon Sep 17 00:00:00 2001
+From: Jackie Huang <jackie.huang@windriver.com>
+Date: Mon, 29 Dec 2014 18:16:04 +0800
+Subject: [PATCH] remove host path from la_LDFLAGS
+
+Upstream-Status: Inappropriate [ cross compile specific ]
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ cmdlang/Makefile.am | 2 +-
+ glib/Makefile.am | 4 ++--
+ tcl/Makefile.am | 2 +-
+ unix/Makefile.am | 4 ++--
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+Index: OpenIPMI-2.0.24/cmdlang/Makefile.am
+===================================================================
+--- OpenIPMI-2.0.24.orig/cmdlang/Makefile.am
++++ OpenIPMI-2.0.24/cmdlang/Makefile.am
+@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.
+ libOpenIPMIcmdlang_la_LIBADD = -lm \
+ $(top_builddir)/utils/libOpenIPMIutils.la \
+ $(top_builddir)/lib/libOpenIPMI.la
+-libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
+- -L$(libdir)
++libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
+
+ bin_PROGRAMS = openipmish
+
+Index: OpenIPMI-2.0.24/unix/Makefile.am
+===================================================================
+--- OpenIPMI-2.0.24.orig/unix/Makefile.am
++++ OpenIPMI-2.0.24/unix/Makefile.am
+@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la li
+ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
+ libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
+ $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB)
+-libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
+- -L$(libdir)
++libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
+
+ libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
+ libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
+ $(GDBM_LIB) $(RT_LIB)
+-libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
+- -L$(libdir)
++libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
+
+ noinst_HEADERS = heap.h
+
diff --git a/meta-networking/recipes-support/openipmi/openipmi_2.0.24.bb b/meta-networking/recipes-support/openipmi/openipmi_2.0.24.bb
new file mode 100644
index 0000000..a4f63c5
--- /dev/null
+++ b/meta-networking/recipes-support/openipmi/openipmi_2.0.24.bb
@@ -0,0 +1,110 @@
+SUMMARY = "IPMI (Intelligent Platform Management Interface) library and tools"
+DESCRIPTION = "OpenIPMI is an effort to create a full-function IPMI system, \
+to allow full access to all IPMI information on a server \
+and to abstract it to a level that will make it easy to use"
+
+HOMEPAGE = "http://openipmi.sourceforge.net"
+
+DEPENDS = " \
+ glib-2.0 \
+ ncurses \
+ net-snmp \
+ openssl \
+ popt \
+ python \
+ swig-native \
+ "
+
+LICENSE = "GPLv2 & LGPLv2.1 & BSD"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+ file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
+ file://COPYING.BSD;md5=4b318d4160eb69c8ee53452feb1b4cdf \
+ "
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \
+ file://fix-symlink-install-error-in-cmdlang.patch \
+ file://openipmi-no-openipmigui-man.patch \
+ file://openipmi-remove-host-path-from-la_LDFLAGS.patch \
+ file://ipmi-init-fix-the-arguments.patch \
+ file://do-not-install-pyc-and-pyo.patch \
+ file://include_sys_types.patch \
+ file://openipmi-helper \
+ file://ipmi.service \
+ file://0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch \
+ "
+
+S = "${WORKDIR}/OpenIPMI-${PV}"
+SRC_URI[md5sum] = "58f9542cbfcb5fe250b77cf88345e1ec"
+SRC_URI[sha256sum] = "bca39a27071278a8b74610181ede8df51e155e5e9031bc8eaa3699d1720292b4"
+
+inherit autotools-brokensep pkgconfig pythonnative perlnative update-rc.d systemd
+
+EXTRA_OECONF = "--disable-static \
+ --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \
+ --with-python='${STAGING_BINDIR_NATIVE}/python-native/python' \
+ --with-pythoninstall='${PYTHON_SITEPACKAGES_DIR}' \
+ --with-glibver=2.0"
+
+PACKAGECONFIG ??= "gdbm"
+PACKAGECONFIG[gdbm] = "ac_cv_header_gdbm_h=yes,ac_cv_header_gdbm_h=no,gdbm,"
+
+PACKAGES += "${PN}-perl ${PN}-python"
+
+FILES_${PN}-perl = " \
+ ${libdir}/perl/vendor_perl/*/OpenIPMI.pm \
+ ${libdir}/perl/vendor_perl/*/auto/OpenIPMI/OpenIPMI.so \
+ "
+
+FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
+
+FILES_${PN}-dbg += " \
+ ${libdir}/perl/vendor_perl/*/auto/OpenIPMI/.debug \
+ ${PYTHON_SITEPACKAGES_DIR}/.debug \
+ "
+
+do_configure () {
+
+ # Let's perform regular configuration first then handle perl issues.
+ autotools_do_configure
+
+ perl_ver=`perl -V:version | cut -d\' -f 2`
+
+ # Force openipmi perl bindings to be compiled using perl-native instead of
+ # the host's perl. Set the proper install directory for the resulting
+ # openipmi.pm and openipmi.so
+ for i in ${S}/swig/Makefile ${S}/swig/perl/Makefile; do
+ echo "SAL: i = $i"
+ echo "SAL: STAGING_INCDIR_NATIVE = $STAGING_INCDIR_NATIVE"
+ echo "SAL: libdir = $libdir"
+ sed -i -e "/^PERL_CFLAGS/s:-I/usr/local/include:-I${STAGING_INCDIR_NATIVE}:g" $i
+ sed -i -e "/^PERL_INSTALL_DIR/s:^PERL_INSTALL_DIR = .*:PERL_INSTALL_DIR = ${libdir}/perl/vendor_perl/$perl_ver:g" $i
+ done
+}
+
+do_install_append () {
+ echo "SAL: D = $D"
+ echo "SAL: libdir = $libdir"
+ install -m 0755 -d ${D}${sysconfdir}/sysconfig ${D}${sysconfdir}/init.d
+ install -m 0755 ${S}/ipmi.init ${D}${sysconfdir}/init.d/ipmi
+ install -m 0644 ${S}/ipmi.sysconf ${D}${sysconfdir}/sysconfig/ipmi
+ # SAL: mv: cannot stat `/localdisk/loadbuild/slittle1/workspace/cgts_test_build/bitbake_build/tmp/work/x86_64-wrs-linux/openipmi-2.0.19-r4/image/usr/lib64/perl5': No such file or directory
+ # SAL: real path to perl is /localdisk/loadbuild/slittle1/workspace/cgts_test_build/bitbake_build/tmp/work/x86_64-wrs-linux/perl-5.14.2-r8.3/package/usr/lib64/perl5 and it is a symlink to perl so no need to mv.
+ if [ -d ${D}${libdir}/perl5 ]
+ then
+ mv ${D}${libdir}/perl5 ${D}${libdir}/perl
+ fi
+
+ # for systemd
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0664 ${WORKDIR}/ipmi.service ${D}${systemd_unitdir}/system
+ sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/ipmi.service
+ install -d ${D}${libexecdir}
+ install -m 0755 ${WORKDIR}/openipmi-helper ${D}${libexecdir}
+}
+
+INITSCRIPT_NAME = "ipmi"
+INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ."
+
+SYSTEMD_SERVICE_${PN} = "ipmi.service"
+SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/meta-oe/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch b/meta-oe/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch
deleted file mode 100644
index 25057fb..0000000
--- a/meta-oe/recipes-support/openipmi/files/0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch
+++ /dev/null
@@ -1,618 +0,0 @@
-From 8b51a6bf5a4829d8add535a098c0c06a049a9958 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 26 Aug 2017 22:50:57 -0700
-Subject: [PATCH] lanserv: Rename struct parameter printf for namespace
- collision
-
-This comes to fore when we use hardening flags where printf
-is treated as macro and gets replaced with printf_chk
-
-Fixes errors like
-
-error: no member named '__printf_chk' in 'struct emu_out_s'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lanserv/OpenIPMI/serv.h | 2 +-
- lanserv/emu_cmd.c | 132 ++++++++++++++++++++++++------------------------
- lanserv/ipmi_sim.c | 10 ++--
- 3 files changed, 72 insertions(+), 72 deletions(-)
-
-diff --git a/lanserv/OpenIPMI/serv.h b/lanserv/OpenIPMI/serv.h
-index d12d63a..8555c85 100644
---- a/lanserv/OpenIPMI/serv.h
-+++ b/lanserv/OpenIPMI/serv.h
-@@ -522,7 +522,7 @@ uint8_t ipmb_checksum(uint8_t *data, int size, uint8_t start);
- typedef struct emu_data_s emu_data_t;
- typedef struct emu_out_s
- {
-- void (*printf)(struct emu_out_s *out, char *format, ...);
-+ void (*eprintf)(struct emu_out_s *out, char *format, ...);
- void *data;
- } emu_out_t;
-
-diff --git a/lanserv/emu_cmd.c b/lanserv/emu_cmd.c
-index ca44032..54b6f7b 100644
---- a/lanserv/emu_cmd.c
-+++ b/lanserv/emu_cmd.c
-@@ -76,7 +76,7 @@ emu_get_uchar(emu_out_t *out, char **toks, unsigned char *val, char *errstr,
- if (empty_ok)
- return ENOSPC;
- if (errstr)
-- out->printf(out, "**No %s given\n", errstr);
-+ out->eprintf(out, "**No %s given\n", errstr);
- return EINVAL;
- }
- if (str[0] == '\'') {
-@@ -86,7 +86,7 @@ emu_get_uchar(emu_out_t *out, char **toks, unsigned char *val, char *errstr,
- *val = strtoul(str, &tmpstr, 0);
- if (*tmpstr != '\0') {
- if (errstr)
-- out->printf(out, "**Invalid %s given\n", errstr);
-+ out->eprintf(out, "**Invalid %s given\n", errstr);
- return EINVAL;
- }
-
-@@ -108,7 +108,7 @@ emu_get_uchar_with_vals(emu_out_t *out, char **toks,
- if (empty_ok)
- return ENOSPC;
- if (errstr)
-- out->printf(out, "**No %s given\n", errstr);
-+ out->eprintf(out, "**No %s given\n", errstr);
- return EINVAL;
- }
- if (str[0] == '\'') {
-@@ -131,7 +131,7 @@ emu_get_uchar_with_vals(emu_out_t *out, char **toks,
- *val = strtoul(str, &tmpstr, 0);
- if (*tmpstr != '\0') {
- if (errstr)
-- out->printf(out, "**Invalid %s given\n", errstr);
-+ out->eprintf(out, "**Invalid %s given\n", errstr);
- return EINVAL;
- }
- out:
-@@ -150,12 +150,12 @@ emu_get_bitmask(emu_out_t *out, char **toks, uint16_t *val, char *errstr,
- if (empty_ok)
- return ENOSPC;
- if (errstr)
-- out->printf(out, "**No %s given\n", errstr);
-+ out->eprintf(out, "**No %s given\n", errstr);
- return EINVAL;
- }
- if (strlen(str) != size) {
- if (errstr)
-- out->printf(out, "**invalid number of bits in %s\n", errstr);
-+ out->eprintf(out, "**invalid number of bits in %s\n", errstr);
- return EINVAL;
- }
- *val = 0;
-@@ -166,7 +166,7 @@ emu_get_bitmask(emu_out_t *out, char **toks, uint16_t *val, char *errstr,
- *val |= 1 << i;
- } else {
- if (errstr)
-- out->printf(out, "**Invalid bit value '%c' in %s\n", str[j],
-+ out->eprintf(out, "**Invalid bit value '%c' in %s\n", str[j],
- errstr);
- return EINVAL;
- }
-@@ -184,13 +184,13 @@ emu_get_uint(emu_out_t *out, char **toks, unsigned int *val, char *errstr)
- str = mystrtok(NULL, " \t\n", toks);
- if (!str) {
- if (errstr)
-- out->printf(out, "**No %s given\n", errstr);
-+ out->eprintf(out, "**No %s given\n", errstr);
- return EINVAL;
- }
- *val = strtoul(str, &tmpstr, 0);
- if (*tmpstr != '\0') {
- if (errstr)
-- out->printf(out, "**Invalid %s given\n", errstr);
-+ out->eprintf(out, "**Invalid %s given\n", errstr);
- return EINVAL;
- }
-
-@@ -206,7 +206,7 @@ emu_get_bytes(emu_out_t *out, char **tokptr, unsigned char *data, char *errstr,
-
- if (!tok) {
- if (errstr)
-- out->printf(out, "**No %s given\n", errstr);
-+ out->eprintf(out, "**No %s given\n", errstr);
- return EINVAL;
- }
- if (*tok == '"') {
-@@ -215,7 +215,7 @@ emu_get_bytes(emu_out_t *out, char **tokptr, unsigned char *data, char *errstr,
- tok++;
- end = strlen(tok) - 1;
- if (tok[end] != '"') {
-- out->printf(out, "**ASCII %s doesn't end in '\"'", errstr);
-+ out->eprintf(out, "**ASCII %s doesn't end in '\"'", errstr);
- return EINVAL;
- }
- if (end > (len - 1))
-@@ -228,7 +228,7 @@ emu_get_bytes(emu_out_t *out, char **tokptr, unsigned char *data, char *errstr,
- char c[3];
- /* HEX pw */
- if (strlen(tok) != 32) {
-- out->printf(out, "**HEX %s not 32 HEX characters long", errstr);
-+ out->eprintf(out, "**HEX %s not 32 HEX characters long", errstr);
- return EINVAL;
- }
- c[2] = '\0';
-@@ -239,7 +239,7 @@ emu_get_bytes(emu_out_t *out, char **tokptr, unsigned char *data, char *errstr,
- tok++;
- data[i] = strtoul(c, &end, 16);
- if (*end != '\0') {
-- out->printf(out, "**Invalid HEX character in %s", errstr);
-+ out->eprintf(out, "**Invalid HEX character in %s", errstr);
- return -1;
- }
- }
-@@ -263,12 +263,12 @@ read_command_file(emu_out_t *out, emu_data_t *emu, const char *command_file)
-
- buffer = malloc(INPUT_BUFFER_SIZE);
- if (!buffer) {
-- out->printf(out, "Could not allocate buffer memory\n");
-+ out->eprintf(out, "Could not allocate buffer memory\n");
- rv = ENOMEM;
- goto out;
- }
- while (fgets(buffer+pos, INPUT_BUFFER_SIZE-pos, f)) {
-- out->printf(out, "%s", buffer+pos);
-+ out->eprintf(out, "%s", buffer+pos);
- if (buffer[pos] == '#')
- continue;
- pos = strlen(buffer);
-@@ -318,7 +318,7 @@ sel_enable(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- rv = ipmi_mc_enable_sel(mc, max_records, flags);
- if (rv)
-- out->printf(out, "**Unable to enable sel, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to enable sel, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -343,9 +343,9 @@ sel_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- rv = ipmi_mc_add_to_sel(mc, record_type, data, &r);
- if (rv)
-- out->printf(out, "**Unable to add to sel, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to add to sel, error 0x%x\n", rv);
- else
-- out->printf(out, "Added record %d\n", r);
-+ out->eprintf(out, "Added record %d\n", r);
- return rv;
- }
-
-@@ -361,14 +361,14 @@ main_sdr_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- if (rv == ENOSPC)
- break;
- if (rv) {
-- out->printf(out, "**Error 0x%x in data byte %d\n", rv, i);
-+ out->eprintf(out, "**Error 0x%x in data byte %d\n", rv, i);
- return rv;
- }
- }
-
- rv = ipmi_mc_add_main_sdr(mc, data, i);
- if (rv)
-- out->printf(out, "**Unable to add to sdr, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to add to sdr, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -389,14 +389,14 @@ device_sdr_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- if (rv == ENOSPC)
- break;
- if (rv) {
-- out->printf(out, "**Error 0x%x in data byte %d\n", rv, i);
-+ out->eprintf(out, "**Error 0x%x in data byte %d\n", rv, i);
- return rv;
- }
- }
-
- rv = ipmi_mc_add_device_sdr(mc, lun, data, i);
- if (rv)
-- out->printf(out, "**Unable to add to sdr, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to add to sdr, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -439,7 +439,7 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- while (tok) {
- if (strcmp(tok, "poll") == 0) {
- if (handler) {
-- out->printf(out, "**poll given twice in sensor\n", tok);
-+ out->eprintf(out, "**poll given twice in sensor\n", tok);
- return -1;
- }
-
-@@ -449,27 +449,27 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- tok = mystrtok(NULL, " \t\n", toks);
- if (!tok) {
-- out->printf(out, "**No polled sensor handler given\n", tok);
-+ out->eprintf(out, "**No polled sensor handler given\n", tok);
- return -1;
- }
-
- handler = ipmi_sensor_find_handler(tok);
- if (!handler) {
-- out->printf(out, "**Invalid sensor handler: %s\n", tok);
-+ out->eprintf(out, "**Invalid sensor handler: %s\n", tok);
- return -1;
- }
-
- rv = handler->init(mc, lun, num, toks, handler->cb_data, &rcb_data,
- &errstr);
- if (rv) {
-- out->printf(out, "**Error initializing sensor handler: %s\n",
-+ out->eprintf(out, "**Error initializing sensor handler: %s\n",
- errstr);
- return rv;
- }
- } else if (strcmp(tok, "event-only") == 0) {
- event_only = 1;
- } else {
-- out->printf(out, "**Unknown sensor option: %s\n", tok);
-+ out->eprintf(out, "**Unknown sensor option: %s\n", tok);
- return -1;
- }
-
-@@ -477,7 +477,7 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- }
-
- if (handler && event_only) {
-- out->printf(out, "**An event-only sensor cannot be polled\n");
-+ out->eprintf(out, "**An event-only sensor cannot be polled\n");
- return -1;
- }
-
-@@ -488,7 +488,7 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- if (!rv && handler->postinit) {
- rv = handler->postinit(rcb_data, &errstr);
- if (rv) {
-- out->printf(out, "**Error in sensor handler postinit: %s\n",
-+ out->eprintf(out, "**Error in sensor handler postinit: %s\n",
- errstr);
- }
- }
-@@ -496,7 +496,7 @@ sensor_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- rv = ipmi_mc_add_sensor(mc, lun, num, type, code, event_only);
- }
- if (rv)
-- out->printf(out, "**Unable to add to sensor, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to add to sensor, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -532,7 +532,7 @@ sensor_set_bit(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- rv = ipmi_mc_sensor_set_bit(mc, lun, num, bit, value, gen_event);
- if (rv)
-- out->printf(out, "**Unable to set sensor bit, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to set sensor bit, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -563,7 +563,7 @@ sensor_set_bit_clr_rest(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **
-
- rv = ipmi_mc_sensor_set_bit_clr_rest(mc, lun, num, bit, gen_event);
- if (rv)
-- out->printf(out, "**Unable to set sensor bit, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to set sensor bit, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -594,7 +594,7 @@ sensor_set_value(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- rv = ipmi_mc_sensor_set_value(mc, lun, num, value, gen_event);
- if (rv)
-- out->printf(out, "**Unable to set sensor value, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to set sensor value, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -637,7 +637,7 @@ sensor_set_hysteresis(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **to
- rv = ipmi_mc_sensor_set_hysteresis(mc, lun, num, support, positive,
- negative);
- if (rv)
-- out->printf(out, "**Unable to set sensor hysteresis, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to set sensor hysteresis, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -682,7 +682,7 @@ sensor_set_threshold(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **tok
- rv = ipmi_mc_sensor_set_threshold(mc, lun, num, support,
- enabled, 1, thresholds);
- if (rv)
-- out->printf(out, "**Unable to set sensor thresholds, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to set sensor thresholds, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -759,7 +759,7 @@ sensor_set_event_support(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char *
- assert_support, deassert_support,
- assert_enabled, deassert_enabled);
- if (rv)
-- out->printf(out, "**Unable to set sensor thresholds, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to set sensor thresholds, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -819,7 +819,7 @@ mc_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- else if (strcmp("persist_sdr", tok) == 0)
- flags |= IPMI_MC_PERSIST_SDR;
- else {
-- out->printf(out, "**Invalid MC flag: %s\n", tok);
-+ out->eprintf(out, "**Invalid MC flag: %s\n", tok);
- return -1;
- }
- }
-@@ -833,7 +833,7 @@ mc_add(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- device_revision, major_fw_rev, minor_fw_rev,
- device_support, mfg_id, product_id, flags);
- if (rv)
-- out->printf(out, "**Unable to add the MC, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to add the MC, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -890,7 +890,7 @@ mc_set_power(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- rv = ipmi_mc_set_power(mc, power, gen_int);
- if (rv)
-- out->printf(out, "**Unable to set power, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to set power, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -916,7 +916,7 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- tok = mystrtok(NULL, " \t\n", toks);
- if (!tok) {
-- out->printf(out, "**No FRU data type given");
-+ out->eprintf(out, "**No FRU data type given");
- return -1;
- }
- if (strcmp(tok, "file") == 0) {
-@@ -929,13 +929,13 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- rv = get_delim_str(toks, &frufn, &errstr);
- if (rv) {
-- out->printf(out, "**Error with FRU filename: %d", strerror(rv));
-+ out->eprintf(out, "**Error with FRU filename: %d", strerror(rv));
- return rv;
- }
- rv = ipmi_mc_add_fru_file(mc, devid, length, file_offset,
- (void *) frufn);
- if (rv)
-- out->printf(out, "**Unable to add FRU file, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to add FRU file, error 0x%x\n", rv);
-
- } else if (strcmp(tok, "data") == 0) {
- for (i=0; i<length; i++) {
-@@ -943,14 +943,14 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- if (rv == ENOSPC)
- break;
- if (rv) {
-- out->printf(out, "**Error 0x%x in data byte %d\n", rv, i);
-+ out->eprintf(out, "**Error 0x%x in data byte %d\n", rv, i);
- return rv;
- }
- }
-
- rv = emu_get_uchar(out, toks, &data[i], "data byte", 1);
- if (rv != ENOSPC) {
-- out->printf(out, "**Error: input data too long for FRU\n", rv, i);
-+ out->eprintf(out, "**Error: input data too long for FRU\n", rv, i);
- return EINVAL;
- }
-
-@@ -958,9 +958,9 @@ mc_add_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- rv = ipmi_mc_add_fru_data(mc, devid, length, NULL, data);
- if (rv)
-- out->printf(out, "**Unable to add FRU data, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to add FRU data, error 0x%x\n", rv);
- } else {
-- out->printf(out, "**FRU type not given, need file or data\n");
-+ out->eprintf(out, "**FRU type not given, need file or data\n");
- rv = EINVAL;
- }
- return rv;
-@@ -981,28 +981,28 @@ mc_dump_fru_data(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- rv = ipmi_mc_get_fru_data_len(mc, devid, &length);
- if (rv) {
-- out->printf(out, "**Unable to dump FRU data, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to dump FRU data, error 0x%x\n", rv);
- goto out;
- }
-
- data = malloc(length);
- if (!data) {
-- out->printf(out, "**Unable to dump FRU data, out of memory\n", rv);
-+ out->eprintf(out, "**Unable to dump FRU data, out of memory\n", rv);
- goto out;
- }
-
- rv = ipmi_mc_get_fru_data(mc, devid, length, data);
- if (rv) {
-- out->printf(out, "**Unable to dump FRU data, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to dump FRU data, error 0x%x\n", rv);
- goto out;
- }
-
- for (i=0; i<length; i++) {
- if ((i > 0) && ((i % 8) == 0))
-- out->printf(out, "\n");
-- out->printf(out, " 0x%2.2x", data[i]);
-+ out->eprintf(out, "\n");
-+ out->eprintf(out, " 0x%2.2x", data[i]);
- }
-- out->printf(out, "\n");
-+ out->eprintf(out, "\n");
-
- out:
- if (data)
-@@ -1021,7 +1021,7 @@ mc_setbmc(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- return rv;
- rv = ipmi_emu_set_bmc_mc(emu, ipmb);
- if (rv)
-- out->printf(out, "**Invalid IPMB address\n");
-+ out->eprintf(out, "**Invalid IPMB address\n");
- return rv;
- }
-
-@@ -1032,7 +1032,7 @@ atca_enable(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- rv = ipmi_emu_atca_enable(emu);
- if (rv)
-- out->printf(out, "**Unable to enable ATCA mode, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to enable ATCA mode, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -1056,7 +1056,7 @@ atca_set_site(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- rv = ipmi_emu_atca_set_site(emu, hw_address, site_type, site_number);
- if (rv)
-- out->printf(out, "**Unable to set site type, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to set site type, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -1072,7 +1072,7 @@ mc_set_num_leds(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- rv = ipmi_mc_set_num_leds(mc, count);
- if (rv)
-- out->printf(out, "**Unable to set number of LEDs, error 0x%x\n", rv);
-+ out->eprintf(out, "**Unable to set number of LEDs, error 0x%x\n", rv);
- return rv;
- }
-
-@@ -1085,7 +1085,7 @@ read_cmds(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- err = get_delim_str(toks, &filename, &errstr);
- if (err) {
-- out->printf(out, "Could not get include filename: %s\n", errstr);
-+ out->eprintf(out, "Could not get include filename: %s\n", errstr);
- return err;
- }
-
-@@ -1097,7 +1097,7 @@ read_cmds(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- {
- char *nf = malloc(strlen(BASE_CONF_STR) + strlen(filename) + 2);
- if (!nf) {
-- out->printf(out, "Out of memory in include\n", errstr);
-+ out->eprintf(out, "Out of memory in include\n", errstr);
- goto out_err;
- }
- strcpy(nf, BASE_CONF_STR);
-@@ -1107,7 +1107,7 @@ read_cmds(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- filename = nf;
- err = read_command_file(out, emu, filename);
- if (err) {
-- out->printf(out, "Could not read include file %s\n", filename);
-+ out->eprintf(out, "Could not read include file %s\n", filename);
- }
- }
-
-@@ -1147,7 +1147,7 @@ debug_cmd(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- } else if (strcmp(tok, "sol") == 0) {
- level |= DEBUG_SOL;
- } else {
-- out->printf(out, "Invalid debug level '%s', options are 'raw' and 'msg'\n",
-+ out->eprintf(out, "Invalid debug level '%s', options are 'raw' and 'msg'\n",
- tok);
- return EINVAL;
- }
-@@ -1168,7 +1168,7 @@ persist_cmd(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
- } else if (strcmp(tok, "off") == 0) {
- persist_enable = 0;
- } else {
-- out->printf(out, "Invalid persist vale '%s', options are 'on' and 'off'\n",
-+ out->eprintf(out, "Invalid persist vale '%s', options are 'on' and 'off'\n",
- tok);
- return EINVAL;
- }
-@@ -1194,18 +1194,18 @@ do_define(emu_out_t *out, emu_data_t *emu, lmc_data_t *mc, char **toks)
-
- name = mystrtok(NULL, " \t\n", toks);
- if (!name) {
-- out->printf(out, "No variable name given for define\n");
-+ out->eprintf(out, "No variable name given for define\n");
- return EINVAL;
- }
- err = get_delim_str(toks, &value, &errstr);
- if (err) {
-- out->printf(out, "Could not get variable %s value: %s\n", name, errstr);
-+ out->eprintf(out, "Could not get variable %s value: %s\n", name, errstr);
- return err;
- }
- err = add_variable(name, value);
- if (err) {
- free(value);
-- out->printf(out, "Out of memory setting variable %s\n", name);
-+ out->eprintf(out, "Out of memory setting variable %s\n", name);
- return err;
- }
- return 0;
-@@ -1301,7 +1301,7 @@ ipmi_emu_cmd(emu_out_t *out, emu_data_t *emu, char *cmd_str)
- return rv;
- rv = ipmi_emu_get_mc_by_addr(emu, ipmb, &mc);
- if (rv) {
-- out->printf(out, "**Invalid MC address\n");
-+ out->eprintf(out, "**Invalid MC address\n");
- return rv;
- }
- }
-@@ -1312,7 +1312,7 @@ ipmi_emu_cmd(emu_out_t *out, emu_data_t *emu, char *cmd_str)
- }
- }
-
-- out->printf(out, "**Unknown command: %s\n", cmd);
-+ out->eprintf(out, "**Unknown command: %s\n", cmd);
-
- out:
- return rv;
-diff --git a/lanserv/ipmi_sim.c b/lanserv/ipmi_sim.c
-index 9472cce..30c4f27 100644
---- a/lanserv/ipmi_sim.c
-+++ b/lanserv/ipmi_sim.c
-@@ -607,8 +607,8 @@ isim_log(sys_data_t *sys, int logtype, msg_t *msg, const char *format,
-
- con = data->consoles;
- while (con) {
-- con->out.printf(&con->out, "%s", str);
-- con->out.printf(&con->out, "\n");
-+ con->out.eprintf(&con->out, "%s", str);
-+ con->out.eprintf(&con->out, "\n");
- con = con->next;
- }
- #if HAVE_SYSLOG
-@@ -956,7 +956,7 @@ console_bind_ready(int fd, void *cb_data, os_hnd_fd_id_t *id)
- newcon->shutdown_on_close = 0;
- newcon->telnet = 1;
- newcon->tn_pos = 0;
-- newcon->out.printf = emu_printf;
-+ newcon->out.eprintf = emu_printf;
- newcon->out.data = newcon;
-
- setsockopt(rv, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val));
-@@ -1463,10 +1463,10 @@ main(int argc, const char *argv[])
- stdio_console.telnet = 0;
- stdio_console.tn_pos = 0;
- if (nostdio) {
-- stdio_console.out.printf = dummy_printf;
-+ stdio_console.out.eprintf = dummy_printf;
- stdio_console.out.data = &stdio_console;
- } else {
-- stdio_console.out.printf = emu_printf;
-+ stdio_console.out.eprintf = emu_printf;
- stdio_console.out.data = &stdio_console;
- }
- stdio_console.next = NULL;
---
-2.14.1
-
diff --git a/meta-oe/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch b/meta-oe/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch
deleted file mode 100644
index d4e02be..0000000
--- a/meta-oe/recipes-support/openipmi/files/do-not-install-pyc-and-pyo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Do not install pyc and pyo for python module
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- swig/python/Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/swig/python/Makefile.am b/swig/python/Makefile.am
-index da95a81..97a62bf 100644
---- a/swig/python/Makefile.am
-+++ b/swig/python/Makefile.am
-@@ -33,8 +33,6 @@ CLEANFILES = OpenIPMI_wrap.c OpenIPMI.py OpenIPMI.pyo OpenIPMI.pyc
- install-exec-local: _OpenIPMI.la OpenIPMI.py OpenIPMI.pyc OpenIPMI.pyo
- $(INSTALL) -d $(DESTDIR)$(PYTHON_INSTALL_DIR)
- $(INSTALL_DATA) OpenIPMI.py "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
-- $(INSTALL_DATA) OpenIPMI.pyc "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
-- $(INSTALL_DATA) OpenIPMI.pyo "$(DESTDIR)$(PYTHON_INSTALL_DIR)"
- if test "x$(PYTHON_GUI_DIR)" = "xopenipmigui"; then \
- $(INSTALL) -d $(DESTDIR)$(bindir); \
- $(INSTALL_SCRIPT) $(srcdir)/openipmigui.py "$(DESTDIR)$(bindir)/openipmigui";\
---
-1.9.1
-
diff --git a/meta-oe/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch b/meta-oe/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
deleted file mode 100644
index 9a568b2..0000000
--- a/meta-oe/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Aws Ismail <aws.ismail@windriver.com>
-Date: Thu Jun 7 16:00:13 2012 -0400
-
- This patch fixes the error during the install stage when
- creating a symbolic link for opeipmish in openipmi/cmdlang
-
- Upstream-Status: Pending
-
- Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
-
-diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
-index 92d6e83..f6039f9 100644
---- a/cmdlang/Makefile.am
-+++ b/cmdlang/Makefile.am
-@@ -36,6 +36,7 @@ CLEANFILES = libOpenIPMIcmdlang.map
- # compatability.
- install-data-local:
- rm -f $(DESTDIR)$(bindir)/ipmish
-+ mkdir -p $(DESTDIR)$(bindir)/
- $(LN_S) openipmish $(DESTDIR)$(bindir)/ipmish
-
- uninstall-local:
diff --git a/meta-oe/recipes-support/openipmi/files/include_sys_types.patch b/meta-oe/recipes-support/openipmi/files/include_sys_types.patch
deleted file mode 100644
index 58ec5d8..0000000
--- a/meta-oe/recipes-support/openipmi/files/include_sys_types.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-include sys/types.h for u_int32_t
-
-ui.c:340:5: error: unknown type name 'u_int32_t'; did you mean 'uint32_t'?
- u_int32_t addr;
- ^~~~~~~~~
-Index: OpenIPMI-2.0.22/ui/ui.c
-===================================================================
---- OpenIPMI-2.0.22.orig/ui/ui.c
-+++ OpenIPMI-2.0.22/ui/ui.c
-@@ -42,6 +42,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <sys/time.h>
-+#include <sys/types.h>
- #include <ctype.h>
-
- #include <OpenIPMI/selector.h>
diff --git a/meta-oe/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch b/meta-oe/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
deleted file mode 100644
index 51a398b..0000000
--- a/meta-oe/recipes-support/openipmi/files/ipmi-init-fix-the-arguments.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Subject: [PATCH] ipmi-init: fix the arguments
-
-The functions success/failure/warning defined in /etc/init.d/functions
-(provided by initscripts) only accepts numeric argument as return code,
-not a string.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- ipmi.init | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ipmi.init b/ipmi.init
-index 2ebcd94..d8161c5 100644
---- a/ipmi.init
-+++ b/ipmi.init
-@@ -45,17 +45,17 @@ elif [ -r /etc/init.d/functions ]; then
- case "$ACTION" in
- success)
- echo -n $*
-- success "$*"
-+ success 0
- echo
- ;;
- failure)
- echo -n $*
-- failure "$*"
-+ failure 1
- echo
- ;;
- warning)
- echo -n $*
-- warning "$*"
-+ warning 0
- echo
- ;;
- *)
---
-1.9.1
-
diff --git a/meta-oe/recipes-support/openipmi/files/ipmi.service b/meta-oe/recipes-support/openipmi/files/ipmi.service
deleted file mode 100644
index 6fe1378..0000000
--- a/meta-oe/recipes-support/openipmi/files/ipmi.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=IPMI Driver
-After=network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@LIBEXECDIR@/openipmi-helper start
-ExecStop=@LIBEXECDIR@/openipmi-helper stop-all
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-oe/recipes-support/openipmi/files/openipmi-helper b/meta-oe/recipes-support/openipmi/files/openipmi-helper
deleted file mode 100755
index 4cebfb9..0000000
--- a/meta-oe/recipes-support/openipmi/files/openipmi-helper
+++ /dev/null
@@ -1,512 +0,0 @@
-#!/bin/sh
-#############################################################################
-#
-# ipmi: OpenIPMI Driver helper script
-#
-# Authors: Jan Safranek <jsafrane@redhat.com>
-#
-# Based on IPMI init script by:
-# Matt Domsch <Matt_Domsch@dell.com>
-# Chris Poblete <Chris_Poblete@dell.com>
-#
-# Status return code bits
-# no bits set = no errors
-# bit 0 set = minimum modules aren't loaded
-# bit 1 set = requested feature module isn't loaded
-# bit 2 set = /dev/ipmi0 (or /dev/imb if using that instead) doesn't exist
-# bit 3 set = /dev/watchdog doesn't exist
-# bit 4 set = lockfile doesn't exist
-# bit 5 set = modules are loaded even when asked to be unloaded
-
-CONFIGFILE=/etc/sysconfig/ipmi
-# source config info
-[ -r ${CONFIGFILE} ] && . ${CONFIGFILE}
-
-#############################################################################
-# GLOBALS
-#############################################################################
-MODULE_NAME="ipmi"
-INTF_NUM=0
-
-IPMI_SMB_MODULE_NAME="ipmi_smb"
-IPMI_SI_MODULE_NAME="ipmi_si"
-kernel=`uname -r | cut -d. -f1-2`
-if [ "${kernel}" == "2.4" ]; then
- IPMI_SMB_MODULE_NAME="ipmi_smb_intf"
- IPMI_SI_MODULE_NAME="ipmi_si_drv"
-fi
-
-MODULES_INTERFACES=""
-[ "${DEV_IPMI}" = "yes" ] && MODULES_INTERFACES="${MODULES_INTERFACES} ipmi_devintf"
-[ "${IPMI_IMB}" = "yes" ] && MODULES_INTERFACES="${MODULES_INTERFACES} ipmi_imb"
-
-MODULES_FEATURES=""
-[ "${IPMI_WATCHDOG}" = "yes" ] && MODULES_FEATURES="${MODULES_FEATURES} ipmi_watchdog"
-[ "${IPMI_POWEROFF}" = "yes" ] && MODULES_FEATURES="${MODULES_FEATURES} ipmi_poweroff"
-
-MODULES_HW=""
-[ "${IPMI_SI}" = "yes" ] && MODULES_HW="${MODULES_HW} ${IPMI_SI_MODULE_NAME}"
-[ "${IPMI_SMB}" = "yes" ] && MODULES_HW="${MODULES_HW} ${IPMI_SMB_MODULE_NAME}"
-
-MODULES_BASE="ipmi_msghandler"
-MODULES="${MODULES_INTERFACES} ${MODULES_FEATURES} ${MODULES_HW} ${MODULES_BASE}"
-
-RETVAL=0
-LOCKFILE=/var/lock/subsys/ipmi
-DEV_IPMI_TIMEOUT=150
-
-UDEV_EXISTS=0
-if [ -e /sbin/udev -o -e /sbin/udevd ]; then
- UDEV_EXISTS=1
-fi
-
-#############################################################################
-# NOTES:
-# * /dev/ipmi0 is unconditionally deleted here on ipmi_devintf unload,
-# because SLES9 and RHEL4 kernels don't send a message for udev to delete
-# it for us.
-#
-#############################################################################
-
-modules_loaded_verbose()
-{
- OnePlusLoaded=0
- OnePlusUnloaded=0
- for m in $@; do
- if /sbin/lsmod | grep $m >/dev/null 2>&1 ; then
- echo "$m module loaded."
- OnePlusLoaded=1
- else
- echo "$m module not loaded."
- OnePlusUnloaded=1
- fi
- done
-}
-
-modules_loaded()
-{
- OnePlusLoaded=0
- OnePlusUnloaded=0
- for m in $@; do
- if /sbin/lsmod | grep $m >/dev/null 2>&1 ; then
- OnePlusLoaded=1
- else
- OnePlusUnloaded=1
- fi
- done
-}
-
-device_node_exists ()
-{
- if [ -e "$1" ]; then
- echo "$1 exists."
- return 1
- fi
- echo "$1 does not exist."
- return 0
-}
-
-minimum_modules_loaded()
-{
- rc_base=1
- rc_hw=1
- modules_loaded_verbose "${MODULES_BASE}"
- [ ${OnePlusLoaded} -eq 0 ] && rc_base=0
-
- modules_loaded_verbose "${MODULES_HW}"
- [ ${OnePlusLoaded} -eq 0 ] && rc_hw=0
-
- return $((rc_base && rc_hw))
-}
-
-#############################################################################
-
-load_si()
-{
- if [ "${IPMI_SI}" = "yes" ]; then
- modprobe ${IPMI_SI_MODULE_NAME} > /dev/null 2>&1
- modules_loaded ${IPMI_SI_MODULE_NAME}
- [ ${OnePlusLoaded} -ne 1 ] && RETVAL=$((RETVAL | 1))
- fi
-}
-
-load_smb()
-{
- if [ "${IPMI_SMB}" = "yes" ]; then
- modprobe ${IPMI_SMB_MODULE_NAME} > /dev/null 2>&1
- modules_loaded ${IPMI_SMB_MODULE_NAME}
- [ ${OnePlusLoaded} -ne 1 ] && RETVAL=$((RETVAL | 1))
- fi
-}
-
-load_hw_modules()
-{
- load_si
- load_smb
-}
-
-start_watchdog_common()
-{
- load_hw_modules
- modprobe ipmi_watchdog ${IPMI_WATCHDOG_OPTIONS} > /dev/null 2>&1
- modules_loaded ipmi_watchdog
- [ ${OnePlusUnloaded} -ne 0 ] &&
- RETVAL=$((RETVAL | 2)) &&
- echo "Watchdog startup failed: cannot load ipmi_watchdog module" &&
- return
- if [ ${UDEV_EXISTS} -eq 0 -a ! -e /dev/watchdog ]; then
- mknod -m 0600 /dev/watchdog c 10 130
- [ $? -ne 0 ] &&
- RETVAL=$((RETVAL | 8)) &&
- echo "Watchdog startup failed: cannot create /dev/watchdog" &&
- return
- fi
-}
-
-start_watchdog_quiet()
-{
- [ "${IPMI_WATCHDOG}" != "yes" ] &&
- return
- start_watchdog_common
-}
-
-start_watchdog()
-{
- [ "${IPMI_WATCHDOG}" != "yes" ] &&
- RETVAL=$((RETVAL | 2)) &&
- echo "Watchdog not configured" &&
- return
- start_watchdog_common
-}
-
-stop_watchdog()
-{
- modprobe -q -r ipmi_watchdog > /dev/null 2>&1
- modules_loaded ipmi_watchdog
- if [ ${OnePlusLoaded} -ne 0 ]; then
- RETVAL=$((RETVAL | 32))
- echo "Watchog shutdown failed: cannot unload ipmi_watchdog module"
- else
- if [ "${IPMI_WATCHDOG}" = "yes" ]; then
- [ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog
- fi
- fi
-}
-
-stop_watchdog_quiet()
-{
- modprobe -q -r ipmi_watchdog > /dev/null 2>&1
- modules_loaded ipmi_watchdog
- if [ ${OnePlusLoaded} -ne 0 ]; then
- RETVAL=$((RETVAL | 32))
- else
- if [ "${IPMI_WATCHDOG}" = "yes" ]; then
- [ ${UDEV_EXISTS} -eq 0 ] && rm -f /dev/watchdog
- fi
- fi
-}
-
-start_powercontrol_common()
-{
- local poweroff_opts=""
- load_hw_modules
- if [ "${IPMI_POWERCYCLE}" == "yes" ]; then
- modinfo ipmi_poweroff 2>/dev/null | grep poweroff_control > /dev/null 2>&1 && \
- poweroff_opts="poweroff_control=2"
- modinfo ipmi_poweroff 2>/dev/null | grep poweroff_powercycle > /dev/null 2>&1 && \
- poweroff_opts="poweroff_powercycle=1"
- fi
- modprobe ipmi_poweroff "${poweroff_opts}" > /dev/null 2>&1
- modules_loaded ipmi_poweroff
- [ ${OnePlusUnloaded} -ne 0 ] &&
- RETVAL=$((RETVAL | 2)) &&
- echo "Powercontroll startup failed: cannot load ipmi_poweroff module" &&
- return
-}
-
-start_powercontrol_quiet()
-{
- [ "${IPMI_POWEROFF}" != "yes" ] &&
- return
- start_powercontrol_common
-}
-
-start_powercontrol()
-{
- [ "${IPMI_POWEROFF}" != "yes" ] &&
- RETVAL=$((RETVAL | 2)) &&
- echo "Powercontroll not configured" &&
- return
- start_powercontrol_common
-}
-
-stop_powercontrol()
-{
- modprobe -q -r ipmi_poweroff > /dev/null 2>&1
- modules_loaded ipmi_poweroff
- if [ ${OnePlusLoaded} -ne 0 ]; then
- RETVAL=$((RETVAL | 32))
- echo "Powercontroll shutdown failed: cannot unload ipmi_poweroff module"
- fi
-}
-
-stop_powercontrol_quiet()
-{
- modprobe -q -r ipmi_poweroff > /dev/null 2>&1
- modules_loaded ipmi_poweroff
- [ ${OnePlusLoaded} -ne 0 ] && RETVAL=$((RETVAL | 32))
-}
-
-#############################################################################
-unload_all_ipmi_modules()
-{
- stop_watchdog_quiet
- stop_powercontrol_quiet
- for m in ${MODULES}; do
- modprobe -q -r ${m} > /dev/null 2>&1
- done
- # delete interface node ONLY if ipmi_devintf is unloaded
- [ `lsmod | grep -c "ipmi_devintf"` -eq 0 ] &&
- rm -f "/dev/ipmi${INTF_NUM}"
-}
-
-unload_ipmi_modules_leave_features()
-{
- for m in ${MODULES_INTERFACES}; do
- modprobe -q -r ${m} > /dev/null 2>&1
- done
- # delete interface node ONLY if ipmi_devintf is unloaded
- [ `lsmod | grep -c "ipmi_devintf"` -eq 0 ] &&
- rm -f "/dev/ipmi${INTF_NUM}"
- lsmod | egrep -q "ipmi_(poweroff|watchdog)" > /dev/null 2>&1
- if [ "$?" -ne "0" ]; then
- stop_watchdog_quiet
- stop_powercontrol_quiet
- for m in ${MODULES}; do
- modprobe -q -r ${m} > /dev/null 2>&1
- done
- fi
-}
-
-#############################################################################
-load_ipmi_modules ()
-{
- local locdelay
- modprobe ipmi_msghandler > /dev/null 2>&1
- modules_loaded ipmi_msghandler
- [ ${OnePlusLoaded} -ne 1 ] && unload_all_ipmi_modules && RETVAL=$((RETVAL | 1)) && return
- load_hw_modules
- [ $((RETVAL & 1)) -eq 1 ] && unload_all_ipmi_modules && RETVAL=$((RETVAL | 1)) && return
-
- if [ "${DEV_IPMI}" = "yes" ]; then
- modprobe ipmi_devintf > /dev/null 2>&1
- modules_loaded ipmi_devintf
- RETVAL=$((RETVAL & ~2))
- [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
- if [ ${OnePlusLoaded} -eq 1 ]; then
- if [ ${UDEV_EXISTS} -eq 0 ]; then
- DEVMAJOR=`cat /proc/devices | awk '/ipmidev/{print $1}'`
- rm -f /dev/ipmi${INTF_NUM}
- mknod -m 0600 /dev/ipmi${INTF_NUM} c ${DEVMAJOR} 0 || RETVAL=$((RETVAL | 4))
- fi
-
- # udev can take several seconds to create /dev/ipmi0,
- # but it happens asynchronously, so delay here
- locdelay=${DEV_IPMI_TIMEOUT}
- while [ ! -e /dev/ipmi${INTF_NUM} -a ${locdelay} -gt 0 ]; do
- locdelay=$((locdelay - 1))
- sleep 0.1
- done
- fi
- fi
-
- if [ "${IPMI_IMB}" = "yes" ]; then
- modprobe ipmi_imb > /dev/null 2>&1
- modules_loaded ipmi_imb
- RETVAL=$((RETVAL & ~2))
- [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
- if [ ${OnePlusLoaded} -eq 1 ]; then
- DEVMAJOR=`cat /proc/devices | awk '/imb/{print $1}'`
- rm -f /dev/imb
- mknod -m 0600 /dev/imb c ${DEVMAJOR} 0 || RETVAL=$((RETVAL | 4))
- fi
- fi
-
- # Per Corey Minyard, essentially no one uses ipmi_radisys
- # and we don't want to encourage its further use
- # so it won't be handled here.
- return
-}
-
-#############################################################################
-start()
-{
- load_ipmi_modules
- if [ ${RETVAL} -eq 0 ]; then
- touch ${LOCKFILE}
- else
- if [ $((RETVAL & 1)) -eq 1 ]; then
- echo "Startup failed."
- else
- touch ${LOCKFILE} && echo "Warning!?"
- fi
- fi
- start_watchdog_quiet
- start_powercontrol_quiet
-}
-
-#############################################################################
-stop()
-{
- unload_ipmi_modules_leave_features
- modules_loaded ${MODULES_INTERFACES}
- if [ ${OnePlusLoaded} -ne 0 ]; then
- RETVAL=$((RETVAL | 32))
- echo "Shutdown failed, something may be in use"
- else
- rm -f ${LOCKFILE}
- fi
-}
-
-stop_all()
-{
- unload_all_ipmi_modules
- modules_loaded ${MODULES}
- if [ ${OnePlusLoaded} -ne 0 ]; then
- RETVAL=$((RETVAL | 32))
- echo "Shutdown failed, something may be in use"
- else
- rm -f ${LOCKFILE}
- fi
-}
-
-#############################################################################
-restart()
-{
- stop_all
- RETVAL=0
- start
-}
-
-#############################################################################
-
-reload()
-{
- stop_all
- RETVAL=0
- start
-}
-
-#############################################################################
-
-status_all()
-{
- minimum_modules_loaded
- [ $? -eq 0 ] && RETVAL=$((RETVAL | 1))
-
- modules_loaded_verbose ${MODULES_FEATURES} ${MODULES_INTERFACES}
- [ ${OnePlusUnloaded} -ne 0 ] && RETVAL=$((RETVAL | 2))
-
- if [ "${DEV_IPMI}" = "yes" ]; then
- device_node_exists /dev/ipmi${INTF_NUM}
- [ $? -eq 0 ] && RETVAL=$((RETVAL | 4))
- fi
-
- if [ "${IPMI_IMB}" = "yes" ]; then
- device_node_exists /dev/imb
- [ $? -eq 0 ] && RETVAL=$((RETVAL | 4))
- fi
-
- if [ "${IPMI_WATCHDOG}" = "yes" ]; then
- device_node_exists /dev/watchdog
- [ $? -eq 0 ] && RETVAL=$((RETVAL | 8))
- fi
-
- [ ! -e ${LOCKFILE} ] && RETVAL=$((RETVAL | 16))
-}
-
-status()
-{
- minimum_modules_loaded
- [ $? -eq 0 ] && RETVAL=$((RETVAL | 1))
-
- if [ "${DEV_IPMI}" = "yes" ]; then
- modules_loaded_verbose ipmi_devintf
- [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
-
- device_node_exists /dev/ipmi${INTF_NUM}
- [ $? -eq 0 ] && RETVAL=$((RETVAL | 4))
- fi
-
- if [ "${IPMI_IMB}" = "yes" ]; then
- device_node_exists /dev/imb
- [ $? -eq 0 ] && RETVAL=$((RETVAL | 4))
- fi
-}
-
-status_watchdog()
-{
- minimum_modules_loaded
- [ $? -eq 0 ] && RETVAL=$((RETVAL | 1))
-
- modules_loaded_verbose ipmi_watchdog
- [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
-
- device_node_exists /dev/watchdog
- [ $? -eq 0 ] && RETVAL=$((RETVAL | 8))
-}
-
-status_powercontrol()
-{
- minimum_modules_loaded
- [ $? -eq 0 ] && RETVAL=$((RETVAL | 1))
-
- modules_loaded_verbose ipmi_powercontrol
- [ ${OnePlusLoaded} -eq 0 ] && RETVAL=$((RETVAL | 2))
-}
-
-#############################################################################
-usage ()
-{
- echo $"Usage: $0 {start|stop|status" 1>&2
- echo $" restart|condrestart|try-restart|reload|force-reload" 1>&2
- echo $" start-watchdog|stop-watchdog|status-watchdog" 1>&2
- echo $" start-powercontrol|stop-powercontrol|status-powercontrol" 1>&2
- echo $" stop-all|status-all}" 1>&2
- RETVAL=2
-}
-
-condrestart ()
-{
- [ -e ${LOCKFILE} ] && restart
-}
-
-#############################################################################
-# MAIN
-#############################################################################
-case "$1" in
- start) start ;;
- stop) stop ;;
- restart) restart ;;
- force-reload) reload ;;
- reload) reload ;;
- status) status ;;
- status-all) status_all ;;
- condrestart) condrestart ;;
- try-restart) condrestart ;;
- start-watchdog) start_watchdog ;;
- stop-watchdog) stop_watchdog ;;
- status-watchdog) status_watchdog ;;
- start-powercontrol) start_powercontrol ;;
- stop-powercontrol) stop_powercontrol ;;
- status-powercontrol) status_powercontrol ;;
- stop-all) stop_all ;;
- *) usage ;;
-esac
-
-exit ${RETVAL}
-
-#############################################################################
-# end of file
-#############################################################################
-
diff --git a/meta-oe/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch b/meta-oe/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
deleted file mode 100644
index 1fa68f9..0000000
--- a/meta-oe/recipes-support/openipmi/files/openipmi-no-openipmigui-man.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: Aws Ismail <aws.ismail@windriver.com>
-Date: Thu Jun 7 12:28:34 2012 -0400
-
- This patch was carried over from WRL4.3 (openipmi v2.0.16)
-
- It was updated for openipmi v2.0.19
-
- Disable making openipmigui man page since we don't need it
-
- Upstream-Status: Pending
-
- Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
- Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
-
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 632f55b..5ce79f5 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,6 +1,6 @@
-
- man_MANS = ipmi_ui.1 openipmicmd.1 openipmish.1 ipmi_cmdlang.7 \
-- openipmigui.1 openipmi_conparms.7 solterm.1 rmcp_ping.1 \
-+ openipmi_conparms.7 solterm.1 rmcp_ping.1 \
- openipmi_eventd.1
-
- EXTRA_DIST = $(man_MANS)
diff --git a/meta-oe/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch b/meta-oe/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
deleted file mode 100644
index 83485a9..0000000
--- a/meta-oe/recipes-support/openipmi/files/openipmi-remove-host-path-from-la_LDFLAGS.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From aa0dc0783a6ff5fb56c914b640836223e3c192bb Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 29 Dec 2014 18:16:04 +0800
-Subject: [PATCH] remove host path from la_LDFLAGS
-
-Upstream-Status: Inappropriate [ cross compile specific ]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- cmdlang/Makefile.am | 2 +-
- glib/Makefile.am | 4 ++--
- tcl/Makefile.am | 2 +-
- unix/Makefile.am | 4 ++--
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-Index: OpenIPMI-2.0.24/cmdlang/Makefile.am
-===================================================================
---- OpenIPMI-2.0.24.orig/cmdlang/Makefile.am
-+++ OpenIPMI-2.0.24/cmdlang/Makefile.am
-@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.
- libOpenIPMIcmdlang_la_LIBADD = -lm \
- $(top_builddir)/utils/libOpenIPMIutils.la \
- $(top_builddir)/lib/libOpenIPMI.la
--libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
-- -L$(libdir)
-+libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
-
- bin_PROGRAMS = openipmish
-
-Index: OpenIPMI-2.0.24/unix/Makefile.am
-===================================================================
---- OpenIPMI-2.0.24.orig/unix/Makefile.am
-+++ OpenIPMI-2.0.24/unix/Makefile.am
-@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la li
- libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
- libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
- $(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB)
--libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
-- -L$(libdir)
-+libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
-
- libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
- libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
- $(GDBM_LIB) $(RT_LIB)
--libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
-- -L$(libdir)
-+libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
-
- noinst_HEADERS = heap.h
-
diff --git a/meta-oe/recipes-support/openipmi/openipmi_2.0.24.bb b/meta-oe/recipes-support/openipmi/openipmi_2.0.24.bb
deleted file mode 100644
index a4f63c5..0000000
--- a/meta-oe/recipes-support/openipmi/openipmi_2.0.24.bb
+++ /dev/null
@@ -1,110 +0,0 @@
-SUMMARY = "IPMI (Intelligent Platform Management Interface) library and tools"
-DESCRIPTION = "OpenIPMI is an effort to create a full-function IPMI system, \
-to allow full access to all IPMI information on a server \
-and to abstract it to a level that will make it easy to use"
-
-HOMEPAGE = "http://openipmi.sourceforge.net"
-
-DEPENDS = " \
- glib-2.0 \
- ncurses \
- net-snmp \
- openssl \
- popt \
- python \
- swig-native \
- "
-
-LICENSE = "GPLv2 & LGPLv2.1 & BSD"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
- file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
- file://COPYING.BSD;md5=4b318d4160eb69c8ee53452feb1b4cdf \
- "
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \
- file://fix-symlink-install-error-in-cmdlang.patch \
- file://openipmi-no-openipmigui-man.patch \
- file://openipmi-remove-host-path-from-la_LDFLAGS.patch \
- file://ipmi-init-fix-the-arguments.patch \
- file://do-not-install-pyc-and-pyo.patch \
- file://include_sys_types.patch \
- file://openipmi-helper \
- file://ipmi.service \
- file://0001-lanserv-Rename-struct-parameter-printf-for-namespace.patch \
- "
-
-S = "${WORKDIR}/OpenIPMI-${PV}"
-SRC_URI[md5sum] = "58f9542cbfcb5fe250b77cf88345e1ec"
-SRC_URI[sha256sum] = "bca39a27071278a8b74610181ede8df51e155e5e9031bc8eaa3699d1720292b4"
-
-inherit autotools-brokensep pkgconfig pythonnative perlnative update-rc.d systemd
-
-EXTRA_OECONF = "--disable-static \
- --with-perl='${STAGING_BINDIR_NATIVE}/perl-native/perl' \
- --with-python='${STAGING_BINDIR_NATIVE}/python-native/python' \
- --with-pythoninstall='${PYTHON_SITEPACKAGES_DIR}' \
- --with-glibver=2.0"
-
-PACKAGECONFIG ??= "gdbm"
-PACKAGECONFIG[gdbm] = "ac_cv_header_gdbm_h=yes,ac_cv_header_gdbm_h=no,gdbm,"
-
-PACKAGES += "${PN}-perl ${PN}-python"
-
-FILES_${PN}-perl = " \
- ${libdir}/perl/vendor_perl/*/OpenIPMI.pm \
- ${libdir}/perl/vendor_perl/*/auto/OpenIPMI/OpenIPMI.so \
- "
-
-FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}"
-
-FILES_${PN}-dbg += " \
- ${libdir}/perl/vendor_perl/*/auto/OpenIPMI/.debug \
- ${PYTHON_SITEPACKAGES_DIR}/.debug \
- "
-
-do_configure () {
-
- # Let's perform regular configuration first then handle perl issues.
- autotools_do_configure
-
- perl_ver=`perl -V:version | cut -d\' -f 2`
-
- # Force openipmi perl bindings to be compiled using perl-native instead of
- # the host's perl. Set the proper install directory for the resulting
- # openipmi.pm and openipmi.so
- for i in ${S}/swig/Makefile ${S}/swig/perl/Makefile; do
- echo "SAL: i = $i"
- echo "SAL: STAGING_INCDIR_NATIVE = $STAGING_INCDIR_NATIVE"
- echo "SAL: libdir = $libdir"
- sed -i -e "/^PERL_CFLAGS/s:-I/usr/local/include:-I${STAGING_INCDIR_NATIVE}:g" $i
- sed -i -e "/^PERL_INSTALL_DIR/s:^PERL_INSTALL_DIR = .*:PERL_INSTALL_DIR = ${libdir}/perl/vendor_perl/$perl_ver:g" $i
- done
-}
-
-do_install_append () {
- echo "SAL: D = $D"
- echo "SAL: libdir = $libdir"
- install -m 0755 -d ${D}${sysconfdir}/sysconfig ${D}${sysconfdir}/init.d
- install -m 0755 ${S}/ipmi.init ${D}${sysconfdir}/init.d/ipmi
- install -m 0644 ${S}/ipmi.sysconf ${D}${sysconfdir}/sysconfig/ipmi
- # SAL: mv: cannot stat `/localdisk/loadbuild/slittle1/workspace/cgts_test_build/bitbake_build/tmp/work/x86_64-wrs-linux/openipmi-2.0.19-r4/image/usr/lib64/perl5': No such file or directory
- # SAL: real path to perl is /localdisk/loadbuild/slittle1/workspace/cgts_test_build/bitbake_build/tmp/work/x86_64-wrs-linux/perl-5.14.2-r8.3/package/usr/lib64/perl5 and it is a symlink to perl so no need to mv.
- if [ -d ${D}${libdir}/perl5 ]
- then
- mv ${D}${libdir}/perl5 ${D}${libdir}/perl
- fi
-
- # for systemd
- install -d ${D}${systemd_unitdir}/system
- install -m 0664 ${WORKDIR}/ipmi.service ${D}${systemd_unitdir}/system
- sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/ipmi.service
- install -d ${D}${libexecdir}
- install -m 0755 ${WORKDIR}/openipmi-helper ${D}${libexecdir}
-}
-
-INITSCRIPT_NAME = "ipmi"
-INITSCRIPT_PARAMS = "start 30 . stop 70 0 1 2 3 4 5 6 ."
-
-SYSTEMD_SERVICE_${PN} = "ipmi.service"
-SYSTEMD_AUTO_ENABLE = "disable"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 04/31] glmark2: Set required distro features to opengl
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (2 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 03/31] openipmi: Move to meta-networking requires net-snmp Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 05/31] openlmi-tools: Only build if the necessary python pieces are available Mark Hatle
` (27 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
index d3766d9..b72ced0 100644
--- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
+++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
@@ -23,7 +23,9 @@ SRCREV = "ed20c633f1926d1dd78e3e89043c85a81302cbe6"
S = "${WORKDIR}/git"
-inherit waf pkgconfig
+inherit waf pkgconfig distro_features_check
+
+REQUIRED_DISTRO_FEATURES += "opengl"
PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gl x11-gles2', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gl wayland-gles2', '', d)} \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 05/31] openlmi-tools: Only build if the necessary python pieces are available
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (3 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 04/31] glmark2: Set required distro features to opengl Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 06/31] xorg-drivers: Add opengl distro flag requirement to ati and nouveau Mark Hatle
` (26 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Since this isn't a python library it doesn't really belong to meta-python.
But I couldn't figure out where else to move it to.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
index b23869d..13e67cb 100644
--- a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
+++ b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
@@ -21,3 +21,8 @@ do_compile_prepend() {
do_install_prepend() {
cd cli
}
+
+python() {
+ if 'meta-python' not in d.getVar('BBFILE_COLLECTIONS').split():
+ raise bb.parse.SkipRecipe('Requires meta-python to be present.')
+}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 06/31] xorg-drivers: Add opengl distro flag requirement to ati and nouveau
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (4 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 05/31] openlmi-tools: Only build if the necessary python pieces are available Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 07/31] boinc-client: Add distro flag, requires opengl Mark Hatle
` (25 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb | 3 +++
meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
index a101008..d409a18 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
@@ -9,6 +9,9 @@ DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics"
DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
virtual/libgl xineramaproto libpciaccess"
+inherit distro_features_check
+REQUIRED_DISTRO_FEATURES += "opengl"
+
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
SRC_URI[md5sum] = "f34d04a755e761e03b459155fa3ddcbb"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb
index b10ee71..2746821 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.15.bb
@@ -10,7 +10,11 @@ DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
virtual/libgl xineramaproto libpciaccess"
RDEPENDS_${PN} += "xserver-xorg-module-exa"
+inherit distro_features_check
+REQUIRED_DISTRO_FEATURES += "opengl"
+
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
SRC_URI[md5sum] = "717203cb87029cddcbccf7398f9ad8c3"
SRC_URI[sha256sum] = "aede10fd395610a328697adca3434fb14e9afbd79911d6c8545cfa2c0e541d4c"
+
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 07/31] boinc-client: Add distro flag, requires opengl
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (5 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 06/31] xorg-drivers: Add opengl distro flag requirement to ati and nouveau Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 08/31] networkmanager-openvpn: requires openvpn from meta-networking Mark Hatle
` (24 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb
index ac5f755..99b43fa 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.6.33.bb
@@ -39,7 +39,9 @@ SRC_URI = "https://github.com/BOINC/boinc/archive/client_release/7.6/${PV}.tar.g
SRC_URI[md5sum] = "437b4b98e384b4bda4ef7056e68166ac"
SRC_URI[sha256sum] = "c4b1c29b9655013e0ac61dddf47ad7f30f38c46159f02a9d9dc8ab854e99aa6d"
-inherit gettext autotools-brokensep pkgconfig
+inherit gettext autotools-brokensep pkgconfig distro_features_check
+
+REQUIRED_DISTRO_FEATURES += "opengl"
S = "${WORKDIR}/${BPN}_release-7.6-${PV}"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 08/31] networkmanager-openvpn: requires openvpn from meta-networking
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (6 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 07/31] boinc-client: Add distro flag, requires opengl Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 09/31] telepathy-python: Move to meta-python, requires python-dbus Mark Hatle
` (23 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../networkmanager/networkmanager-openvpn_1.2.8.bb | 39 ++++++++++++++++++++++
.../networkmanager/networkmanager-openvpn_1.2.8.bb | 39 ----------------------
2 files changed, 39 insertions(+), 39 deletions(-)
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb
new file mode 100644
index 0000000..cce3f91
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb
@@ -0,0 +1,39 @@
+SUMMARY = "NetworkManager-openvpn-plugin"
+SECTION = "net/misc"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c"
+
+DEPENDS = "dbus dbus-glib networkmanager openvpn intltool-native glib-2.0-native"
+
+inherit gnomebase useradd gettext systemd
+
+SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz"
+SRC_URI[md5sum] = "9f325be386aa906ff9b0b7c0bdf2a59a"
+SRC_URI[sha256sum] = "3e0b4007f248d96df4b8eb5d0f937536044af7053debbbf525e67c9bc5d30654"
+
+S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
+
+PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
+
+do_install_append () {
+ rm -rf ${D}${libdir}/NetworkManager/*.la
+}
+
+# Create user and group nm-openvpn that are needed since version 1.0.6
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system nm-openvpn"
+
+FILES_${PN} += " \
+ ${libdir}/NetworkManager/*.so \
+ ${libdir}/NetworkManager/VPN/nm-openvpn-service.name \
+"
+
+FILES_${PN}-staticdev += " \
+ ${libdir}/NetworkManager/*.a \
+"
+
+RDEPENDS_${PN} = " \
+ networkmanager \
+ openvpn \
+"
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb
deleted file mode 100644
index cce3f91..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.8.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "NetworkManager-openvpn-plugin"
-SECTION = "net/misc"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c"
-
-DEPENDS = "dbus dbus-glib networkmanager openvpn intltool-native glib-2.0-native"
-
-inherit gnomebase useradd gettext systemd
-
-SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz"
-SRC_URI[md5sum] = "9f325be386aa906ff9b0b7c0bdf2a59a"
-SRC_URI[sha256sum] = "3e0b4007f248d96df4b8eb5d0f937536044af7053debbbf525e67c9bc5d30654"
-
-S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
-
-PACKAGECONFIG[gnome] = "--with-gnome,--without-gnome"
-
-do_install_append () {
- rm -rf ${D}${libdir}/NetworkManager/*.la
-}
-
-# Create user and group nm-openvpn that are needed since version 1.0.6
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system nm-openvpn"
-
-FILES_${PN} += " \
- ${libdir}/NetworkManager/*.so \
- ${libdir}/NetworkManager/VPN/nm-openvpn-service.name \
-"
-
-FILES_${PN}-staticdev += " \
- ${libdir}/NetworkManager/*.a \
-"
-
-RDEPENDS_${PN} = " \
- networkmanager \
- openvpn \
-"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 09/31] telepathy-python: Move to meta-python, requires python-dbus
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (7 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 08/31] networkmanager-openvpn: requires openvpn from meta-networking Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 10/31] networkmanager: Move to meta-networking, requires dnsmasq Mark Hatle
` (22 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../telepathy-python-0.15.19/parallel_make.patch | 43 ----------------------
.../remove_duplicate_install.patch | 26 -------------
.../telepathy-python_fix_for_automake_1.12.patch | 26 -------------
.../telepathy/telepathy-python_0.15.19.bb | 32 ----------------
.../telepathy-python-0.15.19/parallel_make.patch | 43 ++++++++++++++++++++++
.../remove_duplicate_install.patch | 26 +++++++++++++
.../telepathy-python_fix_for_automake_1.12.patch | 26 +++++++++++++
.../telepathy/telepathy-python_0.15.19.bb | 32 ++++++++++++++++
8 files changed, 127 insertions(+), 127 deletions(-)
delete mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
delete mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
delete mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
delete mode 100644 meta-oe/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
create mode 100644 meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
create mode 100644 meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
create mode 100644 meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
create mode 100644 meta-python/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch b/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
deleted file mode 100644
index 2488246..0000000
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Add dependency of __init__.py
-
-Tasks must be done after exec of __init__, which creates the
-src/_generated directory that tasks are based on.
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-
-Upstream-Status: Submitted
-(However it seems that this project is out of maintanence.)
-
-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
-@@ -39,17 +39,17 @@
- XSLTPROC_OPTS = --nonet --novalid --xinclude
- tools_dir = $(top_srcdir)/tools
-
--_generated/interfaces.py: $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml)
-+_generated/interfaces.py: _generated/__init__.py $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml)
- $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
- $(tools_dir)/python-interfaces-generator.xsl \
- $(spec_dir)/all.xml
-
--_generated/constants.py: $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml)
-+_generated/constants.py: _generated/__init__.py $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml)
- $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
- $(tools_dir)/python-constants-generator.xsl \
- $(spec_dir)/all.xml
-
--_generated/errors.py: $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml)
-+_generated/errors.py: _generated/__init__.py $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml)
- $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
- $(tools_dir)/python-errors-generator.xsl \
- $(spec_dir)/all.xml
-@@ -58,7 +58,7 @@
- $(AM_V_GEN)$(mkdir_p) $(dir $@)
- @echo "# Placeholder for package" > $@
-
--_generated/%.py: $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
-+_generated/%.py: _generated/__init__.py $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
- $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
- $(tools_dir)/spec-to-python.xsl \
- $(spec_dir)/$*.xml
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch b/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
deleted file mode 100644
index df95a4c..0000000
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit f6c67662145de889055a86a6b3b12c70a45fc8d5
-Author: Dongxiao Xu <dongxiao.xu@intel.com>
-Date: Wed Sep 7 16:02:20 2011 +0800
-
- Avoid duplicated installation of errors.py
-
- newer version of autotools don't seem to like listing files to install
- twice. Remove one errors.py from the installation list.
-
- Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-
- Upstream-Status: Inappropirate [upstream inactive]
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5c27dfe..7536e43 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -11,7 +11,7 @@ telepathy_PYTHON = \
-
- # telepathy._generated.* auto-generated modules
- spec_dir = $(top_srcdir)/spec
--spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml))
-+spec_files := $(filter-out _generated/errors.py, $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml)))
-
- BUILT_SOURCES = \
- _generated/interfaces.py \
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch b/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
deleted file mode 100644
index f613fdc..0000000
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Upstream-Status: Pending
-
-automake 1.12 has deprecated use of mkdir_p, and it recommends
-use of MKDIR_P instead. Changed the code to avoid these kind
-of warning-errors.
-
-| make[1]: _generated/: Command not found
-| make[1]: *** [_generated/__init__.py] Error 127
-| make[1]: Leaving directory `/srv/home/nitin/builds2/build0/tmp/work/i586-poky-linux/telepathy-python-0.15.19-r4/telepathy-python-0.15.19/src'
-| make: *** [all-recursive] Error 1
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2012/07/10
-Index: telepathy-python-0.15.19/src/Makefile.am
-===================================================================
---- telepathy-python-0.15.19.orig/src/Makefile.am
-+++ telepathy-python-0.15.19/src/Makefile.am
-@@ -55,7 +55,7 @@ _generated/errors.py: _generated/__init_
- $(spec_dir)/all.xml
-
- _generated/__init__.py:
-- $(AM_V_GEN)$(mkdir_p) $(dir $@)
-+ $(AM_V_GEN)$(MKDIR_P) $(dir $@)
- @echo "# Placeholder for package" > $@
-
- _generated/%.py: _generated/__init__.py $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
diff --git a/meta-oe/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta-oe/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
deleted file mode 100644
index b7aea24..0000000
--- a/meta-oe/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY = "Telepathy IM framework - Python package"
-HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
-LICENSE = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
- file://src/utils.py;beginline=1;endline=17;md5=9a07d1a9791a7429a14e7b25c6c86822"
-
-DEPENDS = "libxslt-native"
-RDEPENDS_${PN} += "python-dbus"
-
-SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
- file://parallel_make.patch \
- file://remove_duplicate_install.patch \
- file://telepathy-python_fix_for_automake_1.12.patch"
-
-PR = "r6"
-
-inherit autotools pythonnative
-
-SRC_URI[md5sum] = "f7ca25ab3c88874015b7e9728f7f3017"
-SRC_URI[sha256sum] = "244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376"
-
-FILES_${PN} += "\
- ${libdir}/python*/site-packages/telepathy/*.py \
- ${libdir}/python*/site-packages/telepathy/*/*.py \
-"
-
-do_install_append () {
- rm -f ${D}${libdir}/python*/site-packages/telepathy/*.pyc
- rm -f ${D}${libdir}/python*/site-packages/telepathy/*.pyo
- rm -f ${D}${libdir}/python*/site-packages/telepathy/*/*.pyc
- rm -f ${D}${libdir}/python*/site-packages/telepathy/*/*.pyo
-}
diff --git a/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch b/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
new file mode 100644
index 0000000..2488246
--- /dev/null
+++ b/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/parallel_make.patch
@@ -0,0 +1,43 @@
+Add dependency of __init__.py
+
+Tasks must be done after exec of __init__, which creates the
+src/_generated directory that tasks are based on.
+
+Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+
+Upstream-Status: Submitted
+(However it seems that this project is out of maintanence.)
+
+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
+@@ -39,17 +39,17 @@
+ XSLTPROC_OPTS = --nonet --novalid --xinclude
+ tools_dir = $(top_srcdir)/tools
+
+-_generated/interfaces.py: $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml)
++_generated/interfaces.py: _generated/__init__.py $(tools_dir)/python-interfaces-generator.xsl $(wildcard $(spec_dir)/*.xml)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
+ $(tools_dir)/python-interfaces-generator.xsl \
+ $(spec_dir)/all.xml
+
+-_generated/constants.py: $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml)
++_generated/constants.py: _generated/__init__.py $(tools_dir)/python-constants-generator.xsl $(wildcard $(spec_dir)/*.xml)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
+ $(tools_dir)/python-constants-generator.xsl \
+ $(spec_dir)/all.xml
+
+-_generated/errors.py: $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml)
++_generated/errors.py: _generated/__init__.py $(tools_dir)/python-errors-generator.xsl $(wildcard $(spec_dir)/*.xml)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
+ $(tools_dir)/python-errors-generator.xsl \
+ $(spec_dir)/all.xml
+@@ -58,7 +58,7 @@
+ $(AM_V_GEN)$(mkdir_p) $(dir $@)
+ @echo "# Placeholder for package" > $@
+
+-_generated/%.py: $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
++_generated/%.py: _generated/__init__.py $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_OPTS) -o $@ \
+ $(tools_dir)/spec-to-python.xsl \
+ $(spec_dir)/$*.xml
diff --git a/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch b/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
new file mode 100644
index 0000000..df95a4c
--- /dev/null
+++ b/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/remove_duplicate_install.patch
@@ -0,0 +1,26 @@
+commit f6c67662145de889055a86a6b3b12c70a45fc8d5
+Author: Dongxiao Xu <dongxiao.xu@intel.com>
+Date: Wed Sep 7 16:02:20 2011 +0800
+
+ Avoid duplicated installation of errors.py
+
+ newer version of autotools don't seem to like listing files to install
+ twice. Remove one errors.py from the installation list.
+
+ Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
+
+ Upstream-Status: Inappropirate [upstream inactive]
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5c27dfe..7536e43 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -11,7 +11,7 @@ telepathy_PYTHON = \
+
+ # telepathy._generated.* auto-generated modules
+ spec_dir = $(top_srcdir)/spec
+-spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml))
++spec_files := $(filter-out _generated/errors.py, $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml)))
+
+ BUILT_SOURCES = \
+ _generated/interfaces.py \
diff --git a/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch b/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
new file mode 100644
index 0000000..f613fdc
--- /dev/null
+++ b/meta-python/recipes-connectivity/telepathy/telepathy-python-0.15.19/telepathy-python_fix_for_automake_1.12.patch
@@ -0,0 +1,26 @@
+Upstream-Status: Pending
+
+automake 1.12 has deprecated use of mkdir_p, and it recommends
+use of MKDIR_P instead. Changed the code to avoid these kind
+of warning-errors.
+
+| make[1]: _generated/: Command not found
+| make[1]: *** [_generated/__init__.py] Error 127
+| make[1]: Leaving directory `/srv/home/nitin/builds2/build0/tmp/work/i586-poky-linux/telepathy-python-0.15.19-r4/telepathy-python-0.15.19/src'
+| make: *** [all-recursive] Error 1
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/07/10
+Index: telepathy-python-0.15.19/src/Makefile.am
+===================================================================
+--- telepathy-python-0.15.19.orig/src/Makefile.am
++++ telepathy-python-0.15.19/src/Makefile.am
+@@ -55,7 +55,7 @@ _generated/errors.py: _generated/__init_
+ $(spec_dir)/all.xml
+
+ _generated/__init__.py:
+- $(AM_V_GEN)$(mkdir_p) $(dir $@)
++ $(AM_V_GEN)$(MKDIR_P) $(dir $@)
+ @echo "# Placeholder for package" > $@
+
+ _generated/%.py: _generated/__init__.py $(tools_dir)/spec-to-python.xsl $(spec_dir)/%.xml
diff --git a/meta-python/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb b/meta-python/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
new file mode 100644
index 0000000..b7aea24
--- /dev/null
+++ b/meta-python/recipes-connectivity/telepathy/telepathy-python_0.15.19.bb
@@ -0,0 +1,32 @@
+SUMMARY = "Telepathy IM framework - Python package"
+HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
+ file://src/utils.py;beginline=1;endline=17;md5=9a07d1a9791a7429a14e7b25c6c86822"
+
+DEPENDS = "libxslt-native"
+RDEPENDS_${PN} += "python-dbus"
+
+SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
+ file://parallel_make.patch \
+ file://remove_duplicate_install.patch \
+ file://telepathy-python_fix_for_automake_1.12.patch"
+
+PR = "r6"
+
+inherit autotools pythonnative
+
+SRC_URI[md5sum] = "f7ca25ab3c88874015b7e9728f7f3017"
+SRC_URI[sha256sum] = "244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376"
+
+FILES_${PN} += "\
+ ${libdir}/python*/site-packages/telepathy/*.py \
+ ${libdir}/python*/site-packages/telepathy/*/*.py \
+"
+
+do_install_append () {
+ rm -f ${D}${libdir}/python*/site-packages/telepathy/*.pyc
+ rm -f ${D}${libdir}/python*/site-packages/telepathy/*.pyo
+ rm -f ${D}${libdir}/python*/site-packages/telepathy/*/*.pyc
+ rm -f ${D}${libdir}/python*/site-packages/telepathy/*/*.pyo
+}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 10/31] networkmanager: Move to meta-networking, requires dnsmasq
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (8 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 09/31] telepathy-python: Move to meta-python, requires python-dbus Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 11/31] python-ldap: Move to meta-networking, requires cyrus-sasl Mark Hatle
` (21 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
| 82 +++
.../0001-check-for-strndupa-before-using-it.patch | 67 +++
...dns-resolved-add-systemd-resolved-backend.patch | 621 +++++++++++++++++++++
...ed-also-check-for-etc-resolv-conf.systemd.patch | 29 +
...o-run-sbin-dhclient-to-get-the-version-nu.patch | 36 ++
...stemd-xlocale.h-is-dropped-by-newer-glibc.patch | 29 +
.../0002-Fix-nm-version-macro-includes.patch | 58 ++
...et-util.h-Include-linux-sockios.h-on-musl.patch | 30 +
...-string-in-g_dbus_message_new_method_erro.patch | 67 +++
.../networkmanager/0003-Define-ETH_ALEN.patch | 39 ++
...Define-missing-features-to-cater-for-musl.patch | 93 +++
...emove-net-ethernet.h-seems-to-be-over-spe.patch | 36 ++
.../networkmanager/networkmanager_1.4.4.bb | 132 +++++
| 82 ---
.../0001-check-for-strndupa-before-using-it.patch | 67 ---
...dns-resolved-add-systemd-resolved-backend.patch | 621 ---------------------
...ed-also-check-for-etc-resolv-conf.systemd.patch | 29 -
...o-run-sbin-dhclient-to-get-the-version-nu.patch | 36 --
...stemd-xlocale.h-is-dropped-by-newer-glibc.patch | 29 -
.../0002-Fix-nm-version-macro-includes.patch | 58 --
...et-util.h-Include-linux-sockios.h-on-musl.patch | 30 -
...-string-in-g_dbus_message_new_method_erro.patch | 67 ---
.../networkmanager/0003-Define-ETH_ALEN.patch | 39 --
...Define-missing-features-to-cater-for-musl.patch | 93 ---
...emove-net-ethernet.h-seems-to-be-over-spe.patch | 36 --
.../networkmanager/networkmanager_1.4.4.bb | 132 -----
26 files changed, 1319 insertions(+), 1319 deletions(-)
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
delete mode 100644 meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
--git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
new file mode 100644
index 0000000..ced0c7c
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
@@ -0,0 +1,82 @@
+From 047d3bf96b510740f64687480333c378e414995f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 31 Mar 2017 15:57:05 -0700
+Subject: [PATCH 1/5] adjust net/ headers for musl compatibility
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libnm-core/nm-utils.c | 12 +++++++-----
+ libnm-core/nm-utils.h | 5 ++---
+ src/platform/wifi/wifi-utils.h | 2 +-
+ 3 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
+index df75d56..868224e 100644
+--- a/libnm-core/nm-utils.c
++++ b/libnm-core/nm-utils.c
+@@ -19,24 +19,26 @@
+ * Copyright 2005 - 2014 Red Hat, Inc.
+ */
+
+-#include "nm-default.h"
+-
+-#include "nm-utils.h"
+-
+ #include <string.h>
+ #include <errno.h>
+ #include <stdlib.h>
+-#include <netinet/ether.h>
+ #include <arpa/inet.h>
+ #include <uuid/uuid.h>
+ #include <libintl.h>
+ #include <gmodule.h>
+ #include <sys/stat.h>
++//#include <net/if_arp.h>
++//#include <net/ethernet.h>
++#include <netinet/ether.h>
++
++#include "nm-default.h"
+
++#include "nm-utils.h"
+ #if WITH_JANSSON
+ #include <jansson.h>
+ #endif
+
++
+ #include "nm-common-macros.h"
+ #include "nm-utils-private.h"
+ #include "nm-setting-private.h"
+diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
+index 407c14e..156ccae 100644
+--- a/libnm-core/nm-utils.h
++++ b/libnm-core/nm-utils.h
+@@ -27,11 +27,10 @@
+
+ #include <glib.h>
+
+-#include <netinet/in.h>
+-
+ /* For ETH_ALEN and INFINIBAND_ALEN */
+-#include <linux/if_ether.h>
++//#include <linux/if_ether.h>
+ #include <linux/if_infiniband.h>
++#include <netinet/in.h>
+
+ #include "nm-core-enum-types.h"
+ #include "nm-setting-wireless-security.h"
+diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
+index 8e2b93f..84f5ce9 100644
+--- a/src/platform/wifi/wifi-utils.h
++++ b/src/platform/wifi/wifi-utils.h
+@@ -22,7 +22,7 @@
+ #ifndef __WIFI_UTILS_H__
+ #define __WIFI_UTILS_H__
+
+-#include <net/ethernet.h>
++//#include <net/ethernet.h>
+
+ #include "nm-dbus-interface.h"
+
+--
+2.12.1
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch
new file mode 100644
index 0000000..26f380b
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch
@@ -0,0 +1,67 @@
+From 05e8bd664d0244cb8ab4376b962830b97860f6bf Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 31 Mar 2017 18:37:19 -0700
+Subject: [PATCH] check for strndupa before using it
+
+musl does not have strndupa
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ config.h.in | 4 ++++
+ configure.ac | 1 +
+ src/systemd/src/basic/alloc-util.h | 12 ++++++++++++
+ 3 files changed, 17 insertions(+)
+
+diff --git a/config.h.in b/config.h.in
+index db8c135..c4229ed 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -41,6 +41,10 @@
+ */
+ #undef HAVE_DCGETTEXT
+
++/* Define to 1 if you have the declaration of `strndupa', and to 0 if you
++ don't. */
++#undef HAVE_DECL_STRNDUPA
++
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ #undef HAVE_DLFCN_H
+
+diff --git a/configure.ac b/configure.ac
+index 2630f8d..d0a57fd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,6 +54,7 @@ AC_SUBST(NM_VERSION)
+
+ GIT_SHA_RECORD(NM_GIT_SHA)
+
++AC_CHECK_DECLS([strndupa], [], [], [[#include <string.h>]])
+ dnl
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ dnl
+diff --git a/src/systemd/src/basic/alloc-util.h b/src/systemd/src/basic/alloc-util.h
+index ceeee51..924b59c 100644
+--- a/src/systemd/src/basic/alloc-util.h
++++ b/src/systemd/src/basic/alloc-util.h
+@@ -25,6 +25,18 @@
+ #include <string.h>
+
+ #include "macro.h"
++#include "config.h"
++
++#if !HAVE_DECL_STRNDUPA
++#define strndupa(s, n) \
++ ({ \
++ const char *__old = (s); \
++ size_t __len = strnlen(__old, (n)); \
++ char *__new = (char *)alloca(__len + 1); \
++ __new[__len] = '\0'; \
++ (char *)memcpy(__new, __old, __len); \
++ })
++#endif
+
+ #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n)))
+
+--
+2.12.1
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch
new file mode 100644
index 0000000..bd194a6
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch
@@ -0,0 +1,621 @@
+From: Sjoerd Simons <sjoerd@luon.net>
+Date: Sun, 21 Aug 2016 21:46:02 +0200
+Subject: [PATCH] dns/resolved: add systemd-resolved backend
+
+Add initial DNS backend that pushes DNS information into
+systemd-resolved. Backend is choosen by default if the systems
+resolv.conv is setup to pointing to one of the standard resolved
+locations.
+
+This doesn't handle global dns configuration.
+
+Signed-off-by: Sjoerd Simons <sjoerd@luon.net>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=762540
+
+Upstream-Status: Backport
+
+---
+ man/NetworkManager.conf.xml | 10 +-
+ src/Makefile.am | 2 +
+ src/dns-manager/nm-dns-manager.c | 43 ++-
+ src/dns-manager/nm-dns-systemd-resolved.c | 427 ++++++++++++++++++++++++++++++
+ src/dns-manager/nm-dns-systemd-resolved.h | 45 ++++
+ 5 files changed, 523 insertions(+), 4 deletions(-)
+ create mode 100644 src/dns-manager/nm-dns-systemd-resolved.c
+ create mode 100644 src/dns-manager/nm-dns-systemd-resolved.h
+
+diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
+index 6295b82..0a67ae5 100644
+--- a/man/NetworkManager.conf.xml
++++ b/man/NetworkManager.conf.xml
+@@ -275,10 +275,12 @@ no-auto-default=*
+ <varlistentry>
+ <term><varname>dns</varname></term>
+ <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.</para>
+- <para><literal>default</literal>: The default if the key is
+- not specified. NetworkManager will update
++ <para><literal>default</literal>: NetworkManager will update
+ <filename>resolv.conf</filename> to reflect the nameservers
+- provided by currently active connections.</para>
++ provided by currently active connections. This is the default
++ if the key is not specified, unless the system is configured
++ to use systemd-resolved; in this case the default is
++ <literal>systemd-resolved</literal></para>
+ <para><literal>dnsmasq</literal>: NetworkManager will run
+ dnsmasq as a local caching nameserver, using a "split DNS"
+ configuration if you are connected to a VPN, and then update
+@@ -288,6 +290,8 @@ no-auto-default=*
+ to unbound and dnssec-triggerd, providing a "split DNS"
+ configuration with DNSSEC support. The <filename>/etc/resolv.conf</filename>
+ will be managed by dnssec-trigger daemon.</para>
++ <para><literal>systemd-resolved</literal>: NetworkManager will
++ push the DNS configuration to systemd-resolved</para>
+ <para><literal>none</literal>: NetworkManager will not
+ modify resolv.conf. This implies
+ <literal>rc-manager</literal> <literal>unmanaged</literal></para>
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8d29b19..10f63de 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -345,6 +345,8 @@ libNetworkManager_la_SOURCES = \
+ \
+ dns-manager/nm-dns-dnsmasq.c \
+ dns-manager/nm-dns-dnsmasq.h \
++ dns-manager/nm-dns-systemd-resolved.c \
++ dns-manager/nm-dns-systemd-resolved.h \
+ dns-manager/nm-dns-unbound.c \
+ dns-manager/nm-dns-unbound.h \
+ dns-manager/nm-dns-manager.c \
+diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
+index 5a758a9..38bc786 100644
+--- a/src/dns-manager/nm-dns-manager.c
++++ b/src/dns-manager/nm-dns-manager.c
+@@ -45,6 +45,7 @@
+
+ #include "nm-dns-plugin.h"
+ #include "nm-dns-dnsmasq.h"
++#include "nm-dns-systemd-resolved.h"
+ #include "nm-dns-unbound.h"
+
+ #if WITH_LIBSOUP
+@@ -1588,6 +1589,37 @@ _check_resconf_immutable (NMDnsManagerResolvConfManager rc_manager)
+
+ NM_DEFINE_SINGLETON_GETTER (NMDnsManager, nm_dns_manager_get, NM_TYPE_DNS_MANAGER);
+
++static gboolean
++_resolvconf_resolved_managed (void)
++{
++ static const char *const resolved_paths[] = {
++ "/run/systemd/resolve/resolv.conf",
++ "/lib/systemd/resolv.conf",
++ "/usr/lib/systemd/resolv.conf",
++ };
++ GFile *f;
++ GFileInfo *info;
++ gboolean ret = FALSE;
++
++ f = g_file_new_for_path (_PATH_RESCONF);
++ info = g_file_query_info (f,
++ G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK","\
++ G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET,
++ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
++ NULL, NULL);
++
++ if (info && g_file_info_get_is_symlink (info)) {
++ ret = _nm_utils_strv_find_first ((gchar **) resolved_paths,
++ G_N_ELEMENTS (resolved_paths),
++ g_file_info_get_symlink_target (info)) >= 0;
++ }
++
++ g_clear_object(&info);
++ g_clear_object(&f);
++
++ return ret;
++}
++
+ static void
+ init_resolv_conf_mode (NMDnsManager *self, gboolean force_reload_plugin)
+ {
+@@ -1633,7 +1665,16 @@ again:
+
+ rc_manager = _check_resconf_immutable (rc_manager);
+
+- if (nm_streq0 (mode, "dnsmasq")) {
++ if ( (!mode && _resolvconf_resolved_managed ())
++ || nm_streq0 (mode, "systemd-resolved")) {
++ if ( force_reload_plugin
++ || !NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) {
++ _clear_plugin (self);
++ priv->plugin = nm_dns_systemd_resolved_new ();
++ plugin_changed = TRUE;
++ }
++ mode = "systemd-resolved";
++ } else if (nm_streq0 (mode, "dnsmasq")) {
+ if (force_reload_plugin || !NM_IS_DNS_DNSMASQ (priv->plugin)) {
+ _clear_plugin (self);
+ priv->plugin = nm_dns_dnsmasq_new ();
+diff --git a/src/dns-manager/nm-dns-systemd-resolved.c b/src/dns-manager/nm-dns-systemd-resolved.c
+new file mode 100644
+index 0000000..6bdd5f6
+--- /dev/null
++++ b/src/dns-manager/nm-dns-systemd-resolved.c
+@@ -0,0 +1,427 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
++/*
++ * Copyright (C) 2010 Dan Williams <dcbw@redhat.com>
++ * Copyright (C) 2016 Sjoerd Simons <sjoerd@luon.net>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ */
++
++#include "nm-default.h"
++
++#include "nm-dns-systemd-resolved.h"
++
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <sys/wait.h>
++#include <arpa/inet.h>
++#include <sys/stat.h>
++#include <linux/if.h>
++
++#include "nm-core-internal.h"
++#include "nm-platform.h"
++#include "nm-utils.h"
++#include "nm-ip4-config.h"
++#include "nm-ip6-config.h"
++#include "nm-bus-manager.h"
++#include "nm-manager.h"
++#include "nm-device.h"
++#include "NetworkManagerUtils.h"
++
++G_DEFINE_TYPE (NMDnsSystemdResolved, nm_dns_systemd_resolved, NM_TYPE_DNS_PLUGIN)
++
++#define NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE(o) \
++ (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_SYSTEMD_RESOLVED, \
++ NMDnsSystemdResolvedPrivate))
++
++#define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1"
++#define SYSTEMD_RESOLVED_DBUS_PATH "/org/freedesktop/resolve1"
++
++typedef struct {
++ int ifindex;
++ GList *configs;
++} InterfaceConfig;
++
++typedef struct {
++ GDBusProxy *resolve;
++ GCancellable *init_cancellable;
++ GCancellable *update_cancellable;
++ GQueue dns_updates;
++ GQueue domain_updates;
++} NMDnsSystemdResolvedPrivate;
++
++/*****************************************************************************/
++
++#define _NMLOG_DOMAIN LOGD_DNS
++#define _NMLOG_PREFIX_NAME "systemd-resolved"
++#define _NMLOG(level, ...) \
++ G_STMT_START { \
++ nm_log ((level), _NMLOG_DOMAIN, \
++ "%s[%p]: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
++ _NMLOG_PREFIX_NAME, \
++ (self) \
++ _NM_UTILS_MACRO_REST(__VA_ARGS__)); \
++ } G_STMT_END
++
++/*****************************************************************************/
++
++static void
++call_done (GObject *source, GAsyncResult *r, gpointer user_data)
++{
++ GVariant *v;
++ GError *error = NULL;
++ NMDnsSystemdResolved *self = (NMDnsSystemdResolved *) user_data;
++
++ v = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), r, &error);
++
++ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
++ return;
++
++ if (error != NULL) {
++ _LOGW ("Failed: %s\n", error->message);
++ g_error_free (error);
++ }
++}
++
++static void
++add_interface_configuration (NMDnsSystemdResolved *self,
++ GArray *interfaces,
++ const NMDnsIPConfigData *data)
++{
++ int i;
++ InterfaceConfig *ic = NULL;
++ int ifindex;
++ NMDevice *device;
++
++ if (NM_IS_IP4_CONFIG (data->config))
++ ifindex = nm_ip4_config_get_ifindex (data->config);
++ else if (NM_IS_IP6_CONFIG (data->config))
++ ifindex = nm_ip6_config_get_ifindex (data->config);
++ else
++ g_return_if_reached ();
++
++ device = nm_manager_get_device_by_ifindex (nm_manager_get (), ifindex);
++
++ if (!nm_device_get_managed (device, FALSE))
++ return;
++
++ for (i = 0; i < interfaces->len; i++) {
++ InterfaceConfig *tic = &g_array_index (interfaces, InterfaceConfig, i);
++ if (ifindex == tic->ifindex) {
++ ic = tic;
++ break;
++ }
++ }
++
++ if (!ic) {
++ g_array_set_size (interfaces, interfaces->len + 1);
++ ic = &g_array_index (interfaces, InterfaceConfig,
++ interfaces->len - 1);
++ ic->ifindex = ifindex;
++ }
++
++ ic->configs = g_list_append (ic->configs, data->config);
++}
++
++static void
++add_domain (GVariantBuilder *domains,
++ const char *domain,
++ gboolean never_default)
++{
++ /* If this link is never the default (e.g. only used for resources on this
++ * network) add a routing domain. */
++ g_variant_builder_add (domains, "(sb)", domain, never_default);
++}
++
++static void
++update_add_ip6_config (NMDnsSystemdResolved *self,
++ GVariantBuilder *dns,
++ GVariantBuilder *domains,
++ const NMIP6Config *config)
++{
++ guint i, n;
++
++ n = nm_ip6_config_get_num_nameservers (config);
++ for (i = 0 ; i < n; i++) {
++ const struct in6_addr *ip;
++
++ g_variant_builder_open (dns, G_VARIANT_TYPE ("(iay)"));
++ g_variant_builder_add (dns, "i", AF_INET6);
++ ip = nm_ip6_config_get_nameserver (config, i),
++
++ g_variant_builder_add_value (dns, g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, ip, 16, 1));
++ g_variant_builder_close (dns);
++ }
++
++ n = nm_ip6_config_get_num_searches (config);
++ if (n > 0) {
++ for (i = 0; i < n; i++) {
++ add_domain (domains, nm_ip6_config_get_search (config, i),
++ nm_ip6_config_get_never_default (config));
++ }
++ } else {
++ n = nm_ip6_config_get_num_domains (config);
++ for (i = 0; i < n; i++) {
++ add_domain (domains, nm_ip6_config_get_domain (config, i),
++ nm_ip6_config_get_never_default (config));
++ }
++ }
++}
++
++static void
++update_add_ip4_config (NMDnsSystemdResolved *self,
++ GVariantBuilder *dns,
++ GVariantBuilder *domains,
++ const NMIP4Config *config)
++{
++ guint i, n;
++
++ n = nm_ip4_config_get_num_nameservers (config);
++ for (i = 0 ; i < n; i++) {
++ guint32 ns;
++
++ g_variant_builder_open (dns, G_VARIANT_TYPE ("(iay)"));
++ g_variant_builder_add (dns, "i", AF_INET);
++ ns = nm_ip4_config_get_nameserver (config, i),
++
++ g_variant_builder_add_value (dns, g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, &ns, 4, 1));
++ g_variant_builder_close (dns);
++ }
++
++ n = nm_ip4_config_get_num_searches (config);
++ if (n > 0) {
++ for (i = 0; i < n; i++) {
++ add_domain (domains, nm_ip4_config_get_search (config, i),
++ nm_ip4_config_get_never_default (config));
++ }
++ } else {
++ n = nm_ip4_config_get_num_domains (config);
++ for (i = 0; i < n; i++) {
++ add_domain (domains, nm_ip4_config_get_domain (config, i),
++ nm_ip4_config_get_never_default (config));
++ }
++ }
++}
++
++static void
++free_pending_updates (NMDnsSystemdResolved *self)
++{
++ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self);
++ GVariant *v;
++
++ while ((v = g_queue_pop_head (&priv->dns_updates)) != NULL)
++ g_variant_unref (v);
++
++ while ((v = g_queue_pop_head (&priv->domain_updates)) != NULL)
++ g_variant_unref (v);
++}
++
++static void
++prepare_one_interface (NMDnsSystemdResolved *self, InterfaceConfig *ic)
++{
++ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self);
++ GVariantBuilder dns, domains;
++ GList *l;
++
++ g_variant_builder_init (&dns, G_VARIANT_TYPE ("(ia(iay))"));
++ g_variant_builder_add (&dns, "i", ic->ifindex);
++ g_variant_builder_open (&dns, G_VARIANT_TYPE ("a(iay)"));
++
++ g_variant_builder_init (&domains, G_VARIANT_TYPE ("(ia(sb))"));
++ g_variant_builder_add (&domains, "i", ic->ifindex);
++ g_variant_builder_open (&domains, G_VARIANT_TYPE ("a(sb)"));
++
++ for (l = ic->configs ; l != NULL ; l = g_list_next (l)) {
++ if (NM_IS_IP4_CONFIG (l->data))
++ update_add_ip4_config (self, &dns, &domains, l->data);
++ else if (NM_IS_IP6_CONFIG (l->data))
++ update_add_ip6_config (self, &dns, &domains, l->data);
++ else
++ g_assert_not_reached ();
++ }
++ g_variant_builder_close (&dns);
++ g_variant_builder_close (&domains);
++
++ g_queue_push_tail (&priv->dns_updates,
++ g_variant_ref_sink (g_variant_builder_end (&dns)));
++ g_queue_push_tail (&priv->domain_updates,
++ g_variant_ref_sink (g_variant_builder_end (&domains)));
++}
++
++static void
++send_updates (NMDnsSystemdResolved *self)
++{
++ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self);
++ GVariant *v;
++
++ nm_clear_g_cancellable (&priv->update_cancellable);
++
++ if (!priv->resolve)
++ return;
++
++ priv->update_cancellable = g_cancellable_new ();
++
++ while ((v = g_queue_pop_head (&priv->dns_updates)) != NULL) {
++ g_dbus_proxy_call (priv->resolve, "SetLinkDNS", v,
++ G_DBUS_CALL_FLAGS_NONE,
++ -1, priv->update_cancellable, call_done, self);
++ g_variant_unref (v);
++ }
++
++ while ((v = g_queue_pop_head (&priv->domain_updates)) != NULL) {
++ g_dbus_proxy_call (priv->resolve, "SetLinkDomains", v,
++ G_DBUS_CALL_FLAGS_NONE,
++ -1, priv->update_cancellable, call_done, self);
++ g_variant_unref (v);
++ }
++}
++
++static gboolean
++update (NMDnsPlugin *plugin,
++ const NMDnsIPConfigData **configs,
++ const NMGlobalDnsConfig *global_config,
++ const char *hostname)
++{
++ NMDnsSystemdResolved *self = NM_DNS_SYSTEMD_RESOLVED (plugin);
++ GArray *interfaces = g_array_new (TRUE, TRUE, sizeof (InterfaceConfig));
++ const NMDnsIPConfigData **c;
++ int i;
++
++ for (c = configs; *c != NULL; c++)
++ add_interface_configuration (self, interfaces, *c);
++
++ free_pending_updates (self);
++
++ for (i = 0; i < interfaces->len; i++) {
++ InterfaceConfig *ic = &g_array_index (interfaces, InterfaceConfig, i);
++
++ prepare_one_interface (self, ic);
++ g_list_free (ic->configs);
++ }
++
++ g_array_free (interfaces, TRUE);
++
++ send_updates (self);
++
++ return TRUE;
++}
++
++/****************************************************************/
++
++static gboolean
++is_caching (NMDnsPlugin *plugin)
++{
++ return TRUE;
++}
++
++static const char *
++get_name (NMDnsPlugin *plugin)
++{
++ return "systemd-resolved";
++}
++
++/****************************************************************/
++
++NMDnsPlugin *
++nm_dns_systemd_resolved_new (void)
++{
++ return g_object_new (NM_TYPE_DNS_SYSTEMD_RESOLVED, NULL);
++}
++
++static void
++resolved_proxy_created (GObject *source, GAsyncResult *r, gpointer user_data)
++{
++ NMDnsSystemdResolved *self = (NMDnsSystemdResolved *) user_data;
++ NMDnsSystemdResolvedPrivate *priv;
++ gs_free_error GError *error = NULL;
++ GDBusProxy *resolve;
++
++ resolve = g_dbus_proxy_new_finish (r, &error);
++ if ( !resolve
++ && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
++ return;
++
++ priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self);
++ g_clear_object (&priv->init_cancellable);
++ if (!resolve) {
++ _LOGW ("failed to connect to resolved via DBus: %s", error->message);
++ g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
++ return;
++ }
++
++ priv->resolve = resolve;
++ send_updates (self);
++}
++
++
++static void
++nm_dns_systemd_resolved_init (NMDnsSystemdResolved *self)
++{
++ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self);
++ NMBusManager *dbus_mgr;
++ GDBusConnection *connection;
++
++ g_queue_init (&priv->dns_updates);
++ g_queue_init (&priv->domain_updates);
++
++ dbus_mgr = nm_bus_manager_get ();
++ g_return_if_fail (dbus_mgr);
++
++ connection = nm_bus_manager_get_connection (dbus_mgr);
++ g_return_if_fail (connection);
++
++ priv->init_cancellable = g_cancellable_new ();
++ g_dbus_proxy_new (connection,
++ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
++ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
++ NULL,
++ SYSTEMD_RESOLVED_DBUS_SERVICE,
++ SYSTEMD_RESOLVED_DBUS_PATH,
++ SYSTEMD_RESOLVED_DBUS_SERVICE ".Manager",
++ priv->init_cancellable,
++ resolved_proxy_created,
++ self);
++}
++
++static void
++dispose (GObject *object)
++{
++ NMDnsSystemdResolved *self = NM_DNS_SYSTEMD_RESOLVED (object);
++ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self);
++
++ free_pending_updates (self);
++ g_clear_object (&priv->resolve);
++ nm_clear_g_cancellable (&priv->init_cancellable);
++ nm_clear_g_cancellable (&priv->update_cancellable);
++
++ G_OBJECT_CLASS (nm_dns_systemd_resolved_parent_class)->dispose (object);
++}
++
++static void
++nm_dns_systemd_resolved_class_init (NMDnsSystemdResolvedClass *dns_class)
++{
++ NMDnsPluginClass *plugin_class = NM_DNS_PLUGIN_CLASS (dns_class);
++ GObjectClass *object_class = G_OBJECT_CLASS (dns_class);
++
++ g_type_class_add_private (dns_class, sizeof (NMDnsSystemdResolvedPrivate));
++
++ object_class->dispose = dispose;
++
++ plugin_class->is_caching = is_caching;
++ plugin_class->update = update;
++ plugin_class->get_name = get_name;
++}
++
+diff --git a/src/dns-manager/nm-dns-systemd-resolved.h b/src/dns-manager/nm-dns-systemd-resolved.h
+new file mode 100644
+index 0000000..45c64b3
+--- /dev/null
++++ b/src/dns-manager/nm-dns-systemd-resolved.h
+@@ -0,0 +1,45 @@
++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
++/* This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Copyright (C) 2010 Red Hat, Inc.
++ * Copyright (C) 2016 Sjoerd Simons <sjoerd@luon.net>
++ */
++
++#ifndef __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__
++#define __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__
++
++#include "nm-dns-plugin.h"
++
++#define NM_TYPE_DNS_SYSTEMD_RESOLVED (nm_dns_systemd_resolved_get_type ())
++#define NM_DNS_SYSTEMD_RESOLVED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolved))
++#define NM_DNS_SYSTEMD_RESOLVED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolvedClass))
++#define NM_IS_DNS_SYSTEMD_RESOLVED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED))
++#define NM_IS_DNS_SYSTEMD_RESOLVED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNS_SYSTEMD_RESOLVED))
++#define NM_DNS_SYSTEMD_RESOLVED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolvedClass))
++
++typedef struct {
++ NMDnsPlugin parent;
++} NMDnsSystemdResolved;
++
++typedef struct {
++ NMDnsPluginClass parent;
++} NMDnsSystemdResolvedClass;
++
++GType nm_dns_systemd_resolved_get_type (void);
++
++NMDnsPlugin *nm_dns_systemd_resolved_new (void);
++
++#endif /* __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__ */
++
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch
new file mode 100644
index 0000000..ca7e4a4
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch
@@ -0,0 +1,29 @@
+From 6f799f1f0e68cc7bf89c0a56aec5ecf46937619d Mon Sep 17 00:00:00 2001
+From: Ricardo Salveti <rsalveti@rsalveti.net>
+Date: Thu, 15 Jun 2017 10:02:38 -0300
+Subject: [PATCH] dns/resolved: also check for /etc/resolv-conf.systemd
+
+OE specific resolv.conf path, so it can be enabled by default if available.
+
+Upstream-Status: Inappropriate [OE config specific]
+
+Signed-off-by: Ricardo Salveti <rsalveti@rsalveti.net>
+---
+ src/dns-manager/nm-dns-manager.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
+index c1d2bf7..d70d4b4 100644
+--- a/src/dns-manager/nm-dns-manager.c
++++ b/src/dns-manager/nm-dns-manager.c
+@@ -1596,6 +1596,7 @@ _resolvconf_resolved_managed (void)
+ "/run/systemd/resolve/resolv.conf",
+ "/lib/systemd/resolv.conf",
+ "/usr/lib/systemd/resolv.conf",
++ "/etc/resolv-conf.systemd",
+ };
+ GFile *f;
+ GFileInfo *info;
+--
+2.7.4
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch
new file mode 100644
index 0000000..5c9ed92
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch
@@ -0,0 +1,36 @@
+From 7dd40db6606c3b3559365a03944cb99aee5ceabc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Thu, 4 Apr 2013 12:57:58 +0200
+Subject: [PATCH] don't try to run /sbin/dhclient to get the version number,
+ this break cross-compiling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [build system specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cc66e9b..7163287 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -488,12 +488,6 @@ AS_IF([test -z "$with_dhcpcd"], with_dhcpcd=yes)
+ # Search and check the executables
+ if test "$with_dhclient" = "yes"; then
+ AC_PATH_PROGS(with_dhclient, dhclient, no, /sbin:/usr/sbin:/usr/local/sbin)
+- if test "$with_dhclient" != "no"; then
+- if ! $with_dhclient --version 2>&1 | grep -q "^isc-dhclient-4\."; then
+- AC_MSG_WARN([Cannot use dhclient, version 4.x is required])
+- with_dhclient=no
+- fi
+- fi
+ fi
+ if test "$with_dhcpcd" = "yes"; then
+ AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin)
+--
+1.7.6.5
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch
new file mode 100644
index 0000000..4234e2b
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch
@@ -0,0 +1,29 @@
+From a9bfe6f2029d75caf28fcdf3e740843cf6359615 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 27 Jun 2017 07:31:25 -0700
+Subject: [PATCH 1/2] systemd: xlocale.h is dropped by newer glibc
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/systemd/src/basic/parse-util.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c
+index 9c21e5a..dd95d1f 100644
+--- a/src/systemd/src/basic/parse-util.c
++++ b/src/systemd/src/basic/parse-util.c
+@@ -25,11 +25,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#ifdef __GLIBC__
+-#include <xlocale.h>
+-#else
+ #include <locale.h>
+-#endif
+ #include "alloc-util.h"
+ #include "extract-word.h"
+ #include "macro.h"
+--
+2.13.2
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch
new file mode 100644
index 0000000..aa57c83
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch
@@ -0,0 +1,58 @@
+From 7274bbadd398a69b8babf47431f80d35e0228c42 Mon Sep 17 00:00:00 2001
+From: Adrian Freihofer <adrian.freihofer@gmail.com>
+Date: Mon, 18 Jan 2016 08:53:26 +0100
+Subject: [PATCH] Fix nm-version-macro includes
+
+nm-version-macros.h cannot be found since include directive has
+been changed from " to <. This breaks for example gnome-panel
+build:
+/usr/include/NetworkManager/NetworkManager.h:31:31:
+fatal error: nm-version-macros.h: No such file or directory.
+---
+ libnm-core/nm-version.h | 2 +-
+ libnm-util/NetworkManager.h | 2 +-
+ libnm-util/nm-version.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
+index 730330a..d751bc1 100644
+--- a/libnm-core/nm-version.h
++++ b/libnm-core/nm-version.h
+@@ -23,7 +23,7 @@
+
+ #include <glib.h>
+
+-#include <nm-version-macros.h>
++#include "nm-version-macros.h"
+
+ /* Deprecation / Availability macros */
+
+diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h
+index d83e4ab..3a964fc 100644
+--- a/libnm-util/NetworkManager.h
++++ b/libnm-util/NetworkManager.h
+@@ -28,7 +28,7 @@
+
+ /* This header must not include glib or libnm. */
+
+-#include <nm-version-macros.h>
++#include "nm-version-macros.h"
+
+ /*
+ * dbus services details
+diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h
+index 63895dd..41101a4 100644
+--- a/libnm-util/nm-version.h
++++ b/libnm-util/nm-version.h
+@@ -23,7 +23,7 @@
+
+ #include <glib.h>
+
+-#include <nm-version-macros.h>
++#include "nm-version-macros.h"
+
+ /* Deprecation / Availability macros */
+
+--
+2.5.0
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
new file mode 100644
index 0000000..22bc6e8
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
@@ -0,0 +1,30 @@
+From 98d7e3ae5b15e30af1bf5dd1d279e1a774bf2b86 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 31 Mar 2017 16:05:05 -0700
+Subject: [PATCH 2/5] socket-util.h: Include linux/sockios.h on musl
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/systemd/src/basic/socket-util.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h
+index 2536b08..76d6107 100644
+--- a/src/systemd/src/basic/socket-util.h
++++ b/src/systemd/src/basic/socket-util.h
+@@ -29,6 +29,12 @@
+ #include <linux/netlink.h>
+ #include <linux/if_packet.h>
+
++#if !defined(__GLIBC__)
++/* SIOCGSTAMPNS from linux/asm-generic.h
++ * for src/systemd/src/libsystemd-network/sd-lldp.c */
++#include <linux/sockios.h>
++#endif
++
+ #include "macro.h"
+ #include "util.h"
+
+--
+2.12.1
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch
new file mode 100644
index 0000000..e32b5c0
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch
@@ -0,0 +1,67 @@
+From adc0668b854289a11cfc29597b5566ba1869d17e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 27 Jun 2017 07:32:09 -0700
+Subject: [PATCH 2/2] user format string in g_dbus_message_new_method_error ()
+
+This fixes format errors with -Werror=format-security
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/nm-manager.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/nm-manager.c b/src/nm-manager.c
+index c3d65cd..e814912 100644
+--- a/src/nm-manager.c
++++ b/src/nm-manager.c
+@@ -4871,6 +4871,7 @@ prop_set_auth_done_cb (NMAuthChain *chain,
+ if (error || (result != NM_AUTH_CALL_RESULT_YES)) {
+ reply = g_dbus_message_new_method_error (pfd->message,
+ NM_PERM_DENIED_ERROR,
++ "%s",
+ (error_message = "Not authorized to perform this operation"));
+ if (error)
+ error_message = error->message;
+@@ -4882,6 +4883,7 @@ prop_set_auth_done_cb (NMAuthChain *chain,
+ if (!object) {
+ reply = g_dbus_message_new_method_error (pfd->message,
+ "org.freedesktop.DBus.Error.UnknownObject",
++ "%s",
+ (error_message = "Object doesn't exist."));
+ goto done;
+ }
+@@ -4890,6 +4892,7 @@ prop_set_auth_done_cb (NMAuthChain *chain,
+ if (!nm_exported_object_get_interface_by_type (object, pfd->interface_type)) {
+ reply = g_dbus_message_new_method_error (pfd->message,
+ "org.freedesktop.DBus.Error.InvalidArgs",
++ "%s",
+ (error_message = "Object is of unexpected type."));
+ goto done;
+ }
+@@ -4905,6 +4908,7 @@ prop_set_auth_done_cb (NMAuthChain *chain,
+ if (global_dns && !nm_global_dns_config_is_internal (global_dns)) {
+ reply = g_dbus_message_new_method_error (pfd->message,
+ NM_PERM_DENIED_ERROR,
++ "%s",
+ (error_message = "Global DNS configuration already set via configuration file"));
+ goto done;
+ }
+@@ -4949,6 +4953,7 @@ do_set_property_check (gpointer user_data)
+ if (!pfd->subject) {
+ reply = g_dbus_message_new_method_error (pfd->message,
+ NM_PERM_DENIED_ERROR,
++ "%s",
+ (error_message = "Could not determine request UID."));
+ goto out;
+ }
+@@ -4958,6 +4963,7 @@ do_set_property_check (gpointer user_data)
+ if (!chain) {
+ reply = g_dbus_message_new_method_error (pfd->message,
+ NM_PERM_DENIED_ERROR,
++ "%s",
+ (error_message = "Could not authenticate request."));
+ goto out;
+ }
+--
+2.13.2
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
new file mode 100644
index 0000000..236914f
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
@@ -0,0 +1,39 @@
+From 16c3dc7a407101243d2056d2c93e61dce1a05350 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 31 Mar 2017 16:08:45 -0700
+Subject: [PATCH 3/5] Define ETH_ALEN
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libnm-core/nm-utils.h | 1 +
+ src/platform/wifi/wifi-utils.h | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
+index 156ccae..68e222b 100644
+--- a/libnm-core/nm-utils.h
++++ b/libnm-core/nm-utils.h
+@@ -29,6 +29,7 @@
+
+ /* For ETH_ALEN and INFINIBAND_ALEN */
+ //#include <linux/if_ether.h>
++#define ETH_ALEN 6 /* Octets in one ethernet addr */
+ #include <linux/if_infiniband.h>
+ #include <netinet/in.h>
+
+diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
+index 84f5ce9..33a838d 100644
+--- a/src/platform/wifi/wifi-utils.h
++++ b/src/platform/wifi/wifi-utils.h
+@@ -24,6 +24,8 @@
+
+ //#include <net/ethernet.h>
+
++#define ETH_ALEN 6 /* Octets in one ethernet addr */
++
+ #include "nm-dbus-interface.h"
+
+ typedef struct WifiData WifiData;
+--
+2.12.1
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
new file mode 100644
index 0000000..27c9ae9
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
@@ -0,0 +1,93 @@
+From 2153109e60e362e0d09215d529bf00176f31a3e7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 31 Mar 2017 16:09:41 -0700
+Subject: [PATCH 4/5] Define missing features to cater for musl
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/systemd/sd-adapt/nm-sd-adapt.h | 2 +-
+ src/systemd/src/basic/parse-util.c | 5 ++++-
+ src/systemd/src/basic/stdio-util.h | 2 ++
+ src/systemd/src/basic/util.h | 5 +++++
+ src/systemd/src/systemd/sd-event.h | 4 ----
+ 5 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h
+index cf27c1a..72c1b89 100644
+--- a/src/systemd/sd-adapt/nm-sd-adapt.h
++++ b/src/systemd/sd-adapt/nm-sd-adapt.h
+@@ -119,7 +119,7 @@ G_STMT_START { \
+ # ifdef HAVE___SECURE_GETENV
+ # define secure_getenv __secure_getenv
+ # else
+-# error neither secure_getenv nor __secure_getenv is available
++# define secure_getenv getenv
+ # endif
+ #endif
+
+diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c
+index 2738663..9c21e5a 100644
+--- a/src/systemd/src/basic/parse-util.c
++++ b/src/systemd/src/basic/parse-util.c
+@@ -25,8 +25,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef __GLIBC__
+ #include <xlocale.h>
+-
++#else
++#include <locale.h>
++#endif
+ #include "alloc-util.h"
+ #include "extract-word.h"
+ #include "macro.h"
+diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h
+index bd1144b..c92e935 100644
+--- a/src/systemd/src/basic/stdio-util.h
++++ b/src/systemd/src/basic/stdio-util.h
+@@ -19,7 +19,9 @@
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
+
++#ifdef __GLIBC__
+ #include <printf.h>
++#endif
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <sys/types.h>
+diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h
+index bb2fc31..fe074a5 100644
+--- a/src/systemd/src/basic/util.h
++++ b/src/systemd/src/basic/util.h
+@@ -46,6 +46,11 @@
+ #include "missing.h"
+ #include "time-util.h"
+
++#if !defined(__GLIBC__)
++typedef int (*__compar_fn_t) (const void*, const void*);
++typedef __compar_fn_t comparison_fn_t;
++#endif
++
+ size_t page_size(void) _pure_;
+ #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
+
+diff --git a/src/systemd/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h
+index cc26b7d..c7e0004 100644
+--- a/src/systemd/src/systemd/sd-event.h
++++ b/src/systemd/src/systemd/sd-event.h
+@@ -69,11 +69,7 @@ typedef int (*sd_event_handler_t)(sd_event_source *s, void *userdata);
+ typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata);
+ typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata);
+ typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata);
+-#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED
+ typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata);
+-#else
+-typedef void* sd_event_child_handler_t;
+-#endif
+
+ int sd_event_default(sd_event **e);
+
+--
+2.12.1
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
new file mode 100644
index 0000000..f4a04c7
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
@@ -0,0 +1,36 @@
+From 9e9e5814456ec23b9fc669d342bf9d8f7ee49fc2 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 31 Mar 2017 16:48:00 -0700
+Subject: [PATCH 5/5] sd-lldp.h: Remove net/ethernet.h seems to be over
+ specified
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/systemd/src/systemd/sd-lldp.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h
+===================================================================
+--- NetworkManager-1.4.2.orig/src/systemd/src/systemd/sd-lldp.h
++++ NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h
+@@ -22,7 +22,7 @@
+ ***/
+
+ #include <inttypes.h>
+-#include <net/ethernet.h>
++//#include <net/ethernet.h>
+ #include <sys/types.h>
+
+ #include "sd-event.h"
+Index: NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c
+===================================================================
+--- NetworkManager-1.4.2.orig/src/systemd/src/libsystemd-network/sd-lldp.c
++++ NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c
+@@ -21,6 +21,7 @@
+ #include "nm-sd-adapt.h"
+
+ #include <arpa/inet.h>
++#include <net/ethernet.h>
+
+ #include "sd-lldp.h"
+
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
new file mode 100644
index 0000000..e7dd4ef
--- /dev/null
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
@@ -0,0 +1,132 @@
+SUMMARY = "NetworkManager"
+SECTION = "net/misc"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
+ file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
+ file://docs/api/html/license.html;md5=8eb8e72bab097b9d11763002cb003697 \
+"
+
+DEPENDS = " \
+ intltool-native \
+ libnl \
+ dbus \
+ dbus-glib \
+ dbus-glib-native \
+ libgudev \
+ util-linux \
+ libndp \
+ libnewt \
+ polkit \
+ jansson \
+"
+
+inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection
+
+SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
+ file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
+ file://0002-Fix-nm-version-macro-includes.patch \
+ file://0001-adjust-net-headers-for-musl-compatibility.patch \
+ file://0002-socket-util.h-Include-linux-sockios.h-on-musl.patch \
+ file://0003-Define-ETH_ALEN.patch \
+ file://0004-Define-missing-features-to-cater-for-musl.patch \
+ file://0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \
+ file://0001-check-for-strndupa-before-using-it.patch \
+ file://0001-dns-resolved-add-systemd-resolved-backend.patch \
+ file://0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch \
+ file://0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch \
+ file://0002-user-format-string-in-g_dbus_message_new_method_erro.patch \
+ "
+SRC_URI[md5sum] = "63f1e0d6d7e9099499d062c84c927a75"
+SRC_URI[sha256sum] = "829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309"
+
+S = "${WORKDIR}/NetworkManager-${PV}"
+
+EXTRA_OECONF = " \
+ --disable-ifcfg-rh \
+ --disable-ifnet \
+ --disable-ifcfg-suse \
+ --disable-more-warnings \
+ --with-iptables=${sbindir}/iptables \
+ --with-tests \
+ --with-nmtui=yes \
+"
+
+do_compile_prepend() {
+ export GIR_EXTRA_LIBS_PATH="${B}/libnm-util/.libs"
+}
+
+PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
+ ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \
+"
+PACKAGECONFIG[systemd] = " \
+ --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
+ --without-systemdsystemunitdir, \
+ polkit \
+"
+PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
+# consolekit is not picked by shlibs, so add it to RDEPENDS too
+PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
+PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4"
+PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
+PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp"
+# Use full featured dhcp client instead of internal one
+PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
+PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
+PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
+PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls"
+PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools"
+PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
+PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no"
+PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
+
+PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \
+ ${PN}-nmtui ${PN}-nmtui-doc \
+ ${PN}-adsl \
+"
+
+FILES_libnmutil += "${libdir}/libnm-util.so.*"
+FILES_libnmglib += "${libdir}/libnm-glib.so.*"
+FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*"
+
+FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so"
+
+FILES_${PN} += " \
+ ${libexecdir} \
+ ${libdir}/pppd/*/nm-pppd-plugin.so \
+ ${libdir}/NetworkManager/*.so \
+ ${datadir}/polkit-1 \
+ ${datadir}/dbus-1 \
+ ${base_libdir}/udev/* \
+ ${systemd_unitdir}/system \
+"
+
+RRECOMMENDS_${PN} += "iptables \
+ ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \
+"
+RCONFLICTS_${PN} = "connman"
+
+FILES_${PN}-dev += " \
+ ${datadir}/NetworkManager/gdb-cmd \
+ ${libdir}/pppd/*/*.la \
+ ${libdir}/NetworkManager/*.la \
+"
+
+FILES_${PN}-nmtui = " \
+ ${bindir}/nmtui \
+ ${bindir}/nmtui-edit \
+ ${bindir}/nmtui-connect \
+ ${bindir}/nmtui-hostname \
+"
+
+FILES_${PN}-nmtui-doc = " \
+ ${mandir}/man1/nmtui* \
+"
+
+SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service"
+
+do_install_append() {
+ rm -rf ${D}/run ${D}${localstatedir}/run
+}
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
deleted file mode 100644
index ced0c7c..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-adjust-net-headers-for-musl-compatibility.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 047d3bf96b510740f64687480333c378e414995f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 15:57:05 -0700
-Subject: [PATCH 1/5] adjust net/ headers for musl compatibility
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libnm-core/nm-utils.c | 12 +++++++-----
- libnm-core/nm-utils.h | 5 ++---
- src/platform/wifi/wifi-utils.h | 2 +-
- 3 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
-index df75d56..868224e 100644
---- a/libnm-core/nm-utils.c
-+++ b/libnm-core/nm-utils.c
-@@ -19,24 +19,26 @@
- * Copyright 2005 - 2014 Red Hat, Inc.
- */
-
--#include "nm-default.h"
--
--#include "nm-utils.h"
--
- #include <string.h>
- #include <errno.h>
- #include <stdlib.h>
--#include <netinet/ether.h>
- #include <arpa/inet.h>
- #include <uuid/uuid.h>
- #include <libintl.h>
- #include <gmodule.h>
- #include <sys/stat.h>
-+//#include <net/if_arp.h>
-+//#include <net/ethernet.h>
-+#include <netinet/ether.h>
-+
-+#include "nm-default.h"
-
-+#include "nm-utils.h"
- #if WITH_JANSSON
- #include <jansson.h>
- #endif
-
-+
- #include "nm-common-macros.h"
- #include "nm-utils-private.h"
- #include "nm-setting-private.h"
-diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
-index 407c14e..156ccae 100644
---- a/libnm-core/nm-utils.h
-+++ b/libnm-core/nm-utils.h
-@@ -27,11 +27,10 @@
-
- #include <glib.h>
-
--#include <netinet/in.h>
--
- /* For ETH_ALEN and INFINIBAND_ALEN */
--#include <linux/if_ether.h>
-+//#include <linux/if_ether.h>
- #include <linux/if_infiniband.h>
-+#include <netinet/in.h>
-
- #include "nm-core-enum-types.h"
- #include "nm-setting-wireless-security.h"
-diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
-index 8e2b93f..84f5ce9 100644
---- a/src/platform/wifi/wifi-utils.h
-+++ b/src/platform/wifi/wifi-utils.h
-@@ -22,7 +22,7 @@
- #ifndef __WIFI_UTILS_H__
- #define __WIFI_UTILS_H__
-
--#include <net/ethernet.h>
-+//#include <net/ethernet.h>
-
- #include "nm-dbus-interface.h"
-
---
-2.12.1
-
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch
deleted file mode 100644
index 26f380b..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-check-for-strndupa-before-using-it.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 05e8bd664d0244cb8ab4376b962830b97860f6bf Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 18:37:19 -0700
-Subject: [PATCH] check for strndupa before using it
-
-musl does not have strndupa
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- config.h.in | 4 ++++
- configure.ac | 1 +
- src/systemd/src/basic/alloc-util.h | 12 ++++++++++++
- 3 files changed, 17 insertions(+)
-
-diff --git a/config.h.in b/config.h.in
-index db8c135..c4229ed 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -41,6 +41,10 @@
- */
- #undef HAVE_DCGETTEXT
-
-+/* Define to 1 if you have the declaration of `strndupa', and to 0 if you
-+ don't. */
-+#undef HAVE_DECL_STRNDUPA
-+
- /* Define to 1 if you have the <dlfcn.h> header file. */
- #undef HAVE_DLFCN_H
-
-diff --git a/configure.ac b/configure.ac
-index 2630f8d..d0a57fd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -54,6 +54,7 @@ AC_SUBST(NM_VERSION)
-
- GIT_SHA_RECORD(NM_GIT_SHA)
-
-+AC_CHECK_DECLS([strndupa], [], [], [[#include <string.h>]])
- dnl
- dnl Checks for typedefs, structures, and compiler characteristics.
- dnl
-diff --git a/src/systemd/src/basic/alloc-util.h b/src/systemd/src/basic/alloc-util.h
-index ceeee51..924b59c 100644
---- a/src/systemd/src/basic/alloc-util.h
-+++ b/src/systemd/src/basic/alloc-util.h
-@@ -25,6 +25,18 @@
- #include <string.h>
-
- #include "macro.h"
-+#include "config.h"
-+
-+#if !HAVE_DECL_STRNDUPA
-+#define strndupa(s, n) \
-+ ({ \
-+ const char *__old = (s); \
-+ size_t __len = strnlen(__old, (n)); \
-+ char *__new = (char *)alloca(__len + 1); \
-+ __new[__len] = '\0'; \
-+ (char *)memcpy(__new, __old, __len); \
-+ })
-+#endif
-
- #define new(t, n) ((t*) malloc_multiply(sizeof(t), (n)))
-
---
-2.12.1
-
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch
deleted file mode 100644
index bd194a6..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-add-systemd-resolved-backend.patch
+++ /dev/null
@@ -1,621 +0,0 @@
-From: Sjoerd Simons <sjoerd@luon.net>
-Date: Sun, 21 Aug 2016 21:46:02 +0200
-Subject: [PATCH] dns/resolved: add systemd-resolved backend
-
-Add initial DNS backend that pushes DNS information into
-systemd-resolved. Backend is choosen by default if the systems
-resolv.conv is setup to pointing to one of the standard resolved
-locations.
-
-This doesn't handle global dns configuration.
-
-Signed-off-by: Sjoerd Simons <sjoerd@luon.net>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=762540
-
-Upstream-Status: Backport
-
----
- man/NetworkManager.conf.xml | 10 +-
- src/Makefile.am | 2 +
- src/dns-manager/nm-dns-manager.c | 43 ++-
- src/dns-manager/nm-dns-systemd-resolved.c | 427 ++++++++++++++++++++++++++++++
- src/dns-manager/nm-dns-systemd-resolved.h | 45 ++++
- 5 files changed, 523 insertions(+), 4 deletions(-)
- create mode 100644 src/dns-manager/nm-dns-systemd-resolved.c
- create mode 100644 src/dns-manager/nm-dns-systemd-resolved.h
-
-diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
-index 6295b82..0a67ae5 100644
---- a/man/NetworkManager.conf.xml
-+++ b/man/NetworkManager.conf.xml
-@@ -275,10 +275,12 @@ no-auto-default=*
- <varlistentry>
- <term><varname>dns</varname></term>
- <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode.</para>
-- <para><literal>default</literal>: The default if the key is
-- not specified. NetworkManager will update
-+ <para><literal>default</literal>: NetworkManager will update
- <filename>resolv.conf</filename> to reflect the nameservers
-- provided by currently active connections.</para>
-+ provided by currently active connections. This is the default
-+ if the key is not specified, unless the system is configured
-+ to use systemd-resolved; in this case the default is
-+ <literal>systemd-resolved</literal></para>
- <para><literal>dnsmasq</literal>: NetworkManager will run
- dnsmasq as a local caching nameserver, using a "split DNS"
- configuration if you are connected to a VPN, and then update
-@@ -288,6 +290,8 @@ no-auto-default=*
- to unbound and dnssec-triggerd, providing a "split DNS"
- configuration with DNSSEC support. The <filename>/etc/resolv.conf</filename>
- will be managed by dnssec-trigger daemon.</para>
-+ <para><literal>systemd-resolved</literal>: NetworkManager will
-+ push the DNS configuration to systemd-resolved</para>
- <para><literal>none</literal>: NetworkManager will not
- modify resolv.conf. This implies
- <literal>rc-manager</literal> <literal>unmanaged</literal></para>
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8d29b19..10f63de 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -345,6 +345,8 @@ libNetworkManager_la_SOURCES = \
- \
- dns-manager/nm-dns-dnsmasq.c \
- dns-manager/nm-dns-dnsmasq.h \
-+ dns-manager/nm-dns-systemd-resolved.c \
-+ dns-manager/nm-dns-systemd-resolved.h \
- dns-manager/nm-dns-unbound.c \
- dns-manager/nm-dns-unbound.h \
- dns-manager/nm-dns-manager.c \
-diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
-index 5a758a9..38bc786 100644
---- a/src/dns-manager/nm-dns-manager.c
-+++ b/src/dns-manager/nm-dns-manager.c
-@@ -45,6 +45,7 @@
-
- #include "nm-dns-plugin.h"
- #include "nm-dns-dnsmasq.h"
-+#include "nm-dns-systemd-resolved.h"
- #include "nm-dns-unbound.h"
-
- #if WITH_LIBSOUP
-@@ -1588,6 +1589,37 @@ _check_resconf_immutable (NMDnsManagerResolvConfManager rc_manager)
-
- NM_DEFINE_SINGLETON_GETTER (NMDnsManager, nm_dns_manager_get, NM_TYPE_DNS_MANAGER);
-
-+static gboolean
-+_resolvconf_resolved_managed (void)
-+{
-+ static const char *const resolved_paths[] = {
-+ "/run/systemd/resolve/resolv.conf",
-+ "/lib/systemd/resolv.conf",
-+ "/usr/lib/systemd/resolv.conf",
-+ };
-+ GFile *f;
-+ GFileInfo *info;
-+ gboolean ret = FALSE;
-+
-+ f = g_file_new_for_path (_PATH_RESCONF);
-+ info = g_file_query_info (f,
-+ G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK","\
-+ G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET,
-+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-+ NULL, NULL);
-+
-+ if (info && g_file_info_get_is_symlink (info)) {
-+ ret = _nm_utils_strv_find_first ((gchar **) resolved_paths,
-+ G_N_ELEMENTS (resolved_paths),
-+ g_file_info_get_symlink_target (info)) >= 0;
-+ }
-+
-+ g_clear_object(&info);
-+ g_clear_object(&f);
-+
-+ return ret;
-+}
-+
- static void
- init_resolv_conf_mode (NMDnsManager *self, gboolean force_reload_plugin)
- {
-@@ -1633,7 +1665,16 @@ again:
-
- rc_manager = _check_resconf_immutable (rc_manager);
-
-- if (nm_streq0 (mode, "dnsmasq")) {
-+ if ( (!mode && _resolvconf_resolved_managed ())
-+ || nm_streq0 (mode, "systemd-resolved")) {
-+ if ( force_reload_plugin
-+ || !NM_IS_DNS_SYSTEMD_RESOLVED (priv->plugin)) {
-+ _clear_plugin (self);
-+ priv->plugin = nm_dns_systemd_resolved_new ();
-+ plugin_changed = TRUE;
-+ }
-+ mode = "systemd-resolved";
-+ } else if (nm_streq0 (mode, "dnsmasq")) {
- if (force_reload_plugin || !NM_IS_DNS_DNSMASQ (priv->plugin)) {
- _clear_plugin (self);
- priv->plugin = nm_dns_dnsmasq_new ();
-diff --git a/src/dns-manager/nm-dns-systemd-resolved.c b/src/dns-manager/nm-dns-systemd-resolved.c
-new file mode 100644
-index 0000000..6bdd5f6
---- /dev/null
-+++ b/src/dns-manager/nm-dns-systemd-resolved.c
-@@ -0,0 +1,427 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/*
-+ * Copyright (C) 2010 Dan Williams <dcbw@redhat.com>
-+ * Copyright (C) 2016 Sjoerd Simons <sjoerd@luon.net>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ */
-+
-+#include "nm-default.h"
-+
-+#include "nm-dns-systemd-resolved.h"
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#include <arpa/inet.h>
-+#include <sys/stat.h>
-+#include <linux/if.h>
-+
-+#include "nm-core-internal.h"
-+#include "nm-platform.h"
-+#include "nm-utils.h"
-+#include "nm-ip4-config.h"
-+#include "nm-ip6-config.h"
-+#include "nm-bus-manager.h"
-+#include "nm-manager.h"
-+#include "nm-device.h"
-+#include "NetworkManagerUtils.h"
-+
-+G_DEFINE_TYPE (NMDnsSystemdResolved, nm_dns_systemd_resolved, NM_TYPE_DNS_PLUGIN)
-+
-+#define NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE(o) \
-+ (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_SYSTEMD_RESOLVED, \
-+ NMDnsSystemdResolvedPrivate))
-+
-+#define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1"
-+#define SYSTEMD_RESOLVED_DBUS_PATH "/org/freedesktop/resolve1"
-+
-+typedef struct {
-+ int ifindex;
-+ GList *configs;
-+} InterfaceConfig;
-+
-+typedef struct {
-+ GDBusProxy *resolve;
-+ GCancellable *init_cancellable;
-+ GCancellable *update_cancellable;
-+ GQueue dns_updates;
-+ GQueue domain_updates;
-+} NMDnsSystemdResolvedPrivate;
-+
-+/*****************************************************************************/
-+
-+#define _NMLOG_DOMAIN LOGD_DNS
-+#define _NMLOG_PREFIX_NAME "systemd-resolved"
-+#define _NMLOG(level, ...) \
-+ G_STMT_START { \
-+ nm_log ((level), _NMLOG_DOMAIN, \
-+ "%s[%p]: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
-+ _NMLOG_PREFIX_NAME, \
-+ (self) \
-+ _NM_UTILS_MACRO_REST(__VA_ARGS__)); \
-+ } G_STMT_END
-+
-+/*****************************************************************************/
-+
-+static void
-+call_done (GObject *source, GAsyncResult *r, gpointer user_data)
-+{
-+ GVariant *v;
-+ GError *error = NULL;
-+ NMDnsSystemdResolved *self = (NMDnsSystemdResolved *) user_data;
-+
-+ v = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), r, &error);
-+
-+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-+ return;
-+
-+ if (error != NULL) {
-+ _LOGW ("Failed: %s\n", error->message);
-+ g_error_free (error);
-+ }
-+}
-+
-+static void
-+add_interface_configuration (NMDnsSystemdResolved *self,
-+ GArray *interfaces,
-+ const NMDnsIPConfigData *data)
-+{
-+ int i;
-+ InterfaceConfig *ic = NULL;
-+ int ifindex;
-+ NMDevice *device;
-+
-+ if (NM_IS_IP4_CONFIG (data->config))
-+ ifindex = nm_ip4_config_get_ifindex (data->config);
-+ else if (NM_IS_IP6_CONFIG (data->config))
-+ ifindex = nm_ip6_config_get_ifindex (data->config);
-+ else
-+ g_return_if_reached ();
-+
-+ device = nm_manager_get_device_by_ifindex (nm_manager_get (), ifindex);
-+
-+ if (!nm_device_get_managed (device, FALSE))
-+ return;
-+
-+ for (i = 0; i < interfaces->len; i++) {
-+ InterfaceConfig *tic = &g_array_index (interfaces, InterfaceConfig, i);
-+ if (ifindex == tic->ifindex) {
-+ ic = tic;
-+ break;
-+ }
-+ }
-+
-+ if (!ic) {
-+ g_array_set_size (interfaces, interfaces->len + 1);
-+ ic = &g_array_index (interfaces, InterfaceConfig,
-+ interfaces->len - 1);
-+ ic->ifindex = ifindex;
-+ }
-+
-+ ic->configs = g_list_append (ic->configs, data->config);
-+}
-+
-+static void
-+add_domain (GVariantBuilder *domains,
-+ const char *domain,
-+ gboolean never_default)
-+{
-+ /* If this link is never the default (e.g. only used for resources on this
-+ * network) add a routing domain. */
-+ g_variant_builder_add (domains, "(sb)", domain, never_default);
-+}
-+
-+static void
-+update_add_ip6_config (NMDnsSystemdResolved *self,
-+ GVariantBuilder *dns,
-+ GVariantBuilder *domains,
-+ const NMIP6Config *config)
-+{
-+ guint i, n;
-+
-+ n = nm_ip6_config_get_num_nameservers (config);
-+ for (i = 0 ; i < n; i++) {
-+ const struct in6_addr *ip;
-+
-+ g_variant_builder_open (dns, G_VARIANT_TYPE ("(iay)"));
-+ g_variant_builder_add (dns, "i", AF_INET6);
-+ ip = nm_ip6_config_get_nameserver (config, i),
-+
-+ g_variant_builder_add_value (dns, g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, ip, 16, 1));
-+ g_variant_builder_close (dns);
-+ }
-+
-+ n = nm_ip6_config_get_num_searches (config);
-+ if (n > 0) {
-+ for (i = 0; i < n; i++) {
-+ add_domain (domains, nm_ip6_config_get_search (config, i),
-+ nm_ip6_config_get_never_default (config));
-+ }
-+ } else {
-+ n = nm_ip6_config_get_num_domains (config);
-+ for (i = 0; i < n; i++) {
-+ add_domain (domains, nm_ip6_config_get_domain (config, i),
-+ nm_ip6_config_get_never_default (config));
-+ }
-+ }
-+}
-+
-+static void
-+update_add_ip4_config (NMDnsSystemdResolved *self,
-+ GVariantBuilder *dns,
-+ GVariantBuilder *domains,
-+ const NMIP4Config *config)
-+{
-+ guint i, n;
-+
-+ n = nm_ip4_config_get_num_nameservers (config);
-+ for (i = 0 ; i < n; i++) {
-+ guint32 ns;
-+
-+ g_variant_builder_open (dns, G_VARIANT_TYPE ("(iay)"));
-+ g_variant_builder_add (dns, "i", AF_INET);
-+ ns = nm_ip4_config_get_nameserver (config, i),
-+
-+ g_variant_builder_add_value (dns, g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, &ns, 4, 1));
-+ g_variant_builder_close (dns);
-+ }
-+
-+ n = nm_ip4_config_get_num_searches (config);
-+ if (n > 0) {
-+ for (i = 0; i < n; i++) {
-+ add_domain (domains, nm_ip4_config_get_search (config, i),
-+ nm_ip4_config_get_never_default (config));
-+ }
-+ } else {
-+ n = nm_ip4_config_get_num_domains (config);
-+ for (i = 0; i < n; i++) {
-+ add_domain (domains, nm_ip4_config_get_domain (config, i),
-+ nm_ip4_config_get_never_default (config));
-+ }
-+ }
-+}
-+
-+static void
-+free_pending_updates (NMDnsSystemdResolved *self)
-+{
-+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self);
-+ GVariant *v;
-+
-+ while ((v = g_queue_pop_head (&priv->dns_updates)) != NULL)
-+ g_variant_unref (v);
-+
-+ while ((v = g_queue_pop_head (&priv->domain_updates)) != NULL)
-+ g_variant_unref (v);
-+}
-+
-+static void
-+prepare_one_interface (NMDnsSystemdResolved *self, InterfaceConfig *ic)
-+{
-+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self);
-+ GVariantBuilder dns, domains;
-+ GList *l;
-+
-+ g_variant_builder_init (&dns, G_VARIANT_TYPE ("(ia(iay))"));
-+ g_variant_builder_add (&dns, "i", ic->ifindex);
-+ g_variant_builder_open (&dns, G_VARIANT_TYPE ("a(iay)"));
-+
-+ g_variant_builder_init (&domains, G_VARIANT_TYPE ("(ia(sb))"));
-+ g_variant_builder_add (&domains, "i", ic->ifindex);
-+ g_variant_builder_open (&domains, G_VARIANT_TYPE ("a(sb)"));
-+
-+ for (l = ic->configs ; l != NULL ; l = g_list_next (l)) {
-+ if (NM_IS_IP4_CONFIG (l->data))
-+ update_add_ip4_config (self, &dns, &domains, l->data);
-+ else if (NM_IS_IP6_CONFIG (l->data))
-+ update_add_ip6_config (self, &dns, &domains, l->data);
-+ else
-+ g_assert_not_reached ();
-+ }
-+ g_variant_builder_close (&dns);
-+ g_variant_builder_close (&domains);
-+
-+ g_queue_push_tail (&priv->dns_updates,
-+ g_variant_ref_sink (g_variant_builder_end (&dns)));
-+ g_queue_push_tail (&priv->domain_updates,
-+ g_variant_ref_sink (g_variant_builder_end (&domains)));
-+}
-+
-+static void
-+send_updates (NMDnsSystemdResolved *self)
-+{
-+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self);
-+ GVariant *v;
-+
-+ nm_clear_g_cancellable (&priv->update_cancellable);
-+
-+ if (!priv->resolve)
-+ return;
-+
-+ priv->update_cancellable = g_cancellable_new ();
-+
-+ while ((v = g_queue_pop_head (&priv->dns_updates)) != NULL) {
-+ g_dbus_proxy_call (priv->resolve, "SetLinkDNS", v,
-+ G_DBUS_CALL_FLAGS_NONE,
-+ -1, priv->update_cancellable, call_done, self);
-+ g_variant_unref (v);
-+ }
-+
-+ while ((v = g_queue_pop_head (&priv->domain_updates)) != NULL) {
-+ g_dbus_proxy_call (priv->resolve, "SetLinkDomains", v,
-+ G_DBUS_CALL_FLAGS_NONE,
-+ -1, priv->update_cancellable, call_done, self);
-+ g_variant_unref (v);
-+ }
-+}
-+
-+static gboolean
-+update (NMDnsPlugin *plugin,
-+ const NMDnsIPConfigData **configs,
-+ const NMGlobalDnsConfig *global_config,
-+ const char *hostname)
-+{
-+ NMDnsSystemdResolved *self = NM_DNS_SYSTEMD_RESOLVED (plugin);
-+ GArray *interfaces = g_array_new (TRUE, TRUE, sizeof (InterfaceConfig));
-+ const NMDnsIPConfigData **c;
-+ int i;
-+
-+ for (c = configs; *c != NULL; c++)
-+ add_interface_configuration (self, interfaces, *c);
-+
-+ free_pending_updates (self);
-+
-+ for (i = 0; i < interfaces->len; i++) {
-+ InterfaceConfig *ic = &g_array_index (interfaces, InterfaceConfig, i);
-+
-+ prepare_one_interface (self, ic);
-+ g_list_free (ic->configs);
-+ }
-+
-+ g_array_free (interfaces, TRUE);
-+
-+ send_updates (self);
-+
-+ return TRUE;
-+}
-+
-+/****************************************************************/
-+
-+static gboolean
-+is_caching (NMDnsPlugin *plugin)
-+{
-+ return TRUE;
-+}
-+
-+static const char *
-+get_name (NMDnsPlugin *plugin)
-+{
-+ return "systemd-resolved";
-+}
-+
-+/****************************************************************/
-+
-+NMDnsPlugin *
-+nm_dns_systemd_resolved_new (void)
-+{
-+ return g_object_new (NM_TYPE_DNS_SYSTEMD_RESOLVED, NULL);
-+}
-+
-+static void
-+resolved_proxy_created (GObject *source, GAsyncResult *r, gpointer user_data)
-+{
-+ NMDnsSystemdResolved *self = (NMDnsSystemdResolved *) user_data;
-+ NMDnsSystemdResolvedPrivate *priv;
-+ gs_free_error GError *error = NULL;
-+ GDBusProxy *resolve;
-+
-+ resolve = g_dbus_proxy_new_finish (r, &error);
-+ if ( !resolve
-+ && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-+ return;
-+
-+ priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self);
-+ g_clear_object (&priv->init_cancellable);
-+ if (!resolve) {
-+ _LOGW ("failed to connect to resolved via DBus: %s", error->message);
-+ g_signal_emit_by_name (self, NM_DNS_PLUGIN_FAILED);
-+ return;
-+ }
-+
-+ priv->resolve = resolve;
-+ send_updates (self);
-+}
-+
-+
-+static void
-+nm_dns_systemd_resolved_init (NMDnsSystemdResolved *self)
-+{
-+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self);
-+ NMBusManager *dbus_mgr;
-+ GDBusConnection *connection;
-+
-+ g_queue_init (&priv->dns_updates);
-+ g_queue_init (&priv->domain_updates);
-+
-+ dbus_mgr = nm_bus_manager_get ();
-+ g_return_if_fail (dbus_mgr);
-+
-+ connection = nm_bus_manager_get_connection (dbus_mgr);
-+ g_return_if_fail (connection);
-+
-+ priv->init_cancellable = g_cancellable_new ();
-+ g_dbus_proxy_new (connection,
-+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
-+ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
-+ NULL,
-+ SYSTEMD_RESOLVED_DBUS_SERVICE,
-+ SYSTEMD_RESOLVED_DBUS_PATH,
-+ SYSTEMD_RESOLVED_DBUS_SERVICE ".Manager",
-+ priv->init_cancellable,
-+ resolved_proxy_created,
-+ self);
-+}
-+
-+static void
-+dispose (GObject *object)
-+{
-+ NMDnsSystemdResolved *self = NM_DNS_SYSTEMD_RESOLVED (object);
-+ NMDnsSystemdResolvedPrivate *priv = NM_DNS_SYSTEMD_RESOLVED_GET_PRIVATE (self);
-+
-+ free_pending_updates (self);
-+ g_clear_object (&priv->resolve);
-+ nm_clear_g_cancellable (&priv->init_cancellable);
-+ nm_clear_g_cancellable (&priv->update_cancellable);
-+
-+ G_OBJECT_CLASS (nm_dns_systemd_resolved_parent_class)->dispose (object);
-+}
-+
-+static void
-+nm_dns_systemd_resolved_class_init (NMDnsSystemdResolvedClass *dns_class)
-+{
-+ NMDnsPluginClass *plugin_class = NM_DNS_PLUGIN_CLASS (dns_class);
-+ GObjectClass *object_class = G_OBJECT_CLASS (dns_class);
-+
-+ g_type_class_add_private (dns_class, sizeof (NMDnsSystemdResolvedPrivate));
-+
-+ object_class->dispose = dispose;
-+
-+ plugin_class->is_caching = is_caching;
-+ plugin_class->update = update;
-+ plugin_class->get_name = get_name;
-+}
-+
-diff --git a/src/dns-manager/nm-dns-systemd-resolved.h b/src/dns-manager/nm-dns-systemd-resolved.h
-new file mode 100644
-index 0000000..45c64b3
---- /dev/null
-+++ b/src/dns-manager/nm-dns-systemd-resolved.h
-@@ -0,0 +1,45 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ * Copyright (C) 2016 Sjoerd Simons <sjoerd@luon.net>
-+ */
-+
-+#ifndef __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__
-+#define __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__
-+
-+#include "nm-dns-plugin.h"
-+
-+#define NM_TYPE_DNS_SYSTEMD_RESOLVED (nm_dns_systemd_resolved_get_type ())
-+#define NM_DNS_SYSTEMD_RESOLVED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolved))
-+#define NM_DNS_SYSTEMD_RESOLVED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolvedClass))
-+#define NM_IS_DNS_SYSTEMD_RESOLVED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED))
-+#define NM_IS_DNS_SYSTEMD_RESOLVED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DNS_SYSTEMD_RESOLVED))
-+#define NM_DNS_SYSTEMD_RESOLVED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DNS_SYSTEMD_RESOLVED, NMDnsSystemdResolvedClass))
-+
-+typedef struct {
-+ NMDnsPlugin parent;
-+} NMDnsSystemdResolved;
-+
-+typedef struct {
-+ NMDnsPluginClass parent;
-+} NMDnsSystemdResolvedClass;
-+
-+GType nm_dns_systemd_resolved_get_type (void);
-+
-+NMDnsPlugin *nm_dns_systemd_resolved_new (void);
-+
-+#endif /* __NETWORKMANAGER_DNS_SYSTEMD_RESOLVED_H__ */
-+
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch
deleted file mode 100644
index ca7e4a4..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6f799f1f0e68cc7bf89c0a56aec5ecf46937619d Mon Sep 17 00:00:00 2001
-From: Ricardo Salveti <rsalveti@rsalveti.net>
-Date: Thu, 15 Jun 2017 10:02:38 -0300
-Subject: [PATCH] dns/resolved: also check for /etc/resolv-conf.systemd
-
-OE specific resolv.conf path, so it can be enabled by default if available.
-
-Upstream-Status: Inappropriate [OE config specific]
-
-Signed-off-by: Ricardo Salveti <rsalveti@rsalveti.net>
----
- src/dns-manager/nm-dns-manager.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
-index c1d2bf7..d70d4b4 100644
---- a/src/dns-manager/nm-dns-manager.c
-+++ b/src/dns-manager/nm-dns-manager.c
-@@ -1596,6 +1596,7 @@ _resolvconf_resolved_managed (void)
- "/run/systemd/resolve/resolv.conf",
- "/lib/systemd/resolv.conf",
- "/usr/lib/systemd/resolv.conf",
-+ "/etc/resolv-conf.systemd",
- };
- GFile *f;
- GFileInfo *info;
---
-2.7.4
-
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch
deleted file mode 100644
index 5c9ed92..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7dd40db6606c3b3559365a03944cb99aee5ceabc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Thu, 4 Apr 2013 12:57:58 +0200
-Subject: [PATCH] don't try to run /sbin/dhclient to get the version number,
- this break cross-compiling
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [build system specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- configure.ac | 6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index cc66e9b..7163287 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -488,12 +488,6 @@ AS_IF([test -z "$with_dhcpcd"], with_dhcpcd=yes)
- # Search and check the executables
- if test "$with_dhclient" = "yes"; then
- AC_PATH_PROGS(with_dhclient, dhclient, no, /sbin:/usr/sbin:/usr/local/sbin)
-- if test "$with_dhclient" != "no"; then
-- if ! $with_dhclient --version 2>&1 | grep -q "^isc-dhclient-4\."; then
-- AC_MSG_WARN([Cannot use dhclient, version 4.x is required])
-- with_dhclient=no
-- fi
-- fi
- fi
- if test "$with_dhcpcd" = "yes"; then
- AC_PATH_PROGS(with_dhcpcd, dhcpcd, no, /sbin:/usr/sbin:/usr/local/sbin)
---
-1.7.6.5
-
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch
deleted file mode 100644
index 4234e2b..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a9bfe6f2029d75caf28fcdf3e740843cf6359615 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 27 Jun 2017 07:31:25 -0700
-Subject: [PATCH 1/2] systemd: xlocale.h is dropped by newer glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/systemd/src/basic/parse-util.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c
-index 9c21e5a..dd95d1f 100644
---- a/src/systemd/src/basic/parse-util.c
-+++ b/src/systemd/src/basic/parse-util.c
-@@ -25,11 +25,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#ifdef __GLIBC__
--#include <xlocale.h>
--#else
- #include <locale.h>
--#endif
- #include "alloc-util.h"
- #include "extract-word.h"
- #include "macro.h"
---
-2.13.2
-
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch
deleted file mode 100644
index aa57c83..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-Fix-nm-version-macro-includes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 7274bbadd398a69b8babf47431f80d35e0228c42 Mon Sep 17 00:00:00 2001
-From: Adrian Freihofer <adrian.freihofer@gmail.com>
-Date: Mon, 18 Jan 2016 08:53:26 +0100
-Subject: [PATCH] Fix nm-version-macro includes
-
-nm-version-macros.h cannot be found since include directive has
-been changed from " to <. This breaks for example gnome-panel
-build:
-/usr/include/NetworkManager/NetworkManager.h:31:31:
-fatal error: nm-version-macros.h: No such file or directory.
----
- libnm-core/nm-version.h | 2 +-
- libnm-util/NetworkManager.h | 2 +-
- libnm-util/nm-version.h | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
-index 730330a..d751bc1 100644
---- a/libnm-core/nm-version.h
-+++ b/libnm-core/nm-version.h
-@@ -23,7 +23,7 @@
-
- #include <glib.h>
-
--#include <nm-version-macros.h>
-+#include "nm-version-macros.h"
-
- /* Deprecation / Availability macros */
-
-diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h
-index d83e4ab..3a964fc 100644
---- a/libnm-util/NetworkManager.h
-+++ b/libnm-util/NetworkManager.h
-@@ -28,7 +28,7 @@
-
- /* This header must not include glib or libnm. */
-
--#include <nm-version-macros.h>
-+#include "nm-version-macros.h"
-
- /*
- * dbus services details
-diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h
-index 63895dd..41101a4 100644
---- a/libnm-util/nm-version.h
-+++ b/libnm-util/nm-version.h
-@@ -23,7 +23,7 @@
-
- #include <glib.h>
-
--#include <nm-version-macros.h>
-+#include "nm-version-macros.h"
-
- /* Deprecation / Availability macros */
-
---
-2.5.0
-
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
deleted file mode 100644
index 22bc6e8..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-socket-util.h-Include-linux-sockios.h-on-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 98d7e3ae5b15e30af1bf5dd1d279e1a774bf2b86 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 16:05:05 -0700
-Subject: [PATCH 2/5] socket-util.h: Include linux/sockios.h on musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/systemd/src/basic/socket-util.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h
-index 2536b08..76d6107 100644
---- a/src/systemd/src/basic/socket-util.h
-+++ b/src/systemd/src/basic/socket-util.h
-@@ -29,6 +29,12 @@
- #include <linux/netlink.h>
- #include <linux/if_packet.h>
-
-+#if !defined(__GLIBC__)
-+/* SIOCGSTAMPNS from linux/asm-generic.h
-+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
-+#include <linux/sockios.h>
-+#endif
-+
- #include "macro.h"
- #include "util.h"
-
---
-2.12.1
-
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch
deleted file mode 100644
index e32b5c0..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-user-format-string-in-g_dbus_message_new_method_erro.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From adc0668b854289a11cfc29597b5566ba1869d17e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 27 Jun 2017 07:32:09 -0700
-Subject: [PATCH 2/2] user format string in g_dbus_message_new_method_error ()
-
-This fixes format errors with -Werror=format-security
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/nm-manager.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index c3d65cd..e814912 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -4871,6 +4871,7 @@ prop_set_auth_done_cb (NMAuthChain *chain,
- if (error || (result != NM_AUTH_CALL_RESULT_YES)) {
- reply = g_dbus_message_new_method_error (pfd->message,
- NM_PERM_DENIED_ERROR,
-+ "%s",
- (error_message = "Not authorized to perform this operation"));
- if (error)
- error_message = error->message;
-@@ -4882,6 +4883,7 @@ prop_set_auth_done_cb (NMAuthChain *chain,
- if (!object) {
- reply = g_dbus_message_new_method_error (pfd->message,
- "org.freedesktop.DBus.Error.UnknownObject",
-+ "%s",
- (error_message = "Object doesn't exist."));
- goto done;
- }
-@@ -4890,6 +4892,7 @@ prop_set_auth_done_cb (NMAuthChain *chain,
- if (!nm_exported_object_get_interface_by_type (object, pfd->interface_type)) {
- reply = g_dbus_message_new_method_error (pfd->message,
- "org.freedesktop.DBus.Error.InvalidArgs",
-+ "%s",
- (error_message = "Object is of unexpected type."));
- goto done;
- }
-@@ -4905,6 +4908,7 @@ prop_set_auth_done_cb (NMAuthChain *chain,
- if (global_dns && !nm_global_dns_config_is_internal (global_dns)) {
- reply = g_dbus_message_new_method_error (pfd->message,
- NM_PERM_DENIED_ERROR,
-+ "%s",
- (error_message = "Global DNS configuration already set via configuration file"));
- goto done;
- }
-@@ -4949,6 +4953,7 @@ do_set_property_check (gpointer user_data)
- if (!pfd->subject) {
- reply = g_dbus_message_new_method_error (pfd->message,
- NM_PERM_DENIED_ERROR,
-+ "%s",
- (error_message = "Could not determine request UID."));
- goto out;
- }
-@@ -4958,6 +4963,7 @@ do_set_property_check (gpointer user_data)
- if (!chain) {
- reply = g_dbus_message_new_method_error (pfd->message,
- NM_PERM_DENIED_ERROR,
-+ "%s",
- (error_message = "Could not authenticate request."));
- goto out;
- }
---
-2.13.2
-
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
deleted file mode 100644
index 236914f..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0003-Define-ETH_ALEN.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 16c3dc7a407101243d2056d2c93e61dce1a05350 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 16:08:45 -0700
-Subject: [PATCH 3/5] Define ETH_ALEN
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libnm-core/nm-utils.h | 1 +
- src/platform/wifi/wifi-utils.h | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
-index 156ccae..68e222b 100644
---- a/libnm-core/nm-utils.h
-+++ b/libnm-core/nm-utils.h
-@@ -29,6 +29,7 @@
-
- /* For ETH_ALEN and INFINIBAND_ALEN */
- //#include <linux/if_ether.h>
-+#define ETH_ALEN 6 /* Octets in one ethernet addr */
- #include <linux/if_infiniband.h>
- #include <netinet/in.h>
-
-diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
-index 84f5ce9..33a838d 100644
---- a/src/platform/wifi/wifi-utils.h
-+++ b/src/platform/wifi/wifi-utils.h
-@@ -24,6 +24,8 @@
-
- //#include <net/ethernet.h>
-
-+#define ETH_ALEN 6 /* Octets in one ethernet addr */
-+
- #include "nm-dbus-interface.h"
-
- typedef struct WifiData WifiData;
---
-2.12.1
-
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
deleted file mode 100644
index 27c9ae9..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0004-Define-missing-features-to-cater-for-musl.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 2153109e60e362e0d09215d529bf00176f31a3e7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 16:09:41 -0700
-Subject: [PATCH 4/5] Define missing features to cater for musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/systemd/sd-adapt/nm-sd-adapt.h | 2 +-
- src/systemd/src/basic/parse-util.c | 5 ++++-
- src/systemd/src/basic/stdio-util.h | 2 ++
- src/systemd/src/basic/util.h | 5 +++++
- src/systemd/src/systemd/sd-event.h | 4 ----
- 5 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/src/systemd/sd-adapt/nm-sd-adapt.h b/src/systemd/sd-adapt/nm-sd-adapt.h
-index cf27c1a..72c1b89 100644
---- a/src/systemd/sd-adapt/nm-sd-adapt.h
-+++ b/src/systemd/sd-adapt/nm-sd-adapt.h
-@@ -119,7 +119,7 @@ G_STMT_START { \
- # ifdef HAVE___SECURE_GETENV
- # define secure_getenv __secure_getenv
- # else
--# error neither secure_getenv nor __secure_getenv is available
-+# define secure_getenv getenv
- # endif
- #endif
-
-diff --git a/src/systemd/src/basic/parse-util.c b/src/systemd/src/basic/parse-util.c
-index 2738663..9c21e5a 100644
---- a/src/systemd/src/basic/parse-util.c
-+++ b/src/systemd/src/basic/parse-util.c
-@@ -25,8 +25,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifdef __GLIBC__
- #include <xlocale.h>
--
-+#else
-+#include <locale.h>
-+#endif
- #include "alloc-util.h"
- #include "extract-word.h"
- #include "macro.h"
-diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h
-index bd1144b..c92e935 100644
---- a/src/systemd/src/basic/stdio-util.h
-+++ b/src/systemd/src/basic/stdio-util.h
-@@ -19,7 +19,9 @@
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
- ***/
-
-+#ifdef __GLIBC__
- #include <printf.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
-diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h
-index bb2fc31..fe074a5 100644
---- a/src/systemd/src/basic/util.h
-+++ b/src/systemd/src/basic/util.h
-@@ -46,6 +46,11 @@
- #include "missing.h"
- #include "time-util.h"
-
-+#if !defined(__GLIBC__)
-+typedef int (*__compar_fn_t) (const void*, const void*);
-+typedef __compar_fn_t comparison_fn_t;
-+#endif
-+
- size_t page_size(void) _pure_;
- #define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
-
-diff --git a/src/systemd/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h
-index cc26b7d..c7e0004 100644
---- a/src/systemd/src/systemd/sd-event.h
-+++ b/src/systemd/src/systemd/sd-event.h
-@@ -69,11 +69,7 @@ typedef int (*sd_event_handler_t)(sd_event_source *s, void *userdata);
- typedef int (*sd_event_io_handler_t)(sd_event_source *s, int fd, uint32_t revents, void *userdata);
- typedef int (*sd_event_time_handler_t)(sd_event_source *s, uint64_t usec, void *userdata);
- typedef int (*sd_event_signal_handler_t)(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata);
--#if defined __USE_POSIX199309 || defined __USE_XOPEN_EXTENDED
- typedef int (*sd_event_child_handler_t)(sd_event_source *s, const siginfo_t *si, void *userdata);
--#else
--typedef void* sd_event_child_handler_t;
--#endif
-
- int sd_event_default(sd_event **e);
-
---
-2.12.1
-
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch b/meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
deleted file mode 100644
index f4a04c7..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager/0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9e9e5814456ec23b9fc669d342bf9d8f7ee49fc2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 31 Mar 2017 16:48:00 -0700
-Subject: [PATCH 5/5] sd-lldp.h: Remove net/ethernet.h seems to be over
- specified
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/systemd/src/systemd/sd-lldp.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h
-===================================================================
---- NetworkManager-1.4.2.orig/src/systemd/src/systemd/sd-lldp.h
-+++ NetworkManager-1.4.2/src/systemd/src/systemd/sd-lldp.h
-@@ -22,7 +22,7 @@
- ***/
-
- #include <inttypes.h>
--#include <net/ethernet.h>
-+//#include <net/ethernet.h>
- #include <sys/types.h>
-
- #include "sd-event.h"
-Index: NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c
-===================================================================
---- NetworkManager-1.4.2.orig/src/systemd/src/libsystemd-network/sd-lldp.c
-+++ NetworkManager-1.4.2/src/systemd/src/libsystemd-network/sd-lldp.c
-@@ -21,6 +21,7 @@
- #include "nm-sd-adapt.h"
-
- #include <arpa/inet.h>
-+#include <net/ethernet.h>
-
- #include "sd-lldp.h"
-
diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
deleted file mode 100644
index e7dd4ef..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.4.4.bb
+++ /dev/null
@@ -1,132 +0,0 @@
-SUMMARY = "NetworkManager"
-SECTION = "net/misc"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
- file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
- file://docs/api/html/license.html;md5=8eb8e72bab097b9d11763002cb003697 \
-"
-
-DEPENDS = " \
- intltool-native \
- libnl \
- dbus \
- dbus-glib \
- dbus-glib-native \
- libgudev \
- util-linux \
- libndp \
- libnewt \
- polkit \
- jansson \
-"
-
-inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection
-
-SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
- file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \
- file://0002-Fix-nm-version-macro-includes.patch \
- file://0001-adjust-net-headers-for-musl-compatibility.patch \
- file://0002-socket-util.h-Include-linux-sockios.h-on-musl.patch \
- file://0003-Define-ETH_ALEN.patch \
- file://0004-Define-missing-features-to-cater-for-musl.patch \
- file://0005-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \
- file://0001-check-for-strndupa-before-using-it.patch \
- file://0001-dns-resolved-add-systemd-resolved-backend.patch \
- file://0001-dns-resolved-also-check-for-etc-resolv-conf.systemd.patch \
- file://0001-systemd-xlocale.h-is-dropped-by-newer-glibc.patch \
- file://0002-user-format-string-in-g_dbus_message_new_method_erro.patch \
- "
-SRC_URI[md5sum] = "63f1e0d6d7e9099499d062c84c927a75"
-SRC_URI[sha256sum] = "829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309"
-
-S = "${WORKDIR}/NetworkManager-${PV}"
-
-EXTRA_OECONF = " \
- --disable-ifcfg-rh \
- --disable-ifnet \
- --disable-ifcfg-suse \
- --disable-more-warnings \
- --with-iptables=${sbindir}/iptables \
- --with-tests \
- --with-nmtui=yes \
-"
-
-do_compile_prepend() {
- export GIR_EXTRA_LIBS_PATH="${B}/libnm-util/.libs"
-}
-
-PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
- ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
- ${@bb.utils.filter('DISTRO_FEATURES', 'wifi', d)} \
-"
-PACKAGECONFIG[systemd] = " \
- --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
- --without-systemdsystemunitdir, \
- polkit \
-"
-PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
-# consolekit is not picked by shlibs, so add it to RDEPENDS too
-PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
-PACKAGECONFIG[concheck] = "--with-libsoup=yes,--with-libsoup=no,libsoup-2.4"
-PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
-PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp"
-# Use full featured dhcp client instead of internal one
-PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
-PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
-PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
-PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls"
-PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools"
-PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
-PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no"
-PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
-
-PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \
- ${PN}-nmtui ${PN}-nmtui-doc \
- ${PN}-adsl \
-"
-
-FILES_libnmutil += "${libdir}/libnm-util.so.*"
-FILES_libnmglib += "${libdir}/libnm-glib.so.*"
-FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*"
-
-FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so"
-
-FILES_${PN} += " \
- ${libexecdir} \
- ${libdir}/pppd/*/nm-pppd-plugin.so \
- ${libdir}/NetworkManager/*.so \
- ${datadir}/polkit-1 \
- ${datadir}/dbus-1 \
- ${base_libdir}/udev/* \
- ${systemd_unitdir}/system \
-"
-
-RRECOMMENDS_${PN} += "iptables \
- ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \
-"
-RCONFLICTS_${PN} = "connman"
-
-FILES_${PN}-dev += " \
- ${datadir}/NetworkManager/gdb-cmd \
- ${libdir}/pppd/*/*.la \
- ${libdir}/NetworkManager/*.la \
-"
-
-FILES_${PN}-nmtui = " \
- ${bindir}/nmtui \
- ${bindir}/nmtui-edit \
- ${bindir}/nmtui-connect \
- ${bindir}/nmtui-hostname \
-"
-
-FILES_${PN}-nmtui-doc = " \
- ${mandir}/man1/nmtui* \
-"
-
-SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service"
-
-do_install_append() {
- rm -rf ${D}/run ${D}${localstatedir}/run
-}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 11/31] python-ldap: Move to meta-networking, requires cyrus-sasl
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (9 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 10/31] networkmanager: Move to meta-networking, requires dnsmasq Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 12/31] python-networkmanager: Move to networking, requires networkmanager Mark Hatle
` (20 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../recipes-devtools/python/python-ldap_2.4.41.bb | 29 ++++++++++++++++++++++
.../recipes-devtools/python/python-ldap_2.4.41.bb | 29 ----------------------
2 files changed, 29 insertions(+), 29 deletions(-)
create mode 100644 meta-networking/recipes-devtools/python/python-ldap_2.4.41.bb
delete mode 100644 meta-python/recipes-devtools/python/python-ldap_2.4.41.bb
diff --git a/meta-networking/recipes-devtools/python/python-ldap_2.4.41.bb b/meta-networking/recipes-devtools/python/python-ldap_2.4.41.bb
new file mode 100644
index 0000000..3dbc8b1
--- /dev/null
+++ b/meta-networking/recipes-devtools/python/python-ldap_2.4.41.bb
@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2012 Wind River Systems, Inc.
+#
+SUMMARY = "Provides a wrapper in Python to LDAP"
+DESCRIPTION = "This module provides access to the LDAP \
+(Lightweight Directory Access Protocol) through Python operations \
+instead of C API. The module mainly acts as a wrapper for the \
+OpenLDAP 2.x libraries. Errors will appear as exceptions."
+
+LICENSE = "PSF"
+HOMEPAGE = "http://www.python-ldap.org/"
+DEPENDS = "python openldap cyrus-sasl"
+
+PYPI_PACKAGE = "python-ldap"
+inherit pypi setuptools
+
+LIC_FILES_CHKSUM = "file://LICENCE;md5=a41c82edffa04912007cae1d20cac555"
+SRC_URI[md5sum] = "18db2d009150ec1864710fea3ed76173"
+SRC_URI[sha256sum] = "6d430ecf040f2fc704ee316d3390cb1f5419c191371e1e131baef54a0e42cef0"
+
+do_configure_prepend() {
+ sed -i -e 's:^library_dirs =.*::' setup.cfg
+ sed -i -e 's:^include_dirs =.*:include_dirs = =/usr/include/sasl/:' setup.cfg
+}
+
+RDEPENDS_${PN} = " \
+ ${PYTHON_PN}-pprint \
+ ${PYTHON_PN}-threading \
+"
diff --git a/meta-python/recipes-devtools/python/python-ldap_2.4.41.bb b/meta-python/recipes-devtools/python/python-ldap_2.4.41.bb
deleted file mode 100644
index 3dbc8b1..0000000
--- a/meta-python/recipes-devtools/python/python-ldap_2.4.41.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (C) 2012 Wind River Systems, Inc.
-#
-SUMMARY = "Provides a wrapper in Python to LDAP"
-DESCRIPTION = "This module provides access to the LDAP \
-(Lightweight Directory Access Protocol) through Python operations \
-instead of C API. The module mainly acts as a wrapper for the \
-OpenLDAP 2.x libraries. Errors will appear as exceptions."
-
-LICENSE = "PSF"
-HOMEPAGE = "http://www.python-ldap.org/"
-DEPENDS = "python openldap cyrus-sasl"
-
-PYPI_PACKAGE = "python-ldap"
-inherit pypi setuptools
-
-LIC_FILES_CHKSUM = "file://LICENCE;md5=a41c82edffa04912007cae1d20cac555"
-SRC_URI[md5sum] = "18db2d009150ec1864710fea3ed76173"
-SRC_URI[sha256sum] = "6d430ecf040f2fc704ee316d3390cb1f5419c191371e1e131baef54a0e42cef0"
-
-do_configure_prepend() {
- sed -i -e 's:^library_dirs =.*::' setup.cfg
- sed -i -e 's:^include_dirs =.*:include_dirs = =/usr/include/sasl/:' setup.cfg
-}
-
-RDEPENDS_${PN} = " \
- ${PYTHON_PN}-pprint \
- ${PYTHON_PN}-threading \
-"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 12/31] python-networkmanager: Move to networking, requires networkmanager
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (10 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 11/31] python-ldap: Move to meta-networking, requires cyrus-sasl Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 13/31] corosync: Requires net-snmp from meta-networking Mark Hatle
` (19 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../python-networkmanager/python-networkmanager_2.0.1.bb | 13 +++++++++++++
.../python-networkmanager/python-networkmanager_2.0.1.bb | 13 -------------
2 files changed, 13 insertions(+), 13 deletions(-)
create mode 100644 meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb
delete mode 100644 meta-python/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb
diff --git a/meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb b/meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb
new file mode 100644
index 0000000..4e41aa5
--- /dev/null
+++ b/meta-networking/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb
@@ -0,0 +1,13 @@
+SUMMARY = "Easy communication with NetworkManager from Python"
+HOMEPAGE = "https://github.com/seveas/python-networkmanager"
+LICENSE = "Zlib"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=8d8bac174bf8422b151200e6cc78ebe4"
+
+SRC_URI[md5sum] = "5fc644a65463031295c6b7dd51a0f1bd"
+SRC_URI[sha256sum] = "bc36507506ad29bfdac941b0987ebd1cc9633c9a9291d7378e229e4515a0a517"
+
+PYPI_PACKAGE = "python-networkmanager"
+inherit pypi setuptools
+
+RDEPENDS_${PN} = "networkmanager python-dbus python-six"
diff --git a/meta-python/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb b/meta-python/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb
deleted file mode 100644
index 4e41aa5..0000000
--- a/meta-python/recipes-connectivity/python-networkmanager/python-networkmanager_2.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-SUMMARY = "Easy communication with NetworkManager from Python"
-HOMEPAGE = "https://github.com/seveas/python-networkmanager"
-LICENSE = "Zlib"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=8d8bac174bf8422b151200e6cc78ebe4"
-
-SRC_URI[md5sum] = "5fc644a65463031295c6b7dd51a0f1bd"
-SRC_URI[sha256sum] = "bc36507506ad29bfdac941b0987ebd1cc9633c9a9291d7378e229e4515a0a517"
-
-PYPI_PACKAGE = "python-networkmanager"
-inherit pypi setuptools
-
-RDEPENDS_${PN} = "networkmanager python-dbus python-six"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 13/31] corosync: Requires net-snmp from meta-networking
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (11 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 12/31] python-networkmanager: Move to networking, requires networkmanager Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 20:12 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 14/31] pywbem: Requires python-m2crypto-native (and others) from meta-python Mark Hatle
` (18 subsequent siblings)
31 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../recipes-extended/corosync/corosync_2.4.2.bb | 78 ++++++++++++++++++++++
.../recipes-extended/corosync/corosync_2.4.2.bb | 78 ----------------------
2 files changed, 78 insertions(+), 78 deletions(-)
create mode 100644 meta-networking/recipes-extended/corosync/corosync_2.4.2.bb
delete mode 100644 meta-oe/recipes-extended/corosync/corosync_2.4.2.bb
diff --git a/meta-networking/recipes-extended/corosync/corosync_2.4.2.bb b/meta-networking/recipes-extended/corosync/corosync_2.4.2.bb
new file mode 100644
index 0000000..7d5a87e
--- /dev/null
+++ b/meta-networking/recipes-extended/corosync/corosync_2.4.2.bb
@@ -0,0 +1,78 @@
+SUMMARY = "The Corosync Cluster Engine and Application Programming Interfaces"
+DESCRIPTION = "This package contains the Corosync Cluster Engine Executive, several default \
+APIs and libraries, default configuration files, and an init script."
+HOMEPAGE = "http://corosync.github.io/corosync/"
+
+SECTION = "base"
+
+inherit autotools pkgconfig systemd useradd
+
+SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz"
+SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f"
+SRC_URI[sha256sum] = "f26e3011309fe4bcce94b1dc20ea8c462f19483a73f3ca62f13b925d011a4ba9"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d"
+
+DEPENDS = "groff-native nss libqb"
+
+SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \
+ ${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'corosync-qnetd.service', '', d)} \
+"
+SYSTEMD_AUTO_ENABLE = "enable"
+
+INITSCRIPT_NAME = "corosync-daemon"
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+ dbus qdevice qnetd snmp \
+"
+
+PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
+PACKAGECONFIG[qdevice] = "--enable-qdevices,--disable-qdevices"
+PACKAGECONFIG[qnetd] = "--enable-qnetd,--disable-qnetd"
+PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma"
+PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
+PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd"
+
+EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash"
+EXTRA_OEMAKE = "tmpfilesdir_DATA="
+
+do_configure_prepend() {
+ ( cd ${S}
+ ${S}/autogen.sh )
+}
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/sysconfig/
+ install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync
+ install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd
+
+ rm -rf "${D}${localstatedir}/run"
+
+ install -d ${D}${sysconfdir}/default/volatiles
+ echo "d root root 0755 ${localstatedir}/log/cluster none" > ${D}${sysconfdir}/default/volatiles/05_corosync
+
+ if ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'true', 'false', d)}; then
+ chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd
+ echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetd none" >> ${D}${sysconfdir}/default/volatiles/05_corosync
+ fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${sysconfdir}/tmpfiles.d
+ echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf
+
+ if ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'true', 'false', d)}; then
+ install -m 0644 ${S}/conf/tmpfiles.d/corosync-qnetd.conf ${D}${sysconfdir}/tmpfiles.d
+ fi
+ fi
+}
+
+RDEPENDS_${PN} += "bash"
+
+FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug"
+FILES_${PN}-doc += "${datadir}/snmp/mibs/COROSYNC-MIB.txt"
+
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM_${PN} = "--system coroqnetd"
+USERADD_PARAM_${PN} = "--system -d / -M -s /bin/nologin -c 'User for corosync-qnetd' -g coroqnetd coroqnetd"
diff --git a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb
deleted file mode 100644
index 7d5a87e..0000000
--- a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb
+++ /dev/null
@@ -1,78 +0,0 @@
-SUMMARY = "The Corosync Cluster Engine and Application Programming Interfaces"
-DESCRIPTION = "This package contains the Corosync Cluster Engine Executive, several default \
-APIs and libraries, default configuration files, and an init script."
-HOMEPAGE = "http://corosync.github.io/corosync/"
-
-SECTION = "base"
-
-inherit autotools pkgconfig systemd useradd
-
-SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz"
-SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f"
-SRC_URI[sha256sum] = "f26e3011309fe4bcce94b1dc20ea8c462f19483a73f3ca62f13b925d011a4ba9"
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d"
-
-DEPENDS = "groff-native nss libqb"
-
-SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \
- ${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \
- ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'corosync-qnetd.service', '', d)} \
-"
-SYSTEMD_AUTO_ENABLE = "enable"
-
-INITSCRIPT_NAME = "corosync-daemon"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
- dbus qdevice qnetd snmp \
-"
-
-PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
-PACKAGECONFIG[qdevice] = "--enable-qdevices,--disable-qdevices"
-PACKAGECONFIG[qnetd] = "--enable-qnetd,--disable-qnetd"
-PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma"
-PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
-PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd"
-
-EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash"
-EXTRA_OEMAKE = "tmpfilesdir_DATA="
-
-do_configure_prepend() {
- ( cd ${S}
- ${S}/autogen.sh )
-}
-
-do_install_append() {
- install -d ${D}${sysconfdir}/sysconfig/
- install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync
- install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd
-
- rm -rf "${D}${localstatedir}/run"
-
- install -d ${D}${sysconfdir}/default/volatiles
- echo "d root root 0755 ${localstatedir}/log/cluster none" > ${D}${sysconfdir}/default/volatiles/05_corosync
-
- if ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'true', 'false', d)}; then
- chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd
- echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetd none" >> ${D}${sysconfdir}/default/volatiles/05_corosync
- fi
-
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- install -d ${D}${sysconfdir}/tmpfiles.d
- echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf
-
- if ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'true', 'false', d)}; then
- install -m 0644 ${S}/conf/tmpfiles.d/corosync-qnetd.conf ${D}${sysconfdir}/tmpfiles.d
- fi
- fi
-}
-
-RDEPENDS_${PN} += "bash"
-
-FILES_${PN}-dbg += "${libexecdir}/lcrso/.debug"
-FILES_${PN}-doc += "${datadir}/snmp/mibs/COROSYNC-MIB.txt"
-
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM_${PN} = "--system coroqnetd"
-USERADD_PARAM_${PN} = "--system -d / -M -s /bin/nologin -c 'User for corosync-qnetd' -g coroqnetd coroqnetd"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 14/31] pywbem: Requires python-m2crypto-native (and others) from meta-python
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (12 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 13/31] corosync: Requires net-snmp from meta-networking Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 15/31] dlm: requires corosync, from meta-networking Mark Hatle
` (17 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Move pywbem to the meta-python layer to avoid missing requirements.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-oe/recipes-extended/pywbem/pywbem_0.8.0.bb | 36 ----------------------
.../recipes-extended/pywbem/pywbem_0.8.0.bb | 36 ++++++++++++++++++++++
2 files changed, 36 insertions(+), 36 deletions(-)
delete mode 100644 meta-oe/recipes-extended/pywbem/pywbem_0.8.0.bb
create mode 100644 meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb
diff --git a/meta-oe/recipes-extended/pywbem/pywbem_0.8.0.bb b/meta-oe/recipes-extended/pywbem/pywbem_0.8.0.bb
deleted file mode 100644
index 7f1986e..0000000
--- a/meta-oe/recipes-extended/pywbem/pywbem_0.8.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY = "Python WBEM Client and Provider Interface"
-DESCRIPTION = "\
-A Python library for making CIM (Common Information Model) operations over \
-HTTP using the WBEM CIM-XML protocol. It is based on the idea that a good \
-WBEM client should be easy to use and not necessarily require a large amount \
-of programming knowledge. It is suitable for a large range of tasks from \
-simply poking around to writing web and GUI applications. \
-\
-WBEM, or Web Based Enterprise Management is a manageability protocol, like \
-SNMP, standardised by the Distributed Management Task Force (DMTF) available \
-at http://www.dmtf.org/standards/wbem. \
-\
-It also provides a Python provider interface, and is the fastest and easiest \
-way to write providers on the planet."
-HOMEPAGE = "http://pywbem.sf.net/"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://pywbem/LICENSE.txt;md5=fbc093901857fcd118f065f900982c24"
-SECTION = "Development/Libraries"
-DEPENDS = "python-m2crypto-native python-typing-native"
-SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BPN}/${BP}/${BP}-dev.r704.zip"
-SRC_URI[md5sum] = "84072451dcdd1aa9ee82363848faf7ad"
-SRC_URI[sha256sum] = "898035866d3cc741bbcd62c4ac26e633ad07b7c11d89db2472b9f923f3fd3ed8"
-
-S = "${WORKDIR}/${BP}-dev"
-
-inherit setuptools python-dir
-
-do_install_append() {
- mv ${D}${bindir}/wbemcli.py ${D}${bindir}/pywbemcli
- mv ${D}${bindir}/mof_compiler.py ${D}${bindir}/mofcomp
-
- rm ${D}${libdir}/python2.7/site-packages/${BPN}/wbemcli.py*
- rm ${D}${libdir}/python2.7/site-packages/${BPN}/mof_compiler.py*
-}
-
-BBCLASSEXTEND = "native"
diff --git a/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb b/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb
new file mode 100644
index 0000000..7f1986e
--- /dev/null
+++ b/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb
@@ -0,0 +1,36 @@
+SUMMARY = "Python WBEM Client and Provider Interface"
+DESCRIPTION = "\
+A Python library for making CIM (Common Information Model) operations over \
+HTTP using the WBEM CIM-XML protocol. It is based on the idea that a good \
+WBEM client should be easy to use and not necessarily require a large amount \
+of programming knowledge. It is suitable for a large range of tasks from \
+simply poking around to writing web and GUI applications. \
+\
+WBEM, or Web Based Enterprise Management is a manageability protocol, like \
+SNMP, standardised by the Distributed Management Task Force (DMTF) available \
+at http://www.dmtf.org/standards/wbem. \
+\
+It also provides a Python provider interface, and is the fastest and easiest \
+way to write providers on the planet."
+HOMEPAGE = "http://pywbem.sf.net/"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://pywbem/LICENSE.txt;md5=fbc093901857fcd118f065f900982c24"
+SECTION = "Development/Libraries"
+DEPENDS = "python-m2crypto-native python-typing-native"
+SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BPN}/${BP}/${BP}-dev.r704.zip"
+SRC_URI[md5sum] = "84072451dcdd1aa9ee82363848faf7ad"
+SRC_URI[sha256sum] = "898035866d3cc741bbcd62c4ac26e633ad07b7c11d89db2472b9f923f3fd3ed8"
+
+S = "${WORKDIR}/${BP}-dev"
+
+inherit setuptools python-dir
+
+do_install_append() {
+ mv ${D}${bindir}/wbemcli.py ${D}${bindir}/pywbemcli
+ mv ${D}${bindir}/mof_compiler.py ${D}${bindir}/mofcomp
+
+ rm ${D}${libdir}/python2.7/site-packages/${BPN}/wbemcli.py*
+ rm ${D}${libdir}/python2.7/site-packages/${BPN}/mof_compiler.py*
+}
+
+BBCLASSEXTEND = "native"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 15/31] dlm: requires corosync, from meta-networking
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (13 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 14/31] pywbem: Requires python-m2crypto-native (and others) from meta-python Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 16/31] open-vm-tools: only build if meta-networking and meta-filesystems is available Mark Hatle
` (16 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../respect-ldflags-also-from-bin_ldflags.patch | 36 +++++++++++++++
meta-networking/recipes-extended/dlm/dlm_4.0.2.bb | 51 ++++++++++++++++++++++
.../respect-ldflags-also-from-bin_ldflags.patch | 36 ---------------
meta-oe/recipes-extended/dlm/dlm_4.0.2.bb | 51 ----------------------
4 files changed, 87 insertions(+), 87 deletions(-)
create mode 100644 meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
create mode 100644 meta-networking/recipes-extended/dlm/dlm_4.0.2.bb
delete mode 100644 meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
delete mode 100644 meta-oe/recipes-extended/dlm/dlm_4.0.2.bb
diff --git a/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch b/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
new file mode 100644
index 0000000..69b2f90
--- /dev/null
+++ b/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
@@ -0,0 +1,36 @@
+diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile
+--- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 10:49:23.661320260 +0200
++++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 10:50:36.121326429 +0200
+@@ -55,7 +55,7 @@
+ BIN_CFLAGS += -fPIE -DPIE
+ BIN_CFLAGS += -I../include -I../libdlm
+
+-BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
++BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie
+ BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum
+
+ LIB_CFLAGS += $(BIN_CFLAGS)
+diff -uNr dlm-4.0.2.orig/dlm_tool/Makefile dlm-4.0.2/dlm_tool/Makefile
+--- dlm-4.0.2.orig/dlm_tool/Makefile 2013-07-31 17:50:26.000000000 +0200
++++ dlm-4.0.2/dlm_tool/Makefile 2017-04-04 10:50:44.617327153 +0200
+@@ -32,7 +32,7 @@
+ BIN_CFLAGS += -fPIE -DPIE
+ BIN_CFLAGS += -I../include -I../libdlm -I../dlm_controld
+
+-BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
++BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie
+ BIN_LDFLAGS += -L../libdlm -L../dlm_controld
+ BIN_LDFLAGS += -lpthread -ldlm -ldlmcontrol
+
+diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile
+--- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 11:02:58.578389641 +0200
++++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 11:07:55.672414935 +0200
+@@ -59,7 +59,7 @@
+ BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum
+
+ LIB_CFLAGS += $(BIN_CFLAGS)
+-LIB_LDFLAGS += -Wl,-z,relro -pie
++LIB_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -pie
+
+ ifeq ($(USE_SD_NOTIFY),yes)
+ BIN_CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) \
diff --git a/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb b/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb
new file mode 100644
index 0000000..31e411e
--- /dev/null
+++ b/meta-networking/recipes-extended/dlm/dlm_4.0.2.bb
@@ -0,0 +1,51 @@
+DESCRIPTION = "dlm control daemon and tool"
+
+SECTION = "utils"
+HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage"
+
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+SRC_URI = "https://git.fedorahosted.org/cgit/dlm.git/snapshot/${BP}.tar.xz \
+ file://respect-ldflags-also-from-bin_ldflags.patch \
+"
+
+SRC_URI[md5sum] = "efc2ee6093aa6aa0a88aaad83e998a3f"
+SRC_URI[sha256sum] = "b89bc557aaffbab0ac005398025f247718a5589cff6574d902eaffe2b20e683e"
+
+LICENSE = "LGPLv2+ & GPLv2 & GPLv2+"
+LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d"
+
+DEPENDS = "corosync systemd"
+
+inherit pkgconfig systemd distro_features_check
+
+SYSTEMD_SERVICE_${PN} = "dlm.service"
+SYSTEMD_AUTO_ENABLE = "enable"
+
+export EXTRA_OEMAKE = ""
+
+do_compile_prepend() {
+ sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile
+}
+
+do_compile () {
+ oe_runmake 'CC=${CC}'
+}
+
+do_install_append (){
+ install -d ${D}${sysconfdir}/sysconfig/
+ install -d ${D}${sysconfdir}/init.d/
+ install -m 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm
+ install -m 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm
+
+ # install systemd unit files
+ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system
+ fi
+}
+
+do_install() {
+ oe_runmake install DESTDIR=${D} LIBDIR=${libdir}
+}
+
diff --git a/meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch b/meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
deleted file mode 100644
index 69b2f90..0000000
--- a/meta-oe/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile
---- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 10:49:23.661320260 +0200
-+++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 10:50:36.121326429 +0200
-@@ -55,7 +55,7 @@
- BIN_CFLAGS += -fPIE -DPIE
- BIN_CFLAGS += -I../include -I../libdlm
-
--BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
-+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie
- BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum
-
- LIB_CFLAGS += $(BIN_CFLAGS)
-diff -uNr dlm-4.0.2.orig/dlm_tool/Makefile dlm-4.0.2/dlm_tool/Makefile
---- dlm-4.0.2.orig/dlm_tool/Makefile 2013-07-31 17:50:26.000000000 +0200
-+++ dlm-4.0.2/dlm_tool/Makefile 2017-04-04 10:50:44.617327153 +0200
-@@ -32,7 +32,7 @@
- BIN_CFLAGS += -fPIE -DPIE
- BIN_CFLAGS += -I../include -I../libdlm -I../dlm_controld
-
--BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
-+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie
- BIN_LDFLAGS += -L../libdlm -L../dlm_controld
- BIN_LDFLAGS += -lpthread -ldlm -ldlmcontrol
-
-diff -uNr dlm-4.0.2.orig/dlm_controld/Makefile dlm-4.0.2/dlm_controld/Makefile
---- dlm-4.0.2.orig/dlm_controld/Makefile 2017-04-04 11:02:58.578389641 +0200
-+++ dlm-4.0.2/dlm_controld/Makefile 2017-04-04 11:07:55.672414935 +0200
-@@ -59,7 +59,7 @@
- BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum
-
- LIB_CFLAGS += $(BIN_CFLAGS)
--LIB_LDFLAGS += -Wl,-z,relro -pie
-+LIB_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -pie
-
- ifeq ($(USE_SD_NOTIFY),yes)
- BIN_CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) \
diff --git a/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb b/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb
deleted file mode 100644
index 31e411e..0000000
--- a/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-DESCRIPTION = "dlm control daemon and tool"
-
-SECTION = "utils"
-HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage"
-
-REQUIRED_DISTRO_FEATURES = "systemd"
-
-SRC_URI = "https://git.fedorahosted.org/cgit/dlm.git/snapshot/${BP}.tar.xz \
- file://respect-ldflags-also-from-bin_ldflags.patch \
-"
-
-SRC_URI[md5sum] = "efc2ee6093aa6aa0a88aaad83e998a3f"
-SRC_URI[sha256sum] = "b89bc557aaffbab0ac005398025f247718a5589cff6574d902eaffe2b20e683e"
-
-LICENSE = "LGPLv2+ & GPLv2 & GPLv2+"
-LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d"
-
-DEPENDS = "corosync systemd"
-
-inherit pkgconfig systemd distro_features_check
-
-SYSTEMD_SERVICE_${PN} = "dlm.service"
-SYSTEMD_AUTO_ENABLE = "enable"
-
-export EXTRA_OEMAKE = ""
-
-do_compile_prepend() {
- sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile
-}
-
-do_compile () {
- oe_runmake 'CC=${CC}'
-}
-
-do_install_append (){
- install -d ${D}${sysconfdir}/sysconfig/
- install -d ${D}${sysconfdir}/init.d/
- install -m 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm
- install -m 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm
-
- # install systemd unit files
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system
- fi
-}
-
-do_install() {
- oe_runmake install DESTDIR=${D} LIBDIR=${libdir}
-}
-
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 16/31] open-vm-tools: only build if meta-networking and meta-filesystems is available
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (14 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 15/31] dlm: requires corosync, from meta-networking Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 17/31] miniupnpd: Move to meta-networking, requires libnetfilter-conntrack Mark Hatle
` (15 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
libdnet - meta-networking
fuse - meta-filesystems
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
index f7746c8..5e809ac 100644
--- a/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
+++ b/meta-oe/recipes-support/open-vm-tools/open-vm-tools_10.1.5.bb
@@ -93,3 +93,10 @@ do_configure_prepend() {
export CUSTOM_DNET_NAME=dnet
export CUSTOM_DNET_LIBS=-L${STAGING_LIBDIR}/libdnet.so
}
+
+python() {
+ if 'networking-layer' not in d.getVar('BBFILE_COLLECTIONS').split() or \
+ 'filesystems-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
+ raise bb.parse.SkipRecipe('Requires meta-networking and meta-filesystems to be present.')
+}
+
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 17/31] miniupnpd: Move to meta-networking, requires libnetfilter-conntrack
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (15 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 16/31] open-vm-tools: only build if meta-networking and meta-filesystems is available Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 18/31] enable_gnome.conf: Move the AVAHI_GTK setting Mark Hatle
` (14 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../miniupnpd/miniupnpd_2.0.bb | 37 ----------------------
.../miniupnpd/miniupnpd_2.0.bb | 37 ++++++++++++++++++++++
2 files changed, 37 insertions(+), 37 deletions(-)
delete mode 100644 meta-multimedia/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb
create mode 100644 meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb
diff --git a/meta-multimedia/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb b/meta-multimedia/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb
deleted file mode 100644
index c6f36e1..0000000
--- a/meta-multimedia/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "Lightweight UPnP IGD daemon"
-DESCRIPTION = "The miniUPnP daemon is an UPnP IGD (internet gateway device) \
-which provide NAT traversal services to any UPnP enabled client on \
-the network."
-
-SECTION = "networking"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=aa71c78c373ccfe0ff207af0cd966d91"
-
-inherit autotools gettext pkgconfig
-
-DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack"
-
-SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${P}.tar.gz;downloadfilename=${P}.tar.gz \
-"
-SRC_URI[md5sum] = "1c07a215dd9b362e75a9efc05e2fb3b4"
-SRC_URI[sha256sum] = "d96aa3a00e0f5490826bba3cb97e68cd27479e5839adac4b9bcb66eae786bfb7"
-
-IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}"
-
-do_compile() {
- cd ${S}
- CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux
-}
-
-do_install() {
- install -d ${D}/${sbindir}
- install ${S}/miniupnpd ${D}/${sbindir}
- install -d ${D}/${sysconfdir}/${BPN}
- install ${S}/netfilter/iptables_init.sh ${D}/${sysconfdir}/${BPN}
- install ${S}/netfilter/iptables_removeall.sh ${D}/${sysconfdir}/${BPN}
- install ${S}/netfilter/ip6tables_init.sh ${D}/${sysconfdir}/${BPN}
- install ${S}/netfilter/ip6tables_removeall.sh ${D}/${sysconfdir}/${BPN}
- install -m 0644 -b ${S}/miniupnpd.conf ${D}/${sysconfdir}/${BPN}
- install -d ${D}/${sysconfdir}/init.d
- install ${S}/linux/miniupnpd.init.d.script ${D}/${sysconfdir}/init.d/miniupnpd
-}
diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb
new file mode 100644
index 0000000..c6f36e1
--- /dev/null
+++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Lightweight UPnP IGD daemon"
+DESCRIPTION = "The miniUPnP daemon is an UPnP IGD (internet gateway device) \
+which provide NAT traversal services to any UPnP enabled client on \
+the network."
+
+SECTION = "networking"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=aa71c78c373ccfe0ff207af0cd966d91"
+
+inherit autotools gettext pkgconfig
+
+DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack"
+
+SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${P}.tar.gz;downloadfilename=${P}.tar.gz \
+"
+SRC_URI[md5sum] = "1c07a215dd9b362e75a9efc05e2fb3b4"
+SRC_URI[sha256sum] = "d96aa3a00e0f5490826bba3cb97e68cd27479e5839adac4b9bcb66eae786bfb7"
+
+IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}"
+
+do_compile() {
+ cd ${S}
+ CONFIG_OPTIONS="${IPV6} --leasefile --vendorcfg" oe_runmake -f Makefile.linux
+}
+
+do_install() {
+ install -d ${D}/${sbindir}
+ install ${S}/miniupnpd ${D}/${sbindir}
+ install -d ${D}/${sysconfdir}/${BPN}
+ install ${S}/netfilter/iptables_init.sh ${D}/${sysconfdir}/${BPN}
+ install ${S}/netfilter/iptables_removeall.sh ${D}/${sysconfdir}/${BPN}
+ install ${S}/netfilter/ip6tables_init.sh ${D}/${sysconfdir}/${BPN}
+ install ${S}/netfilter/ip6tables_removeall.sh ${D}/${sysconfdir}/${BPN}
+ install -m 0644 -b ${S}/miniupnpd.conf ${D}/${sysconfdir}/${BPN}
+ install -d ${D}/${sysconfdir}/init.d
+ install ${S}/linux/miniupnpd.init.d.script ${D}/${sysconfdir}/init.d/miniupnpd
+}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 18/31] enable_gnome.conf: Move the AVAHI_GTK setting
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (16 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 17/31] miniupnpd: Move to meta-networking, requires libnetfilter-conntrack Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf Mark Hatle
` (13 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
This is a distribution wide setting, so just including the layer should not
affect other layers.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-gnome/README | 5 +++++
meta-gnome/conf/enable_gnome.conf | 1 +
meta-gnome/conf/layer.conf | 2 --
3 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 meta-gnome/conf/enable_gnome.conf
diff --git a/meta-gnome/README b/meta-gnome/README
index 0c4fbd2..14cf415 100644
--- a/meta-gnome/README
+++ b/meta-gnome/README
@@ -1,3 +1,8 @@
+To enable gnome, you need to add the following to your system:
+
+require conf/enable_gnome.conf
+
+
This layer depends on:
URI: git://github.com/openembedded/oe-core.git
diff --git a/meta-gnome/conf/enable_gnome.conf b/meta-gnome/conf/enable_gnome.conf
new file mode 100644
index 0000000..883a6f5
--- /dev/null
+++ b/meta-gnome/conf/enable_gnome.conf
@@ -0,0 +1 @@
+AVAHI_GTK_pn-avahi-ui = "gtk gtk3"
diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
index fce5627..58e12a9 100644
--- a/meta-gnome/conf/layer.conf
+++ b/meta-gnome/conf/layer.conf
@@ -13,5 +13,3 @@ BBFILE_PRIORITY_gnome-layer = "7"
LAYERVERSION_gnome-layer = "1"
LAYERDEPENDS_gnome-layer = "core openembedded-layer"
-
-AVAHI_GTK_pn-avahi-ui = "gtk gtk3"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (17 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 18/31] enable_gnome.conf: Move the AVAHI_GTK setting Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-07 9:29 ` Andreas Müller
2017-09-06 19:23 ` [PATCH 20/31] libart-lgpg: Obsolete, replaced by version in oe-core Mark Hatle
` (12 subsequent siblings)
31 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
This resolves a failure of the yocto-compat-layer.py script. Changing the
PACKAGECONFIG setting by just including a layer can cause problems.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-gnome/conf/enable_gnome.conf | 2 ++
meta-gnome/recipes-devtools/glade/glade3_%.bbappend | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
delete mode 100644 meta-gnome/recipes-devtools/glade/glade3_%.bbappend
diff --git a/meta-gnome/conf/enable_gnome.conf b/meta-gnome/conf/enable_gnome.conf
index 883a6f5..7e711ee 100644
--- a/meta-gnome/conf/enable_gnome.conf
+++ b/meta-gnome/conf/enable_gnome.conf
@@ -1 +1,3 @@
AVAHI_GTK_pn-avahi-ui = "gtk gtk3"
+
+PACKAGECONFIG_pn-glade3 = "gnome"
diff --git a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend b/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
deleted file mode 100644
index 3abacfb..0000000
--- a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG ??= "gnome"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 20/31] libart-lgpg: Obsolete, replaced by version in oe-core
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (18 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 21/31] pinpoint: Add dependency on opengl for cogl Mark Hatle
` (11 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../libart-lgpl/libart-lgpl/Makefile.am.patch | 17 -------------
.../libart-lgpl/libart-lgpl/aarch64/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/aarch64be/art_config.h | 10 --------
.../libart-lgpl/aarch64be_32/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/arm/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/armeb/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/i386/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/i586/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/i686/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/mips/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/mips64/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/mips64el/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/mipsel/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/powerpc/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/powerpc64/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl/x86_64/art_config.h | 10 --------
.../libart-lgpl/libart-lgpl_2.3.21.bb | 28 ----------------------
17 files changed, 195 deletions(-)
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/Makefile.am.patch
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64be/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64be_32/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/arm/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/armeb/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i386/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i586/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i686/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips64/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips64el/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mipsel/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/powerpc/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/powerpc64/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/x86_64/art_config.h
delete mode 100644 meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/Makefile.am.patch b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/Makefile.am.patch
deleted file mode 100644
index 190ba96..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/Makefile.am.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-+++ libart_lgpl-2.3.21/Makefile.am 2010-11-23 23:12:32.445450075 -0800
-@@ -7,8 +7,8 @@
-
- BUILT_SOURCES = art_config.h
-
--art_config.h:
-- ./gen_art_config.sh > art_config.h
-+#art_config.h:
-+# ./gen_art_config.sh > art_config.h
-
- EXTRA_DIST = \
- libart.def \
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64/art_config.h
deleted file mode 100644
index 500ffc3..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 8
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64be/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64be/art_config.h
deleted file mode 100644
index 500ffc3..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64be/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 8
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64be_32/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64be_32/art_config.h
deleted file mode 100644
index b0e74ad..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/aarch64be_32/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 4
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/arm/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/arm/art_config.h
deleted file mode 100644
index b0e74ad..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/arm/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 4
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/armeb/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/armeb/art_config.h
deleted file mode 100644
index b0e74ad..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/armeb/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 4
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i386/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i386/art_config.h
deleted file mode 100644
index b0e74ad..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i386/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 4
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i586/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i586/art_config.h
deleted file mode 100644
index b0e74ad..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i586/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 4
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i686/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i686/art_config.h
deleted file mode 100644
index b0e74ad..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/i686/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 4
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips/art_config.h
deleted file mode 100644
index b0e74ad..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 4
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips64/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips64/art_config.h
deleted file mode 100644
index d10cd95..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips64/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 8
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips64el/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips64el/art_config.h
deleted file mode 100644
index d10cd95..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mips64el/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 8
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mipsel/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mipsel/art_config.h
deleted file mode 100644
index b0e74ad..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/mipsel/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 4
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/powerpc/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/powerpc/art_config.h
deleted file mode 100644
index b0e74ad..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/powerpc/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 4
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/powerpc64/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/powerpc64/art_config.h
deleted file mode 100644
index 500ffc3..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/powerpc64/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 8
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/x86_64/art_config.h b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/x86_64/art_config.h
deleted file mode 100644
index 500ffc3..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl/x86_64/art_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Automatically generated by gen_art_config.c */
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 8
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
diff --git a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb b/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb
deleted file mode 100644
index 7b29506..0000000
--- a/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Library of functions for 2D graphics"
-SECTION = "x11/gnome"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-PR = "r2"
-
-ART_CONFIG = "${HOST_ARCH}/art_config.h"
-
-# can't use gnome.oeclass due to _ in filename
-SRC_URI = "${GNOME_MIRROR}/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
- file://${ART_CONFIG} \
- file://Makefile.am.patch"
-
-SRC_URI[md5sum] = "08559ff3c67fd95d57b0c5e91a6b4302"
-SRC_URI[sha256sum] = "fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa"
-
-inherit autotools pkgconfig
-
-DEPENDS = ""
-
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += "${bindir}/libart2-config"
-
-S = "${WORKDIR}/libart_lgpl-${PV}"
-
-do_configure_prepend() {
- cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h
-}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 21/31] pinpoint: Add dependency on opengl for cogl
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (19 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 20/31] libart-lgpg: Obsolete, replaced by version in oe-core Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 22/31] vim: Remove xfce vim bbappend Mark Hatle
` (10 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
index 5e902a1..bf5178c 100644
--- a/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
+++ b/meta-gnome/recipes-apps/pinpoint/pinpoint_git.bb
@@ -9,7 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
DEPENDS = "glib-2.0 gdk-pixbuf cogl-1.0 clutter-1.0 clutter-gst-3.0 librsvg"
-inherit autotools gettext pkgconfig
+inherit autotools gettext pkgconfig distro_features_check
+
+# cogl requires opengl
+REQUIRED_DISTRO_FEATURES = "opengl"
SRC_URI = "git://git.gnome.org/pinpoint"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 22/31] vim: Remove xfce vim bbappend
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (20 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 21/31] pinpoint: Add dependency on opengl for cogl Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-07 8:57 ` Andreas Müller
2017-09-06 19:23 ` [PATCH 23/31] layer.conf: Add meta-networking for the networkmanager Mark Hatle
` (9 subsequent siblings)
31 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Changing the behavior of a recipe by including a layer is not allowed
by the yocto-compat-layer script.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-xfce/recipes-support/vim/vim_%.bbappend | 6 ------
1 file changed, 6 deletions(-)
delete mode 100644 meta-xfce/recipes-support/vim/vim_%.bbappend
diff --git a/meta-xfce/recipes-support/vim/vim_%.bbappend b/meta-xfce/recipes-support/vim/vim_%.bbappend
deleted file mode 100644
index 25403e6..0000000
--- a/meta-xfce/recipes-support/vim/vim_%.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-do_install_append() {
- # The mouse being autoenabled is just annoying in xfce4-terminal (mouse
- # drag make vim go into visual mode and there is no right click menu),
- # delete the block.
- sed -i '/the mouse works just fine/,+4d' ${D}/${datadir}/${BPN}/vimrc
-}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 23/31] layer.conf: Add meta-networking for the networkmanager
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (21 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 22/31] vim: Remove xfce vim bbappend Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 24/31] meta-xfce: depend on meta-multimedia Mark Hatle
` (8 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-gnome/conf/layer.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf
index 58e12a9..fb89c14 100644
--- a/meta-gnome/conf/layer.conf
+++ b/meta-gnome/conf/layer.conf
@@ -12,4 +12,4 @@ BBFILE_PRIORITY_gnome-layer = "7"
# cause compatibility issues with other layers
LAYERVERSION_gnome-layer = "1"
-LAYERDEPENDS_gnome-layer = "core openembedded-layer"
+LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 24/31] meta-xfce: depend on meta-multimedia
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (22 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 23/31] layer.conf: Add meta-networking for the networkmanager Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 25/31] mpv: Requires ffmpeg which has a LICENSE_FLAGS = commercial set Mark Hatle
` (7 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Remove duplicate meta-oe dependency and replace it with one for meta-multimedia.
This is needed for various apps.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-xfce/conf/layer.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-xfce/conf/layer.conf b/meta-xfce/conf/layer.conf
index 64b1077..ad25dcb 100644
--- a/meta-xfce/conf/layer.conf
+++ b/meta-xfce/conf/layer.conf
@@ -15,7 +15,7 @@ LAYERVERSION_xfce-layer = "1"
LAYERDEPENDS_xfce-layer = "core"
LAYERDEPENDS_xfce-layer += "openembedded-layer"
LAYERDEPENDS_xfce-layer += "gnome-layer"
-LAYERDEPENDS_xfce-layer += "openembedded-layer"
+LAYERDEPENDS_xfce-layer += "multimedia-layer"
LAYERDEPENDS_xfce-layer += "meta-python"
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 25/31] mpv: Requires ffmpeg which has a LICENSE_FLAGS = commercial set
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (23 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 24/31] meta-xfce: depend on meta-multimedia Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 26/31] recipes-multimedia: Add LICENSE_FLAGS Mark Hatle
` (6 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
We need to also set LICENSE_FLAGS = commercial to avoid any type of parsing
errors for world builds.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb
index a154e50..44d92a0 100644
--- a/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb
@@ -11,6 +11,9 @@ REQUIRED_DISTRO_FEATURES = "x11"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://LICENSE;md5=91f1cb870c1cc2d31351a4d2595441cb"
+# While this item does not require it, it depends on ffmpeg which does
+LICENSE_FLAGS = "commercial"
+
SRC_URI = " \
https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \
http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;subdir=${BPN}-${PV} \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 26/31] recipes-multimedia: Add LICENSE_FLAGS
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (24 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 25/31] mpv: Requires ffmpeg which has a LICENSE_FLAGS = commercial set Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 27/31] " Mark Hatle
` (5 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Multiple recipes require libmap, mpg123 or ffmpeg which all are defined
to have a LICENSE_FLAGS = "commercial". Set these referring packages
to the same license flag so they are only enabled when their dependency
is also enabled.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb | 4 +++-
meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb | 3 +++
meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb | 3 +++
.../recipes-multimedia/streamripper/streamripper_1.64.6.bb | 3 +++
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 3 +++
5 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
index bb69bfe..f3eaf30 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
+++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
@@ -14,7 +14,9 @@ DEPENDS += "gst-plugins-base virtual/libgles2 virtual/egl jpeg libpng glew"
PR = "r4"
-inherit gettext
+inherit gettext distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl"
# This package doesn't have a configure switch for EGL or GL, so forcibly tell
# configure that it can't find gl.h so it always uses EGL. If/when we have some
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb
index c16f3be..77ab5eb 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb
@@ -39,6 +39,9 @@ DEPENDS += " \
libupnp \
"
+# While this item does not require it, it depends on mpg123 which does
+LICENSE_FLAGS = "commercial"
+
SRC_URI = " \
http://www.musicpd.org/download/${BPN}/0.19/${BP}.tar.xz \
file://mpd.conf.in \
diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
index e115f1c..3eb1856 100644
--- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
+++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
@@ -6,6 +6,9 @@ SECTION = "audio"
DEPENDS = "libpng ffmpeg libsndfile1 libvorbis"
+# While this item does not require it, it depends on ffmpeg which does
+LICENSE_FLAGS = "commercial"
+
PR = "r2"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \
diff --git a/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb b/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb
index 94355b6..722815a 100644
--- a/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb
+++ b/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb
@@ -6,6 +6,9 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
DEPENDS = "glib-2.0 libmad libogg libvorbis"
+# While this item does not require it, it depends on libmad which does
+LICENSE_FLAGS = "commercial"
+
SRC_URI = "\
${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
file://0001-build-these-are-foreign-automake-projects.patch \
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 087baab..acb3ccd 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -13,6 +13,9 @@ DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \
tiff"
+# While this item does not require it, it depends on ffmpeg which does
+LICENSE_FLAGS = "commercial"
+
SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz"
inherit autotools gettext pkgconfig distro_features_check
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 27/31] recipes-multimedia: Add LICENSE_FLAGS
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (25 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 26/31] recipes-multimedia: Add LICENSE_FLAGS Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 28/31] libmtp: remove 'mtp-tools' from PACKAGES Mark Hatle
` (4 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Multiple recipes require other recipes which all are defined to have a
LICENSE_FLAGS = "commercial". Set these referring packages to the same
license flag so they are only enabled when their dependency is also enabled.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb | 4 ++++
.../recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb | 3 +++
meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb | 3 +++
3 files changed, 10 insertions(+)
diff --git a/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb b/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb
index 72a96f3..d3e31fe 100644
--- a/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb
+++ b/meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb
@@ -4,6 +4,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
inherit packagegroup
+# While this item does not require it, it depends on xfmpc and xfc4-mpc-plugin
+# that wants mpd which does
+LICENSE_FLAGS = "commercial"
+
RDEPENDS_${PN} = " \
parole \
xfmpc \
diff --git a/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb b/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb
index f709e4d..9f501f7 100644
--- a/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb
+++ b/meta-xfce/recipes-multimedia/xfce4-mpc-plugin/xfce4-mpc-plugin_0.5.0.bb
@@ -8,6 +8,9 @@ inherit xfce-panel-plugin
DEPENDS += "libmpd"
+# While this item does not require it, it depends on mpd which does
+LICENSE_FLAGS = "commercial"
+
# for now we recommend our own mpd-server
RRECOMMENDS_${PN} = "mpd"
diff --git a/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb
index 3d902a1..869435d 100644
--- a/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb
+++ b/meta-xfce/recipes-multimedia/xfmpc/xfmpc_0.2.3.bb
@@ -4,6 +4,9 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "gtk+ libxfce4util libxfce4ui libmpd vala-native"
+# While this item does not require it, it depends on mpd which does
+LICENSE_FLAGS = "commercial"
+
# for now we recommend our own mpd-server
RRECOMMENDS_${PN} = "mpd"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 28/31] libmtp: remove 'mtp-tools' from PACKAGES
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (26 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 27/31] " Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete Mark Hatle
` (3 subsequent siblings)
31 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
mtp-tools is a 'rename' of the ${PN}-bin, so it should not be in the
PACKAGES value. If it is, it will result in either an error during packaging
or an indeterminate package.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
index b5df8e0..0819b41 100644
--- a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
+++ b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
@@ -45,10 +45,10 @@ PACKAGECONFIG[doxygen] = "--enable-doxygen,--disable-doxygen"
PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile"
PACKAGECONFIG[mtpz] = "--enable-mtpz,--disable-mtpz,libgcrypt"
-PACKAGES =+ "libmtp-common libmtp-runtime mtp-tools"
+PACKAGES =+ "libmtp-common libmtp-runtime"
RDEPENDS_${PN} += "libmtp-common"
-RRECOMMENDS_${PN} += "libmtp-runtime mtp-tools"
+RRECOMMENDS_${PN} += "libmtp-runtime ${PN}-bin"
FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/*"
PKG_${PN}-bin = "mtp-tools"
SUMMARY_${PN}-bin = "Tools for communicating with MTP devices"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (27 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 28/31] libmtp: remove 'mtp-tools' from PACKAGES Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:58 ` Andreas Müller
2017-09-06 19:23 ` [PATCH 30/31] florence: update 0.6.3 Mark Hatle
` (2 subsequent siblings)
31 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
There is no upstream revision to the mixer to make it work w/o gstreamer-0.10
also remove from packagegroup-xfce-extended
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb | 14 --------------
.../packagegroups/packagegroup-xfce-extended.bb | 1 -
2 files changed, 15 deletions(-)
delete mode 100644 meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
diff --git a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
deleted file mode 100644
index bdbec45..0000000
--- a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "A volume control application based on GStreamer"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-inherit xfce-panel-plugin
-
-DEPENDS += "glib-2.0 gst-plugins-base gtk+ xfconf libunique"
-
-SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "1b3753b91224867a3a2dfddda239c28d"
-SRC_URI[sha256sum] = "fb0c1df201ed1130f54f15b914cbe5a59286e994a137acda5609570c57112de2"
-
-RDEPENDS_${PN} = "gst-meta-audio"
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index c07188f..ff024b3 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -61,7 +61,6 @@ RRECOMMENDS_${PN} = " \
xfce4-appfinder \
xfce4-screenshooter \
xfce4-power-manager \
- xfce4-mixer \
ristretto \
xfce4-taskmanager \
gigolo \
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 30/31] florence: update 0.6.3
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (28 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 19:59 ` Andreas Müller
2017-09-06 19:23 ` [PATCH 31/31] gstreamer-0.10: Remove as all users are gone and it is obsolete Mark Hatle
2017-09-06 23:41 ` [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
31 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
From: Andreas Müller <schnitzeltony@googlemail.com>
* patches were either leftovers or do not match the code
* DESCRIPTION -> shortened SUMMARY
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Added gtk+3 dependency and resolved conflicts
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../florence/files/fix-no-atspi-compile.patch | 30 ----------------------
.../recipes-support/florence/florence_0.5.4.bb | 20 ---------------
.../recipes-support/florence/florence_0.6.3.bb | 19 ++++++++++++++
3 files changed, 19 insertions(+), 50 deletions(-)
delete mode 100644 meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch
delete mode 100644 meta-gnome/recipes-support/florence/florence_0.5.4.bb
create mode 100644 meta-gnome/recipes-support/florence/florence_0.6.3.bb
diff --git a/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch b/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch
deleted file mode 100644
index 0bb5dee..0000000
--- a/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/florence.c b/src/florence.c
-index b27c31b..feadefe 100644
---- a/src/florence.c
-+++ b/src/florence.c
-@@ -44,12 +44,6 @@
- /* exit signal */
- static int flo_exit=FALSE;
-
--#ifdef ENABLE_AT_SPI2
--void flo_check_show (struct florence *florence, AtspiAccessible *obj);
--#else
--void flo_check_show (struct florence *florence, Accessible *obj);
--#endif
--
- /* Called on destroy event (systray quit or close window) */
- void flo_destroy (void)
- {
-@@ -61,6 +55,12 @@ void flo_destroy (void)
- }
-
- #ifdef AT_SPI
-+#ifdef ENABLE_AT_SPI2
-+void flo_check_show (struct florence *florence, AtspiAccessible *obj);
-+#else
-+void flo_check_show (struct florence *florence, Accessible *obj);
-+#endif
-+
- /* Called to destroy the icon */
- void flo_icon_destroy (GtkWidget *widget, gpointer user_data)
- {
diff --git a/meta-gnome/recipes-support/florence/florence_0.5.4.bb b/meta-gnome/recipes-support/florence/florence_0.5.4.bb
deleted file mode 100644
index 8ce85c9..0000000
--- a/meta-gnome/recipes-support/florence/florence_0.5.4.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Florence is a virtual keyboard (also called on-screen-keyboard), which allows the user to input text through a touchscreen."
-HOMEPAGE = "http://florence.sourceforge.net/english.html"
-
-#NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once.
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-PR = "r1"
-
-DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf gconf-native cairo intltool-native gnome-doc-utils libnotify gstreamer"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV}-gtk2/florence-${PV}.tar.bz2 \
- file://fix-no-atspi-compile.patch"
-SRC_URI[md5sum] = "8d5c2367a28485bfcf577650b0badab7"
-SRC_URI[sha256sum] = "26d33aa20d5fbf34ceeded4c41cb922d2988b6082e33d9acc46dd7bfe56d31a1"
-
-inherit gettext autotools gconf pkgconfig
-
-EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord"
diff --git a/meta-gnome/recipes-support/florence/florence_0.6.3.bb b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
new file mode 100644
index 0000000..b9b7d0c
--- /dev/null
+++ b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Florence is a virtual keyboard for touch screens"
+HOMEPAGE = "http://florence.sourceforge.net/english.html"
+
+#NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once.
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+DEPENDS = "gtk+3 libxml2 libglade librsvg libxtst gconf gconf-native cairo intltool-native gnome-doc-utils libnotify gstreamer1.0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${PN}/${PN}/${PV}/${PN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "8775051d7352f75dec5a86dc9964e8e0"
+SRC_URI[sha256sum] = "422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e"
+
+inherit gettext autotools gconf pkgconfig
+
+EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord"
+
+FILES_${PN} += "${datadir}/glib-2.0/schemas"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [PATCH 31/31] gstreamer-0.10: Remove as all users are gone and it is obsolete
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (29 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 30/31] florence: update 0.6.3 Mark Hatle
@ 2017-09-06 19:23 ` Mark Hatle
2017-09-06 20:01 ` Andreas Müller
2017-09-06 23:41 ` [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
31 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 19:23 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
.../gst-ffmpeg-0.10.13/lower-rank.diff | 16 -
.../gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb | 14 -
.../gst-fluendo-mpegdemux_0.10.85.bb | 12 -
.../gstreamer-0.10/gst-fluendo.inc | 14 -
.../gstreamer-0.10/gst-meta-base_0.10.bb | 73 ---
.../gstreamer-0.10/gst-openmax/gcc_4.6.patch | 18 -
.../gstreamer-0.10/gst-openmax/ptr-array.patch | 46 --
.../gstreamer-0.10/gst-openmax_0.10.1.bb | 35 --
.../gst-plugins-bad/buffer-overflow-mp4.patch | 36 --
.../gstreamer-0.10/gst-plugins-bad_0.10.23.bb | 61 ---
...l.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch | 32 --
...le-Fix-build-on-x86-if-emmintrin.h-is-ava.patch | 37 --
.../configure.ac-fix-subparse-plugin.patch | 27 --
.../gst-plugins-base-tremor.patch | 20 -
.../gstreamer-0.10/gst-plugins-base_0.10.36.bb | 44 --
...-conditional-gl-framebuffer-undefined-use.patch | 35 --
.../gst-plugins-gl/rpi-egl-gles2-dep.patch | 22 -
.../gstreamer-0.10/gst-plugins-gl_0.10.3.bb | 29 --
...ild-with-recent-kernels-the-v4l2_buffer-i.patch | 33 --
...define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch | 45 --
.../0407-mulawdec-fix-integer-overrun.patch | 47 --
.../gstreamer-0.10/gst-plugins-good_0.10.31.bb | 47 --
...sate-for-libcdio-s-recent-cd-text-api-cha.patch | 193 --------
.../0002-Fix-opencore-include-paths.patch | 58 ---
.../gstreamer-0.10/gst-plugins-ugly_0.10.19.bb | 35 --
.../gstreamer-0.10/gst-plugins.inc | 29 --
...ecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch | 34 --
.../gstreamer-0.10/gst-rtsp_0.10.8.bb | 18 -
...ix-self-comparison-always-evaluates-to-tr.patch | 32 --
...01-parse-make-grammar.y-work-with-Bison-3.patch | 35 --
...2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch | 32 --
.../gstreamer-0.10.36/check_fix.patch | 19 -
.../gst-inspect-check-error.patch | 16 -
.../gstreamer-0.10.36/gstregistrybinary.c | 487 ---------------------
.../gstreamer-0.10.36/gstregistrybinary.h | 194 --------
.../gstreamer-0.10/gstreamer_0.10.36.bb | 53 ---
36 files changed, 1978 deletions(-)
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h
delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff
deleted file mode 100644
index 5f08afe..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-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 @@
- case CODEC_ID_MSMPEG4V3:
- case CODEC_ID_H264:
- case CODEC_ID_COOK:
-- rank = GST_RANK_PRIMARY;
-+ rank = GST_RANK_SECONDARY;
- break;
- case CODEC_ID_DVVIDEO:
- /* we have a good dv decoder, fast on both ppc as well as x86. they say
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb
deleted file mode 100644
index 1e2cd2a..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require gst-fluendo.inc
-
-SUMMARY = "Fluendo closed-format mp3 GStreamer plug-in"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=259a43dd1c9854b71fc396f74699f4d2"
-LICENSE_FLAGS = "commercial"
-
-GSTREAMER_DEBUG ?= "--disable-debug"
-EXTRA_OECONF += "${GSTREAMER_DEBUG} --with-gstreamer-api=0.10"
-
-acpaths = "-I ${S}/common/m4 -I ${S}/m4"
-
-SRC_URI[md5sum] = "adf0390f3416bb72f91c358528be0c38"
-SRC_URI[sha256sum] = "dae0d0559a4e159c0dd92b7e18de059a5783f8d038904c7de4ca6393f7d55c7d"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb
deleted file mode 100644
index 7bba41a..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require gst-fluendo.inc
-
-SUMMARY = "Fluendo MPEG Transport Stream and Program Stream demuxer for GStreamer"
-LICENSE = "MPLv1.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=be282f1c3cc9a98cc0dc5c2b25dfc510 \
- file://src/gstmpegdemux.h;beginline=1;endline=19;md5=a9e90033f59897b91664d9f2a2ff01dd"
-LICENSE_FLAGS = "commercial"
-
-acpaths = "-I ${S}/common/m4 -I ${S}/m4"
-
-SRC_URI[md5sum] = "7c4fb993f80b9ae631b11897733f0970"
-SRC_URI[sha256sum] = "df04c91cc8e5d9a892c2492ed989974b4547beaa2a3647649e85113317897424"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc
deleted file mode 100644
index 7a77d62..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "Fluendo closed-format GStreamer plug-in"
-SECTION = "multimedia"
-HOMEPAGE = "https://core.fluendo.com/gstreamer/trac/wiki"
-DEPENDS = "gstreamer gst-plugins-base zlib"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://core.fluendo.com/gstreamer/src/${BPN}/${BPN}-${PV}.tar.bz2"
-
-FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
-FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
-
-EXTRA_OECONF = "--disable-valgrind"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb
deleted file mode 100644
index 039abe1..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb
+++ /dev/null
@@ -1,73 +0,0 @@
-SUMMARY = "GStreamer package groups"
-LICENSE = "MIT"
-
-COMMERCIAL_PLUGINS = "${COMMERCIAL_AUDIO_PLUGINS} ${COMMERCIAL_VIDEO_PLUGINS}"
-DEPENDS_UGLY="${@'gst-plugins-ugly' if 'ugly' in COMMERCIAL_PLUGINS.split('-') else ''}"
-DEPENDS_BAD="${@'gst-plugins-bad' if 'bad' in COMMERCIAL_PLUGINS.split('-') else ''}"
-DEPENDS = "gstreamer gst-plugins-base gst-plugins-good ${DEPENDS_UGLY} ${DEPENDS_BAD}"
-
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
- file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-
-PR = "r13"
-
-PACKAGES = "\
- gst-meta-base \
- gst-meta-x11-base \
- gst-meta-audio \
- gst-meta-debug \
- gst-meta-video"
-
-ALLOW_EMPTY_gst-meta-base = "1"
-ALLOW_EMPTY_gst-meta-x11-base = "1"
-ALLOW_EMPTY_gst-meta-audio = "1"
-ALLOW_EMPTY_gst-meta-debug = "1"
-ALLOW_EMPTY_gst-meta-video = "1"
-
-RDEPENDS_gst-meta-base = "\
- ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gst-meta-x11-base', '', d)} \
- gstreamer \
- gst-plugins-base-playbin \
- gst-plugins-base-decodebin \
- gst-plugins-base-decodebin2 \
- gst-plugins-base-gio \
- gst-plugins-base-alsa \
- gst-plugins-base-volume \
- gst-plugins-base-audioconvert \
- gst-plugins-base-audioresample \
- gst-plugins-base-typefindfunctions \
- gst-plugins-base-videoscale \
- gst-plugins-base-ffmpegcolorspace \
- gst-plugins-good-autodetect \
- gst-plugins-good-souphttpsrc"
-
-RRECOMMENDS_gst-meta-x11-base = "\
- gst-plugins-base-ximagesink \
- gst-plugins-base-xvimagesink"
-
-RDEPENDS_gst-meta-audio = "\
- gst-meta-base \
- gst-plugins-base-vorbis \
- gst-plugins-base-ogg \
- gst-plugins-good-wavparse \
- gst-plugins-good-flac \
- ${COMMERCIAL_AUDIO_PLUGINS}"
-
-
-RDEPENDS_gst-meta-debug = "\
- gst-meta-base \
- gst-plugins-good-debug \
- gst-plugins-base-audiotestsrc \
- gst-plugins-base-videotestsrc"
-
-
-RDEPENDS_gst-meta-video = "\
- gst-meta-base \
- gst-plugins-good-avi \
- gst-plugins-good-matroska \
- gst-plugins-base-theora \
- ${COMMERCIAL_VIDEO_PLUGINS}"
-
-RRECOMMENDS_gst-meta-video = "\
- gst-meta-audio"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch
deleted file mode 100644
index 57a63b5..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: gst-openmax-0.10.1/omx/gstomx.c
-===================================================================
---- gst-openmax-0.10.1.orig/omx/gstomx.c 2010-09-30 18:00:24.000000000 -0700
-+++ gst-openmax-0.10.1/omx/gstomx.c 2011-05-17 23:08:08.794535872 -0700
-@@ -238,7 +238,8 @@
- const gchar *element_name = gst_structure_nth_field_name (element_table, i);
- GstStructure *element = get_element_entry (element_name);
- const gchar *type_name, *parent_type_name;
-- const gchar *component_name, *component_role, *library_name;
-+ const gchar *component_name, *library_name;
-+ const gchar __attribute__((__unused__)) *component_role;
- GType type;
- gint rank;
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch
deleted file mode 100644
index 5965bba..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Rename static functions that use GLib naming conventions as one of them
-(g_ptr_array_insert) has now been added to GLib.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/omx/gstomx_util.c b/omx/gstomx_util.c
-index 423e441..579dbf5 100644
---- a/omx/gstomx_util.c
-+++ b/omx/gstomx_util.c
-@@ -85,7 +85,7 @@ static gboolean initialized;
- */
-
- static void
--g_ptr_array_clear (GPtrArray * array)
-+omx_g_ptr_array_clear (GPtrArray * array)
- {
- guint index;
- for (index = 0; index < array->len; index++)
-@@ -93,7 +93,7 @@ g_ptr_array_clear (GPtrArray * array)
- }
-
- static void
--g_ptr_array_insert (GPtrArray * array, guint index, gpointer data)
-+omx_g_ptr_array_insert (GPtrArray * array, guint index, gpointer data)
- {
- if (index + 1 > array->len) {
- g_ptr_array_set_size (array, index + 1);
-@@ -394,7 +394,7 @@ g_omx_core_unload (GOmxCore * core)
- }
-
- core_for_each_port (core, g_omx_port_free);
-- g_ptr_array_clear (core->ports);
-+ omx_g_ptr_array_clear (core->ports);
- }
-
- static inline GOmxPort *
-@@ -418,7 +418,7 @@ g_omx_core_new_port (GOmxCore * core, guint index)
- }
-
- port = g_omx_port_new (core, index);
-- g_ptr_array_insert (core->ports, index, port);
-+ omx_g_ptr_array_insert (core->ports, index, port);
-
- return port;
- }
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb
deleted file mode 100644
index 2e01579..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SUMMARY = "GStreamer plug-in for communication with OpenMAX IL components"
-DESCRIPTION = "GstOpenMAX is a GStreamer plug-in that allows \
-communication with OpenMAX Integration Layer (IL) components. OpenMAX \
-IL is an industry standard that provides an abstraction layer for \
-computer graphics, video, and sound routines."
-HOMEPAGE = "http://freedesktop.org/wiki/GstOpenMAX"
-DEPENDS = "gstreamer"
-RDEPENDS_${PN} = "libomxil"
-LICENSE = "LGPLv2.1"
-LICENSE_FLAGS = "commercial"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
- file://util/sem.h;beginline=1;endline=20;md5=accce5550d5583b839b441a0623f09fc"
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gst-openmax/gst-openmax-${PV}.tar.bz2 \
- file://gcc_4.6.patch \
- file://ptr-array.patch \
- "
-
-inherit autotools pkgconfig
-
-# Tell configure that this isn't a development snapshot so we don't want
-# -Werror (hopefully fixed in 0.10.2)
-export GST_CVS="no"
-
-EXTRA_OECONF += "--disable-valgrind"
-
-PR = "r4"
-
-FILES_${PN} += "${libdir}/gstreamer-0.10/libgstomx.so"
-FILES_${PN}-dev += "${libdir}/gstreamer-0.10/libgstomx.la"
-FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/libgstomx.a"
-FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug/"
-
-SRC_URI[md5sum] = "4d0370bfe99dea20918c84347abadb4e"
-SRC_URI[sha256sum] = "9074d5a0591995133d19cfb15144f19664f902c1623f996595695cf2c2070e1f"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch
deleted file mode 100644
index 235acda..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix buffer overflow in mp4 parsing
-Author: Ralph Giles <giles@mozilla.com>
----
-Backport patch from debian to fix CVE-2015-0797.
-https://sources.debian.net/data/main/g/gst-plugins-bad0.10/0.10.23-7.1+deb7u2/debian/patches/buffer-overflow-mp4.patch
-
-Upstream-Status: Backport
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
---- gst-plugins-bad0.10-0.10.23.orig/gst/videoparsers/gsth264parse.c
-+++ gst-plugins-bad0.10-0.10.23/gst/videoparsers/gsth264parse.c
-@@ -384,6 +384,11 @@ gst_h264_parse_wrap_nal (GstH264Parse *
-
- GST_DEBUG_OBJECT (h264parse, "nal length %d", size);
-
-+ if (size > G_MAXUINT32 - nl) {
-+ GST_ELEMENT_ERROR (h264parse, STREAM, FAILED, (NULL),
-+ ("overflow in nal size"));
-+ return NULL;
-+ }
- buf = gst_buffer_new_and_alloc (size + nl + 4);
- if (format == GST_H264_PARSE_FORMAT_AVC) {
- GST_WRITE_UINT32_BE (GST_BUFFER_DATA (buf), size << (32 - 8 * nl));
-@@ -452,6 +457,11 @@ gst_h264_parse_process_nal (GstH264Parse
- GST_DEBUG_OBJECT (h264parse, "not processing nal size %u", nalu->size);
- return;
- }
-+ if (G_UNLIKELY (nalu->size > 20 * 1024 * 1024)) {
-+ GST_DEBUG_OBJECT (h264parse, "not processing nal size %u (too big)",
-+ nalu->size);
-+ return;
-+ }
-
- /* we have a peek as well */
- nal_type = nalu->type;
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb
deleted file mode 100644
index 38fccc8..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-require gst-plugins.inc
-
-LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ "
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
- file://gst/tta/filters.h;beginline=12;endline=29;md5=629b0c7a665d155a6677778f4460ec06 \
- file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
- file://gst/tta/crc32.h;beginline=12;endline=29;md5=71a904d99ce7ae0c1cf129891b98145c"
-
-DEPENDS += "gst-plugins-base"
-
-PR = "r4"
-
-SRC_URI += "file://buffer-overflow-mp4.patch"
-
-inherit gettext gsettings
-
-EXTRA_OECONF += "--disable-experimental \
- --disable-sdl --disable-cdaudio --disable-directfb \
- --disable-vdpau --disable-apexsink"
-
-PACKAGECONFIG ??= "bzip curl \
- ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'rsvg', '', d)}"
-
-PACKAGECONFIG[bzip] = "--enable-bz2,--disable-bz2,bzip2"
-PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
-PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg,"
-PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
-PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon"
-PACKAGECONFIG[mms] = "--enable-libmms,--disable-libmms,libmms"
-PACKAGECONFIG[cog] = "--enable-cog,--disable-cog,libpng"
-PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2"
-PACKAGECONFIG[jp2k] = "--enable-jp2k,--disable-jp2k,jasper"
-PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug"
-PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus"
-PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1"
-PACKAGECONFIG[vp8] = "--enable-vp8,--disable-vp8,libvpx"
-PACKAGECONFIG[ass] = "--enable-assrender,--disable-assrender,libass"
-PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft"
-PACKAGECONFIG[schro] = "--enable-schro,--disable-schro,schroedinger"
-PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394"
-PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac"
-PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump"
-PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc"
-PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc"
-PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdnav libdvdread"
-PACKAGECONFIG[zbar] = "--enable-zbar,--disable-zbar,zbar jpeg"
-
-ARM_INSTRUCTION_SET = "arm"
-
-PACKAGES =+ "${PN}-resindvd"
-FILES_${PN}-resindvd = "${libdir}/gstreamer-${LIBV}/libresindvd.so"
-FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/libresindvd.la"
-FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs"
-
-do_configure_prepend() {
- # This m4 file contains nastiness which conflicts with libtool 2.2.2
- rm ${S}/m4/lib-link.m4 || true
-}
-
-SRC_URI[md5sum] = "fcb09798114461955260e4d940db5987"
-SRC_URI[sha256sum] = "0eae7d1a1357ae8377fded6a1b42e663887beabe0e6cc336e2ef9ada42e11491"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
deleted file mode 100644
index 29fbec5..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5478eafecf618cd8e742cc1b96d688a2c7ce5a79 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Sun, 2 Oct 2016 21:49:33 +0200
-Subject: [PATCH] gst-glib2.m4: don't do crazy things to GLIB_CFLAGS
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-we are definitely not one of those poor souls mentioned
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- common/m4/gst-glib2.m4 | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/common/m4/gst-glib2.m4 b/common/m4/gst-glib2.m4
-index b01f02f..4569ae5 100644
---- a/common/m4/gst-glib2.m4
-+++ b/common/m4/gst-glib2.m4
-@@ -69,7 +69,6 @@ AC_DEFUN([AG_GST_GLIB_CHECK],
- fi
-
- dnl for the poor souls who for example have glib in /usr/local
-- AS_SCRUB_INCLUDE(GLIB_CFLAGS)
-
- AC_SUBST(GLIB_EXTRA_CFLAGS)
- ])
---
-2.5.5
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
deleted file mode 100644
index 5214256..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-audioresample: Fix build on x86 if emmintrin.h is available but can't be used
-
-On x86, EMMINTRIN is defined but not usable without SSE so check for
-__SSE__ and __SSE2__ as well.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=670690
-
-Upstream-Status: Backport
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- gst/audioresample/resample.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c
-index 98d006c..481fa01 100644
---- a/gst/audioresample/resample.c
-+++ b/gst/audioresample/resample.c
-@@ -77,13 +77,13 @@
- #define EXPORT G_GNUC_INTERNAL
-
- #ifdef _USE_SSE
--#ifndef HAVE_XMMINTRIN_H
-+#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H)
- #undef _USE_SSE
- #endif
- #endif
-
- #ifdef _USE_SSE2
--#ifndef HAVE_EMMINTRIN_H
-+#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H)
- #undef _USE_SSE2
- #endif
- #endif
---
-1.7.1
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch
deleted file mode 100644
index b8602c8..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Submitted [similar patch by other author, bugzilla]
-Bugtracker-URL: https://bugzilla.gnome.org/show_bug.cgi?id=663600
-
-Prepend PKG_CONFIG_SYSROOT to includedir, so configure doesn't
-search for gstconfig.h in /usr/include.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1901bcf..460fb0a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -435,7 +435,7 @@ AG_GST_CHECK_PLUGIN(volume)
- dnl check for gstreamer core features (subsystems)
- dnl FIXME: this assumes srcdir == builddir for uninstalled setups
- GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-0.10`"/gst/gstconfig.h"
--AG_GST_PARSE_SUBSYSTEM_DISABLES($GST_CONFIGPATH)
-+AG_GST_PARSE_SUBSYSTEM_DISABLES($PKG_CONFIG_SYSROOT_DIR$GST_CONFIGPATH)
- AM_CONDITIONAL(USE_XML, test $GST_DISABLE_XML != "1")
-
- dnl disable plug-ins that require libxml2's HTML support if it is not available
---
-1.7.5.4
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch
deleted file mode 100644
index 99dbc9d..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove -DTREMOR option since Tremor has dropped its internal
-libogg2, and gst-plugins-base has dependency on that.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-Signed-off-by: Shane Wang <shane.wang@intel.com>
-
-diff -r 70065fb4e085 ext/vorbis/Makefile.am
---- a/ext/vorbis/Makefile.am Tue Mar 13 16:36:56 2012 +0800
-+++ b/ext/vorbis/Makefile.am Tue Mar 13 16:38:53 2012 +0800
-@@ -30,7 +30,7 @@
- gstvorbisdec.c gstvorbisdeclib.c gstvorbiscommon.c
- libgstivorbisdec_la_CFLAGS = \
- $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
-- -DTREMOR $(IVORBIS_CFLAGS)
-+ $(IVORBIS_CFLAGS)
- libgstivorbisdec_la_LIBADD = \
- $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \
- $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
deleted file mode 100644
index a3bfa5f..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-require gst-plugins.inc
-
-LICENSE = "GPLv2+ & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
- file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \
- file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
- file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"
-
-DEPENDS += "alsa-lib libogg libvorbis libtheora util-linux tremor glib-2.0-native"
-
-SRC_URI += "file://gst-plugins-base-tremor.patch \
- file://configure.ac-fix-subparse-plugin.patch \
- file://audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch \
- file://0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch \
-"
-
-SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a"
-SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976"
-
-PR = "r8"
-
-inherit gettext
-
-EXTRA_OECONF += "--disable-freetypetest"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
-
-PACKAGECONFIG[gnomevfs] = "--enable-gnome_vfs,--disable-gnome_vfs,gnome-vfs"
-PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
-PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
-PACKAGECONFIG[x11] = "--enable-x --enable-xvideo,--disable-x --disable-xvideo,virtual/libx11 libxv libsm libice"
-PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia"
-
-do_configure_prepend() {
- # This m4 file contains nastiness which conflicts with libtool 2.2.2
- rm -f ${S}/m4/lib-link.m4
-}
-
-FILES_${PN} += "${datadir}/${BPN}"
-
-CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
-
-# /usr/bin/gst-visualise-0.10 is a perl script.
-RDEPENDS_${PN}-apps += "perl"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch
deleted file mode 100644
index bc2f88b..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 14d51cbefef19737e7ab2b6818ee1d3bdb248d12 Mon Sep 17 00:00:00 2001
-From: Jeremy Stashluk <jstashluk@dekaresearch.com>
-Date: Wed, 6 Feb 2013 09:59:48 -0500
-Subject: [PATCH] conditional gl framebuffer undefined use
-
-The OpenGL extension GL_ARB_framebuffer_object defines the macro
-GL_FRAMEBUFFER_UNDEFINED. The macro will only need to map to an error
-string if the extension provides functions that might return the macro.
-
-Upstream-Status: Pending
-
-Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
----
- gst-libs/gst/gl/gstgldisplay.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c
-index 3ed0b71..64c6c2c 100644
---- a/gst-libs/gst/gl/gstgldisplay.c
-+++ b/gst-libs/gst/gl/gstgldisplay.c
-@@ -2177,9 +2177,11 @@ gst_gl_display_check_framebuffer_status (void)
- GST_ERROR ("GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS");
- break;
-
-+#if defined(GL_ARB_framebuffer_object)
- case GL_FRAMEBUFFER_UNDEFINED:
- GST_ERROR ("GL_FRAMEBUFFER_UNDEFINED");
- break;
-+#endif
-
- default:
- GST_ERROR ("General FBO error");
---
-1.7.9.5
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch
deleted file mode 100644
index 7db1c5a..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Check for header and library separately and check for GLESv2 before egl
-this is to overcome an annoying issue with rpi/userland where egl depends
-on sysmbols from libGLESv2
-
--Khem
-Index: gst-plugins-gl-0.10.3/configure.ac
-===================================================================
---- gst-plugins-gl-0.10.3.orig/configure.ac
-+++ gst-plugins-gl-0.10.3/configure.ac
-@@ -183,8 +183,10 @@ case $host in
- else
- AC_CHECK_HEADERS([EGL/egl.h], [HAVE_EGL=yes], [HAVE_EGL=no])
- if test "x$HAVE_EGL" = "xyes"; then
-- AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h,, AC_MSG_ERROR([EGL is required]))
-- AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h,, AC_MSG_ERROR([OpenGLES2 is required]))
-+ AC_CHECK_HEADERS([GLES2/gl2.h],, AC_MSG_ERROR([OpenGLES2 is required]))
-+ AC_CHECK_LIB(GLESv2,[glTexImage2D],, AC_MSG_ERROR([OpenGLES2 is required]))
-+ AC_CHECK_HEADERS([EGL/egl.h],, AC_MSG_ERROR([EGL is required]))
-+ AC_CHECK_LIB(EGL,[eglGetError],, AC_MSG_ERROR([EGL is required]))
- GL_LIBS="$LIBS $X_LIBS -lEGL -lGLESv2"
- GL_BACKEND=x11ES2
- GL_TYPE=gles
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
deleted file mode 100644
index f3eaf30..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-require gst-plugins.inc
-
-LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ "
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
-
-SRC_URI[md5sum] = "ac70ede13f79978d56eaed8abaa3c938"
-SRC_URI[sha256sum] = "48340b6a4b8abce16344a7bc33e74a94fdcce4f57ef6342cdf2f941c429bf210"
-
-SRC_URI += " file://0001-conditional-gl-framebuffer-undefined-use.patch \
- file://rpi-egl-gles2-dep.patch \
-"
-
-DEPENDS += "gst-plugins-base virtual/libgles2 virtual/egl jpeg libpng glew"
-
-PR = "r4"
-
-inherit gettext distro_features_check
-
-REQUIRED_DISTRO_FEATURES = "opengl"
-
-# This package doesn't have a configure switch for EGL or GL, so forcibly tell
-# configure that it can't find gl.h so it always uses EGL. If/when we have some
-# way for machines to specify their preferred GL flavour this can be
-# automatically adapted.
-EXTRA_OECONF += "ac_cv_header_GL_gl_h=no"
-
-ALLOW_EMPTY_${PN} = "1"
-ALLOW_EMPTY_${PN}-apps = "1"
-ALLOW_EMPTY_${PN}-glib = "1"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch
deleted file mode 100644
index 6456d3c..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 12d18fe4e98e7c232d59b56d529a0521f293fe6d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Wed, 5 Sep 2012 18:54:42 +0200
-Subject: [PATCH] v4l2: fix build with recent kernels, the v4l2_buffer input
- field was removed
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Backport
-
-[1] http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=9f2aa8d47f835ea155aaf635f618c0fc1ca87012
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- sys/v4l2/gstv4l2bufferpool.c | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
-index b81c6a4..51cc0ce 100644
---- a/sys/v4l2/gstv4l2bufferpool.c
-+++ b/sys/v4l2/gstv4l2bufferpool.c
-@@ -181,7 +181,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
- GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u",
- ret->vbuffer.m.offset);
- GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
-- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
-
- data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
- PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd,
---
-1.7.6.5
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
deleted file mode 100644
index bd0de58..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ccb01de8096a32d86d47b0d92ec3416c57ee4d25 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Thu, 22 Aug 2013 12:15:54 -0400
-Subject: [PATCH] v4l2_calls: define V4L2_CID_HCENTER and V4L2_CID_VCENTER
-
-kernel commit 24b9f5017 [[media] V4L: Remove deprecated image centering controls]
-removed the definitions of V4L2_CID_HCENTER and V4L2_CID_VCENTER after three
-years of depreciation.
-
-The ioctl values are still free, and the case statement which processess them
-in v4l2 userspace falls through to the proper replacement. So in the short
-term, we can explicitly define them using the old absolute values, and everything
-will work.
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- sys/v4l2/v4l2_calls.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
-index 309bfb6..3c64544 100644
---- a/sys/v4l2/v4l2_calls.c
-+++ b/sys/v4l2/v4l2_calls.c
-@@ -54,11 +54,16 @@
- #include "gst/gst-i18n-plugin.h"
-
- /* Those are ioctl calls */
-+
-+/* V4L2_CID_HCENTER has been removed from the mainline kernel, but
-+ the ioctl space is still present. Since these values fall through
-+ to their replacement, it is safe (in the short term) to re-use the
-+ old values explictily */
- #ifndef V4L2_CID_HCENTER
--#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
-+#define V4L2_CID_HCENTER V4L2_CID_BASE+22
- #endif
- #ifndef V4L2_CID_VCENTER
--#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
-+#define V4L2_CID_VCENTER V4L2_CID_BASE+23
- #endif
-
- GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
---
-1.7.10.4
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
deleted file mode 100644
index 48b8e98..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ce94b2c2b91b6db190c121860e12a6afafce7ae1 Mon Sep 17 00:00:00 2001
-From: Roland Krikava <rkrikava@gmail.com>
-Date: Fri, 2 Nov 2012 12:38:44 -0400
-Subject: [PATCH 407/440] mulawdec: fix integer overrun
-
-There might be more than 65535 samples in a chunk of data.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=687469
-
-Commit - 3be45f70220310ec1c60d819f90b5f2ae03b5d83 in 0.10 branch
-
-Upstream Status: Backported
-
-Signed-off-by: Roland Krikava <rkrikava@gmail.com>
----
- gst/law/mulaw-conversion.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/gst/law/mulaw-conversion.c b/gst/law/mulaw-conversion.c
-index 8afae80..190a9f5 100644
---- a/gst/law/mulaw-conversion.c
-+++ b/gst/law/mulaw-conversion.c
-@@ -51,9 +51,10 @@ mulaw_encode (gint16 * in, guint8 * out, gint numsamples)
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
- };
-- gint16 sign, exponent, mantissa, i;
-+ gint16 sign, exponent, mantissa;
- gint16 sample;
- guint8 ulawbyte;
-+ gint i;
-
- for (i = 0; i < numsamples; i++) {
- sample = in[i];
-@@ -102,7 +103,8 @@ mulaw_decode (guint8 * in, gint16 * out, gint numsamples)
- static gint16 exp_lut[8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 };
- gint16 sign, exponent, mantissa;
- guint8 ulawbyte;
-- gint16 linear, i;
-+ gint16 linear;
-+ gint i;
-
- for (i = 0; i < numsamples; i++) {
- ulawbyte = in[i];
---
-1.7.9.5
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb
deleted file mode 100644
index f993cfc..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-require gst-plugins.inc
-
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
- file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \
- file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
-
-PR = "r8"
-
-PACKAGECONFIG ?= "jpeg v4l \
- ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
-"
-PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
-PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
-PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
-PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack"
-PACKAGECONFIG[gdkpixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
-PACKAGECONFIG[v4l] = "--enable-gst_v4l2 --with-gudev,--disable-gst_v4l2 --without-gudev,libgudev"
-# sub-feature of v4l, but control separately since libv4l is not part of oe-core
-PACKAGECONFIG[libv4l] = "--with-libv4l2,--without-libv4l2,libv4l"
-PACKAGECONFIG[bzip2] = "--enable-bz2,--disable-bz2,bzip2"
-PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
-PACKAGECONFIG[x11] = "--enable-x,--disable-x,virtual/libx11 libxfixes libxdamage"
-PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libiec61883 libavc1394"
-
-DEPENDS += "gst-plugins-base gconf cairo libpng zlib libid3tag flac \
- speex libsoup-2.4 libcap"
-
-inherit gettext gconf
-
-SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch \
- file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch \
- file://0407-mulawdec-fix-integer-overrun.patch \
-"
-EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal \
- --disable-examples --disable-taglib"
-
-do_configure_prepend() {
- # This m4 file contains nastiness which conflicts with libtool 2.2.2
- rm ${S}/m4/lib-link.m4 || true
-}
-
-SRC_URI[md5sum] = "24f98a294a2b521e1b29412bdadae2e6"
-SRC_URI[sha256sum] = "7e27840e40a7932ef2dc032d7201f9f41afcaf0b437daf5d1d44dc96d9e35ac6"
-
-FILES_${PN}-gconfelements += "${sysconfdir}/gconf/schemas/gstreamer-0.10.schemas"
-FILES_${PN}-equalizer += "${datadir}/gstreamer-0.10/presets/*.prs"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch
deleted file mode 100644
index 1f72fc0..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001
-From: Leon Merten Lohse <leon@green-side.de>
-Date: Thu, 3 May 2012 23:50:30 +0100
-Subject: [PATCH] cdio: compensate for libcdio's recent cd-text api changes
-
-https://bugzilla.gnome.org/show_bug.cgi?id=675112
-
-Conflicts:
-
- ext/cdio/gstcdiocddasrc.c
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-
-Upstream-Status: Backport
----
- ext/cdio/gstcdio.c | 35 ++++++++++++++++++++++++++++-------
- ext/cdio/gstcdio.h | 16 ++++++++++++++++
- ext/cdio/gstcdiocddasrc.c | 19 +++++++++++++++++++
- 3 files changed, 63 insertions(+), 7 deletions(-)
-
-diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c
-index 2f58d18..483ebf5 100644
---- a/ext/cdio/gstcdio.c
-+++ b/ext/cdio/gstcdio.c
-@@ -30,12 +30,16 @@
- GST_DEBUG_CATEGORY (gst_cdio_debug);
-
- void
--gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
-+gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track,
- cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags)
- {
- const gchar *txt;
-
-+#if LIBCDIO_VERSION_NUM > 83
-+ txt = cdtext_get_const (cdtext, field, track);
-+#else
- txt = cdtext_get_const (field, cdtext);
-+#endif
- if (txt == NULL || *txt == '\0') {
- GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag);
- return;
-@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
- }
-
- GstTagList *
-+#if LIBCDIO_VERSION_NUM > 83
-+gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track)
-+{
-+ GstTagList *tags = NULL;
-+
-+#else
- gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
- {
- GstTagList *tags = NULL;
-@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
- GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track);
- return NULL;
- }
-+#endif
-
-- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags);
-- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags);
-+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER,
-+ GST_TAG_ARTIST, &tags);
-+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE,
-+ &tags);
-
- return tags;
- }
-
- void
-+#if LIBCDIO_VERSION_NUM > 83
-+gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t,
-+ GstTagList * tags)
-+{
-+#else
- gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
- {
- cdtext_t *t;
-@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
- GST_DEBUG_OBJECT (src, "no CD-TEXT for album");
- return;
- }
-+#endif
-
-- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */
-- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags);
-- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags);
--
-+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER,
-+ GST_TAG_ALBUM_ARTIST, &tags);
-+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM,
-+ &tags);
-+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE,
-+ &tags);
- GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags);
- }
-
-diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h
-index ef31ed0..c6da580 100644
---- a/ext/cdio/gstcdio.h
-+++ b/ext/cdio/gstcdio.h
-@@ -24,22 +24,38 @@
- #include <gst/gst.h>
- #include <cdio/cdio.h>
- #include <cdio/cdtext.h>
-+#include <cdio/version.h>
-+
-+#if LIBCDIO_VERSION_NUM <= 83
-+ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER
-+ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE
-+ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE
-+#endif
-
- GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug);
- #define GST_CAT_DEFAULT gst_cdio_debug
-
- void gst_cdio_add_cdtext_field (GstObject * src,
- cdtext_t * cdtext,
-+ track_t track,
- cdtext_field_t field,
- const gchar * gst_tag,
- GstTagList ** p_tags);
-
- GstTagList * gst_cdio_get_cdtext (GstObject * src,
-+#if LIBCDIO_VERSION_NUM > 83
-+ cdtext_t * t,
-+#else
- CdIo * cdio,
-+#endif
- track_t track);
-
- void gst_cdio_add_cdtext_album_tags (GstObject * src,
-+#if LIBCDIO_VERSION_NUM > 83
-+ cdtext_t * t,
-+#else
- CdIo * cdio,
-+#endif
- GstTagList * tags);
-
- #endif /* __GST_CDIO_H__ */
-diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c
-index 615a0c8..830839e 100644
---- a/ext/cdio/gstcdiocddasrc.c
-+++ b/ext/cdio/gstcdiocddasrc.c
-@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
- GstCdioCddaSrc *src;
- discmode_t discmode;
- gint first_track, num_tracks, i;
-+#if LIBCDIO_VERSION_NUM > 83
-+ cdtext_t *cdtext;
-+#endif
-
- src = GST_CDIO_CDDA_SRC (audiocdsrc);
-
-@@ -244,8 +244,18 @@ gst_cdio_cdda_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device)
- if (src->read_speed != -1)
- cdio_set_speed (src->cdio, src->read_speed);
-
-+#if LIBCDIO_VERSION_NUM > 83
-+ cdtext = cdio_get_cdtext (src->cdio);
-+
-+ if (NULL == cdtext)
-+ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc");
-+ else
-+ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext,
-+ cddabasesrc->tags);
-+#else
- gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio,
- cddabasesrc->tags);
-+#endif
-
- GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track);
-
-@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
- * the right thing here (for cddb id calculations etc. as well) */
- track.start = cdio_get_track_lsn (src->cdio, i + first_track);
- track.end = track.start + len_sectors - 1; /* -1? */
-+#if LIBCDIO_VERSION_NUM > 83
-+ if (NULL != cdtext)
-+ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext,
-+ i + first_track);
-+#else
- track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio,
- i + first_track);
-+#endif
-
- gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track);
- }
---
-2.1.0
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch
deleted file mode 100644
index 3fd6a26..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From e634bc6420826f760f6519a9f134c6a4d3412ef8 Mon Sep 17 00:00:00 2001
-From: Carlos Rafael Giani <dv@pseudoterminal.org>
-Date: Mon, 19 Oct 2015 15:26:24 +0200
-Subject: [PATCH] Fix opencore include paths
-
-Upstream-Status: Inappropriate [no upstream - GStreamer 0.10 is no longer being maintained]
-
-Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
----
- ext/amrnb/amrnbdec.h | 2 +-
- ext/amrnb/amrnbenc.h | 2 +-
- ext/amrwbdec/amrwbdec.h | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ext/amrnb/amrnbdec.h b/ext/amrnb/amrnbdec.h
-index 1e81839..01b7154 100644
---- a/ext/amrnb/amrnbdec.h
-+++ b/ext/amrnb/amrnbdec.h
-@@ -22,7 +22,7 @@
-
- #include <gst/gst.h>
- #include <gst/audio/gstaudiodecoder.h>
--#include <interf_dec.h>
-+#include <opencore-amrnb/interf_dec.h>
-
- G_BEGIN_DECLS
-
-diff --git a/ext/amrnb/amrnbenc.h b/ext/amrnb/amrnbenc.h
-index 7f673ac..5be39b5 100644
---- a/ext/amrnb/amrnbenc.h
-+++ b/ext/amrnb/amrnbenc.h
-@@ -21,7 +21,7 @@
- #define __GST_AMRNBENC_H__
-
- #include <gst/gst.h>
--#include <interf_enc.h>
-+#include <opencore-amrnb/interf_enc.h>
- #include <gst/audio/gstaudioencoder.h>
-
- G_BEGIN_DECLS
-diff --git a/ext/amrwbdec/amrwbdec.h b/ext/amrwbdec/amrwbdec.h
-index c3528fc..f27c6d2 100644
---- a/ext/amrwbdec/amrwbdec.h
-+++ b/ext/amrwbdec/amrwbdec.h
-@@ -22,8 +22,8 @@
-
- #include <gst/gst.h>
- #include <gst/audio/gstaudiodecoder.h>
--#include <dec_if.h>
--#include <if_rom.h>
-+#include <opencore-amrwb/dec_if.h>
-+#include <opencore-amrwb/if_rom.h>
-
- G_BEGIN_DECLS
-
---
-1.9.1
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb
deleted file mode 100644
index 199b47d..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require gst-plugins.inc
-
-LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+"
-LICENSE_FLAGS = "commercial"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
- file://gst/synaesthesia/synaescope.h;beginline=1;endline=20;md5=99f301df7b80490c6ff8305fcc712838 \
- file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 \
- file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9"
-
-DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
-PR = "r3"
-
-inherit gettext
-
-EXTRA_OECONF += "--with-plugins=a52dec,lame,id3tag,mad,mpeg2dec,mpegstream,mpegaudioparse,asfdemux,realmedia \
- --disable-orc"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264"
-PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio"
-PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread"
-PACKAGECONFIG[amrnb] = "--enable-amrnb,--disable-amrnb,opencore-amr"
-PACKAGECONFIG[amrwb] = "--enable-amrwb,--disable-amrwb,opencore-amr"
-
-do_configure_prepend() {
- # This m4 file contains nastiness which conflicts with libtool 2.2.2
- rm ${S}/m4/lib-link.m4 || true
-}
-
-SRC_URI[md5sum] = "1d81c593e22a6cdf0f2b4f57eae93df2"
-SRC_URI[sha256sum] = "1ca90059275c0f5dca71d4d1601a8f429b7852baed0723e820703b977e2c8df0"
-SRC_URI += "file://0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch \
- file://0002-Fix-opencore-include-paths.patch"
-
-FILES_${PN}-amrnb += "${datadir}/gstreamer-0.10/presets/GstAmrnbEnc.prs"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
deleted file mode 100644
index 6e163a8..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "Plugins for the GStreamer multimedia framework"
-HOMEPAGE = "http://gstreamer.freedesktop.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
-SECTION = "multimedia"
-DEPENDS = "gstreamer"
-
-# gobject-introspection to get --disable-introspection into UNKNOWN_CONFIGURE_WHITELIST
-inherit autotools pkgconfig gobject-introspection
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2"
-
-GSTREAMER_DEBUG ?= "--disable-debug"
-EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_DEBUG} --disable-examples --disable-introspection"
-
-acpaths = "-I ${S}/common/m4 -I ${S}/m4"
-
-LIBV = "0.10"
-require recipes-multimedia/gstreamer/gst-plugins-package.inc
-
-PACKAGES_DYNAMIC += "^${PN}-.*"
-
-# apply gstreamer hack after Makefile.in.in in source is replaced by our version from
-# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed
-# http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html
-oe_runconf_prepend() {
- if [ -e ${S}/po/Makefile.in.in ]; then
- sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in
- fi
-}
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch
deleted file mode 100644
index 3afca4e..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-index gst-rtsp_0.10.8/bindings/python/Makefile.am
---- gst-rtsp_0.10.8.orig/bindings/python/Makefile.am
-+++ gst-rtsp_0.10.8/bindings/python/Makefile.am
-@@ -14,7 +14,7 @@ defs_DATA = $(DEFS)
- defsdir = $(pkgdatadir)/$(GST_MAJORMINOR)/defs
- OVERRIDES = rtspserver.override
-
--INCLUDES = -I$(top_srcdir) -I$(srcdir) $(PYTHON_INCLUDES)
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) $(PYTHON_INCLUDES)
-
- rtspserver_la_CFLAGS = -I$(top_srcdir)/src \
- $(PYGOBJECT_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-index gst-rtsp_0.10.8/examples/Makefile.am
---- gst-rtsp_0.10.8.orig/examples/Makefile.am
-+++ gst-rtsp_0.10.8/examples/Makefile.am
-@@ -1,6 +1,6 @@
- noinst_PROGRAMS = test-video test-ogg test-mp4 test-readme test-launch test-sdp test-uri test-auth
-
--INCLUDES = -I$(top_srcdir) -I$(srcdir)
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)
-
- AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
- AM_LDFLAGS = \
-index gst-rtsp_0.10.8/tests/Makefile.am
---- gst-rtsp_0.10.8.orig/tests/Makefile.am
-+++ gst-rtsp_0.10.8/tests/Makefile.am
-@@ -1,6 +1,6 @@
- noinst_PROGRAMS = test-cleanup
-
--INCLUDES = -I$(top_srcdir) -I$(srcdir)
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)
-
- AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
- AM_LDFLAGS = \
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
deleted file mode 100644
index b78bcaf..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "GStreamer RTSP server"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
- file://0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch"
-SRC_URI[md5sum] = "b511af07000595f63c3a705946221643"
-SRC_URI[sha256sum] = "9915887cf8515bda87462c69738646afb715b597613edc7340477ccab63a6617"
-
-DEPENDS = "gst-plugins-base gstreamer"
-
-EXTRA_OECONF = "--disable-introspection"
-
-# Configure always checks for Python so inherit pythonnative. Better solution
-# would be to disable the checks entirely.
-inherit autotools pythonnative gettext
-
-FILES_${PN}-dev += "${datadir}/vala/vapi/"
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch
deleted file mode 100644
index d077496..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ed7f4802222234eef192aa3f74bc92268f338f97 Mon Sep 17 00:00:00 2001
-From: Sebastian Droege <sebastian.droege@collabora.co.uk>
-Date: Tue, 6 Mar 2012 12:28:02 +0100
-Subject: [PATCH] baseparse: Fix 'self-comparison always evaluates to true'
-
-This was really a bug.
-
-Commit is ed7f4802222234eef192aa3f74bc92268f338f97 in 0.10 branch
-
-Upstream Status: Backported
-
-Signed-off-by: Sebastian Droege <sebastian.droege@collabora.co.uk>
----
- libs/gst/base/gstbaseparse.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c
-index 851ec1d..108ee89 100644
---- a/libs/gst/base/gstbaseparse.c
-+++ b/libs/gst/base/gstbaseparse.c
-@@ -3899,7 +3899,7 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event)
- seek event (in bytes) to upstream. Segment / flush handling happens
- in corresponding src event handlers */
- GST_DEBUG_OBJECT (parse, "seek in PUSH mode");
-- if (seekstop >= 0 && seekpos <= seekpos)
-+ if (seekstop >= 0 && seekstop <= seekpos)
- seekstop = seekpos;
- new_event = gst_event_new_seek (rate, GST_FORMAT_BYTES, flags,
- GST_SEEK_TYPE_SET, seekpos, stop_type, seekstop);
---
-1.7.9.5
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch
deleted file mode 100644
index dc2d606..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 60516f4798894f958fc53b470e1283318d0f8706 Mon Sep 17 00:00:00 2001
-From: Kerrick Staley <kerrick@kerrickstaley.com>
-Date: Tue, 20 Aug 2013 23:59:29 -0700
-Subject: [PATCH 1/2] parse: make grammar.y work with Bison 3
-
-YYLEX_PARAM is no longer supported in Bison 3.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=706462
----
- gst/parse/grammar.y | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
-index 24fc87b..7f9dd16 100644
---- a/gst/parse/grammar.y
-+++ b/gst/parse/grammar.y
-@@ -26,7 +26,6 @@
- */
-
- #define YYERROR_VERBOSE 1
--#define YYLEX_PARAM scanner
-
- #define YYENABLE_NLS 0
-
-@@ -648,6 +647,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s);
- %right '.'
- %left '!' '='
-
-+%lex-param { void *scanner }
- %parse-param { void *scanner }
- %parse-param { graph_t *graph }
- %pure-parser
---
-2.7.2
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
deleted file mode 100644
index 8db3966..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4b145ceb22bbce7ba6e209c6ab61f2d5867e69f9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Tue, 1 Nov 2016 19:02:30 +0100
-Subject: [PATCH] gst-glib2.m4: don't do crazy things to GLIB_CFLAGS
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-we are definitely not one of those poor souls mentioned
-
-Upstream-Status: Pending
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- common/m4/gst-glib2.m4 | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/common/m4/gst-glib2.m4 b/common/m4/gst-glib2.m4
-index b01f02f..4569ae5 100644
---- a/common/m4/gst-glib2.m4
-+++ b/common/m4/gst-glib2.m4
-@@ -69,7 +69,6 @@ AC_DEFUN([AG_GST_GLIB_CHECK],
- fi
-
- dnl for the poor souls who for example have glib in /usr/local
-- AS_SCRUB_INCLUDE(GLIB_CFLAGS)
-
- AC_SUBST(GLIB_EXTRA_CFLAGS)
- ])
---
-2.5.5
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch
deleted file mode 100644
index 5d8bb13..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# gstreamer: Fix a problem with configure if check has already been built
-# Richard Purdie <rpurdie@linux.intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-diff -urN gstreamer-0.10.29-orig/configure.ac gstreamer-0.10.29/configure.ac
---- gstreamer-0.10.29-orig/configure.ac 2010-06-26 12:49:27.774930773 +0800
-+++ gstreamer-0.10.29/configure.ac 2010-06-26 12:51:12.899200233 +0800
-@@ -543,8 +543,10 @@
- *) BUILD_CHECK=yes ;;
- esac
- ])
-+
- dnl bit of a misnomer, but keep the conditional named like this so we don't
- dnl have to change too much elsewhere
-+HAVE_CHECK=no
- AM_CONDITIONAL(HAVE_CHECK, test "x$BUILD_CHECK" = "xyes")
-
- dnl configure the desired buffer alignment
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch
deleted file mode 100644
index 30be85f..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Fix crash with gst-inspect
-# Chris Lord <chris@openedhand.com>
-
-Upstream-Status: Pending
-
---- gstreamer-0.10.9/tools/gst-inspect.c.old 2006-09-12 11:56:53.000000000 +0100
-+++ gstreamer-0.10.9/tools/gst-inspect.c 2006-09-12 11:57:27.000000000 +0100
-@@ -1123,7 +1123,7 @@
- g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE);
- g_option_context_add_group (ctx, gst_init_get_option_group ());
- if (!g_option_context_parse (ctx, &argc, &argv, &err)) {
-- g_print ("Error initializing: %s\n", err->message);
-+ g_print ("Error initializing: %s\n", err ? err->message : "(null)");
- exit (1);
- }
- g_option_context_free (ctx);
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c
deleted file mode 100644
index c1f3e71..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c
+++ /dev/null
@@ -1,487 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- * 2000 Wim Taymans <wtay@chello.be>
- * 2005 David A. Schleef <ds@schleef.org>
- *
- * gstregistryxml.c: GstRegistry object, support routines
- *
- * This library is free software; you can redistribute it and/or
- * modify it ulnder the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#include <gst/gstregistrybinary.h>
-
-/*
-** Simple handy function to write a memory location to the registry cache file
-*/
-inline static gboolean
-gst_registry_binary_write(GstRegistry *registry, const void *mem, const ssize_t size)
-{
- if (write(registry->cache_file, mem, size) != size)
- {
- GST_ERROR("Failed to write binary registry element: ptr=%p size=%u error=%s\n",
- mem, size, strerror(errno));
- return FALSE;
- }
- return TRUE;
-}
-
-/*
-** Save features GstBinary style
-*/
-static gboolean
-gst_registry_binary_fill_feature(GList **list, GstPluginFeature *orig, GstBinaryPluginFeature *dest, const char *name)
-{
- GstBinaryChunck *chk;
-
- if ((chk = calloc(1, sizeof (GstBinaryChunck))) == NULL)
- return FALSE;
-
- chk->data = dest;
- chk->size = sizeof (GstBinaryPluginFeature);
-
- *list = g_list_append(*list, chk);
-
- dest->rank = orig->rank;
- if (!strncpy(dest->typename, name, GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN) ||
- !strncpy(dest->name, orig->name, GST_BINARY_REGISTRY_TYPENAME_NAME_LEN))
- {
- GST_ERROR("Failed to write binary registry feature");
- goto fail;
- }
-
- if (GST_IS_ELEMENT_FACTORY(orig))
- {
- GstElementFactory *factory = GST_ELEMENT_FACTORY(orig);
-
- if (!strncpy(dest->longname, factory->details.longname, GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN) ||
- !strncpy(dest->class, factory->details.klass, GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN) ||
- !strncpy(dest->description, factory->details.description, GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN) ||
- !strncpy(dest->author, factory->details.author, GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN))
- {
- GST_ERROR("Failed to write binary registry feature");
- goto fail;
- }
- }
-
- dest->npadtemplates = dest->ninterfaces = dest->nuritypes = 0;
- return TRUE;
-
- fail:
- free(chk);
- return FALSE;
-}
-
-
-/*
-** Initialize the GstBinaryRegistryMagic, setting both our magic number and gstreamer major/minor version
-*/
-inline static gboolean
-gst_registry_binary_initialize_magic(GstBinaryRegistryMagic *m)
-{
- if (!strncpy(m->magic, GST_MAGIC_BINARY_REGISTRY_STR, GST_MAGIC_BINARY_REGISTRY_LEN) ||
- !strncpy(m->version, GST_MAJORMINOR, GST_BINARY_REGISTRY_VERSION_LEN))
- {
- GST_ERROR("Failed to write magic to the registry magic structure");
- return FALSE;
- }
- return TRUE;
-}
-
-/*
-** Check GstBinaryRegistryMagic validity.
-** Return a pointer pointing right after the magic structure
-*/
-static gchar *
-gst_registry_binary_check_magic(gchar *in)
-{
- GstBinaryRegistryMagic *m = (GstBinaryRegistryMagic *) in;
-
- if (m == NULL || m->magic == NULL || m->version == NULL)
- {
- GST_ERROR("Binary registry magic structure is broken");
- return NULL;
- }
- if (strncmp(m->magic, GST_MAGIC_BINARY_REGISTRY_STR, GST_MAGIC_BINARY_REGISTRY_LEN) != 0)
- {
- GST_ERROR("Binary registry magic is different : %02x%02x%02x%02x != %02x%02x%02x%02x",
- GST_MAGIC_BINARY_REGISTRY_STR[0] & 0xff, GST_MAGIC_BINARY_REGISTRY_STR[1] & 0xff,
- GST_MAGIC_BINARY_REGISTRY_STR[2] & 0xff, GST_MAGIC_BINARY_REGISTRY_STR[3] & 0xff,
- m->magic[0] & 0xff, m->magic[1] & 0xff, m->magic[2] & 0xff, m->magic[3] & 0xff);
- return NULL;
- }
- if (strncmp(m->version, GST_MAJORMINOR, GST_BINARY_REGISTRY_VERSION_LEN))
- {
- GST_ERROR("Binary registry magic version is different : %s != %s",
- GST_MAJORMINOR, m->version);
- return NULL;
- }
- return (in + sizeof (GstBinaryRegistryMagic));
-}
-
-/*
-** Adapt a GstPlugin to our GstBinaryPluginElement structure, and write it to the
-** registry file.
-*/
-static gboolean
-gst_registry_binary_save_plugin(GList **list, GstRegistry *registry, GstPlugin *plugin)
-{
- GstBinaryPluginElement *e;
- GstBinaryChunck *chk;
- GList *walk;
-
- if ((e = calloc(1, sizeof (GstBinaryPluginElement))) == NULL ||
- (chk = calloc(1, sizeof (GstBinaryChunck))) == NULL)
- return FALSE;
-
- chk->data = e;
- chk->size = sizeof (GstBinaryPluginElement);
- *list = g_list_append(*list, chk);
-
- if (!strncpy(e->name, plugin->desc.name, GST_BINARY_REGISTRY_NAME_LEN) ||
- !strncpy(e->description, plugin->desc.description, GST_BINARY_REGISTRY_DESCRIPTION_LEN) ||
- !strncpy(e->filename, plugin->filename, _POSIX_PATH_MAX) ||
- !strncpy(e->version, plugin->desc.version, GST_BINARY_REGISTRY_VERSION_LEN) ||
- !strncpy(e->license, plugin->desc.license, GST_BINARY_REGISTRY_LICENSE_LEN) ||
- !strncpy(e->source, plugin->desc.source, GST_BINARY_REGISTRY_SOURCE_LEN) ||
- !strncpy(e->package, plugin->desc.package, GST_BINARY_REGISTRY_PACKAGE_LEN) ||
- !strncpy(e->origin, plugin->desc.origin, GST_BINARY_REGISTRY_ORIGIN_LEN))
- {
- GST_DEBUG("Can't adapt GstPlugin to GstBinaryPluginElement");
- goto fail;
- }
-
- e->size = plugin->file_size;
- e->m32p = plugin->file_mtime;
-
- GList *ft_list = gst_registry_get_feature_list_by_plugin(registry, plugin->desc.name);
-
- for (walk = ft_list; walk; walk = g_list_next(walk), e->nfeatures++)
- {
- GstPluginFeature *curfeat = GST_PLUGIN_FEATURE (walk->data);
- GstBinaryPluginFeature *newfeat;
- const char *feat_name = g_type_name(G_OBJECT_TYPE(curfeat));
-
- if ((newfeat = calloc(1, sizeof (GstBinaryPluginFeature))) == NULL)
- goto fail;
-
- if (!feat_name || !gst_registry_binary_fill_feature(list, curfeat, newfeat, feat_name))
- {
- GST_ERROR("Can't fill plugin feature, aborting.");
- goto fail;
- }
- }
-
- GST_DEBUG("Found %d features in plugin \"%s\"\n", e->nfeatures, e->name);
- return TRUE;
-
- fail:
- free(chk);
- free(e);
- return FALSE;
-}
-
-/*
-** Write the cache to file. Part of the code was taken from gstregistryxml.c
-*/
-gboolean
-gst_registry_binary_write_cache(GstRegistry *registry, const char *location)
-{
- GList *walk;
- char *tmp_location;
- GstBinaryRegistryMagic *magic;
- GstBinaryChunck *magic_chunck;
- GList *to_write = NULL;
-
- GST_INFO("Writing binary registry cache");
-
- g_return_val_if_fail (GST_IS_REGISTRY (registry), FALSE);
- tmp_location = g_strconcat (location, ".tmpXXXXXX", NULL);
- registry->cache_file = g_mkstemp (tmp_location);
- if (registry->cache_file == -1)
- {
- char *dir;
-
- /* oops, I bet the directory doesn't exist */
- dir = g_path_get_dirname (location);
- g_mkdir_with_parents (dir, 0777);
- g_free (dir);
-
- registry->cache_file = g_mkstemp (tmp_location);
- }
-
- if (registry->cache_file == -1)
- goto fail;
-
- if ((magic = calloc(1, sizeof (GstBinaryRegistryMagic))) == NULL ||
- !gst_registry_binary_initialize_magic(magic))
- goto fail;
-
- if ((magic_chunck = calloc(1, sizeof (GstBinaryChunck))) == NULL)
- goto fail;
-
- magic_chunck->data = magic;
- magic_chunck->size = sizeof (GstBinaryRegistryMagic);
- to_write = g_list_append(to_write, magic_chunck);
-
- /* Iterate trough the list of plugins in the GstRegistry and adapt them to our structures */
- for (walk = g_list_last(registry->plugins); walk; walk = g_list_previous(walk))
- {
- GstPlugin *plugin = GST_PLUGIN(walk->data);
-
- if (!plugin->filename)
- continue;
-
- if (plugin->flags & GST_PLUGIN_FLAG_CACHED)
- {
- int ret;
- struct stat statbuf;
-
- ret = g_stat (plugin->filename, &statbuf);
- if ((ret = g_stat (plugin->filename, &statbuf)) < 0 ||
- plugin->file_mtime != statbuf.st_mtime ||
- plugin->file_size != statbuf.st_size)
- continue;
- }
-
- if (!gst_registry_binary_save_plugin(&to_write, registry, plugin))
- {
- GST_ERROR("Can't write binary plugin information for \"%s\"", plugin->filename);
- continue; /* Try anyway */
- }
- }
-
- for (walk = g_list_first(to_write); walk; walk = g_list_next(walk))
- {
- GstBinaryChunck *cur = walk->data;
-
- if (!gst_registry_binary_write(registry, cur->data, cur->size))
- {
- free(cur->data);
- free(cur);
- g_list_free(to_write);
- goto fail;
- }
- free(cur->data);
- free(cur);
- }
- g_list_free(to_write);
-
- if (close(registry->cache_file) < 0)
- {
- GST_DEBUG("Can't close registry file : %s", strerror(errno));
- goto fail;
- }
-
- if (g_file_test (tmp_location, G_FILE_TEST_EXISTS)) {
-#ifdef WIN32
- remove (location);
-#endif
- rename (tmp_location, location);
- }
-
- g_free (tmp_location);
- return TRUE;
-
- fail:
- g_free(tmp_location);
- return FALSE;
-}
-
-static GstPluginFeature*
-gst_registry_binary_load_feature(GstBinaryPluginFeature *in)
-{
- GstPluginFeature *feature;
- GType type;
-
- if (!in->typename || !*(in->typename))
- return NULL;
-
- /* GST_INFO("Plugin feature typename : %s", in->typename);*/
-
- if (!(type = g_type_from_name(in->typename)))
- {
- GST_ERROR("Unknown type from typename");
- return NULL;
- }
- feature = g_object_new (type, NULL);
-
- if (!feature) {
- GST_ERROR("Can't create feature from type");
- return NULL;
- }
-
- if (!GST_IS_PLUGIN_FEATURE (feature)) {
- /* don't really know what it is */
- if (GST_IS_OBJECT (feature))
- gst_object_unref (feature);
- else
- g_object_unref (feature);
- return NULL;
- }
-
- feature->name = g_strdup(in->name);
- feature->rank = in->rank;
-
- if (GST_IS_ELEMENT_FACTORY(feature))
- {
- GstElementFactory *factory = GST_ELEMENT_FACTORY(feature);
-
- factory->details.longname = g_strdup(in->longname);
- factory->details.klass = g_strdup(in->class);
- factory->details.description = g_strdup(in->description);
- factory->details.author = g_strdup(in->author);
-
- /* GST_INFO("Element factory : %s", factory->details.longname); */
- }
-
- GST_DEBUG("Added feature %p with name %s", feature, feature->name);
- return feature;
-}
-
-/*
-** Make a new plugin from current GstBinaryPluginElement structure
-** and save it to the GstRegistry. Return an offset to the next
-** GstBinaryPluginElement structure.
-*/
-static unsigned long
-gst_registry_binary_get_binary_plugin(GstRegistry *registry, gchar *in)
-{
- GstBinaryPluginElement *p = (GstBinaryPluginElement *) in;
- GstPlugin *plugin = NULL;
- GList *plugin_features = NULL;
- GstBinaryPluginFeature *feat;
- unsigned int i;
- unsigned long offset;
-
- plugin = g_object_new (GST_TYPE_PLUGIN, NULL);
-
- plugin->flags |= GST_PLUGIN_FLAG_CACHED;
-
- plugin->desc.name = g_strdup(p->name);
- plugin->desc.description= g_strdup(p->description);
- plugin->filename = g_strdup(p->filename);
- plugin->desc.version = g_strdup(p->version);
- plugin->desc.license = g_strdup(p->license);
- plugin->desc.source = g_strdup(p->source);
- plugin->desc.package = g_strdup(p->package);
- plugin->desc.origin = g_strdup(p->origin);
- plugin->file_mtime = p->m32p;
- plugin->file_size = p->size;
- plugin->basename = g_path_get_basename (plugin->filename);
-
- if (plugin->file_mtime < 0 || plugin->file_size < 0)
- {
- GST_ERROR("Plugin time or file size is not valid !");
- g_free(plugin);
- return -1;
- }
-
- if (p->nfeatures < 0)
- {
- GST_ERROR("The number of feature structure is not valid !");
- gst_object_unref(plugin);
- return -1;
- }
-
- for (feat = (GstBinaryPluginFeature *) (in + sizeof (GstBinaryPluginElement)), i = 0;
- i < p->nfeatures; i++, feat++)
- {
- GstPluginFeature *gstfeat;
-
- if ((gstfeat = gst_registry_binary_load_feature(feat)) == NULL)
- {
- g_list_free(plugin_features);
- g_free(plugin);
- GST_ERROR("Error while loading binary feature");
- return -1;
- }
- gstfeat->plugin_name = g_strdup(plugin->desc.name);
- plugin_features = g_list_prepend(plugin_features, gstfeat);
- }
-
- GST_DEBUG("Added plugin \"%s\" to global registry from binary registry", plugin->desc.name);
- GList *g;
-
- gst_registry_add_plugin (registry, plugin);
- for (g = plugin_features; g; g = g_list_next (g))
- gst_registry_add_feature (registry, GST_PLUGIN_FEATURE (g->data));
- /* g_list_free(plugin_features); */
-
- offset = sizeof (GstBinaryPluginElement) + p->nfeatures * sizeof (GstBinaryPluginFeature);
- return offset;
-}
-
-
-/*
-** Read the cache and adapt it to fill GstRegistry
-*/
-gboolean
-gst_registry_binary_read_cache(GstRegistry *registry, const char *location)
-{
- GMappedFile *mapped = NULL;
- GTimer *timer = NULL;
- gchar *contents = NULL;
- gdouble seconds;
- unsigned long offset, inc;
- gsize size;
-
- /* make sure these types exist */
- GST_TYPE_ELEMENT_FACTORY;
- GST_TYPE_TYPE_FIND_FACTORY;
- GST_TYPE_INDEX_FACTORY;
-
- timer = g_timer_new ();
-
- if ((mapped = g_mapped_file_new(location, FALSE, NULL)) == NULL ||
- (contents = g_mapped_file_get_contents(mapped)) == NULL)
- {
- GST_ERROR("Can't load file : %s", strerror(errno));
- return FALSE;
- }
- if ((contents = gst_registry_binary_check_magic(contents)) == NULL)
- {
- GST_ERROR("Binary registry type not recognized (invalid magic)");
- g_mapped_file_free(mapped);
- return FALSE;
- }
-
- if ((size = g_mapped_file_get_length(mapped)) < sizeof (GstBinaryPluginElement))
- {
- GST_INFO("No binary plugins structure to read");
- return TRUE; /* This is not really an error */
- }
-
- for (offset = inc = 0; (offset + sizeof (GstBinaryPluginElement)) < size &&
- (inc = gst_registry_binary_get_binary_plugin(registry, contents + offset)) > 0;
- offset += inc)
- ; /* May want in the future to do something here */
- if (inc < 0)
- {
- GST_DEBUG("Problem while reading binary registry");
- return FALSE;
- }
-
- g_timer_stop (timer);
- seconds = g_timer_elapsed (timer, NULL);
- g_timer_destroy (timer);
-
- GST_INFO ("loaded %s in %f seconds", location, seconds);
-
- if (mapped)
- g_mapped_file_free (mapped);
- return TRUE;
-}
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h
deleted file mode 100644
index 2ef24d7..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- * 2000 Wim Taymans <wim.taymans@chello.be>
- *
- * gstregistry.h: Header for registry handling
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* SUGGESTIONS AND TODO :
-** ====================
-** - Use a compressed registry, but would induce performance loss
-** - Encrypt the registry, for security purpose, but would also reduce performances
-** - Also have a non-mmap based cache reading (work with file descriptors)
-*/
-
-#ifndef __GST_REGISTRYBINARY_H__
-#define __GST_REGISTRYBINARY_H__
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <gst/gst_private.h>
-#include <gst/gstelement.h>
-#include <gst/gsttypefind.h>
-#include <gst/gsttypefindfactory.h>
-#include <gst/gsturi.h>
-#include <gst/gstinfo.h>
-#include <gst/gstenumtypes.h>
-#include <gst/gstregistry.h>
-#include <gst/gstpadtemplate.h>
-
-#include "glib-compat-private.h"
-#include <glib/gstdio.h>
-
-/* A magic, written at the beginning of the file */
-#define GST_MAGIC_BINARY_REGISTRY_STR "\xc0\xde\xf0\x0d"
-#define GST_MAGIC_BINARY_REGISTRY_LEN (4)
-#define GST_MAGIC_BINARY_VERSION_LEN (64)
-
-typedef struct _GstBinaryRegistryMagic
-{
- char magic[GST_MAGIC_BINARY_REGISTRY_LEN];
- char version[GST_MAGIC_BINARY_VERSION_LEN];
-} GstBinaryRegistryMagic;
-
-
-/* Used to store pointers to write */
-typedef struct _GstBinaryChunck
-{
- void *data;
- unsigned int size;
-} GstBinaryChunck;
-
-
-/* A structure containing (staticely) every information needed for a plugin
-**
-** Notes :
-** "nfeatures" is used to say how many GstBinaryPluginFeature structures we will have
-** right after the structure itself.
-*/
-
-/* Various lenght defines for our GstBinaryPluginElement structure
-** Note : We could eventually use smaller size
-*/
-#define GST_BINARY_REGISTRY_NAME_LEN (256)
-#define GST_BINARY_REGISTRY_DESCRIPTION_LEN (1024)
-#define GST_BINARY_REGISTRY_VERSION_LEN (64)
-#define GST_BINARY_REGISTRY_LICENSE_LEN (256)
-#define GST_BINARY_REGISTRY_SOURCE_LEN (256)
-#define GST_BINARY_REGISTRY_PACKAGE_LEN (1024)
-#define GST_BINARY_REGISTRY_ORIGIN_LEN (1024)
-
-typedef struct _GstBinaryPluginElement
-{
- char name[GST_BINARY_REGISTRY_NAME_LEN];
- char description[GST_BINARY_REGISTRY_DESCRIPTION_LEN];
- char filename[_POSIX_PATH_MAX];
- char version[GST_BINARY_REGISTRY_VERSION_LEN];
- char license[GST_BINARY_REGISTRY_LICENSE_LEN];
- char source[GST_BINARY_REGISTRY_SOURCE_LEN];
- char package[GST_BINARY_REGISTRY_PACKAGE_LEN];
- char origin[GST_BINARY_REGISTRY_ORIGIN_LEN];
- unsigned long size;
- unsigned long m32p;
- unsigned int nfeatures;
-} GstBinaryPluginElement;
-
-
-/* A structure containing the plugin features
-**
-** Note :
-** "npadtemplates" is used to store the number of GstBinaryPadTemplate structures following the structure itself.
-** "ninterfaces" is used to store the number of GstBinaryInterface structures following the structure itself.
-** "nuritypes" is used to store the number of GstBinaryUriType structures following the structure itself.
-*/
-#define GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN (256)
-#define GST_BINARY_REGISTRY_TYPENAME_NAME_LEN (256)
-#define GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN (1024)
-#define GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN (512)
-#define GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN (1024)
-#define GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN (256)
-
-typedef struct _GstBinaryPluginFeature
-{
- char typename[GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN];
- char name[GST_BINARY_REGISTRY_TYPENAME_NAME_LEN];
- unsigned long rank;
- char longname[GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN];
- char class[GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN];
- char description[GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN];
- char author[GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN];
- unsigned int npadtemplates;
- unsigned int ninterfaces;
- unsigned int nuritypes;
-} GstBinaryPluginFeature;
-
-
-/*
-** A structure containing the static pad templates of a plugin feature
-*/
-#define GST_BINARY_REGISTRY_PADTEMPLATE_NAME_LEN (256)
-#define GST_BINARY_REGISTRY_PADTEMPLATE_CAP_LEN (1024)
-
-typedef struct _GstBinaryPadTemplate
-{
- char name[GST_BINARY_REGISTRY_PADTEMPLATE_NAME_LEN];
- char cap[GST_BINARY_REGISTRY_PADTEMPLATE_CAP_LEN];
- int direction; /* Either 0:"sink" or 1:"src" */
- GstPadPresence presence;
-} GstBinaryPadTemplate;
-
-/*
-** A very simple structure defining the plugin feature interface string
-*/
-#define GST_BINARY_REGISTRY_INTERFACE_INTERFACE_LEN (512)
-typedef struct _GstBinaryInterface
-{
- char interface[GST_BINARY_REGISTRY_INTERFACE_INTERFACE_LEN];
- unsigned long size;
-} GstBinaryInterface;
-
-/* Uri Type */
-typedef struct _GstBinaryUriType
-{
- GstURIType type;
- unsigned long nuriprotocols;
-} GstBinaryUriType;
-
-/*
-** Function prototypes
-*/
-
-/* Local prototypes */
-inline static gboolean gst_registry_binary_write(GstRegistry *registry, const void *mem, const ssize_t size);
-inline static gboolean gst_registry_binary_initialize_magic(GstBinaryRegistryMagic *m);
-static gboolean gst_registry_binary_fill_feature(GList **list, GstPluginFeature *, GstBinaryPluginFeature *, const char *);
-static gboolean gst_registry_binary_save_plugin(GList **list, GstRegistry *registry, GstPlugin *plugin);
-static gchar *gst_registry_binary_check_magic(gchar *in);
-static GstPluginFeature *gst_registry_binary_load_feature(GstBinaryPluginFeature *);
-static unsigned long gst_registry_binary_get_binary_plugin(GstRegistry *registry, gchar *in);
-
-/* Exportable */
-gboolean gst_registry_binary_write_cache(GstRegistry *registry, const char *location);
-gboolean gst_registry_binary_read_cache(GstRegistry *registry, const char *location);
-
-#endif /* !__GST_REGISTRYBINARY_H__ */
-
-
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
deleted file mode 100644
index 5f97a20..0000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-SUMMARY = "GStreamer multimedia framework"
-DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
-It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
-HOMEPAGE = "http://gstreamer.freedesktop.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
-SECTION = "multimedia"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
- file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4"
-DEPENDS = "glib-2.0 libxml2 bison-native flex-native glib-2.0-native"
-
-PR = "r2"
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
- file://check_fix.patch \
- file://gst-inspect-check-error.patch \
- file://0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch \
- file://0001-parse-make-grammar.y-work-with-Bison-3.patch \
- file://0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch \
-"
-
-SRC_URI[md5sum] = "a0cf7d6877f694a1a2ad2b4d1ecb890b"
-SRC_URI[sha256sum] = "e556a529e0a8cf1cd0afd0cab2af5488c9524e7c3f409de29b5d82bb41ae7a30"
-
-inherit autotools pkgconfig gettext
-
-GSTREAMER_DEBUG ?= "--disable-debug"
-EXTRA_OECONF = "--disable-docbook --disable-gtk-doc \
- --disable-dependency-tracking --disable-check \
- --disable-examples --disable-tests \
- --disable-valgrind ${GSTREAMER_DEBUG} \
- --disable-introspection \
- "
-
-CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no"
-
-# apply gstreamer hack after Makefile.in.in in source is replaced by our version from
-# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed
-# http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html
-oe_runconf_prepend() {
- sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in
-}
-
-#do_compile_prepend () {
-# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/
-#}
-
-RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
-RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
-
-FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
-FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/ ${libexecdir}/gstreamer-0.10/.debug/"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 55+ messages in thread
* Re: [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
2017-09-06 19:23 ` [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete Mark Hatle
@ 2017-09-06 19:58 ` Andreas Müller
2017-09-06 20:02 ` Mark Hatle
0 siblings, 1 reply; 55+ messages in thread
From: Andreas Müller @ 2017-09-06 19:58 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-devel
On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
> There is no upstream revision to the mixer to make it work w/o gstreamer-0.10
>
> also remove from packagegroup-xfce-extended
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb | 14 --------------
> .../packagegroups/packagegroup-xfce-extended.bb | 1 -
> 2 files changed, 15 deletions(-)
> delete mode 100644 meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
>
> diff --git a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
> deleted file mode 100644
> index bdbec45..0000000
> --- a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -SUMMARY = "A volume control application based on GStreamer"
> -LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
> -
> -inherit xfce-panel-plugin
> -
> -DEPENDS += "glib-2.0 gst-plugins-base gtk+ xfconf libunique"
> -
> -SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2"
> -
> -SRC_URI[md5sum] = "1b3753b91224867a3a2dfddda239c28d"
> -SRC_URI[sha256sum] = "fb0c1df201ed1130f54f15b914cbe5a59286e994a137acda5609570c57112de2"
> -
> -RDEPENDS_${PN} = "gst-meta-audio"
> diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
> index c07188f..ff024b3 100644
> --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
> +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
> @@ -61,7 +61,6 @@ RRECOMMENDS_${PN} = " \
> xfce4-appfinder \
> xfce4-screenshooter \
> xfce4-power-manager \
> - xfce4-mixer \
> ristretto \
> xfce4-taskmanager \
> gigolo \
> --
> 1.8.3.1
>
NAK - I use it daily and there is no proper replacement (not using pulsaudio)
Andreas
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 30/31] florence: update 0.6.3
2017-09-06 19:23 ` [PATCH 30/31] florence: update 0.6.3 Mark Hatle
@ 2017-09-06 19:59 ` Andreas Müller
2017-09-06 20:15 ` Mark Hatle
0 siblings, 1 reply; 55+ messages in thread
From: Andreas Müller @ 2017-09-06 19:59 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-devel
On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
> From: Andreas Müller <schnitzeltony@googlemail.com>
>
> * patches were either leftovers or do not match the code
> * DESCRIPTION -> shortened SUMMARY
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>
> Added gtk+3 dependency and resolved conflicts
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> .../florence/files/fix-no-atspi-compile.patch | 30 ----------------------
> .../recipes-support/florence/florence_0.5.4.bb | 20 ---------------
> .../recipes-support/florence/florence_0.6.3.bb | 19 ++++++++++++++
> 3 files changed, 19 insertions(+), 50 deletions(-)
> delete mode 100644 meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch
> delete mode 100644 meta-gnome/recipes-support/florence/florence_0.5.4.bb
> create mode 100644 meta-gnome/recipes-support/florence/florence_0.6.3.bb
>
> diff --git a/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch b/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch
> deleted file mode 100644
> index 0bb5dee..0000000
> --- a/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -diff --git a/src/florence.c b/src/florence.c
> -index b27c31b..feadefe 100644
> ---- a/src/florence.c
> -+++ b/src/florence.c
> -@@ -44,12 +44,6 @@
> - /* exit signal */
> - static int flo_exit=FALSE;
> -
> --#ifdef ENABLE_AT_SPI2
> --void flo_check_show (struct florence *florence, AtspiAccessible *obj);
> --#else
> --void flo_check_show (struct florence *florence, Accessible *obj);
> --#endif
> --
> - /* Called on destroy event (systray quit or close window) */
> - void flo_destroy (void)
> - {
> -@@ -61,6 +55,12 @@ void flo_destroy (void)
> - }
> -
> - #ifdef AT_SPI
> -+#ifdef ENABLE_AT_SPI2
> -+void flo_check_show (struct florence *florence, AtspiAccessible *obj);
> -+#else
> -+void flo_check_show (struct florence *florence, Accessible *obj);
> -+#endif
> -+
> - /* Called to destroy the icon */
> - void flo_icon_destroy (GtkWidget *widget, gpointer user_data)
> - {
> diff --git a/meta-gnome/recipes-support/florence/florence_0.5.4.bb b/meta-gnome/recipes-support/florence/florence_0.5.4.bb
> deleted file mode 100644
> index 8ce85c9..0000000
> --- a/meta-gnome/recipes-support/florence/florence_0.5.4.bb
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -DESCRIPTION = "Florence is a virtual keyboard (also called on-screen-keyboard), which allows the user to input text through a touchscreen."
> -HOMEPAGE = "http://florence.sourceforge.net/english.html"
> -
> -#NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once.
> -
> -LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
> -
> -PR = "r1"
> -
> -DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf gconf-native cairo intltool-native gnome-doc-utils libnotify gstreamer"
> -
> -SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV}-gtk2/florence-${PV}.tar.bz2 \
> - file://fix-no-atspi-compile.patch"
> -SRC_URI[md5sum] = "8d5c2367a28485bfcf577650b0badab7"
> -SRC_URI[sha256sum] = "26d33aa20d5fbf34ceeded4c41cb922d2988b6082e33d9acc46dd7bfe56d31a1"
> -
> -inherit gettext autotools gconf pkgconfig
> -
> -EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord"
> diff --git a/meta-gnome/recipes-support/florence/florence_0.6.3.bb b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
> new file mode 100644
> index 0000000..b9b7d0c
> --- /dev/null
> +++ b/meta-gnome/recipes-support/florence/florence_0.6.3.bb
> @@ -0,0 +1,19 @@
> +SUMMARY = "Florence is a virtual keyboard for touch screens"
> +HOMEPAGE = "http://florence.sourceforge.net/english.html"
> +
> +#NOTICE: If florence can't find its gconf settings, you need to start florence with --config for one time and save the configuration once.
> +
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
> +
> +DEPENDS = "gtk+3 libxml2 libglade librsvg libxtst gconf gconf-native cairo intltool-native gnome-doc-utils libnotify gstreamer1.0"
> +
> +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${PN}/${PN}/${PV}/${PN}-${PV}.tar.bz2"
> +SRC_URI[md5sum] = "8775051d7352f75dec5a86dc9964e8e0"
> +SRC_URI[sha256sum] = "422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e"
> +
> +inherit gettext autotools gconf pkgconfig
> +
> +EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord"
> +
> +FILES_${PN} += "${datadir}/glib-2.0/schemas"
> --
> 1.8.3.1
>
> --
There were certain reasons this was not accepted. Are these obsolete these days?
Andreas
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 31/31] gstreamer-0.10: Remove as all users are gone and it is obsolete
2017-09-06 19:23 ` [PATCH 31/31] gstreamer-0.10: Remove as all users are gone and it is obsolete Mark Hatle
@ 2017-09-06 20:01 ` Andreas Müller
0 siblings, 0 replies; 55+ messages in thread
From: Andreas Müller @ 2017-09-06 20:01 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-devel
On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> .../gst-ffmpeg-0.10.13/lower-rank.diff | 16 -
> .../gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb | 14 -
> .../gst-fluendo-mpegdemux_0.10.85.bb | 12 -
> .../gstreamer-0.10/gst-fluendo.inc | 14 -
> .../gstreamer-0.10/gst-meta-base_0.10.bb | 73 ---
> .../gstreamer-0.10/gst-openmax/gcc_4.6.patch | 18 -
> .../gstreamer-0.10/gst-openmax/ptr-array.patch | 46 --
> .../gstreamer-0.10/gst-openmax_0.10.1.bb | 35 --
> .../gst-plugins-bad/buffer-overflow-mp4.patch | 36 --
> .../gstreamer-0.10/gst-plugins-bad_0.10.23.bb | 61 ---
> ...l.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch | 32 --
> ...le-Fix-build-on-x86-if-emmintrin.h-is-ava.patch | 37 --
> .../configure.ac-fix-subparse-plugin.patch | 27 --
> .../gst-plugins-base-tremor.patch | 20 -
> .../gstreamer-0.10/gst-plugins-base_0.10.36.bb | 44 --
> ...-conditional-gl-framebuffer-undefined-use.patch | 35 --
> .../gst-plugins-gl/rpi-egl-gles2-dep.patch | 22 -
> .../gstreamer-0.10/gst-plugins-gl_0.10.3.bb | 29 --
> ...ild-with-recent-kernels-the-v4l2_buffer-i.patch | 33 --
> ...define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch | 45 --
> .../0407-mulawdec-fix-integer-overrun.patch | 47 --
> .../gstreamer-0.10/gst-plugins-good_0.10.31.bb | 47 --
> ...sate-for-libcdio-s-recent-cd-text-api-cha.patch | 193 --------
> .../0002-Fix-opencore-include-paths.patch | 58 ---
> .../gstreamer-0.10/gst-plugins-ugly_0.10.19.bb | 35 --
> .../gstreamer-0.10/gst-plugins.inc | 29 --
> ...ecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch | 34 --
> .../gstreamer-0.10/gst-rtsp_0.10.8.bb | 18 -
> ...ix-self-comparison-always-evaluates-to-tr.patch | 32 --
> ...01-parse-make-grammar.y-work-with-Bison-3.patch | 35 --
> ...2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch | 32 --
> .../gstreamer-0.10.36/check_fix.patch | 19 -
> .../gst-inspect-check-error.patch | 16 -
> .../gstreamer-0.10.36/gstregistrybinary.c | 487 ---------------------
> .../gstreamer-0.10.36/gstregistrybinary.h | 194 --------
> .../gstreamer-0.10/gstreamer_0.10.36.bb | 53 ---
> 36 files changed, 1978 deletions(-)
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h
> delete mode 100644 meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
>
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff
> deleted file mode 100644
> index 5f08afe..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/lower-rank.diff
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -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 @@
> - case CODEC_ID_MSMPEG4V3:
> - case CODEC_ID_H264:
> - case CODEC_ID_COOK:
> -- rank = GST_RANK_PRIMARY;
> -+ rank = GST_RANK_SECONDARY;
> - break;
> - case CODEC_ID_DVVIDEO:
> - /* we have a good dv decoder, fast on both ppc as well as x86. they say
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb
> deleted file mode 100644
> index 1e2cd2a..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mp3_0.10.31.bb
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -require gst-fluendo.inc
> -
> -SUMMARY = "Fluendo closed-format mp3 GStreamer plug-in"
> -LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=259a43dd1c9854b71fc396f74699f4d2"
> -LICENSE_FLAGS = "commercial"
> -
> -GSTREAMER_DEBUG ?= "--disable-debug"
> -EXTRA_OECONF += "${GSTREAMER_DEBUG} --with-gstreamer-api=0.10"
> -
> -acpaths = "-I ${S}/common/m4 -I ${S}/m4"
> -
> -SRC_URI[md5sum] = "adf0390f3416bb72f91c358528be0c38"
> -SRC_URI[sha256sum] = "dae0d0559a4e159c0dd92b7e18de059a5783f8d038904c7de4ca6393f7d55c7d"
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb
> deleted file mode 100644
> index 7bba41a..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo-mpegdemux_0.10.85.bb
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -require gst-fluendo.inc
> -
> -SUMMARY = "Fluendo MPEG Transport Stream and Program Stream demuxer for GStreamer"
> -LICENSE = "MPLv1.1"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=be282f1c3cc9a98cc0dc5c2b25dfc510 \
> - file://src/gstmpegdemux.h;beginline=1;endline=19;md5=a9e90033f59897b91664d9f2a2ff01dd"
> -LICENSE_FLAGS = "commercial"
> -
> -acpaths = "-I ${S}/common/m4 -I ${S}/m4"
> -
> -SRC_URI[md5sum] = "7c4fb993f80b9ae631b11897733f0970"
> -SRC_URI[sha256sum] = "df04c91cc8e5d9a892c2492ed989974b4547beaa2a3647649e85113317897424"
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc
> deleted file mode 100644
> index 7a77d62..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-fluendo.inc
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -SUMMARY = "Fluendo closed-format GStreamer plug-in"
> -SECTION = "multimedia"
> -HOMEPAGE = "https://core.fluendo.com/gstreamer/trac/wiki"
> -DEPENDS = "gstreamer gst-plugins-base zlib"
> -
> -inherit autotools pkgconfig
> -
> -SRC_URI = "http://core.fluendo.com/gstreamer/src/${BPN}/${BPN}-${PV}.tar.bz2"
> -
> -FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
> -FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
> -FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
> -
> -EXTRA_OECONF = "--disable-valgrind"
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb
> deleted file mode 100644
> index 039abe1..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-meta-base_0.10.bb
> +++ /dev/null
> @@ -1,73 +0,0 @@
> -SUMMARY = "GStreamer package groups"
> -LICENSE = "MIT"
> -
> -COMMERCIAL_PLUGINS = "${COMMERCIAL_AUDIO_PLUGINS} ${COMMERCIAL_VIDEO_PLUGINS}"
> -DEPENDS_UGLY="${@'gst-plugins-ugly' if 'ugly' in COMMERCIAL_PLUGINS.split('-') else ''}"
> -DEPENDS_BAD="${@'gst-plugins-bad' if 'bad' in COMMERCIAL_PLUGINS.split('-') else ''}"
> -DEPENDS = "gstreamer gst-plugins-base gst-plugins-good ${DEPENDS_UGLY} ${DEPENDS_BAD}"
> -
> -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
> - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
> -
> -
> -PR = "r13"
> -
> -PACKAGES = "\
> - gst-meta-base \
> - gst-meta-x11-base \
> - gst-meta-audio \
> - gst-meta-debug \
> - gst-meta-video"
> -
> -ALLOW_EMPTY_gst-meta-base = "1"
> -ALLOW_EMPTY_gst-meta-x11-base = "1"
> -ALLOW_EMPTY_gst-meta-audio = "1"
> -ALLOW_EMPTY_gst-meta-debug = "1"
> -ALLOW_EMPTY_gst-meta-video = "1"
> -
> -RDEPENDS_gst-meta-base = "\
> - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gst-meta-x11-base', '', d)} \
> - gstreamer \
> - gst-plugins-base-playbin \
> - gst-plugins-base-decodebin \
> - gst-plugins-base-decodebin2 \
> - gst-plugins-base-gio \
> - gst-plugins-base-alsa \
> - gst-plugins-base-volume \
> - gst-plugins-base-audioconvert \
> - gst-plugins-base-audioresample \
> - gst-plugins-base-typefindfunctions \
> - gst-plugins-base-videoscale \
> - gst-plugins-base-ffmpegcolorspace \
> - gst-plugins-good-autodetect \
> - gst-plugins-good-souphttpsrc"
> -
> -RRECOMMENDS_gst-meta-x11-base = "\
> - gst-plugins-base-ximagesink \
> - gst-plugins-base-xvimagesink"
> -
> -RDEPENDS_gst-meta-audio = "\
> - gst-meta-base \
> - gst-plugins-base-vorbis \
> - gst-plugins-base-ogg \
> - gst-plugins-good-wavparse \
> - gst-plugins-good-flac \
> - ${COMMERCIAL_AUDIO_PLUGINS}"
> -
> -
> -RDEPENDS_gst-meta-debug = "\
> - gst-meta-base \
> - gst-plugins-good-debug \
> - gst-plugins-base-audiotestsrc \
> - gst-plugins-base-videotestsrc"
> -
> -
> -RDEPENDS_gst-meta-video = "\
> - gst-meta-base \
> - gst-plugins-good-avi \
> - gst-plugins-good-matroska \
> - gst-plugins-base-theora \
> - ${COMMERCIAL_VIDEO_PLUGINS}"
> -
> -RRECOMMENDS_gst-meta-video = "\
> - gst-meta-audio"
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch
> deleted file mode 100644
> index 57a63b5..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/gcc_4.6.patch
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Saul Wold <sgw@linux.intel.com>
> -
> -Index: gst-openmax-0.10.1/omx/gstomx.c
> -===================================================================
> ---- gst-openmax-0.10.1.orig/omx/gstomx.c 2010-09-30 18:00:24.000000000 -0700
> -+++ gst-openmax-0.10.1/omx/gstomx.c 2011-05-17 23:08:08.794535872 -0700
> -@@ -238,7 +238,8 @@
> - const gchar *element_name = gst_structure_nth_field_name (element_table, i);
> - GstStructure *element = get_element_entry (element_name);
> - const gchar *type_name, *parent_type_name;
> -- const gchar *component_name, *component_role, *library_name;
> -+ const gchar *component_name, *library_name;
> -+ const gchar __attribute__((__unused__)) *component_role;
> - GType type;
> - gint rank;
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch
> deleted file mode 100644
> index 5965bba..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax/ptr-array.patch
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -Rename static functions that use GLib naming conventions as one of them
> -(g_ptr_array_insert) has now been added to GLib.
> -
> -Upstream-Status: Pending
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -diff --git a/omx/gstomx_util.c b/omx/gstomx_util.c
> -index 423e441..579dbf5 100644
> ---- a/omx/gstomx_util.c
> -+++ b/omx/gstomx_util.c
> -@@ -85,7 +85,7 @@ static gboolean initialized;
> - */
> -
> - static void
> --g_ptr_array_clear (GPtrArray * array)
> -+omx_g_ptr_array_clear (GPtrArray * array)
> - {
> - guint index;
> - for (index = 0; index < array->len; index++)
> -@@ -93,7 +93,7 @@ g_ptr_array_clear (GPtrArray * array)
> - }
> -
> - static void
> --g_ptr_array_insert (GPtrArray * array, guint index, gpointer data)
> -+omx_g_ptr_array_insert (GPtrArray * array, guint index, gpointer data)
> - {
> - if (index + 1 > array->len) {
> - g_ptr_array_set_size (array, index + 1);
> -@@ -394,7 +394,7 @@ g_omx_core_unload (GOmxCore * core)
> - }
> -
> - core_for_each_port (core, g_omx_port_free);
> -- g_ptr_array_clear (core->ports);
> -+ omx_g_ptr_array_clear (core->ports);
> - }
> -
> - static inline GOmxPort *
> -@@ -418,7 +418,7 @@ g_omx_core_new_port (GOmxCore * core, guint index)
> - }
> -
> - port = g_omx_port_new (core, index);
> -- g_ptr_array_insert (core->ports, index, port);
> -+ omx_g_ptr_array_insert (core->ports, index, port);
> -
> - return port;
> - }
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb
> deleted file mode 100644
> index 2e01579..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-openmax_0.10.1.bb
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -SUMMARY = "GStreamer plug-in for communication with OpenMAX IL components"
> -DESCRIPTION = "GstOpenMAX is a GStreamer plug-in that allows \
> -communication with OpenMAX Integration Layer (IL) components. OpenMAX \
> -IL is an industry standard that provides an abstraction layer for \
> -computer graphics, video, and sound routines."
> -HOMEPAGE = "http://freedesktop.org/wiki/GstOpenMAX"
> -DEPENDS = "gstreamer"
> -RDEPENDS_${PN} = "libomxil"
> -LICENSE = "LGPLv2.1"
> -LICENSE_FLAGS = "commercial"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
> - file://util/sem.h;beginline=1;endline=20;md5=accce5550d5583b839b441a0623f09fc"
> -
> -SRC_URI = "http://gstreamer.freedesktop.org/src/gst-openmax/gst-openmax-${PV}.tar.bz2 \
> - file://gcc_4.6.patch \
> - file://ptr-array.patch \
> - "
> -
> -inherit autotools pkgconfig
> -
> -# Tell configure that this isn't a development snapshot so we don't want
> -# -Werror (hopefully fixed in 0.10.2)
> -export GST_CVS="no"
> -
> -EXTRA_OECONF += "--disable-valgrind"
> -
> -PR = "r4"
> -
> -FILES_${PN} += "${libdir}/gstreamer-0.10/libgstomx.so"
> -FILES_${PN}-dev += "${libdir}/gstreamer-0.10/libgstomx.la"
> -FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/libgstomx.a"
> -FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug/"
> -
> -SRC_URI[md5sum] = "4d0370bfe99dea20918c84347abadb4e"
> -SRC_URI[sha256sum] = "9074d5a0591995133d19cfb15144f19664f902c1623f996595695cf2c2070e1f"
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch
> deleted file mode 100644
> index 235acda..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad/buffer-overflow-mp4.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -Description: Fix buffer overflow in mp4 parsing
> -Author: Ralph Giles <giles@mozilla.com>
> ----
> -Backport patch from debian to fix CVE-2015-0797.
> -https://sources.debian.net/data/main/g/gst-plugins-bad0.10/0.10.23-7.1+deb7u2/debian/patches/buffer-overflow-mp4.patch
> -
> -Upstream-Status: Backport
> -
> -Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ----
> ---- gst-plugins-bad0.10-0.10.23.orig/gst/videoparsers/gsth264parse.c
> -+++ gst-plugins-bad0.10-0.10.23/gst/videoparsers/gsth264parse.c
> -@@ -384,6 +384,11 @@ gst_h264_parse_wrap_nal (GstH264Parse *
> -
> - GST_DEBUG_OBJECT (h264parse, "nal length %d", size);
> -
> -+ if (size > G_MAXUINT32 - nl) {
> -+ GST_ELEMENT_ERROR (h264parse, STREAM, FAILED, (NULL),
> -+ ("overflow in nal size"));
> -+ return NULL;
> -+ }
> - buf = gst_buffer_new_and_alloc (size + nl + 4);
> - if (format == GST_H264_PARSE_FORMAT_AVC) {
> - GST_WRITE_UINT32_BE (GST_BUFFER_DATA (buf), size << (32 - 8 * nl));
> -@@ -452,6 +457,11 @@ gst_h264_parse_process_nal (GstH264Parse
> - GST_DEBUG_OBJECT (h264parse, "not processing nal size %u", nalu->size);
> - return;
> - }
> -+ if (G_UNLIKELY (nalu->size > 20 * 1024 * 1024)) {
> -+ GST_DEBUG_OBJECT (h264parse, "not processing nal size %u (too big)",
> -+ nalu->size);
> -+ return;
> -+ }
> -
> - /* we have a peek as well */
> - nal_type = nalu->type;
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb
> deleted file mode 100644
> index 38fccc8..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -require gst-plugins.inc
> -
> -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ "
> -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
> - file://gst/tta/filters.h;beginline=12;endline=29;md5=629b0c7a665d155a6677778f4460ec06 \
> - file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
> - file://gst/tta/crc32.h;beginline=12;endline=29;md5=71a904d99ce7ae0c1cf129891b98145c"
> -
> -DEPENDS += "gst-plugins-base"
> -
> -PR = "r4"
> -
> -SRC_URI += "file://buffer-overflow-mp4.patch"
> -
> -inherit gettext gsettings
> -
> -EXTRA_OECONF += "--disable-experimental \
> - --disable-sdl --disable-cdaudio --disable-directfb \
> - --disable-vdpau --disable-apexsink"
> -
> -PACKAGECONFIG ??= "bzip curl \
> - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'rsvg', '', d)}"
> -
> -PACKAGECONFIG[bzip] = "--enable-bz2,--disable-bz2,bzip2"
> -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
> -PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg,"
> -PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
> -PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon"
> -PACKAGECONFIG[mms] = "--enable-libmms,--disable-libmms,libmms"
> -PACKAGECONFIG[cog] = "--enable-cog,--disable-cog,libpng"
> -PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2"
> -PACKAGECONFIG[jp2k] = "--enable-jp2k,--disable-jp2k,jasper"
> -PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug"
> -PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus"
> -PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1"
> -PACKAGECONFIG[vp8] = "--enable-vp8,--disable-vp8,libvpx"
> -PACKAGECONFIG[ass] = "--enable-assrender,--disable-assrender,libass"
> -PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft"
> -PACKAGECONFIG[schro] = "--enable-schro,--disable-schro,schroedinger"
> -PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394"
> -PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac"
> -PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump"
> -PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc"
> -PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc"
> -PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdnav libdvdread"
> -PACKAGECONFIG[zbar] = "--enable-zbar,--disable-zbar,zbar jpeg"
> -
> -ARM_INSTRUCTION_SET = "arm"
> -
> -PACKAGES =+ "${PN}-resindvd"
> -FILES_${PN}-resindvd = "${libdir}/gstreamer-${LIBV}/libresindvd.so"
> -FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/libresindvd.la"
> -FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs"
> -
> -do_configure_prepend() {
> - # This m4 file contains nastiness which conflicts with libtool 2.2.2
> - rm ${S}/m4/lib-link.m4 || true
> -}
> -
> -SRC_URI[md5sum] = "fcb09798114461955260e4d940db5987"
> -SRC_URI[sha256sum] = "0eae7d1a1357ae8377fded6a1b42e663887beabe0e6cc336e2ef9ada42e11491"
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
> deleted file mode 100644
> index 29fbec5..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From 5478eafecf618cd8e742cc1b96d688a2c7ce5a79 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> -Date: Sun, 2 Oct 2016 21:49:33 +0200
> -Subject: [PATCH] gst-glib2.m4: don't do crazy things to GLIB_CFLAGS
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -we are definitely not one of those poor souls mentioned
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ----
> - common/m4/gst-glib2.m4 | 1 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/common/m4/gst-glib2.m4 b/common/m4/gst-glib2.m4
> -index b01f02f..4569ae5 100644
> ---- a/common/m4/gst-glib2.m4
> -+++ b/common/m4/gst-glib2.m4
> -@@ -69,7 +69,6 @@ AC_DEFUN([AG_GST_GLIB_CHECK],
> - fi
> -
> - dnl for the poor souls who for example have glib in /usr/local
> -- AS_SCRUB_INCLUDE(GLIB_CFLAGS)
> -
> - AC_SUBST(GLIB_EXTRA_CFLAGS)
> - ])
> ---
> -2.5.5
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
> deleted file mode 100644
> index 5214256..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -audioresample: Fix build on x86 if emmintrin.h is available but can't be used
> -
> -On x86, EMMINTRIN is defined but not usable without SSE so check for
> -__SSE__ and __SSE2__ as well.
> -
> -https://bugzilla.gnome.org/show_bug.cgi?id=670690
> -
> -Upstream-Status: Backport
> -
> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ----
> - gst/audioresample/resample.c | 4 ++--
> - 1 files changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c
> -index 98d006c..481fa01 100644
> ---- a/gst/audioresample/resample.c
> -+++ b/gst/audioresample/resample.c
> -@@ -77,13 +77,13 @@
> - #define EXPORT G_GNUC_INTERNAL
> -
> - #ifdef _USE_SSE
> --#ifndef HAVE_XMMINTRIN_H
> -+#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H)
> - #undef _USE_SSE
> - #endif
> - #endif
> -
> - #ifdef _USE_SSE2
> --#ifndef HAVE_EMMINTRIN_H
> -+#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H)
> - #undef _USE_SSE2
> - #endif
> - #endif
> ---
> -1.7.1
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch
> deleted file mode 100644
> index b8602c8..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -Upstream-Status: Submitted [similar patch by other author, bugzilla]
> -Bugtracker-URL: https://bugzilla.gnome.org/show_bug.cgi?id=663600
> -
> -Prepend PKG_CONFIG_SYSROOT to includedir, so configure doesn't
> -search for gstconfig.h in /usr/include.
> -
> -Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ----
> - configure.ac | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 1901bcf..460fb0a 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -435,7 +435,7 @@ AG_GST_CHECK_PLUGIN(volume)
> - dnl check for gstreamer core features (subsystems)
> - dnl FIXME: this assumes srcdir == builddir for uninstalled setups
> - GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-0.10`"/gst/gstconfig.h"
> --AG_GST_PARSE_SUBSYSTEM_DISABLES($GST_CONFIGPATH)
> -+AG_GST_PARSE_SUBSYSTEM_DISABLES($PKG_CONFIG_SYSROOT_DIR$GST_CONFIGPATH)
> - AM_CONDITIONAL(USE_XML, test $GST_DISABLE_XML != "1")
> -
> - dnl disable plug-ins that require libxml2's HTML support if it is not available
> ---
> -1.7.5.4
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch
> deleted file mode 100644
> index 99dbc9d..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -Remove -DTREMOR option since Tremor has dropped its internal
> -libogg2, and gst-plugins-base has dependency on that.
> -
> -Upstream-Status: Inappropriate [configuration]
> -
> -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> -Signed-off-by: Shane Wang <shane.wang@intel.com>
> -
> -diff -r 70065fb4e085 ext/vorbis/Makefile.am
> ---- a/ext/vorbis/Makefile.am Tue Mar 13 16:36:56 2012 +0800
> -+++ b/ext/vorbis/Makefile.am Tue Mar 13 16:38:53 2012 +0800
> -@@ -30,7 +30,7 @@
> - gstvorbisdec.c gstvorbisdeclib.c gstvorbiscommon.c
> - libgstivorbisdec_la_CFLAGS = \
> - $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
> -- -DTREMOR $(IVORBIS_CFLAGS)
> -+ $(IVORBIS_CFLAGS)
> - libgstivorbisdec_la_LIBADD = \
> - $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \
> - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
> deleted file mode 100644
> index a3bfa5f..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -require gst-plugins.inc
> -
> -LICENSE = "GPLv2+ & LGPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
> - file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \
> - file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
> - file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"
> -
> -DEPENDS += "alsa-lib libogg libvorbis libtheora util-linux tremor glib-2.0-native"
> -
> -SRC_URI += "file://gst-plugins-base-tremor.patch \
> - file://configure.ac-fix-subparse-plugin.patch \
> - file://audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch \
> - file://0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch \
> -"
> -
> -SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a"
> -SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976"
> -
> -PR = "r8"
> -
> -inherit gettext
> -
> -EXTRA_OECONF += "--disable-freetypetest"
> -
> -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
> -
> -PACKAGECONFIG[gnomevfs] = "--enable-gnome_vfs,--disable-gnome_vfs,gnome-vfs"
> -PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
> -PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
> -PACKAGECONFIG[x11] = "--enable-x --enable-xvideo,--disable-x --disable-xvideo,virtual/libx11 libxv libsm libice"
> -PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia"
> -
> -do_configure_prepend() {
> - # This m4 file contains nastiness which conflicts with libtool 2.2.2
> - rm -f ${S}/m4/lib-link.m4
> -}
> -
> -FILES_${PN} += "${datadir}/${BPN}"
> -
> -CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
> -
> -# /usr/bin/gst-visualise-0.10 is a perl script.
> -RDEPENDS_${PN}-apps += "perl"
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch
> deleted file mode 100644
> index bc2f88b..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/0001-conditional-gl-framebuffer-undefined-use.patch
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -From 14d51cbefef19737e7ab2b6818ee1d3bdb248d12 Mon Sep 17 00:00:00 2001
> -From: Jeremy Stashluk <jstashluk@dekaresearch.com>
> -Date: Wed, 6 Feb 2013 09:59:48 -0500
> -Subject: [PATCH] conditional gl framebuffer undefined use
> -
> -The OpenGL extension GL_ARB_framebuffer_object defines the macro
> -GL_FRAMEBUFFER_UNDEFINED. The macro will only need to map to an error
> -string if the extension provides functions that might return the macro.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
> ----
> - gst-libs/gst/gl/gstgldisplay.c | 2 ++
> - 1 file changed, 2 insertions(+)
> -
> -diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c
> -index 3ed0b71..64c6c2c 100644
> ---- a/gst-libs/gst/gl/gstgldisplay.c
> -+++ b/gst-libs/gst/gl/gstgldisplay.c
> -@@ -2177,9 +2177,11 @@ gst_gl_display_check_framebuffer_status (void)
> - GST_ERROR ("GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS");
> - break;
> -
> -+#if defined(GL_ARB_framebuffer_object)
> - case GL_FRAMEBUFFER_UNDEFINED:
> - GST_ERROR ("GL_FRAMEBUFFER_UNDEFINED");
> - break;
> -+#endif
> -
> - default:
> - GST_ERROR ("General FBO error");
> ---
> -1.7.9.5
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch
> deleted file mode 100644
> index 7db1c5a..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl/rpi-egl-gles2-dep.patch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -Check for header and library separately and check for GLESv2 before egl
> -this is to overcome an annoying issue with rpi/userland where egl depends
> -on sysmbols from libGLESv2
> -
> --Khem
> -Index: gst-plugins-gl-0.10.3/configure.ac
> -===================================================================
> ---- gst-plugins-gl-0.10.3.orig/configure.ac
> -+++ gst-plugins-gl-0.10.3/configure.ac
> -@@ -183,8 +183,10 @@ case $host in
> - else
> - AC_CHECK_HEADERS([EGL/egl.h], [HAVE_EGL=yes], [HAVE_EGL=no])
> - if test "x$HAVE_EGL" = "xyes"; then
> -- AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h,, AC_MSG_ERROR([EGL is required]))
> -- AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h,, AC_MSG_ERROR([OpenGLES2 is required]))
> -+ AC_CHECK_HEADERS([GLES2/gl2.h],, AC_MSG_ERROR([OpenGLES2 is required]))
> -+ AC_CHECK_LIB(GLESv2,[glTexImage2D],, AC_MSG_ERROR([OpenGLES2 is required]))
> -+ AC_CHECK_HEADERS([EGL/egl.h],, AC_MSG_ERROR([EGL is required]))
> -+ AC_CHECK_LIB(EGL,[eglGetError],, AC_MSG_ERROR([EGL is required]))
> - GL_LIBS="$LIBS $X_LIBS -lEGL -lGLESv2"
> - GL_BACKEND=x11ES2
> - GL_TYPE=gles
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
> deleted file mode 100644
> index f3eaf30..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -require gst-plugins.inc
> -
> -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ "
> -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
> -
> -SRC_URI[md5sum] = "ac70ede13f79978d56eaed8abaa3c938"
> -SRC_URI[sha256sum] = "48340b6a4b8abce16344a7bc33e74a94fdcce4f57ef6342cdf2f941c429bf210"
> -
> -SRC_URI += " file://0001-conditional-gl-framebuffer-undefined-use.patch \
> - file://rpi-egl-gles2-dep.patch \
> -"
> -
> -DEPENDS += "gst-plugins-base virtual/libgles2 virtual/egl jpeg libpng glew"
> -
> -PR = "r4"
> -
> -inherit gettext distro_features_check
> -
> -REQUIRED_DISTRO_FEATURES = "opengl"
> -
> -# This package doesn't have a configure switch for EGL or GL, so forcibly tell
> -# configure that it can't find gl.h so it always uses EGL. If/when we have some
> -# way for machines to specify their preferred GL flavour this can be
> -# automatically adapted.
> -EXTRA_OECONF += "ac_cv_header_GL_gl_h=no"
> -
> -ALLOW_EMPTY_${PN} = "1"
> -ALLOW_EMPTY_${PN}-apps = "1"
> -ALLOW_EMPTY_${PN}-glib = "1"
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch
> deleted file mode 100644
> index 6456d3c..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From 12d18fe4e98e7c232d59b56d529a0521f293fe6d Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> -Date: Wed, 5 Sep 2012 18:54:42 +0200
> -Subject: [PATCH] v4l2: fix build with recent kernels, the v4l2_buffer input
> - field was removed
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Upstream-Status: Backport
> -
> -[1] http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=9f2aa8d47f835ea155aaf635f618c0fc1ca87012
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ----
> - sys/v4l2/gstv4l2bufferpool.c | 1 -
> - 1 files changed, 0 insertions(+), 1 deletions(-)
> -
> -diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
> -index b81c6a4..51cc0ce 100644
> ---- a/sys/v4l2/gstv4l2bufferpool.c
> -+++ b/sys/v4l2/gstv4l2bufferpool.c
> -@@ -181,7 +181,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
> - GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u",
> - ret->vbuffer.m.offset);
> - GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
> -- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
> -
> - data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
> - PROT_READ | PROT_WRITE, MAP_SHARED, pool->video_fd,
> ---
> -1.7.6.5
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
> deleted file mode 100644
> index bd0de58..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -From ccb01de8096a32d86d47b0d92ec3416c57ee4d25 Mon Sep 17 00:00:00 2001
> -From: Bruce Ashfield <bruce.ashfield@windriver.com>
> -Date: Thu, 22 Aug 2013 12:15:54 -0400
> -Subject: [PATCH] v4l2_calls: define V4L2_CID_HCENTER and V4L2_CID_VCENTER
> -
> -kernel commit 24b9f5017 [[media] V4L: Remove deprecated image centering controls]
> -removed the definitions of V4L2_CID_HCENTER and V4L2_CID_VCENTER after three
> -years of depreciation.
> -
> -The ioctl values are still free, and the case statement which processess them
> -in v4l2 userspace falls through to the proper replacement. So in the short
> -term, we can explicitly define them using the old absolute values, and everything
> -will work.
> -
> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> ----
> - sys/v4l2/v4l2_calls.c | 9 +++++++--
> - 1 file changed, 7 insertions(+), 2 deletions(-)
> -
> -diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
> -index 309bfb6..3c64544 100644
> ---- a/sys/v4l2/v4l2_calls.c
> -+++ b/sys/v4l2/v4l2_calls.c
> -@@ -54,11 +54,16 @@
> - #include "gst/gst-i18n-plugin.h"
> -
> - /* Those are ioctl calls */
> -+
> -+/* V4L2_CID_HCENTER has been removed from the mainline kernel, but
> -+ the ioctl space is still present. Since these values fall through
> -+ to their replacement, it is safe (in the short term) to re-use the
> -+ old values explictily */
> - #ifndef V4L2_CID_HCENTER
> --#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
> -+#define V4L2_CID_HCENTER V4L2_CID_BASE+22
> - #endif
> - #ifndef V4L2_CID_VCENTER
> --#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
> -+#define V4L2_CID_VCENTER V4L2_CID_BASE+23
> - #endif
> -
> - GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
> ---
> -1.7.10.4
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
> deleted file mode 100644
> index 48b8e98..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good-0.10.31/0407-mulawdec-fix-integer-overrun.patch
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -From ce94b2c2b91b6db190c121860e12a6afafce7ae1 Mon Sep 17 00:00:00 2001
> -From: Roland Krikava <rkrikava@gmail.com>
> -Date: Fri, 2 Nov 2012 12:38:44 -0400
> -Subject: [PATCH 407/440] mulawdec: fix integer overrun
> -
> -There might be more than 65535 samples in a chunk of data.
> -
> -https://bugzilla.gnome.org/show_bug.cgi?id=687469
> -
> -Commit - 3be45f70220310ec1c60d819f90b5f2ae03b5d83 in 0.10 branch
> -
> -Upstream Status: Backported
> -
> -Signed-off-by: Roland Krikava <rkrikava@gmail.com>
> ----
> - gst/law/mulaw-conversion.c | 6 ++++--
> - 1 file changed, 4 insertions(+), 2 deletions(-)
> -
> -diff --git a/gst/law/mulaw-conversion.c b/gst/law/mulaw-conversion.c
> -index 8afae80..190a9f5 100644
> ---- a/gst/law/mulaw-conversion.c
> -+++ b/gst/law/mulaw-conversion.c
> -@@ -51,9 +51,10 @@ mulaw_encode (gint16 * in, guint8 * out, gint numsamples)
> - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
> - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
> - };
> -- gint16 sign, exponent, mantissa, i;
> -+ gint16 sign, exponent, mantissa;
> - gint16 sample;
> - guint8 ulawbyte;
> -+ gint i;
> -
> - for (i = 0; i < numsamples; i++) {
> - sample = in[i];
> -@@ -102,7 +103,8 @@ mulaw_decode (guint8 * in, gint16 * out, gint numsamples)
> - static gint16 exp_lut[8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 };
> - gint16 sign, exponent, mantissa;
> - guint8 ulawbyte;
> -- gint16 linear, i;
> -+ gint16 linear;
> -+ gint i;
> -
> - for (i = 0; i < numsamples; i++) {
> - ulawbyte = in[i];
> ---
> -1.7.9.5
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb
> deleted file mode 100644
> index f993cfc..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -require gst-plugins.inc
> -
> -LICENSE = "GPLv2+ & LGPLv2.1+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
> - file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \
> - file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
> -
> -PR = "r8"
> -
> -PACKAGECONFIG ?= "jpeg v4l \
> - ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
> -"
> -PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
> -PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
> -PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
> -PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack"
> -PACKAGECONFIG[gdkpixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
> -PACKAGECONFIG[v4l] = "--enable-gst_v4l2 --with-gudev,--disable-gst_v4l2 --without-gudev,libgudev"
> -# sub-feature of v4l, but control separately since libv4l is not part of oe-core
> -PACKAGECONFIG[libv4l] = "--with-libv4l2,--without-libv4l2,libv4l"
> -PACKAGECONFIG[bzip2] = "--enable-bz2,--disable-bz2,bzip2"
> -PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
> -PACKAGECONFIG[x11] = "--enable-x,--disable-x,virtual/libx11 libxfixes libxdamage"
> -PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libiec61883 libavc1394"
> -
> -DEPENDS += "gst-plugins-base gconf cairo libpng zlib libid3tag flac \
> - speex libsoup-2.4 libcap"
> -
> -inherit gettext gconf
> -
> -SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch \
> - file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch \
> - file://0407-mulawdec-fix-integer-overrun.patch \
> -"
> -EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal \
> - --disable-examples --disable-taglib"
> -
> -do_configure_prepend() {
> - # This m4 file contains nastiness which conflicts with libtool 2.2.2
> - rm ${S}/m4/lib-link.m4 || true
> -}
> -
> -SRC_URI[md5sum] = "24f98a294a2b521e1b29412bdadae2e6"
> -SRC_URI[sha256sum] = "7e27840e40a7932ef2dc032d7201f9f41afcaf0b437daf5d1d44dc96d9e35ac6"
> -
> -FILES_${PN}-gconfelements += "${sysconfdir}/gconf/schemas/gstreamer-0.10.schemas"
> -FILES_${PN}-equalizer += "${datadir}/gstreamer-0.10/presets/*.prs"
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch
> deleted file mode 100644
> index 1f72fc0..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch
> +++ /dev/null
> @@ -1,193 +0,0 @@
> -From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001
> -From: Leon Merten Lohse <leon@green-side.de>
> -Date: Thu, 3 May 2012 23:50:30 +0100
> -Subject: [PATCH] cdio: compensate for libcdio's recent cd-text api changes
> -
> -https://bugzilla.gnome.org/show_bug.cgi?id=675112
> -
> -Conflicts:
> -
> - ext/cdio/gstcdiocddasrc.c
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> -
> -Upstream-Status: Backport
> ----
> - ext/cdio/gstcdio.c | 35 ++++++++++++++++++++++++++++-------
> - ext/cdio/gstcdio.h | 16 ++++++++++++++++
> - ext/cdio/gstcdiocddasrc.c | 19 +++++++++++++++++++
> - 3 files changed, 63 insertions(+), 7 deletions(-)
> -
> -diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c
> -index 2f58d18..483ebf5 100644
> ---- a/ext/cdio/gstcdio.c
> -+++ b/ext/cdio/gstcdio.c
> -@@ -30,12 +30,16 @@
> - GST_DEBUG_CATEGORY (gst_cdio_debug);
> -
> - void
> --gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
> -+gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track,
> - cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags)
> - {
> - const gchar *txt;
> -
> -+#if LIBCDIO_VERSION_NUM > 83
> -+ txt = cdtext_get_const (cdtext, field, track);
> -+#else
> - txt = cdtext_get_const (field, cdtext);
> -+#endif
> - if (txt == NULL || *txt == '\0') {
> - GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag);
> - return;
> -@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext,
> - }
> -
> - GstTagList *
> -+#if LIBCDIO_VERSION_NUM > 83
> -+gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track)
> -+{
> -+ GstTagList *tags = NULL;
> -+
> -+#else
> - gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
> - {
> - GstTagList *tags = NULL;
> -@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track)
> - GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track);
> - return NULL;
> - }
> -+#endif
> -
> -- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags);
> -- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags);
> -+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER,
> -+ GST_TAG_ARTIST, &tags);
> -+ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE,
> -+ &tags);
> -
> - return tags;
> - }
> -
> - void
> -+#if LIBCDIO_VERSION_NUM > 83
> -+gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t,
> -+ GstTagList * tags)
> -+{
> -+#else
> - gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
> - {
> - cdtext_t *t;
> -@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags)
> - GST_DEBUG_OBJECT (src, "no CD-TEXT for album");
> - return;
> - }
> -+#endif
> -
> -- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */
> -- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags);
> -- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags);
> --
> -+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER,
> -+ GST_TAG_ALBUM_ARTIST, &tags);
> -+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM,
> -+ &tags);
> -+ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE,
> -+ &tags);
> - GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags);
> - }
> -
> -diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h
> -index ef31ed0..c6da580 100644
> ---- a/ext/cdio/gstcdio.h
> -+++ b/ext/cdio/gstcdio.h
> -@@ -24,22 +24,38 @@
> - #include <gst/gst.h>
> - #include <cdio/cdio.h>
> - #include <cdio/cdtext.h>
> -+#include <cdio/version.h>
> -+
> -+#if LIBCDIO_VERSION_NUM <= 83
> -+ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER
> -+ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE
> -+ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE
> -+#endif
> -
> - GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug);
> - #define GST_CAT_DEFAULT gst_cdio_debug
> -
> - void gst_cdio_add_cdtext_field (GstObject * src,
> - cdtext_t * cdtext,
> -+ track_t track,
> - cdtext_field_t field,
> - const gchar * gst_tag,
> - GstTagList ** p_tags);
> -
> - GstTagList * gst_cdio_get_cdtext (GstObject * src,
> -+#if LIBCDIO_VERSION_NUM > 83
> -+ cdtext_t * t,
> -+#else
> - CdIo * cdio,
> -+#endif
> - track_t track);
> -
> - void gst_cdio_add_cdtext_album_tags (GstObject * src,
> -+#if LIBCDIO_VERSION_NUM > 83
> -+ cdtext_t * t,
> -+#else
> - CdIo * cdio,
> -+#endif
> - GstTagList * tags);
> -
> - #endif /* __GST_CDIO_H__ */
> -diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c
> -index 615a0c8..830839e 100644
> ---- a/ext/cdio/gstcdiocddasrc.c
> -+++ b/ext/cdio/gstcdiocddasrc.c
> -@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
> - GstCdioCddaSrc *src;
> - discmode_t discmode;
> - gint first_track, num_tracks, i;
> -+#if LIBCDIO_VERSION_NUM > 83
> -+ cdtext_t *cdtext;
> -+#endif
> -
> - src = GST_CDIO_CDDA_SRC (audiocdsrc);
> -
> -@@ -244,8 +244,18 @@ gst_cdio_cdda_src_open (GstCddaBaseSrc * cddabasesrc, const gchar * device)
> - if (src->read_speed != -1)
> - cdio_set_speed (src->cdio, src->read_speed);
> -
> -+#if LIBCDIO_VERSION_NUM > 83
> -+ cdtext = cdio_get_cdtext (src->cdio);
> -+
> -+ if (NULL == cdtext)
> -+ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc");
> -+ else
> -+ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext,
> -+ cddabasesrc->tags);
> -+#else
> - gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio,
> - cddabasesrc->tags);
> -+#endif
> -
> - GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track);
> -
> -@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device)
> - * the right thing here (for cddb id calculations etc. as well) */
> - track.start = cdio_get_track_lsn (src->cdio, i + first_track);
> - track.end = track.start + len_sectors - 1; /* -1? */
> -+#if LIBCDIO_VERSION_NUM > 83
> -+ if (NULL != cdtext)
> -+ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext,
> -+ i + first_track);
> -+#else
> - track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio,
> - i + first_track);
> -+#endif
> -
> - gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track);
> - }
> ---
> -2.1.0
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch
> deleted file mode 100644
> index 3fd6a26..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly/0002-Fix-opencore-include-paths.patch
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -From e634bc6420826f760f6519a9f134c6a4d3412ef8 Mon Sep 17 00:00:00 2001
> -From: Carlos Rafael Giani <dv@pseudoterminal.org>
> -Date: Mon, 19 Oct 2015 15:26:24 +0200
> -Subject: [PATCH] Fix opencore include paths
> -
> -Upstream-Status: Inappropriate [no upstream - GStreamer 0.10 is no longer being maintained]
> -
> -Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
> ----
> - ext/amrnb/amrnbdec.h | 2 +-
> - ext/amrnb/amrnbenc.h | 2 +-
> - ext/amrwbdec/amrwbdec.h | 4 ++--
> - 3 files changed, 4 insertions(+), 4 deletions(-)
> -
> -diff --git a/ext/amrnb/amrnbdec.h b/ext/amrnb/amrnbdec.h
> -index 1e81839..01b7154 100644
> ---- a/ext/amrnb/amrnbdec.h
> -+++ b/ext/amrnb/amrnbdec.h
> -@@ -22,7 +22,7 @@
> -
> - #include <gst/gst.h>
> - #include <gst/audio/gstaudiodecoder.h>
> --#include <interf_dec.h>
> -+#include <opencore-amrnb/interf_dec.h>
> -
> - G_BEGIN_DECLS
> -
> -diff --git a/ext/amrnb/amrnbenc.h b/ext/amrnb/amrnbenc.h
> -index 7f673ac..5be39b5 100644
> ---- a/ext/amrnb/amrnbenc.h
> -+++ b/ext/amrnb/amrnbenc.h
> -@@ -21,7 +21,7 @@
> - #define __GST_AMRNBENC_H__
> -
> - #include <gst/gst.h>
> --#include <interf_enc.h>
> -+#include <opencore-amrnb/interf_enc.h>
> - #include <gst/audio/gstaudioencoder.h>
> -
> - G_BEGIN_DECLS
> -diff --git a/ext/amrwbdec/amrwbdec.h b/ext/amrwbdec/amrwbdec.h
> -index c3528fc..f27c6d2 100644
> ---- a/ext/amrwbdec/amrwbdec.h
> -+++ b/ext/amrwbdec/amrwbdec.h
> -@@ -22,8 +22,8 @@
> -
> - #include <gst/gst.h>
> - #include <gst/audio/gstaudiodecoder.h>
> --#include <dec_if.h>
> --#include <if_rom.h>
> -+#include <opencore-amrwb/dec_if.h>
> -+#include <opencore-amrwb/if_rom.h>
> -
> - G_BEGIN_DECLS
> -
> ---
> -1.9.1
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb
> deleted file mode 100644
> index 199b47d..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -require gst-plugins.inc
> -
> -LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+"
> -LICENSE_FLAGS = "commercial"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
> - file://gst/synaesthesia/synaescope.h;beginline=1;endline=20;md5=99f301df7b80490c6ff8305fcc712838 \
> - file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 \
> - file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9"
> -
> -DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
> -PR = "r3"
> -
> -inherit gettext
> -
> -EXTRA_OECONF += "--with-plugins=a52dec,lame,id3tag,mad,mpeg2dec,mpegstream,mpegaudioparse,asfdemux,realmedia \
> - --disable-orc"
> -
> -PACKAGECONFIG ??= ""
> -PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264"
> -PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio"
> -PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread"
> -PACKAGECONFIG[amrnb] = "--enable-amrnb,--disable-amrnb,opencore-amr"
> -PACKAGECONFIG[amrwb] = "--enable-amrwb,--disable-amrwb,opencore-amr"
> -
> -do_configure_prepend() {
> - # This m4 file contains nastiness which conflicts with libtool 2.2.2
> - rm ${S}/m4/lib-link.m4 || true
> -}
> -
> -SRC_URI[md5sum] = "1d81c593e22a6cdf0f2b4f57eae93df2"
> -SRC_URI[sha256sum] = "1ca90059275c0f5dca71d4d1601a8f429b7852baed0723e820703b977e2c8df0"
> -SRC_URI += "file://0001-cdio-compensate-for-libcdio-s-recent-cd-text-api-cha.patch \
> - file://0002-Fix-opencore-include-paths.patch"
> -
> -FILES_${PN}-amrnb += "${datadir}/gstreamer-0.10/presets/GstAmrnbEnc.prs"
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
> deleted file mode 100644
> index 6e163a8..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -SUMMARY = "Plugins for the GStreamer multimedia framework"
> -HOMEPAGE = "http://gstreamer.freedesktop.org/"
> -BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
> -SECTION = "multimedia"
> -DEPENDS = "gstreamer"
> -
> -# gobject-introspection to get --disable-introspection into UNKNOWN_CONFIGURE_WHITELIST
> -inherit autotools pkgconfig gobject-introspection
> -
> -SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2"
> -
> -GSTREAMER_DEBUG ?= "--disable-debug"
> -EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_DEBUG} --disable-examples --disable-introspection"
> -
> -acpaths = "-I ${S}/common/m4 -I ${S}/m4"
> -
> -LIBV = "0.10"
> -require recipes-multimedia/gstreamer/gst-plugins-package.inc
> -
> -PACKAGES_DYNAMIC += "^${PN}-.*"
> -
> -# apply gstreamer hack after Makefile.in.in in source is replaced by our version from
> -# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed
> -# http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html
> -oe_runconf_prepend() {
> - if [ -e ${S}/po/Makefile.in.in ]; then
> - sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in
> - fi
> -}
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch
> deleted file mode 100644
> index 3afca4e..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp/0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -index gst-rtsp_0.10.8/bindings/python/Makefile.am
> ---- gst-rtsp_0.10.8.orig/bindings/python/Makefile.am
> -+++ gst-rtsp_0.10.8/bindings/python/Makefile.am
> -@@ -14,7 +14,7 @@ defs_DATA = $(DEFS)
> - defsdir = $(pkgdatadir)/$(GST_MAJORMINOR)/defs
> - OVERRIDES = rtspserver.override
> -
> --INCLUDES = -I$(top_srcdir) -I$(srcdir) $(PYTHON_INCLUDES)
> -+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) $(PYTHON_INCLUDES)
> -
> - rtspserver_la_CFLAGS = -I$(top_srcdir)/src \
> - $(PYGOBJECT_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
> -index gst-rtsp_0.10.8/examples/Makefile.am
> ---- gst-rtsp_0.10.8.orig/examples/Makefile.am
> -+++ gst-rtsp_0.10.8/examples/Makefile.am
> -@@ -1,6 +1,6 @@
> - noinst_PROGRAMS = test-video test-ogg test-mp4 test-readme test-launch test-sdp test-uri test-auth
> -
> --INCLUDES = -I$(top_srcdir) -I$(srcdir)
> -+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)
> -
> - AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
> - AM_LDFLAGS = \
> -index gst-rtsp_0.10.8/tests/Makefile.am
> ---- gst-rtsp_0.10.8.orig/tests/Makefile.am
> -+++ gst-rtsp_0.10.8/tests/Makefile.am
> -@@ -1,6 +1,6 @@
> - noinst_PROGRAMS = test-cleanup
> -
> --INCLUDES = -I$(top_srcdir) -I$(srcdir)
> -+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)
> -
> - AM_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
> - AM_LDFLAGS = \
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
> deleted file mode 100644
> index b78bcaf..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-rtsp_0.10.8.bb
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -SUMMARY = "GStreamer RTSP server"
> -LICENSE = "LGPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
> -
> -SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \
> - file://0001-change-deprecated-INCLUDES-to-AM_CPPFLAGS-for-automa.patch"
> -SRC_URI[md5sum] = "b511af07000595f63c3a705946221643"
> -SRC_URI[sha256sum] = "9915887cf8515bda87462c69738646afb715b597613edc7340477ccab63a6617"
> -
> -DEPENDS = "gst-plugins-base gstreamer"
> -
> -EXTRA_OECONF = "--disable-introspection"
> -
> -# Configure always checks for Python so inherit pythonnative. Better solution
> -# would be to disable the checks entirely.
> -inherit autotools pythonnative gettext
> -
> -FILES_${PN}-dev += "${datadir}/vala/vapi/"
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch
> deleted file mode 100644
> index d077496..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From ed7f4802222234eef192aa3f74bc92268f338f97 Mon Sep 17 00:00:00 2001
> -From: Sebastian Droege <sebastian.droege@collabora.co.uk>
> -Date: Tue, 6 Mar 2012 12:28:02 +0100
> -Subject: [PATCH] baseparse: Fix 'self-comparison always evaluates to true'
> -
> -This was really a bug.
> -
> -Commit is ed7f4802222234eef192aa3f74bc92268f338f97 in 0.10 branch
> -
> -Upstream Status: Backported
> -
> -Signed-off-by: Sebastian Droege <sebastian.droege@collabora.co.uk>
> ----
> - libs/gst/base/gstbaseparse.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c
> -index 851ec1d..108ee89 100644
> ---- a/libs/gst/base/gstbaseparse.c
> -+++ b/libs/gst/base/gstbaseparse.c
> -@@ -3899,7 +3899,7 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event)
> - seek event (in bytes) to upstream. Segment / flush handling happens
> - in corresponding src event handlers */
> - GST_DEBUG_OBJECT (parse, "seek in PUSH mode");
> -- if (seekstop >= 0 && seekpos <= seekpos)
> -+ if (seekstop >= 0 && seekstop <= seekpos)
> - seekstop = seekpos;
> - new_event = gst_event_new_seek (rate, GST_FORMAT_BYTES, flags,
> - GST_SEEK_TYPE_SET, seekpos, stop_type, seekstop);
> ---
> -1.7.9.5
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch
> deleted file mode 100644
> index dc2d606..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0001-parse-make-grammar.y-work-with-Bison-3.patch
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -From 60516f4798894f958fc53b470e1283318d0f8706 Mon Sep 17 00:00:00 2001
> -From: Kerrick Staley <kerrick@kerrickstaley.com>
> -Date: Tue, 20 Aug 2013 23:59:29 -0700
> -Subject: [PATCH 1/2] parse: make grammar.y work with Bison 3
> -
> -YYLEX_PARAM is no longer supported in Bison 3.
> -
> -https://bugzilla.gnome.org/show_bug.cgi?id=706462
> ----
> - gst/parse/grammar.y | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
> -index 24fc87b..7f9dd16 100644
> ---- a/gst/parse/grammar.y
> -+++ b/gst/parse/grammar.y
> -@@ -26,7 +26,6 @@
> - */
> -
> - #define YYERROR_VERBOSE 1
> --#define YYLEX_PARAM scanner
> -
> - #define YYENABLE_NLS 0
> -
> -@@ -648,6 +647,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s);
> - %right '.'
> - %left '!' '='
> -
> -+%lex-param { void *scanner }
> - %parse-param { void *scanner }
> - %parse-param { graph_t *graph }
> - %pure-parser
> ---
> -2.7.2
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
> deleted file mode 100644
> index 8db3966..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -From 4b145ceb22bbce7ba6e209c6ab61f2d5867e69f9 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> -Date: Tue, 1 Nov 2016 19:02:30 +0100
> -Subject: [PATCH] gst-glib2.m4: don't do crazy things to GLIB_CFLAGS
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -we are definitely not one of those poor souls mentioned
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ----
> - common/m4/gst-glib2.m4 | 1 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/common/m4/gst-glib2.m4 b/common/m4/gst-glib2.m4
> -index b01f02f..4569ae5 100644
> ---- a/common/m4/gst-glib2.m4
> -+++ b/common/m4/gst-glib2.m4
> -@@ -69,7 +69,6 @@ AC_DEFUN([AG_GST_GLIB_CHECK],
> - fi
> -
> - dnl for the poor souls who for example have glib in /usr/local
> -- AS_SCRUB_INCLUDE(GLIB_CFLAGS)
> -
> - AC_SUBST(GLIB_EXTRA_CFLAGS)
> - ])
> ---
> -2.5.5
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch
> deleted file mode 100644
> index 5d8bb13..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/check_fix.patch
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -# gstreamer: Fix a problem with configure if check has already been built
> -# Richard Purdie <rpurdie@linux.intel.com>
> -
> -Upstream-Status: Inappropriate [configuration]
> -
> -diff -urN gstreamer-0.10.29-orig/configure.ac gstreamer-0.10.29/configure.ac
> ---- gstreamer-0.10.29-orig/configure.ac 2010-06-26 12:49:27.774930773 +0800
> -+++ gstreamer-0.10.29/configure.ac 2010-06-26 12:51:12.899200233 +0800
> -@@ -543,8 +543,10 @@
> - *) BUILD_CHECK=yes ;;
> - esac
> - ])
> -+
> - dnl bit of a misnomer, but keep the conditional named like this so we don't
> - dnl have to change too much elsewhere
> -+HAVE_CHECK=no
> - AM_CONDITIONAL(HAVE_CHECK, test "x$BUILD_CHECK" = "xyes")
> -
> - dnl configure the desired buffer alignment
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch
> deleted file mode 100644
> index 30be85f..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gst-inspect-check-error.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -# Fix crash with gst-inspect
> -# Chris Lord <chris@openedhand.com>
> -
> -Upstream-Status: Pending
> -
> ---- gstreamer-0.10.9/tools/gst-inspect.c.old 2006-09-12 11:56:53.000000000 +0100
> -+++ gstreamer-0.10.9/tools/gst-inspect.c 2006-09-12 11:57:27.000000000 +0100
> -@@ -1123,7 +1123,7 @@
> - g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE);
> - g_option_context_add_group (ctx, gst_init_get_option_group ());
> - if (!g_option_context_parse (ctx, &argc, &argv, &err)) {
> -- g_print ("Error initializing: %s\n", err->message);
> -+ g_print ("Error initializing: %s\n", err ? err->message : "(null)");
> - exit (1);
> - }
> - g_option_context_free (ctx);
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c
> deleted file mode 100644
> index c1f3e71..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.c
> +++ /dev/null
> @@ -1,487 +0,0 @@
> -/* GStreamer
> - * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
> - * 2000 Wim Taymans <wtay@chello.be>
> - * 2005 David A. Schleef <ds@schleef.org>
> - *
> - * gstregistryxml.c: GstRegistry object, support routines
> - *
> - * This library is free software; you can redistribute it and/or
> - * modify it ulnder the terms of the GNU Library General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * Library General Public License for more details.
> - *
> - * You should have received a copy of the GNU Library General Public
> - * License along with this library; if not, write to the
> - * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
> - * Boston, MA 02111-1307, USA.
> - */
> -
> -
> -#include <gst/gstregistrybinary.h>
> -
> -/*
> -** Simple handy function to write a memory location to the registry cache file
> -*/
> -inline static gboolean
> -gst_registry_binary_write(GstRegistry *registry, const void *mem, const ssize_t size)
> -{
> - if (write(registry->cache_file, mem, size) != size)
> - {
> - GST_ERROR("Failed to write binary registry element: ptr=%p size=%u error=%s\n",
> - mem, size, strerror(errno));
> - return FALSE;
> - }
> - return TRUE;
> -}
> -
> -/*
> -** Save features GstBinary style
> -*/
> -static gboolean
> -gst_registry_binary_fill_feature(GList **list, GstPluginFeature *orig, GstBinaryPluginFeature *dest, const char *name)
> -{
> - GstBinaryChunck *chk;
> -
> - if ((chk = calloc(1, sizeof (GstBinaryChunck))) == NULL)
> - return FALSE;
> -
> - chk->data = dest;
> - chk->size = sizeof (GstBinaryPluginFeature);
> -
> - *list = g_list_append(*list, chk);
> -
> - dest->rank = orig->rank;
> - if (!strncpy(dest->typename, name, GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN) ||
> - !strncpy(dest->name, orig->name, GST_BINARY_REGISTRY_TYPENAME_NAME_LEN))
> - {
> - GST_ERROR("Failed to write binary registry feature");
> - goto fail;
> - }
> -
> - if (GST_IS_ELEMENT_FACTORY(orig))
> - {
> - GstElementFactory *factory = GST_ELEMENT_FACTORY(orig);
> -
> - if (!strncpy(dest->longname, factory->details.longname, GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN) ||
> - !strncpy(dest->class, factory->details.klass, GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN) ||
> - !strncpy(dest->description, factory->details.description, GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN) ||
> - !strncpy(dest->author, factory->details.author, GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN))
> - {
> - GST_ERROR("Failed to write binary registry feature");
> - goto fail;
> - }
> - }
> -
> - dest->npadtemplates = dest->ninterfaces = dest->nuritypes = 0;
> - return TRUE;
> -
> - fail:
> - free(chk);
> - return FALSE;
> -}
> -
> -
> -/*
> -** Initialize the GstBinaryRegistryMagic, setting both our magic number and gstreamer major/minor version
> -*/
> -inline static gboolean
> -gst_registry_binary_initialize_magic(GstBinaryRegistryMagic *m)
> -{
> - if (!strncpy(m->magic, GST_MAGIC_BINARY_REGISTRY_STR, GST_MAGIC_BINARY_REGISTRY_LEN) ||
> - !strncpy(m->version, GST_MAJORMINOR, GST_BINARY_REGISTRY_VERSION_LEN))
> - {
> - GST_ERROR("Failed to write magic to the registry magic structure");
> - return FALSE;
> - }
> - return TRUE;
> -}
> -
> -/*
> -** Check GstBinaryRegistryMagic validity.
> -** Return a pointer pointing right after the magic structure
> -*/
> -static gchar *
> -gst_registry_binary_check_magic(gchar *in)
> -{
> - GstBinaryRegistryMagic *m = (GstBinaryRegistryMagic *) in;
> -
> - if (m == NULL || m->magic == NULL || m->version == NULL)
> - {
> - GST_ERROR("Binary registry magic structure is broken");
> - return NULL;
> - }
> - if (strncmp(m->magic, GST_MAGIC_BINARY_REGISTRY_STR, GST_MAGIC_BINARY_REGISTRY_LEN) != 0)
> - {
> - GST_ERROR("Binary registry magic is different : %02x%02x%02x%02x != %02x%02x%02x%02x",
> - GST_MAGIC_BINARY_REGISTRY_STR[0] & 0xff, GST_MAGIC_BINARY_REGISTRY_STR[1] & 0xff,
> - GST_MAGIC_BINARY_REGISTRY_STR[2] & 0xff, GST_MAGIC_BINARY_REGISTRY_STR[3] & 0xff,
> - m->magic[0] & 0xff, m->magic[1] & 0xff, m->magic[2] & 0xff, m->magic[3] & 0xff);
> - return NULL;
> - }
> - if (strncmp(m->version, GST_MAJORMINOR, GST_BINARY_REGISTRY_VERSION_LEN))
> - {
> - GST_ERROR("Binary registry magic version is different : %s != %s",
> - GST_MAJORMINOR, m->version);
> - return NULL;
> - }
> - return (in + sizeof (GstBinaryRegistryMagic));
> -}
> -
> -/*
> -** Adapt a GstPlugin to our GstBinaryPluginElement structure, and write it to the
> -** registry file.
> -*/
> -static gboolean
> -gst_registry_binary_save_plugin(GList **list, GstRegistry *registry, GstPlugin *plugin)
> -{
> - GstBinaryPluginElement *e;
> - GstBinaryChunck *chk;
> - GList *walk;
> -
> - if ((e = calloc(1, sizeof (GstBinaryPluginElement))) == NULL ||
> - (chk = calloc(1, sizeof (GstBinaryChunck))) == NULL)
> - return FALSE;
> -
> - chk->data = e;
> - chk->size = sizeof (GstBinaryPluginElement);
> - *list = g_list_append(*list, chk);
> -
> - if (!strncpy(e->name, plugin->desc.name, GST_BINARY_REGISTRY_NAME_LEN) ||
> - !strncpy(e->description, plugin->desc.description, GST_BINARY_REGISTRY_DESCRIPTION_LEN) ||
> - !strncpy(e->filename, plugin->filename, _POSIX_PATH_MAX) ||
> - !strncpy(e->version, plugin->desc.version, GST_BINARY_REGISTRY_VERSION_LEN) ||
> - !strncpy(e->license, plugin->desc.license, GST_BINARY_REGISTRY_LICENSE_LEN) ||
> - !strncpy(e->source, plugin->desc.source, GST_BINARY_REGISTRY_SOURCE_LEN) ||
> - !strncpy(e->package, plugin->desc.package, GST_BINARY_REGISTRY_PACKAGE_LEN) ||
> - !strncpy(e->origin, plugin->desc.origin, GST_BINARY_REGISTRY_ORIGIN_LEN))
> - {
> - GST_DEBUG("Can't adapt GstPlugin to GstBinaryPluginElement");
> - goto fail;
> - }
> -
> - e->size = plugin->file_size;
> - e->m32p = plugin->file_mtime;
> -
> - GList *ft_list = gst_registry_get_feature_list_by_plugin(registry, plugin->desc.name);
> -
> - for (walk = ft_list; walk; walk = g_list_next(walk), e->nfeatures++)
> - {
> - GstPluginFeature *curfeat = GST_PLUGIN_FEATURE (walk->data);
> - GstBinaryPluginFeature *newfeat;
> - const char *feat_name = g_type_name(G_OBJECT_TYPE(curfeat));
> -
> - if ((newfeat = calloc(1, sizeof (GstBinaryPluginFeature))) == NULL)
> - goto fail;
> -
> - if (!feat_name || !gst_registry_binary_fill_feature(list, curfeat, newfeat, feat_name))
> - {
> - GST_ERROR("Can't fill plugin feature, aborting.");
> - goto fail;
> - }
> - }
> -
> - GST_DEBUG("Found %d features in plugin \"%s\"\n", e->nfeatures, e->name);
> - return TRUE;
> -
> - fail:
> - free(chk);
> - free(e);
> - return FALSE;
> -}
> -
> -/*
> -** Write the cache to file. Part of the code was taken from gstregistryxml.c
> -*/
> -gboolean
> -gst_registry_binary_write_cache(GstRegistry *registry, const char *location)
> -{
> - GList *walk;
> - char *tmp_location;
> - GstBinaryRegistryMagic *magic;
> - GstBinaryChunck *magic_chunck;
> - GList *to_write = NULL;
> -
> - GST_INFO("Writing binary registry cache");
> -
> - g_return_val_if_fail (GST_IS_REGISTRY (registry), FALSE);
> - tmp_location = g_strconcat (location, ".tmpXXXXXX", NULL);
> - registry->cache_file = g_mkstemp (tmp_location);
> - if (registry->cache_file == -1)
> - {
> - char *dir;
> -
> - /* oops, I bet the directory doesn't exist */
> - dir = g_path_get_dirname (location);
> - g_mkdir_with_parents (dir, 0777);
> - g_free (dir);
> -
> - registry->cache_file = g_mkstemp (tmp_location);
> - }
> -
> - if (registry->cache_file == -1)
> - goto fail;
> -
> - if ((magic = calloc(1, sizeof (GstBinaryRegistryMagic))) == NULL ||
> - !gst_registry_binary_initialize_magic(magic))
> - goto fail;
> -
> - if ((magic_chunck = calloc(1, sizeof (GstBinaryChunck))) == NULL)
> - goto fail;
> -
> - magic_chunck->data = magic;
> - magic_chunck->size = sizeof (GstBinaryRegistryMagic);
> - to_write = g_list_append(to_write, magic_chunck);
> -
> - /* Iterate trough the list of plugins in the GstRegistry and adapt them to our structures */
> - for (walk = g_list_last(registry->plugins); walk; walk = g_list_previous(walk))
> - {
> - GstPlugin *plugin = GST_PLUGIN(walk->data);
> -
> - if (!plugin->filename)
> - continue;
> -
> - if (plugin->flags & GST_PLUGIN_FLAG_CACHED)
> - {
> - int ret;
> - struct stat statbuf;
> -
> - ret = g_stat (plugin->filename, &statbuf);
> - if ((ret = g_stat (plugin->filename, &statbuf)) < 0 ||
> - plugin->file_mtime != statbuf.st_mtime ||
> - plugin->file_size != statbuf.st_size)
> - continue;
> - }
> -
> - if (!gst_registry_binary_save_plugin(&to_write, registry, plugin))
> - {
> - GST_ERROR("Can't write binary plugin information for \"%s\"", plugin->filename);
> - continue; /* Try anyway */
> - }
> - }
> -
> - for (walk = g_list_first(to_write); walk; walk = g_list_next(walk))
> - {
> - GstBinaryChunck *cur = walk->data;
> -
> - if (!gst_registry_binary_write(registry, cur->data, cur->size))
> - {
> - free(cur->data);
> - free(cur);
> - g_list_free(to_write);
> - goto fail;
> - }
> - free(cur->data);
> - free(cur);
> - }
> - g_list_free(to_write);
> -
> - if (close(registry->cache_file) < 0)
> - {
> - GST_DEBUG("Can't close registry file : %s", strerror(errno));
> - goto fail;
> - }
> -
> - if (g_file_test (tmp_location, G_FILE_TEST_EXISTS)) {
> -#ifdef WIN32
> - remove (location);
> -#endif
> - rename (tmp_location, location);
> - }
> -
> - g_free (tmp_location);
> - return TRUE;
> -
> - fail:
> - g_free(tmp_location);
> - return FALSE;
> -}
> -
> -static GstPluginFeature*
> -gst_registry_binary_load_feature(GstBinaryPluginFeature *in)
> -{
> - GstPluginFeature *feature;
> - GType type;
> -
> - if (!in->typename || !*(in->typename))
> - return NULL;
> -
> - /* GST_INFO("Plugin feature typename : %s", in->typename);*/
> -
> - if (!(type = g_type_from_name(in->typename)))
> - {
> - GST_ERROR("Unknown type from typename");
> - return NULL;
> - }
> - feature = g_object_new (type, NULL);
> -
> - if (!feature) {
> - GST_ERROR("Can't create feature from type");
> - return NULL;
> - }
> -
> - if (!GST_IS_PLUGIN_FEATURE (feature)) {
> - /* don't really know what it is */
> - if (GST_IS_OBJECT (feature))
> - gst_object_unref (feature);
> - else
> - g_object_unref (feature);
> - return NULL;
> - }
> -
> - feature->name = g_strdup(in->name);
> - feature->rank = in->rank;
> -
> - if (GST_IS_ELEMENT_FACTORY(feature))
> - {
> - GstElementFactory *factory = GST_ELEMENT_FACTORY(feature);
> -
> - factory->details.longname = g_strdup(in->longname);
> - factory->details.klass = g_strdup(in->class);
> - factory->details.description = g_strdup(in->description);
> - factory->details.author = g_strdup(in->author);
> -
> - /* GST_INFO("Element factory : %s", factory->details.longname); */
> - }
> -
> - GST_DEBUG("Added feature %p with name %s", feature, feature->name);
> - return feature;
> -}
> -
> -/*
> -** Make a new plugin from current GstBinaryPluginElement structure
> -** and save it to the GstRegistry. Return an offset to the next
> -** GstBinaryPluginElement structure.
> -*/
> -static unsigned long
> -gst_registry_binary_get_binary_plugin(GstRegistry *registry, gchar *in)
> -{
> - GstBinaryPluginElement *p = (GstBinaryPluginElement *) in;
> - GstPlugin *plugin = NULL;
> - GList *plugin_features = NULL;
> - GstBinaryPluginFeature *feat;
> - unsigned int i;
> - unsigned long offset;
> -
> - plugin = g_object_new (GST_TYPE_PLUGIN, NULL);
> -
> - plugin->flags |= GST_PLUGIN_FLAG_CACHED;
> -
> - plugin->desc.name = g_strdup(p->name);
> - plugin->desc.description= g_strdup(p->description);
> - plugin->filename = g_strdup(p->filename);
> - plugin->desc.version = g_strdup(p->version);
> - plugin->desc.license = g_strdup(p->license);
> - plugin->desc.source = g_strdup(p->source);
> - plugin->desc.package = g_strdup(p->package);
> - plugin->desc.origin = g_strdup(p->origin);
> - plugin->file_mtime = p->m32p;
> - plugin->file_size = p->size;
> - plugin->basename = g_path_get_basename (plugin->filename);
> -
> - if (plugin->file_mtime < 0 || plugin->file_size < 0)
> - {
> - GST_ERROR("Plugin time or file size is not valid !");
> - g_free(plugin);
> - return -1;
> - }
> -
> - if (p->nfeatures < 0)
> - {
> - GST_ERROR("The number of feature structure is not valid !");
> - gst_object_unref(plugin);
> - return -1;
> - }
> -
> - for (feat = (GstBinaryPluginFeature *) (in + sizeof (GstBinaryPluginElement)), i = 0;
> - i < p->nfeatures; i++, feat++)
> - {
> - GstPluginFeature *gstfeat;
> -
> - if ((gstfeat = gst_registry_binary_load_feature(feat)) == NULL)
> - {
> - g_list_free(plugin_features);
> - g_free(plugin);
> - GST_ERROR("Error while loading binary feature");
> - return -1;
> - }
> - gstfeat->plugin_name = g_strdup(plugin->desc.name);
> - plugin_features = g_list_prepend(plugin_features, gstfeat);
> - }
> -
> - GST_DEBUG("Added plugin \"%s\" to global registry from binary registry", plugin->desc.name);
> - GList *g;
> -
> - gst_registry_add_plugin (registry, plugin);
> - for (g = plugin_features; g; g = g_list_next (g))
> - gst_registry_add_feature (registry, GST_PLUGIN_FEATURE (g->data));
> - /* g_list_free(plugin_features); */
> -
> - offset = sizeof (GstBinaryPluginElement) + p->nfeatures * sizeof (GstBinaryPluginFeature);
> - return offset;
> -}
> -
> -
> -/*
> -** Read the cache and adapt it to fill GstRegistry
> -*/
> -gboolean
> -gst_registry_binary_read_cache(GstRegistry *registry, const char *location)
> -{
> - GMappedFile *mapped = NULL;
> - GTimer *timer = NULL;
> - gchar *contents = NULL;
> - gdouble seconds;
> - unsigned long offset, inc;
> - gsize size;
> -
> - /* make sure these types exist */
> - GST_TYPE_ELEMENT_FACTORY;
> - GST_TYPE_TYPE_FIND_FACTORY;
> - GST_TYPE_INDEX_FACTORY;
> -
> - timer = g_timer_new ();
> -
> - if ((mapped = g_mapped_file_new(location, FALSE, NULL)) == NULL ||
> - (contents = g_mapped_file_get_contents(mapped)) == NULL)
> - {
> - GST_ERROR("Can't load file : %s", strerror(errno));
> - return FALSE;
> - }
> - if ((contents = gst_registry_binary_check_magic(contents)) == NULL)
> - {
> - GST_ERROR("Binary registry type not recognized (invalid magic)");
> - g_mapped_file_free(mapped);
> - return FALSE;
> - }
> -
> - if ((size = g_mapped_file_get_length(mapped)) < sizeof (GstBinaryPluginElement))
> - {
> - GST_INFO("No binary plugins structure to read");
> - return TRUE; /* This is not really an error */
> - }
> -
> - for (offset = inc = 0; (offset + sizeof (GstBinaryPluginElement)) < size &&
> - (inc = gst_registry_binary_get_binary_plugin(registry, contents + offset)) > 0;
> - offset += inc)
> - ; /* May want in the future to do something here */
> - if (inc < 0)
> - {
> - GST_DEBUG("Problem while reading binary registry");
> - return FALSE;
> - }
> -
> - g_timer_stop (timer);
> - seconds = g_timer_elapsed (timer, NULL);
> - g_timer_destroy (timer);
> -
> - GST_INFO ("loaded %s in %f seconds", location, seconds);
> -
> - if (mapped)
> - g_mapped_file_free (mapped);
> - return TRUE;
> -}
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h
> deleted file mode 100644
> index 2ef24d7..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer-0.10.36/gstregistrybinary.h
> +++ /dev/null
> @@ -1,194 +0,0 @@
> -/* GStreamer
> - * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
> - * 2000 Wim Taymans <wim.taymans@chello.be>
> - *
> - * gstregistry.h: Header for registry handling
> - *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Library General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * Library General Public License for more details.
> - *
> - * You should have received a copy of the GNU Library General Public
> - * License along with this library; if not, write to the
> - * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
> - * Boston, MA 02111-1307, USA.
> - */
> -
> -/* SUGGESTIONS AND TODO :
> -** ====================
> -** - Use a compressed registry, but would induce performance loss
> -** - Encrypt the registry, for security purpose, but would also reduce performances
> -** - Also have a non-mmap based cache reading (work with file descriptors)
> -*/
> -
> -#ifndef __GST_REGISTRYBINARY_H__
> -#define __GST_REGISTRYBINARY_H__
> -
> -#ifdef HAVE_CONFIG_H
> -# include "config.h"
> -#endif
> -
> -#include <stdio.h>
> -#include <errno.h>
> -#include <sys/types.h>
> -#include <sys/stat.h>
> -#include <dirent.h>
> -#include <fcntl.h>
> -#include <sys/mman.h>
> -#ifdef HAVE_UNISTD_H
> -#include <unistd.h>
> -#endif
> -
> -#include <gst/gst_private.h>
> -#include <gst/gstelement.h>
> -#include <gst/gsttypefind.h>
> -#include <gst/gsttypefindfactory.h>
> -#include <gst/gsturi.h>
> -#include <gst/gstinfo.h>
> -#include <gst/gstenumtypes.h>
> -#include <gst/gstregistry.h>
> -#include <gst/gstpadtemplate.h>
> -
> -#include "glib-compat-private.h"
> -#include <glib/gstdio.h>
> -
> -/* A magic, written at the beginning of the file */
> -#define GST_MAGIC_BINARY_REGISTRY_STR "\xc0\xde\xf0\x0d"
> -#define GST_MAGIC_BINARY_REGISTRY_LEN (4)
> -#define GST_MAGIC_BINARY_VERSION_LEN (64)
> -
> -typedef struct _GstBinaryRegistryMagic
> -{
> - char magic[GST_MAGIC_BINARY_REGISTRY_LEN];
> - char version[GST_MAGIC_BINARY_VERSION_LEN];
> -} GstBinaryRegistryMagic;
> -
> -
> -/* Used to store pointers to write */
> -typedef struct _GstBinaryChunck
> -{
> - void *data;
> - unsigned int size;
> -} GstBinaryChunck;
> -
> -
> -/* A structure containing (staticely) every information needed for a plugin
> -**
> -** Notes :
> -** "nfeatures" is used to say how many GstBinaryPluginFeature structures we will have
> -** right after the structure itself.
> -*/
> -
> -/* Various lenght defines for our GstBinaryPluginElement structure
> -** Note : We could eventually use smaller size
> -*/
> -#define GST_BINARY_REGISTRY_NAME_LEN (256)
> -#define GST_BINARY_REGISTRY_DESCRIPTION_LEN (1024)
> -#define GST_BINARY_REGISTRY_VERSION_LEN (64)
> -#define GST_BINARY_REGISTRY_LICENSE_LEN (256)
> -#define GST_BINARY_REGISTRY_SOURCE_LEN (256)
> -#define GST_BINARY_REGISTRY_PACKAGE_LEN (1024)
> -#define GST_BINARY_REGISTRY_ORIGIN_LEN (1024)
> -
> -typedef struct _GstBinaryPluginElement
> -{
> - char name[GST_BINARY_REGISTRY_NAME_LEN];
> - char description[GST_BINARY_REGISTRY_DESCRIPTION_LEN];
> - char filename[_POSIX_PATH_MAX];
> - char version[GST_BINARY_REGISTRY_VERSION_LEN];
> - char license[GST_BINARY_REGISTRY_LICENSE_LEN];
> - char source[GST_BINARY_REGISTRY_SOURCE_LEN];
> - char package[GST_BINARY_REGISTRY_PACKAGE_LEN];
> - char origin[GST_BINARY_REGISTRY_ORIGIN_LEN];
> - unsigned long size;
> - unsigned long m32p;
> - unsigned int nfeatures;
> -} GstBinaryPluginElement;
> -
> -
> -/* A structure containing the plugin features
> -**
> -** Note :
> -** "npadtemplates" is used to store the number of GstBinaryPadTemplate structures following the structure itself.
> -** "ninterfaces" is used to store the number of GstBinaryInterface structures following the structure itself.
> -** "nuritypes" is used to store the number of GstBinaryUriType structures following the structure itself.
> -*/
> -#define GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN (256)
> -#define GST_BINARY_REGISTRY_TYPENAME_NAME_LEN (256)
> -#define GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN (1024)
> -#define GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN (512)
> -#define GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN (1024)
> -#define GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN (256)
> -
> -typedef struct _GstBinaryPluginFeature
> -{
> - char typename[GST_BINARY_REGISTRY_TYPENAME_TYPENAME_LEN];
> - char name[GST_BINARY_REGISTRY_TYPENAME_NAME_LEN];
> - unsigned long rank;
> - char longname[GST_BINARY_REGISTRY_TYPENAME_LONGNAME_LEN];
> - char class[GST_BINARY_REGISTRY_TYPENAME_CLASS_LEN];
> - char description[GST_BINARY_REGISTRY_TYPENAME_DESCRIPTION_LEN];
> - char author[GST_BINARY_REGISTRY_TYPENAME_AUTHOR_LEN];
> - unsigned int npadtemplates;
> - unsigned int ninterfaces;
> - unsigned int nuritypes;
> -} GstBinaryPluginFeature;
> -
> -
> -/*
> -** A structure containing the static pad templates of a plugin feature
> -*/
> -#define GST_BINARY_REGISTRY_PADTEMPLATE_NAME_LEN (256)
> -#define GST_BINARY_REGISTRY_PADTEMPLATE_CAP_LEN (1024)
> -
> -typedef struct _GstBinaryPadTemplate
> -{
> - char name[GST_BINARY_REGISTRY_PADTEMPLATE_NAME_LEN];
> - char cap[GST_BINARY_REGISTRY_PADTEMPLATE_CAP_LEN];
> - int direction; /* Either 0:"sink" or 1:"src" */
> - GstPadPresence presence;
> -} GstBinaryPadTemplate;
> -
> -/*
> -** A very simple structure defining the plugin feature interface string
> -*/
> -#define GST_BINARY_REGISTRY_INTERFACE_INTERFACE_LEN (512)
> -typedef struct _GstBinaryInterface
> -{
> - char interface[GST_BINARY_REGISTRY_INTERFACE_INTERFACE_LEN];
> - unsigned long size;
> -} GstBinaryInterface;
> -
> -/* Uri Type */
> -typedef struct _GstBinaryUriType
> -{
> - GstURIType type;
> - unsigned long nuriprotocols;
> -} GstBinaryUriType;
> -
> -/*
> -** Function prototypes
> -*/
> -
> -/* Local prototypes */
> -inline static gboolean gst_registry_binary_write(GstRegistry *registry, const void *mem, const ssize_t size);
> -inline static gboolean gst_registry_binary_initialize_magic(GstBinaryRegistryMagic *m);
> -static gboolean gst_registry_binary_fill_feature(GList **list, GstPluginFeature *, GstBinaryPluginFeature *, const char *);
> -static gboolean gst_registry_binary_save_plugin(GList **list, GstRegistry *registry, GstPlugin *plugin);
> -static gchar *gst_registry_binary_check_magic(gchar *in);
> -static GstPluginFeature *gst_registry_binary_load_feature(GstBinaryPluginFeature *);
> -static unsigned long gst_registry_binary_get_binary_plugin(GstRegistry *registry, gchar *in);
> -
> -/* Exportable */
> -gboolean gst_registry_binary_write_cache(GstRegistry *registry, const char *location);
> -gboolean gst_registry_binary_read_cache(GstRegistry *registry, const char *location);
> -
> -#endif /* !__GST_REGISTRYBINARY_H__ */
> -
> -
> diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
> deleted file mode 100644
> index 5f97a20..0000000
> --- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -SUMMARY = "GStreamer multimedia framework"
> -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
> -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
> -HOMEPAGE = "http://gstreamer.freedesktop.org/"
> -BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
> -SECTION = "multimedia"
> -LICENSE = "LGPLv2+"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
> - file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4"
> -DEPENDS = "glib-2.0 libxml2 bison-native flex-native glib-2.0-native"
> -
> -PR = "r2"
> -
> -SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
> - file://check_fix.patch \
> - file://gst-inspect-check-error.patch \
> - file://0001-baseparse-Fix-self-comparison-always-evaluates-to-tr.patch \
> - file://0001-parse-make-grammar.y-work-with-Bison-3.patch \
> - file://0002-gst-glib2.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch \
> -"
> -
> -SRC_URI[md5sum] = "a0cf7d6877f694a1a2ad2b4d1ecb890b"
> -SRC_URI[sha256sum] = "e556a529e0a8cf1cd0afd0cab2af5488c9524e7c3f409de29b5d82bb41ae7a30"
> -
> -inherit autotools pkgconfig gettext
> -
> -GSTREAMER_DEBUG ?= "--disable-debug"
> -EXTRA_OECONF = "--disable-docbook --disable-gtk-doc \
> - --disable-dependency-tracking --disable-check \
> - --disable-examples --disable-tests \
> - --disable-valgrind ${GSTREAMER_DEBUG} \
> - --disable-introspection \
> - "
> -
> -CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no"
> -
> -# apply gstreamer hack after Makefile.in.in in source is replaced by our version from
> -# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed
> -# http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html
> -oe_runconf_prepend() {
> - sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in
> -}
> -
> -#do_compile_prepend () {
> -# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/
> -#}
> -
> -RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
> -RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
> -
> -FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
> -FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
> -FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/ ${libexecdir}/gstreamer-0.10/.debug/"
> --
> 1.8.3.1
>
> --
NAK - same as for xfce4-mixer
A question of intgerest: what is the goal of removing working recipes??
Andreas
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
2017-09-06 19:58 ` Andreas Müller
@ 2017-09-06 20:02 ` Mark Hatle
2017-09-06 20:13 ` Andreas Müller
0 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 20:02 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-devel
On 9/6/17 2:58 PM, Andreas Müller wrote:
> On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>> There is no upstream revision to the mixer to make it work w/o gstreamer-0.10
>>
>> also remove from packagegroup-xfce-extended
>>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> ---
>> meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb | 14 --------------
>> .../packagegroups/packagegroup-xfce-extended.bb | 1 -
>> 2 files changed, 15 deletions(-)
>> delete mode 100644 meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
>>
>> diff --git a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
>> deleted file mode 100644
>> index bdbec45..0000000
>> --- a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
>> +++ /dev/null
>> @@ -1,14 +0,0 @@
>> -SUMMARY = "A volume control application based on GStreamer"
>> -LICENSE = "GPLv2"
>> -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
>> -
>> -inherit xfce-panel-plugin
>> -
>> -DEPENDS += "glib-2.0 gst-plugins-base gtk+ xfconf libunique"
>> -
>> -SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2"
>> -
>> -SRC_URI[md5sum] = "1b3753b91224867a3a2dfddda239c28d"
>> -SRC_URI[sha256sum] = "fb0c1df201ed1130f54f15b914cbe5a59286e994a137acda5609570c57112de2"
>> -
>> -RDEPENDS_${PN} = "gst-meta-audio"
>> diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
>> index c07188f..ff024b3 100644
>> --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
>> +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
>> @@ -61,7 +61,6 @@ RRECOMMENDS_${PN} = " \
>> xfce4-appfinder \
>> xfce4-screenshooter \
>> xfce4-power-manager \
>> - xfce4-mixer \
>> ristretto \
>> xfce4-taskmanager \
>> gigolo \
>> --
>> 1.8.3.1
>>
> NAK - I use it daily and there is no proper replacement (not using pulsaudio)
That is exactly why I removed it.. there is no proper replacement for it.
Between gstreamer-0.10 not being supported and the existence of it in
meta-openembedded causing preferred provider problems. It really needs to be
replaced with something else. I have no idea 'what else', but I was looking and
most other distributions have dumped it.
I saw some references to security issues in gstreamer-0.10 (not being resolved)
due to it no longer being supported as well, but no specifics.
--Mark
> Andreas
>
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 13/31] corosync: Requires net-snmp from meta-networking
2017-09-06 19:23 ` [PATCH 13/31] corosync: Requires net-snmp from meta-networking Mark Hatle
@ 2017-09-06 20:12 ` Mark Hatle
0 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 20:12 UTC (permalink / raw)
To: openembedded-devel
FYI, the git mv here was incomplete. I missed the patch. I will send up a v2
for this commit soon.
On 9/6/17 2:23 PM, Mark Hatle wrote:
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> .../recipes-extended/corosync/corosync_2.4.2.bb | 78 ++++++++++++++++++++++
> .../recipes-extended/corosync/corosync_2.4.2.bb | 78 ----------------------
> 2 files changed, 78 insertions(+), 78 deletions(-)
> create mode 100644 meta-networking/recipes-extended/corosync/corosync_2.4.2.bb
> delete mode 100644 meta-oe/recipes-extended/corosync/corosync_2.4.2.bb
>
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
2017-09-06 20:02 ` Mark Hatle
@ 2017-09-06 20:13 ` Andreas Müller
2017-09-06 20:21 ` Mark Hatle
0 siblings, 1 reply; 55+ messages in thread
From: Andreas Müller @ 2017-09-06 20:13 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-devel
On Wed, Sep 6, 2017 at 10:02 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
> On 9/6/17 2:58 PM, Andreas Müller wrote:
>> On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>>> There is no upstream revision to the mixer to make it work w/o gstreamer-0.10
>>>
>>> also remove from packagegroup-xfce-extended
>>>
>>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>>> ---
>>> meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb | 14 --------------
>>> .../packagegroups/packagegroup-xfce-extended.bb | 1 -
>>> 2 files changed, 15 deletions(-)
>>> delete mode 100644 meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
>>>
>>> diff --git a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
>>> deleted file mode 100644
>>> index bdbec45..0000000
>>> --- a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
>>> +++ /dev/null
>>> @@ -1,14 +0,0 @@
>>> -SUMMARY = "A volume control application based on GStreamer"
>>> -LICENSE = "GPLv2"
>>> -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
>>> -
>>> -inherit xfce-panel-plugin
>>> -
>>> -DEPENDS += "glib-2.0 gst-plugins-base gtk+ xfconf libunique"
>>> -
>>> -SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2"
>>> -
>>> -SRC_URI[md5sum] = "1b3753b91224867a3a2dfddda239c28d"
>>> -SRC_URI[sha256sum] = "fb0c1df201ed1130f54f15b914cbe5a59286e994a137acda5609570c57112de2"
>>> -
>>> -RDEPENDS_${PN} = "gst-meta-audio"
>>> diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
>>> index c07188f..ff024b3 100644
>>> --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
>>> +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
>>> @@ -61,7 +61,6 @@ RRECOMMENDS_${PN} = " \
>>> xfce4-appfinder \
>>> xfce4-screenshooter \
>>> xfce4-power-manager \
>>> - xfce4-mixer \
>>> ristretto \
>>> xfce4-taskmanager \
>>> gigolo \
>>> --
>>> 1.8.3.1
>>>
>> NAK - I use it daily and there is no proper replacement (not using pulsaudio)
>
> That is exactly why I removed it.. there is no proper replacement for it.
> Between gstreamer-0.10 not being supported and the existence of it in
> meta-openembedded causing preferred provider problems. It really needs to be
> replaced with something else. I have no idea 'what else', but I was looking and
> most other distributions have dumped it.
>
> I saw some references to security issues in gstreamer-0.10 (not being resolved)
> due to it no longer being supported as well, but no specifics.
>
> --Mark
>
You are about to remove a recipe I need very very very often. As you
can see in meta-qt5-extra I use my build for making music. You end up
in calling this other peoples problem (e.g mine) and don't really care
of any replacement. Thank you - I will send out a removing me as
maintainer for meta-xfce - fun times are definetely over.
And please don't even think about running your magic script for
meta-qt5-extra or send patches.
Over and out
Andreas
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 30/31] florence: update 0.6.3
2017-09-06 19:59 ` Andreas Müller
@ 2017-09-06 20:15 ` Mark Hatle
0 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 20:15 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-devel
On 9/6/17 2:59 PM, Andreas Müller wrote:
> On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>> From: Andreas Müller <schnitzeltony@googlemail.com>
>>
>> * patches were either leftovers or do not match the code
>> * DESCRIPTION -> shortened SUMMARY
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>>
>> Added gtk+3 dependency and resolved conflicts
>>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> There were certain reasons this was not accepted. Are these obsolete these days?
Reading back a year ago the comments indicated that some of the dependencies
were incorrect and there were some other packages that may be wrong. These have
been fixed (in the other packages).
I do not have a way to check the functionality of the patch, other then it
compiles and I'm going off your original patch.
Looking at Debian and others, this appears to be the version of florence they
are using.
--Mark
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
2017-09-06 20:13 ` Andreas Müller
@ 2017-09-06 20:21 ` Mark Hatle
2017-09-06 20:35 ` Andreas Müller
0 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 20:21 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-devel
On 9/6/17 3:13 PM, Andreas Müller wrote:
> On Wed, Sep 6, 2017 at 10:02 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>> On 9/6/17 2:58 PM, Andreas Müller wrote:
>>> On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>>>> There is no upstream revision to the mixer to make it work w/o gstreamer-0.10
>>>>
>>>> also remove from packagegroup-xfce-extended
>>>>
>>>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>>>> ---
>>>> meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb | 14 --------------
>>>> .../packagegroups/packagegroup-xfce-extended.bb | 1 -
>>>> 2 files changed, 15 deletions(-)
>>>> delete mode 100644 meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
>>>>
>>>> diff --git a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb b/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
>>>> deleted file mode 100644
>>>> index bdbec45..0000000
>>>> --- a/meta-xfce/recipes-apps/xfce4-mixer/xfce4-mixer_4.11.0.bb
>>>> +++ /dev/null
>>>> @@ -1,14 +0,0 @@
>>>> -SUMMARY = "A volume control application based on GStreamer"
>>>> -LICENSE = "GPLv2"
>>>> -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
>>>> -
>>>> -inherit xfce-panel-plugin
>>>> -
>>>> -DEPENDS += "glib-2.0 gst-plugins-base gtk+ xfconf libunique"
>>>> -
>>>> -SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2"
>>>> -
>>>> -SRC_URI[md5sum] = "1b3753b91224867a3a2dfddda239c28d"
>>>> -SRC_URI[sha256sum] = "fb0c1df201ed1130f54f15b914cbe5a59286e994a137acda5609570c57112de2"
>>>> -
>>>> -RDEPENDS_${PN} = "gst-meta-audio"
>>>> diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
>>>> index c07188f..ff024b3 100644
>>>> --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
>>>> +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
>>>> @@ -61,7 +61,6 @@ RRECOMMENDS_${PN} = " \
>>>> xfce4-appfinder \
>>>> xfce4-screenshooter \
>>>> xfce4-power-manager \
>>>> - xfce4-mixer \
>>>> ristretto \
>>>> xfce4-taskmanager \
>>>> gigolo \
>>>> --
>>>> 1.8.3.1
>>>>
>>> NAK - I use it daily and there is no proper replacement (not using pulsaudio)
>>
>> That is exactly why I removed it.. there is no proper replacement for it.
>> Between gstreamer-0.10 not being supported and the existence of it in
>> meta-openembedded causing preferred provider problems. It really needs to be
>> replaced with something else. I have no idea 'what else', but I was looking and
>> most other distributions have dumped it.
>>
>> I saw some references to security issues in gstreamer-0.10 (not being resolved)
>> due to it no longer being supported as well, but no specifics.
>>
>> --Mark
>>
> You are about to remove a recipe I need very very very often. As you
> can see in meta-qt5-extra I use my build for making music. You end up
> in calling this other peoples problem (e.g mine) and don't really care
> of any replacement. Thank you - I will send out a removing me as
> maintainer for meta-xfce - fun times are definetely over.
You are missing the point. We DO need a replacement. However, I was unable to
find one. With the few references I found when searching that there was no
replacement, and it was effectively obsolete (and removed in other
distributions), I followed their example.
As I said in the header, I don't believe this set is completely right. But it's
a first stab and what it took for me to pass the testing script.
I am retesting with this patch and the removal of gstreamer removed from the
test set (it will take a while, I've got -30,000- tasks to run through for a
test). It's possible that something else in the system was triggering a fault
that caused gstreamer-0.10 to fail and that was resolved elsewhere.
I tested the original work against master, but rebased to master-next after
talking w/ Martin... I then spot checked the modified recipes that they were
still working after the rebase.
> And please don't even think about running your magic script for
> meta-qt5-extra or send patches.
Again, you are missing the point here. Someone has to start this work. It's
the layer maintainers decision to accept or reject the patches, not mine.. but
I feel it's my obligation as a community member to submit the patches I create
to the community layers that I use. I also feel it's my obligation as a patch
submitter to explain why (or why not) they are necessary for my specific
use-case. (In this case, passing a specific compatibility test script.)
--Mark
> Over and out
>
> Andreas
>
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
2017-09-06 20:21 ` Mark Hatle
@ 2017-09-06 20:35 ` Andreas Müller
2017-09-06 20:44 ` Mark Hatle
0 siblings, 1 reply; 55+ messages in thread
From: Andreas Müller @ 2017-09-06 20:35 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-devel
On Wed, Sep 6, 2017 at 10:21 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>
> You are missing the point. We DO need a replacement. However, I was unable to
> find one. With the few references I found when searching that there was no
> replacement, and it was effectively obsolete (and removed in other
> distributions), I followed their example.
>
> As I said in the header, I don't believe this set is completely right. But it's
> a first stab and what it took for me to pass the testing script.
>
> I am retesting with this patch and the removal of gstreamer removed from the
> test set (it will take a while, I've got -30,000- tasks to run through for a
> test). It's possible that something else in the system was triggering a fault
> that caused gstreamer-0.10 to fail and that was resolved elsewhere.
>
> I tested the original work against master, but rebased to master-next after
> talking w/ Martin... I then spot checked the modified recipes that they were
> still working after the rebase.
>
>> And please don't even think about running your magic script for
>> meta-qt5-extra or send patches.
>
> Again, you are missing the point here. Someone has to start this work. It's
> the layer maintainers decision to accept or reject the patches, not mine.. but
> I feel it's my obligation as a community member to submit the patches I create
> to the community layers that I use. I also feel it's my obligation as a patch
> submitter to explain why (or why not) they are necessary for my specific
> use-case. (In this case, passing a specific compatibility test script.)
>
> --Mark
>
>> Over and out
>>
>> Andreas
>>
>
I am sure that I miss the point again but fedora - for me
reference/inspiration many times - has no problem with xfce4-mixer
[1].
[1] http://pkgs.fedoraproject.org/cgit/rpms/xfce4-mixer.git/tree/xfce4-mixer.spec
Andreas
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
2017-09-06 20:35 ` Andreas Müller
@ 2017-09-06 20:44 ` Mark Hatle
2017-09-06 20:53 ` Andreas Müller
0 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 20:44 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-devel
On 9/6/17 3:35 PM, Andreas Müller wrote:
> On Wed, Sep 6, 2017 at 10:21 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>>
>> You are missing the point. We DO need a replacement. However, I was unable to
>> find one. With the few references I found when searching that there was no
>> replacement, and it was effectively obsolete (and removed in other
>> distributions), I followed their example.
>>
>> As I said in the header, I don't believe this set is completely right. But it's
>> a first stab and what it took for me to pass the testing script.
>>
>> I am retesting with this patch and the removal of gstreamer removed from the
>> test set (it will take a while, I've got -30,000- tasks to run through for a
>> test). It's possible that something else in the system was triggering a fault
>> that caused gstreamer-0.10 to fail and that was resolved elsewhere.
>>
>> I tested the original work against master, but rebased to master-next after
>> talking w/ Martin... I then spot checked the modified recipes that they were
>> still working after the rebase.
>>
>>> And please don't even think about running your magic script for
>>> meta-qt5-extra or send patches.
>>
>> Again, you are missing the point here. Someone has to start this work. It's
>> the layer maintainers decision to accept or reject the patches, not mine.. but
>> I feel it's my obligation as a community member to submit the patches I create
>> to the community layers that I use. I also feel it's my obligation as a patch
>> submitter to explain why (or why not) they are necessary for my specific
>> use-case. (In this case, passing a specific compatibility test script.)
>>
>> --Mark
>>
>>> Over and out
>>>
>>> Andreas
>>>
>>
> I am sure that I miss the point again but fedora - for me
> reference/inspiration many times - has no problem with xfce4-mixer
> [1].
>
> [1] http://pkgs.fedoraproject.org/cgit/rpms/xfce4-mixer.git/tree/xfce4-mixer.spec
arch - https://bbs.archlinux.org/viewtopic.php?id=222294
debian - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=785846
mageia - https://forums.mageia.org/en/viewtopic.php?f=15&t=10018
Fedora - https://bugzilla.redhat.com/show_bug.cgi?id=1355763
etc... This is what I based the original commit message on.
Just an FYI, the first part of my test WITHOUT the xfce4-mixer and
gstreamer-0.10 removal just passed. I will let it continue and will report on
the status once the full test is complete. (full test as in bitbake world)
--Mark
> Andreas
>
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
2017-09-06 20:44 ` Mark Hatle
@ 2017-09-06 20:53 ` Andreas Müller
2017-09-06 21:00 ` Mark Hatle
0 siblings, 1 reply; 55+ messages in thread
From: Andreas Müller @ 2017-09-06 20:53 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-devel
>> I am sure that I miss the point again but fedora - for me
>> reference/inspiration many times - has no problem with xfce4-mixer
>> [1].
>>
>> [1] http://pkgs.fedoraproject.org/cgit/rpms/xfce4-mixer.git/tree/xfce4-mixer.spec
>
> arch - https://bbs.archlinux.org/viewtopic.php?id=222294
> debian - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=785846
> mageia - https://forums.mageia.org/en/viewtopic.php?f=15&t=10018
> Fedora - https://bugzilla.redhat.com/show_bug.cgi?id=1355763
^ Yes you should look into this - that is exactly the problem I have.
>
> etc... This is what I based the original commit message on.
>
> Just an FYI, the first part of my test WITHOUT the xfce4-mixer and
> gstreamer-0.10 removal just passed.
Passed what exactly?
> I will let it continue and will report on
> the status once the full test is complete. (full test as in bitbake world)
>
> --Mark
>
Andreas
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
2017-09-06 20:53 ` Andreas Müller
@ 2017-09-06 21:00 ` Mark Hatle
2017-09-06 23:40 ` Mark Hatle
0 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 21:00 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-devel
On 9/6/17 3:53 PM, Andreas Müller wrote:
>>> I am sure that I miss the point again but fedora - for me
>>> reference/inspiration many times - has no problem with xfce4-mixer
>>> [1].
>>>
>>> [1] http://pkgs.fedoraproject.org/cgit/rpms/xfce4-mixer.git/tree/xfce4-mixer.spec
>>
>> arch - https://bbs.archlinux.org/viewtopic.php?id=222294
>> debian - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=785846
>> mageia - https://forums.mageia.org/en/viewtopic.php?f=15&t=10018
>> Fedora - https://bugzilla.redhat.com/show_bug.cgi?id=1355763
> ^ Yes you should look into this - that is exactly the problem I have.
>>
>> etc... This is what I based the original commit message on.
>>
>> Just an FYI, the first part of my test WITHOUT the xfce4-mixer and
>> gstreamer-0.10 removal just passed.
> Passed what exactly?
../scripts/yocto-compat-layer.py meta-openembedded
bitbake -S none world
bitbake -S none universe
bitbake xfce4-mixer florence (with opengl and x11 distro features enabled, and
commercial license flag set)
bitbake world (bringing in additional recipes that may collide or otherwise
impact with the two versions of gstreamer) is what I have in progress.
The next step will be to verify packagegroups/images can at least construct
something without generating a file conflict error.
--Mark
>> I will let it continue and will report on
>> the status once the full test is complete. (full test as in bitbake world)
>>
>> --Mark
>>
> Andreas
>
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
2017-09-06 21:00 ` Mark Hatle
@ 2017-09-06 23:40 ` Mark Hatle
0 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 23:40 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-devel
On 9/6/17 4:00 PM, Mark Hatle wrote:
> On 9/6/17 3:53 PM, Andreas Müller wrote:
>>>> I am sure that I miss the point again but fedora - for me
>>>> reference/inspiration many times - has no problem with xfce4-mixer
>>>> [1].
>>>>
>>>> [1] http://pkgs.fedoraproject.org/cgit/rpms/xfce4-mixer.git/tree/xfce4-mixer.spec
>>>
>>> arch - https://bbs.archlinux.org/viewtopic.php?id=222294
>>> debian - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=785846
>>> mageia - https://forums.mageia.org/en/viewtopic.php?f=15&t=10018
>>> Fedora - https://bugzilla.redhat.com/show_bug.cgi?id=1355763
>> ^ Yes you should look into this - that is exactly the problem I have.
>>>
>>> etc... This is what I based the original commit message on.
>>>
>>> Just an FYI, the first part of my test WITHOUT the xfce4-mixer and
>>> gstreamer-0.10 removal just passed.
>> Passed what exactly?
>
> ../scripts/yocto-compat-layer.py meta-openembedded
>
> bitbake -S none world
> bitbake -S none universe
> bitbake xfce4-mixer florence (with opengl and x11 distro features enabled, and
> commercial license flag set)
>
> bitbake world (bringing in additional recipes that may collide or otherwise
> impact with the two versions of gstreamer) is what I have in progress.
The received the following failures:
meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb:do_compile
meta-openembedded/meta-perl/recipes-perl/libterm/libterm-readkey-perl_2.37.bb:do_compile
virtual:native:meta-openembedded/meta-oe/recipes-extended/efivar/efivar_0.31.bb:do_compile
meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.12.0.bb:do_compile
meta-openembedded/meta-oe/recipes-extended/leveldb/leveldb_git.bb:do_compile
meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.4.4.bb:do_compile
None of these are related to any of the changes in this system or gstreamer.
> The next step will be to verify packagegroups/images can at least construct
> something without generating a file conflict error.
bitbake packagegroup-tools-bluetooth packagegroup-basic packagegroup-boot
packagegroup-sdk-target packagegroup-fonts-truetype packagegroup-xfce-multimedia
packagegroup-xfce-base packagegroup-xfce-extended
Passed.
bitbake core-image-minimal-xfce core-image-minimal core-image-base core-image-sato
Passed.
So whatever caused the fault with gstreamer when I was building before has gone
away. I'm unable to reproduce it. So patches 29 and 31 can be dropped from the
set.
> --Mark
>
>>> I will let it continue and will report on
>>> the status once the full test is complete. (full test as in bitbake world)
>>>
>>> --Mark
>>>
>> Andreas
>>
>
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 00/31] Numerous patches to resolve yocto-compat-layer
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
` (30 preceding siblings ...)
2017-09-06 19:23 ` [PATCH 31/31] gstreamer-0.10: Remove as all users are gone and it is obsolete Mark Hatle
@ 2017-09-06 23:41 ` Mark Hatle
2017-09-06 23:49 ` Khem Raj
31 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 23:41 UTC (permalink / raw)
To: openembedded-devel
Current version of these patches, the v2 of 13/31 and the dropping of 29 and 31
has been pushed to:
git://git.openembedded.org/meta-openembedded-contrib
mgh/yp-compat/master-next
--Mark
On 9/6/17 2:22 PM, Mark Hatle wrote:
> This patch set attempts to address the 'yocto-compat-layer.py' failures.
>
> Many of the patches seem like obvious fixes or changes to me.. however some
> of them are clearly dubious.
>
> I would not suggestion treating this as a single take them all or take none,
> but as individual changes.. (a few of them may require prior changes...)
>
> Besides the standard git summary (below), I have attempted to summaries the
> individual patches here to help with review:
>
> [01/31] iproute2: Move tipc enablement to oe-core
> [02/31] libml: Move to oe-core
> - I will be sending up a corresponding patch to oe-core for these. See the
> other email ( iproute2: Move tipc enablement to oe-core ) for a description
> of why this is necessary.
>
> [03/31] openipmi: Move to meta-networking requires net-snmp
> - openipmi in meta-oe requires net-snmp, but meta-oe doesn't depend on
> meta-networking. Easiest resolution was to move it.
>
> [04/31] glmark2: Set required distro features to opengl
> - Should be one of the 'obvious' fixes
>
> [05/31] openlmi-tools: Only build if the necessary python
> - This is one of the dubious patches. I could not figure out an appropriate
> place to 'move' this to that requires meta-python -- as the item itself does
> not appear to be appriopriate to put into meta-python.
>
> [06/31] xorg-drivers: Add opengl distro flag requirement to ati
> [07/31] boinc-client: Add distro flag, requires opengl
> - Another set of the 'obvious' fixes
>
> [08/31] networkmanager-openvpn: requires openvpn from meta-networking
> - requires openvpn from meta-networking, but meta-oe doesn't depend on
> meta-networking. Easiest resolution was to move it.
>
> [09/31] telepathy-python: Move to meta-python, requires python-dbus
> - This seems like a reasonable move to meta-python
>
> [10/31] networkmanager: Move to meta-networking, requires dnsmasq
> - This moves the rest of networkmanager to meta-networking
>
> [11/31] python-ldap: Move to meta-networking, requires cyrus-sasl
> - I originally was going to move to meta-python, but that doesn't depend on
> meta-networking... so move it there instead
>
> [12/31] python-networkmanager: Move to networking, requires networkmanager
> - Due to the prior moves, move this as well to meta-networking
>
> [13/31] corosync: Requires net-snmp from meta-networking
> - Again move to meta-networking due to dep
>
> [14/31] pywbem: Requires python-m2crypto-native (and others)
> - This is one I'm not sure if it's the right thing or not.. but it does
> require meta-python.. so move it.
>
> [15/31] dlm: requires corosync, from meta-networking
> - Again move to meta-networking due to prior move
>
> [16/31] open-vm-tools: only build if meta-networking and meta-filesystems
> - open-vm-tools requires libdnet (meta-networking) and fuse (meta-filesystem)
> I think this is a dubious way to 'fix' the issue, but I really couldn't think
> of a better way.
>
> [17/31] miniupnpd: Move to meta-networking, requires libnetfilter-conntrack
> - Move to meta-networking due to dependency...
>
> [18/31] enable_gnome.conf: Move the AVAHI_GTK setting
> - The yp-compat script does not allow a layer to modify the system wide
> configuration (including modifying other recipe behavior). The AVHAI_GTK
> changes the behavior of that recipe, which is detected by the script. So
> I choose to move this to a configuration file that will need to be required
> by the user IF they want avahi to use GTK. I'm not happy with this, but I
> don't see any other way to meet the requirements.
>
> [19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
> - Similar to the above, but with PACKAGECONFIG this time.
>
> [20/31] libart-lgpg: Obsolete, replaced by version in oe-core
> - OE core already has this version, remove it.
>
> [21/31] pinpoint: Add dependency on opengl for cogl
> - Add the required distro flag...
>
> [22/31] vim: Remove xfce vim bbappend
> - This breaks the same rule as 18 and 19. I didn't see a way to 'fix it',
> so I just removed the change.
>
> [23/31] layer.conf: Add meta-networking for the networkmanager
> - add meta-networking as a dependency to meta-gnome for networkmanager
> this is due to the move above
>
> [24/31] meta-xfce: depend on meta-multimedia
> - There was a duplicate openembedded-layer entry, but I think it was
> supposed to be for meta-multimedia. This resolves a bunch of dependency
> errors.
>
> [25/31] mpv: Requires ffmpeg which has a LICENSE_FLAGS =
> [26/31] recipes-multimedia: Add LICENSE_FLAGS
> [27/31] recipes-multimedia: Add LICENSE_FLAGS
> - Above items all get LICENSE_FLAGS added to match their dependencies. This
> resolves a dependency issue where the required item(s) are not avaialable.
>
> [28/31] libmtp: remove 'mtp-tools' from PACKAGES
> - This is a real bug in mtp-tools, and needs to be fixed.
>
> [29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
> - There is no 'fix' for xfce4-mixer using gstreamer-0.10, so remove it...
>
> [30/31] florence: update 0.6.3
> - Use Andreas Muller's patch from Oct 2016 to git rid of the gstreamer-0.10
> dependency. Resolve the issue with requiring gtk+3.
>
> [31/31] gstreamer-0.10: Remove as all users are gone and it is
> - Remove gstreamer-0.10 as all of the users are now gone. (This resolves
> various preferred provider issues I observed..)
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 00/31] Numerous patches to resolve yocto-compat-layer
2017-09-06 23:41 ` [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
@ 2017-09-06 23:49 ` Khem Raj
2017-09-06 23:59 ` Mark Hatle
0 siblings, 1 reply; 55+ messages in thread
From: Khem Raj @ 2017-09-06 23:49 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembeded-devel
On Wed, Sep 6, 2017 at 4:41 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
> Current version of these patches, the v2 of 13/31 and the dropping of 29 and 31
> has been pushed to:
>
> git://git.openembedded.org/meta-openembedded-contrib
> mgh/yp-compat/master-next
>
Are these made on top of master-next ?
if not it would be easier to integrate if they were rebased on top of
master-next
> --Mark
>
> On 9/6/17 2:22 PM, Mark Hatle wrote:
>> This patch set attempts to address the 'yocto-compat-layer.py' failures.
>>
>> Many of the patches seem like obvious fixes or changes to me.. however some
>> of them are clearly dubious.
>>
>> I would not suggestion treating this as a single take them all or take none,
>> but as individual changes.. (a few of them may require prior changes...)
>>
>> Besides the standard git summary (below), I have attempted to summaries the
>> individual patches here to help with review:
>>
>> [01/31] iproute2: Move tipc enablement to oe-core
>> [02/31] libml: Move to oe-core
>> - I will be sending up a corresponding patch to oe-core for these. See the
>> other email ( iproute2: Move tipc enablement to oe-core ) for a description
>> of why this is necessary.
>>
>> [03/31] openipmi: Move to meta-networking requires net-snmp
>> - openipmi in meta-oe requires net-snmp, but meta-oe doesn't depend on
>> meta-networking. Easiest resolution was to move it.
>>
>> [04/31] glmark2: Set required distro features to opengl
>> - Should be one of the 'obvious' fixes
>>
>> [05/31] openlmi-tools: Only build if the necessary python
>> - This is one of the dubious patches. I could not figure out an appropriate
>> place to 'move' this to that requires meta-python -- as the item itself does
>> not appear to be appriopriate to put into meta-python.
>>
>> [06/31] xorg-drivers: Add opengl distro flag requirement to ati
>> [07/31] boinc-client: Add distro flag, requires opengl
>> - Another set of the 'obvious' fixes
>>
>> [08/31] networkmanager-openvpn: requires openvpn from meta-networking
>> - requires openvpn from meta-networking, but meta-oe doesn't depend on
>> meta-networking. Easiest resolution was to move it.
>>
>> [09/31] telepathy-python: Move to meta-python, requires python-dbus
>> - This seems like a reasonable move to meta-python
>>
>> [10/31] networkmanager: Move to meta-networking, requires dnsmasq
>> - This moves the rest of networkmanager to meta-networking
>>
>> [11/31] python-ldap: Move to meta-networking, requires cyrus-sasl
>> - I originally was going to move to meta-python, but that doesn't depend on
>> meta-networking... so move it there instead
>>
>> [12/31] python-networkmanager: Move to networking, requires networkmanager
>> - Due to the prior moves, move this as well to meta-networking
>>
>> [13/31] corosync: Requires net-snmp from meta-networking
>> - Again move to meta-networking due to dep
>>
>> [14/31] pywbem: Requires python-m2crypto-native (and others)
>> - This is one I'm not sure if it's the right thing or not.. but it does
>> require meta-python.. so move it.
>>
>> [15/31] dlm: requires corosync, from meta-networking
>> - Again move to meta-networking due to prior move
>>
>> [16/31] open-vm-tools: only build if meta-networking and meta-filesystems
>> - open-vm-tools requires libdnet (meta-networking) and fuse (meta-filesystem)
>> I think this is a dubious way to 'fix' the issue, but I really couldn't think
>> of a better way.
>>
>> [17/31] miniupnpd: Move to meta-networking, requires libnetfilter-conntrack
>> - Move to meta-networking due to dependency...
>>
>> [18/31] enable_gnome.conf: Move the AVAHI_GTK setting
>> - The yp-compat script does not allow a layer to modify the system wide
>> configuration (including modifying other recipe behavior). The AVHAI_GTK
>> changes the behavior of that recipe, which is detected by the script. So
>> I choose to move this to a configuration file that will need to be required
>> by the user IF they want avahi to use GTK. I'm not happy with this, but I
>> don't see any other way to meet the requirements.
>>
>> [19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
>> - Similar to the above, but with PACKAGECONFIG this time.
>>
>> [20/31] libart-lgpg: Obsolete, replaced by version in oe-core
>> - OE core already has this version, remove it.
>>
>> [21/31] pinpoint: Add dependency on opengl for cogl
>> - Add the required distro flag...
>>
>> [22/31] vim: Remove xfce vim bbappend
>> - This breaks the same rule as 18 and 19. I didn't see a way to 'fix it',
>> so I just removed the change.
>>
>> [23/31] layer.conf: Add meta-networking for the networkmanager
>> - add meta-networking as a dependency to meta-gnome for networkmanager
>> this is due to the move above
>>
>> [24/31] meta-xfce: depend on meta-multimedia
>> - There was a duplicate openembedded-layer entry, but I think it was
>> supposed to be for meta-multimedia. This resolves a bunch of dependency
>> errors.
>>
>> [25/31] mpv: Requires ffmpeg which has a LICENSE_FLAGS =
>> [26/31] recipes-multimedia: Add LICENSE_FLAGS
>> [27/31] recipes-multimedia: Add LICENSE_FLAGS
>> - Above items all get LICENSE_FLAGS added to match their dependencies. This
>> resolves a dependency issue where the required item(s) are not avaialable.
>>
>> [28/31] libmtp: remove 'mtp-tools' from PACKAGES
>> - This is a real bug in mtp-tools, and needs to be fixed.
>>
>> [29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
>> - There is no 'fix' for xfce4-mixer using gstreamer-0.10, so remove it...
>>
>> [30/31] florence: update 0.6.3
>> - Use Andreas Muller's patch from Oct 2016 to git rid of the gstreamer-0.10
>> dependency. Resolve the issue with requiring gtk+3.
>>
>> [31/31] gstreamer-0.10: Remove as all users are gone and it is
>> - Remove gstreamer-0.10 as all of the users are now gone. (This resolves
>> various preferred provider issues I observed..)
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 00/31] Numerous patches to resolve yocto-compat-layer
2017-09-06 23:49 ` Khem Raj
@ 2017-09-06 23:59 ` Mark Hatle
2017-09-07 0:12 ` Khem Raj
0 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-06 23:59 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On 9/6/17 6:49 PM, Khem Raj wrote:
> On Wed, Sep 6, 2017 at 4:41 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>> Current version of these patches, the v2 of 13/31 and the dropping of 29 and 31
>> has been pushed to:
>>
>> git://git.openembedded.org/meta-openembedded-contrib
>> mgh/yp-compat/master-next
>>
>
> Are these made on top of master-next ?
> if not it would be easier to integrate if they were rebased on top of
> master-next
Yes they are all based on master-next.
--Mark
>
>> --Mark
>>
>> On 9/6/17 2:22 PM, Mark Hatle wrote:
>>> This patch set attempts to address the 'yocto-compat-layer.py' failures.
>>>
>>> Many of the patches seem like obvious fixes or changes to me.. however some
>>> of them are clearly dubious.
>>>
>>> I would not suggestion treating this as a single take them all or take none,
>>> but as individual changes.. (a few of them may require prior changes...)
>>>
>>> Besides the standard git summary (below), I have attempted to summaries the
>>> individual patches here to help with review:
>>>
>>> [01/31] iproute2: Move tipc enablement to oe-core
>>> [02/31] libml: Move to oe-core
>>> - I will be sending up a corresponding patch to oe-core for these. See the
>>> other email ( iproute2: Move tipc enablement to oe-core ) for a description
>>> of why this is necessary.
>>>
>>> [03/31] openipmi: Move to meta-networking requires net-snmp
>>> - openipmi in meta-oe requires net-snmp, but meta-oe doesn't depend on
>>> meta-networking. Easiest resolution was to move it.
>>>
>>> [04/31] glmark2: Set required distro features to opengl
>>> - Should be one of the 'obvious' fixes
>>>
>>> [05/31] openlmi-tools: Only build if the necessary python
>>> - This is one of the dubious patches. I could not figure out an appropriate
>>> place to 'move' this to that requires meta-python -- as the item itself does
>>> not appear to be appriopriate to put into meta-python.
>>>
>>> [06/31] xorg-drivers: Add opengl distro flag requirement to ati
>>> [07/31] boinc-client: Add distro flag, requires opengl
>>> - Another set of the 'obvious' fixes
>>>
>>> [08/31] networkmanager-openvpn: requires openvpn from meta-networking
>>> - requires openvpn from meta-networking, but meta-oe doesn't depend on
>>> meta-networking. Easiest resolution was to move it.
>>>
>>> [09/31] telepathy-python: Move to meta-python, requires python-dbus
>>> - This seems like a reasonable move to meta-python
>>>
>>> [10/31] networkmanager: Move to meta-networking, requires dnsmasq
>>> - This moves the rest of networkmanager to meta-networking
>>>
>>> [11/31] python-ldap: Move to meta-networking, requires cyrus-sasl
>>> - I originally was going to move to meta-python, but that doesn't depend on
>>> meta-networking... so move it there instead
>>>
>>> [12/31] python-networkmanager: Move to networking, requires networkmanager
>>> - Due to the prior moves, move this as well to meta-networking
>>>
>>> [13/31] corosync: Requires net-snmp from meta-networking
>>> - Again move to meta-networking due to dep
>>>
>>> [14/31] pywbem: Requires python-m2crypto-native (and others)
>>> - This is one I'm not sure if it's the right thing or not.. but it does
>>> require meta-python.. so move it.
>>>
>>> [15/31] dlm: requires corosync, from meta-networking
>>> - Again move to meta-networking due to prior move
>>>
>>> [16/31] open-vm-tools: only build if meta-networking and meta-filesystems
>>> - open-vm-tools requires libdnet (meta-networking) and fuse (meta-filesystem)
>>> I think this is a dubious way to 'fix' the issue, but I really couldn't think
>>> of a better way.
>>>
>>> [17/31] miniupnpd: Move to meta-networking, requires libnetfilter-conntrack
>>> - Move to meta-networking due to dependency...
>>>
>>> [18/31] enable_gnome.conf: Move the AVAHI_GTK setting
>>> - The yp-compat script does not allow a layer to modify the system wide
>>> configuration (including modifying other recipe behavior). The AVHAI_GTK
>>> changes the behavior of that recipe, which is detected by the script. So
>>> I choose to move this to a configuration file that will need to be required
>>> by the user IF they want avahi to use GTK. I'm not happy with this, but I
>>> don't see any other way to meet the requirements.
>>>
>>> [19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
>>> - Similar to the above, but with PACKAGECONFIG this time.
>>>
>>> [20/31] libart-lgpg: Obsolete, replaced by version in oe-core
>>> - OE core already has this version, remove it.
>>>
>>> [21/31] pinpoint: Add dependency on opengl for cogl
>>> - Add the required distro flag...
>>>
>>> [22/31] vim: Remove xfce vim bbappend
>>> - This breaks the same rule as 18 and 19. I didn't see a way to 'fix it',
>>> so I just removed the change.
>>>
>>> [23/31] layer.conf: Add meta-networking for the networkmanager
>>> - add meta-networking as a dependency to meta-gnome for networkmanager
>>> this is due to the move above
>>>
>>> [24/31] meta-xfce: depend on meta-multimedia
>>> - There was a duplicate openembedded-layer entry, but I think it was
>>> supposed to be for meta-multimedia. This resolves a bunch of dependency
>>> errors.
>>>
>>> [25/31] mpv: Requires ffmpeg which has a LICENSE_FLAGS =
>>> [26/31] recipes-multimedia: Add LICENSE_FLAGS
>>> [27/31] recipes-multimedia: Add LICENSE_FLAGS
>>> - Above items all get LICENSE_FLAGS added to match their dependencies. This
>>> resolves a dependency issue where the required item(s) are not avaialable.
>>>
>>> [28/31] libmtp: remove 'mtp-tools' from PACKAGES
>>> - This is a real bug in mtp-tools, and needs to be fixed.
>>>
>>> [29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
>>> - There is no 'fix' for xfce4-mixer using gstreamer-0.10, so remove it...
>>>
>>> [30/31] florence: update 0.6.3
>>> - Use Andreas Muller's patch from Oct 2016 to git rid of the gstreamer-0.10
>>> dependency. Resolve the issue with requiring gtk+3.
>>>
>>> [31/31] gstreamer-0.10: Remove as all users are gone and it is
>>> - Remove gstreamer-0.10 as all of the users are now gone. (This resolves
>>> various preferred provider issues I observed..)
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 00/31] Numerous patches to resolve yocto-compat-layer
2017-09-06 23:59 ` Mark Hatle
@ 2017-09-07 0:12 ` Khem Raj
0 siblings, 0 replies; 55+ messages in thread
From: Khem Raj @ 2017-09-07 0:12 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembeded-devel
On Wed, Sep 6, 2017 at 4:59 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
> On 9/6/17 6:49 PM, Khem Raj wrote:
>> On Wed, Sep 6, 2017 at 4:41 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>>> Current version of these patches, the v2 of 13/31 and the dropping of 29 and 31
>>> has been pushed to:
>>>
>>> git://git.openembedded.org/meta-openembedded-contrib
>>> mgh/yp-compat/master-next
>>>
>>
>> Are these made on top of master-next ?
>> if not it would be easier to integrate if they were rebased on top of
>> master-next
>
> Yes they are all based on master-next.
>
thanks. I will pull them into my master-next and see how it goes with my set of
world builds
> --Mark
>
>>
>>> --Mark
>>>
>>> On 9/6/17 2:22 PM, Mark Hatle wrote:
>>>> This patch set attempts to address the 'yocto-compat-layer.py' failures.
>>>>
>>>> Many of the patches seem like obvious fixes or changes to me.. however some
>>>> of them are clearly dubious.
>>>>
>>>> I would not suggestion treating this as a single take them all or take none,
>>>> but as individual changes.. (a few of them may require prior changes...)
>>>>
>>>> Besides the standard git summary (below), I have attempted to summaries the
>>>> individual patches here to help with review:
>>>>
>>>> [01/31] iproute2: Move tipc enablement to oe-core
>>>> [02/31] libml: Move to oe-core
>>>> - I will be sending up a corresponding patch to oe-core for these. See the
>>>> other email ( iproute2: Move tipc enablement to oe-core ) for a description
>>>> of why this is necessary.
>>>>
>>>> [03/31] openipmi: Move to meta-networking requires net-snmp
>>>> - openipmi in meta-oe requires net-snmp, but meta-oe doesn't depend on
>>>> meta-networking. Easiest resolution was to move it.
>>>>
>>>> [04/31] glmark2: Set required distro features to opengl
>>>> - Should be one of the 'obvious' fixes
>>>>
>>>> [05/31] openlmi-tools: Only build if the necessary python
>>>> - This is one of the dubious patches. I could not figure out an appropriate
>>>> place to 'move' this to that requires meta-python -- as the item itself does
>>>> not appear to be appriopriate to put into meta-python.
>>>>
>>>> [06/31] xorg-drivers: Add opengl distro flag requirement to ati
>>>> [07/31] boinc-client: Add distro flag, requires opengl
>>>> - Another set of the 'obvious' fixes
>>>>
>>>> [08/31] networkmanager-openvpn: requires openvpn from meta-networking
>>>> - requires openvpn from meta-networking, but meta-oe doesn't depend on
>>>> meta-networking. Easiest resolution was to move it.
>>>>
>>>> [09/31] telepathy-python: Move to meta-python, requires python-dbus
>>>> - This seems like a reasonable move to meta-python
>>>>
>>>> [10/31] networkmanager: Move to meta-networking, requires dnsmasq
>>>> - This moves the rest of networkmanager to meta-networking
>>>>
>>>> [11/31] python-ldap: Move to meta-networking, requires cyrus-sasl
>>>> - I originally was going to move to meta-python, but that doesn't depend on
>>>> meta-networking... so move it there instead
>>>>
>>>> [12/31] python-networkmanager: Move to networking, requires networkmanager
>>>> - Due to the prior moves, move this as well to meta-networking
>>>>
>>>> [13/31] corosync: Requires net-snmp from meta-networking
>>>> - Again move to meta-networking due to dep
>>>>
>>>> [14/31] pywbem: Requires python-m2crypto-native (and others)
>>>> - This is one I'm not sure if it's the right thing or not.. but it does
>>>> require meta-python.. so move it.
>>>>
>>>> [15/31] dlm: requires corosync, from meta-networking
>>>> - Again move to meta-networking due to prior move
>>>>
>>>> [16/31] open-vm-tools: only build if meta-networking and meta-filesystems
>>>> - open-vm-tools requires libdnet (meta-networking) and fuse (meta-filesystem)
>>>> I think this is a dubious way to 'fix' the issue, but I really couldn't think
>>>> of a better way.
>>>>
>>>> [17/31] miniupnpd: Move to meta-networking, requires libnetfilter-conntrack
>>>> - Move to meta-networking due to dependency...
>>>>
>>>> [18/31] enable_gnome.conf: Move the AVAHI_GTK setting
>>>> - The yp-compat script does not allow a layer to modify the system wide
>>>> configuration (including modifying other recipe behavior). The AVHAI_GTK
>>>> changes the behavior of that recipe, which is detected by the script. So
>>>> I choose to move this to a configuration file that will need to be required
>>>> by the user IF they want avahi to use GTK. I'm not happy with this, but I
>>>> don't see any other way to meet the requirements.
>>>>
>>>> [19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
>>>> - Similar to the above, but with PACKAGECONFIG this time.
>>>>
>>>> [20/31] libart-lgpg: Obsolete, replaced by version in oe-core
>>>> - OE core already has this version, remove it.
>>>>
>>>> [21/31] pinpoint: Add dependency on opengl for cogl
>>>> - Add the required distro flag...
>>>>
>>>> [22/31] vim: Remove xfce vim bbappend
>>>> - This breaks the same rule as 18 and 19. I didn't see a way to 'fix it',
>>>> so I just removed the change.
>>>>
>>>> [23/31] layer.conf: Add meta-networking for the networkmanager
>>>> - add meta-networking as a dependency to meta-gnome for networkmanager
>>>> this is due to the move above
>>>>
>>>> [24/31] meta-xfce: depend on meta-multimedia
>>>> - There was a duplicate openembedded-layer entry, but I think it was
>>>> supposed to be for meta-multimedia. This resolves a bunch of dependency
>>>> errors.
>>>>
>>>> [25/31] mpv: Requires ffmpeg which has a LICENSE_FLAGS =
>>>> [26/31] recipes-multimedia: Add LICENSE_FLAGS
>>>> [27/31] recipes-multimedia: Add LICENSE_FLAGS
>>>> - Above items all get LICENSE_FLAGS added to match their dependencies. This
>>>> resolves a dependency issue where the required item(s) are not avaialable.
>>>>
>>>> [28/31] libmtp: remove 'mtp-tools' from PACKAGES
>>>> - This is a real bug in mtp-tools, and needs to be fixed.
>>>>
>>>> [29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete
>>>> - There is no 'fix' for xfce4-mixer using gstreamer-0.10, so remove it...
>>>>
>>>> [30/31] florence: update 0.6.3
>>>> - Use Andreas Muller's patch from Oct 2016 to git rid of the gstreamer-0.10
>>>> dependency. Resolve the issue with requiring gtk+3.
>>>>
>>>> [31/31] gstreamer-0.10: Remove as all users are gone and it is
>>>> - Remove gstreamer-0.10 as all of the users are now gone. (This resolves
>>>> various preferred provider issues I observed..)
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 22/31] vim: Remove xfce vim bbappend
2017-09-06 19:23 ` [PATCH 22/31] vim: Remove xfce vim bbappend Mark Hatle
@ 2017-09-07 8:57 ` Andreas Müller
2017-09-07 13:52 ` Mark Hatle
0 siblings, 1 reply; 55+ messages in thread
From: Andreas Müller @ 2017-09-07 8:57 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-devel
On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
> Changing the behavior of a recipe by including a layer is not allowed
> by the yocto-compat-layer script.
I have a question on this: What is the yocto target for this matter?
Will there be times that a layer cannot change recipe's behavior
anymore? Background: Personally I don't care much (yet) for
yocto-compat-layer script - am busy enough to keep my images building
and running with the functionality I am interested in. But if this
will be forbidden by design in the future I have to expect further
activities. Not to be misunderstood: I understand why this is part of
requirements and only want to know what I need to put on my personal
TODO.
Andreas
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
2017-09-06 19:23 ` [PATCH 19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf Mark Hatle
@ 2017-09-07 9:29 ` Andreas Müller
2017-09-07 13:45 ` Mark Hatle
0 siblings, 1 reply; 55+ messages in thread
From: Andreas Müller @ 2017-09-07 9:29 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-devel
On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
> This resolves a failure of the yocto-compat-layer.py script. Changing the
> PACKAGECONFIG setting by just including a layer can cause problems.
>
> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
> ---
> meta-gnome/conf/enable_gnome.conf | 2 ++
> meta-gnome/recipes-devtools/glade/glade3_%.bbappend | 1 -
> 2 files changed, 2 insertions(+), 1 deletion(-)
> delete mode 100644 meta-gnome/recipes-devtools/glade/glade3_%.bbappend
>
> diff --git a/meta-gnome/conf/enable_gnome.conf b/meta-gnome/conf/enable_gnome.conf
> index 883a6f5..7e711ee 100644
> --- a/meta-gnome/conf/enable_gnome.conf
> +++ b/meta-gnome/conf/enable_gnome.conf
> @@ -1 +1,3 @@
> AVAHI_GTK_pn-avahi-ui = "gtk gtk3"
> +
> +PACKAGECONFIG_pn-glade3 = "gnome"
> diff --git a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend b/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
> deleted file mode 100644
> index 3abacfb..0000000
> --- a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
> +++ /dev/null
> @@ -1 +0,0 @@
> -PACKAGECONFIG ??= "gnome"
> --
> 1.8.3.1
>
Yet another stupid question (yes I need gnome support for working with
glade3): How is enable_gnome.conf supposed to be activated?
For the record: This is yet another patch kicking things off for the
sake of yocto-compat-layer script. Is meta-gnome supposed to be yocto
compatible? Was this decided by 'community'?
But I am sure I missed another point...
Andreas
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
2017-09-07 9:29 ` Andreas Müller
@ 2017-09-07 13:45 ` Mark Hatle
2017-09-07 14:51 ` Andreas Müller
0 siblings, 1 reply; 55+ messages in thread
From: Mark Hatle @ 2017-09-07 13:45 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-devel
On 9/7/17 4:29 AM, Andreas Müller wrote:
> On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>> This resolves a failure of the yocto-compat-layer.py script. Changing the
>> PACKAGECONFIG setting by just including a layer can cause problems.
>>
>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>> ---
>> meta-gnome/conf/enable_gnome.conf | 2 ++
>> meta-gnome/recipes-devtools/glade/glade3_%.bbappend | 1 -
>> 2 files changed, 2 insertions(+), 1 deletion(-)
>> delete mode 100644 meta-gnome/recipes-devtools/glade/glade3_%.bbappend
>>
>> diff --git a/meta-gnome/conf/enable_gnome.conf b/meta-gnome/conf/enable_gnome.conf
>> index 883a6f5..7e711ee 100644
>> --- a/meta-gnome/conf/enable_gnome.conf
>> +++ b/meta-gnome/conf/enable_gnome.conf
>> @@ -1 +1,3 @@
>> AVAHI_GTK_pn-avahi-ui = "gtk gtk3"
>> +
>> +PACKAGECONFIG_pn-glade3 = "gnome"
>> diff --git a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend b/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
>> deleted file mode 100644
>> index 3abacfb..0000000
>> --- a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
>> +++ /dev/null
>> @@ -1 +0,0 @@
>> -PACKAGECONFIG ??= "gnome"
>> --
>> 1.8.3.1
>>
> Yet another stupid question (yes I need gnome support for working with
> glade3): How is enable_gnome.conf supposed to be activated?
>
> For the record: This is yet another patch kicking things off for the
> sake of yocto-compat-layer script. Is meta-gnome supposed to be yocto
> compatible? Was this decided by 'community'?
See the cover letter:
[18/31] enable_gnome.conf: Move the AVAHI_GTK setting
- The yp-compat script does not allow a layer to modify the system wide
configuration (including modifying other recipe behavior). The AVHAI_GTK
changes the behavior of that recipe, which is detected by the script. So
I choose to move this to a configuration file that will need to be required
by the user IF they want avahi to use GTK. I'm not happy with this, but I
don't see any other way to meet the requirements.
[19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
- Similar to the above, but with PACKAGECONFIG this time.
I don't see an alternative here due to this requirement. As I said before you
guys maintain meta-openembedded, I don't. If this doesn't work (and I never
expected it to) then reject the patch and don't merge it.
I simply don't have an answer to any other way to implement this based on the
specific requirement of that checking script.
> But I am sure I missed another point...
>
> Andreas
>
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 22/31] vim: Remove xfce vim bbappend
2017-09-07 8:57 ` Andreas Müller
@ 2017-09-07 13:52 ` Mark Hatle
0 siblings, 0 replies; 55+ messages in thread
From: Mark Hatle @ 2017-09-07 13:52 UTC (permalink / raw)
To: Andreas Müller; +Cc: openembedded-devel
On 9/7/17 3:57 AM, Andreas Müller wrote:
> On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>> Changing the behavior of a recipe by including a layer is not allowed
>> by the yocto-compat-layer script.
> I have a question on this: What is the yocto target for this matter?
> Will there be times that a layer cannot change recipe's behavior
> anymore? Background: Personally I don't care much (yet) for
> yocto-compat-layer script - am busy enough to keep my images building
> and running with the functionality I am interested in. But if this
> will be forbidden by design in the future I have to expect further
> activities. Not to be misunderstood: I understand why this is part of
> requirements and only want to know what I need to put on my personal
> TODO.
My understanding of the YP requirement here is simple:
Inclusion of a layer should not change behavior of existing components from
other layers, without the user doing something to activate the change in
functionality.
Typically this would be done through a distribution configuration, i.e.
PACKAGECONFIG, DISTRO_FEATURES, MACHINE_FEATURES, etc.
So just setting a value, which ends up changing package behaviors as part of the
inclusion of a layer fails the test.
So in this specific case, if I include meta-xfce (even if I have no intention of
using xfce), the behavior of 'vim' will change without any way for me to control it.
Adding a PACKAGECONFIG, or some other 'switch' that only enables the change when
I've enabled it would resolve this. But in the case of VIM, I really have no
idea what the expected behavior is here. I do believe it should be improved in
'some way' rather then removal. Either by changing the system default (i.e.
directly in meta-openembedded/meta-oe/recipes-support/vim) or by adding a
PACKAGECONFIG that changes behavior, etc.
This is similar to the meta-gnome issue.. Why did I create a config file, to
address exactly the same issue. Is a random configuration file that nobody is
going to just 'find' a good idea? No.. it's horrible. but it was the only way
I could see to deal with this requirement.
--Mark
> Andreas
>
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
2017-09-07 13:45 ` Mark Hatle
@ 2017-09-07 14:51 ` Andreas Müller
2017-09-07 15:08 ` Philip Balister
0 siblings, 1 reply; 55+ messages in thread
From: Andreas Müller @ 2017-09-07 14:51 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-devel
On Thu, Sep 7, 2017 at 3:45 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
> On 9/7/17 4:29 AM, Andreas Müller wrote:
>> On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>>> This resolves a failure of the yocto-compat-layer.py script. Changing the
>>> PACKAGECONFIG setting by just including a layer can cause problems.
>>>
>>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>>> ---
>>> meta-gnome/conf/enable_gnome.conf | 2 ++
>>> meta-gnome/recipes-devtools/glade/glade3_%.bbappend | 1 -
>>> 2 files changed, 2 insertions(+), 1 deletion(-)
>>> delete mode 100644 meta-gnome/recipes-devtools/glade/glade3_%.bbappend
>>>
>>> diff --git a/meta-gnome/conf/enable_gnome.conf b/meta-gnome/conf/enable_gnome.conf
>>> index 883a6f5..7e711ee 100644
>>> --- a/meta-gnome/conf/enable_gnome.conf
>>> +++ b/meta-gnome/conf/enable_gnome.conf
>>> @@ -1 +1,3 @@
>>> AVAHI_GTK_pn-avahi-ui = "gtk gtk3"
>>> +
>>> +PACKAGECONFIG_pn-glade3 = "gnome"
>>> diff --git a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend b/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
>>> deleted file mode 100644
>>> index 3abacfb..0000000
>>> --- a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
>>> +++ /dev/null
>>> @@ -1 +0,0 @@
>>> -PACKAGECONFIG ??= "gnome"
>>> --
>>> 1.8.3.1
>>>
>> Yet another stupid question (yes I need gnome support for working with
>> glade3): How is enable_gnome.conf supposed to be activated?
>>
>> For the record: This is yet another patch kicking things off for the
>> sake of yocto-compat-layer script. Is meta-gnome supposed to be yocto
>> compatible? Was this decided by 'community'?
>
> See the cover letter:
>
> [18/31] enable_gnome.conf: Move the AVAHI_GTK setting
> - The yp-compat script does not allow a layer to modify the system wide
> configuration (including modifying other recipe behavior). The AVHAI_GTK
> changes the behavior of that recipe, which is detected by the script. So
> I choose to move this to a configuration file that will need to be required
> by the user IF they want avahi to use GTK. I'm not happy with this, but I
> don't see any other way to meet the requirements.
>
> [19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
> - Similar to the above, but with PACKAGECONFIG this time.
>
> I don't see an alternative here due to this requirement. As I said before you
> guys maintain meta-openembedded, I don't. If this doesn't work (and I never
> expected it to) then reject the patch and don't merge it.
Your approach scares me - really: Somebody creates a magic script says
'this is it', calls it community driven and you send out patches which
break things and you don't care - or even worse you expect them to
break things. You guys are aware of what we are doing here: Major
target is building working images - right?
This is not the community I want to waste further time on
Andreas
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PATCH 19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
2017-09-07 14:51 ` Andreas Müller
@ 2017-09-07 15:08 ` Philip Balister
0 siblings, 0 replies; 55+ messages in thread
From: Philip Balister @ 2017-09-07 15:08 UTC (permalink / raw)
To: Andreas Müller, Mark Hatle; +Cc: openembedded-devel
On 09/07/2017 10:51 AM, Andreas Müller wrote:
> On Thu, Sep 7, 2017 at 3:45 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>> On 9/7/17 4:29 AM, Andreas Müller wrote:
>>> On Wed, Sep 6, 2017 at 9:23 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>>>> This resolves a failure of the yocto-compat-layer.py script. Changing the
>>>> PACKAGECONFIG setting by just including a layer can cause problems.
>>>>
>>>> Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
>>>> ---
>>>> meta-gnome/conf/enable_gnome.conf | 2 ++
>>>> meta-gnome/recipes-devtools/glade/glade3_%.bbappend | 1 -
>>>> 2 files changed, 2 insertions(+), 1 deletion(-)
>>>> delete mode 100644 meta-gnome/recipes-devtools/glade/glade3_%.bbappend
>>>>
>>>> diff --git a/meta-gnome/conf/enable_gnome.conf b/meta-gnome/conf/enable_gnome.conf
>>>> index 883a6f5..7e711ee 100644
>>>> --- a/meta-gnome/conf/enable_gnome.conf
>>>> +++ b/meta-gnome/conf/enable_gnome.conf
>>>> @@ -1 +1,3 @@
>>>> AVAHI_GTK_pn-avahi-ui = "gtk gtk3"
>>>> +
>>>> +PACKAGECONFIG_pn-glade3 = "gnome"
>>>> diff --git a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend b/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
>>>> deleted file mode 100644
>>>> index 3abacfb..0000000
>>>> --- a/meta-gnome/recipes-devtools/glade/glade3_%.bbappend
>>>> +++ /dev/null
>>>> @@ -1 +0,0 @@
>>>> -PACKAGECONFIG ??= "gnome"
>>>> --
>>>> 1.8.3.1
>>>>
>>> Yet another stupid question (yes I need gnome support for working with
>>> glade3): How is enable_gnome.conf supposed to be activated?
>>>
>>> For the record: This is yet another patch kicking things off for the
>>> sake of yocto-compat-layer script. Is meta-gnome supposed to be yocto
>>> compatible? Was this decided by 'community'?
>>
>> See the cover letter:
>>
>> [18/31] enable_gnome.conf: Move the AVAHI_GTK setting
>> - The yp-compat script does not allow a layer to modify the system wide
>> configuration (including modifying other recipe behavior). The AVHAI_GTK
>> changes the behavior of that recipe, which is detected by the script. So
>> I choose to move this to a configuration file that will need to be required
>> by the user IF they want avahi to use GTK. I'm not happy with this, but I
>> don't see any other way to meet the requirements.
>>
>> [19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf
>> - Similar to the above, but with PACKAGECONFIG this time.
>>
>> I don't see an alternative here due to this requirement. As I said before you
>> guys maintain meta-openembedded, I don't. If this doesn't work (and I never
>> expected it to) then reject the patch and don't merge it.
> Your approach scares me - really: Somebody creates a magic script says
> 'this is it', calls it community driven and you send out patches which
> break things and you don't care - or even worse you expect them to
> break things. You guys are aware of what we are doing here: Major
> target is building working images - right?
>
> This is not the community I want to waste further time on
It is pretty clear Mark does care about the impact of the compat testing
on people and layers.
I think it is a good thing to automate testing for recipes that have
possibly bad behaviour and communicating this behaviour to layer
maintainers.
The topic of what sorts of things layers should and should not do has
been discussed many times at developer meetings. We are trying to make
sure all layers behave in predictable ways, this script is part of that
ongoing work.
You have the option of rejecting this patch, but at least make sure the
layer README notes what can happen when you add this layer to your stack.
Philip
>
> Andreas
>
^ permalink raw reply [flat|nested] 55+ messages in thread
end of thread, other threads:[~2017-09-07 15:08 UTC | newest]
Thread overview: 55+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
2017-09-06 19:22 ` [PATCH 01/31] iproute2: Move tipc enablement to oe-core Mark Hatle
2017-09-06 19:23 ` [PATCH 02/31] libml: Move " Mark Hatle
2017-09-06 19:23 ` [PATCH 03/31] openipmi: Move to meta-networking requires net-snmp Mark Hatle
2017-09-06 19:23 ` [PATCH 04/31] glmark2: Set required distro features to opengl Mark Hatle
2017-09-06 19:23 ` [PATCH 05/31] openlmi-tools: Only build if the necessary python pieces are available Mark Hatle
2017-09-06 19:23 ` [PATCH 06/31] xorg-drivers: Add opengl distro flag requirement to ati and nouveau Mark Hatle
2017-09-06 19:23 ` [PATCH 07/31] boinc-client: Add distro flag, requires opengl Mark Hatle
2017-09-06 19:23 ` [PATCH 08/31] networkmanager-openvpn: requires openvpn from meta-networking Mark Hatle
2017-09-06 19:23 ` [PATCH 09/31] telepathy-python: Move to meta-python, requires python-dbus Mark Hatle
2017-09-06 19:23 ` [PATCH 10/31] networkmanager: Move to meta-networking, requires dnsmasq Mark Hatle
2017-09-06 19:23 ` [PATCH 11/31] python-ldap: Move to meta-networking, requires cyrus-sasl Mark Hatle
2017-09-06 19:23 ` [PATCH 12/31] python-networkmanager: Move to networking, requires networkmanager Mark Hatle
2017-09-06 19:23 ` [PATCH 13/31] corosync: Requires net-snmp from meta-networking Mark Hatle
2017-09-06 20:12 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 14/31] pywbem: Requires python-m2crypto-native (and others) from meta-python Mark Hatle
2017-09-06 19:23 ` [PATCH 15/31] dlm: requires corosync, from meta-networking Mark Hatle
2017-09-06 19:23 ` [PATCH 16/31] open-vm-tools: only build if meta-networking and meta-filesystems is available Mark Hatle
2017-09-06 19:23 ` [PATCH 17/31] miniupnpd: Move to meta-networking, requires libnetfilter-conntrack Mark Hatle
2017-09-06 19:23 ` [PATCH 18/31] enable_gnome.conf: Move the AVAHI_GTK setting Mark Hatle
2017-09-06 19:23 ` [PATCH 19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf Mark Hatle
2017-09-07 9:29 ` Andreas Müller
2017-09-07 13:45 ` Mark Hatle
2017-09-07 14:51 ` Andreas Müller
2017-09-07 15:08 ` Philip Balister
2017-09-06 19:23 ` [PATCH 20/31] libart-lgpg: Obsolete, replaced by version in oe-core Mark Hatle
2017-09-06 19:23 ` [PATCH 21/31] pinpoint: Add dependency on opengl for cogl Mark Hatle
2017-09-06 19:23 ` [PATCH 22/31] vim: Remove xfce vim bbappend Mark Hatle
2017-09-07 8:57 ` Andreas Müller
2017-09-07 13:52 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 23/31] layer.conf: Add meta-networking for the networkmanager Mark Hatle
2017-09-06 19:23 ` [PATCH 24/31] meta-xfce: depend on meta-multimedia Mark Hatle
2017-09-06 19:23 ` [PATCH 25/31] mpv: Requires ffmpeg which has a LICENSE_FLAGS = commercial set Mark Hatle
2017-09-06 19:23 ` [PATCH 26/31] recipes-multimedia: Add LICENSE_FLAGS Mark Hatle
2017-09-06 19:23 ` [PATCH 27/31] " Mark Hatle
2017-09-06 19:23 ` [PATCH 28/31] libmtp: remove 'mtp-tools' from PACKAGES Mark Hatle
2017-09-06 19:23 ` [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete Mark Hatle
2017-09-06 19:58 ` Andreas Müller
2017-09-06 20:02 ` Mark Hatle
2017-09-06 20:13 ` Andreas Müller
2017-09-06 20:21 ` Mark Hatle
2017-09-06 20:35 ` Andreas Müller
2017-09-06 20:44 ` Mark Hatle
2017-09-06 20:53 ` Andreas Müller
2017-09-06 21:00 ` Mark Hatle
2017-09-06 23:40 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 30/31] florence: update 0.6.3 Mark Hatle
2017-09-06 19:59 ` Andreas Müller
2017-09-06 20:15 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 31/31] gstreamer-0.10: Remove as all users are gone and it is obsolete Mark Hatle
2017-09-06 20:01 ` Andreas Müller
2017-09-06 23:41 ` [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
2017-09-06 23:49 ` Khem Raj
2017-09-06 23:59 ` Mark Hatle
2017-09-07 0:12 ` Khem Raj
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.