refactor: Remove monit and sysV bundles and references (#5334)

* Removed monit resources and references Signed-off-by: pierantoniomerlino <[email protected]> * Removed sysV resources and references Signed-off-by: pierantoniomerlino <[email protected]> * Removed sysc.provider; deleted service.manager property from ant Signed-off-by: pierantoniomerlino <[email protected]> * Removed sysv from distrib pom and build properties Signed-off-by: pierantoniomerlino <[email protected]> * Fixed ant script Signed-off-by: pierantoniomerlino <[email protected]> --------- Signed-off-by: pierantoniomerlino <[email protected]>
eclipse-kura · Aug 16, 2024 · af0ac35 · af0ac35
1 parent 6a47cf4
commit af0ac35
Show file tree

Hide file tree

Showing 31 changed files with 30 additions and 797 deletions.
diff --git a/kura/distrib/config/kura.build.properties b/kura/distrib/config/kura.build.properties
@@ -47,7 +47,6 @@ org.eclipse.kura.ble.ibeacon.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.ble.eddystone.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.linux.command.version=2.0.0-SNAPSHOT
 org.eclipse.kura.linux.net.version=3.0.0-SNAPSHOT
-org.eclipse.kura.linux.sysv.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.linux.systemd.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.linux.debian.provider.version=2.0.0-SNAPSHOT
 org.eclipse.kura.linux.redhat.provider.version=2.0.0-SNAPSHOT

diff --git a/kura/distrib/pom.xml b/kura/distrib/pom.xml
@@ -321,11 +321,6 @@
                                     <artifactId>org.eclipse.kura.linux.net</artifactId>
                                     <version>${org.eclipse.kura.linux.net.version}</version>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.eclipse.kura</groupId>
-                                    <artifactId>org.eclipse.kura.linux.sysv.provider</artifactId>
-                                    <version>${org.eclipse.kura.linux.sysv.provider.version}</version>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.eclipse.kura</groupId>
                                     <artifactId>org.eclipse.kura.linux.systemd.provider</artifactId>
@@ -771,7 +766,6 @@
                                 <move file="target/plugins/org.eclipse.kura.linux.clock.jar" tofile="target/plugins/org.eclipse.kura.linux.clock_${org.eclipse.kura.linux.clock.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.linux.command.jar" tofile="target/plugins/org.eclipse.kura.linux.command_${org.eclipse.kura.linux.command.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.linux.net.jar" tofile="target/plugins/org.eclipse.kura.linux.net_${org.eclipse.kura.linux.net.version}.jar" />
-                                <move file="target/plugins/org.eclipse.kura.linux.sysv.provider.jar" tofile="target/plugins/org.eclipse.kura.linux.sysv.provider_${org.eclipse.kura.linux.sysv.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.linux.systemd.provider.jar" tofile="target/plugins/org.eclipse.kura.linux.systemd.provider_${org.eclipse.kura.linux.systemd.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.linux.debian.provider.jar" tofile="target/plugins/org.eclipse.kura.linux.debian.provider_${org.eclipse.kura.linux.debian.provider.version}.jar" />
                                 <move file="target/plugins/org.eclipse.kura.linux.redhat.provider.jar" tofile="target/plugins/org.eclipse.kura.linux.redhat.provider_${org.eclipse.kura.linux.redhat.provider.version}.jar" />
@@ -1202,7 +1196,6 @@
                                         <property name="native.tag" value="armv6hf" />
                                         <property name="kura.os.version" value="raspbian" />
                                         <property name="kura.arch" value="armv7_hf" />
-                                        <property name="service.manager" value="systemd" />
                                         <property name="os.base" value="debian" />
                                         <property name="kura.mem.size" value="512m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />
@@ -1300,7 +1293,6 @@
                                         <property name="native.tag" value="armv6hf" />
                                         <property name="kura.os.version" value="raspbian" />
                                         <property name="kura.arch" value="armv7_hf" />
-                                        <property name="service.manager" value="systemd" />
                                         <property name="os.base" value="debian" />
                                         <property name="kura.mem.size" value="512m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />
@@ -1393,7 +1385,6 @@
                                         <property name="native.tag" value="x86_64" />
                                         <property name="kura.os.version" value="raspbian" />
                                         <property name="kura.arch" value="x86_64" />
-                                        <property name="service.manager" value="systemd" />
                                         <property name="os.base" value="debian" />
                                         <property name="kura.mem.size" value="512m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />
@@ -1491,7 +1482,6 @@
                                         <property name="native.tag" value="x86_64" />
                                         <property name="kura.os.version" value="raspbian" />
                                         <property name="kura.arch" value="x86_64" />
-                                        <property name="service.manager" value="systemd" />
                                         <property name="os.base" value="debian" />
                                         <property name="kura.mem.size" value="512m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />
@@ -1584,7 +1574,6 @@
                                         <property name="native.tag" value="aarch64" />
                                         <property name="kura.os.version" value="raspbian" />
                                         <property name="kura.arch" value="generic-arm64" />
-                                        <property name="service.manager" value="systemd" />
                                         <property name="os.base" value="debian" />
                                         <property name="kura.mem.size" value="512m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />
@@ -1682,7 +1671,6 @@
                                         <property name="native.tag" value="aarch64" />
                                         <property name="kura.os.version" value="raspbian" />
                                         <property name="kura.arch" value="generic-arm64" />
-                                        <property name="service.manager" value="systemd" />
                                         <property name="os.base" value="debian" />
                                         <property name="kura.mem.size" value="512m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />
@@ -1775,7 +1763,6 @@
                                         <property name="native.tag" value="x86_64" />
                                         <property name="kura.os.version" value="linux" />
                                         <property name="kura.arch" value="x86_64" />
-                                        <property name="service.manager" value="systemd" />
                                         <property name="os.base" value="linux-generic" />
                                         <property name="kura.mem.size" value="1024m" />
                                         <property name="kura.install.dir" value="/opt/eclipse" />

diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml
@@ -114,22 +114,6 @@
         <condition property="is.docker">
             <contains string="${build.name}" substring="docker" />
         </condition>
-        <condition property="is.sysv">
-            <and>
-                <contains string="${service.manager}" substring="sysv" />
-                <not>
-                    <contains string="${build.name}" substring="-nn" />
-                </not>
-            </and>
-        </condition>
-        <condition property="is.systemd">
-            <and>
-                <contains string="${service.manager}" substring="systemd" />
-                <not>
-                    <contains string="${build.name}" substring="-nn" />
-                </not>
-            </and>
-        </condition>
 
         <condition property="is.debian">
             <and>
@@ -251,10 +235,8 @@
         <antcall target="gpio-config" />
         <antcall target="emulator-gpio-config" />
         <antcall target="emulator-config" />
-        <antcall target="linux-sysv-config" />
         <antcall target="linux-debian-config" />
         <antcall target="linux-redhat-config" />
-        <antcall target="linux-systemd-config" />
         <antcall target="linux-network-manager-config" />
 
         <!-- Add mToolkit to config.ini -->
@@ -509,12 +491,6 @@ fi]]>
                 file="src/main/resources/common/manage_kura_users.sh"
                 prefix="${build.output.name}/${install.folder}/" filemode="700" />
 
