diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 956e42b..f115218 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -112,7 +112,7 @@ jobs: image_repo: ${{ env.IMAGE_REPO}} image_tag: ${{ matrix.version }} version: ${{ matrix.version == 'eln' && '9' || matrix.version }} - repos: ${{ matrix.version == 'eln' && 'repos/centos.srepo' || '' }} + repos: ${{ matrix.version == 'eln' && 'repos/centos.repo' || '' }} variant: ${{ needs.load_vars.outputs.VARIANT }} flatpak_remote_refs: ${{ matrix.flatpaks == 'flatpak_refs' && needs.load_vars.outputs.FLATPAK_REMOTE_REFS || '' }} flatpak_remote_refs_dir: ${{ matrix.flatpaks == 'flatpak_refs_dir' && needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR || '' }} diff --git a/.gitignore b/.gitignore index df805b5..8ccdc98 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ /flatpaks/list.txt /lorax_templates/post_* /pkglists -/repos/*.repo /results /xorriso/input.txt /original-pkgsizes.txt diff --git a/Makefile b/Makefile index 48873e6..622128e 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ _VOLID := $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$( ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo) export _RHEL := true -else ifeq ($(findstring centos.srepo,$(REPOS)),centos.srepo) +else ifeq ($(findstring centos.repo,$(REPOS)),centos.repo) export _RHEL := true else export _RHEL := false diff --git a/repos/centos.srepo b/repos/centos.repo similarity index 85% rename from repos/centos.srepo rename to repos/centos.repo index 8ab6a8c..f9a5ee1 100644 --- a/repos/centos.srepo +++ b/repos/centos.repo @@ -1,5 +1,5 @@ [baseos] -name=CentOS Stream $releasever - BaseOS +name=CentOS Stream 9 - BaseOS metalink=https://mirrors.centos.org/metalink?repo=centos-baseos-9-stream&arch=x86_64&protocol=https,http gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial gpgcheck=0 @@ -9,7 +9,7 @@ countme=1 enabled=1 [appstream] -name=CentOS Stream $releasever - AppStream +name=CentOS Stream 9 - AppStream metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-9-stream&arch=x86_64&protocol=https,http gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial gpgcheck=0