From e92ead86ef3d8e25fc97ac7411e2f7c9af33e9d2 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakivskyy Date: Thu, 12 Feb 2015 15:01:37 +0200 Subject: recipes-connectivity: neardal: add recipe Bug-AGL: SPEC-1554 Link: https://patchwork.openembedded.org/patch/88673/ Change-Id: Id0287d8cd6bc75b03ec06d0445938a7c27304620 Signed-off-by: Oleg Zhurakivskyy 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 insertions(+) create mode 100644 meta-agl-profile-core/recipes-connectivity/neardal/neardal.inc create mode 100644 meta-agl-profile-core/recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch create mode 100644 meta-agl-profile-core/recipes-connectivity/neardal/neardal/ncl.patch create mode 100644 meta-agl-profile-core/recipes-connectivity/neardal/neardal_0.14.bb diff --git a/meta-agl-profile-core/recipes-connectivity/neardal/neardal.inc b/meta-agl-profile-core/recipes-connectivity/neardal/neardal.inc new file mode 100644 index 000000000..3bb6b24ec --- /dev/null +++ b/meta-agl-profile-core/recipes-connectivity/neardal/neardal.inc @@ -0,0 +1,22 @@ +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/meta-agl-profile-core/recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch b/meta-agl-profile-core/recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch new file mode 100644 index 000000000..8e45e1ca2 --- /dev/null +++ b/meta-agl-profile-core/recipes-connectivity/neardal/neardal/0001-neardal-ncl-fix-segfault-on-help-page-being-displaye.patch @@ -0,0 +1,29 @@ +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/meta-agl-profile-core/recipes-connectivity/neardal/neardal/ncl.patch b/meta-agl-profile-core/recipes-connectivity/neardal/neardal/ncl.patch new file mode 100644 index 000000000..baef6ccaa --- /dev/null +++ b/meta-agl-profile-core/recipes-connectivity/neardal/neardal/ncl.patch @@ -0,0 +1,25 @@ +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/meta-agl-profile-core/recipes-connectivity/neardal/neardal_0.14.bb b/meta-agl-profile-core/recipes-connectivity/neardal/neardal_0.14.bb new file mode 100644 index 000000000..022e54e26 --- /dev/null +++ b/meta-agl-profile-core/recipes-connectivity/neardal/neardal_0.14.bb @@ -0,0 +1,8 @@ +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" -- cgit 1.2.3-korg