From 2c6e83434eef43bd96e592efba263701d37381f7 Mon Sep 17 00:00:00 2001 From: lleyton Date: Thu, 18 May 2023 21:48:07 -0700 Subject: [PATCH] Rename anda-mock-configs to terra-mock-configs (#446) --- .devcontainer/Dockerfile | 2 +- .github/workflows/bootstrap.yml | 2 +- anda/mock-configs/.gitignore | 1 - anda/mock-configs/anda-mock-configs.spec | 41 -------------- anda/mock-configs/anda.hcl | 2 +- ...da-38-aarch64.cfg => terra-38-aarch64.cfg} | 2 +- ...anda-38-x86_64.cfg => terra-38-x86_64.cfg} | 2 +- anda/mock-configs/terra-mock-configs.spec | 53 +++++++++++++++++++ anda/mock-configs/{anda.tpl => terra.tpl} | 30 ++--------- 9 files changed, 61 insertions(+), 74 deletions(-) delete mode 100644 anda/mock-configs/.gitignore delete mode 100644 anda/mock-configs/anda-mock-configs.spec rename anda/mock-configs/{anda-38-aarch64.cfg => terra-38-aarch64.cfg} (79%) rename anda/mock-configs/{anda-38-x86_64.cfg => terra-38-x86_64.cfg} (79%) create mode 100644 anda/mock-configs/terra-mock-configs.spec rename anda/mock-configs/{anda.tpl => terra.tpl} (86%) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8c21d4db49..97bdb28677 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -7,4 +7,4 @@ RUN usermod -aG mock vscode RUN echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode RUN dnf -y install git 'dnf-command(config-manager)' mock createrepo_c RUN dnf config-manager --add-repo='https://raw.githubusercontent.com/terrapkg/subatomic-repos/main/terra.repo' -RUN dnf -y install anda anda-mock-configs +RUN dnf -y install anda terra-mock-configs diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index b9cd44876d..4a5b33ca15 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -23,7 +23,7 @@ jobs: run: | sudo dnf install -y dnf-plugins-core sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo - sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel + sudo dnf install -y mock createrepo_c rpm-build terra-mock-configs gcc curl wget git-core openssl-devel - uses: actions/checkout@v3 with: diff --git a/anda/mock-configs/.gitignore b/anda/mock-configs/.gitignore deleted file mode 100644 index 79b8e8a9dd..0000000000 --- a/anda/mock-configs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -anda-build/ \ No newline at end of file diff --git a/anda/mock-configs/anda-mock-configs.spec b/anda/mock-configs/anda-mock-configs.spec deleted file mode 100644 index d072d20c12..0000000000 --- a/anda/mock-configs/anda-mock-configs.spec +++ /dev/null @@ -1,41 +0,0 @@ -Name: anda-mock-configs -Version: 3 -Release: 1%{?dist} -Summary: Mock configs for Terra repos - -License: MIT -URL: http://fedoraproject.org/wiki/Extras -Source0: anda.tpl -Source1: anda-38-x86_64.cfg -Source2: anda-38-aarch64.cfg - -BuildRequires: mock-core-configs -Requires: mock-core-configs -BuildArch: noarch - - -%description -%{summary} - -%prep - -%build - - -%install -mkdir -p %{buildroot}%{_sysusersdir} -mkdir -p %{buildroot}%{_sysconfdir}/mock/templates - - -cp -v %{SOURCE0} %{buildroot}%{_sysconfdir}/mock/templates/ -cp -v %{SOURCE1} %{buildroot}%{_sysconfdir}/mock/ -cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}/mock/ - -%files -%{_sysconfdir}/mock/templates/anda.tpl -%{_sysconfdir}/mock/anda-38-x86_64.cfg -%{_sysconfdir}/mock/anda-38-aarch64.cfg - -%changelog -* Mon Oct 03 2022 Cappy Ishihara -- Intial Release diff --git a/anda/mock-configs/anda.hcl b/anda/mock-configs/anda.hcl index 4875c0d7a1..208cbd274c 100644 --- a/anda/mock-configs/anda.hcl +++ b/anda/mock-configs/anda.hcl @@ -1,5 +1,5 @@ project pkg { rpm { - spec = "anda-mock-configs.spec" + spec = "terra-mock-configs.spec" } } diff --git a/anda/mock-configs/anda-38-aarch64.cfg b/anda/mock-configs/terra-38-aarch64.cfg similarity index 79% rename from anda/mock-configs/anda-38-aarch64.cfg rename to anda/mock-configs/terra-38-aarch64.cfg index 08d0630e60..42efc70495 100644 --- a/anda/mock-configs/anda-38-aarch64.cfg +++ b/anda/mock-configs/terra-38-aarch64.cfg @@ -2,4 +2,4 @@ config_opts['releasever'] = '38' config_opts['target_arch'] = 'aarch64' config_opts['legal_host_arches'] = ('aarch64',) -include('templates/anda.tpl') +include('templates/terra.tpl') diff --git a/anda/mock-configs/anda-38-x86_64.cfg b/anda/mock-configs/terra-38-x86_64.cfg similarity index 79% rename from anda/mock-configs/anda-38-x86_64.cfg rename to anda/mock-configs/terra-38-x86_64.cfg index 761a6b3c37..caa7a68cc3 100644 --- a/anda/mock-configs/anda-38-x86_64.cfg +++ b/anda/mock-configs/terra-38-x86_64.cfg @@ -2,4 +2,4 @@ config_opts['releasever'] = '38' config_opts['target_arch'] = 'x86_64' config_opts['legal_host_arches'] = ('x86_64',) -include('templates/anda.tpl') +include('templates/terra.tpl') diff --git a/anda/mock-configs/terra-mock-configs.spec b/anda/mock-configs/terra-mock-configs.spec new file mode 100644 index 0000000000..45f1743e93 --- /dev/null +++ b/anda/mock-configs/terra-mock-configs.spec @@ -0,0 +1,53 @@ +Name: terra-mock-configs +Version: 4 +Release: 1%{?dist} +Summary: Mock configs for Terra repos + +License: MIT +URL: http://terra.fyralabs.com +Source0: terra.tpl +Source1: terra-38-x86_64.cfg +Source2: terra-38-aarch64.cfg + +BuildRequires: mock-core-configs +Requires: mock-core-configs +BuildArch: noarch + +Provides: anda-mock-configs = %{version}-%{release} +Obsoletes: anda-mock-configs < 3-2%{?dist} + +%description +%{summary} + +%prep + +%build + + +%install +mkdir -p %{buildroot}%{_sysusersdir} +mkdir -p %{buildroot}%{_sysconfdir}/mock/templates + + +cp -v %{SOURCE0} %{buildroot}%{_sysconfdir}/mock/templates/ +cp -v %{SOURCE1} %{buildroot}%{_sysconfdir}/mock/ +cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}/mock/ + +# For legacy compatibility, remove in next Terra release +ln -s %{_sysconfdir}/mock/templates/terra.tpl %{buildroot}%{_sysconfdir}/mock/templates/anda.tpl +ln -s %{_sysconfdir}/mock/terra-38-x86_64.cfg %{buildroot}%{_sysconfdir}/mock/anda-38-x86_64.cfg +ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/anda-38-aarch64.cfg + +%files +%{_sysconfdir}/mock/templates/terra.tpl +%{_sysconfdir}/mock/terra-38-x86_64.cfg +%{_sysconfdir}/mock/terra-38-aarch64.cfg +%{_sysconfdir}/mock/templates/anda.tpl +%{_sysconfdir}/mock/anda-38-x86_64.cfg +%{_sysconfdir}/mock/anda-38-aarch64.cfg + +%changelog +* Thu May 18 2023 Lleyton Gray +- Rename to terra-mock-configs and rename files to terra +* Mon Oct 03 2022 Cappy Ishihara +- Intial Release diff --git a/anda/mock-configs/anda.tpl b/anda/mock-configs/terra.tpl similarity index 86% rename from anda/mock-configs/anda.tpl rename to anda/mock-configs/terra.tpl index f171c9af8f..2643cdb247 100644 --- a/anda/mock-configs/anda.tpl +++ b/anda/mock-configs/terra.tpl @@ -1,4 +1,4 @@ -config_opts['root'] = 'anda-{{ releasever }}-{{ target_arch }}' +config_opts['root'] = 'terra-{{ releasever }}-{{ target_arch }}' config_opts['dist'] = 'fc{{ releasever }}' # only useful for --resultdir variable subst config_opts['macros']['%dist'] = '.fc{{ releasever }}' config_opts['chroot_setup_cmd'] = 'install @buildsys-build' @@ -10,7 +10,7 @@ config_opts['dnf.conf'] = """ [main] keepcache=1 -debuglevel=2 +debuglevel=2a reposdir=/dev/null logfile=/var/log/yum.log retries=20 @@ -37,30 +37,6 @@ enabled=1 enabled_metadata=1 metadata_expire=4h -[rpmfusion-free] -name=RPM Fusion for Fedora $releasever - Free -#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch -enabled=1 -metadata_expire=14d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever - -[rpmfusion-nonfree] -name=RPM Fusion for Fedora $releasever - Nonfree -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch -enabled=0 -enabled_metadata=1 -metadata_expire=14d -type=rpm-md -gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever - - [local] name=local baseurl=https://lapis.ultramarine-linux.org/kojifiles/repos/um{{ releasever }}-build/latest/$basearch/ @@ -200,4 +176,4 @@ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch skip_if_unavailable=False {% endif %} -""" \ No newline at end of file +"""