Enable building fc38 packages

Both for R4.1 and R4.2. Add also fc38 templates targets. QubesOS/qubes-issues#8069
QubesOS · Mar 4, 2023 · 4e26880 · 4e26880
1 parent 4acfff3
commit 4e26880
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/R4.1/qubes-os-r4.1-fedora.conf b/R4.1/qubes-os-r4.1-fedora.conf
@@ -9,7 +9,7 @@ NO_SIGN ?=
 BACKEND_VMM=xen
 
 DIST_DOM0 ?=
-DISTS_VM ?= fc36 fc37
+DISTS_VM ?= fc36 fc37 fc38
 USE_DIST_BUILD_TOOLS = 1
 
 include example-configs/qubes-os-r4.1.conf

diff --git a/R4.1/qubes-os-r4.1-templates-itl.conf b/R4.1/qubes-os-r4.1-templates-itl.conf
@@ -17,6 +17,7 @@ DISTS_FEDORA = \
 			   fc35 fc35+minimal fc35+xfce \
 			   fc36 fc36+minimal fc36+xfce \
 			   fc37 fc37+minimal fc37+xfce \
+			   fc38 fc38+minimal fc38+xfce \
 			   $(null)
 
 DISTS_DEBIAN = \
@@ -66,6 +67,9 @@ TEMPLATE_LABEL += fc36+xfce:fedora-36-xfce
 TEMPLATE_LABEL += fc37:fedora-37
 TEMPLATE_LABEL += fc37+minimal:fedora-37-minimal
 TEMPLATE_LABEL += fc37+xfce:fedora-37-xfce
+TEMPLATE_LABEL += fc38:fedora-38
+TEMPLATE_LABEL += fc38+minimal:fedora-38-minimal
+TEMPLATE_LABEL += fc38+xfce:fedora-38-xfce
 
 TEMPLATE_LABEL += buster:debian-10
 TEMPLATE_LABEL += buster+standard:debian-10
@@ -110,6 +114,9 @@ BUILDER_TEMPLATE_CONF += fc36+xfce:$(TEMPLATE_FEDORA_CONF)
 BUILDER_TEMPLATE_CONF += fc37:$(TEMPLATE_FEDORA_CONF)
 BUILDER_TEMPLATE_CONF += fc37+minimal:$(TEMPLATE_FEDORA_CONF)
 BUILDER_TEMPLATE_CONF += fc37+xfce:$(TEMPLATE_FEDORA_CONF)
+BUILDER_TEMPLATE_CONF += fc38:$(TEMPLATE_FEDORA_CONF)
+BUILDER_TEMPLATE_CONF += fc38+minimal:$(TEMPLATE_FEDORA_CONF)
+BUILDER_TEMPLATE_CONF += fc38+xfce:$(TEMPLATE_FEDORA_CONF)
 
 BUILDER_TEMPLATE_CONF += buster:$(TEMPLATE_DEBIAN_CONF)
 BUILDER_TEMPLATE_CONF += buster+standard:$(TEMPLATE_DEBIAN_CONF)

diff --git a/R4.2/qubes-os-r4.2-fedora.yml b/R4.2/qubes-os-r4.2-fedora.yml
@@ -15,6 +15,7 @@ reuse-fetched-source: true
 distributions:
  - vm-fc36
  - vm-fc37
+ - vm-fc38
 
 +components:
   - release-configs:

diff --git a/R4.2/qubes-os-r4.2-templates-itl.yml b/R4.2/qubes-os-r4.2-templates-itl.yml
@@ -58,6 +58,21 @@ templates:
       dist: fc37
       timeout: 7200
       flavor: minimal
+  - fedora-38:
+      dist: fc38
+      options:
+       - selinux
+      timeout: 7200
+  - fedora-38-xfce:
+      dist: fc38
+      options:
+       - selinux
+      timeout: 7200
+      flavor: xfce
+  - fedora-38-minimal:
+      dist: fc38
+      timeout: 7200
+      flavor: minimal
   - debian-11:
       dist: bullseye
       options:
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ reuse-fetched-source: true @@
     distributions:
      - vm-fc36
      - vm-fc37
+     - vm-fc38
     +components:
       - release-configs:
@@ Expand Down @@