diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-12-08 11:15:02 +0100 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-12-17 13:58:05 +0000 |
| commit | 41591d4f8c586aa801220fac0924556f406c58bd (patch) | |
| tree | 85a2803d48a094fb0ba3a76b9e3d0870a4e5edc2 /recipes-connectivity/neard/files | |
| parent | 4830bcef14e7f49cdc851c646a69c9bb9bd92e82 (diff) | |
SPEC-3723: restructure meta-agl-demo
All demo related components should be in here now.
We keep the packagegroups on purpose for now to stay backward-compatible.
v2: layer does pass yocto-check-layer, dependencies adapted
v3: remove the dynamic-layer setup, use all-in-one approach
v4: Fixed comments from Paul Barker. Tnx!
v5: Removed wayland/weston/agl-compositor additions, except for demo
specific weston-init bbappend
Follow-up changes required later:
- massaging packagegroups
- scrub of recipes
Bug-AGL: SPEC-3723
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I47cefd8c23d46b2cdd063470e3f7d97d5ad952d8
Diffstat (limited to 'recipes-connectivity/neard/files')
2 files changed, 58 insertions, 0 deletions
diff --git a/recipes-connectivity/neard/files/0001-systemd-neard-add-multi-user.target-to-neard.service.patch b/recipes-connectivity/neard/files/0001-systemd-neard-add-multi-user.target-to-neard.service.patch new file mode 100644 index 000000000..c32951693 --- /dev/null +++ b/recipes-connectivity/neard/files/0001-systemd-neard-add-multi-user.target-to-neard.service.patch @@ -0,0 +1,25 @@ +From d8c03a31e2734e59af43dd50cbd7f5a94d798ab1 Mon Sep 17 00:00:00 2001 +From: Matt Ranostay <matt.ranostay@konsulko.com> +Date: Tue, 10 Jul 2018 21:18:26 -0700 +Subject: [PATCH] systemd: neard: add multi-user.target to neard.service + +Allowing a service to be system level requires a WantedBy= target + +Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com> +--- + src/neard.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/neard.service.in b/src/neard.service.in +index dfa238c..540da7e 100644 +--- a/src/neard.service.in ++++ b/src/neard.service.in +@@ -9,4 +9,5 @@ ExecStart=@pkglibexecdir@/neard -n + LimitNPROC=1 + + [Install] ++WantedBy=multi-user.target + Alias=dbus-org.neard.service +-- +2.17.1 + diff --git a/recipes-connectivity/neard/files/0002-ndef-avoid-dbus-property_get_type-method-on-empty-re.patch b/recipes-connectivity/neard/files/0002-ndef-avoid-dbus-property_get_type-method-on-empty-re.patch new file mode 100644 index 000000000..49c11a509 --- /dev/null +++ b/recipes-connectivity/neard/files/0002-ndef-avoid-dbus-property_get_type-method-on-empty-re.patch @@ -0,0 +1,33 @@ +From d7ea2a00e00795ad24897e3481b015a27d37d60f Mon Sep 17 00:00:00 2001 +From: Raquel Medina <raquel.medina@konsulko.com> +Date: Tue, 22 Jan 2019 09:00:05 -0500 +Subject: [PATCH] ndef: avoid dbus property_get_type method on empty record + +Signed-off-by: Raquel Medina <raquel.medina@konsulko.com> +--- + src/ndef.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/ndef.c b/src/ndef.c +index 5656baf..883c6f4 100644 +--- a/src/ndef.c ++++ b/src/ndef.c +@@ -2832,10 +2832,14 @@ GList *near_ndef_parse_msg(uint8_t *ndef_data, size_t ndef_length, + case RECORD_TYPE_WKT_ALTERNATIVE_CARRIER: + case RECORD_TYPE_WKT_COLLISION_RESOLUTION: + case RECORD_TYPE_WKT_ERROR: +- case RECORD_TYPE_UNKNOWN: + case RECORD_TYPE_ERROR: + break; + ++ case RECORD_TYPE_UNKNOWN: ++ if (record->header->tnf == RECORD_TNF_EMPTY) ++ goto fail; ++ break; ++ + case RECORD_TYPE_WKT_HANDOVER_REQUEST: + case RECORD_TYPE_WKT_HANDOVER_SELECT: + /* +-- +2.17.1 + |