From c61950513efde0f14ddf795691f030a9bcc70d69 Mon Sep 17 00:00:00 2001
From: Michal Kubecek <mkubecek@suse.cz>
Date: Jan 26 2024 12:13:35 +0000
Subject: Merge branch 'packaging' into master


Conflicts:
	rpm/constraints.in

---

diff --git a/rpm/constraints.in b/rpm/constraints.in
index 47f3364..979133d 100644
--- a/rpm/constraints.in
+++ b/rpm/constraints.in
@@ -18,6 +18,7 @@
   <overwrite>
     <conditions>
       <package>kernel-syzkaller</package>
+      <package>kernel-source@VARIANT@:kernel-syzkaller</package>
     </conditions>
     <hardware>
       <physicalmemory>
@@ -26,12 +27,10 @@
     </hardware>
   </overwrite>
 
-  <!-- 8GB for kernel-source -->
+  <!-- 8GB for kernel-source@VARIANT@ -->
   <overwrite>
     <conditions>
-      <package>kernel-source</package>
-      <package>kernel-source-azure</package>
-      <package>kernel-source-rt</package>
+      <package>kernel-source@VARIANT@</package>
     </conditions>
     <hardware>
       <disk>
@@ -41,11 +40,11 @@
     <hostlabel exclude="true">SLOW_DISK</hostlabel>
   </overwrite>
 
-  <!-- 4GB for kernel-docs -->
+  <!-- 4GB for kernel-docs@VARIANT@ -->
   <overwrite>
     <conditions>
-      <package>kernel-docs</package>
-      <package>kernel-docs-rt</package>
+      <package>kernel-docs@VARIANT@</package>
+      <package>kernel-source@VARIANT@:kernel-docs@VARIANT@</package>
     </conditions>
     <hardware>
       <physicalmemory>
@@ -68,7 +67,7 @@
     </hardware>
   </overwrite>
 
-  <!-- 14GB of disk and 2GB of memory for binary package on s390x -->
+  <!-- 16GB of disk and 2GB of memory for binary package on s390x -->
   <overwrite>
     <conditions>
       <arch>s390x</arch>
@@ -166,6 +165,7 @@
       <arch>i586</arch>
       <arch>x86_64</arch>
       <package>kernel-obs-qa</package>
+      <package>kernel-source@VARIANT@:kernel-obs-qa</package>
     </conditions>
     <sandbox>kvm</sandbox>
   </overwrite>
@@ -175,6 +175,7 @@
       <arch>i586</arch>
       <arch>x86_64</arch>
       <package>kernel-obs-qa-xen</package>
+      <package>kernel-source@VARIANT@:kernel-obs-qa-xen</package>
     </conditions>
     <sandbox>xen</sandbox>
   </overwrite>
diff --git a/rpm/mkspec b/rpm/mkspec
index 04f9733..05c8233 100755
--- a/rpm/mkspec
+++ b/rpm/mkspec
@@ -260,10 +260,11 @@ copy_changes();
 
 # _constraints
 {
-	my @packages = map { "<package>kernel-$_</package>\n<package>kernel-source:kernel-$_</package>" } sort keys(%flavor_archs);
+	my @packages = map { "<package>kernel-$_</package>\n<package>kernel-source$variant:kernel-$_</package>" } sort keys(%flavor_archs);
 	my $packages = join("\n", @packages);
 	do_spec('constraints', "_constraints",
-		BINARY_PACKAGES_XML => $packages);
+		BINARY_PACKAGES_XML => $packages,
+		VARIANT => $variant);
 }
 
 exit 0;