X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile.in;h=aa8d8b47d62dd6a4ae5ffd1242b92f5506fb3cb0;hb=75605bd63002a1740b04a198c1ad9b7a65f74fd9;hp=68e1a9eefa4d11e0c07ef1d5bfdae2a0287312b2;hpb=f2e56f5d3d0f951a05b154c9c850568ce2653cf9;p=virt-p2v.git

diff --git a/Makefile.in b/Makefile.in
index 68e1a9e..aa8d8b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,28 +21,19 @@
 #----------------------------------------------------------------------
 # General configuration
 
-PACKAGE  := @PACKAGE_NAME@
-VERSION  := @PACKAGE_VERSION@
+PACKAGE		:= @PACKAGE_NAME@
+VERSION		:= @PACKAGE_VERSION@
 
-HAVE_PERLDOC := @HAVE_PERLDOC@
-HAVE_QEMU := @HAVE_QEMU@
-HAVE_QEMU_KVM := @HAVE_QEMU_KVM@
-HAVE_LIVECD_CREATOR := @HAVE_LIVECD_CREATOR@
-
-# i386 images also work on x86-64, so best to stick with i386.
-ARCH     := i386
-
-# Base repository.
-BASE	 := 8
-BASEURL	 := http://download.fedora.redhat.com/pub/fedora/linux/releases/$(BASE)/Everything/$(ARCH)/os/
+INSTALL		:= @INSTALL@
 
-LANG	 := en_US.UTF-8
-KEYBOARD := us
-TIMEZONE := US/Eastern
-
-LABEL	 := $(PACKAGE)-$(VERSION)
+HAVE_PERLDOC	:= @HAVE_PERLDOC@
+HAVE_QEMU	:= @HAVE_QEMU@
+HAVE_QEMU_KVM	:= @HAVE_QEMU_KVM@
+HAVE_LIVECD_CREATOR := @HAVE_LIVECD_CREATOR@
+HAVE_LIVECD_ISO_TO_PXEBOOT := @HAVE_LIVECD_ISO_TO_PXEBOOT@
 
-ISO	 := $(LABEL).iso
+LABEL		:= $(PACKAGE)-$(VERSION)
+ISO		:= $(LABEL).iso
 
 #----------------------------------------------------------------------
 
@@ -52,43 +43,18 @@ all:
 	@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"
+	@echo "make pxe       Build a PXE image (in tftpboot/ subdirectory)"
 	@echo "make man       Make man pages (needs POD)"
 
 # Build live CD.
 
 ifeq ($(HAVE_LIVECD_CREATOR),livecd-creator)
 
-build: checkroot checkscript livecd.ks
+build:	p2v.ks checkroot checkscript
 	rm -f $(ISO)
-	livecd-creator --config=livecd.ks --fslabel=$(LABEL)
+	livecd-creator --config=$< --fslabel=$(LABEL)
 	ls -lhtr *.iso
 
-livecd.ks: livecd.ks.in livecd-post.sh Makefile
-	rm -f $@
-	sed \
-	  -e 's|@ARCH@|$(ARCH)|g' \
-	  -e 's|@BASE@|$(BASE)|g' \
-	  -e 's|@BASEURL@|$(BASEURL)|g' \
-	  -e 's|@LANG@|$(LANG)|g' \
-	  -e 's|@KEYBOARD@|$(KEYBOARD)|g' \
-	  -e 's|@TIMEZONE@|$(TIMEZONE)|g' \
-	  < $< | cat - livecd-post.sh > $@
-
-livecd-post.sh: livecd-post.sh.in virt-p2v virt-p2v-update-wrapper iso-attach inittab lvm.conf Makefile
-	rm -f $@
-	sed \
-	  -e '/@VIRT-P2V@/ r virt-p2v' \
-	  -e '/@VIRT-P2V@/ d' \
-	  -e '/@VIRT-P2V-UPDATE-WRAPPER@/ r virt-p2v-update-wrapper' \
-	  -e '/@VIRT-P2V-UPDATE-WRAPPER@/ d' \
-	  -e '/@ISO-ATTACH@/ r iso-attach' \
-	  -e '/@ISO-ATTACH@/ d' \
-	  -e '/@INITTAB@/ r inittab' \
-	  -e '/@INITTAB@/ d' \
-	  -e '/@LVM.CONF@/ r lvm.conf' \
-	  -e '/@LVM.CONF@/ d' \
-	  < $< > $@
-
 endif
 
 # Run live CD under qemu.
@@ -120,9 +86,18 @@ endif
 # Update an existing ISO.
 
 update: checkroot checkscript
-	-./iso-attach delete $(ISO)
+	-./iso-attach delete $(ISO) 2>/dev/null
 	./iso-attach add $(ISO) virt-p2v
 
+# PXE boot.
+
+ifeq ($(HAVE_LIVECD_ISO_TO_PXEBOOT),livecd-iso-to-pxeboot)
+
+pxe: checkroot checkscript
+	livecd-iso-to-pxeboot $(ISO)
+
+endif
+
 # Check that we are root.
 
 checkroot:
@@ -139,7 +114,13 @@ checkscript:
 # Clean.
 
 clean:
-	rm -f *~ core livecd.ks livecd-post.sh
+	rm -f *~ core p2v.ks pod2htm*
+
+distclean: clean
+	rm -rf autom4te.cache config.log config.status configure
+
+reallyreallyclean: distclean
+	rm -f virt-p2v-*.tar.gz virt-p2v-*.iso
 
 # Manifest.
 
@@ -148,6 +129,7 @@ dist:
 	rm -rf $(PACKAGE)-$(VERSION)
 	mkdir $(PACKAGE)-$(VERSION)
 	tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
+	$(INSTALL) -m 0755 configure $(PACKAGE)-$(VERSION)/
 	tar zcf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
 	rm -rf $(PACKAGE)-$(VERSION)
 	ls -l $(PACKAGE)-$(VERSION).tar.gz
@@ -187,4 +169,22 @@ website: man dist
 	cp virt-p2v.1.css $(WEBSITE_DIR)
 	cp $(PACKAGE)-$(VERSION).tar.gz $(WEBSITE_DIR)
 
+# Upload everything.
+
+upload: upload_iso upload_pxe
+
+# Upload ISO.
+
+upload_iso:
+	scp -l 300 $(ISO) et.redhat.com:public_html/tmp/
+
+# 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/
+	rm $(PXE_TAR)
+
 .PHONY:	build boot checkroot
\ No newline at end of file