From 3d2838b75053c9bdb77d011f20e03a7fbe8ce593 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Tue, 19 Mar 2013 18:55:54 +0100
Subject: [PATCH] New builder API

---
 Makefile         | 37 -------------------------------------
 Makefile.builder |  3 +++
 build-deps.list  |  4 ----
 kernel.spec      |  7 +++++++
 4 files changed, 10 insertions(+), 41 deletions(-)
 create mode 100644 Makefile.builder
 delete mode 100644 build-deps.list

diff --git a/Makefile b/Makefile
index d9c1bca..dad5ff6 100644
--- a/Makefile
+++ b/Makefile
@@ -107,43 +107,6 @@ srpm: get-sources $(SPECFILE)
 verrel:
 	@echo $(NAME)-$(VERSION)-$(RELEASE)
 
-
-update-repo-current:
-	ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/
-	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/
-	ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/
-	for vmrepo in ../yum/current-release/current/vm/* ; do \
-		ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\
-	done
-	ln -f rpm/x86_64/kernel-qubes-vm-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current/dom0/rpm/
-
-
-update-repo-current-testing:
-	ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/
-	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/
-	ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/
-	for vmrepo in ../yum/current-release/current-testing/vm/* ; do \
-		ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\
-	done
-	ln -f rpm/x86_64/kernel-qubes-vm-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/current-testing/dom0/rpm/
-
-update-repo-unstable:
-	ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/
-	ln -f rpm/x86_64/kernel-debuginfo-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/
-	ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/
-	for vmrepo in ../yum/current-release/unstable/vm/* ; do \
-		ln -f rpm/x86_64/kernel-devel-$(VERSION)-$(RELEASE)*.rpm $$vmrepo/rpm/ ;\
-	done
-	ln -f rpm/x86_64/kernel-qubes-vm-$(VERSION)-$(RELEASE)*.rpm ../yum/current-release/unstable/dom0/rpm/
-
-update-repo-installer: update-repo-installer-kernel-dom0 update-repo-installer-kernel-vm
-
-update-repo-installer-kernel-dom0:
-	ln -f rpm/x86_64/kernel-$(VERSION)-$(RELEASE)*.rpm ../installer/yum/qubes-dom0/rpm/
-
-update-repo-installer-kernel-vm:
-	ln -f rpm/x86_64/kernel-qubes-vm-$(VERSION)-$(RELEASE)*.rpm ../installer/yum/qubes-dom0/rpm/
-
 # mop up, printing out exactly what was mopped.
 
 .PHONY : clean
diff --git a/Makefile.builder b/Makefile.builder
new file mode 100644
index 0000000..6007c88
--- /dev/null
+++ b/Makefile.builder
@@ -0,0 +1,3 @@
+ifeq ($(PACKAGE_SET),dom0)
+RPM_SPEC_FILES := kernel.spec
+endif
diff --git a/build-deps.list b/build-deps.list
deleted file mode 100644
index 7bec0ea..0000000
--- a/build-deps.list
+++ /dev/null
@@ -1,4 +0,0 @@
-sparse
-tar
-qubes-core-libs-devel-*DIST*
-dracut
diff --git a/kernel.spec b/kernel.spec
index b501734..6aa7512 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2,6 +2,13 @@
 # Based on the Open SUSE kernel-spec & Fedora kernel-spec.
 #
 
+# default to pvops build
+%{!?build_flavor:%define build_flavor pvops}
+
+%if 0%{?qubes_builder}
+%define _sourcedir %(pwd)
+%endif
+
 #%define _unpackaged_files_terminate_build 0
 %define variant %{build_flavor}.qubes
 %define plainrel %(cat rel-%{build_flavor})