[releng] do not make the Workstation install tree per FESCo

[Dennis Gilmore]

commit bf1c146406be6bb7ffc2ca994938848d7208fdec
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Thu Oct 23 09:53:55 2014 -0500

    do not make the Workstation install tree per FESCo

 scripts/run-pungi |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/scripts/run-pungi b/scripts/run-pungi
index 123c328..3cdbc94 100755
--- a/scripts/run-pungi
+++ b/scripts/run-pungi
@@ -43,7 +43,7 @@ popd
 for arch in armhfp i386 x86_64
 do
  mock -r fedora-branched-compose-i386 --init || exit 1
- mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-workstation.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --name Fedora-Workstation --flavor Workstation" || exit 1
+ #mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-workstation.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --name Fedora-Workstation --flavor Workstation" || exit 1
  mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-server.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --name Fedora-Server --flavor Server" || exit 1
  mock -r fedora-branched-compose-i386 --shell "pungi -c $KICKSTARTS/fedora-install-cloud.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ --arch=$arch -G -C --ver $VERSION --workdirbase=/tmp/work --name Fedora-Cloud --flavor Cloud" || exit 1
  mock -r fedora-branched-compose-i386 --clean || exit 1
@@ -66,7 +66,7 @@ do
  set -x
  umask 002
  mock -r fedora-branched-compose-$arch --init || exit 1
- mock -r fedora-branched-compose-$arch --shell "pungi -c $KICKSTARTS/fedora-install-workstation.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --no-dvd --ver $VERSION --workdirbase=/tmp/work --flavor Workstation --name=Fedora-Workstation"
+ #mock -r fedora-branched-compose-$arch --shell "pungi -c $KICKSTARTS/fedora-install-workstation.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --no-dvd --ver $VERSION --workdirbase=/tmp/work --flavor Workstation --name=Fedora-Workstation"
  mock -r fedora-branched-compose-$arch --shell "pungi -c $KICKSTARTS/fedora-install-server.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/  -B -I --ver $VERSION --workdirbase=/tmp/work --flavor Server --name=Fedora-Server"
  mock -r fedora-branched-compose-$arch --shell "pungi -c $KICKSTARTS/fedora-install-cloud.ks --destdir $DESTDIR --cachedir /srv/pungi/cache/ -B -I --no-dvd  --ver $VERSION --workdirbase=/tmp/work --flavor Cloud --name=Fedora-Cloud"
  mock -r fedora-branched-compose-$arch --clean || exit 1
@@ -83,7 +83,7 @@ popd
 
 hardlink -vvc $FINALDEST/$VERSION/Workstation $FINALDEST/$VERSION/Server $FINALDEST/$VERSION/Cloud
 
-sg releng "./build_composeinfo $FINALDEST/$VERSION/Workstation"
+#sg releng "./build_composeinfo $FINALDEST/$VERSION/Workstation"
 sg releng "./build_composeinfo $FINALDEST/$VERSION/Server"
 sg releng "./build_composeinfo $FINALDEST/$VERSION/Cloud"
 
@@ -101,7 +101,7 @@ done
 
 
 pushd $FINALDEST/$VERSION/
-sg releng "mkdir -p Images/armhfp Cloud/Images/i386 Cloud/Images/x86_64 Spins/i386 Spins/x86_64 Live/i386 Live/x86_64 Docker/x86_64 Workstation/armhfp/Images/"
+sg releng "mkdir -p Images/armhfp Cloud/Images/i386 Cloud/Images/x86_64 Spins/i386 Spins/x86_64 Live/i386 Live/x86_64 Docker/x86_64 Workstation/armhfp/Images/ Workstation/x86_64/iso Workstation/i386/iso"
 popd