11#! /bin/bash -e
22set -o pipefail
33
4- STEPS=" setupoe,initramfs,stubinitramfs,dom0,uivm,ndvm,syncvm,installer,installer2,syncui, source,sdk,license,sourceinfo,ship"
4+ STEPS=" setupoe,initramfs,stubinitramfs,dom0,uivm,ndvm,syncvm,installer,installer2,source,sdk,license,sourceinfo,ship"
55
66# Additional steps:
77
@@ -315,28 +315,6 @@ do_oe_ndvm()
315315 do_oe_ndvm_copy $path
316316}
317317
318- do_oe_nilfvm_copy ()
319- {
320- local path=" $1 "
321- do_oe_copy " $path " " nilfvm" " xenclient-nilfvm" " xenclient-nilfvm"
322-
323- local binaries=" tmp-glibc/deploy/images"
324- pushd " $path "
325- cp " $binaries /service-nilfvm" " $OUTPUT_DIR /$NAME /raw/service-nilfvm"
326- popd
327- }
328-
329- do_oe_nilfvm ()
330- {
331- local path=" $1 "
332-
333- echo This step is now useless, everything we need should be built as part of the tools.
334- return
335-
336- do_oe " $path " " xenclient-nilfvm" " xenclient-nilfvm-image"
337- do_oe_nilfvm_copy $path
338- }
339-
340318do_oe_syncvm_copy ()
341319{
342320 local path=" $1 "
@@ -350,23 +328,6 @@ do_oe_syncvm()
350328 do_oe_syncvm_copy $path
351329}
352330
353- do_oe_syncui_copy ()
354- {
355- local path=" $1 "
356- pushd " $path "
357- mkdir -p " $OUTPUT_DIR /$NAME /raw"
358- cp tmp-glibc/deploy/tar/sync-wui-0+git* .tar.gz " $OUTPUT_DIR /$NAME /raw/sync-wui-${RELEASE} .tar.gz"
359- cp tmp-glibc/deploy/tar/sync-wui-sources-0+git* .tar.gz " $OUTPUT_DIR /$NAME /raw/sync-wui-sources-${RELEASE} .tar.gz"
360- popd
361- }
362-
363- do_oe_syncui ()
364- {
365- local path=" $1 "
366- do_oe " $path " " xenclient-syncui" " sync-wui"
367- do_oe_syncui_copy " $path "
368- }
369-
370331do_oe_dom0_copy ()
371332{
372333 local path=" $1 "
@@ -1184,10 +1145,6 @@ do_xctools_debian_repo()
11841145 local dest_dir=" ${path} /tmp-glibc/deb-xctools-image/"
11851146 local d_output_dir=" ${OUTPUT_DIR} /${NAME} /xctools-debian-repo/debian"
11861147
1187- echo " Building Debian Service VM tools"
1188- do_oe " ${path} " " xenclient-nilfvm" " linux-xenclient-nilfvm"
1189- do_oe " ${path} " " xenclient-nilfvm" " deb-servicevm-tools"
1190-
11911148 echo " Building XC Tools Debian/Ubuntu repository"
11921149 do_oe " ${path} " " xenclient-dom0" " deb-xctools-image"
11931150
@@ -1245,26 +1202,6 @@ do_xctools() {
12451202 do_xctools_linux " $1 "
12461203}
12471204
1248- do_syncui ()
1249- {
1250- local name=" sync-wui-${RELEASE} .tar.gz"
1251- local file=" $OUTPUT_DIR /$NAME /raw/$name "
1252- local out=" $OUTPUT_DIR /$NAME /sync"
1253-
1254- if [ ! -r " ${file} " ]; then
1255- echo " syncui: Not built, skipping"
1256- return 0
1257- fi
1258-
1259- echo " syncui:"
1260- echo " - copy $name "
1261-
1262- mkdir -p " $out "
1263- cp " $file " " $out "
1264-
1265- echo
1266- }
1267-
12681205do_info ()
12691206{
12701207 local out=" $OUTPUT_DIR /$NAME "
@@ -1301,7 +1238,6 @@ do_ship()
13011238 do_source_iso
13021239 do_source_info
13031240 do_licences
1304- do_syncui
13051241 do_info
13061242 do_logs
13071243 fi
@@ -1399,15 +1335,8 @@ do_build()
13991335 do_oe_uivm " $path " ;;
14001336 ndvm)
14011337 do_oe_ndvm " $path " ;;
1402- nilfvm)
1403- do_oe_nilfvm " $path " ;;
1404- vpnvm)
1405- # for retro-compatibility
1406- do_oe_nilfvm " $path " ;;
14071338 syncvm)
14081339 do_oe_syncvm " $path " ;;
1409- syncui)
1410- do_oe_syncui " $path " ;;
14111340 uivmcp)
14121341 do_oe_uivm_copy " $path " ;;
14131342 ndvmcp)
@@ -1416,8 +1345,6 @@ do_build()
14161345 do_oe_vpnvm_copy " $path " ;;
14171346 syncvmcp)
14181347 do_oe_syncvm_copy " $path " ;;
1419- syncuicp)
1420- do_oe_syncui_copy " $path " ;;
14211348 xctools* )
14221349 do_xctools " $path /xctools" ;;
14231350 debian)
0 commit comments