From 6731e3f4a5fe7f5be8db2903551ccf781e6d267d Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Sun, 28 Aug 2022 23:21:54 -0700 Subject: [PATCH] add fedora major version for future use --- iso/empanadas/empanadas/configs/el9-beta.yaml | 1 + iso/empanadas/empanadas/configs/el9.yaml | 1 + iso/empanadas/empanadas/configs/el9alt.yaml | 1 + iso/empanadas/empanadas/configs/el9lh.yaml | 1 + .../empanadas/scripts/build_image.py | 2 +- .../templates/icicle/tdl-new.xml.tmpl | 21 +++++++++++++++++++ 6 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 iso/empanadas/empanadas/templates/icicle/tdl-new.xml.tmpl diff --git a/iso/empanadas/empanadas/configs/el9-beta.yaml b/iso/empanadas/empanadas/configs/el9-beta.yaml index 46d88bb..664455d 100644 --- a/iso/empanadas/empanadas/configs/el9-beta.yaml +++ b/iso/empanadas/empanadas/configs/el9-beta.yaml @@ -8,6 +8,7 @@ profile: '9-beta' bugurl: 'https://bugs.rockylinux.org' checksum: 'sha256' + fedora_major: '20' allowed_arches: - x86_64 - aarch64 diff --git a/iso/empanadas/empanadas/configs/el9.yaml b/iso/empanadas/empanadas/configs/el9.yaml index 0d52b1d..e9e9e89 100644 --- a/iso/empanadas/empanadas/configs/el9.yaml +++ b/iso/empanadas/empanadas/configs/el9.yaml @@ -8,6 +8,7 @@ profile: '9' bugurl: 'https://bugs.rockylinux.org' checksum: 'sha256' + fedora_major: '20' allowed_arches: - x86_64 - aarch64 diff --git a/iso/empanadas/empanadas/configs/el9alt.yaml b/iso/empanadas/empanadas/configs/el9alt.yaml index f8bccb8..680b1df 100644 --- a/iso/empanadas/empanadas/configs/el9alt.yaml +++ b/iso/empanadas/empanadas/configs/el9alt.yaml @@ -9,6 +9,7 @@ profile: '9' bugurl: 'https://bugs.rockylinux.org' checksum: 'sha256' + fedora_major: '20' allowed_arches: - armv7hl - riscv64 diff --git a/iso/empanadas/empanadas/configs/el9lh.yaml b/iso/empanadas/empanadas/configs/el9lh.yaml index aa300e3..0c919cb 100644 --- a/iso/empanadas/empanadas/configs/el9lh.yaml +++ b/iso/empanadas/empanadas/configs/el9lh.yaml @@ -8,6 +8,7 @@ profile: '9-lookahead' bugurl: 'https://bugs.rockylinux.org' checksum: 'sha256' + fedora_major: '20' allowed_arches: - x86_64 - aarch64 diff --git a/iso/empanadas/empanadas/scripts/build_image.py b/iso/empanadas/empanadas/scripts/build_image.py index 5085253..8d8408f 100644 --- a/iso/empanadas/empanadas/scripts/build_image.py +++ b/iso/empanadas/empanadas/scripts/build_image.py @@ -388,7 +388,7 @@ class ImageBuild: except Exception as e: log.exception(e) finally: - f.flush() + f.flush() def run(): try: diff --git a/iso/empanadas/empanadas/templates/icicle/tdl-new.xml.tmpl b/iso/empanadas/empanadas/templates/icicle/tdl-new.xml.tmpl new file mode 100644 index 0000000..1297d90 --- /dev/null +++ b/iso/empanadas/empanadas/templates/icicle/tdl-new.xml.tmpl @@ -0,0 +1,21 @@ + + +