From 8231c199411acc24c20e644e932bc05895af379b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zuzana=20Mikl=C3=A1nkov=C3=A1?= Date: Mon, 29 May 2023 16:31:55 +0200 Subject: [PATCH] Add config for Fedora 38, both x86_64 and i686 versions. (#138) --- distgen/distconf/fedora-38-i686.yaml | 7 +++++++ distgen/distconf/fedora-38-x86_64.yaml | 10 ++++++++++ distgen/distconf/fedora-rawhide-i686.yaml | 2 +- tests/dockerfile/test.exp | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 distgen/distconf/fedora-38-i686.yaml create mode 100644 distgen/distconf/fedora-38-x86_64.yaml diff --git a/distgen/distconf/fedora-38-i686.yaml b/distgen/distconf/fedora-38-i686.yaml new file mode 100644 index 0000000..4b79359 --- /dev/null +++ b/distgen/distconf/fedora-38-i686.yaml @@ -0,0 +1,7 @@ +extends: "lib/fedora.yaml" + +package_installer: + name: dnf + +os: + version: 38 diff --git a/distgen/distconf/fedora-38-x86_64.yaml b/distgen/distconf/fedora-38-x86_64.yaml new file mode 100644 index 0000000..eebfb89 --- /dev/null +++ b/distgen/distconf/fedora-38-x86_64.yaml @@ -0,0 +1,10 @@ +extends: "fedora-38-i686.yaml" + +macros: + libdir: $prefix/lib64 + +os: + arch: x86_64 + +docker: + from: fedora:38 diff --git a/distgen/distconf/fedora-rawhide-i686.yaml b/distgen/distconf/fedora-rawhide-i686.yaml index 54bcbf7..38243e2 120000 --- a/distgen/distconf/fedora-rawhide-i686.yaml +++ b/distgen/distconf/fedora-rawhide-i686.yaml @@ -1 +1 @@ -fedora-37-i686.yaml \ No newline at end of file +fedora-38-i686.yaml \ No newline at end of file diff --git a/tests/dockerfile/test.exp b/tests/dockerfile/test.exp index 3d61f94..0bbbe8e 100644 --- a/tests/dockerfile/test.exp +++ b/tests/dockerfile/test.exp @@ -77,7 +77,7 @@ MAINTAINER Pavel Raiskup ENV container="docker" \ PGDATA="/var/lib/pgsql/data" \ - TEST_VAR="build_for fedora-37-x86_64" + TEST_VAR="build_for fedora-38-x86_64" RUN dnf -y --setopt=tsflags=nodocs install postgresql-server \ && dnf -y --setopt=tsflags=nodocs reinstall glibc-common \