Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Commit e9be413

Browse files
committed
intel-iot-refkit: move to use mraa and upm from meta-oe
mraa/upm were added in meta-oe so there's no need to maintain them in meta-refkit-core anymore. The change needs adjustments in layer dependencies and a few other places to get the compatibility checks passing. * meta-openembedded 4a45235...5d6d21e (201): > libreport: fix Nothing RPROVIDES 'lib32-python3-libreport' > libpwquality: fix Nothing RPROVIDES 'lib32-python3-libpwquality' > postgresql: Update to 9.4.14 > stress-ng: Add recipe > fluidsynth: update 1.1.6 -> 1.1.8 > nodejs: Update to 8.7.0 > nodejs: Remove unreferenced patches > tslib: update project homepage > gperftools: Fix build on musl/mips > python3-asn1crypto: add support for Python 3 > python-cffi: update to version 1.11.2 > python-lxml: update to version 4.1.0 > imagemagick: 7.0.7-1 -> 7.0.7-7 > oprofile: move from oe-core, as it's being deprecated there > rocksdb: add version 5.8 > nodejs: Add npx to nodejs-npm package > toybox: Switch building from git src_uri > hostapd: fix WPA2 key replay security bug > libmnl: Move to oe-core > wireshark: update to 2.2.10 > gpsd: Fix gpsd Yocto pyro build for read only rootfs > python-asn1crypto: add new package > python-pytest: fix egg version of package > python-twisted: remove empty lore subpackage > meta-oe/conf/layer.conf: Remove "id" from HOSTTOOLS > nghttp2: add recipe for Nghttp2: HTTP/2 C Library. > python3-ujson: support Python 3 > python3-protobuf: add python3 version > netkit-rsh: correct the file attribute > mdns: move from meta-intel-iot-middleware > dnsmasq: upgrade to 2.78 > libauthen-radius-perl: move recipe to meta-networking > lldpd: Update to version 0.9.8 > ebtables: Add HOMEPAGE info into recipe file. > c-ares: Build native version > net-snmp: check that executable is used before testing for existance > openl2tp: Fix build with musl/libtirpc > yp-tools: Ignore cpp warnings as errors > drbd-utils: remove 0001-drbd-8.4.4-drbd-tools-only-rmmod-if-DRBD-is-a-module.patch > iproute2: Move tipc enablement to oe-core > network-manager-applet: Disable gobject-introspection on musl > klibc: Pass Optimization with KLIBCOPTFLAGS > breakpad: fix typo ( minidump_cpu_arm.h -> minidump_cpu_arm64.h ) > initramfs-kexecboot-image: replace deprecated license file > initramfs-debug: replace deprecated license file > python-grpcio-tools: update to version 1.6.3 > python-twisted: update to version 17.9.0 > python-parse-type: update to version 0.4.2 > python-flask-sqlalchemy: update to version 2.3.0 > python-cython: update to version 0.27.1 > python-pylint: update to version 1.7.4 > leveldb: fix parallel build II > Add python pandas recipes > upm: add recipe from meta-refkit-core > mraa: move recipe from meta-refkit-core > gperftools: Enable on mips > klibc.bbclass: Pass TUNE_CCARGS in flags > ubi-utils-klibc: Update to 1.5.2 release of mtd-utils > python-m2crypto: Upgrade to 0.26.4 > phoronix-test-suite: Upgrade from v6.6.1 to v7.4.0 > meta-perl: update layer.conf to include openembedded-layer > meta-webserver: update the layer.conf to include the openembedded-layer > mongodb: Pass computed endian variable > uftrace: update version to 0.8 > python-pyfirmata: move in from meta-intel-iot-middleware and upgrade > python-can: update to version 2.0.0b1 > libol: Add HOMEPAGE info into recipe file. > python-parse-type: update to version 0.4.1 > python-zopeinterface: update to version 4.4.3 > python-pyasn1: update to version 0.3.6 > python-pytest: update to version 3.2.2 > python-babel: update to version 2.5.1 > python-cython: update to version 0.27 > python-futures: Build native version > protobuf: Upgrade to 3.4.1 > lvm2: refactoring code to disable package config thin-provisioning-tools > mongodb: Fix build on aarch64 > leveldb: Fix parallel build > rcmd: Fix build with musl > nbench-byte: Update SRC_URI to fossies.org > breakpad: Fix build with musl/mips > toybox: Upgrade to 0.7.4 > openwsman: Fix build with musl > cpupower: add a new recipe > lvm2: fix start lvm2-monitor.service failed > lvm2: disable thin provisioning support if GPLv3 incompatible > dfu-util: Add HOMEPAGE info into recipe file. > byacc: Add HOMEPAGE info into recipe file. > opencv: fix CVE-2017-14136 > luajit: Fix mips build with clang > php: add libgcc to the runtime depends > php: update stable version to 5.6.31 > php: update version to 7.1.9 > msgpack-c: update to version 2.1.5 > jsoncpp: update to version 1.8.3 > opencv: Fix build on aarch64 > flatbuffers: Fix build with clang on big-endian machines > openct: Add HOMEPAGE info into recipe file. > python-bitarray: add a python3 version of the recipe > python-bcrypt: add a python3 version of the recipe > python-appdirs: add an initial recipe > python-twisted: update version to 17.5.0 > adduser: update to version 3.116 > breakpad: Fix mips build on musl > ltrace: Fix build with musl/mips > python3-multidict: update to version 3.2.0 > python-cassandra-driver: update to version 3.11.0 > python-protobuf: update to version 3.4.0 > python-pymisp: update to version 2.4.80 > python-pyasn1: update to version 0.3.5 > python-tornado: update to version 4.5.2 > python-grpcio-tools: update to version 1.6.0 > python-grpcio: update to version 1.6.0 > python-cmd2: update to version 0.7.7 > python-lxml: update to version 4.0.0 > python-pyro4: update to version 4.62 > python-pymongo: split the package into bson and original pymongo package > python-aws-iot-device-sdk-python: update to version 1.2.0 > python-six: update to version 1.11.0 > python-cffi: update to version 1.10.0 > python-psutil: update to version 5.3.1 > python-xlrd: update to version 1.1.0 > python-pyopenssl: update to version 17.3.0 > python-redis: update to version 2.10.6 > libnet-dns-perl: Add HOMEPAGE info into recipe file. > libhtml-parser-perl: Add HOMEPAGE info into recipe file. > ipc-run: Add HOMEPAGE info into recipe file. > fbset: Add HOMEPAGE info into recipe file. > eventlog: Add HOMEPAGE info into recipe file. > imagemagick: 7.0.6-9 -> 7.0.7-1 > python-cython: update to version 0.26.1 > python-babel: update to version 2.5.0 > python-ndg-httpsclient: update to version 0.4.3 > python-pybind11: update to version 2.2.1 > autoconf-archive: Delete ( moved to oe-core ) > android-tools: Fix build with musl > python-pymisp: update to version 2.4.79 > python-pymongo: update to version 3.5.1 > python-jsonpointer: update to version 1.12 > python-pytest-runner: update to version 2.12.1 > python-django: update to version 1.11.5 > python-pyasn1: update to version 0.3.4 > python-sqlalchemy: update to version 1.1.14 > nginx: update development version to 1.13.5 > breakpad: Upgrade to latest master > rsyslog: update from 8.22 to 8.29 > librelp: upgrade from 1.2.12 to 1.2.14 > python-pyparsing: add support for native build > networkmanager: Disable gobject-introspection on musl > netkit-telnet: Add HOMEPAGE info into recipe file. > opensaf: Upgrade to 5.17.07 > openhpi: Fix build with musl > ypbind-mt: Upgrade to 2.4 > stunnel: Add HOMEPAGE info into recipe file. > libtdb: Add HOMEPAGE info into recipe file. > samba: Add HOMEPAGE info into recipe file. > networkmanager: Add HOMEPAGE info into recipe file. > tcpdump: update to 4.9.2 to fix CVEs > ipvsadm: Add HOMEPAGE info into recipe file. > yp-tools: Upgrade to 4.2.2 > autofs: Fix build with musl > poco: update to 1.7.9 > krb5: CVE-2017-11462 > libp11: 0.4.0 -> 0.4.7 > recipes: fix invalid license file > gnome-keyring: Fix build with musl > apache2: change files layout to debian style > apache2: use volatiles for sysvinit > pidgin-otr: Upgrade to 4.0.2 > Nginx: use PACKAGECONFIG variables in configure > sgpio: Add HOMEPAGE info into recipe file. > orbit2: Add HOMEPAGE info into recipe file. > numactl: Add HOMEPAGE info into recipe file. > mozjs: Add HOMEPAGE info into recipe file. > mailcap: Add HOMEPAGE info into recipe file. > libnih: Add HOMEPAGE info into recipe file. > ceres-solver: add new recipe > gnome-keyring: Resolve conflict with gcr 3 and gold linking error > libndp: Add HOMEPAGE info into recipe file. > fbset: Add HOMEPAGE info into recipe file. > daemontools: Add HOMEPAGE info into recipe file. > liblockfile: Add HOMEPAGE info into recipe file. > libjs-sizzle: Add HOMEPAGE info into recipe file. > gerbera: clean recipe > libupnp: Add recipe for version 1.8.2 > capnproto: add version 0.6.1 > flatbuffers: add version 1.7.1 > libgpiod: bump version to v0.3.1 > protobuf-c: update to 1.3.0 > protobuf: update to 3.4.0 > debsums: inherit gettext > lvm2: Add HOMEPAGE info into recipe file. > libidl: Add HOMEPAGE info into recipe file. > v4l-utils: added missing dependency on udev > python-jsonschema, python3-jsonschema: add vcversioner-native dependency > system-setup-keyboard: delete blacklisted > smbnetfs: delete blacklisted > klibc.bbclass: Add -mfloat-abi on arm > klibc.bbclass: Use forcevariable override to define flags > klibc: Edit out gcc hardcoding in do_compile > leveldb: Fix build with clang Signed-off-by: Mikko Ylinen <[email protected]>
1 parent 5ae9f55 commit e9be413

