From 8b58f49ec0f700b378374872d401ef4a3bc6aa25 Mon Sep 17 00:00:00 2001 From: Mattia Dal Ben Date: Wed, 28 Aug 2024 16:33:50 +0200 Subject: [PATCH 1/4] fix: correctly report architecture in deb control --- .../src/main/resources/generic-aarch64-nn/deb/control/control | 4 ++-- .../src/main/resources/generic-aarch64/deb/control/control | 4 ++-- .../src/main/resources/generic-arm32-nn/deb/control/control | 2 +- .../src/main/resources/generic-arm32/deb/control/control | 2 +- .../src/main/resources/generic-x86_64-nn/deb/control/control | 4 ++-- .../src/main/resources/generic-x86_64/deb/control/control | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control b/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control index de80d3e16d2..374b187f82a 100644 --- a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control @@ -20,10 +20,10 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem bluez | bluez5, bluez-hcidump | bluez5-noinst-tools, ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd Recommends: python3 -Architecture: all +Architecture: arm64 Maintainer: support@eurotech.com 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 and software that can be easily ported from one hardware platform - to another. \ No newline at end of file + to another. diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control b/kura/distrib/src/main/resources/generic-aarch64/deb/control/control index 9efbdb6b1f7..60dbfb0a50c 100644 --- a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control +++ b/kura/distrib/src/main/resources/generic-aarch64/deb/control/control @@ -23,10 +23,10 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem logrotate, gpsd Recommends: python3 -Architecture: all +Architecture: arm64 Maintainer: support@eurotech.com 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 and software that can be easily ported from one hardware platform - to another. \ No newline at end of file + to another. diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control b/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control index 1916034356d..540b24618ba 100644 --- a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control +++ b/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control @@ -20,7 +20,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem bluez | bluez5, bluez-hcidump | bluez5-noinst-tools, ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd Recommends: python3 -Architecture: all +Architecture: armhf Maintainer: support@eurotech.com Description: 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/generic-arm32/deb/control/control b/kura/distrib/src/main/resources/generic-arm32/deb/control/control index a55507d887e..75134318c1b 100644 --- a/kura/distrib/src/main/resources/generic-arm32/deb/control/control +++ b/kura/distrib/src/main/resources/generic-arm32/deb/control/control @@ -23,7 +23,7 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem logrotate, gpsd Recommends: python3 -Architecture: all +Architecture: armhf Maintainer: support@eurotech.com Description: 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/generic-x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control index de80d3e16d2..a72a47fbdd9 100644 --- a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control @@ -20,10 +20,10 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem bluez | bluez5, bluez-hcidump | bluez5-noinst-tools, ntpdate, chrony, chronyc | chrony, cron | cronie, logrotate, gpsd Recommends: python3 -Architecture: all +Architecture: amd64 Maintainer: support@eurotech.com 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 and software that can be easily ported from one hardware platform - to another. \ No newline at end of file + to another. diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control b/kura/distrib/src/main/resources/generic-x86_64/deb/control/control index 9efbdb6b1f7..11021a1dad1 100644 --- a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control +++ b/kura/distrib/src/main/resources/generic-x86_64/deb/control/control @@ -23,10 +23,10 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem logrotate, gpsd Recommends: python3 -Architecture: all +Architecture: amd64 Maintainer: support@eurotech.com 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 and software that can be easily ported from one hardware platform - to another. \ No newline at end of file + to another. From 6eb90534a4e25dfec570cc1a3068657b1901948d Mon Sep 17 00:00:00 2001 From: Mattia Dal Ben Date: Thu, 29 Aug 2024 08:58:30 +0200 Subject: [PATCH 2/4] fix: shorten description so that it is correctly displayed by apt search --- .../main/resources/docker-x86_64-nn/deb/control/control | 8 ++------ .../main/resources/generic-aarch64-nn/deb/control/control | 6 +----- .../main/resources/generic-aarch64/deb/control/control | 6 +----- .../main/resources/generic-arm32-nn/deb/control/control | 6 +----- .../src/main/resources/generic-arm32/deb/control/control | 6 +----- .../main/resources/generic-x86_64-nn/deb/control/control | 6 +----- .../src/main/resources/generic-x86_64/deb/control/control | 6 +----- 7 files changed, 8 insertions(+), 36 deletions(-) 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 17ac6fcdafc..a87601f7208 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 @@ -7,10 +7,6 @@ Depends: dos2unix, unzip, bluez, chrony, ntpdate, openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk, cron -Architecture: all +Architecture: amd64 Maintainer: support@eurotech.com -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 - and software that can be easily ported from one hardware platform - to another. +Description: Open-source IoT edge framework based on Java/OSGi. diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control b/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control index 374b187f82a..953676f7c55 100644 --- a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control @@ -22,8 +22,4 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem Recommends: python3 Architecture: arm64 Maintainer: support@eurotech.com -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 - and software that can be easily ported from one hardware platform - to another. +Description: Open-source IoT edge framework based on Java/OSGi. diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control b/kura/distrib/src/main/resources/generic-aarch64/deb/control/control index 60dbfb0a50c..d5c2b824f35 100644 --- a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control +++ b/kura/distrib/src/main/resources/generic-aarch64/deb/control/control @@ -25,8 +25,4 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem Recommends: python3 Architecture: arm64 Maintainer: support@eurotech.com -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 - and software that can be easily ported from one hardware platform - to another. +Description: Open-source IoT edge framework based on Java/OSGi. diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control b/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control index 540b24618ba..3ae259e417f 100644 --- a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control +++ b/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control @@ -22,8 +22,4 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem Recommends: python3 Architecture: armhf Maintainer: support@eurotech.com -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 - and software that can be easily ported from one hardware platform - to another. +Description: Open-source IoT edge framework based on Java/OSGi. diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/control b/kura/distrib/src/main/resources/generic-arm32/deb/control/control index 75134318c1b..fc4e5408845 100644 --- a/kura/distrib/src/main/resources/generic-arm32/deb/control/control +++ b/kura/distrib/src/main/resources/generic-arm32/deb/control/control @@ -25,8 +25,4 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem Recommends: python3 Architecture: armhf Maintainer: support@eurotech.com -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 - and software that can be easily ported from one hardware platform - to another. +Description: Open-source IoT edge framework based on Java/OSGi. diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control index a72a47fbdd9..18c07b7fe9c 100644 --- a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control @@ -22,8 +22,4 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem Recommends: python3 Architecture: amd64 Maintainer: support@eurotech.com -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 - and software that can be easily ported from one hardware platform - to another. +Description: Open-source IoT edge framework based on Java/OSGi. diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control b/kura/distrib/src/main/resources/generic-x86_64/deb/control/control index 11021a1dad1..f642b46d923 100644 --- a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control +++ b/kura/distrib/src/main/resources/generic-x86_64/deb/control/control @@ -25,8 +25,4 @@ Depends: openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | tem Recommends: python3 Architecture: amd64 Maintainer: support@eurotech.com -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 - and software that can be easily ported from one hardware platform - to another. +Description: Open-source IoT edge framework based on Java/OSGi. From 4494526be86f44ea7939519c171e03765ab6a293 Mon Sep 17 00:00:00 2001 From: Mattia Dal Ben Date: Thu, 29 Aug 2024 14:36:51 +0200 Subject: [PATCH 3/4] refactor: reintroduce extended description --- .../resources/docker-x86_64-nn/deb/control/control | 11 ++++++++--- .../resources/generic-aarch64-nn/deb/control/control | 5 +++++ .../resources/generic-aarch64/deb/control/control | 5 +++++ .../resources/generic-arm32-nn/deb/control/control | 5 +++++ .../main/resources/generic-arm32/deb/control/control | 5 +++++ .../resources/generic-x86_64-nn/deb/control/control | 5 +++++ .../main/resources/generic-x86_64/deb/control/control | 5 +++++ 7 files changed, 38 insertions(+), 3 deletions(-) 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 a87601f7208..6953cb6549f 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 @@ -2,11 +2,16 @@ Package: kura Version: [[project.version]] Section: misc Priority: low -Depends: dos2unix, unzip, - telnet, bluez-hcidump, - bluez, chrony, ntpdate, +Depends: dos2unix, unzip, + telnet, bluez-hcidump, + bluez, chrony, ntpdate, openjdk-17-jre-headless | temurin-17-jdk | openjdk-8-jre-headless | temurin-8-jdk, cron Architecture: amd64 Maintainer: support@eurotech.com 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 + to another. diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control b/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control index 953676f7c55..f305647527d 100644 --- a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control @@ -23,3 +23,8 @@ Recommends: python3 Architecture: arm64 Maintainer: support@eurotech.com 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 + to another. diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control b/kura/distrib/src/main/resources/generic-aarch64/deb/control/control index d5c2b824f35..9f65d23e0db 100644 --- a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control +++ b/kura/distrib/src/main/resources/generic-aarch64/deb/control/control @@ -26,3 +26,8 @@ Recommends: python3 Architecture: arm64 Maintainer: support@eurotech.com 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 + to another. diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control b/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control index 3ae259e417f..bc9f9be17fd 100644 --- a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control +++ b/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control @@ -23,3 +23,8 @@ Recommends: python3 Architecture: armhf Maintainer: support@eurotech.com 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 + to another. diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/control b/kura/distrib/src/main/resources/generic-arm32/deb/control/control index fc4e5408845..0b52604e314 100644 --- a/kura/distrib/src/main/resources/generic-arm32/deb/control/control +++ b/kura/distrib/src/main/resources/generic-arm32/deb/control/control @@ -26,3 +26,8 @@ Recommends: python3 Architecture: armhf Maintainer: support@eurotech.com 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 + to another. diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control b/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control index 18c07b7fe9c..650c0ba2553 100644 --- a/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control +++ b/kura/distrib/src/main/resources/generic-x86_64-nn/deb/control/control @@ -23,3 +23,8 @@ Recommends: python3 Architecture: amd64 Maintainer: support@eurotech.com 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 + to another. diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control b/kura/distrib/src/main/resources/generic-x86_64/deb/control/control index f642b46d923..3d1b613f176 100644 --- a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control +++ b/kura/distrib/src/main/resources/generic-x86_64/deb/control/control @@ -26,3 +26,8 @@ Recommends: python3 Architecture: amd64 Maintainer: support@eurotech.com 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 + to another. From e6fe59641ad9af44687f3e60aa0ae5e67c35ada8 Mon Sep 17 00:00:00 2001 From: Mattia Dal Ben Date: Thu, 29 Aug 2024 15:23:55 +0200 Subject: [PATCH 4/4] refactor: user proper architecture names --- kura/distrib/pom.xml | 96 +++++++++---------- .../deb/control/control | 0 .../deb/control/postinst | 0 .../deb/control/preinst | 0 .../deb/control/prerm | 0 .../kura.logrotate | 0 .../kura.properties | 2 +- .../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 | 2 +- .../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 .../kura.logrotate | 0 .../kura.properties | 2 +- .../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 | 2 +- .../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 .../kura.logrotate | 0 .../kura.properties | 2 +- .../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 | 2 +- .../kura_install.sh | 0 .../kura_upgrade.sh | 0 .../log4j.xml | 0 61 files changed, 54 insertions(+), 54 deletions(-) rename kura/distrib/src/main/resources/{generic-x86_64-nn => generic-amd64-nn}/deb/control/control (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => generic-amd64-nn}/deb/control/postinst (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => generic-amd64-nn}/deb/control/preinst (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => generic-amd64-nn}/deb/control/prerm (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => generic-amd64-nn}/kura.logrotate (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => generic-amd64-nn}/kura.properties (99%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => generic-amd64-nn}/kura_install.sh (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => generic-amd64-nn}/kura_upgrade.sh (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => generic-amd64-nn}/log4j.xml (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => generic-amd64}/deb/control/control (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => generic-amd64}/deb/control/postinst (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => generic-amd64}/deb/control/preinst (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => generic-amd64}/deb/control/prerm (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => generic-amd64}/firewall.init (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => generic-amd64}/firewall.service (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => generic-amd64}/kura.logrotate (100%) rename kura/distrib/src/main/resources/{generic-arm32 => generic-amd64}/kura.properties (99%) rename kura/distrib/src/main/resources/{generic-aarch64 => generic-amd64}/kura_install.sh (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => generic-amd64}/kura_upgrade.sh (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => generic-amd64}/log4j.xml (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => generic-arm64-nn}/deb/control/control (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => generic-arm64-nn}/deb/control/postinst (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => generic-arm64-nn}/deb/control/preinst (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => generic-arm64-nn}/deb/control/prerm (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => generic-arm64-nn}/kura.logrotate (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => generic-arm64-nn}/kura.properties (99%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => generic-arm64-nn}/kura_install.sh (100%) rename kura/distrib/src/main/resources/{generic-aarch64-nn => generic-arm64-nn}/kura_upgrade.sh (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => generic-arm64-nn}/log4j.xml (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => generic-arm64}/deb/control/control (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => generic-arm64}/deb/control/postinst (100%) rename kura/distrib/src/main/resources/{generic-arm32 => generic-arm64}/deb/control/preinst (100%) rename kura/distrib/src/main/resources/{generic-arm32 => generic-arm64}/deb/control/prerm (100%) rename kura/distrib/src/main/resources/{generic-arm32 => generic-arm64}/firewall.init (100%) rename kura/distrib/src/main/resources/{generic-arm32 => generic-arm64}/firewall.service (100%) rename kura/distrib/src/main/resources/{generic-arm32 => generic-arm64}/kura.logrotate (100%) rename kura/distrib/src/main/resources/{generic-aarch64 => generic-arm64}/kura.properties (99%) rename kura/distrib/src/main/resources/{generic-arm32 => generic-arm64}/kura_install.sh (100%) rename kura/distrib/src/main/resources/{generic-arm32 => generic-arm64}/kura_upgrade.sh (100%) rename kura/distrib/src/main/resources/{generic-arm32 => generic-arm64}/log4j.xml (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => generic-armhf-nn}/deb/control/control (100%) rename kura/distrib/src/main/resources/{generic-arm32 => generic-armhf-nn}/deb/control/postinst (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => generic-armhf-nn}/deb/control/preinst (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => generic-armhf-nn}/deb/control/prerm (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => generic-armhf-nn}/kura.logrotate (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => generic-armhf-nn}/kura.properties (99%) rename kura/distrib/src/main/resources/{generic-arm32-nn => generic-armhf-nn}/kura_install.sh (100%) rename kura/distrib/src/main/resources/{generic-arm32-nn => generic-armhf-nn}/kura_upgrade.sh (100%) rename kura/distrib/src/main/resources/{generic-x86_64-nn => generic-armhf-nn}/log4j.xml (100%) rename kura/distrib/src/main/resources/{generic-arm32 => generic-armhf}/deb/control/control (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => generic-armhf}/deb/control/postinst (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => generic-armhf}/deb/control/preinst (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => generic-armhf}/deb/control/prerm (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => generic-armhf}/firewall.init (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => generic-armhf}/firewall.service (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => generic-armhf}/kura.logrotate (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => generic-armhf}/kura.properties (99%) rename kura/distrib/src/main/resources/{generic-x86_64 => generic-armhf}/kura_install.sh (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => generic-armhf}/kura_upgrade.sh (100%) rename kura/distrib/src/main/resources/{generic-x86_64 => generic-armhf}/log4j.xml (100%) diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml index e73de846885..73b4f24d69b 100644 --- a/kura/distrib/pom.xml +++ b/kura/distrib/pom.xml @@ -1147,7 +1147,7 @@ - generic-arm32 + generic-armhf buildAll @@ -1180,7 +1180,7 @@ 1.7 - generic-arm32-jars + generic-armhf-jars prepare-package run @@ -1191,8 +1191,8 @@ - - + + @@ -1211,18 +1211,18 @@ 1.0 - generic-arm32-deb + generic-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}_generic-armhf_installer.deb + ${basedir}/src/main/resources/generic-armhf/deb/control - ${basedir}/target/kura_${project.version}_generic-arm32.zip + ${basedir}/target/kura_${project.version}_generic-armhf.zip file perm @@ -1244,7 +1244,7 @@ - generic-arm32-nn + generic-armhf-nn buildAll @@ -1277,7 +1277,7 @@ 1.7 - generic-arm32-nn-jars + generic-armhf-nn-jars prepare-package run @@ -1288,8 +1288,8 @@ - - + + @@ -1308,18 +1308,18 @@ 1.0 - generic-arm32-nn-deb + generic-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}_generic-armhf-nn_installer.deb + ${basedir}/src/main/resources/generic-armhf-nn/deb/control - ${basedir}/target/kura_${project.version}_generic-arm32-nn.zip + ${basedir}/target/kura_${project.version}_generic-armhf-nn.zip file perm @@ -1336,7 +1336,7 @@ - generic-x86_64 + generic-amd64 buildAll @@ -1369,7 +1369,7 @@ 1.7 - generic-x86_64-jars + generic-amd64-jars prepare-package run @@ -1380,8 +1380,8 @@ - - + + @@ -1400,18 +1400,18 @@ 1.0 - generic-x86_64-deb + generic-amd64-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}_generic-amd64_installer.deb + ${basedir}/src/main/resources/generic-amd64/deb/control - ${basedir}/target/kura_${project.version}_generic-x86_64.zip + ${basedir}/target/kura_${project.version}_generic-amd64.zip file perm @@ -1433,7 +1433,7 @@ - generic-x86_64-nn + generic-amd64-nn buildAll @@ -1466,7 +1466,7 @@ 1.7 - generic-x86_64-nn-jars + generic-amd64-nn-jars prepare-package run @@ -1477,8 +1477,8 @@ - - + + @@ -1497,18 +1497,18 @@ 1.0 - generic-x86_64-nn-deb + generic-amd64-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}_generic-amd64-nn_installer.deb + ${basedir}/src/main/resources/generic-amd64-nn/deb/control - ${basedir}/target/kura_${project.version}_generic-x86_64-nn.zip + ${basedir}/target/kura_${project.version}_generic-amd64-nn.zip file perm @@ -1525,7 +1525,7 @@ - generic-aarch64 + generic-arm64 buildAll @@ -1558,7 +1558,7 @@ 1.7 - generic-aarch64-jars + generic-arm64-jars prepare-package run @@ -1569,8 +1569,8 @@ - - + + @@ -1589,18 +1589,18 @@ 1.0 - generic-aarch64-deb + generic-arm64-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}_generic-arm64_installer.deb + ${basedir}/src/main/resources/generic-arm64/deb/control - ${basedir}/target/kura_${project.version}_generic-aarch64.zip + ${basedir}/target/kura_${project.version}_generic-arm64.zip file perm @@ -1622,7 +1622,7 @@ - generic-aarch64-nn + generic-arm64-nn buildAll @@ -1655,7 +1655,7 @@ 1.7 - generic-aarch64-nn-jars + generic-arm64-nn-jars prepare-package run @@ -1666,8 +1666,8 @@ - - + + @@ -1686,18 +1686,18 @@ 1.0 - generic-aarch64-nn-deb + generic-arm64-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}_generic-arm64-nn_installer.deb + ${basedir}/src/main/resources/generic-arm64-nn/deb/control - ${basedir}/target/kura_${project.version}_generic-aarch64-nn.zip + ${basedir}/target/kura_${project.version}_generic-arm64-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/generic-amd64-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/generic-amd64-nn/deb/control/control diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/postinst b/kura/distrib/src/main/resources/generic-amd64-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/generic-amd64-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/generic-amd64-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/generic-amd64-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/generic-amd64-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/generic-amd64-nn/deb/control/prerm diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura.logrotate b/kura/distrib/src/main/resources/generic-amd64-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/generic-amd64-nn/kura.logrotate diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura.properties b/kura/distrib/src/main/resources/generic-amd64-nn/kura.properties similarity index 99% rename from kura/distrib/src/main/resources/generic-x86_64-nn/kura.properties rename to kura/distrib/src/main/resources/generic-amd64-nn/kura.properties index 248b30f37de..d8ba8f835eb 100644 --- a/kura/distrib/src/main/resources/generic-x86_64-nn/kura.properties +++ b/kura/distrib/src/main/resources/generic-amd64-nn/kura.properties @@ -18,7 +18,7 @@ kura.name=Eclipse Kura kura.version= kura.marketplace.compatibility.version= kura.company=EUROTECH -kura.project=generic-x86_64 +kura.project=generic-amd64 kura.platform=kura_platform kura.device.name=device_name kura.model.id=device_name diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura_install.sh b/kura/distrib/src/main/resources/generic-amd64-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/generic-amd64-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/generic-amd64-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/generic-amd64-nn/kura_upgrade.sh diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/log4j.xml b/kura/distrib/src/main/resources/generic-amd64-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/generic-amd64-nn/log4j.xml diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/control b/kura/distrib/src/main/resources/generic-amd64/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/generic-amd64/deb/control/control diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/postinst b/kura/distrib/src/main/resources/generic-amd64/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/generic-amd64/deb/control/postinst diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/preinst b/kura/distrib/src/main/resources/generic-amd64/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/generic-amd64/deb/control/preinst diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/prerm b/kura/distrib/src/main/resources/generic-amd64/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/generic-amd64/deb/control/prerm diff --git a/kura/distrib/src/main/resources/generic-aarch64/firewall.init b/kura/distrib/src/main/resources/generic-amd64/firewall.init similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/firewall.init rename to kura/distrib/src/main/resources/generic-amd64/firewall.init diff --git a/kura/distrib/src/main/resources/generic-aarch64/firewall.service b/kura/distrib/src/main/resources/generic-amd64/firewall.service similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/firewall.service rename to kura/distrib/src/main/resources/generic-amd64/firewall.service diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura.logrotate b/kura/distrib/src/main/resources/generic-amd64/kura.logrotate similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/kura.logrotate rename to kura/distrib/src/main/resources/generic-amd64/kura.logrotate diff --git a/kura/distrib/src/main/resources/generic-arm32/kura.properties b/kura/distrib/src/main/resources/generic-amd64/kura.properties similarity index 99% rename from kura/distrib/src/main/resources/generic-arm32/kura.properties rename to kura/distrib/src/main/resources/generic-amd64/kura.properties index 4d821f45f16..f56c054f7d9 100644 --- a/kura/distrib/src/main/resources/generic-arm32/kura.properties +++ b/kura/distrib/src/main/resources/generic-amd64/kura.properties @@ -18,7 +18,7 @@ kura.name=Eclipse Kura kura.version= kura.marketplace.compatibility.version= kura.company=EUROTECH -kura.project=generic-arm32 +kura.project=generic-amd64 kura.platform=kura_platform kura.device.name=device_name kura.model.id=device_name diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura_install.sh b/kura/distrib/src/main/resources/generic-amd64/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/generic-amd64/kura_install.sh diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura_upgrade.sh b/kura/distrib/src/main/resources/generic-amd64/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/generic-amd64/kura_upgrade.sh diff --git a/kura/distrib/src/main/resources/generic-aarch64/log4j.xml b/kura/distrib/src/main/resources/generic-amd64/log4j.xml similarity index 100% rename from kura/distrib/src/main/resources/generic-aarch64/log4j.xml rename to kura/distrib/src/main/resources/generic-amd64/log4j.xml diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/control b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-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/generic-arm64-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/generic-arm64-nn/deb/control/postinst diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/preinst b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/deb/control/preinst diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/deb/control/prerm b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/deb/control/prerm diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura.logrotate b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/kura.logrotate diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura.properties b/kura/distrib/src/main/resources/generic-arm64-nn/kura.properties similarity index 99% rename from kura/distrib/src/main/resources/generic-aarch64-nn/kura.properties rename to kura/distrib/src/main/resources/generic-arm64-nn/kura.properties index 6afc9a353cf..8f5d13e93d9 100644 --- a/kura/distrib/src/main/resources/generic-aarch64-nn/kura.properties +++ b/kura/distrib/src/main/resources/generic-arm64-nn/kura.properties @@ -18,7 +18,7 @@ kura.name=Eclipse Kura kura.version= kura.marketplace.compatibility.version= kura.company=EUROTECH -kura.project=generic-aarch64 +kura.project=generic-arm64 kura.platform=kura_platform kura.device.name=device_name kura.model.id=N/A diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura_install.sh b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/kura_install.sh diff --git a/kura/distrib/src/main/resources/generic-aarch64-nn/kura_upgrade.sh b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/kura_upgrade.sh diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/log4j.xml b/kura/distrib/src/main/resources/generic-arm64-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/generic-arm64-nn/log4j.xml diff --git a/kura/distrib/src/main/resources/generic-aarch64/deb/control/control b/kura/distrib/src/main/resources/generic-arm64/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/generic-arm64/deb/control/control diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/postinst b/kura/distrib/src/main/resources/generic-arm64/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/generic-arm64/deb/control/postinst diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/preinst b/kura/distrib/src/main/resources/generic-arm64/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/generic-arm64/deb/control/preinst diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/prerm b/kura/distrib/src/main/resources/generic-arm64/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/generic-arm64/deb/control/prerm diff --git a/kura/distrib/src/main/resources/generic-arm32/firewall.init b/kura/distrib/src/main/resources/generic-arm64/firewall.init similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/firewall.init rename to kura/distrib/src/main/resources/generic-arm64/firewall.init diff --git a/kura/distrib/src/main/resources/generic-arm32/firewall.service b/kura/distrib/src/main/resources/generic-arm64/firewall.service similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/firewall.service rename to kura/distrib/src/main/resources/generic-arm64/firewall.service diff --git a/kura/distrib/src/main/resources/generic-arm32/kura.logrotate b/kura/distrib/src/main/resources/generic-arm64/kura.logrotate similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/kura.logrotate rename to kura/distrib/src/main/resources/generic-arm64/kura.logrotate diff --git a/kura/distrib/src/main/resources/generic-aarch64/kura.properties b/kura/distrib/src/main/resources/generic-arm64/kura.properties similarity index 99% rename from kura/distrib/src/main/resources/generic-aarch64/kura.properties rename to kura/distrib/src/main/resources/generic-arm64/kura.properties index 00204a9dcaa..78de7a8b271 100644 --- a/kura/distrib/src/main/resources/generic-aarch64/kura.properties +++ b/kura/distrib/src/main/resources/generic-arm64/kura.properties @@ -18,7 +18,7 @@ kura.name=Eclipse Kura kura.version= kura.marketplace.compatibility.version= kura.company=EUROTECH -kura.project=generic-aarch64 +kura.project=generic-arm64 kura.platform=kura_platform kura.device.name=device_name kura.model.id=N/A diff --git a/kura/distrib/src/main/resources/generic-arm32/kura_install.sh b/kura/distrib/src/main/resources/generic-arm64/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/generic-arm64/kura_install.sh diff --git a/kura/distrib/src/main/resources/generic-arm32/kura_upgrade.sh b/kura/distrib/src/main/resources/generic-arm64/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/generic-arm64/kura_upgrade.sh diff --git a/kura/distrib/src/main/resources/generic-arm32/log4j.xml b/kura/distrib/src/main/resources/generic-arm64/log4j.xml similarity index 100% rename from kura/distrib/src/main/resources/generic-arm32/log4j.xml rename to kura/distrib/src/main/resources/generic-arm64/log4j.xml diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/deb/control/control b/kura/distrib/src/main/resources/generic-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/generic-armhf-nn/deb/control/control diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/postinst b/kura/distrib/src/main/resources/generic-armhf-nn/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/generic-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/generic-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/generic-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/generic-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/generic-armhf-nn/deb/control/prerm diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/kura.logrotate b/kura/distrib/src/main/resources/generic-armhf-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/generic-armhf-nn/kura.logrotate diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura.properties b/kura/distrib/src/main/resources/generic-armhf-nn/kura.properties similarity index 99% rename from kura/distrib/src/main/resources/generic-arm32-nn/kura.properties rename to kura/distrib/src/main/resources/generic-armhf-nn/kura.properties index 1f856020d33..9a1539c657a 100644 --- a/kura/distrib/src/main/resources/generic-arm32-nn/kura.properties +++ b/kura/distrib/src/main/resources/generic-armhf-nn/kura.properties @@ -18,7 +18,7 @@ kura.name=Eclipse Kura kura.version= kura.marketplace.compatibility.version= kura.company=EUROTECH -kura.project=generic-arm32 +kura.project=generic-armhf kura.platform=kura_platform kura.device.name=device_name kura.model.id=device_name diff --git a/kura/distrib/src/main/resources/generic-arm32-nn/kura_install.sh b/kura/distrib/src/main/resources/generic-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/generic-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/generic-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/generic-armhf-nn/kura_upgrade.sh diff --git a/kura/distrib/src/main/resources/generic-x86_64-nn/log4j.xml b/kura/distrib/src/main/resources/generic-armhf-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/generic-armhf-nn/log4j.xml diff --git a/kura/distrib/src/main/resources/generic-arm32/deb/control/control b/kura/distrib/src/main/resources/generic-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/generic-armhf/deb/control/control diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/postinst b/kura/distrib/src/main/resources/generic-armhf/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/generic-armhf/deb/control/postinst diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/preinst b/kura/distrib/src/main/resources/generic-armhf/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/generic-armhf/deb/control/preinst diff --git a/kura/distrib/src/main/resources/generic-x86_64/deb/control/prerm b/kura/distrib/src/main/resources/generic-armhf/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/generic-armhf/deb/control/prerm diff --git a/kura/distrib/src/main/resources/generic-x86_64/firewall.init b/kura/distrib/src/main/resources/generic-armhf/firewall.init similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/firewall.init rename to kura/distrib/src/main/resources/generic-armhf/firewall.init diff --git a/kura/distrib/src/main/resources/generic-x86_64/firewall.service b/kura/distrib/src/main/resources/generic-armhf/firewall.service similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/firewall.service rename to kura/distrib/src/main/resources/generic-armhf/firewall.service diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura.logrotate b/kura/distrib/src/main/resources/generic-armhf/kura.logrotate similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/kura.logrotate rename to kura/distrib/src/main/resources/generic-armhf/kura.logrotate diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura.properties b/kura/distrib/src/main/resources/generic-armhf/kura.properties similarity index 99% rename from kura/distrib/src/main/resources/generic-x86_64/kura.properties rename to kura/distrib/src/main/resources/generic-armhf/kura.properties index eab684412d0..ffbda80b119 100644 --- a/kura/distrib/src/main/resources/generic-x86_64/kura.properties +++ b/kura/distrib/src/main/resources/generic-armhf/kura.properties @@ -18,7 +18,7 @@ kura.name=Eclipse Kura kura.version= kura.marketplace.compatibility.version= kura.company=EUROTECH -kura.project=generic-x86_64 +kura.project=generic-armhf kura.platform=kura_platform kura.device.name=device_name kura.model.id=device_name diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura_install.sh b/kura/distrib/src/main/resources/generic-armhf/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/generic-armhf/kura_install.sh diff --git a/kura/distrib/src/main/resources/generic-x86_64/kura_upgrade.sh b/kura/distrib/src/main/resources/generic-armhf/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/generic-armhf/kura_upgrade.sh diff --git a/kura/distrib/src/main/resources/generic-x86_64/log4j.xml b/kura/distrib/src/main/resources/generic-armhf/log4j.xml similarity index 100% rename from kura/distrib/src/main/resources/generic-x86_64/log4j.xml rename to kura/distrib/src/main/resources/generic-armhf/log4j.xml