refactor(distrib): installers renaming and corrected metadata

kura/distrib/src/main/ant/build_equinox_distrib.xml

@@ -268,22 +268,12 @@ ${DIR}/bin/gen_config_ini.sh ${DIR}/framework/config.ini ${DIR}/plugins > /tmp/.
 
 KURA_RUNNING=`ps ax | grep java | grep "org.eclipse.equinox"`
 
-#get java version
-JAVA_VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
-JAVA_VERSION_NUM=$(echo "$JAVA_VERSION" | awk -F. '{printf("%03d%03d",$1,$2);}')
-
-OPEN_MODULE_OPTIONS=''
-
-if [ $JAVA_VERSION_NUM -gt 001008 ] ; then
-        OPEN_MODULE_OPTIONS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED"
-fi
-
 if [ -z "$KURA_RUNNING" ] ; then
         exec java -Xms${kura.mem.size} -Xmx${kura.mem.size} \
         -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/kura-heapdump.hprof \
         -XX:ErrorFile=/var/log/kura-error.log \
         -XX:+IgnoreUnrecognizedVMOptions \
-        ${OPEN_MODULE_OPTIONS} \
+        --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED \
         --add-modules=ALL-SYSTEM \
         -Dkura.os.version=${kura.os.version} \
         -Dkura.arch=${kura.arch} \
@@ -321,24 +311,14 @@ ${DIR}/bin/gen_config_ini.sh ${DIR}/framework/config.ini ${DIR}/plugins > /tmp/.
 
 KURA_RUNNING=`ps ax | grep java | grep "org.eclipse.equinox"`
 
-#get java version
-JAVA_VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
-JAVA_VERSION_NUM=$(echo "$JAVA_VERSION" | awk -F. '{printf("%03d%03d",$1,$2);}')
-
-OPEN_MODULE_OPTIONS=''
-
-if [ $JAVA_VERSION_NUM -gt 001008 ] ; then
-        OPEN_MODULE_OPTIONS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED"
-fi
-
 if [ -z "$KURA_RUNNING" ] ; then
         exec java -Xms${kura.mem.size} -Xmx${kura.mem.size} \
         -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:/var/log/kura-gc.log \
         -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M \
         -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/kura-heapdump.hprof \
         -XX:ErrorFile=/var/log/kura-error.log \
         -XX:+IgnoreUnrecognizedVMOptions \
-        ${OPEN_MODULE_OPTIONS} \
+        --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED \
         --add-modules=ALL-SYSTEM \
         -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=*:8000,suspend=n \
         -Dkura.os.version=${kura.os.version} \
@@ -378,22 +358,12 @@ ${DIR}/bin/gen_config_ini.sh ${DIR}/framework/config.ini ${DIR}/plugins > /tmp/.
 
 KURA_RUNNING=`ps ax | grep java | grep "org.eclipse.equinox"`
 
-#get java version
-JAVA_VERSION=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
-JAVA_VERSION_NUM=$(echo "$JAVA_VERSION" | awk -F. '{printf("%03d%03d",$1,$2);}')
-
-OPEN_MODULE_OPTIONS=''
-
-if [ $JAVA_VERSION_NUM -gt 001008 ] ; then
-        OPEN_MODULE_OPTIONS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED"
-fi
-
 if [ -z "$KURA_RUNNING" ] ; then
   nohup java -Xms${kura.mem.size} -Xmx${kura.mem.size} \
         -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/kura-heapdump.hprof \
         -XX:ErrorFile=/var/log/kura-error.log \
         -XX:+IgnoreUnrecognizedVMOptions \
-        ${OPEN_MODULE_OPTIONS} \
+        --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED \
         --add-modules=ALL-SYSTEM \
         -Dkura.os.version=${kura.os.version} \
         -Dkura.arch=${kura.arch} \
@@ -424,24 +394,12 @@ fi]]>
         <!-- Populate parameters -->
         <copy file="src/main/resources/${build.name}/kura_install.sh"
             tofile="${project.build.directory}/${build.output.name}/kura_install.sh" />
-        <copy file="src/main/resources/common/kura.init.yocto"
-            tofile="${project.build.directory}/${build.output.name}/kura.init.yocto"
-            failonerror="false" />
-        <copy file="src/main/resources/common/kura.init.raspbian"
-            tofile="${project.build.directory}/${build.output.name}/kura.init.raspbian"
-            failonerror="false" />
         <copy file="src/main/resources/common/kura.service"
             tofile="${project.build.directory}/${build.output.name}/kura.service"
             failonerror="false" />
         <replaceregexp
             file="${project.build.directory}/${build.output.name}/kura_install.sh"
             match="INSTALL_DIR=.*" replace="INSTALL_DIR=${kura.install.dir}" />
-        <replaceregexp
-            file="${project.build.directory}/${build.output.name}/kura.init.yocto"
-            match="INSTALL_DIR=.*" replace="INSTALL_DIR=${kura.install.dir}" />
-        <replaceregexp
-            file="${project.build.directory}/${build.output.name}/kura.init.raspbian"
-            match="INSTALL_DIR=.*" replace="INSTALL_DIR=${kura.install.dir}" />
         <replaceregexp
             file="${project.build.directory}/${build.output.name}/kura.service"
             match="INSTALL_DIR" replace="${kura.install.dir}" />

kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control → kura/distrib/src/main/resources/aarch64-nn/deb/control/control

@@ -10,18 +10,20 @@
 # Contributors:
 #  Eurotech
 #
-Package: kura
+Package: kura-nn
 Version: [[project.version]]
-Section: misc
-Priority: low
-Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+Section: admin
+Priority: optional
+Depends: openjdk-17-jre-headless | temurin-17-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd, python3
-Architecture: all
-Maintainer: [email protected]
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: arm64
+Maintainer: Eclipse Kura Developers <[email protected]>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform

kura/distrib/src/main/resources/generic-x86_64/deb/control/control → kura/distrib/src/main/resources/aarch64/deb/control/control

@@ -12,18 +12,20 @@
 #
 Package: kura
 Version: [[project.version]]
-Section: misc
-Priority: low
-Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+Section: admin
+Priority: optional
+Depends: openjdk-17-jre-headless | temurin-17-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie,
  network-manager | networkmanager, bind9 | bind, dnsmasq | isc-dhcp-server, isc-dhcp-client | dhcpcd, iw, iptables, modemmanager,
  logrotate, gpsd, python3
-Architecture: all
-Maintainer: [email protected]
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: arm64
+Maintainer: Eclipse Kura Developers <[email protected]>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform

kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control → kura/distrib/src/main/resources/armhf-nn/deb/control/control

@@ -10,18 +10,20 @@
 # Contributors:
 #  Eurotech
 #
-Package: kura
+Package: kura-nn
 Version: [[project.version]]
-Section: misc
-Priority: low
-Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+Section: admin
+Priority: optional
+Depends: openjdk-17-jre-headless | temurin-17-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd, python3
-Architecture: all
-Maintainer: [email protected]
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: armhf
+Maintainer: Eclipse Kura Developers <[email protected]>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform

kura/distrib/src/main/resources/generic-arm32/deb/control/control → kura/distrib/src/main/resources/armhf/deb/control/control

@@ -12,18 +12,20 @@
 #
 Package: kura
 Version: [[project.version]]
-Section: misc
-Priority: low
-Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+Section: admin
+Priority: optional
+Depends: openjdk-17-jre-headless | temurin-17-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie,
  network-manager | networkmanager, bind9 | bind, dnsmasq | isc-dhcp-server, isc-dhcp-client | dhcpcd, iw, iptables, modemmanager,
  logrotate, gpsd, python3
-Architecture: all
-Maintainer: [email protected]
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: armhf
+Maintainer: Eclipse Kura Developers <[email protected]>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform

kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control

@@ -1,15 +1,29 @@
-Package: kura
+#
+# Copyright (c) 2024 Eurotech and/or its affiliates and others
+#
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#  Eurotech
+#
+Package: kura-nn
 Version: [[project.version]]
-Section: misc
-Priority: low
+Section: admin
+Priority: optional
 Depends: dos2unix, unzip, 
  telnet, bluez-hcidump, 
  bluez, chrony, ntpdate, 
- openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+ openjdk-17-jre-headless | temurin-17-jdk,
  cron
-Architecture: all
-Maintainer: [email protected]
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: amd64
+Maintainer: Eclipse Kura Developers <[email protected]>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform

kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control → kura/distrib/src/main/resources/x86_64-nn/deb/control/control

@@ -10,18 +10,20 @@
 # Contributors:
 #  Eurotech
 #
-Package: kura
+Package: kura-nn
 Version: [[project.version]]
-Section: misc
-Priority: low
-Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+Section: admin
+Priority: optional
+Depends: openjdk-17-jre-headless | temurin-17-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd, python3
-Architecture: all
-Maintainer: [email protected]
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: amd64
+Maintainer: Eclipse Kura Developers <[email protected]>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform

kura/distrib/src/main/resources/generic-aarch64/deb/control/control → kura/distrib/src/main/resources/x86_64/deb/control/control

@@ -12,18 +12,20 @@
 #
 Package: kura
 Version: [[project.version]]
-Section: misc
-Priority: low
-Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk,
+Section: admin
+Priority: optional
+Depends: openjdk-17-jre-headless | temurin-17-jdk,
  setserial, zip, gzip, unzip, procps, usbutils, socat, gawk, sed, inetutils-telnet,
  polkit | policykit-1, ssh | openssh, openssl, busybox, openvpn,
  bluez | bluez5, bluez-hcidump | bluez5-noinst-tools,
  ntpdate, chrony, chronyc | chrony, cron | cronie,
  network-manager | networkmanager, bind9 | bind, dnsmasq | isc-dhcp-server, isc-dhcp-client | dhcpcd, iw, iptables, modemmanager,
  logrotate, gpsd, python3
-Architecture: all
-Maintainer: [email protected]
-Description: Kura is an inclusive software framework that puts a layer
+Architecture: amd64
+Maintainer: Eclipse Kura Developers <[email protected]>
+Homepage: https://eclipse-kura.github.io/kura/
+Description: Open-source IoT edge framework based on Java/OSGi
+  Kura is an inclusive software framework that puts a layer
   between the operating system and the customer application, with industry
   standard interfaces that shorten custom development time, simplified coding
   and software that can be easily ported from one hardware platform