File tree

9 files changed

+13
-150
lines changed

9 files changed

+13
-150
lines changed

meta-openembedded

Submodule meta-openembedded updated from 4a45235 to 5d6d21e

meta-refkit-core/classes/refkit-image.bbclass

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,10 @@ FEATURE_PACKAGES_iotivity = "packagegroup-iotivity"
156156

157157
FEATURE_PACKAGES_sensors = "packagegroup-sensors \
158158
${@ bb.utils.contains('IMAGE_FEATURES', 'python-runtime', 'python-mraa python-upm', '', d)} \
159+
"
160+
161+
# MRAA/UPM nodejs bindings currently enabled via refkit-gateway distro feature
162+
FEATURE_PACKAGES_sensors_append_df-refkit-gateway = " \
159163
${@ bb.utils.contains('IMAGE_FEATURES', 'nodejs-runtime', 'node-mraa node-upm', '', d)} \
160164
"
161165

meta-refkit-core/conf/distro/include/refkit-config.inc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,5 +165,9 @@ PACKAGECONFIG_append_pn-connman_df-refkit-config = " nftables"
165165
PACKAGECONFIG_remove_pn-curl_df-refkit-config = "gnutls"
166166
PACKAGECONFIG_append_pn-curl_df-refkit-config = " ssl"
167167

