From 686c770112a5dd9738d385b490678593a024d8cc Mon Sep 17 00:00:00 2001 From: Mark Riddoch Date: Mon, 13 May 2019 11:07:56 +0000 Subject: [PATCH 1/4] FOGL-2785 Correct company name in license file --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index a4d3b5d..1ec4087 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018 Dianomic Systems + Copyright 2018 Dianomic Systems Inc Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 41481d87365f360ef1d33b2d483ffd84c7fc4188 Mon Sep 17 00:00:00 2001 From: ashish-jabble Date: Tue, 14 May 2019 17:54:25 +0530 Subject: [PATCH 2/4] RPM packaging restricted for AM2315 --- Description | 1 + Package | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 Description create mode 100644 Package diff --git a/Description b/Description new file mode 100644 index 0000000..b8e0113 --- /dev/null +++ b/Description @@ -0,0 +1 @@ +FogLAMP South DHT11 plugin for Raspberry PI \ No newline at end of file diff --git a/Package b/Package new file mode 100644 index 0000000..1770bf5 --- /dev/null +++ b/Package @@ -0,0 +1,32 @@ +# A set of variables that define how we package this repository +# +plugin_name=dht11 +plugin_type=south +plugin_install_dirname=${plugin_name} + +# Now build up the runtime requirements list. This has 3 components +# 1. Generic packages we depend on in all architectures and package managers +# 2. Architecture specific packages we depend on +# 3. Package manager specific packages we depend on +requirements="foglamp,wiringpi" + +case "$arch" in + x86_64) + ;; + armhf) + ;; + aarch64) + ;; +esac +case "$package_manager" in + deb) + if [ "$arch" != "armhf" ]; then + echo "Deb Package building for ${plugin_name} is only supported on armhf architecture!!" + exit 0 + fi + ;; + rpm) + echo "RPM Package building for ${plugin_name} is not supported on $arch architecture!!" + exit 0 + ;; +esac From 510aa361d25281856aec42612c4280abf85b2016 Mon Sep 17 00:00:00 2001 From: Mark Riddoch Date: Wed, 22 May 2019 10:27:48 +0000 Subject: [PATCH 3/4] FOGL-2771 Add dht11 Coral Package --- make_deb | 19 ++++++++----- packages/Debian/arm64/DEBIAN/control | 10 +++++++ packages/Debian/arm64/DEBIAN/postinst | 40 +++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 packages/Debian/arm64/DEBIAN/control create mode 100755 packages/Debian/arm64/DEBIAN/postinst diff --git a/make_deb b/make_deb index 9cef37c..c23a61e 100755 --- a/make_deb +++ b/make_deb @@ -61,13 +61,18 @@ do done -# If the architecture has not been defined, then the script is complete -if [ "$(dpkg --print-architecture)" != "armhf" ]; then - echo "Package building is only supported on armhf architecture!!" - exit 0 -fi - -architecture="armhf" +architecture="$(dpkg --print-architecture)" + +case "${architecture}" in + arm64) + ;; + armhf) + ;; + *) + echo "Package building is only supported on arm architectures!!" + exit 0 + ;; +esac version=`cat ${GIT_ROOT}/VERSION.south.dht11 | tr -d ' ' | grep 'foglamp_south_dht11_version=' | head -1 | sed -e 's/\(.*\)=\(.*\)/\2/g'` foglamp_version=`cat ${GIT_ROOT}/VERSION.south.dht11 | tr -d ' ' | grep 'foglamp_version' | head -1 | sed -e 's/\(.*\)version\(.*\)/\2/g'` diff --git a/packages/Debian/arm64/DEBIAN/control b/packages/Debian/arm64/DEBIAN/control new file mode 100644 index 0000000..dc80c64 --- /dev/null +++ b/packages/Debian/arm64/DEBIAN/control @@ -0,0 +1,10 @@ +Package: foglamp-south-dht11 +Version: 1.0.0 +Section: devel +Priority: optional +Architecture: armh64 +Depends: foglamp,wiringpi +Conflicts: +Maintainer: Dianomic Systems, Inc. +Homepage: http://www.dianomic.com +Description: South plugin for the DHT11 diff --git a/packages/Debian/arm64/DEBIAN/postinst b/packages/Debian/arm64/DEBIAN/postinst new file mode 100755 index 0000000..f2c6324 --- /dev/null +++ b/packages/Debian/arm64/DEBIAN/postinst @@ -0,0 +1,40 @@ +#!/bin/sh + +##-------------------------------------------------------------------- +## Copyright (c) 2019 Dianomic Systems Inc +## +## Licensed under the Apache License, Version 2.0 (the "License"); +## you may not use this file except in compliance with the License. +## You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +##-------------------------------------------------------------------- + +##-------------------------------------------------------------------- +## +## @postinst DEBIAN/postinst +## This script is used to execute post installation tasks. +## +## Author: Ivan Zoratti, Praveen Garg, Mark Riddoch +## +##-------------------------------------------------------------------- + +set -e + +install_deps () { + pip3 install -Ir /usr/local/foglamp/python/requirements-dht.txt --no-cache-dir +} + +set_files_ownership () { + chown -R root:root /usr/local/foglamp/python/foglamp/plugins/south/dht11 +} + +install_deps +set_files_ownership +echo "dht11 plugin installed." From 2b9c6de169ed6e966413587c75b47362b5414460 Mon Sep 17 00:00:00 2001 From: dianomicbot Date: Wed, 22 May 2019 12:06:38 +0000 Subject: [PATCH 4/4] VERSION changed --- VERSION.south.dht11 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION.south.dht11 b/VERSION.south.dht11 index d273ee7..93328c2 100644 --- a/VERSION.south.dht11 +++ b/VERSION.south.dht11 @@ -1,2 +1,2 @@ -foglamp_south_dht11_version=1.5.2 -foglamp_version>=1.5 +foglamp_south_dht11_version=1.6.0 +foglamp_version>=1.6