220819

pozsarzs · Aug 19, 2022 · 3b96a66 · 3b96a66
1 parent 7e19c8f
commit 3b96a66
Show file tree

Hide file tree

Showing 24 changed files with 79 additions and 70 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ GitHub: <https://github.com/pozsarzs/mm8d-sw>
 
  - architecture:       amd64, armhf, i386
  - operation system:   Raspbian OS, Debian GNU/Linux
- - version:            v0.3
+ - version:            v0.3.1
  - language:           en (hu)
  - licence:            EUPL v1.1
  - user interface:     CLI, TUI, WUI

diff --git a/documents/INSTALL.pc b/documents/INSTALL.pc
@@ -7,9 +7,9 @@ network.
 
 Installation
 ~~~~~~~~~~~~
-  $ tar -xzf mm8d-sw-0.3-i386.tar.gz
+  $ tar -xzf mm8d-sw-0.3.1-i386.tar.gz
                   or
-  $ tar -xzf mm8d-sw-0.3-amd64.tar.gz
+  $ tar -xzf mm8d-sw-0.3.1-amd64.tar.gz
 
   $ cd mm8d-sw
   $ ./prepare

diff --git a/documents/INSTALL.raspi b/documents/INSTALL.raspi
@@ -7,7 +7,7 @@ and enable SPI module.
 
 Installation
 ~~~~~~~~~~~~
-  $ tar -xzf mm8d-sw-0.3-armhf.tar.gz
+  $ tar -xzf mm8d-sw-0.3.1-armhf.tar.gz
   $ cd mm8d-sw
   $ sudo raspi-config
   $ ./prepare

diff --git a/documents/README b/documents/README
@@ -17,7 +17,7 @@ it with SSH client.
 Requirements:
 
   Hardware: Raspberry Pi 3 Model B.
-  Software: Raspbian OS Lite,
+  Software: Raspberry Pi OS Lite,
             Apache webserver,
             GNUPlot,
             Perl,
@@ -34,20 +34,20 @@ Requirements:
 ------------------------------------------
 a. Visit homepage (see later) to download installer packages:
 
-  Raspbian OS:      mm8d-sw-0.3-armhf.tar.gz
+  Raspberry Pi OS:  mm8d-sw-0.3.1-armhf.tar.gz
 
-                    mm8d-eec_0.3-1_armhf.deb
-                    mm8d-sw_0.3-1_armhf.deb
-                    mm8d-web_0.3-1_all.deb
+                    mm8d-eec_0.3.1-1_armhf.deb
+                    mm8d-sw_0.3.1-1_armhf.deb
+                    mm8d-web_0.3.1-1_all.deb
 
-  Debian GNU/Linux: mm8d-sw-0.3-i386.tar.gz
-                    mm8d-sw-0.3-amd64.tar.gz
+  Debian GNU/Linux: mm8d-sw-0.3.1-i386.tar.gz
+                    mm8d-sw-0.3.1-amd64.tar.gz
 
-                    mm8d-eec_0.3-1_i386.deb
-                    mm8d-sw_0.3-1_i386.deb
-                    mm8d-eec_0.3-1_amd64.deb
-                    mm8d-sw_0.3-1_amd64.deb
-                    mm8d-web_0.3-1_all.deb
+                    mm8d-eec_0.3.1-1_i386.deb
+                    mm8d-sw_0.3.1-1_i386.deb
+                    mm8d-eec_0.3.1-1_amd64.deb
+                    mm8d-sw_0.3.1-1_amd64.deb
+                    mm8d-web_0.3.1-1_all.deb
 
 b. Download from Github
 

diff --git a/documents/VERSION b/documents/VERSION
@@ -1,2 +1,2 @@
-0.3
+0.3.1
 
diff --git a/documents/changelog b/documents/changelog
@@ -1,3 +1,9 @@
+ MM8D (0.3.1) unstable; urgency=low
+
+  * Some bugfix.
+
+ -- Pozsár Zsolt <pozsar.zsolt@szerafingomba.hu>  Fri, 19 Aug 2022 15:44:00
+
  MM8D (0.3) unstable; urgency=low
 
   * New option is in envir-ch?.ini files.

diff --git a/packaging/eec-amd64/control b/packaging/eec-amd64/control
@@ -1,5 +1,5 @@
 Package: mm8d-eec