-            <zipfileset
-                file="${project.build.directory}/${build.output.name}/kura.init.yocto"
-                prefix="${build.output.name}/${install.folder}" filemode="700" />
-            <zipfileset
-                file="${project.build.directory}/${build.output.name}/kura.init.raspbian"
-                prefix="${build.output.name}/${install.folder}" filemode="700" />
             <zipfileset
                 file="${project.build.directory}/${build.output.name}/kura.service"
                 prefix="${build.output.name}/${install.folder}" />
@@ -524,42 +500,13 @@ fi]]>
                 prefix="${build.output.name}/${install.folder}" filemode="700" />
             <zipfileset file="src/main/resources/${build.name}/iptables.init"
                 prefix="${build.output.name}/${install.folder}" filemode="700" />
-            <zipfileset file="src/main/resources/${build.name}/hostapd.conf"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/${build.name}/dhcpd-eth0.conf"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/${build.name}/dhcpd-wlan0.conf"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/${build.name}/dhcpd-enp2s0.conf"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/${build.name}/dhcpd-wlp4s0.conf"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/${build.name}/ifcfg-enp2s0"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/${build.name}/ifcfg-enp3s0"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/${build.name}/ifcfg-wlp4s0"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/common/monit.init.raspbian"
-                prefix="${build.output.name}/${install.folder}" filemode="700" />
-
-            <zipfileset file="src/main/resources/common/monitrc.raspbian"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/${build.name}/network.interfaces"
-                prefix="${build.output.name}/${install.folder}" />
 
             <zipfileset file="src/main/resources/common/kura-tmpfiles.conf"
                 prefix="${build.output.name}/${install.folder}" />
 
             <zipfileset file="src/main/resources/${build.name}/kura.logrotate"
                 prefix="${build.output.name}/${install.folder}" />
 
