Add gudev to OE-Core + bug fixes
cover Add gudev to OE-Core + bug fixes
gudev was split from systemd into its own project. There's a recipe in meta-oe already and most of the changes required to support both providers of gudev (gudev and udev) have been made. This patchset only moves gudev to oe-core and fixes some small dependency issues.
There's also a couple of other unrelated fixes.
The following changes since commit 03f15e51998a3ef65a5b68cb7cbf724f4388c289:
sstate: Ensure siginfo and sig files are also touched (2015-11-25 08:09:00 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/gudev-and-bug-fixes
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/gudev-and-bug-fixes
Jussi Kukkonen (5):
connman-gnome: rrecommend connman, don't rdepend gstreamer1.0-plugins-good: Fix gudev dependency gstreamer1.0-plugins-bad: Fix gudev dependency
gudev: Add from meta-oe
gcr: Require x11 DISTRO_FEATURE
meta/recipes-connectivity/connman/connman-gnome_0.7.bb | 2 +- meta/recipes-gnome/gcr/gcr_3.16.0.bb | 4 ++-- meta/recipes-gnome/libgudev/libgudev_230.bb | 15 +++++++++++++++ .../gstreamer/gstreamer1.0-plugins-bad.inc | 2 +- .../gstreamer/gstreamer1.0-plugins-good.inc | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-gnome/libgudev/libgudev_230.bb
Signature · 1 line
2.1.4
PATCH 1/5 connman-gnome: rrecommend connman, don't rdepend
connman-gnome doesn't have a binary dependency on connman, and using RRECOMMEND is better for multilib builds (connman-gnome works fine with connman from a different architecture).
Fixes [YOCTO #8586]
--- meta/recipes-connectivity/connman/connman-gnome_0.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/connman/connman-gnome_0.7.bb +1 -1
@@ -22,7 +22,7 @@ S = "${WORKDIR}/git" inherit autotools-brokensep gtk-icon-cache pkgconfig distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" -RDEPENDS_${PN} = "connman" +RRECOMMENDS_${PN} = "connman" do_install_append() { install -m 0644 ${WORKDIR}/images/* ${D}/usr/share/icons/hicolor/22x22/apps/
Signature · 1 line
2.1.4
PATCH 2/5 gstreamer1.0-plugins-good: Fix gudev dependency
libgudev is now it's own library (also provided by udev).
--- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +1 -1
@@ -20,7 +20,7 @@ PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" -PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,udev" +PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" PACKAGECONFIG[libpng] = "--enable-libpng,--disable-libpng,libpng"
Signature · 1 line
2.1.4
Re: [PATCH 2/5] gstreamer1.0-plugins-good: Fix gudev dependency
Quoted 1 line · Jussi Kukkonen
libgudev is now it's own library (also provided by udev).
Duplicates http://patchwork.openembedded.org/patch/107479/
Quoted 27 lines
Signed-off-by Jussi Kukkonen <[email protected]>--- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +1
-1@@ -20,7 +20,7 @@ PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" -PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,udev" +PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" PACKAGECONFIG[libpng] = "--enable-libpng,--disable-libpng,libpng"Signature · 7 lines
2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [PATCH 2/5] gstreamer1.0-plugins-good: Fix gudev dependency
Quoted 5 lines · Martin Jansa
Quoted 1 line · Jussi Kukkonen
libgudev is now it's own library (also provided by udev).
This is true, sorry. Assuming the gudev commit goes in, the best gstreamer-plugins patches seem to be your v2-patches (instead of v3 that removed gudev from default packageconfigs): v2 seems to be what is still in your branch so that should work fine.
I'll remove these two gstreamer1.0-plugins.* commits from my branch.
Jussi
Quoted 7 lines
Signed-off-by Jussi Kukkonen <[email protected]>--- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git
a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc PACKAGECONFIG[pulseaudio] =
Quoted 4 lines
index 1119e10..c2ada4d 100644
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +0
-0@@ -20,7 +20,7 @@ PACKAGECONFIG[pulseaudio] =
"--enable-pulse,--disable-pulse,pulseaudio"
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
Quoted 3 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +0
-0PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" PACKAGECONFIG[gdk-pixbuf] =
"--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
Quoted 8 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +1
-2-PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,udev" +PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" PACKAGECONFIG[libpng] = "--enable-libpng,--disable-libpng,libpng" --2.1.4
Quoted 5 lines
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: [email protected]
PATCH 3/5 gstreamer1.0-plugins-bad: Fix gudev dependency
In reply to Jussi Kukkonenlibgudev is now it's own library (also provided by udev).
--- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +1 -1
@@ -40,7 +40,7 @@ PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa" PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" PACKAGECONFIG[wayland] = "--enable-wayland --enable-egl,--disable-wayland --disable-egl,wayland virtual/egl" -PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 udev" +PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev" PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon" PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft"
Signature · 1 line
2.1.4
Re: [PATCH 3/5] gstreamer1.0-plugins-bad: Fix gudev dependency
Quoted 1 line · Jussi Kukkonen
libgudev is now it's own library (also provided by udev).
Duplicates: http://patchwork.openembedded.org/patch/107475/
Quoted 27 lines
Signed-off-by Jussi Kukkonen <[email protected]>--- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +1
-1@@ -40,7 +40,7 @@ PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa" PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" PACKAGECONFIG[wayland] = "--enable-wayland --enable-egl,--disable-wayland --disable-egl,wayland virtual/egl" -PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 udev" +PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev" PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon" PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft"Signature · 7 lines
2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
PATCH 4/5 gudev: Add from meta-oe
In reply to Jussi Kukkonenlibgudev was split from systemd and is used by recipes in oe-core. udev already provides libgudev as well.
The recipe is from meta-oe (Andreas Müller).
Fixes [YOCTO #8686]
--- meta/recipes-gnome/libgudev/libgudev_230.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 meta/recipes-gnome/libgudev/libgudev_230.bb
meta/recipes-gnome/libgudev/libgudev_230.bb new file +15 -0
@@ -0,0 +1,15 @@ +SUMMARY = "GObject wrapper for libudev" + +SRC_URI[archive.md5sum] = "e4dee8f3f349e9372213d33887819a4d" +SRC_URI[archive.sha256sum] = "a2e77faced0c66d7498403adefcc0707105e03db71a2b2abd620025b86347c18" + +DEPENDS = "glib-2.0 udev" + +RCONFLICTS_${PN} = "systemd (<= 220)" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +inherit gnomebase distro_features_check + +REQUIRED_DISTRO_FEATURES = "systemd"
Signature · 1 line
2.1.4
PATCH 5/5 gcr: Require x11 DISTRO_FEATURE
In reply to Jussi KukkonenThis enables a world build without x11. GTK3DISTROFEATURES is not enough because gtk+-x11.pc is still required.
Fixes [YOCTO #8611].
--- meta/recipes-gnome/gcr/gcr_3.16.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-gnome/gcr/gcr_3.16.0.bb +2 -2
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt vala" inherit autotools gnomebase gtk-icon-cache gtk-doc distro_features_check -# depends on gtk+3 -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +# depends on gtk+3, but also x11 through gtk+-x11 +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.md5sum] = "d5835680be0b6a838e02a528d5378d9c" SRC_URI[archive.sha256sum] = "ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075"
Signature · 1 line
2.1.4
Re: [PATCH 1/5] connman-gnome: rrecommend connman, don't rdepend
In reply to Jussi KukkonenQuoted 4 lines · Jussi Kukkonen
connman-gnome doesn't have a binary dependency on connman, and using RRECOMMEND is better for multilib builds (connman-gnome works fine with connman from a different architecture).
It's possible I've missed a thread during holidays but I believe this patch never made it into master.
Jussi
Quoted 26 lines
Fixes [YOCTO #8586]
Signed-off-by Jussi Kukkonen <[email protected]>--- meta/recipes-connectivity/connman/connman-gnome_0.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-connectivity/connman/connman-gnome_0.7.bb +1
-1@@ -22,7 +22,7 @@ S = "${WORKDIR}/git" inherit autotools-brokensep gtk-icon-cache pkgconfig distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" -RDEPENDS_${PN} = "connman" +RRECOMMENDS_${PN} = "connman" do_install_append() { install -m 0644 ${WORKDIR}/images/*${D}/usr/share/icons/hicolor/22x22/apps/
--
2.1.4
Re: [PATCH 1/5] connman-gnome: rrecommend connman, don't rdepend
In reply to Jussi KukkonenPing? Please let me know if this was not actually a good idea.
- Jussi
Quoted 30 lines · Jussi Kukkonen
connman-gnome doesn't have a binary dependency on connman, and using RRECOMMEND is better for multilib builds (connman-gnome works fine with connman from a different architecture).
Fixes [YOCTO #8586]
Signed-off-by Jussi Kukkonen <[email protected]>--- meta/recipes-connectivity/connman/connman-gnome_0.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-connectivity/connman/connman-gnome_0.7.bb +1
-1@@ -22,7 +22,7 @@ S = "${WORKDIR}/git" inherit autotools-brokensep gtk-icon-cache pkgconfig distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" -RDEPENDS_${PN} = "connman" +RRECOMMENDS_${PN} = "connman" do_install_append() { install -m 0644 ${WORKDIR}/images/*${D}/usr/share/icons/hicolor/22x22/apps/
--
2.1.4
Re: [PATCH 1/5] connman-gnome: rrecommend connman, don't rdepend
Quoted 2 lines · Jussi Kukkonen
Ping? Please let me know if this was not actually a good idea.
Entirely my fault for the patch falling off page 1 of my mailbox. Staged locally, thanks.
Ross