diff options
| author | John Klug <john.klug@multitech.com> | 2016-12-13 18:00:24 -0600 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2016-12-13 18:00:24 -0600 |
| commit | 923ceeece80b7575ca15c243e4b249fb13752e1a (patch) | |
| tree | 04db68ad03fce5bc472f02a3a03262a625ba88b6 | |
| parent | 9e667ff529b65eac316b4f66c4ae37ed835b7138 (diff) | |
| parent | dd786c4554427df245d5498c2e5b2cebd76aeee7 (diff) | |
| download | meta-mlinux-923ceeece80b7575ca15c243e4b249fb13752e1a.tar.gz meta-mlinux-923ceeece80b7575ca15c243e4b249fb13752e1a.tar.bz2 meta-mlinux-923ceeece80b7575ca15c243e4b249fb13752e1a.zip | |
Merge branch 'master' of gitlab.multitech.net:mirrors/meta-mlinux into gpsd
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb | 14 | ||||
| -rw-r--r-- | recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba2186a..e07d2a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ before_script: - (test -f env-oe.sh && ./setup.sh --update) || ./setup.sh - source env-oe.sh - cd layers/meta-mlinux + - git fetch - git checkout $CI_BUILD_REF - cd ../.. diff --git a/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb b/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb index 64ad81f..382328d 100644 --- a/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb +++ b/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb @@ -31,11 +31,11 @@ do_compile() { } do_install() { - install -d ${D}${includedir}/lora - install -d ${D}${libdir}/lora - install -m 0644 libloragw/libloragw.a ${D}${libdir}/lora - install -m 0644 libloragw/library.cfg ${D}${libdir}/lora - install -m 0644 libloragw/inc/* ${D}${includedir}/lora + install -d ${D}${includedir}/lora-usb + install -d ${D}${libdir}/lora-usb + install -m 0644 libloragw/libloragw.a ${D}${libdir}/lora-usb + install -m 0644 libloragw/library.cfg ${D}${libdir}/lora-usb + install -m 0644 libloragw/inc/* ${D}${includedir}/lora-usb install -d ${D}/opt/lora install -d ${D}/opt/lora/gateway-utils-usb @@ -49,8 +49,8 @@ PACKAGES += "${PN}-utils ${PN}-utils-dbg" FILES_${PN}-utils = "/opt/lora/gateway-utils-usb/*" FILES_${PN}-utils-dbg = "/opt/lora/.debug" -FILES_${PN}-dev = "${includedir}/lora ${libdir}/lora/library.cfg" -FILES_${PN}-staticdev = "${libdir}/lora/libloragw.a" +FILES_${PN}-dev = "${includedir}/lora-usb ${libdir}/lora-usb/library.cfg" +FILES_${PN}-staticdev = "${libdir}/lora-usb/libloragw.a" # disable this on purpose for dev purposes do_rm_work() { diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb index 541247b..7ca1ffb 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb @@ -26,8 +26,8 @@ S = "${WORKDIR}/git" LORA_DIR = "/opt/lora" -export LGW_PATH = "${STAGING_LIBDIR}/lora" -export LGW_INC = "${STAGING_INCDIR}/lora" +export LGW_PATH = "${STAGING_LIBDIR}/lora-usb" +export LGW_INC = "${STAGING_INCDIR}/lora-usb" CFLAGS += "-I${LGW_INC} -Iinc -I." |