Add fedora 34 config

devexp-db · Feb 20, 2021 · f5c075c · f5c075c
1 parent a85fccd
commit f5c075c
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -1,5 +1,13 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+New in 1.7:
+
+* New features:
+
+  - Added 'fedora-34' config, and rawhide moved to 'fedora-35'.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 New in 1.6:
 
 * New features:

diff --git a/distgen/distconf/fedora-34-i686.yaml b/distgen/distconf/fedora-34-i686.yaml
@@ -4,4 +4,4 @@ package_installer:
   name: dnf
 
 os:
-  version: 33
+  version: 34
diff --git a/distgen/distconf/fedora-34-x86_64.yaml b/distgen/distconf/fedora-34-x86_64.yaml
@@ -1,4 +1,4 @@
-extends: "fedora-33-i686.yaml"
+extends: "fedora-34-i686.yaml"
 
 macros:
   libdir: $prefix/lib64
@@ -7,4 +7,4 @@ os:
   arch: x86_64
 
 docker:
-  from: fedora:33
+  from: fedora:34
diff --git a/distgen/distconf/fedora-35-i686.yaml b/distgen/distconf/fedora-35-i686.yaml
@@ -0,0 +1,7 @@
+extends: "lib/fedora.yaml"
+
+package_installer:
+  name: dnf
+
+os:
+  version: 35
diff --git a/distgen/distconf/fedora-35-x86_64.yaml b/distgen/distconf/fedora-35-x86_64.yaml
@@ -0,0 +1,10 @@
+extends: "fedora-35-i686.yaml"
+
+macros:
+  libdir: $prefix/lib64
+
+os:
+  arch: x86_64
+
+docker:
+  from: fedora:35
diff --git a/distgen/distconf/fedora-rawhide-i686.yaml b/distgen/distconf/fedora-rawhide-i686.yaml
@@ -1 +1 @@
-fedora-34-i686.yaml
+fedora-35-i686.yaml
diff --git a/tests/dockerfile/test.exp b/tests/dockerfile/test.exp
@@ -77,7 +77,7 @@ MAINTAINER Pavel Raiskup <[email protected]>
 
 ENV container="docker" \
     PGDATA="/var/lib/pgsql/data" \
-    TEST_VAR="build_for fedora-33-x86_64"
+    TEST_VAR="build_for fedora-35-x86_64"
 
 RUN dnf -y --setopt=tsflags=nodocs install postgresql-server \
     && dnf -y --setopt=tsflags=nodocs reinstall glibc-common \