From 4c8903bbf55d210ad59a817fc755926b265c1539 Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 14 Aug 2019 18:01:29 -0500 Subject: Move to L4N1 and L4E1 support, temporarily on gitlab --- recipes-support/multitech/libmts-io_1.0.18.bb | 30 -------------------------- recipes-support/multitech/libmts-io_1.0.19.bb | 31 +++++++++++++++++++++++++++ recipes-support/multitech/radio-cmd_0.4.bb | 22 ------------------- recipes-support/multitech/radio-cmd_0.6.bb | 23 ++++++++++++++++++++ recipes-support/multitech/radio-query_0.7.bb | 22 ------------------- recipes-support/multitech/radio-query_0.8.bb | 23 ++++++++++++++++++++ 6 files changed, 77 insertions(+), 74 deletions(-) delete mode 100644 recipes-support/multitech/libmts-io_1.0.18.bb create mode 100644 recipes-support/multitech/libmts-io_1.0.19.bb delete mode 100644 recipes-support/multitech/radio-cmd_0.4.bb create mode 100644 recipes-support/multitech/radio-cmd_0.6.bb delete mode 100644 recipes-support/multitech/radio-query_0.7.bb create mode 100644 recipes-support/multitech/radio-query_0.8.bb (limited to 'recipes-support') diff --git a/recipes-support/multitech/libmts-io_1.0.18.bb b/recipes-support/multitech/libmts-io_1.0.18.bb deleted file mode 100644 index 34115be..0000000 --- a/recipes-support/multitech/libmts-io_1.0.18.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "MultiTech IO C++ Library" -HOMEPAGE = "http://www.multitech.net/" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "libmts jsoncpp cmake-native cppunit" -BBCLASSEXTEND = "native" - -PR = "r0" -SRCREV = "${PV}" -SRC_URI = "git://git.multitech.net/libmts-io;branch=master" - -S = "${WORKDIR}/git" - -do_compile() { - oe_runmake -} - -# build and run tests for native recipe -do_compile_append_virtclass-native() { - cd test - cmake . - oe_runmake - ./TestRunnerClient -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - diff --git a/recipes-support/multitech/libmts-io_1.0.19.bb b/recipes-support/multitech/libmts-io_1.0.19.bb new file mode 100644 index 0000000..3572e17 --- /dev/null +++ b/recipes-support/multitech/libmts-io_1.0.19.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "MultiTech IO C++ Library" +HOMEPAGE = "http://www.multitech.net/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "libmts jsoncpp cmake-native cppunit" +BBCLASSEXTEND = "native" + +PR = "r0" +SRCREV = "${PV}" +#SRC_URI = "git://git.multitech.net/libmts-io;branch=master" +SRC_URI = "git://git@${MTS_INTERNAL_GIT}/mirrors/libmts-io.git;protocol=ssh;branch=master" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake +} + +# build and run tests for native recipe +do_compile_append_virtclass-native() { + cd test + cmake . + oe_runmake + ./TestRunnerClient +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + diff --git a/recipes-support/multitech/radio-cmd_0.4.bb b/recipes-support/multitech/radio-cmd_0.4.bb deleted file mode 100644 index b8e5b23..0000000 --- a/recipes-support/multitech/radio-cmd_0.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "MultiTech cellular radio command tool" -HOMEPAGE = "http://www.multitech.net/" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "jsoncpp libmts libmts-io" - -PR = "r0" -SRCREV = "${PV}" - -SRC_URI = "git://git.multitech.net/radio-cmd;branch=master" - -S = "${WORKDIR}/git" - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - diff --git a/recipes-support/multitech/radio-cmd_0.6.bb b/recipes-support/multitech/radio-cmd_0.6.bb new file mode 100644 index 0000000..afa7308 --- /dev/null +++ b/recipes-support/multitech/radio-cmd_0.6.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "MultiTech cellular radio command tool" +HOMEPAGE = "http://www.multitech.net/" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "jsoncpp libmts libmts-io" + +PR = "r0" +SRCREV = "${PV}" + +#SRC_URI = "git://git.multitech.net/radio-cmd;branch=master" +SRC_URI = "git://git@${MTS_INTERNAL_GIT}/mirrors/radio-cmd.git;protocol=ssh;branch=master" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + diff --git a/recipes-support/multitech/radio-query_0.7.bb b/recipes-support/multitech/radio-query_0.7.bb deleted file mode 100644 index 5e0b60a..0000000 --- a/recipes-support/multitech/radio-query_0.7.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "MultiTech cellular radio query tool" -HOMEPAGE = "http://www.multitech.net/" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "jsoncpp libmts libmts-io" - -PR = "r0" -SRCREV = "${PV}" - -SRC_URI = "git://git.multitech.net/radio-query;branch=master" - -S = "${WORKDIR}/git" - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - diff --git a/recipes-support/multitech/radio-query_0.8.bb b/recipes-support/multitech/radio-query_0.8.bb new file mode 100644 index 0000000..f548cf6 --- /dev/null +++ b/recipes-support/multitech/radio-query_0.8.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "MultiTech cellular radio query tool" +HOMEPAGE = "http://www.multitech.net/" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "jsoncpp libmts libmts-io" + +PR = "r0" +SRCREV = "${PV}" + +#SRC_URI = "git://git.multitech.net/radio-query;branch=master" +SRC_URI = "git://git@${MTS_INTERNAL_GIT}/mirrors/radio-query.git;protocol=ssh;branch=master" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install DESTDIR=${D} +} + -- cgit v1.2.3 From 6a9ad96dc77fc8589d275300c9f1d1e2c4f58871 Mon Sep 17 00:00:00 2001 From: John Klug Date: Tue, 20 Aug 2019 10:22:42 -0500 Subject: Move recipes to public git.multitech.net for release. --- recipes-support/multitech/libmts-io_1.0.13.bb | 30 --------------------------- recipes-support/multitech/libmts-io_1.0.19.bb | 3 +-- recipes-support/multitech/radio-cmd_0.2.bb | 22 -------------------- recipes-support/multitech/radio-cmd_0.6.bb | 3 +-- recipes-support/multitech/radio-query_0.8.bb | 3 +-- 5 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 recipes-support/multitech/libmts-io_1.0.13.bb delete mode 100644 recipes-support/multitech/radio-cmd_0.2.bb (limited to 'recipes-support') diff --git a/recipes-support/multitech/libmts-io_1.0.13.bb b/recipes-support/multitech/libmts-io_1.0.13.bb deleted file mode 100644 index 34115be..0000000 --- a/recipes-support/multitech/libmts-io_1.0.13.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "MultiTech IO C++ Library" -HOMEPAGE = "http://www.multitech.net/" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "libmts jsoncpp cmake-native cppunit" -BBCLASSEXTEND = "native" - -PR = "r0" -SRCREV = "${PV}" -SRC_URI = "git://git.multitech.net/libmts-io;branch=master" - -S = "${WORKDIR}/git" - -do_compile() { - oe_runmake -} - -# build and run tests for native recipe -do_compile_append_virtclass-native() { - cd test - cmake . - oe_runmake - ./TestRunnerClient -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - diff --git a/recipes-support/multitech/libmts-io_1.0.19.bb b/recipes-support/multitech/libmts-io_1.0.19.bb index 3572e17..34115be 100644 --- a/recipes-support/multitech/libmts-io_1.0.19.bb +++ b/recipes-support/multitech/libmts-io_1.0.19.bb @@ -8,8 +8,7 @@ BBCLASSEXTEND = "native" PR = "r0" SRCREV = "${PV}" -#SRC_URI = "git://git.multitech.net/libmts-io;branch=master" -SRC_URI = "git://git@${MTS_INTERNAL_GIT}/mirrors/libmts-io.git;protocol=ssh;branch=master" +SRC_URI = "git://git.multitech.net/libmts-io;branch=master" S = "${WORKDIR}/git" diff --git a/recipes-support/multitech/radio-cmd_0.2.bb b/recipes-support/multitech/radio-cmd_0.2.bb deleted file mode 100644 index b8e5b23..0000000 --- a/recipes-support/multitech/radio-cmd_0.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "MultiTech cellular radio command tool" -HOMEPAGE = "http://www.multitech.net/" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "jsoncpp libmts libmts-io" - -PR = "r0" -SRCREV = "${PV}" - -SRC_URI = "git://git.multitech.net/radio-cmd;branch=master" - -S = "${WORKDIR}/git" - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake install DESTDIR=${D} -} - diff --git a/recipes-support/multitech/radio-cmd_0.6.bb b/recipes-support/multitech/radio-cmd_0.6.bb index afa7308..b8e5b23 100644 --- a/recipes-support/multitech/radio-cmd_0.6.bb +++ b/recipes-support/multitech/radio-cmd_0.6.bb @@ -8,8 +8,7 @@ DEPENDS = "jsoncpp libmts libmts-io" PR = "r0" SRCREV = "${PV}" -#SRC_URI = "git://git.multitech.net/radio-cmd;branch=master" -SRC_URI = "git://git@${MTS_INTERNAL_GIT}/mirrors/radio-cmd.git;protocol=ssh;branch=master" +SRC_URI = "git://git.multitech.net/radio-cmd;branch=master" S = "${WORKDIR}/git" diff --git a/recipes-support/multitech/radio-query_0.8.bb b/recipes-support/multitech/radio-query_0.8.bb index f548cf6..5e0b60a 100644 --- a/recipes-support/multitech/radio-query_0.8.bb +++ b/recipes-support/multitech/radio-query_0.8.bb @@ -8,8 +8,7 @@ DEPENDS = "jsoncpp libmts libmts-io" PR = "r0" SRCREV = "${PV}" -#SRC_URI = "git://git.multitech.net/radio-query;branch=master" -SRC_URI = "git://git@${MTS_INTERNAL_GIT}/mirrors/radio-query.git;protocol=ssh;branch=master" +SRC_URI = "git://git.multitech.net/radio-query;branch=master" S = "${WORKDIR}/git" -- cgit v1.2.3 From 63517b9a1cc2bae8280ae7f977c545f58f2d86c1 Mon Sep 17 00:00:00 2001 From: John Klug Date: Fri, 20 Dec 2019 17:08:27 -0600 Subject: Do not start ntpd without GPS unless configured --- recipes-support/ntp/files/ntpd-init.patch | 31 ++++++++++++++++++++++++++----- recipes-support/ntp/ntp_%.bbappend | 4 +++- 2 files changed, 29 insertions(+), 6 deletions(-) (limited to 'recipes-support') diff --git a/recipes-support/ntp/files/ntpd-init.patch b/recipes-support/ntp/files/ntpd-init.patch index e3107e1..3f8129a 100644 --- a/recipes-support/ntp/files/ntpd-init.patch +++ b/recipes-support/ntp/files/ntpd-init.patch @@ -1,6 +1,6 @@ diff -Naru orig/ntpd new/ntpd ---- orig/ntpd 2019-03-18 10:49:41.255374972 -0500 -+++ new/ntpd 2019-03-18 11:36:56.635291031 -0500 +--- orig/ntpd 2019-12-20 15:28:43.002031942 -0600 ++++ new/ntpd 2019-12-20 15:32:59.138024359 -0600 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash @@ -17,7 +17,28 @@ diff -Naru orig/ntpd new/ntpd DAEMON=/usr/sbin/ntpd PIDFILE=/var/run/ntpd.pid -@@ -34,13 +36,40 @@ +@@ -22,6 +24,20 @@ + + # Source function library. + . /etc/init.d/functions ++has_gps=0 ++if [[ -f /sys/devices/platform/mts-io/capability/gps ]] ; then ++ has_gps=$(cat /sys/devices/platform/mts-io/capability/gps) ++fi ++ ++if (( has_gps == 0 )) ; then ++ if [[ -n ${CONFIGFILE_sha256} ]] ; then ++ NEWCONFIGFILE_sha256=$(sha256sum $CONFIGFILE) ++ if [[ $NEWCONFIGFILE_sha256 =~ $CONFIGFILE_sha256 ]] ; then ++ logger -p daemon.notice -s -t etc_ntpd "No GPS, need to configure /etc/ntp.conf" ++ exit 0 ++ fi ++ fi ++fi + + # Functions to do individual actions + settick(){ +@@ -34,13 +50,40 @@ } } startdaemon(){ @@ -30,7 +51,7 @@ diff -Naru orig/ntpd new/ntpd - echo "done" + /usr/sbin/start-stop-daemon -N -20 --start -x /usr/sbin/ntpd --test -- -u ntp:ntp -p /var/run/ntp.pid "$@" \ + || return 1 -+ if [[ -x /usr/sbin/gpsd_settime ]] && ((GPSD_REQUIRED == 1)) && (( $(/usr/sbin/mts-io-sysfs show capability/gps) == 1 )) && [[ -f "${GNSSRST}" ]]; then ++ if [[ -x /usr/sbin/gpsd_settime ]] && ((GPSD_REQUIRED == 1)) && (( has_gps == 1 )) && [[ -f "${GNSSRST}" ]]; then + . /etc/default/gpsd + [[ ${VERBOSE} != no ]] && logger -t 'etc_ntpd' -p daemon.info 'Have a GPS and it is required' + if ((SET_SYSTEM_CLOCK == 1)) && /usr/sbin/gpsd_settime ; then @@ -65,7 +86,7 @@ diff -Naru orig/ntpd new/ntpd } stopdaemon(){ echo -n "Stopping ntpd: " -@@ -50,8 +79,22 @@ +@@ -50,8 +93,22 @@ case "$1" in start) diff --git a/recipes-support/ntp/ntp_%.bbappend b/recipes-support/ntp/ntp_%.bbappend index c69eff0..436164a 100644 --- a/recipes-support/ntp/ntp_%.bbappend +++ b/recipes-support/ntp/ntp_%.bbappend @@ -1,4 +1,4 @@ -PR .= ".mlinux5" +PR .= ".mlinux6" SRC_URI += " file://ntpd-default \ file://ntp.conf.patch;patchdir=.. \ @@ -23,6 +23,8 @@ do_install_append() { touch ${drfile} chmod 664 ${drfile} chown -R ntp:ntp ${drdir} + tmp=$(sha256sum ${D}${sysconfdir}/ntp.conf | sed 's/ .*//') + echo "CONFIGFILE_sha256=${tmp}" >> ${D}${sysconfdir}/default/ntpd.default } pkg_postinst_${PN}_append() { update-alternatives --install ${sysconfdir}/default/ntpd ntpd-defaults ${sysconfdir}/default/ntpd.default 10 -- cgit v1.2.3 From 89f4bd5d090a0934c709405eb90dd241339626a9 Mon Sep 17 00:00:00 2001 From: Jason Reiss Date: Tue, 31 Dec 2019 14:32:12 -0600 Subject: lora: update to LNS 2.3.3, requires mosquitto 1.5.1 and jsoncpp changes --- recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile | 21 ++++++++++++--------- recipes-support/jsoncpp/jsoncpp_1.6.0.bb | 19 +++++++++---------- 2 files changed, 21 insertions(+), 19 deletions(-) (limited to 'recipes-support') diff --git a/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile b/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile index 3be3743..7df3d63 100644 --- a/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile +++ b/recipes-support/jsoncpp/jsoncpp-1.6.0/Makefile @@ -16,29 +16,32 @@ json_reader.d \ json_value.d \ json_writer.d -all: libjsoncpp.a +TARGET = libjsoncpp.so -libjsoncpp.a: $(OBJS) +all: $(TARGET) + +libjsoncpp.so: $(OBJS) @echo 'Building target: $@' - $(AR) -r libjsoncpp.a $(OBJS) + #$(AR) -r libjsoncpp.a $(OBJS) + $(CXX) ${LDFLAGS} -shared -o $@ $^ @echo 'Finished building target: $@' @echo ' ' %.o: src/lib_json/%.cpp @echo 'Building file: $<' - $(CXX) $(CFLAGS) -Iinclude -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<" + $(CXX) $(CFLAGS) -Iinclude -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -fPIC -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' install: - mkdir -p $(DESTDIR)$(libdir) - mkdir -p $(DESTDIR)$(includedir)/jsoncpp/json - cp libjsoncpp.a $(DESTDIR)$(libdir)/ - cp include/json/* $(DESTDIR)$(includedir)/jsoncpp/json/ + install -d $(DESTDIR)/usr/include/json + install -m 644 include/json/*.h $(DESTDIR)/usr/include/json + mkdir -p $(DESTDIR)/usr/lib + cp libjsoncpp.so $(DESTDIR)/usr/lib # Other Targets clean: - -$(RM) $(OBJS)$(CPP_DEPS) libjsoncpp.a + -$(RM) $(OBJS)$(CPP_DEPS) libjsoncpp.so -@echo ' ' .PHONY: all clean dependents diff --git a/recipes-support/jsoncpp/jsoncpp_1.6.0.bb b/recipes-support/jsoncpp/jsoncpp_1.6.0.bb index 80f3f70..8c8454d 100644 --- a/recipes-support/jsoncpp/jsoncpp_1.6.0.bb +++ b/recipes-support/jsoncpp/jsoncpp_1.6.0.bb @@ -4,10 +4,6 @@ HOMEPAGE = "https://github.com/open-source-parsers/jsoncpp" LICENSE = "PD" LIC_FILES_CHKSUM = "file://LICENSE;md5=c56ee55c03a55f8105b969d8270632ce" DEPENDS = "" -BBCLASSEXTEND = "native" - -# static lib only, require staticdev -RDEPENDS_${PN}-dev = "${PN}-staticdev" #tag 1.6.0 SRCREV="cbe7e7c9cbd39d864588c5cf2436690634562d3f" @@ -16,7 +12,7 @@ SRC_URI = " git://github.com/open-source-parsers/jsoncpp.git;protocol=git \ file://Makefile \ " -PR = "r1" +PR = "r6" S = "${WORKDIR}/git" @@ -25,10 +21,13 @@ do_compile() { oe_runmake } -do_install() { - oe_runmake install DESTDIR=${D} +do_install () { + install -d ${D}/usr/lib + install -m 0755 ${S}/libjsoncpp.so ${D}/usr/lib + install -d ${D}${includedir}/jsoncpp/json + install -m 0755 ${S}/include/json/*.h ${D}${includedir}/jsoncpp/json } -# this recipe provides dev packages only (static lib) -PACKAGES = "${PN}-dev ${PN}-staticdev ${PN}-dbg" - +FILES_SOLIBSDEV = "" +FILES_${PN} += "${libdir}/*.so" +FILES_{PN}-dev += "${libdir}/*.so" -- cgit v1.2.3