-Version: 0.3
+Version: 0.3.1
 Section: misc
 Priority: optional
 Architecture: amd64

diff --git a/packaging/eec-amd64/md5sums b/packaging/eec-amd64/md5sums
@@ -1,6 +1,6 @@
 15240e9b2145b018a11c8bb567d79855  usr/bin/mm8d-editenvirconf
 ce1ee68fa77c6bc5fe110988c7d8504c  usr/bin/mm8d-editenvirconf.bin
 e8f18d402b848b55b2f347f4919f9466  usr/bin/mm8d-editirrconf.bin
-87a27995f527d22f805b39214d8501b2  usr/share/doc/mm8d-eec/changelog.gz
+b1e3dccc5617ace5653eef2fcef0b234  usr/share/doc/mm8d-eec/changelog.gz
 40a29a5ec427fc848370a7b2ee2f3aaf  usr/share/doc/mm8d-eec/copyright
 1bb6ed72868793b39f8155d427fb0caf  usr/share/man/man1/mm8d-editenvirconf.1.gz
diff --git a/packaging/eec-armhf/control b/packaging/eec-armhf/control
@@ -1,5 +1,5 @@
 Package: mm8d-eec
-Version: 0.3
+Version: 0.3.1
 Section: misc
 Priority: optional
 Architecture: armhf

diff --git a/packaging/eec-armhf/md5sums b/packaging/eec-armhf/md5sums
@@ -1,6 +1,6 @@
 15240e9b2145b018a11c8bb567d79855  usr/bin/mm8d-editenvirconf
 db7efb2dcdb5e2a7631c8502492a07ce  usr/bin/mm8d-editenvirconf.bin
 d77b7a4c723130bc0ec2fa440a335c77  usr/bin/mm8d-editirrconf.bin
-87a27995f527d22f805b39214d8501b2  usr/share/doc/mm8d-eec/changelog.gz
+b1e3dccc5617ace5653eef2fcef0b234  usr/share/doc/mm8d-eec/changelog.gz
 40a29a5ec427fc848370a7b2ee2f3aaf  usr/share/doc/mm8d-eec/copyright
 1bb6ed72868793b39f8155d427fb0caf  usr/share/man/man1/mm8d-editenvirconf.1.gz
diff --git a/packaging/eec-i386/control b/packaging/eec-i386/control
@@ -1,5 +1,5 @@
 Package: mm8d-eec
-Version: 0.3
+Version: 0.3.1
 Section: misc
 Priority: optional
 Architecture: i386

diff --git a/packaging/eec-i386/md5sums b/packaging/eec-i386/md5sums
@@ -1,6 +1,6 @@
 15240e9b2145b018a11c8bb567d79855  usr/bin/mm8d-editenvirconf
 014557b957810bd954e1720890542cf5  usr/bin/mm8d-editenvirconf.bin
 e639ac730d9f593bb8898a0e0e61940b  usr/bin/mm8d-editirrconf.bin
-87a27995f527d22f805b39214d8501b2  usr/share/doc/mm8d-eec/changelog.gz
+b1e3dccc5617ace5653eef2fcef0b234  usr/share/doc/mm8d-eec/changelog.gz
 40a29a5ec427fc848370a7b2ee2f3aaf  usr/share/doc/mm8d-eec/copyright
 1bb6ed72868793b39f8155d427fb0caf  usr/share/man/man1/mm8d-editenvirconf.1.gz
diff --git a/packaging/sw-amd64/control b/packaging/sw-amd64/control
@@ -1,5 +1,5 @@
 Package: mm8d-sw
-Version: 0.3
+Version: 0.3.1
 Section: misc
 Priority: optional
 Architecture: amd64

diff --git a/packaging/sw-amd64/md5sums b/packaging/sw-amd64/md5sums
@@ -9,12 +9,12 @@ cbf13c5b5eab95588d40057c5d8a25b5  etc/mm8d/envir-ch6.ini
 66b4c6be7e74f6d0f78d788e6b3faeeb  etc/mm8d/envir-ch7.ini
 cbf13c5b5eab95588d40057c5d8a25b5  etc/mm8d/envir-ch8.ini
 4b2d02738a8772541365c796f302eb89  etc/mm8d/irrigator.ini
