From 0e01c40613f36d4ad6afe858d08ac1048cb4319f Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Tue, 10 Jul 2018 15:55:31 -0700 Subject: [PATCH] Revert "recipes-connectivity: neardal: add recipe" This reverts commit afec28613b0b0b25cdee9cccb61b384ce518d0b8. Bug-AGL: SPEC-1544 Change-Id: I476f790ec3f65ba7fe1870ed0363c81e17feaac2 Signed-off-by: Matt Ranostay --- recipes-connectivity/neardal/neardal.inc | 22 ---------------- ...-fix-segfault-on-help-page-being-displaye.patch | 29 ---------------------- recipes-connectivity/neardal/neardal/ncl.patch | 25 ------------------- recipes-connectivity/neardal/neardal_0.14.bb | 8 ------ 4 files changed, 84 deletions(-) delete mode 100644 recipes-connectivity/neardal/neardal.inc delete mode 100644 recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch delete mode 100644 recipes-connectivity/neardal/neardal/ncl.patch delete mode 100644 recipes-connectivity/neardal/neardal_0.14.bb diff --git a/recipes-connectivity/neardal/neardal.inc b/recipes-connectivity/neardal/neardal.inc deleted file mode 100644 index 3bb6b24ec..000000000 --- a/recipes-connectivity/neardal/neardal.inc +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Neard Abstraction Library (NeardAL)" - -DESCRIPTION = "NeardAL is a library that provides a simple C API \ -to exchange data with NFC daemon (Neard)." - -HOMEPAGE = "https://github.com/connectivity/neardal" -SECTION = "libs" -LICENSE = "LGPLv2" - -DEPENDS = "glib-2.0 readline glib-2.0-native" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ - file://lib/neardal.h;endline=20;md5=a53e93aea9357387078ed217565c0a99" - -inherit autotools pkgconfig - -PACKAGES =+ "${PN}-tools ${PN}-tools-dbg" - -FILES_${PN}-tools = "${libexecdir}/ncl" -FILES_${PN}-tools-dbg += "${libexecdir}/.debug" - -RDEPENDS_${PN}-tools = "bash" diff --git a/recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch b/recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch deleted file mode 100644 index 8e45e1ca2..000000000 --- a/recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0f33143d13d9224ffa8b648e2d9cf11c62ba234d Mon Sep 17 00:00:00 2001 -From: Matt Ranostay -Date: Fri, 6 Jul 2018 17:19:09 -0700 -Subject: [PATCH] neardal: ncl: fix segfault on help page being displayed - -LISTCMD_NAME is declared as a const char due to being defined in a -macro so g_strdup it to stop proceeding operations from segfaulting. - -Signed-off-by: Matt Ranostay ---- - ncl/ncl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ncl/ncl.c b/ncl/ncl.c -index ef42862..c26e757 100644 ---- a/ncl/ncl.c -+++ b/ncl/ncl.c -@@ -342,7 +342,7 @@ int main(int argc, char *argv[]) - g_io_channel_unref(gNclCtx.channel); - - if (show_help) -- ncl_exec(LISTCMD_NAME); -+ ncl_exec(g_strdup(LISTCMD_NAME)); - - g_main_loop_run(gNclCtx.main_loop); - } --- -2.17.1 - diff --git a/recipes-connectivity/neardal/neardal/ncl.patch b/recipes-connectivity/neardal/neardal/ncl.patch deleted file mode 100644 index baef6ccaa..000000000 --- a/recipes-connectivity/neardal/neardal/ncl.patch +++ /dev/null @@ -1,25 +0,0 @@ -From eab402bae42c3ea5caa8d540b6702d39e56c84c1 Mon Sep 17 00:00:00 2001 -From: Oleg Zhurakivskyy -Date: Tue, 10 Feb 2015 12:58:39 +0200 -Subject: [PATCH] build: Install ncl - -Signed-off-by: Oleg Zhurakivskyy ---- - ncl/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ncl/Makefile.am b/ncl/Makefile.am -index beda75b..c06742f 100644 ---- a/ncl/Makefile.am -+++ b/ncl/Makefile.am -@@ -1,6 +1,6 @@ - AM_CPPFLAGS = @gio_CFLAGS@ -I$(top_builddir)/lib -I$(top_srcdir)/lib - --noinst_PROGRAMS=ncl -+libexec_PROGRAMS = ncl - - ncl_SOURCES = \ - $(srcdir)/ncl.c $(srcdir)/ncl.h \ --- -2.1.0 - diff --git a/recipes-connectivity/neardal/neardal_0.14.bb b/recipes-connectivity/neardal/neardal_0.14.bb deleted file mode 100644 index 022e54e26..000000000 --- a/recipes-connectivity/neardal/neardal_0.14.bb +++ /dev/null @@ -1,8 +0,0 @@ -require neardal.inc - -SRC_URI = "https://github.com/connectivity/neardal/archive/${PV}.tar.gz \ - file://ncl.patch \ - file://0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch \ - " -SRC_URI[md5sum] = "3dbda58253ca30ee6a7a7573eaa68f40" -SRC_URI[sha256sum] = "157d320bd831d91a82203d9697d2d2a2cebdb515d6e1c4ce04fe8ef27d1da615" -- 2.16.6