Skip to content

Commit

Permalink
Merge branch 'develop' into partial-snapshot-searchbox
Browse files Browse the repository at this point in the history
  • Loading branch information
@sfiorani
sfiorani authored Dec 19, 2024
2 parents a4afc89 + 3572238 commit c4c77fe
Show file tree
Hide file tree
Showing 50 changed files with 44 additions and 2,750 deletions.
195 changes: 0 additions & 195 deletions kura/distrib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,11 +338,6 @@
<artifactId>org.eclipse.kura.linux.usb</artifactId>
<version>${org.eclipse.kura.linux.usb.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.kura</groupId>
<artifactId>org.eclipse.kura.linux.usb.armv6hf</artifactId>
<version>${org.eclipse.kura.linux.usb.version}</version>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.kura</groupId>
<artifactId>org.eclipse.kura.linux.usb.x86_64</artifactId>
Expand Down Expand Up @@ -777,7 +772,6 @@
<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.position.jar" tofile="target/plugins/org.eclipse.kura.linux.position_${org.eclipse.kura.linux.position.version}.jar" />
<move file="target/plugins/org.eclipse.kura.linux.usb.jar" tofile="target/plugins/org.eclipse.kura.linux.usb_${org.eclipse.kura.linux.usb.version}.jar" />
<move file="target/plugins/org.eclipse.kura.linux.usb.armv6hf.jar" tofile="target/plugins/org.eclipse.kura.linux.usb.armv6hf_${org.eclipse.kura.linux.usb.version}.jar" />
<move file="target/plugins/org.eclipse.kura.linux.usb.x86_64.jar" tofile="target/plugins/org.eclipse.kura.linux.usb.x86_64_${org.eclipse.kura.linux.usb.version}.jar" />
<move file="target/plugins/org.eclipse.kura.linux.usb.aarch64.jar" tofile="target/plugins/org.eclipse.kura.linux.usb.aarch64_${org.eclipse.kura.linux.usb.version}.jar" />
<move file="target/plugins/org.eclipse.kura.ble.provider.jar" tofile="target/plugins/org.eclipse.kura.ble.provider_${org.eclipse.kura.ble.provider.version}.jar" />
Expand Down Expand Up @@ -1157,195 +1151,6 @@
</properties>
</profile>

<!-- armhf -->
<profile>
<id>armhf</id>
<activation>
<property>
<name>buildAll</name>
</property>
</activation>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create-timestamp</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>armhf-jars</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<property name="buildNumber" value="buildNumber" />
<property name="project.version" value="${project.version}" />
<property name="project.build.profile" value="${project.build.profile}" />
<property name="project.build.directory" value="${project.build.directory}" />
<property name="build.name" value="armhf" />
<property name="target.device" value="armhf" />
<property name="native.tag" value="armv6hf" />
<property name="kura.os.version" value="debian" />
<property name="kura.arch" value="armv7_hf" />
<property name="kura.mem.size" value="512m" />
<property name="kura.install.dir" value="/opt/eclipse" />
<ant antfile="${basedir}/src/main/ant/build_equinox_distrib.xml" target="dist-linux" />
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
<version>1.0</version>
<executions>
<execution>
<id>armhf-deb</id>
<phase>package</phase>
<goals>
<goal>jdeb</goal>
</goals>
<configuration>
<verbose>true</verbose>
<deb>${basedir}/target/kura_${project.version}_armhf.deb</deb>
<controlDir>${basedir}/src/main/resources/armhf/deb/control</controlDir>
<dataSet>
<data>
<src>${basedir}/target/kura_${project.version}_armhf.zip</src>
<type>file</type>
<mapper>
<type>perm</type>
<prefix>/tmp</prefix>
</mapper>
</data>
<data>
<src>${project.basedir}/src/main/resources/common/99-kura-nm.conf</src>
<dst>/etc/NetworkManager/conf.d/99-kura-nm.conf</dst>
<type>file</type>
</data>
</dataSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<!-- armhf-nn -->
<profile>
<id>armhf-nn</id>
<activation>
<property>
<name>buildAll</name>
</property>
</activation>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>create-timestamp</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<id>armhf-nn-jars</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<property name="buildNumber" value="buildNumber" />
<property name="project.version" value="${project.version}" />
<property name="project.build.profile" value="${project.build.profile}" />
<property name="project.build.directory" value="${project.build.directory}" />
<property name="build.name" value="armhf-nn" />
<property name="target.device" value="armhf-nn" />
<property name="native.tag" value="armv6hf" />
<property name="kura.os.version" value="debian" />
<property name="kura.arch" value="armv7_hf" />
<property name="kura.mem.size" value="512m" />
<property name="kura.install.dir" value="/opt/eclipse" />
<ant antfile="${basedir}/src/main/ant/build_equinox_distrib.xml" target="dist-linux" />
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
<version>1.0</version>
<executions>
<execution>
<id>armhf-nn-deb</id>
<phase>package</phase>
<goals>
<goal>jdeb</goal>
</goals>
<configuration>
<verbose>true</verbose>
<deb>${basedir}/target/kura-nn_${project.version}_armhf.deb</deb>
<controlDir>${basedir}/src/main/resources/armhf-nn/deb/control</controlDir>
<dataSet>
<data>
<src>${basedir}/target/kura_${project.version}_armhf-nn.zip</src>
<type>file</type>
<mapper>
<type>perm</type>
<prefix>/tmp</prefix>
</mapper>
</data>
</dataSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<!-- x86_64 -->
<profile>
<id>x86_64</id>
Expand Down
30 changes: 0 additions & 30 deletions kura/distrib/src/main/resources/armhf-nn/deb/control/control
View file

This file was deleted.

101 changes: 0 additions & 101 deletions kura/distrib/src/main/resources/armhf-nn/deb/control/postinst
View file

This file was deleted.

Loading

0 comments on commit c4c77fe

Please sign in to comment.