-c7eb4b34176304eedf48b77eea06f125  etc/mm8d/mm8d.ini
-915852a552aa31f5e587482ada837f24  etc/motd
+49170d5a4136c85cf7cfaa1077c64ebe  etc/mm8d/mm8d.ini
+2051674256c7aa741737aee3c45c749d  etc/motd
 68b8e15cd6dd84a3d6a618d2627c5624  etc/systemd/system/mm8d.service
 02676cff2a984e8647256179988cbd3b  usr/bin/mm8d-editmainconf
 7e1f78a9139d54d49b71c7d9cf509396  usr/bin/mm8d-editmainconf.bin
-14659c16f87dc503031241e104f1dc6f  usr/bin/mm8d-hwtest.py
+1a98708c16c30a33d77e5692015c1bba  usr/bin/mm8d-hwtest.py
 eb6fc0da3a3de5d540502b21782e3d81  usr/bin/mm8d-maintainlog
 f33b52addb978f5760843b526242f199  usr/bin/mm8d-override
 23f7c97757f05adc4c765eb39e07b4a2  usr/bin/mm8d-override.bin
@@ -26,15 +26,13 @@ f33b52addb978f5760843b526242f199  usr/bin/mm8d-override
 6745e971c21f4f509aa083a8ca52c418  usr/bin/mm8d-webpage
 4994f4cacf022e01ffda29f5627f7ab5  usr/share/doc/mm8d-sw/AUTHORS
 3e903caeb6f5ff4c77a30787ea99357c  usr/share/doc/mm8d-sw/cgiprogs.txt
-87a27995f527d22f805b39214d8501b2  usr/share/doc/mm8d-sw/changelog.gz
+b1e3dccc5617ace5653eef2fcef0b234  usr/share/doc/mm8d-sw/changelog.gz
 9b2c3ec44e9d23c64ebebd66ec3f5f3a  usr/share/doc/mm8d-sw/connecting.txt
 40a29a5ec427fc848370a7b2ee2f3aaf  usr/share/doc/mm8d-sw/copyright
 4a5b8c152d83b4d853c9f8f3d7a6dd77  usr/share/doc/mm8d-sw/exitcodes.txt
-abe49b1c0d175f96b8a34e82b356662a  usr/share/doc/mm8d-sw/INSTALL.pc
-771679cbc5b22ed033b4af59dadd04ad  usr/share/doc/mm8d-sw/INSTALL.raspi
 13485c77bf7293fa03d4cdea3f088cb2  usr/share/doc/mm8d-sw/logfiles.txt
-d706a7bc6360f712403559547cc4b836  usr/share/doc/mm8d-sw/README
-f4b5992df2bbde4ae95c396ed9be98e3  usr/share/doc/mm8d-sw/VERSION
+794e03bfdd4312b46638ec4d2e15fd86  usr/share/doc/mm8d-sw/README
+b013832b4ea8cb744edf94de94038b96  usr/share/doc/mm8d-sw/VERSION
 36e5effed48029b3789760fbcd2fcef7  usr/share/man/man1/mm8d-editmainconf.1.gz
 e7e40dce0a31bdf655496960c78d7606  usr/share/man/man1/mm8d-hwtest.py.1.gz
 d0c1de7e4b022ee5f742f79e45025d75  usr/share/man/man1/mm8d-maintainlog.1.gz

diff --git a/packaging/sw-amd64/postinst b/packaging/sw-amd64/postinst
@@ -5,11 +5,14 @@ if [ "$1" = "configure" ]; then
     ln -sf /usr/share/doc/mm8d-sw /usr/doc/mm8d-sw
   fi
 fi
-cd /tmp/
-wget http://portio.inrim.it/portio-0.5.tar.gz
-tar -xzf portio-0.5.tar.gz
-cd portio-0.5
-python3 setup.py install
+if [ "$ARCH" != "armhf" ]
+then
+  cd /tmp/
+  wget http://portio.inrim.it/portio-0.5.tar.gz
+  tar -xzf portio-0.5.tar.gz
+  cd portio-0.5
+  python3 setup.py install
+fi
 mkdir --parents /var/lib/mm8d/
 invoke-rc.d mm8d.sh stop
 ln -sf /etc/init.d/mm8d.sh /etc/rc0.d/K01mm8d.sh

