blob: 31e99e55cfa8f63c7889dc1d2f05b14934e522c2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
|
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
|