-            <zipfileset file="src/main/resources/common/sysctl.kura.conf"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/common/sysctl.kura.raspbian.conf"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/common/patch_sysctl.sh"
-                prefix="${build.output.name}/${install.folder}" />
             <zipfileset file="src/main/resources/common/find_net_interfaces.py"
                 prefix="${build.output.name}/${install.folder}" />
             <zipfileset file="src/main/resources/common/comment_interfaces_file.py"
@@ -579,32 +526,16 @@ fi]]>
                 <include name="*" />
             </zipfileset>
 
-            <zipfileset file="src/main/resources/common/named/named.conf"
-                prefix="${build.output.name}/${install.folder}" />
             <zipfileset file="src/main/resources/common/named/named.ca"
                 prefix="${build.output.name}/${install.folder}" />
             <zipfileset file="src/main/resources/common/named/named.rfc1912.zones"
                 prefix="${build.output.name}/${install.folder}" />
             <zipfileset file="src/main/resources/common/named/usr.sbin.named"
                 prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/${build.name}/bind.init"
-                prefix="${build.output.name}/${install.folder}" />
-
-            <zipfileset file="src/main/resources/common/ifdown-local"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/common/ifup-local"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/common/ifup-local.debian"
-                prefix="${build.output.name}/${install.folder}" />
-            <zipfileset file="src/main/resources/common/ifup-local.raspbian"
-                prefix="${build.output.name}/${install.folder}" />
 
             <zipfileset file="src/main/resources/common/dnsmasq"
                 prefix="${build.output.name}/${install.folder}" />
 
-            <zipfileset file="${project.build.directory}/${build.output.name}/selinuxKura.pp"
-            	prefix="${build.output.name}/${install.folder}" />
-
             <zipfileset
                 file="${project.build.directory}/${build.output.name}/start_kura.sh"
                 fullpath="${build.output.name}/${binary.folder}/start_kura.sh"
@@ -798,10 +729,8 @@ fi]]>
         <antcall target="gpio-jar" />
         <antcall target="emulator-gpio-jar" />
         <antcall target="emulator-jars" />
-        <antcall target="linux-sysv-jars" />
         <antcall target="linux-debian-jars" />
         <antcall target="linux-redhat-jars" />
-        <antcall target="linux-systemd-jars" />
         <antcall target="linux-network-manager-jars" />
 
         <echo message="Building Kura Distribution for ${build.name}-jars..." />
@@ -1738,6 +1667,11 @@ fi]]>
             <entry key="osgi.bundles" operation="+"
                 value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/org.eclipse.kura.linux.net_${org.eclipse.kura.linux.net.version}.jar@4" />
         </propertyfile>
