[Ovirt-devel] [PATCH release] Fixed tar-src target to work with refactored appliance structure

[Perry Myers]

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 ovirt.mk |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ovirt.mk b/ovirt.mk
index 631291a..a29f428 100644
--- a/ovirt.mk
+++ b/ovirt.mk
@@ -7,6 +7,7 @@ OVIRT_GIT_SERVER ?= git://ovirt.org
 # 'next' is development snapshot
 OVIRT_BRANCH ?= next
 OVIRT_URL ?= http://ovirt.org/repos/ovirt
+THINCRUST_URL ?= http://www.thincrust.net/repo
 FEDORA_MIRROR ?= http://mirrors.fedoraproject.org/mirrorlist
 
 SUBDIRS ?= release server node node-image recipe appliance docs
@@ -77,6 +78,8 @@ update-host:
 
 tar-src:
 	@mkdir -p $(OVIRT_CACHE_DIR)
+	@sudo chown -R $(USER) $(OVIRT_CACHE_DIR)
+	@rm -Rf $(OVIRT_CACHE_DIR)/source
 	@( if [ -n "$(FEDORA_URL)" ]; then \
 	  echo "repo --name=f$(F_REL) --baseurl=$(FEDORA_URL)/releases/$(F_REL)/Everything/\$$basearch/os" ; \
 	  echo "repo --name=f$(F_REL)-updates --baseurl=$(FEDORA_URL)/updates/$(F_REL)/\$$basearch" ; \
@@ -92,11 +95,17 @@ tar-src:
 	  echo "repo --name=f$(F_REL)-updates-src --mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-source-f$(F_REL)&arch=src" ; \
 	  echo "repo --name=f$(F_REL)-updates-src-newkey --mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-source-f$(F_REL).newkey&arch=src" ; \
 	fi ; \
+	echo "repo --name=ovirt-org --baseurl=$(OVIRT_URL)/${F_REL}/\$$basearch" ; \
+	echo "repo --name=ovirt-org-src --baseurl=$(OVIRT_URL)/${F_REL}/src" ; \
+	echo "repo --name=thincrust-net --baseurl=$(THINCRUST_URL)/noarch" ; \
+	echo "repo --name=thincrust-net-src --baseurl=$(THINCRUST_URL)/srpms" ; \
+	echo "repo --name=ovirt-local --baseurl=file://$(OVIRT_CACHE_DIR)/ovirt" ; \
 	echo "%packages --nobase" ; \
+	grep -v '^-' /usr/share/appliance-tools/base-pkgs.ks ; \
+	echo "lokkit" ; \
 	for dir in $(SUBDIRS); do \
-	  if test -f $$dir/common-pkgs.ks ; then \
-	    grep -v '^-' $$dir/common-pkgs.ks ; \
-	  fi ; \
+	  echo "ovirt-$$dir" ; \
+	  test -f $$dir/common-pkgs.ks && grep -v '^-' $$dir/common-pkgs.ks ; \
 	done ; \
 	echo "%end" ) > $(SRC_KS)
 	cd $(OVIRT_CACHE_DIR) && \
-- 
1.5.5.1