From b782eb0781fd2fa8a235825e84f557122f8f283b Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Fri, 6 Dec 2024 14:54:18 +0100 Subject: [PATCH 01/17] style: added comments for better reachability Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/pom.xml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml index 4e497933ae..26e1217f19 100644 --- a/kura/distrib/pom.xml +++ b/kura/distrib/pom.xml @@ -1136,6 +1136,7 @@ + java8 @@ -1145,6 +1146,7 @@ false + java17 @@ -1154,6 +1156,8 @@ true + + generic-arm32 @@ -1250,6 +1254,7 @@ + generic-arm32-nn @@ -1341,6 +1346,7 @@ + generic-x86_64 @@ -1437,6 +1443,7 @@ + generic-x86_64-nn @@ -1527,7 +1534,8 @@ - + + generic-aarch64 @@ -1624,6 +1632,7 @@ + generic-aarch64-nn @@ -1715,6 +1724,8 @@ + + docker-x86_64-nn @@ -1832,6 +1843,7 @@ + docker-ubi8-x86_64-nn @@ -1878,6 +1890,7 @@ + docker-alpine-x86_64-nn @@ -1925,6 +1938,7 @@ + dev-env @@ -2273,6 +2287,9 @@ + + + core-dp @@ -2400,6 +2417,7 @@ + can-dp @@ -2437,5 +2455,6 @@ + From 51d074762d83b30c0cd39a8eb326115d136ee564 Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Fri, 6 Dec 2024 15:02:58 +0100 Subject: [PATCH 02/17] refactor(distrib): renamed generic-aarch64 profiles into aarch64 Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/pom.xml | 36 +++++++++---------- .../deb/control/control | 0 .../deb/control/postinst | 0 .../deb/control/preinst | 0 .../deb/control/prerm | 0 .../kura.logrotate | 0 .../kura.properties | 0 .../kura_install.sh | 0 .../kura_upgrade.sh | 0 .../log4j.xml | 0 .../deb/control/control | 0 .../deb/control/postinst | 0 .../deb/control/preinst | 0 .../deb/control/prerm | 0 .../firewall.init | 0 .../firewall.service | 0 .../kura.logrotate | 0 .../kura.properties | 0 .../kura_install.sh | 0 .../kura_upgrade.sh | 0 .../{generic-aarch64 => aarch64}/log4j.xml | 0 21 files changed, 18 insertions(+), 18 deletions(-) rename kura/distrib/src/main/resources/{generic-aarch64-nn => aarch64-nn}/deb/control/control (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => aarch64-nn}/deb/control/postinst (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => aarch64-nn}/deb/control/preinst (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => aarch64-nn}/deb/control/prerm (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => aarch64-nn}/kura.logrotate (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => aarch64-nn}/kura.properties (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => aarch64-nn}/kura_install.sh (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => aarch64-nn}/kura_upgrade.sh (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => aarch64-nn}/log4j.xml (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => aarch64}/deb/control/control (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => aarch64}/deb/control/postinst (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => aarch64}/deb/control/preinst (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => aarch64}/deb/control/prerm (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => aarch64}/firewall.init (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => aarch64}/firewall.service (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => aarch64}/kura.logrotate (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => aarch64}/kura.properties (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => aarch64}/kura_install.sh (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => aarch64}/kura_upgrade.sh (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => aarch64}/log4j.xml (100%) diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml index 26e1217f19..35b3dd8fa3 100644 --- a/kura/distrib/pom.xml +++ b/kura/distrib/pom.xml @@ -1537,7 +1537,7 @@ - generic-aarch64 + aarch64 buildAll @@ -1570,7 +1570,7 @@ 1.7 - generic-aarch64-jars + aarch64-jars prepare-package run @@ -1581,11 +1581,11 @@ - - + + - + @@ -1600,18 +1600,18 @@ 1.0 - generic-aarch64-deb + aarch64-deb package jdeb true - ${basedir}/target/kura_${project.version}_generic-aarch64_installer.deb - ${basedir}/src/main/resources/generic-aarch64/deb/control + ${basedir}/target/kura_${project.version}_aarch64_installer.deb + ${basedir}/src/main/resources/aarch64/deb/control - ${basedir}/target/kura_${project.version}_generic-aarch64.zip + ${basedir}/target/kura_${project.version}_aarch64.zip file perm @@ -1634,7 +1634,7 @@ - generic-aarch64-nn + aarch64-nn buildAll @@ -1667,7 +1667,7 @@ 1.7 - generic-aarch64-nn-jars + aarch64-nn-jars prepare-package run @@ -1678,11 +1678,11 @@ - - + + - + @@ -1697,18 +1697,18 @@ 1.0 - generic-aarch64-nn-deb + aarch64-nn-deb package jdeb true - ${basedir}/target/kura_${project.version}_generic-aarch64-nn_installer.deb - ${basedir}/src/main/resources/generic-aarch64-nn/deb/control + ${basedir}/target/kura_${project.version}_aarch64-nn_installer.deb + ${basedir}/src/main/resources/aarch64-nn/deb/control - ${basedir}/target/kura_${project.version}_generic-aarch64-nn.zip + ${basedir}/target/kura_${project.version}_aarch64-nn.zip file perm diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control b/kura/distrib/src/main/resources/aarch64-nn/deb/control/control similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control rename to kura/distrib/src/main/resources/aarch64-nn/deb/control/control diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/postinst b/kura/distrib/src/main/resources/aarch64-nn/deb/control/postinst similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/postinst rename to kura/distrib/src/main/resources/aarch64-nn/deb/control/postinst diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/preinst b/kura/distrib/src/main/resources/aarch64-nn/deb/control/preinst similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/preinst rename to kura/distrib/src/main/resources/aarch64-nn/deb/control/preinst diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/prerm b/kura/distrib/src/main/resources/aarch64-nn/deb/control/prerm similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/prerm rename to kura/distrib/src/main/resources/aarch64-nn/deb/control/prerm diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura.logrotate b/kura/distrib/src/main/resources/aarch64-nn/kura.logrotate similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64-nn/kura.logrotate rename to kura/distrib/src/main/resources/aarch64-nn/kura.logrotate diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura.properties b/kura/distrib/src/main/resources/aarch64-nn/kura.properties similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64-nn/kura.properties rename to kura/distrib/src/main/resources/aarch64-nn/kura.properties diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura_install.sh b/kura/distrib/src/main/resources/aarch64-nn/kura_install.sh similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64-nn/kura_install.sh rename to kura/distrib/src/main/resources/aarch64-nn/kura_install.sh diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura_upgrade.sh b/kura/distrib/src/main/resources/aarch64-nn/kura_upgrade.sh similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64-nn/kura_upgrade.sh rename to kura/distrib/src/main/resources/aarch64-nn/kura_upgrade.sh diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/log4j.xml b/kura/distrib/src/main/resources/aarch64-nn/log4j.xml similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64-nn/log4j.xml rename to kura/distrib/src/main/resources/aarch64-nn/log4j.xml diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control b/kura/distrib/src/main/resources/aarch64/deb/control/control similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/deb/control/control rename to kura/distrib/src/main/resources/aarch64/deb/control/control diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/postinst b/kura/distrib/src/main/resources/aarch64/deb/control/postinst similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/deb/control/postinst rename to kura/distrib/src/main/resources/aarch64/deb/control/postinst diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/preinst b/kura/distrib/src/main/resources/aarch64/deb/control/preinst similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/deb/control/preinst rename to kura/distrib/src/main/resources/aarch64/deb/control/preinst diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/prerm b/kura/distrib/src/main/resources/aarch64/deb/control/prerm similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/deb/control/prerm rename to kura/distrib/src/main/resources/aarch64/deb/control/prerm diff --git a/kura/distrib/src/main/resources/generic-aarch64/firewall.init b/kura/distrib/src/main/resources/aarch64/firewall.init similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/firewall.init rename to kura/distrib/src/main/resources/aarch64/firewall.init diff --git a/kura/distrib/src/main/resources/generic-aarch64/firewall.service b/kura/distrib/src/main/resources/aarch64/firewall.service similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/firewall.service rename to kura/distrib/src/main/resources/aarch64/firewall.service diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura.logrotate b/kura/distrib/src/main/resources/aarch64/kura.logrotate similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/kura.logrotate rename to kura/distrib/src/main/resources/aarch64/kura.logrotate diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura.properties b/kura/distrib/src/main/resources/aarch64/kura.properties similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/kura.properties rename to kura/distrib/src/main/resources/aarch64/kura.properties diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura_install.sh b/kura/distrib/src/main/resources/aarch64/kura_install.sh similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/kura_install.sh rename to kura/distrib/src/main/resources/aarch64/kura_install.sh diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura_upgrade.sh b/kura/distrib/src/main/resources/aarch64/kura_upgrade.sh similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/kura_upgrade.sh rename to kura/distrib/src/main/resources/aarch64/kura_upgrade.sh diff --git a/kura/distrib/src/main/resources/generic-aarch64/log4j.xml b/kura/distrib/src/main/resources/aarch64/log4j.xml similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/log4j.xml rename to kura/distrib/src/main/resources/aarch64/log4j.xml From b7209145434de88f8a46b97071eae3d74ae72511 Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Fri, 6 Dec 2024 15:07:10 +0100 Subject: [PATCH 03/17] refactor(distrib): renamed generic-arm32 profiles into armhf Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/pom.xml | 32 +++++++++---------- .../deb/control/control | 0 .../deb/control/postinst | 0 .../deb/control/preinst | 0 .../deb/control/prerm | 0 .../kura.logrotate | 0 .../kura.properties | 0 .../kura_install.sh | 0 .../kura_upgrade.sh | 0 .../{generic-arm32-nn => armhf-nn}/log4j.xml | 0 .../deb/control/control | 0 .../deb/control/postinst | 0 .../deb/control/preinst | 0 .../deb/control/prerm | 0 .../{generic-arm32 => armhf}/firewall.init | 0 .../{generic-arm32 => armhf}/firewall.service | 0 .../{generic-arm32 => armhf}/kura.logrotate | 0 .../{generic-arm32 => armhf}/kura.properties | 0 .../{generic-arm32 => armhf}/kura_install.sh | 0 .../{generic-arm32 => armhf}/kura_upgrade.sh | 0 .../{generic-arm32 => armhf}/log4j.xml | 0 21 files changed, 16 insertions(+), 16 deletions(-) rename kura/distrib/src/main/resources/{generic-arm32-nn => armhf-nn}/deb/control/control (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => armhf-nn}/deb/control/postinst (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => armhf-nn}/deb/control/preinst (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => armhf-nn}/deb/control/prerm (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => armhf-nn}/kura.logrotate (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => armhf-nn}/kura.properties (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => armhf-nn}/kura_install.sh (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => armhf-nn}/kura_upgrade.sh (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => armhf-nn}/log4j.xml (100%) rename kura/distrib/src/main/resources/{generic-arm32 => armhf}/deb/control/control (100%) rename kura/distrib/src/main/resources/{generic-arm32 => armhf}/deb/control/postinst (100%) rename kura/distrib/src/main/resources/{generic-arm32 => armhf}/deb/control/preinst (100%) rename kura/distrib/src/main/resources/{generic-arm32 => armhf}/deb/control/prerm (100%) rename kura/distrib/src/main/resources/{generic-arm32 => armhf}/firewall.init (100%) rename kura/distrib/src/main/resources/{generic-arm32 => armhf}/firewall.service (100%) rename kura/distrib/src/main/resources/{generic-arm32 => armhf}/kura.logrotate (100%) rename kura/distrib/src/main/resources/{generic-arm32 => armhf}/kura.properties (100%) rename kura/distrib/src/main/resources/{generic-arm32 => armhf}/kura_install.sh (100%) rename kura/distrib/src/main/resources/{generic-arm32 => armhf}/kura_upgrade.sh (100%) rename kura/distrib/src/main/resources/{generic-arm32 => armhf}/log4j.xml (100%) diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml index 35b3dd8fa3..390a17e971 100644 --- a/kura/distrib/pom.xml +++ b/kura/distrib/pom.xml @@ -1159,7 +1159,7 @@ - generic-arm32 + armhf buildAll @@ -1192,7 +1192,7 @@ 1.7 - generic-arm32-jars + armhf-jars prepare-package run @@ -1203,8 +1203,8 @@ - - + + @@ -1222,18 +1222,18 @@ 1.0 - generic-arm32-deb + armhf-deb package jdeb true - ${basedir}/target/kura_${project.version}_generic-arm32_installer.deb - ${basedir}/src/main/resources/generic-arm32/deb/control + ${basedir}/target/kura_${project.version}_armhf_installer.deb + ${basedir}/src/main/resources/armhf/deb/control - ${basedir}/target/kura_${project.version}_generic-arm32.zip + ${basedir}/target/kura_${project.version}_armhf.zip file perm @@ -1256,7 +1256,7 @@ - generic-arm32-nn + armhf-nn buildAll @@ -1289,7 +1289,7 @@ 1.7 - generic-arm32-nn-jars + armhf-nn-jars prepare-package run @@ -1300,8 +1300,8 @@ - - + + @@ -1319,18 +1319,18 @@ 1.0 - generic-arm32-nn-deb + armhf-nn-deb package jdeb true - ${basedir}/target/kura_${project.version}_generic-arm32-nn_installer.deb - ${basedir}/src/main/resources/generic-arm32-nn/deb/control + ${basedir}/target/kura_${project.version}_armhf-nn_installer.deb + ${basedir}/src/main/resources/armhf-nn/deb/control - ${basedir}/target/kura_${project.version}_generic-arm32-nn.zip + ${basedir}/target/kura_${project.version}_armhf-nn.zip file perm diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control b/kura/distrib/src/main/resources/armhf-nn/deb/control/control similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control rename to kura/distrib/src/main/resources/armhf-nn/deb/control/control diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/postinst b/kura/distrib/src/main/resources/armhf-nn/deb/control/postinst similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32-nn/deb/control/postinst rename to kura/distrib/src/main/resources/armhf-nn/deb/control/postinst diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/preinst b/kura/distrib/src/main/resources/armhf-nn/deb/control/preinst similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32-nn/deb/control/preinst rename to kura/distrib/src/main/resources/armhf-nn/deb/control/preinst diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/prerm b/kura/distrib/src/main/resources/armhf-nn/deb/control/prerm similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32-nn/deb/control/prerm rename to kura/distrib/src/main/resources/armhf-nn/deb/control/prerm diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura.logrotate b/kura/distrib/src/main/resources/armhf-nn/kura.logrotate similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32-nn/kura.logrotate rename to kura/distrib/src/main/resources/armhf-nn/kura.logrotate diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura.properties b/kura/distrib/src/main/resources/armhf-nn/kura.properties similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32-nn/kura.properties rename to kura/distrib/src/main/resources/armhf-nn/kura.properties diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura_install.sh b/kura/distrib/src/main/resources/armhf-nn/kura_install.sh similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32-nn/kura_install.sh rename to kura/distrib/src/main/resources/armhf-nn/kura_install.sh diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura_upgrade.sh b/kura/distrib/src/main/resources/armhf-nn/kura_upgrade.sh similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32-nn/kura_upgrade.sh rename to kura/distrib/src/main/resources/armhf-nn/kura_upgrade.sh diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/log4j.xml b/kura/distrib/src/main/resources/armhf-nn/log4j.xml similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32-nn/log4j.xml rename to kura/distrib/src/main/resources/armhf-nn/log4j.xml diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/control b/kura/distrib/src/main/resources/armhf/deb/control/control similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/deb/control/control rename to kura/distrib/src/main/resources/armhf/deb/control/control diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/postinst b/kura/distrib/src/main/resources/armhf/deb/control/postinst similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/deb/control/postinst rename to kura/distrib/src/main/resources/armhf/deb/control/postinst diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/preinst b/kura/distrib/src/main/resources/armhf/deb/control/preinst similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/deb/control/preinst rename to kura/distrib/src/main/resources/armhf/deb/control/preinst diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/prerm b/kura/distrib/src/main/resources/armhf/deb/control/prerm similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/deb/control/prerm rename to kura/distrib/src/main/resources/armhf/deb/control/prerm diff --git a/kura/distrib/src/main/resources/generic-arm32/firewall.init b/kura/distrib/src/main/resources/armhf/firewall.init similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/firewall.init rename to kura/distrib/src/main/resources/armhf/firewall.init diff --git a/kura/distrib/src/main/resources/generic-arm32/firewall.service b/kura/distrib/src/main/resources/armhf/firewall.service similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/firewall.service rename to kura/distrib/src/main/resources/armhf/firewall.service diff --git a/kura/distrib/src/main/resources/generic-arm32/kura.logrotate b/kura/distrib/src/main/resources/armhf/kura.logrotate similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/kura.logrotate rename to kura/distrib/src/main/resources/armhf/kura.logrotate diff --git a/kura/distrib/src/main/resources/generic-arm32/kura.properties b/kura/distrib/src/main/resources/armhf/kura.properties similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/kura.properties rename to kura/distrib/src/main/resources/armhf/kura.properties diff --git a/kura/distrib/src/main/resources/generic-arm32/kura_install.sh b/kura/distrib/src/main/resources/armhf/kura_install.sh similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/kura_install.sh rename to kura/distrib/src/main/resources/armhf/kura_install.sh diff --git a/kura/distrib/src/main/resources/generic-arm32/kura_upgrade.sh b/kura/distrib/src/main/resources/armhf/kura_upgrade.sh similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/kura_upgrade.sh rename to kura/distrib/src/main/resources/armhf/kura_upgrade.sh diff --git a/kura/distrib/src/main/resources/generic-arm32/log4j.xml b/kura/distrib/src/main/resources/armhf/log4j.xml similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/log4j.xml rename to kura/distrib/src/main/resources/armhf/log4j.xml From e386ae7ce840ce6005ed7fee9588ad6dbd237d22 Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Fri, 6 Dec 2024 15:10:26 +0100 Subject: [PATCH 04/17] refactor(distrib): renamed generic-x86_64 profiles into x86_64 Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/pom.xml | 32 +++++++++---------- .../deb/control/control | 0 .../deb/control/postinst | 0 .../deb/control/preinst | 0 .../deb/control/prerm | 0 .../kura.logrotate | 0 .../kura.properties | 0 .../kura_install.sh | 0 .../kura_upgrade.sh | 0 .../log4j.xml | 0 .../deb/control/control | 0 .../deb/control/postinst | 0 .../deb/control/preinst | 0 .../deb/control/prerm | 0 .../{generic-x86_64 => x86_64}/firewall.init | 0 .../firewall.service | 0 .../{generic-x86_64 => x86_64}/kura.logrotate | 0 .../kura.properties | 0 .../kura_install.sh | 0 .../kura_upgrade.sh | 0 .../{generic-x86_64 => x86_64}/log4j.xml | 0 21 files changed, 16 insertions(+), 16 deletions(-) rename kura/distrib/src/main/resources/{generic-x86_64-nn => x86_64-nn}/deb/control/control (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => x86_64-nn}/deb/control/postinst (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => x86_64-nn}/deb/control/preinst (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => x86_64-nn}/deb/control/prerm (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => x86_64-nn}/kura.logrotate (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => x86_64-nn}/kura.properties (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => x86_64-nn}/kura_install.sh (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => x86_64-nn}/kura_upgrade.sh (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => x86_64-nn}/log4j.xml (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => x86_64}/deb/control/control (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => x86_64}/deb/control/postinst (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => x86_64}/deb/control/preinst (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => x86_64}/deb/control/prerm (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => x86_64}/firewall.init (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => x86_64}/firewall.service (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => x86_64}/kura.logrotate (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => x86_64}/kura.properties (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => x86_64}/kura_install.sh (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => x86_64}/kura_upgrade.sh (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => x86_64}/log4j.xml (100%) diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml index 390a17e971..9819771361 100644 --- a/kura/distrib/pom.xml +++ b/kura/distrib/pom.xml @@ -1348,7 +1348,7 @@ - generic-x86_64 + x86_64 buildAll @@ -1381,7 +1381,7 @@ 1.7 - generic-x86_64-jars + x86_64-jars prepare-package run @@ -1392,8 +1392,8 @@ - - + + @@ -1411,18 +1411,18 @@ 1.0 - generic-x86_64-deb + x86_64-deb package jdeb true - ${basedir}/target/kura_${project.version}_generic-x86_64_installer.deb - ${basedir}/src/main/resources/generic-x86_64/deb/control + ${basedir}/target/kura_${project.version}_x86_64_installer.deb + ${basedir}/src/main/resources/x86_64/deb/control - ${basedir}/target/kura_${project.version}_generic-x86_64.zip + ${basedir}/target/kura_${project.version}_x86_64.zip file perm @@ -1445,7 +1445,7 @@ - generic-x86_64-nn + x86_64-nn buildAll @@ -1478,7 +1478,7 @@ 1.7 - generic-x86_64-nn-jars + x86_64-nn-jars prepare-package run @@ -1489,8 +1489,8 @@ - - + + @@ -1508,18 +1508,18 @@ 1.0 - generic-x86_64-nn-deb + x86_64-nn-deb package jdeb true - ${basedir}/target/kura_${project.version}_generic-x86_64-nn_installer.deb - ${basedir}/src/main/resources/generic-x86_64-nn/deb/control + ${basedir}/target/kura_${project.version}_x86_64-nn_installer.deb + ${basedir}/src/main/resources/x86_64-nn/deb/control - ${basedir}/target/kura_${project.version}_generic-x86_64-nn.zip + ${basedir}/target/kura_${project.version}_x86_64-nn.zip file perm diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/x86_64-nn/deb/control/control similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control rename to kura/distrib/src/main/resources/x86_64-nn/deb/control/control diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/postinst b/kura/distrib/src/main/resources/x86_64-nn/deb/control/postinst similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/postinst rename to kura/distrib/src/main/resources/x86_64-nn/deb/control/postinst diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/preinst b/kura/distrib/src/main/resources/x86_64-nn/deb/control/preinst similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/preinst rename to kura/distrib/src/main/resources/x86_64-nn/deb/control/preinst diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/prerm b/kura/distrib/src/main/resources/x86_64-nn/deb/control/prerm similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/prerm rename to kura/distrib/src/main/resources/x86_64-nn/deb/control/prerm diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura.logrotate b/kura/distrib/src/main/resources/x86_64-nn/kura.logrotate similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64-nn/kura.logrotate rename to kura/distrib/src/main/resources/x86_64-nn/kura.logrotate diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura.properties b/kura/distrib/src/main/resources/x86_64-nn/kura.properties similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64-nn/kura.properties rename to kura/distrib/src/main/resources/x86_64-nn/kura.properties diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura_install.sh b/kura/distrib/src/main/resources/x86_64-nn/kura_install.sh similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64-nn/kura_install.sh rename to kura/distrib/src/main/resources/x86_64-nn/kura_install.sh diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura_upgrade.sh b/kura/distrib/src/main/resources/x86_64-nn/kura_upgrade.sh similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64-nn/kura_upgrade.sh rename to kura/distrib/src/main/resources/x86_64-nn/kura_upgrade.sh diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/log4j.xml b/kura/distrib/src/main/resources/x86_64-nn/log4j.xml similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64-nn/log4j.xml rename to kura/distrib/src/main/resources/x86_64-nn/log4j.xml diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control b/kura/distrib/src/main/resources/x86_64/deb/control/control similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/deb/control/control rename to kura/distrib/src/main/resources/x86_64/deb/control/control diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/postinst b/kura/distrib/src/main/resources/x86_64/deb/control/postinst similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/deb/control/postinst rename to kura/distrib/src/main/resources/x86_64/deb/control/postinst diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/preinst b/kura/distrib/src/main/resources/x86_64/deb/control/preinst similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/deb/control/preinst rename to kura/distrib/src/main/resources/x86_64/deb/control/preinst diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/prerm b/kura/distrib/src/main/resources/x86_64/deb/control/prerm similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/deb/control/prerm rename to kura/distrib/src/main/resources/x86_64/deb/control/prerm diff --git a/kura/distrib/src/main/resources/generic-x86_64/firewall.init b/kura/distrib/src/main/resources/x86_64/firewall.init similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/firewall.init rename to kura/distrib/src/main/resources/x86_64/firewall.init diff --git a/kura/distrib/src/main/resources/generic-x86_64/firewall.service b/kura/distrib/src/main/resources/x86_64/firewall.service similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/firewall.service rename to kura/distrib/src/main/resources/x86_64/firewall.service diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura.logrotate b/kura/distrib/src/main/resources/x86_64/kura.logrotate similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/kura.logrotate rename to kura/distrib/src/main/resources/x86_64/kura.logrotate diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura.properties b/kura/distrib/src/main/resources/x86_64/kura.properties similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/kura.properties rename to kura/distrib/src/main/resources/x86_64/kura.properties diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura_install.sh b/kura/distrib/src/main/resources/x86_64/kura_install.sh similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/kura_install.sh rename to kura/distrib/src/main/resources/x86_64/kura_install.sh diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura_upgrade.sh b/kura/distrib/src/main/resources/x86_64/kura_upgrade.sh similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/kura_upgrade.sh rename to kura/distrib/src/main/resources/x86_64/kura_upgrade.sh diff --git a/kura/distrib/src/main/resources/generic-x86_64/log4j.xml b/kura/distrib/src/main/resources/x86_64/log4j.xml similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/log4j.xml rename to kura/distrib/src/main/resources/x86_64/log4j.xml From fb59c459a1fa02672a4d6745b91eff643ce1411a Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Fri, 6 Dec 2024 16:28:02 +0100 Subject: [PATCH 05/17] refactor(distrib): removed Java version check in launch scripts, added opens in launch config Signed-off-by: Marcello Rinaldo Martina --- .../src/main/ant/build_equinox_distrib.xml | 36 ++----------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml index 7087be1ba8..f65b30313c 100644 --- a/kura/distrib/src/main/ant/build_equinox_distrib.xml +++ b/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,16 +311,6 @@ ${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 \ @@ -338,7 +318,7 @@ if [ -z "$KURA_RUNNING" ] ; then -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} \ From 9cdab14a8900b0ea09a6821bb1b0cb0774f76cbd Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Fri, 6 Dec 2024 16:29:09 +0100 Subject: [PATCH 06/17] refactor(distrib): installer metadata changes for aarch64 Signed-off-by: Marcello Rinaldo Martina --- .../src/main/resources/aarch64-nn/deb/control/control | 11 ++++++----- .../src/main/resources/aarch64/deb/control/control | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/kura/distrib/src/main/resources/aarch64-nn/deb/control/control b/kura/distrib/src/main/resources/aarch64-nn/deb/control/control index cf60b26aab..c76eb55f7c 100644 --- a/kura/distrib/src/main/resources/aarch64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/aarch64-nn/deb/control/control @@ -12,16 +12,17 @@ # 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, logrotate, gpsd, python3 -Architecture: all +Architecture: arm64 Maintainer: support@eurotech.com -Description: Kura is an inclusive software framework that puts a layer +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 diff --git a/kura/distrib/src/main/resources/aarch64/deb/control/control b/kura/distrib/src/main/resources/aarch64/deb/control/control index 9eaa1b0d38..1c10164ed7 100644 --- a/kura/distrib/src/main/resources/aarch64/deb/control/control +++ b/kura/distrib/src/main/resources/aarch64/deb/control/control @@ -12,18 +12,19 @@ # 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 +Architecture: arm64 Maintainer: support@eurotech.com -Description: Kura is an inclusive software framework that puts a layer +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 From e90a1859cc6949c22ca40db880dfd0c14215861f Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Fri, 6 Dec 2024 17:47:38 +0100 Subject: [PATCH 07/17] refactor(distrib): installer metadata changes for armhf Signed-off-by: Marcello Rinaldo Martina --- .../src/main/resources/armhf-nn/deb/control/control | 11 ++++++----- .../src/main/resources/armhf/deb/control/control | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/kura/distrib/src/main/resources/armhf-nn/deb/control/control b/kura/distrib/src/main/resources/armhf-nn/deb/control/control index ecf8416ba3..e4f8bc929d 100644 --- a/kura/distrib/src/main/resources/armhf-nn/deb/control/control +++ b/kura/distrib/src/main/resources/armhf-nn/deb/control/control @@ -12,16 +12,17 @@ # 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, logrotate, gpsd, python3 -Architecture: all +Architecture: armhf Maintainer: support@eurotech.com -Description: Kura is an inclusive software framework that puts a layer +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 diff --git a/kura/distrib/src/main/resources/armhf/deb/control/control b/kura/distrib/src/main/resources/armhf/deb/control/control index 74cf93815b..3835d9e9eb 100644 --- a/kura/distrib/src/main/resources/armhf/deb/control/control +++ b/kura/distrib/src/main/resources/armhf/deb/control/control @@ -12,18 +12,19 @@ # 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 +Architecture: armhf Maintainer: support@eurotech.com -Description: Kura is an inclusive software framework that puts a layer +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 From a9848079419a5d7b0880706737223deec3cf9dac Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Fri, 6 Dec 2024 17:52:49 +0100 Subject: [PATCH 08/17] refactor(distrib): installer metadata changes for x86_64 Signed-off-by: Marcello Rinaldo Martina --- .../src/main/resources/x86_64-nn/deb/control/control | 11 ++++++----- .../src/main/resources/x86_64/deb/control/control | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/kura/distrib/src/main/resources/x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/x86_64-nn/deb/control/control index cf60b26aab..4b9dfc7a52 100644 --- a/kura/distrib/src/main/resources/x86_64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/x86_64-nn/deb/control/control @@ -12,16 +12,17 @@ # 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, logrotate, gpsd, python3 -Architecture: all +Architecture: amd64 Maintainer: support@eurotech.com -Description: Kura is an inclusive software framework that puts a layer +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 diff --git a/kura/distrib/src/main/resources/x86_64/deb/control/control b/kura/distrib/src/main/resources/x86_64/deb/control/control index 9eaa1b0d38..5413335d77 100644 --- a/kura/distrib/src/main/resources/x86_64/deb/control/control +++ b/kura/distrib/src/main/resources/x86_64/deb/control/control @@ -12,18 +12,19 @@ # 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 +Architecture: amd64 Maintainer: support@eurotech.com -Description: Kura is an inclusive software framework that puts a layer +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 From a8049fc07c7ed12bf7633a3de8fba4818a538314 Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Mon, 9 Dec 2024 09:41:28 +0100 Subject: [PATCH 09/17] refactor(distrib): removed non-existing references to kura.init files in ant script Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/src/main/ant/build_equinox_distrib.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml index f65b30313c..101715d903 100644 --- a/kura/distrib/src/main/ant/build_equinox_distrib.xml +++ b/kura/distrib/src/main/ant/build_equinox_distrib.xml @@ -394,24 +394,12 @@ fi]]> - - - - From d73983d60db3f635d169ea1141e628502bb298ae Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Mon, 9 Dec 2024 10:18:35 +0100 Subject: [PATCH 10/17] refactor(distrib): changed kura.os.version from raspbian to Linux Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml index 9819771361..5d2b7d7b16 100644 --- a/kura/distrib/pom.xml +++ b/kura/distrib/pom.xml @@ -1206,7 +1206,7 @@ - + @@ -1303,7 +1303,7 @@ - + @@ -1395,7 +1395,7 @@ - + @@ -1492,7 +1492,7 @@ - + @@ -1584,7 +1584,7 @@ - + @@ -1681,7 +1681,7 @@ - + From 242db7c12f49ccb20cacc0be1b6aa7847a169271 Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Mon, 9 Dec 2024 15:10:41 +0100 Subject: [PATCH 11/17] refactor(distrib): fixed Maintainer metadata field Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/src/main/resources/aarch64-nn/deb/control/control | 2 +- kura/distrib/src/main/resources/aarch64/deb/control/control | 2 +- kura/distrib/src/main/resources/armhf-nn/deb/control/control | 2 +- kura/distrib/src/main/resources/armhf/deb/control/control | 2 +- .../src/main/resources/docker-x86_64-nn/deb/control/control | 2 +- kura/distrib/src/main/resources/x86_64-nn/deb/control/control | 2 +- kura/distrib/src/main/resources/x86_64/deb/control/control | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kura/distrib/src/main/resources/aarch64-nn/deb/control/control b/kura/distrib/src/main/resources/aarch64-nn/deb/control/control index c76eb55f7c..08d1e05fb0 100644 --- a/kura/distrib/src/main/resources/aarch64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/aarch64-nn/deb/control/control @@ -20,7 +20,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk, bluez | bluez5, bluez-hcidump | bluez5-noinst-tools, ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd, python3 Architecture: arm64 -Maintainer: support@eurotech.com +Maintainer: Eclipse Kura Developers 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 diff --git a/kura/distrib/src/main/resources/aarch64/deb/control/control b/kura/distrib/src/main/resources/aarch64/deb/control/control index 1c10164ed7..efab05ac70 100644 --- a/kura/distrib/src/main/resources/aarch64/deb/control/control +++ b/kura/distrib/src/main/resources/aarch64/deb/control/control @@ -22,7 +22,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk, network-manager | networkmanager, bind9 | bind, dnsmasq | isc-dhcp-server, isc-dhcp-client | dhcpcd, iw, iptables, modemmanager, logrotate, gpsd, python3 Architecture: arm64 -Maintainer: support@eurotech.com +Maintainer: Eclipse Kura Developers 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 diff --git a/kura/distrib/src/main/resources/armhf-nn/deb/control/control b/kura/distrib/src/main/resources/armhf-nn/deb/control/control index e4f8bc929d..c83ea0ff7f 100644 --- a/kura/distrib/src/main/resources/armhf-nn/deb/control/control +++ b/kura/distrib/src/main/resources/armhf-nn/deb/control/control @@ -20,7 +20,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk, bluez | bluez5, bluez-hcidump | bluez5-noinst-tools, ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd, python3 Architecture: armhf -Maintainer: support@eurotech.com +Maintainer: Eclipse Kura Developers 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 diff --git a/kura/distrib/src/main/resources/armhf/deb/control/control b/kura/distrib/src/main/resources/armhf/deb/control/control index 3835d9e9eb..a73afe19ae 100644 --- a/kura/distrib/src/main/resources/armhf/deb/control/control +++ b/kura/distrib/src/main/resources/armhf/deb/control/control @@ -22,7 +22,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk, network-manager | networkmanager, bind9 | bind, dnsmasq | isc-dhcp-server, isc-dhcp-client | dhcpcd, iw, iptables, modemmanager, logrotate, gpsd, python3 Architecture: armhf -Maintainer: support@eurotech.com +Maintainer: Eclipse Kura Developers 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 diff --git a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control index 17ac6fcdaf..dece2acf0d 100644 --- a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control @@ -8,7 +8,7 @@ Depends: dos2unix, unzip, openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk, cron Architecture: all -Maintainer: support@eurotech.com +Maintainer: Eclipse Kura Developers Description: 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 diff --git a/kura/distrib/src/main/resources/x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/x86_64-nn/deb/control/control index 4b9dfc7a52..3b3f3fbc6b 100644 --- a/kura/distrib/src/main/resources/x86_64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/x86_64-nn/deb/control/control @@ -20,7 +20,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk, bluez | bluez5, bluez-hcidump | bluez5-noinst-tools, ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd, python3 Architecture: amd64 -Maintainer: support@eurotech.com +Maintainer: Eclipse Kura Developers 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 diff --git a/kura/distrib/src/main/resources/x86_64/deb/control/control b/kura/distrib/src/main/resources/x86_64/deb/control/control index 5413335d77..8e1f477719 100644 --- a/kura/distrib/src/main/resources/x86_64/deb/control/control +++ b/kura/distrib/src/main/resources/x86_64/deb/control/control @@ -22,7 +22,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk, network-manager | networkmanager, bind9 | bind, dnsmasq | isc-dhcp-server, isc-dhcp-client | dhcpcd, iw, iptables, modemmanager, logrotate, gpsd, python3 Architecture: amd64 -Maintainer: support@eurotech.com +Maintainer: Eclipse Kura Developers 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 From 5d5c8102978a7bc983c505ee48ec93da77b6349b Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Mon, 9 Dec 2024 15:49:23 +0100 Subject: [PATCH 12/17] feat(distrib): added Homepage metadata field Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/src/main/resources/aarch64-nn/deb/control/control | 1 + kura/distrib/src/main/resources/aarch64/deb/control/control | 1 + kura/distrib/src/main/resources/armhf-nn/deb/control/control | 1 + kura/distrib/src/main/resources/armhf/deb/control/control | 1 + .../src/main/resources/docker-x86_64-nn/deb/control/control | 1 + kura/distrib/src/main/resources/x86_64-nn/deb/control/control | 1 + kura/distrib/src/main/resources/x86_64/deb/control/control | 1 + 7 files changed, 7 insertions(+) diff --git a/kura/distrib/src/main/resources/aarch64-nn/deb/control/control b/kura/distrib/src/main/resources/aarch64-nn/deb/control/control index 08d1e05fb0..e18774772f 100644 --- a/kura/distrib/src/main/resources/aarch64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/aarch64-nn/deb/control/control @@ -21,6 +21,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk, ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd, python3 Architecture: arm64 Maintainer: Eclipse Kura Developers +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 diff --git a/kura/distrib/src/main/resources/aarch64/deb/control/control b/kura/distrib/src/main/resources/aarch64/deb/control/control index efab05ac70..adb2db42e7 100644 --- a/kura/distrib/src/main/resources/aarch64/deb/control/control +++ b/kura/distrib/src/main/resources/aarch64/deb/control/control @@ -23,6 +23,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk, logrotate, gpsd, python3 Architecture: arm64 Maintainer: Eclipse Kura Developers +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 diff --git a/kura/distrib/src/main/resources/armhf-nn/deb/control/control b/kura/distrib/src/main/resources/armhf-nn/deb/control/control index c83ea0ff7f..be02340377 100644 --- a/kura/distrib/src/main/resources/armhf-nn/deb/control/control +++ b/kura/distrib/src/main/resources/armhf-nn/deb/control/control @@ -21,6 +21,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk, ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd, python3 Architecture: armhf Maintainer: Eclipse Kura Developers +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 diff --git a/kura/distrib/src/main/resources/armhf/deb/control/control b/kura/distrib/src/main/resources/armhf/deb/control/control index a73afe19ae..fa74d63575 100644 --- a/kura/distrib/src/main/resources/armhf/deb/control/control +++ b/kura/distrib/src/main/resources/armhf/deb/control/control @@ -23,6 +23,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk, logrotate, gpsd, python3 Architecture: armhf Maintainer: Eclipse Kura Developers +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 diff --git a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control index dece2acf0d..90d8859703 100644 --- a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control @@ -9,6 +9,7 @@ Depends: dos2unix, unzip, cron Architecture: all Maintainer: Eclipse Kura Developers +Homepage: https://eclipse-kura.github.io/kura/ Description: 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 diff --git a/kura/distrib/src/main/resources/x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/x86_64-nn/deb/control/control index 3b3f3fbc6b..a4a3556f89 100644 --- a/kura/distrib/src/main/resources/x86_64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/x86_64-nn/deb/control/control @@ -21,6 +21,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk, ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd, python3 Architecture: amd64 Maintainer: Eclipse Kura Developers +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 diff --git a/kura/distrib/src/main/resources/x86_64/deb/control/control b/kura/distrib/src/main/resources/x86_64/deb/control/control index 8e1f477719..1d63e3c53e 100644 --- a/kura/distrib/src/main/resources/x86_64/deb/control/control +++ b/kura/distrib/src/main/resources/x86_64/deb/control/control @@ -23,6 +23,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk, logrotate, gpsd, python3 Architecture: amd64 Maintainer: Eclipse Kura Developers +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 From f825eb8b27589f963cd5229be16bd30c1b5ed0d9 Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Tue, 10 Dec 2024 09:12:35 +0100 Subject: [PATCH 13/17] refactor(distrib): changed kura.os.version from linux to debian Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml index 5d2b7d7b16..8736a1d53d 100644 --- a/kura/distrib/pom.xml +++ b/kura/distrib/pom.xml @@ -1206,7 +1206,7 @@ - + @@ -1303,7 +1303,7 @@ - + @@ -1395,7 +1395,7 @@ - + @@ -1492,7 +1492,7 @@ - + @@ -1584,7 +1584,7 @@ - + @@ -1681,7 +1681,7 @@ - + From 8e456abff05db0cb87a242f2f763f04aad8a4bb5 Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Tue, 10 Dec 2024 11:32:41 +0100 Subject: [PATCH 14/17] fix(distrib): corrected nn profiles names Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/pom.xml | 6 +++--- .../src/main/resources/aarch64-nn/deb/control/control | 2 +- .../distrib/src/main/resources/armhf-nn/deb/control/control | 2 +- .../src/main/resources/x86_64-nn/deb/control/control | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml index 8736a1d53d..547a874503 100644 --- a/kura/distrib/pom.xml +++ b/kura/distrib/pom.xml @@ -1326,7 +1326,7 @@ true - ${basedir}/target/kura_${project.version}_armhf-nn_installer.deb + ${basedir}/target/kura-nn_${project.version}_armhf_installer.deb ${basedir}/src/main/resources/armhf-nn/deb/control @@ -1515,7 +1515,7 @@ true - ${basedir}/target/kura_${project.version}_x86_64-nn_installer.deb + ${basedir}/target/kura-nn_${project.version}_x86_64_installer.deb ${basedir}/src/main/resources/x86_64-nn/deb/control @@ -1704,7 +1704,7 @@ true - ${basedir}/target/kura_${project.version}_aarch64-nn_installer.deb + ${basedir}/target/kura-nn_${project.version}_aarch64_installer.deb ${basedir}/src/main/resources/aarch64-nn/deb/control diff --git a/kura/distrib/src/main/resources/aarch64-nn/deb/control/control b/kura/distrib/src/main/resources/aarch64-nn/deb/control/control index e18774772f..841c492979 100644 --- a/kura/distrib/src/main/resources/aarch64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/aarch64-nn/deb/control/control @@ -10,7 +10,7 @@ # Contributors: # Eurotech # -Package: kura +Package: kura-nn Version: [[project.version]] Section: admin Priority: optional diff --git a/kura/distrib/src/main/resources/armhf-nn/deb/control/control b/kura/distrib/src/main/resources/armhf-nn/deb/control/control index be02340377..2fdbc66331 100644 --- a/kura/distrib/src/main/resources/armhf-nn/deb/control/control +++ b/kura/distrib/src/main/resources/armhf-nn/deb/control/control @@ -10,7 +10,7 @@ # Contributors: # Eurotech # -Package: kura +Package: kura-nn Version: [[project.version]] Section: admin Priority: optional diff --git a/kura/distrib/src/main/resources/x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/x86_64-nn/deb/control/control index a4a3556f89..23952627e9 100644 --- a/kura/distrib/src/main/resources/x86_64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/x86_64-nn/deb/control/control @@ -10,7 +10,7 @@ # Contributors: # Eurotech # -Package: kura +Package: kura-nn Version: [[project.version]] Section: admin Priority: optional From 4852c4889d22ecc7e9b9fea83885478121467792 Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Tue, 10 Dec 2024 11:43:37 +0100 Subject: [PATCH 15/17] fix(distrib): corrected docker metadata Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/.vscode/settings.json | 3 +++ .../docker-x86_64-nn/deb/control/control | 25 ++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 kura/distrib/.vscode/settings.json diff --git a/kura/distrib/.vscode/settings.json b/kura/distrib/.vscode/settings.json new file mode 100644 index 0000000000..0e14d8e27d --- /dev/null +++ b/kura/distrib/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "disabled" +} \ No newline at end of file diff --git a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control index 90d8859703..904c79497f 100644 --- a/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/docker-x86_64-nn/deb/control/control @@ -1,16 +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 +Architecture: amd64 Maintainer: Eclipse Kura Developers Homepage: https://eclipse-kura.github.io/kura/ -Description: Kura is an inclusive software framework that puts a layer +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 From 0cb5dab4a0783ea0ba2eb89ec6b4aeae82ea9fb6 Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Tue, 10 Dec 2024 12:18:06 +0100 Subject: [PATCH 16/17] fix(distrib): changed installer .deb names to match __.deb Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml index 547a874503..b973d157a3 100644 --- a/kura/distrib/pom.xml +++ b/kura/distrib/pom.xml @@ -1229,7 +1229,7 @@ true - ${basedir}/target/kura_${project.version}_armhf_installer.deb + ${basedir}/target/kura_${project.version}_armhf.deb ${basedir}/src/main/resources/armhf/deb/control @@ -1326,7 +1326,7 @@ true - ${basedir}/target/kura-nn_${project.version}_armhf_installer.deb + ${basedir}/target/kura-nn_${project.version}_armhf.deb ${basedir}/src/main/resources/armhf-nn/deb/control @@ -1418,7 +1418,7 @@ true - ${basedir}/target/kura_${project.version}_x86_64_installer.deb + ${basedir}/target/kura_${project.version}_amd64.deb ${basedir}/src/main/resources/x86_64/deb/control @@ -1515,7 +1515,7 @@ true - ${basedir}/target/kura-nn_${project.version}_x86_64_installer.deb + ${basedir}/target/kura-nn_${project.version}_amd64.deb ${basedir}/src/main/resources/x86_64-nn/deb/control @@ -1607,7 +1607,7 @@ true - ${basedir}/target/kura_${project.version}_aarch64_installer.deb + ${basedir}/target/kura_${project.version}_arm64.deb ${basedir}/src/main/resources/aarch64/deb/control @@ -1704,7 +1704,7 @@ true - ${basedir}/target/kura-nn_${project.version}_aarch64_installer.deb + ${basedir}/target/kura-nn_${project.version}_arm64.deb ${basedir}/src/main/resources/aarch64-nn/deb/control From c1a620a698701dd5d607b820ebfccb403d35c746 Mon Sep 17 00:00:00 2001 From: Marcello Rinaldo Martina Date: Tue, 10 Dec 2024 12:18:46 +0100 Subject: [PATCH 17/17] fix: removing wrong commited files Signed-off-by: Marcello Rinaldo Martina --- kura/distrib/.vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 kura/distrib/.vscode/settings.json diff --git a/kura/distrib/.vscode/settings.json b/kura/distrib/.vscode/settings.json deleted file mode 100644 index 0e14d8e27d..0000000000 --- a/kura/distrib/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "disabled" -} \ No newline at end of file