[Ovirt-devel] [PATCH 1/4] Modified makefile for fedora

[David Huff]

---
 Makefile.am |   61 ++++------------------------------------------------------
 1 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 306f49f..41741d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,7 @@
 OVIRT_CACHE_DIR  ?= $(HOME)/ovirt-cache
 OVIRT_LOCAL_REPO ?= file://$(OVIRT_CACHE_DIR)/ovirt
 OVIRT_URL        ?= http://ovirt.org/repos/ovirt
+OVIRT_NODE_RECIPE ?= /usr/share/ovirt-node-tools/ovirt-node-recipe.ks
 SUM              ?= sha1sum
 PKG_FMT           = iso
 SRC_FMT          ?= tar
@@ -37,17 +38,7 @@ NVR               = $(PACKAGE)-$(VERSION)-$(ARCH)
 EXTRA_DIST =				\
   .gitignore				\
   $(PACKAGE).spec			\
-  $(PACKAGE).spec.in			\
-  common-blacklist.ks			\
-  common-install.ks			\
-  common-pkgs.ks			\
-  common-post.ks			\
-  $(PACKAGE).ks				\
-  create-ovirt-iso-nodes		\
-  edit-livecd				\
-  livecd-iso-to-iscsi			\
-  livecd-setauth			\
-  livecd-rpms				\
+  $(PACKAGE).spec.in		\
   README

 DISTCLEANFILES = $(PACKAGE)-$(VERSION).tar.gz \
@@ -70,48 +61,6 @@ RPM_FLAGS  += $(if $(_ovirt_dev),--define "extra_release .$(GIT_RELEASE)")
 NODE_TMP    = $(OVIRT_CACHE_DIR)/$(PACKAGE)-$(ARCH)-tmp
 SRC_KS      = $(NODE_TMP)/src.ks

-repos.ks:
-	( \
-	    if [ 0$(FEDORA) == 0$(CUR_RAWHIDE) ]; then \
-	        FEDORA_REPO=rawhide ;\
-	        FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/development/$(ARCH)/os,--mirrorlist=$(FEDORA_MIRROR)?repo=rawhide&arch=$(ARCH))" ;\
-	        OVIRT_DISTRO=development ;\
-	    else \
-	        FEDORA_REPO=f$(FEDORA) ;\
-	        FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/releases/$(FEDORA)/Everything/${ARCH}/os,--mirrorlist=$(FEDORA_MIRROR)?repo=fedora-$(FEDORA)&arch=$(ARCH))" ;\
-	        OVIRT_DISTRO=$(FEDORA) ;\
-	        UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates $(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/updates/$(FEDORA)/${ARCH},--mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-f$(FEDORA)&arch=$(ARCH))\n" ;\
-	        if [ 0$(FEDORA) == 0$(CUR_PREVIEW) ]; then \
-	            UPDATE_REPO_LINE="$${UPDATE_REPO_LINE}repo --name=preview --baseurl=$(PREVIEW_URL)\n" ;\
-	        fi ;\
-	    fi ;\
-	    echo "repo --name=$${FEDORA_REPO} $${FEDORA_REPO_LOC}" > $@ ;\
-	    echo "repo --name=ovirt-org --baseurl=$(OVIRT_URL)/$${OVIRT_DISTRO}/$(ARCH)" >> $@ ;\
-	    printf "$${UPDATE_REPO_LINE}" >> $@ ;\
-	    echo "repo --name=ovirt-local --baseurl=$(OVIRT_LOCAL_REPO)" >> $@ \
-	)
-
-src.ks: repos.ks
-	mkdir -p $(NODE_TMP)
-	( \
-	    cat repos.ks ;\
-	    if [ 0$(FEDORA) == 0$(CUR_RAWHIDE) ]; then \
-	        FEDORA_REPO=rawhide ;\
-	        FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/development/source/SRPMS,--mirrorlist=$(FEDORA_MIRROR)?repo=rawhide-source&arch=source)" ;\
-	        OVIRT_DISTRO=development ;\
-	    else \
-	        FEDORA_REPO=f$(FEDORA) ;\
-	        FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/releases/$(FEDORA)/Everything/source/SRPMS,--mirrorlist=$(FEDORA_MIRROR)?repo=fedora-source-$(FEDORA)&arch=source)" ;\
-	        OVIRT_DISTRO=$(FEDORA) ;\
-	        UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates-source $(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/updates/$(FEDORA)/SRPMS,--mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-source-f$(FEDORA)&arch=source)" ;\
-	    fi ;\
-	    echo "repo --name=$${FEDORA_REPO}-source $${FEDORA_REPO_LOC}" ;\
-	    echo "repo --name=ovirt-org-source --baseurl=$(OVIRT_URL)/$${OVIRT_DISTRO}/src" ;\
-	    echo "$${UPDATE_REPO_LINE}" ;\
-	    echo "%packages --nobase" ;\
-	    grep -v '^-' common-pkgs.ks ;\
-	    echo "%end" ;\
-	) > $(SRC_KS)

 keys:
 	if [ "$(_ovirt_dev)" = 1 -a -f $(AUTH_KEYS) ]; then \
@@ -126,7 +75,7 @@ $(NVR).$(PKG_FMT): no_nscd repos.ks keys
 	    case $(SELINUX_ENFORCING) in \
 	        Enforcing) sudo /usr/sbin/setenforce Permissive ;; \
 	        Permissive) ;; \
-	        *) if ksflatten $(PACKAGE).ks 2>/dev/null \
+	        *) if cat $(OVIRT_NODE_RECIPE) \
 	               | grep -q '^selinux --disabled'; then \
 	               echo WARNING: SELinux disabled in kickstart ;\
 	           else \
@@ -136,7 +85,7 @@ $(NVR).$(PKG_FMT): no_nscd repos.ks keys
 	           fi ;; \
 	    esac ;\
 	)
-	sudo livecd-creator --skip-minimize -c $(PACKAGE).ks \
+	sudo livecd-creator --skip-minimize -c $(OVIRT_NODE_RECIPE) \
 	    -f $(PACKAGE) \
 	    --tmpdir='$(NODE_TMP)' \
 	    --cache='$(OVIRT_CACHE_DIR)/yum-$(ARCH)'
@@ -155,7 +104,7 @@ $(NVR).$(PKG_FMT).$(SUM): $(NVR).$(PKG_FMT)
 $(PACKAGE).$(PKG_FMT) node: $(NVR).$(PKG_FMT).$(SUM)

 PUNGI = $(NODE_TMP)/tree/pungi
-source: src.ks
+source:
 	@sudo rm -Rf $(PUNGI)
 	@mkdir -p $(PUNGI)

-- 
1.6.2.5