X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=89e647450e37f1e11db3ec77e8971d9d2f3a0111;hb=d9eeebe35bedea60b31d9a642c02fe0e203141d3;hp=f2a437b331de3e4022618590e20eeb10c07886f9;hpb=58d00e9c5eb4727f4700422e1ca8dc6f44161164;p=virt-p2v.git

diff --git a/Makefile.in b/Makefile.in
index f2a437b..89e6474 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,12 +34,15 @@ HAVE_LIVECD_ISO_TO_PXEBOOT := @HAVE_LIVECD_ISO_TO_PXEBOOT@
 
 LABEL		:= $(PACKAGE)-$(VERSION)
 ISO		:= $(LABEL).iso
+PXE_TAR		:= $(PACKAGE)-$(VERSION)-pxeboot.tar
+VIRTP2V_RPM     := $(PACKAGE)-$(VERSION)-1.noarch.rpm
 
 #----------------------------------------------------------------------
 
 all:
+	@echo "make rpm       Build the virt-p2v RPM"
 	@echo "make build     Build the live CD ISO"
-	@echo "make boot [HDA=hda.img] [HDB=hdb.img] [ISO=livecd.iso]"
+	@echo "make boot [HDA=hda.img] [HDB=hdb.img] [ISO=livecd.iso] [SERIAL=yes]"
 	@echo "                 Boot built/named ISO (uses qemu)"
 	@echo "make update    Update an existing live CD ISO with new"
 	@echo "                 virt-p2v script, without doing full rebuild"
@@ -50,13 +53,36 @@ all:
 
 ifeq ($(HAVE_LIVECD_CREATOR),livecd-creator)
 
-build:	p2v.ks checkroot checkscript
+build:	checkroot checkrpm checkscript
 	rm -f $(ISO)
-	livecd-creator --config=$< --fslabel=$(LABEL)
+	livecd-creator --config=p2v.ks --fslabel=$(LABEL)
 	ls -lhtr *.iso
 
 endif
 
+# Build RPM of virt-p2v.
+
+rpm:	checknotroot p2vrepo/$(VIRTP2V_RPM)
+
+RPM_FLAGS := --define "_topdir       %(pwd)/rpmbuild" \
+	     --define "_builddir     %{_topdir}/BUILD" \
+	     --define "_rpmdir       %{_topdir}/RPMS" \
+	     --define "_srcrpmdir    %{_topdir}/SRPMS" \
+	     --define "_specdir      %{_topdir}/SPECS" \
+	     --define "_sourcedir    %(pwd)"
+
+p2vrepo/$(VIRTP2V_RPM): \
+		virt-p2v.spec \
+		virt-p2v virt-p2v-update-wrapper iso-attach \
+		inittab tty1
+	$(MAKE) dist
+	rm -rf rpmbuild
+	mkdir rpmbuild rpmbuild/{RPMS,BUILD,SRPMS,SPECS} rpmbuild/RPMS/noarch
+	rpmbuild $(RPM_FLAGS) -ba $<
+	mkdir -p p2vrepo
+	cp rpmbuild/RPMS/noarch/$(VIRTP2V_RPM) p2vrepo
+	createrepo p2vrepo
+
 # Run live CD under qemu.
 
 ifeq ($(HAVE_QEMU_KVM),qemu-kvm)
@@ -78,6 +104,8 @@ endif
 ifneq ($(HDB),)
 QEMU_ARGS += -hdb $(HDB)
 endif
+SERIAL    = none
+QEMU_ARGS += -serial $(SERIAL)
 
 boot:
 	$(QEMU) $(QEMU_ARGS)
@@ -106,18 +134,33 @@ checkroot:
 	  exit 1; \
 	fi
 
+# Check that we are not root.
+
+checknotroot:
+	@if [ `id -u` -eq 0 ]; then \
+	  echo "You must not perform this step as root."; \
+	  exit 1; \
+	fi
+
 # Check that the script compiles.
 
 checkscript:
+	test -x virt-p2v
 	./virt-p2v --test
 
+# Check that the RPM has been built.
+
+checkrpm:
+	test -f p2vrepo/$(VIRTP2V_RPM)
+
 # Clean.
 
 clean:
-	rm -f *~ core p2v.ks pod2htm*
+	rm -f core *~ pod2htm*
 
 distclean: clean
-	rm -rf autom4te.cache config.log config.status configure
+	rm -rf autom4te.cache config.log config.status configure \
+	  p2v.ks Makefile po/Makefile virt-p2v.spec
 
 reallyreallyclean: distclean
 	rm -f virt-p2v-*.tar.gz virt-p2v-*.iso
@@ -180,8 +223,6 @@ upload_iso:
 
 # Upload PXE image.
 
-PXE_TAR := $(PACKAGE)-$(VERSION)-pxeboot.tar
-
 upload_pxe:
 	tar cf $(PXE_TAR) tftpboot
 	scp -l 300 $(PXE_TAR) et.redhat.com:public_html/tmp/