diff --git a/packaging/sw-armhf/control b/packaging/sw-armhf/control
@@ -1,5 +1,5 @@
 Package: mm8d-sw
-Version: 0.3
+Version: 0.3.1
 Section: misc
 Priority: optional
 Architecture: armhf

diff --git a/packaging/sw-armhf/md5sums b/packaging/sw-armhf/md5sums
@@ -9,12 +9,12 @@ cbf13c5b5eab95588d40057c5d8a25b5  etc/mm8d/envir-ch6.ini
 66b4c6be7e74f6d0f78d788e6b3faeeb  etc/mm8d/envir-ch7.ini
 cbf13c5b5eab95588d40057c5d8a25b5  etc/mm8d/envir-ch8.ini
 4b2d02738a8772541365c796f302eb89  etc/mm8d/irrigator.ini
-c7eb4b34176304eedf48b77eea06f125  etc/mm8d/mm8d.ini
-915852a552aa31f5e587482ada837f24  etc/motd
+49170d5a4136c85cf7cfaa1077c64ebe  etc/mm8d/mm8d.ini
+2051674256c7aa741737aee3c45c749d  etc/motd
 68b8e15cd6dd84a3d6a618d2627c5624  etc/systemd/system/mm8d.service
 02676cff2a984e8647256179988cbd3b  usr/bin/mm8d-editmainconf
 2bec118a22e197aa6e5d999a1146d015  usr/bin/mm8d-editmainconf.bin
-14659c16f87dc503031241e104f1dc6f  usr/bin/mm8d-hwtest.py
+1a98708c16c30a33d77e5692015c1bba  usr/bin/mm8d-hwtest.py
 eb6fc0da3a3de5d540502b21782e3d81  usr/bin/mm8d-maintainlog
 f33b52addb978f5760843b526242f199  usr/bin/mm8d-override
 4948c4cc69e833dd22c0c0942ddf1eb9  usr/bin/mm8d-override.bin
@@ -26,15 +26,13 @@ f33b52addb978f5760843b526242f199  usr/bin/mm8d-override
 6745e971c21f4f509aa083a8ca52c418  usr/bin/mm8d-webpage
 4994f4cacf022e01ffda29f5627f7ab5  usr/share/doc/mm8d-sw/AUTHORS
 3e903caeb6f5ff4c77a30787ea99357c  usr/share/doc/mm8d-sw/cgiprogs.txt
-87a27995f527d22f805b39214d8501b2  usr/share/doc/mm8d-sw/changelog.gz
+b1e3dccc5617ace5653eef2fcef0b234  usr/share/doc/mm8d-sw/changelog.gz
 9b2c3ec44e9d23c64ebebd66ec3f5f3a  usr/share/doc/mm8d-sw/connecting.txt
 40a29a5ec427fc848370a7b2ee2f3aaf  usr/share/doc/mm8d-sw/copyright
 4a5b8c152d83b4d853c9f8f3d7a6dd77  usr/share/doc/mm8d-sw/exitcodes.txt
-abe49b1c0d175f96b8a34e82b356662a  usr/share/doc/mm8d-sw/INSTALL.pc
-771679cbc5b22ed033b4af59dadd04ad  usr/share/doc/mm8d-sw/INSTALL.raspi
 13485c77bf7293fa03d4cdea3f088cb2  usr/share/doc/mm8d-sw/logfiles.txt
-d706a7bc6360f712403559547cc4b836  usr/share/doc/mm8d-sw/README
-f4b5992df2bbde4ae95c396ed9be98e3  usr/share/doc/mm8d-sw/VERSION
+794e03bfdd4312b46638ec4d2e15fd86  usr/share/doc/mm8d-sw/README
+b013832b4ea8cb744edf94de94038b96  usr/share/doc/mm8d-sw/VERSION
 36e5effed48029b3789760fbcd2fcef7  usr/share/man/man1/mm8d-editmainconf.1.gz
 e7e40dce0a31bdf655496960c78d7606  usr/share/man/man1/mm8d-hwtest.py.1.gz
 d0c1de7e4b022ee5f742f79e45025d75  usr/share/man/man1/mm8d-maintainlog.1.gz