168-
#remove gtk dependency from opencv
168+
# Remove gtk dependency from opencv
169169
PACKAGECONFIG_remove_pn-opencv_df-refkit-config = "gtk"
170+
171+
# Enable UPM/MRAA nodejs bindins
172+
BINDINGS_append_pn-mraa_df-refkit-gateway = " nodejs"
173+
BINDINGS_append_pn-upm_df-refkit-gateway = " nodejs"

meta-refkit-core/conf/layer.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ HAVE_META_NETWORKING = "${@ bb.utils.contains('BBFILE_COLLECTIONS', 'networking-
6666
HAVE_LOWPAN_TOOLS ??= "${HAVE_META_NETWORKING}"
6767
HAVE_IFTOP ??= "${HAVE_META_NETWORKING}"
6868
HAVE_META_IOT_WEB = "${@ bb.utils.contains('BBFILE_COLLECTIONS', 'iot-web', 'True', 'False', d) }"
69-
HAVE_NODEJS ??= "${HAVE_META_IOT_WEB}"
7069

7170
HAVE_META_FLATPAK = "${@ bb.utils.contains('BBFILE_COLLECTIONS', 'flatpak-layer', 'True', 'False', d) }"
7271
HAVE_FLATPAK ??= "${HAVE_META_FLATPAK}"

meta-refkit-core/recipes-sensors/mraa/mraa_git.bb

Lines changed: 0 additions & 48 deletions
This file was deleted.

meta-refkit-core/recipes-sensors/upm/files/ads1x15-fixed-case-logic-in-getThresh-function.patch

Lines changed: 0 additions & 54 deletions
This file was deleted.

meta-refkit-core/recipes-sensors/upm/upm_git.bb

Lines changed: 0 additions & 42 deletions
This file was deleted.

meta-refkit-gateway/conf/layer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "refkit-gateway"
99
BBFILE_PATTERN_refkit-gateway = "^${LAYERDIR}/"
1010
BBFILE_PRIORITY_refkit-gateway = "6"
1111

12-
LAYERDEPENDS_refkit-gateway = "refkit-core oic iot-web"
12+
LAYERDEPENDS_refkit-gateway = "refkit-core oic iot-web openembedded-layer"

meta-refkit/conf/distro/include/refkit-supported-recipes.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ moveit-ros-perception@ros-layer
333333
moveit-ros-planning@ros-layer
334334
mpfr@core
335335
mraa-test@iotqa
336-
mraa@refkit-core
336+
mraa@openembedded-layer
337337
mtdev@core
338338
multipath-tools@openembedded-layer
339339
ncurses@core
@@ -478,7 +478,7 @@ u-boot@core
478478
udp-smack-test@security-smack
479479
update-rc.d@core
480480
upm-test@iotqa
481-
upm@refkit-core
481+
upm@openembedded-layer
482482
urdf-parser-plugin@ros-layer
483483
urdf@ros-layer
484484
urdfdom-headers@ros-layer

0 commit comments

Comments
 (0)