From 8367a772f43db0aacb5482defb2786f7838380bd Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Tue, 19 Mar 2013 18:55:54 +0100 Subject: [PATCH] New builder API Conflicts: Makefile - not removed update-repo-* targets --- Makefile | 1 - Makefile.builder | 3 +++ kernel.spec | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 Makefile.builder diff --git a/Makefile b/Makefile index bc8bb8f..980dabd 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,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/ 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/kernel.spec b/kernel.spec index 6a9fc36..fd81646 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})