diff --git a/packaging/sw-armhf/postinst b/packaging/sw-armhf/postinst
@@ -5,11 +5,14 @@ if [ "$1" = "configure" ]; then
     ln -sf /usr/share/doc/mm8d-sw /usr/doc/mm8d-sw
   fi
 fi
-cd /tmp/
-wget http://portio.inrim.it/portio-0.5.tar.gz
-tar -xzf portio-0.5.tar.gz
-cd portio-0.5
-python3 setup.py install
+if [ "$ARCH" != "armhf" ]
+then
+  cd /tmp/
+  wget http://portio.inrim.it/portio-0.5.tar.gz
+  tar -xzf portio-0.5.tar.gz
+  cd portio-0.5
+  python3 setup.py install
+fi
 mkdir --parents /var/lib/mm8d/
 invoke-rc.d mm8d.sh stop
 ln -sf /etc/init.d/mm8d.sh /etc/rc0.d/K01mm8d.sh

diff --git a/packaging/sw-i386/control b/packaging/sw-i386/control
@@ -1,5 +1,5 @@
 Package: mm8d-sw
-Version: 0.3
+Version: 0.3.1
 Section: misc
 Priority: optional
 Architecture: i386

diff --git a/packaging/sw-i386/md5sums b/packaging/sw-i386/md5sums
@@ -9,12 +9,12 @@ cbf13c5b5eab95588d40057c5d8a25b5  etc/mm8d/envir-ch6.ini
 66b4c6be7e74f6d0f78d788e6b3faeeb  etc/mm8d/envir-ch7.ini
 cbf13c5b5eab95588d40057c5d8a25b5  etc/mm8d/envir-ch8.ini
 4b2d02738a8772541365c796f302eb89  etc/mm8d/irrigator.ini
-c7eb4b34176304eedf48b77eea06f125  etc/mm8d/mm8d.ini
-915852a552aa31f5e587482ada837f24  etc/motd
+49170d5a4136c85cf7cfaa1077c64ebe  etc/mm8d/mm8d.ini
+2051674256c7aa741737aee3c45c749d  etc/motd
 68b8e15cd6dd84a3d6a618d2627c5624  etc/systemd/system/mm8d.service
 02676cff2a984e8647256179988cbd3b  usr/bin/mm8d-editmainconf
 e1ecc4217da1948e92d42e067ab0a09a  usr/bin/mm8d-editmainconf.bin
-14659c16f87dc503031241e104f1dc6f  usr/bin/mm8d-hwtest.py
+1a98708c16c30a33d77e5692015c1bba  usr/bin/mm8d-hwtest.py
 eb6fc0da3a3de5d540502b21782e3d81  usr/bin/mm8d-maintainlog
 f33b52addb978f5760843b526242f199  usr/bin/mm8d-override
 731ac773c3602b77be8583f5dbabba52  usr/bin/mm8d-override.bin
@@ -26,15 +26,13 @@ f33b52addb978f5760843b526242f199  usr/bin/mm8d-override
 6745e971c21f4f509aa083a8ca52c418  usr/bin/mm8d-webpage
 4994f4cacf022e01ffda29f5627f7ab5  usr/share/doc/mm8d-sw/AUTHORS
 3e903caeb6f5ff4c77a30787ea99357c  usr/share/doc/mm8d-sw/cgiprogs.txt
-87a27995f527d22f805b39214d8501b2  usr/share/doc/mm8d-sw/changelog.gz
+b1e3dccc5617ace5653eef2fcef0b234  usr/share/doc/mm8d-sw/changelog.gz
 9b2c3ec44e9d23c64ebebd66ec3f5f3a  usr/share/doc/mm8d-sw/connecting.txt
 40a29a5ec427fc848370a7b2ee2f3aaf  usr/share/doc/mm8d-sw/copyright
 4a5b8c152d83b4d853c9f8f3d7a6dd77  usr/share/doc/mm8d-sw/exitcodes.txt
-abe49b1c0d175f96b8a34e82b356662a  usr/share/doc/mm8d-sw/INSTALL.pc
-771679cbc5b22ed033b4af59dadd04ad  usr/share/doc/mm8d-sw/INSTALL.raspi
 13485c77bf7293fa03d4cdea3f088cb2  usr/share/doc/mm8d-sw/logfiles.txt
