Ohad Basan has uploaded a new change for review.
Change subject: ovirt-live fix makefile iso path
......................................................................
ovirt-live fix makefile iso path
the oVirtLiveFiles is the liveuser's home directory
therefore the iso has to be placed in there in order to be available in
the live environment for usage
Change-Id: I915d26aaeac14145f316ff9fa5cb1b71e7811327
Signed-off-by: Ohad Basan <oba...@redhat.com>
---
M centos/Makefile
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-live refs/changes/00/20500/1
diff --git a/centos/Makefile b/centos/Makefile
index a9b59dc..0f8c4d0 100644
--- a/centos/Makefile
+++ b/centos/Makefile
@@ -13,17 +13,19 @@
maintainer-clean: dist-clean
rm -fr downloads
+ rm -rf oVirtLiveFiles/iso
prereq:
if [ $$(id -u) != 0 ]; then echo "You must be root"; exit 1; fi
download: \
downloads/yad-0.14.2-1.fc14.x86_64.rpm \
- downloads/TinyCore-current.iso \
+ oVirtLiveFiles/iso//TinyCore-current.iso \
$(NULL)
_download:
mkdir -p downloads
+ mkdir -p oVirtLiveFiles/iso
rm -f "downloads/$(OUT)"
curl "$(URL)" > "downloads/$(OUT).tmp"
mv "downloads/$(OUT).tmp" "downloads/$(OUT)"
@@ -31,8 +33,9 @@
downloads/yad-0.14.2-1.fc14.x86_64.rpm:
$(MAKE) _download
URL="http://kojipkgs.fedoraproject.org//packages/yad/0.14.2/1.fc14/x86_64/yad-0.14.2-1.fc14.x86_64.rpm";
OUT="yad-0.14.2-1.fc14.x86_64.rpm"
-downloads/TinyCore-current.iso:
+oVirtLiveFiles/iso/TinyCore-current.iso:
$(MAKE) _download
URL="http://distro.ibiblio.org/tinycorelinux/4.x/x86/release/TinyCore-current.iso";
OUT="TinyCore-current.iso"
+ mv downloads/TinyCore-current.iso oVirtLiveFiles/iso/
repo: \
@@ -59,7 +62,7 @@
livecd: \
repo \
- downloads/TinyCore-current.iso \
+ oVirtLiveFiles/iso/TinyCore-current.iso \
kickstart/ovirt-live-base.ks \
$(NULL)
livecd-creator -d -v --config=kickstart/ovirt-live-gnome.ks
--cache=/home --fslabel=ovirt-live-el6 > iso.log 2>&1
--
To view, visit http://gerrit.ovirt.org/20500
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I915d26aaeac14145f316ff9fa5cb1b71e7811327
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-live
Gerrit-Branch: master
Gerrit-Owner: Ohad Basan <oba...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
