From 15514ac7667c36882b8da3a4acd712397c88bab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 20 Feb 2017 22:54:51 +0100
Subject: [PATCH] Upload kernel-devel package built for dom0 to VM repository

When VM kernel is provided by dom0 (the default in Qubes 3.x), VM
kernel-devel package should match kernel actually installed in dom0.

Fixes QubesOS/qubes-issues#2641

(cherry picked from commit d3c09e68ad4a31f2e87957b2597173e98dd5d14d)
---
 Makefile.builder | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Makefile.builder b/Makefile.builder
index 3e3b27f..424f563 100644
--- a/Makefile.builder
+++ b/Makefile.builder
@@ -1,8 +1,14 @@
 ifeq ($(PACKAGE_SET),dom0)
 RPM_SPEC_FILES := kernel.spec
 else ifeq ($(PACKAGE_SET),vm)
+
 ifdef UPDATE_REPO
+# If DIST_DOM0 defined, copy kernel-devel from there
+ifneq ($(DIST_DOM0),)
 # Include kernel-devel packages in VM repo - dummy spec file
 RPM_SPEC_FILES := kernel-devel.spec
+OUTPUT_DIR = pkgs/$(DIST_DOM0)
 endif
 endif
+
+endif