mpower-dev-thud: merge meta-mlinux:master (92cbb8fb Feb 11 2020) to meta-mlinux:multiarch5-thud (ed01626 Feb 3 2020)

9 files changed, 29 insertions, 200 deletions

diff --git a/recipes-support/multitech/jsparser/Makefile b/recipes-support/multitech/jsparser/Makefile
deleted file mode 100644
index 8fe64f6..0000000
--- a/recipes-support/multitech/jsparser/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-
-includedir ?= /usr/include
-libdir ?= /usr/lib
-
-LIBS := -lmts -ljsoncpp -lrt
-
-OBJS += \
-Version.o \
-main.o
-
-CPP_DEPS += \
-Version.d \
-main.d
-
-all: postbuild
-
-prebuild:
-	@echo PRE-BUILD
-	@echo 'Removing previous version components started'
-	-$(RM) Version.o
-	-$(RM) Version.d
-	-$(RM) Version.cpp
-	@echo 'Removing previous version components complete'
-	@echo ' '
-	
-postbuild: mainbuild
-	@echo POST-BUILD
-	@echo ' '
-
-mainbuild: prebuild
-	@echo MAIN-BUILD
-	@$(MAKE) --no-print-directory target
-
-target: $(OBJS)
-	@echo 'Building target: $@'
-	$(CXX) $(CFLAGS) $(LDFLAGS) -o jsparser $(OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-Version.o: Version.cpp
-	@echo 'Building file: $<'
-	$(CXX) $(CFLAGS) -Iinclude -Wall -c -std=c++0x -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-Version.cpp:
-	@echo 'Creating file: Version.cpp'
-	/bin/echo -e "//Pre-Build Auto-Generated Source\n#include \"Version.h\"\n\nconst std::string Version::version(\"$(shell git describe)\");" > Version.cpp
-	@echo 'Finished creating: Version.cpp'
-	@echo ' '
-
-main.o: main.cpp
-	@echo 'Building file: $<'
-	$(CXX) $(CFLAGS) -I=$(includedir)/jsoncpp -Wall -c -std=c++0x -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-install:
-	install -d $(DESTDIR)/usr/bin
-	install -m 0755 jsparser $(DESTDIR)/usr/bin
-
-clean:
-	-$(RM) $(OBJS) $(CPP_DEPS) jsparser
-	-@echo ' '
-
-.PHONY: all clean dependents install target
-.SECONDARY:
-
-
diff --git a/recipes-support/multitech/libmts-io/Makefile b/recipes-support/multitech/libmts-io/Makefile
deleted file mode 100644
index dc37858..0000000
--- a/recipes-support/multitech/libmts-io/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-include version
-
-APPNAME = libmts-io
-SONAME = $(APPNAME).so.$(VERSION)
-libdir ?= /usr/lib
-
-OBJS += \
-	src/MTS_IO_TelitRadio.o \
-	src/MTS_IO_EG95Radio.o \
-	src/MTS_IO_QuectelRadio.o \
-	src/MTS_IO_CdmaRadio.o \
-	src/MTS_IO_CE910Radio.o \
-	src/MTS_IO_CellularRadio.o \
-	src/MTS_IO_ICellularRadio.o \
-	src/MTS_IO_CellularRadioFactory.o \
-	src/MTS_IO_Connection.o \
-	src/MTS_IO_DE910Radio.o \
-	src/MTS_IO_GE910Radio.o \
-	src/MTS_IO_HE910Radio.o \
-	src/MTS_IO_HE910DRadio.o \
-	src/MTS_IO_HE910EUDRadio.o \
-	src/MTS_IO_LE910JN1Radio.o \
-	src/MTS_IO_LE866Radio.o \
-	src/MTS_IO_LE866A1JSRadio.o \
-	src/MTS_IO_LE910Radio.o \
-	src/MTS_IO_LE910NAGRadio.o \
-	src/MTS_IO_LE910C4NFRadio.o \
-	src/MTS_IO_LE910NA1Radio.o \
-	src/MTS_IO_LE910SVGRadio.o \
-	src/MTS_IO_LE910EUGRadio.o \
-	src/MTS_IO_LE910C4EURadio.o \
-	src/MTS_IO_LE910EU1Radio.o \
-	src/MTS_IO_LE910C1NSRadio.o \
-	src/MTS_IO_LE910C1APRadio.o \
-	src/MTS_IO_ME910C1NARadio.o \
-	src/MTS_IO_ME910C1NVRadio.o \
-	src/MTS_IO_ME910C1WWRadio.o \
-	src/MTS_IO_ME910Radio.o \
-	src/MTS_IO_LockFile.o \
-	src/MTS_IO_MccMncTable.o \
-	src/MTS_IO_SerialConnection.o
-
-CC := $(CXX)
-CXXFLAGS += -Wall -std=c++0x -fmessage-length=0 -fPIC -fvisibility=hidden -fvisibility-inlines-hidden
-CPPFLAGS += -I=/usr/include/jsoncpp -Iinclude
-LDFLAGS += -s -shared -Wl,-soname,$(APPNAME).so.0
-
-.PHONY: all clean install
-
-all: $(APPNAME).a $(SONAME)
-
-$(APPNAME).a: $(OBJS)
-	$(AR) -rs $@ $?
-
-$(SONAME): $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $+ $(LDLIBS)
-
-# Handle header dependencies
-DEPS = $(OBJS:.o=.d)
-CPPFLAGS += -MMD
--include $(DEPS)
-
-install:
-	mkdir -p $(DESTDIR)$(libdir)
-	mkdir -p $(DESTDIR)$(includedir)/mts
-	install -m 0644 $(APPNAME).a $(SONAME) $(DESTDIR)$(libdir)/
-	ln -sf $(SONAME) $(DESTDIR)$(libdir)/$(APPNAME).so.0
-	ln -sf $(SONAME) $(DESTDIR)$(libdir)/$(APPNAME).so
-	install -m 0644 include/mts/* $(DESTDIR)$(includedir)/mts/
-
-clean:
-	$(RM) $(OBJS) $(APPNAME).a $(SONAME) $(DEPS)
-
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 cb788ca..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 nativesdk"
-
-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.13.bb b/recipes-support/multitech/libmts-io_1.0.19.bb
index 34115be..34115be 100644
--- a/recipes-support/multitech/libmts-io_1.0.13.bb
+++ b/recipes-support/multitech/libmts-io_1.0.19.bb
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 822f178..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"
-RDEPENDS_${PN} += "jsoncpp"
-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.2.bb b/recipes-support/multitech/radio-cmd_0.6.bb
index b8e5b23..b8e5b23 100644
--- a/recipes-support/multitech/radio-cmd_0.2.bb
+++ b/recipes-support/multitech/radio-cmd_0.6.bb
diff --git a/recipes-support/multitech/radio-query_0.7.bb b/recipes-support/multitech/radio-query_0.8.bb
index 7ce0976..7ce0976 100644
--- a/recipes-support/multitech/radio-query_0.7.bb
+++ b/recipes-support/multitech/radio-query_0.8.bb
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