X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=p2v.ks.in;h=ae385d1a6aad04899075b85b34c8883430165792;hb=d2056df9b67dc906882e69f34faac7bc7120f386;hp=a590d7067e63de45fc6defaef10a9dd9a592cbe7;hpb=5fb7e98883fc445f51ad3d357a5981da0138e547;p=virt-p2v.git

diff --git a/p2v.ks.in b/p2v.ks.in
index a590d70..ae385d1 100644
--- a/p2v.ks.in
+++ b/p2v.ks.in
@@ -25,10 +25,16 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firewall --disabled
 
+# Basic Fedora repo.
 repo --name=released --baseurl=@CD_BASE_URL@
 #repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-@CD_BASE@&arch=@CD_ARCH@
+
+# A local repository if selected by ./configure --enable-localrepo=...
 @LOCALREPO@
 
+# The rpmbuild subdirectory, containing virt-p2v RPM.
+repo --name=p2v --baseurl=file://@abs_top_builddir@/rpmbuild
+
 %packages
 bash
 kernel
@@ -63,20 +69,7 @@ findutils
 iproute
 net-tools
 
-# For OCaml
-ocaml
-ocaml-runtime
-ocaml-pcre
-ocaml-extlib
-ocaml-xml-light
-# REQUIRED: ocaml-libvirt >= 0.4.1.1
-ocaml-libvirt
-# REQUIRED: ocaml-newt >= 0.9
-ocaml-newt
-
 # For network configuration
-# dhclient >= 4.0.0 fixes the cwd-holds-filesystem-open problem.
-# REQUIRED: dhclient >= 4.0.0
 dhclient
 
 # Some other generally useful packages
@@ -90,6 +83,9 @@ vim-enhanced
 bind-utils
 file
 
+# virt-p2v package and its deps
+virt-p2v
+
 
 %post --nochroot
 
@@ -103,7 +99,6 @@ if test "x$INSTALL_ROOT" = "x"; then ERROR=1; fi
 if ! test -d "$INSTALL_ROOT/usr/bin"; then ERROR=1; fi
 if ! test -d "@abs_top_srcdir@"; then ERROR=1; fi
 if ! test -d "@abs_top_srcdir@/extras"; then ERROR=1; fi
-if ! test -f "@abs_top_srcdir@/virt-p2v"; then ERROR=1; fi
 
 if test "x$ERROR" = "x1"; then
     echo "**************************************************"
@@ -117,15 +112,6 @@ if test "x$ERROR" = "x1"; then
     exit 1
 fi
 
-install -m 0755 -o root -g root \
-	@abs_top_srcdir@/virt-p2v \
-	@abs_top_srcdir@/virt-p2v-update-wrapper \
-	@abs_top_srcdir@/iso-attach \
-	$INSTALL_ROOT/usr/bin
-
-install -m 0644 -o root -g root @abs_top_srcdir@/inittab \
-	$INSTALL_ROOT/etc
-
 cp -a $INSTALL_ROOT/etc/lvm $INSTALL_ROOT/etc/lvm.new
 install -m 0644 -o root -g root @abs_top_srcdir@/lvm.conf \
 	$INSTALL_ROOT/etc/lvm.new