+        <propertyfile
+            file="${project.build.directory}/${build.output.name}/config.ini">
+            <entry key="osgi.bundles" operation="+"
+                value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/org.eclipse.kura.linux.systemd.provider_${org.eclipse.kura.linux.systemd.provider.version}.jar@4" />
+        </propertyfile>
     </target>
 
     <target name="linux-network-manager-config" depends="linux-config">
@@ -1752,14 +1686,6 @@ fi]]>
         </propertyfile>
     </target>
 
-    <target name="linux-sysv-config" if="is.sysv" depends="linux-config">
-        <propertyfile
-            file="${project.build.directory}/${build.output.name}/config.ini">
-            <entry key="osgi.bundles" operation="+"
-                value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/org.eclipse.kura.linux.sysv.provider_${org.eclipse.kura.linux.sysv.provider.version}.jar@4" />
-        </propertyfile>
-    </target>
-
     <target name="linux-debian-config" if="is.debian" depends="linux-config">
         <propertyfile
             file="${project.build.directory}/${build.output.name}/config.ini">
@@ -1776,14 +1702,6 @@ fi]]>
         </propertyfile>
     </target>
 
-    <target name="linux-systemd-config" if="is.systemd" depends="linux-config">
-        <propertyfile
-            file="${project.build.directory}/${build.output.name}/config.ini">
-            <entry key="osgi.bundles" operation="+"
-                value=", reference:file:${kura.install.dir}/${kura.symlink}/${plugins.folder}/org.eclipse.kura.linux.systemd.provider_${org.eclipse.kura.linux.systemd.provider.version}.jar@4" />
-        </propertyfile>
-    </target>
-
     <target name="event-publisher-config">
         <propertyfile file="${project.build.directory}/${build.output.name}/config.ini">
             <entry key="osgi.bundles" operation="+"
@@ -1810,6 +1728,12 @@ fi]]>
                 file="${project.build.directory}/plugins/org.eclipse.kura.linux.net_${org.eclipse.kura.linux.net.version}.jar"
                 prefix="${build.output.name}/${plugins.folder}" />
         </zip>
+        <zip destfile="${project.build.directory}/${build.output.name}.zip"
+            update="true">
+            <zipfileset
+                file="${project.build.directory}/plugins/org.eclipse.kura.linux.systemd.provider_${org.eclipse.kura.linux.systemd.provider.version}.jar"
+                prefix="${build.output.name}/${plugins.folder}" />
+        </zip>
     </target>
 
     <target name="linux-network-manager-jars">
@@ -1826,15 +1750,6 @@ fi]]>
                 prefix="${build.output.name}/${plugins.folder}" />
         </zip>
     </target>
-
-    <target name="linux-sysv-jars" if="is.sysv" depends="linux-jars">
-        <zip destfile="${project.build.directory}/${build.output.name}.zip"
-            update="true">
-            <zipfileset
-                file="${project.build.directory}/plugins/org.eclipse.kura.linux.sysv.provider_${org.eclipse.kura.linux.sysv.provider.version}.jar"
-                prefix="${build.output.name}/${plugins.folder}" />
-        </zip>
-    </target>
 
     <target name="linux-debian-jars" if="is.debian" depends="linux-jars">
         <zip destfile="${project.build.directory}/${build.output.name}.zip"
@@ -1854,15 +1769,6 @@ fi]]>
         </zip>
     </target>
 
-    <target name="linux-systemd-jars" if="is.systemd" depends="linux-jars">
-        <zip destfile="${project.build.directory}/${build.output.name}.zip"
-            update="true">
-            <zipfileset
-                file="${project.build.directory}/plugins/org.eclipse.kura.linux.systemd.provider_${org.eclipse.kura.linux.systemd.provider.version}.jar"
-                prefix="${build.output.name}/${plugins.folder}" />
-        </zip>
-    </target>
-
     <target name="web2-jar-win" if="is.web2.jar.available">
         <echo
             message="web2-jar-win ${project.build.directory}/${build.output.name}/config.ini..." />

diff --git a/kura/distrib/src/main/resources/common/kura.init.raspbian b/kura/distrib/src/main/resources/common/kura.init.raspbian