Skip to content

Commit

Permalink
refactor(distrib)!: Remove Intel UP2 and Nvidia Jetson Nano profiles (#…
Browse files Browse the repository at this point in the history
…5315)

* Removed Up2 and Nano profiles

Signed-off-by: pierantoniomerlino <[email protected]>

* Removed Up2 and Nano profiles from pom

Signed-off-by: pierantoniomerlino <[email protected]>

* Removed network.provider property; removed nano references from ant script

Signed-off-by: pierantoniomerlino <[email protected]>

* Deleted files for old networking

Signed-off-by: pierantoniomerlino <[email protected]>

---------

Signed-off-by: pierantoniomerlino <[email protected]>
  • Loading branch information
pierantoniomerlino authored Jul 16, 2024
1 parent 44e8c30 commit 93c08c3
Show file tree
Hide file tree
Showing 70 changed files with 2 additions and 7,412 deletions.
377 changes: 0 additions & 377 deletions kura/distrib/pom.xml

Large diffs are not rendered by default.

69 changes: 2 additions & 67 deletions kura/distrib/src/main/ant/build_equinox_distrib.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,21 +147,6 @@
</not>
</and>
</condition>

<condition property="is.nvidia.jetson.nano">
<contains string="${build.name}" substring="nvidia-jetson-nano" />
</condition>

<condition property="is.nvidia.jetson.nano">
<contains string="${build.name}" substring="nvidia-jetson-nano" />
</condition>

<condition property="is.network.manager">
<contains string="${network.provider}" substring="network-manager" />
</condition>
<condition property="is.kura.network">
<contains string="${network.provider}" substring="kura-network" />
</condition>

<copy file="src/main/resources/${build.name}/snapshot_0.xml"
tofile="${project.build.directory}/${build.output.name}/snapshot_0.xml" failonerror="false" />
Expand Down Expand Up @@ -270,9 +255,6 @@
<antcall target="linux-debian-config" />
<antcall target="linux-redhat-config" />
<antcall target="linux-systemd-config" />
<antcall target="ai-wire-config" />
<antcall target="nvidia-triton-server-config" />
<antcall target="linux-kura-network-config" />
<antcall target="linux-network-manager-config" />

<!-- Add mToolkit to config.ini -->
Expand Down Expand Up @@ -827,8 +809,6 @@ fi]]>
<antcall target="linux-debian-jars" />
<antcall target="linux-redhat-jars" />
<antcall target="linux-systemd-jars" />
<antcall target="nvidia-jetson-nano-jars" />
<antcall target="linux-kura-network-jars" />
<antcall target="linux-network-manager-jars" />

<echo message="Building Kura Distribution for ${build.name}-jars..." />
Expand Down Expand Up @@ -1769,15 +1749,7 @@ fi]]>
</propertyfile>
</target>

<target name="linux-kura-network-config" if="is.kura.network" 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.net.admin_${org.eclipse.kura.net.admin.version}.jar@5:start" />
</propertyfile>
</target>

<target name="linux-network-manager-config" if="is.network.manager" depends="linux-config">
<target name="linux-network-manager-config" depends="linux-config">
<propertyfile
file="${project.build.directory}/${build.output.name}/config.ini">
<entry key="osgi.bundles" operation="+"
Expand Down Expand Up @@ -1821,22 +1793,6 @@ fi]]>
</propertyfile>
</target>

<target name="ai-wire-config" if="is.nvidia.jetson.nano">
<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.wire.ai.component.provider_${org.eclipse.kura.wire.ai.component.provider.version}.jar@4:start" />
</propertyfile>
</target>

<target name="nvidia-triton-server-config" if="is.nvidia.jetson.nano">
<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.ai.triton.server_${org.eclipse.kura.ai.triton.server.version}.jar@4:start" />
</propertyfile>
</target>

<target name="event-publisher-config">
<propertyfile file="${project.build.directory}/${build.output.name}/config.ini">
<entry key="osgi.bundles" operation="+"
Expand Down Expand Up @@ -1865,16 +1821,7 @@ fi]]>
</zip>
</target>

<target name="linux-kura-network-jars" if="is.kura.network">
<zip destfile="${project.build.directory}/${build.output.name}.zip"
update="true">
<zipfileset
file="${project.build.directory}/plugins/org.eclipse.kura.net.admin_${org.eclipse.kura.net.admin.version}.jar"
prefix="${build.output.name}/${plugins.folder}" />
</zip>
</target>

<target name="linux-network-manager-jars" if="is.network.manager">
<target name="linux-network-manager-jars">
<zip destfile="${project.build.directory}/${build.output.name}.zip"
update="true">
<zipfileset
Expand Down Expand Up @@ -1925,18 +1872,6 @@ fi]]>
</zip>
</target>

<target name="nvidia-jetson-nano-jars" if="is.nvidia.jetson.nano">
<zip destfile="${project.build.directory}/${build.output.name}.zip"
update="true">
<zipfileset
file="${project.build.directory}/plugins/org.eclipse.kura.wire.ai.component.provider_${org.eclipse.kura.wire.ai.component.provider.version}.jar"
prefix="${build.output.name}/${plugins.folder}" />
<zipfileset
file="${project.build.directory}/plugins/org.eclipse.kura.ai.triton.server_${org.eclipse.kura.ai.triton.server.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..." />
Expand Down
15 changes: 0 additions & 15 deletions kura/distrib/src/main/resources/common/customize-installation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,21 +82,6 @@ then
echo "Customizing installation for Raspberry PI"
fi

if uname -a | grep -q 'up' > /dev/null 2>&1
then
if uname -n | grep 'intel' > /dev/null 2>&1
then
BOARD="intelup2"
echo "Customizing installation for Intel UP2"
fi
fi

if uname -a | grep -q 'nvidia' > /dev/null 2>&1
then
BOARD="jetson-nano"
echo "Customizing installation for NVIDIA Jetson Nano"
fi

if [ ! -d "/opt/eclipse/kura/user/snapshots/" ]; then
mkdir /opt/eclipse/kura/user/snapshots/
fi
Expand Down
5 changes: 0 additions & 5 deletions kura/distrib/src/main/resources/common/ifdown-local

This file was deleted.

43 changes: 0 additions & 43 deletions kura/distrib/src/main/resources/common/ifup-local

This file was deleted.

97 changes: 0 additions & 97 deletions kura/distrib/src/main/resources/common/ifup-local.debian

This file was deleted.

97 changes: 0 additions & 97 deletions kura/distrib/src/main/resources/common/ifup-local.raspbian

This file was deleted.

Loading

0 comments on commit 93c08c3

Please sign in to comment.