From d3985bf6d25a4b523dfebfae49a7e22cbadf088a Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Aug 31 2020 11:57:51 +0000
Subject: ELN: Import missing shared/general and shared/createiso. Move Fedora specific configuration to fedora/override.conf.


Signed-off-by: Jan Kaluza <jkaluza@redhat.com>

---

diff --git a/eln.conf b/eln.conf
index cdd42f3..e2379d0 100644
--- a/eln.conf
+++ b/eln.conf
@@ -8,12 +8,14 @@
 # For any change which should happen only for Fedora ELN, edit the
 # "fedora/override.conf" configuration file.
 
+from shared/general import *
 from shared/multilib import *
 from shared/additional_and_filter_packages import *
 from shared/runroot import *
 from shared/pkgset import *
 from shared/gather import *
 from shared/createrepo import *
+from shared/createiso import *
 from shared/buildinstall import *
 from shared/lookaside import *
 from fedora/variables import *
diff --git a/fedora/override.conf b/fedora/override.conf
index fa8da30..eeb0074 100644
--- a/fedora/override.conf
+++ b/fedora/override.conf
@@ -80,4 +80,20 @@ variant_as_lookaside = [
     ("CRB", "AppStream"),
 ]
 
+
+# TODO: There is no "fus" in Fedora. For now use "deps".
+gather_method = {
+    # Anything that is not AppStream or CRB should use the old depsolver
+    "^(?!(AppStream|CRB)).*$": {
+        "comps": "deps",
+    },
+    # TODO: There is no "fus" in Fedora. For now use "deps".
+    "^(AppStream|CRB)$": {
+        "comps": "deps",
+    },
+}
+
+# No product_id for Fedora.
+product_id_allow_missing = False
+
 variants_file = "variants.xml"
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index d812ddc..7cf8781 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -1,5 +1,3 @@
-filter_system_release_packages = False
-
 filter_packages = [
      ("^.*$", {
          "*": [
diff --git a/shared/gather.conf b/shared/gather.conf
index 79f73ce..a035fa6 100644
--- a/shared/gather.conf
+++ b/shared/gather.conf
@@ -6,10 +6,7 @@ gather_method = {
     "^(?!(AppStream|CRB)).*$": {
         "comps": "deps",
     },
-    # TODO: There is no "fus" in Fedora. For now use "deps".
-    "^(AppStream|CRB)$": {
-        "comps": "deps",
-    },
+    "^(AppStream|CRB)$": "hybrid",
 }
 
 hashed_directories = False