* [meta-oe][PATCH 1/3] smbnetfs: delete blacklisted @ 2017-09-12 8:36 Martin Jansa 2017-09-12 8:36 ` [meta-oe][PATCH 2/3] system-setup-keyboard: " Martin Jansa 2017-09-12 8:36 ` [meta-oe][PATCH 3/3] gnome-keyring: " Martin Jansa 0 siblings, 2 replies; 5+ messages in thread From: Martin Jansa @ 2017-09-12 8:36 UTC (permalink / raw) To: openembedded-devel * there was some work on it recently, but it still doesn't work and no reply in 2 weeks: http://lists.openembedded.org/pipermail/openembedded-devel/2017-August/114480.html Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- ...CK_MODULES-to-found-headers-and-libraries.patch | 42 ---------------------- .../smbnetfs/smbnetfs/configure.patch | 11 ------ .../recipes-filesystems/smbnetfs/smbnetfs_git.bb | 28 --------------- 3 files changed, 81 deletions(-) delete mode 100644 meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch delete mode 100644 meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch delete mode 100644 meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch deleted file mode 100644 index f05f09f61..000000000 --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7a524d49b3d4459280f18942df2980603400ec52 Mon Sep 17 00:00:00 2001 -From: Bian Naimeng <biannm@cn.fujitsu.com> -Date: Fri, 19 Jun 2015 11:54:44 +0900 -Subject: [PATCH] Using PKG_CHECK_MODULES to found headers and libraries of - smbclient - -Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> ---- - configure.in | 5 +++++ - src/Makefile.am | 3 +++ - 2 files changed, 8 insertions(+) - -diff --git a/configure.in b/configure.in -index ce21aef..ecd7119 100644 ---- a/configure.in -+++ b/configure.in -@@ -125,6 +125,11 @@ AC_CHECK_LIB(smbclient, smbc_setOptionUserData, - )] - ) - -+dnl ***************************************************************** -+dnl *** Check libsmbclient by pkgconfig to get cflags and ldflags *** -+dnl ***************************************************************** -+PKG_CHECK_MODULES(SMBCLIENT, smbclient) -+ - dnl ****************** - dnl *** Final step *** - dnl ****************** -diff --git a/src/Makefile.am b/src/Makefile.am -index 41519d8..9fc97e9 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -16,3 +16,6 @@ smbnetfs_SOURCES = \ - event.c event.h \ - reconfigure.c reconfigure.h \ - main.c -+ -+smbnetfs_CFLAGS=${SMBCLIENT_CFLAGS} -+smbnetfs_LDFLAGS=${SMBCLIENT_LDFLAGS} --- -1.8.4.2 - diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch deleted file mode 100644 index c80fed187..000000000 --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: git/configure.in -=================================================================== ---- git.orig/configure.in 2014-06-18 16:06:16.040721349 +0000 -+++ git/configure.in 2014-07-18 07:49:17.085552256 +0000 -@@ -1,5 +1,5 @@ - AC_INIT([SMBNetFS],[0.5.3а]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADERS([src/config.h]) - AC_PROG_CC - diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb deleted file mode 100644 index 6995ad3f5..000000000 --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "FUSE module for mounting an entire SMB/NMB network in a single directory" -DESCRIPTION = "SMBNetFS is a Linux/FreeBSD filesystem that allow you to use \ - samba/microsoft network in the same manner as the network \ - neighborhood in Microsoft Windows. Please donate me to help \ - in SMBNetFS development." - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" -HOMEPAGE ="http://sourceforge.net/projects/smbnetfs" - -DEPENDS = "fuse samba" - -inherit autotools gitpkgv pkgconfig - -PKGV = "${GITPKGVTAG}" - -SRCREV = "ace1c519d45fe488b9b7e6cc77a2bcadb6c83464" - -SRC_URI = "git://smbnetfs.git.sourceforge.net/gitroot/smbnetfs/smbnetfs;branch=master \ - file://configure.patch \ - file://Using-PKG_CHECK_MODULES-to-found-headers-and-libraries.patch" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gnome-keyring] = "--with-gnome-keyring=yes,--with-gnome-keyring=no,libgnome-keyring" - -S = "${WORKDIR}/git" - -PNBLACKLIST[smbnetfs] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/132827/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" -- 2.14.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-oe][PATCH 2/3] system-setup-keyboard: delete blacklisted 2017-09-12 8:36 [meta-oe][PATCH 1/3] smbnetfs: delete blacklisted Martin Jansa @ 2017-09-12 8:36 ` Martin Jansa 2017-09-12 8:36 ` [meta-oe][PATCH 3/3] gnome-keyring: " Martin Jansa 1 sibling, 0 replies; 5+ messages in thread From: Martin Jansa @ 2017-09-12 8:36 UTC (permalink / raw) To: openembedded-devel * there was some work on it recently, but still contains QA issues and no reply in 2 weeks: http://lists.openembedded.org/pipermail/openembedded-devel/2017-August/114478.html Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../system-setup-keyboard_0.8.8.bb | 33 ---------------------- 1 file changed, 33 deletions(-) delete mode 100644 meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb diff --git a/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb b/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb deleted file mode 100644 index 0bd7af734..000000000 --- a/meta-oe/recipes-support/system-setup-keyboard/system-setup-keyboard_0.8.8.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "xorg.conf keyboard layout callout" -DESCRIPTION = "system-setup-keyboard is a daemon to monitor the keyboard layout configured in \ -/etc/sysconfig/keyboard and transfer this into the matching xorg.conf.d snippet." - -HOMEPAGE = "https://git.fedorahosted.org/git/system-setup-keyboard.git" -SECTION = "Applications/System" - -SRC_URI = "https://git.fedorahosted.org/cgit/${PN}.git/snapshot/${BP}.tar.gz" -SRC_URI[md5sum] = "399003968ccc739cddd9cc370af377a0" -SRC_URI[sha256sum] = "1ef6ef79c3588e85d7f42e99eb80a2e459f966284cf029c2d6fc1b645abcb860" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=bf57969a59612c5aca007b340c49d3a2" - -inherit pythonnative - -DEPENDS = "glib-2.0 system-config-keyboard-native" - -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -do_compile_prepend() { - ${PYTHON} -v get_layouts.py > keyboards.h -} - -do_install() { - oe_runmake install DESTDIR=${D} - install -d ${D}/etc/X11/xorg.conf.d - touch ${D}/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf -} - -FILES_${PN} += "${systemd_unitdir}/system/${BPN}.service" - -PNBLACKLIST[system-setup-keyboard] ?= "Depends on blacklisted system-config-keyboard-native - the recipe will be removed on 2017-09-01 unless the issue is fixed" -- 2.14.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-oe][PATCH 3/3] gnome-keyring: delete blacklisted 2017-09-12 8:36 [meta-oe][PATCH 1/3] smbnetfs: delete blacklisted Martin Jansa 2017-09-12 8:36 ` [meta-oe][PATCH 2/3] system-setup-keyboard: " Martin Jansa @ 2017-09-12 8:36 ` Martin Jansa 2017-09-13 21:48 ` Rob Woolley 1 sibling, 1 reply; 5+ messages in thread From: Martin Jansa @ 2017-09-12 8:36 UTC (permalink / raw) To: openembedded-devel * there was some work on it recently, but still contains QA issues and no reply in 2 weeks: http://lists.openembedded.org/pipermail/openembedded-devel/2017-August/114415.html Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../gnome-keyring/gnome-keyring/egg-asn1x.patch | 55 ---------------------- .../gnome-keyring/gnome-keyring_2.32.1.bb | 45 ------------------ 2 files changed, 100 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch deleted file mode 100644 index ad8a40ccf..000000000 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch +++ /dev/null @@ -1,55 +0,0 @@ -Fixed build error with gcc 4.8 - -Errors like below - -egg-asn1x.c: In function 'anode_encode_build': -egg-asn1x.c:1280:7: warning: variable 'type' set but not used [-Wunused-but-set-variable] -egg-asn1x.c: In function 'traverse_and_prepare': -egg-asn1x.c:3354:3: warning: passing argument 1 of 'egg_asn1x_create' from incompatible pointer type [enabled by default] -In file included from egg-asn1x.c:50:0: -egg-asn1x.h:38:8: note: expected 'const struct static_struct_asn *' but argument is of type 'const struct asn1_static_node *' -egg-asn1x.c: At top level: -egg-asn1x.c:3509:1: error: conflicting types for 'egg_asn1x_create' -In file included from egg-asn1x.c:50:0: -egg-asn1x.h:38:8: note: previous declaration of 'egg_asn1x_create' was here -egg-asn1x.c:3572:1: error: conflicting types for 'egg_asn1x_create_quark' -In file included from egg-asn1x.c:50:0: -egg-asn1x.h:41:8: note: previous declaration of 'egg_asn1x_create_quark' was here -egg-asn1x.c:3579:1: error: conflicting types for 'egg_asn1x_create_and_decode' -In file included from egg-asn1x.c:50:0: -egg-asn1x.h:44:8: note: previous declaration of 'egg_asn1x_create_and_decode' was here -make[4]: *** [libegg_la-egg-asn1x.lo] Error 1 - - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending -Index: gnome-keyring-2.32.1/egg/egg-asn1x.h -=================================================================== ---- gnome-keyring-2.32.1.orig/egg/egg-asn1x.h 2010-10-18 19:11:38.000000000 -0700 -+++ gnome-keyring-2.32.1/egg/egg-asn1x.h 2013-06-11 15:15:00.675399263 -0700 -@@ -25,6 +25,7 @@ - #define EGG_ASN1X_H_ - - #include <glib.h> -+#include <libtasn1.h> - - #ifndef HAVE_EGG_ALLOCATOR - typedef void* (*EggAllocator) (void* p, gsize); -@@ -35,13 +36,13 @@ - - struct static_struct_asn; - --GNode* egg_asn1x_create (const struct static_struct_asn *defs, -+GNode* egg_asn1x_create (const ASN1_ARRAY_TYPE *defs, - const gchar *type); - --GNode* egg_asn1x_create_quark (const struct static_struct_asn *defs, -+GNode* egg_asn1x_create_quark (const ASN1_ARRAY_TYPE *defs, - GQuark type); - --GNode* egg_asn1x_create_and_decode (const struct static_struct_asn *defs, -+GNode* egg_asn1x_create_and_decode (const ASN1_ARRAY_TYPE *defs, - const gchar *type, - gconstpointer data, - gsize n_data); diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb deleted file mode 100644 index 4ac75cbef..000000000 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Password and keyring managing daemon" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://gcr/gcr.h;endline=22;md5=a272df1e633e27ecf35e74fb5576250e \ - file://egg/egg-dbus.h;endline=25;md5=eb6f531af37165dc53420c073d774e61 \ - file://gp11/gp11.h;endline=24;md5=bd8c7a8a21d6c28d40536d96a35e3469 \ - file://pkcs11/pkcs11i.h;endline=24;md5=e72cfbb718389b76a4dae838d1c1f439" - -SECTION = "x11/gnome" - -PR = "r12" - -inherit autotools gnome gtk-doc pkgconfig gsettings - -SRC_URI += "file://egg-asn1x.patch" - -DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} intltool-native" -RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" - -EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}" - -SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc" -SRC_URI[archive.sha256sum] = "31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9" -GNOME_COMPRESS_TYPE="bz2" - -FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr \ - ${base_libdir}/security/*${SOLIBSDEV} \ - " - -FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \ - ${libdir}/${BPN}/devel/*${SOLIBSDEV} \ - ${libdir}/${BPN}/standalone/*.la \ - ${base_libdir}/security/*.la \ - " - -INSANE_SKIP_${PN}-dev += "dev-elf" - -FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \ - ${libdir}/${BPN}/devel/.debug/ \ - ${base_libdir}/security/.debug/" - -PNBLACKLIST[gnome-keyring] ?= "This version conflicts with gcr from oe-core - the recipe will be removed on 2017-09-01 unless the issue is fixed" -- 2.14.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH 3/3] gnome-keyring: delete blacklisted 2017-09-12 8:36 ` [meta-oe][PATCH 3/3] gnome-keyring: " Martin Jansa @ 2017-09-13 21:48 ` Rob Woolley 2017-09-13 21:59 ` Martin Jansa 0 siblings, 1 reply; 5+ messages in thread From: Rob Woolley @ 2017-09-13 21:48 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-devel Hi Martin, I just started looking into this today. Adding libgmodule to the gnome-keyring recipe should resolve the problem you're seeing: LDFLAGS += "-lgmodule-2.0" How would you like me to send a patch should I merge it with Jason's previous patch or make a new patch in the series? Regards, Rob On Tue, Sep 12, 2017 at 4:36 AM, Martin Jansa <martin.jansa@gmail.com> wrote: > * there was some work on it recently, but still contains QA issues and no > reply in 2 weeks: > http://lists.openembedded.org/pipermail/openembedded-devel/2 > 017-August/114415.html > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > .../gnome-keyring/gnome-keyring/egg-asn1x.patch | 55 > ---------------------- > .../gnome-keyring/gnome-keyring_2.32.1.bb | 45 > ------------------ > 2 files changed, 100 deletions(-) > delete mode 100644 meta-gnome/recipes-gnome/gnome > -keyring/gnome-keyring/egg-asn1x.patch > delete mode 100644 meta-gnome/recipes-gnome/gnome-keyring/ > gnome-keyring_2.32.1.bb > > diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch > b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch > deleted file mode 100644 > index ad8a40ccf..000000000 > --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch > +++ /dev/null > @@ -1,55 +0,0 @@ > -Fixed build error with gcc 4.8 > - > -Errors like below > - > -egg-asn1x.c: In function 'anode_encode_build': > -egg-asn1x.c:1280:7: warning: variable 'type' set but not used > [-Wunused-but-set-variable] > -egg-asn1x.c: In function 'traverse_and_prepare': > -egg-asn1x.c:3354:3: warning: passing argument 1 of 'egg_asn1x_create' > from incompatible pointer type [enabled by default] > -In file included from egg-asn1x.c:50:0: > -egg-asn1x.h:38:8: note: expected 'const struct static_struct_asn *' but > argument is of type 'const struct asn1_static_node *' > -egg-asn1x.c: At top level: > -egg-asn1x.c:3509:1: error: conflicting types for 'egg_asn1x_create' > -In file included from egg-asn1x.c:50:0: > -egg-asn1x.h:38:8: note: previous declaration of 'egg_asn1x_create' was > here > -egg-asn1x.c:3572:1: error: conflicting types for 'egg_asn1x_create_quark' > -In file included from egg-asn1x.c:50:0: > -egg-asn1x.h:41:8: note: previous declaration of 'egg_asn1x_create_quark' > was here > -egg-asn1x.c:3579:1: error: conflicting types for > 'egg_asn1x_create_and_decode' > -In file included from egg-asn1x.c:50:0: > -egg-asn1x.h:44:8: note: previous declaration of > 'egg_asn1x_create_and_decode' was here > -make[4]: *** [libegg_la-egg-asn1x.lo] Error 1 > - > - > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > - > -Upstream-Status: Pending > -Index: gnome-keyring-2.32.1/egg/egg-asn1x.h > -=================================================================== > ---- gnome-keyring-2.32.1.orig/egg/egg-asn1x.h 2010-10-18 > 19:11:38.000000000 -0700 > -+++ gnome-keyring-2.32.1/egg/egg-asn1x.h 2013-06-11 > 15:15:00.675399263 -0700 > -@@ -25,6 +25,7 @@ > - #define EGG_ASN1X_H_ > - > - #include <glib.h> > -+#include <libtasn1.h> > - > - #ifndef HAVE_EGG_ALLOCATOR > - typedef void* (*EggAllocator) (void* p, gsize); > -@@ -35,13 +36,13 @@ > - > - struct static_struct_asn; > - > --GNode* egg_asn1x_create (const struct > static_struct_asn *defs, > -+GNode* egg_asn1x_create (const > ASN1_ARRAY_TYPE *defs, > - const gchar *type); > - > --GNode* egg_asn1x_create_quark (const struct > static_struct_asn *defs, > -+GNode* egg_asn1x_create_quark (const > ASN1_ARRAY_TYPE *defs, > - GQuark type); > - > --GNode* egg_asn1x_create_and_decode (const struct > static_struct_asn *defs, > -+GNode* egg_asn1x_create_and_decode (const > ASN1_ARRAY_TYPE *defs, > - const gchar *type, > - gconstpointer data, > - gsize n_data); > diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32. > 1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb > deleted file mode 100644 > index 4ac75cbef..000000000 > --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb > +++ /dev/null > @@ -1,45 +0,0 @@ > -SUMMARY = "Password and keyring managing daemon" > -HOMEPAGE = "http://www.gnome.org/" > -BUGTRACKER = "https://bugzilla.gnome.org/" > - > -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" > -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ > - file://gcr/gcr.h;endline=22;md > 5=a272df1e633e27ecf35e74fb5576250e \ > - file://egg/egg-dbus.h;endline= > 25;md5=eb6f531af37165dc53420c073d774e61 \ > - file://gp11/gp11.h;endline=24; > md5=bd8c7a8a21d6c28d40536d96a35e3469 \ > - file://pkcs11/pkcs11i.h;endlin > e=24;md5=e72cfbb718389b76a4dae838d1c1f439" > - > -SECTION = "x11/gnome" > - > -PR = "r12" > - > -inherit autotools gnome gtk-doc pkgconfig gsettings > - > -SRC_URI += "file://egg-asn1x.patch" > - > -DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf > ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} > intltool-native" > -RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" > - > -EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', > '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', > d)}" > - > -SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc" > -SRC_URI[archive.sha256sum] = "31fecec1430a97f59a6159a5a2ea8 > d6a1b44287f1e9e595b3594df46bf7f18f9" > -GNOME_COMPRESS_TYPE="bz2" > - > -FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr \ > - ${base_libdir}/security/*${SOLIBSDEV} \ > - " > - > -FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \ > - ${libdir}/${BPN}/devel/*${SOLIBSDEV} \ > - ${libdir}/${BPN}/standalone/*.la \ > - ${base_libdir}/security/*.la \ > - " > - > -INSANE_SKIP_${PN}-dev += "dev-elf" > - > -FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \ > - ${libdir}/${BPN}/devel/.debug/ \ > - ${base_libdir}/security/.debug/" > - > -PNBLACKLIST[gnome-keyring] ?= "This version conflicts with gcr from > oe-core - the recipe will be removed on 2017-09-01 unless the issue is > fixed" > -- > 2.14.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH 3/3] gnome-keyring: delete blacklisted 2017-09-13 21:48 ` Rob Woolley @ 2017-09-13 21:59 ` Martin Jansa 0 siblings, 0 replies; 5+ messages in thread From: Martin Jansa @ 2017-09-13 21:59 UTC (permalink / raw) To: Rob Woolley; +Cc: openembedded-devel Thanks Rob, please send v2 of this one: http://lists.openembedded.org/pipermail/openembedded-devel/2017-August/114340.html and I'll apply it instead of this removal. On Wed, Sep 13, 2017 at 11:48 PM, Rob Woolley <rob.woolley@windriver.com> wrote: > Hi Martin, > > I just started looking into this today. > > Adding libgmodule to the gnome-keyring recipe should resolve the problem > you're seeing: LDFLAGS += "-lgmodule-2.0" > > How would you like me to send a patch should I merge it with Jason's > previous patch or make a new patch in the series? > > Regards, > Rob > > On Tue, Sep 12, 2017 at 4:36 AM, Martin Jansa <martin.jansa@gmail.com> > wrote: > >> * there was some work on it recently, but still contains QA issues and no >> reply in 2 weeks: >> http://lists.openembedded.org/pipermail/openembedded-devel/2 >> 017-August/114415.html >> >> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >> --- >> .../gnome-keyring/gnome-keyring/egg-asn1x.patch | 55 >> ---------------------- >> .../gnome-keyring/gnome-keyring_2.32.1.bb | 45 >> ------------------ >> 2 files changed, 100 deletions(-) >> delete mode 100644 meta-gnome/recipes-gnome/gnome >> -keyring/gnome-keyring/egg-asn1x.patch >> delete mode 100644 meta-gnome/recipes-gnome/gnome-keyring/ >> gnome-keyring_2.32.1.bb >> >> diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch >> b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-asn1x.patch >> deleted file mode 100644 >> index ad8a40ccf..000000000 >> --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/egg-a >> sn1x.patch >> +++ /dev/null >> @@ -1,55 +0,0 @@ >> -Fixed build error with gcc 4.8 >> - >> -Errors like below >> - >> -egg-asn1x.c: In function 'anode_encode_build': >> -egg-asn1x.c:1280:7: warning: variable 'type' set but not used >> [-Wunused-but-set-variable] >> -egg-asn1x.c: In function 'traverse_and_prepare': >> -egg-asn1x.c:3354:3: warning: passing argument 1 of 'egg_asn1x_create' >> from incompatible pointer type [enabled by default] >> -In file included from egg-asn1x.c:50:0: >> -egg-asn1x.h:38:8: note: expected 'const struct static_struct_asn *' but >> argument is of type 'const struct asn1_static_node *' >> -egg-asn1x.c: At top level: >> -egg-asn1x.c:3509:1: error: conflicting types for 'egg_asn1x_create' >> -In file included from egg-asn1x.c:50:0: >> -egg-asn1x.h:38:8: note: previous declaration of 'egg_asn1x_create' was >> here >> -egg-asn1x.c:3572:1: error: conflicting types for 'egg_asn1x_create_quark' >> -In file included from egg-asn1x.c:50:0: >> -egg-asn1x.h:41:8: note: previous declaration of 'egg_asn1x_create_quark' >> was here >> -egg-asn1x.c:3579:1: error: conflicting types for >> 'egg_asn1x_create_and_decode' >> -In file included from egg-asn1x.c:50:0: >> -egg-asn1x.h:44:8: note: previous declaration of >> 'egg_asn1x_create_and_decode' was here >> -make[4]: *** [libegg_la-egg-asn1x.lo] Error 1 >> - >> - >> -Signed-off-by: Khem Raj <raj.khem@gmail.com> >> - >> -Upstream-Status: Pending >> -Index: gnome-keyring-2.32.1/egg/egg-asn1x.h >> -=================================================================== >> ---- gnome-keyring-2.32.1.orig/egg/egg-asn1x.h 2010-10-18 >> 19:11:38.000000000 -0700 >> -+++ gnome-keyring-2.32.1/egg/egg-asn1x.h 2013-06-11 >> 15:15:00.675399263 -0700 >> -@@ -25,6 +25,7 @@ >> - #define EGG_ASN1X_H_ >> - >> - #include <glib.h> >> -+#include <libtasn1.h> >> - >> - #ifndef HAVE_EGG_ALLOCATOR >> - typedef void* (*EggAllocator) (void* p, gsize); >> -@@ -35,13 +36,13 @@ >> - >> - struct static_struct_asn; >> - >> --GNode* egg_asn1x_create (const struct >> static_struct_asn *defs, >> -+GNode* egg_asn1x_create (const >> ASN1_ARRAY_TYPE *defs, >> - const gchar >> *type); >> - >> --GNode* egg_asn1x_create_quark (const struct >> static_struct_asn *defs, >> -+GNode* egg_asn1x_create_quark (const >> ASN1_ARRAY_TYPE *defs, >> - GQuark type); >> - >> --GNode* egg_asn1x_create_and_decode (const struct >> static_struct_asn *defs, >> -+GNode* egg_asn1x_create_and_decode (const >> ASN1_ARRAY_TYPE *defs, >> - const gchar *type, >> - gconstpointer >> data, >> - gsize n_data); >> diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32. >> 1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb >> deleted file mode 100644 >> index 4ac75cbef..000000000 >> --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb >> +++ /dev/null >> @@ -1,45 +0,0 @@ >> -SUMMARY = "Password and keyring managing daemon" >> -HOMEPAGE = "http://www.gnome.org/" >> -BUGTRACKER = "https://bugzilla.gnome.org/" >> - >> -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" >> -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f >> \ >> - file://gcr/gcr.h;endline=22;md >> 5=a272df1e633e27ecf35e74fb5576250e \ >> - file://egg/egg-dbus.h;endline= >> 25;md5=eb6f531af37165dc53420c073d774e61 \ >> - file://gp11/gp11.h;endline=24; >> md5=bd8c7a8a21d6c28d40536d96a35e3469 \ >> - file://pkcs11/pkcs11i.h;endlin >> e=24;md5=e72cfbb718389b76a4dae838d1c1f439" >> - >> -SECTION = "x11/gnome" >> - >> -PR = "r12" >> - >> -inherit autotools gnome gtk-doc pkgconfig gsettings >> - >> -SRC_URI += "file://egg-asn1x.patch" >> - >> -DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf >> ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} >> intltool-native" >> -RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils" >> - >> -EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', >> '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', >> d)}" >> - >> -SRC_URI[archive.md5sum] = "9a8aa74e03361676f29d6e73155786fc" >> -SRC_URI[archive.sha256sum] = "31fecec1430a97f59a6159a5a2ea8 >> d6a1b44287f1e9e595b3594df46bf7f18f9" >> -GNOME_COMPRESS_TYPE="bz2" >> - >> -FILES_${PN} += "${datadir}/dbus-1/services ${datadir}/gcr \ >> - ${base_libdir}/security/*${SOLIBSDEV} \ >> - " >> - >> -FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \ >> - ${libdir}/${BPN}/devel/*${SOLIBSDEV} \ >> - ${libdir}/${BPN}/standalone/*.la \ >> - ${base_libdir}/security/*.la \ >> - " >> - >> -INSANE_SKIP_${PN}-dev += "dev-elf" >> - >> -FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \ >> - ${libdir}/${BPN}/devel/.debug/ \ >> - ${base_libdir}/security/.debug/" >> - >> -PNBLACKLIST[gnome-keyring] ?= "This version conflicts with gcr from >> oe-core - the recipe will be removed on 2017-09-01 unless the issue is >> fixed" >> -- >> 2.14.1 >> >> -- >> _______________________________________________ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel >> > > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-09-13 21:59 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-09-12 8:36 [meta-oe][PATCH 1/3] smbnetfs: delete blacklisted Martin Jansa 2017-09-12 8:36 ` [meta-oe][PATCH 2/3] system-setup-keyboard: " Martin Jansa 2017-09-12 8:36 ` [meta-oe][PATCH 3/3] gnome-keyring: " Martin Jansa 2017-09-13 21:48 ` Rob Woolley 2017-09-13 21:59 ` Martin Jansa
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.