From c38a9b9ab749fc32d9e3d5e06f21043a7dc6288d Mon Sep 17 00:00:00 2001
From: Scott Ware <scott.r.ware@intel.com>
Date: Thu, 12 Mar 2020 10:57:24 +0000
Subject: [PATCH] Fix equinox build

Signed-off-by: Scott Ware <scott.r.ware@intel.com>
---
 .../distrib/src/main/ant/build_equinox_distrib.xml | 132 ---------------------
 1 file changed, 132 deletions(-)

diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml
index 6ef51a6..8985da5 100644
--- a/kura/distrib/src/main/ant/build_equinox_distrib.xml
+++ b/kura/distrib/src/main/ant/build_equinox_distrib.xml
@@ -391,27 +391,16 @@ fi]]>
 		</echo>
 
 		<!-- Populate parameters -->
-		<copy file="src/main/resources/${build.name}/kura_install.sh"
-			tofile="${project.build.directory}/${build.output.name}/kura_install.sh" />
 		<copy file="src/main/resources/common/kura.init.yocto"
 			tofile="${project.build.directory}/${build.output.name}/kura.init.yocto"
 			failonerror="false" />
-		<copy file="src/main/resources/common/kura.init.raspbian"
-			tofile="${project.build.directory}/${build.output.name}/kura.init.raspbian"
-			failonerror="false" />
 		<copy file="src/main/resources/common/kura.service"
 			tofile="${project.build.directory}/${build.output.name}/kura.service"
 			failonerror="false" />
 		<replaceregexp
-			file="${project.build.directory}/${build.output.name}/kura_install.sh"
-			match="INSTALL_DIR=.*" replace="INSTALL_DIR=${kura.install.dir}" />
-		<replaceregexp
 			file="${project.build.directory}/${build.output.name}/kura.init.yocto"
 			match="INSTALL_DIR=.*" replace="INSTALL_DIR=${kura.install.dir}" />
 		<replaceregexp
-			file="${project.build.directory}/${build.output.name}/kura.init.raspbian"
-			match="INSTALL_DIR=.*" replace="INSTALL_DIR=${kura.install.dir}" />
-		<replaceregexp
 			file="${project.build.directory}/${build.output.name}/kura.service"
 			match="INSTALL_DIR" replace="${kura.install.dir}" />
 
@@ -441,89 +430,11 @@ fi]]>
 				prefix="${build.output.name}/${user.config.folder}/" />
 
 			<zipfileset
-				file="${project.build.directory}/${build.output.name}/kura_install.sh"
-				prefix="${build.output.name}/${install.folder}/" />
-
-			<zipfileset file="src/main/resources/${build.name}/kuranet.conf"
-				prefix="${build.output.name}/${install.folder}/" />
-
-			<zipfileset
 				file="${project.build.directory}/${build.output.name}/kura.init.yocto"
 				prefix="${build.output.name}/${install.folder}" />
 			<zipfileset
-				file="${project.build.directory}/${build.output.name}/kura.init.raspbian"
-				prefix="${build.output.name}/${install.folder}" />
-			<zipfileset
 				file="${project.build.directory}/${build.output.name}/kura.service"
 				prefix="${build.output.name}/${install.folder}" />
-			<zipfileset
-				file="src/main/resources/${build.name}/recover_default_config.init"
-				prefix="${build.output.name}/${install.folder}" />
-			<zipfileset file="src/main/resources/${build.name}/firewall.init"
-				prefix="${build.output.name}/${install.folder}" />
-			<zipfileset file="src/main/resources/${build.name}/iptables.init"
-				prefix="${build.output.name}/${install.folder}" />
-			<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}" />
-			<zipfileset file="src/main/resources/common/monitrc.raspbian"
-				prefix="${build.output.name}/${install.folder}" />
-			<zipfileset file="src/main/resources/${build.name}/kura-tmpfiles.conf"
-				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/logrotate.conf"
-				prefix="${build.output.name}/${install.folder}" />
-			<zipfileset file="src/main/resources/common/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/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="${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"
@@ -690,18 +601,6 @@ fi]]>
 
 		<echo message="Building Kura Distribution for ${build.name}-jars..." />
 
-		<!-- Create installer script -->
-		<echo message="Creating Installer for ${build.name}  ${kura.install.dir}" />
-		<exec executable="${project.build.directory}/../src/main/sh/create_installer.sh">
-			<arg value="${project.build.directory}" />
-			<arg value="${build.output.name}.zip" />
-			<arg value="kura_${project.version}_${build.name}_installer.sh" />
-			<arg value="${build.name}" />
-			<arg value="${kura.install.dir}" />
-		</exec>
-
-
-
 		<!-- Get version information for the bundles/files in this build -->
 		<echo
 			message="Gathering version information for the bundles/files in ${build.name}" />
@@ -712,37 +611,6 @@ fi]]>
 			<arg value="${build.name}" />
 		</exec>
 
-
-		<!-- Diff with the previous version -->
-		<property file="RELEASE_INFO/version.properties" />
-		<echo
-			message="Diff version information with ${build.name} version ${kura.project.version.previous}" />
-		<exec executable="src/main/sh/diff_build_versions.sh">
-			<arg
-				value="RELEASE_INFO/${kura.project.version.previous}/kura_${kura.project.version.previous}_${build.name}.catalog" />
-			<arg value="${project.build.directory}/${build.output.name}.catalog" />
-			<arg
-				value="${project.build.directory}/kura_${kura.project.version.previous}_to_${project.version}_${build.name}" />
-			<arg value="${build.name}" />
-		</exec>
-
-
-		<!-- Create upgrader -->
-		<echo message="Creating Upgrader for ${build.name}" />
-		<exec executable="${project.build.directory}/../src/main/sh/create_upgrader.sh">
-			<arg value="${project.build.directory}" />
-			<arg value="${project.build.directory}/${build.output.name}.zip" />
-			<arg value="kura_${project.version}_${build.name}_upgrade.zip" />
-			<arg value="KURA_${kura.project.version.previous}" />
-			<arg value="${kura.install.dir}" />
-			<arg value="${build.output.name}" />
-			<arg
-				value="kura_${kura.project.version.previous}_to_${project.version}_${build.name}.removed" />
-			<arg
-				value="kura_${kura.project.version.previous}_to_${project.version}_${build.name}.keep" />
-			<arg value="${build.output.name}_upgrader.sh" />
-			<arg value="${build.name}" />
-		</exec>
 	</target>
 
 	<target name="set-http-port" if="http.port">
-- 
2.7.4