-d706a7bc6360f712403559547cc4b836  usr/share/doc/mm8d-sw/README
-f4b5992df2bbde4ae95c396ed9be98e3  usr/share/doc/mm8d-sw/VERSION
+794e03bfdd4312b46638ec4d2e15fd86  usr/share/doc/mm8d-sw/README
+b013832b4ea8cb744edf94de94038b96  usr/share/doc/mm8d-sw/VERSION
 36e5effed48029b3789760fbcd2fcef7  usr/share/man/man1/mm8d-editmainconf.1.gz
 e7e40dce0a31bdf655496960c78d7606  usr/share/man/man1/mm8d-hwtest.py.1.gz
 d0c1de7e4b022ee5f742f79e45025d75  usr/share/man/man1/mm8d-maintainlog.1.gz

diff --git a/packaging/sw-i386/postinst b/packaging/sw-i386/postinst
@@ -5,11 +5,14 @@ if [ "$1" = "configure" ]; then
     ln -sf /usr/share/doc/mm8d-sw /usr/doc/mm8d-sw
   fi
 fi
-cd /tmp/
-wget http://portio.inrim.it/portio-0.5.tar.gz
-tar -xzf portio-0.5.tar.gz
-cd portio-0.5
-python3 setup.py install
+if [ "$ARCH" != "armhf" ]
+then
+  cd /tmp/
+  wget http://portio.inrim.it/portio-0.5.tar.gz
+  tar -xzf portio-0.5.tar.gz
+  cd portio-0.5
+  python3 setup.py install
+fi
 mkdir --parents /var/lib/mm8d/
 invoke-rc.d mm8d.sh stop
 ln -sf /etc/init.d/mm8d.sh /etc/rc0.d/K01mm8d.sh

diff --git a/packaging/web-all/control b/packaging/web-all/control
@@ -1,11 +1,11 @@
 Package: mm8d-web
-Version: 0.3
+Version: 0.3.1
 Section: misc
 Priority: optional
 Architecture: all
 Installed-Size: 292 kB
 Maintainer: Pozsár Zsolt <pozsar.zsolt@szerafingomba.hu>
-Depends: mm8d-sw, apache2, gnuplot, wget, libswitch-perl, liconfig-tiny-perl
+Depends: mm8d-sw, apache2, gnuplot, wget, libswitch-perl, libconfig-tiny-perl
 Description: Web interface
  This is a part of operating program of MM8D growing house and
  irrigation controlling and remote monitoring device.
diff --git a/packaging/web-all/md5sums b/packaging/web-all/md5sums
@@ -4,8 +4,8 @@ ce661abcc6a565f2a4805a2318b60a33  etc/cron.d/mm8d-web
 2a14a7fdefcf214355b70646f4997a8c  usr/bin/mm8d-updatestartpage
 17cd844007a6d2931e5e8853ec2a6478  usr/lib/cgi-bin/getdata.cgi
 49b37979a01d991c62210ac43bd08c7a  usr/lib/cgi-bin/getenvirconf.cgi
-b5e59132e9653a86942ef11cee96db10  usr/lib/cgi-bin/getpage.cgi
-87a27995f527d22f805b39214d8501b2  usr/share/doc/mm8d-web/changelog.gz
+4efb30b823a8fe7ac8102e73d37ec48e  usr/lib/cgi-bin/getpage.cgi
+b1e3dccc5617ace5653eef2fcef0b234  usr/share/doc/mm8d-web/changelog.gz
 40a29a5ec427fc848370a7b2ee2f3aaf  usr/share/doc/mm8d-web/copyright
 eb7c62051e17e8fbc5539958e2ad7630  usr/share/locale/hu/mm8d.msg
 ae688af0fa4a86c41bfe153a0e8eef2b  usr/share/man/man1/mm8d-creatediagrams.1.gz

diff --git a/prepare b/prepare
@@ -51,7 +51,7 @@ sudo apt-get install apache2 \
                      libconfig-tiny-perl \
                      sudo \
                      wget
-if [ $ARCH = 'armhf' ]
+if [ "$ARCH" = "armhf" ]
 then
   sudo apt-get install python3-rpi.gpio
 else