From 0499798ded82722a4610dfa786733468647bf19f Mon Sep 17 00:00:00 2001 From: lleyton Date: Wed, 16 Aug 2023 01:57:39 -0700 Subject: [PATCH 1/2] feat: bump version to 39 and remove unused packages --- .github/workflows/autobuild.yml | 4 +- .github/workflows/bootstrap.yml | 2 +- .github/workflows/mass-rebuild.yml | 4 +- .../backgrounds/ultramarine-backgrounds.spec | 2 +- ultramarine/flatpak-selinux-fix/.gitignore | 1 - ultramarine/flatpak-selinux-fix/anda.hcl | 6 - .../flatpak-selinux-fix.spec | 83 --- ultramarine/flatpak-selinux-fix/umpkg.toml | 6 - ultramarine/kde-settings/kde-settings.spec | 2 +- ultramarine/logos/ultramarine-logos.spec | 2 +- ultramarine/mock-core-configs/.gitignore | 2 - ultramarine/mock-core-configs/anda.hcl | 6 - .../mock-core-configs/mock-core-configs.spec | 515 ------------------ .../mock-core-configs.spec.rpmlintrc | 6 - ultramarine/release/ultramarine-release.spec | 10 +- ultramarine/repos/repos.spec | 2 +- .../ultramarine-38-aarch64.cfg | 2 +- .../ultramarine-38-x86_64.cfg | 2 +- .../ultramarine-39-aarch64.cfg | 5 + .../ultramarine-39-x86_64.cfg | 5 + .../ultramarine-mock-configs.spec | 6 +- 21 files changed, 31 insertions(+), 642 deletions(-) delete mode 100644 ultramarine/flatpak-selinux-fix/.gitignore delete mode 100644 ultramarine/flatpak-selinux-fix/anda.hcl delete mode 100644 ultramarine/flatpak-selinux-fix/flatpak-selinux-fix.spec delete mode 100644 ultramarine/flatpak-selinux-fix/umpkg.toml delete mode 100644 ultramarine/mock-core-configs/.gitignore delete mode 100644 ultramarine/mock-core-configs/anda.hcl delete mode 100644 ultramarine/mock-core-configs/mock-core-configs.spec delete mode 100644 ultramarine/mock-core-configs/mock-core-configs.spec.rpmlintrc create mode 100644 ultramarine/ultramarine-mock-configs/ultramarine-39-aarch64.cfg create mode 100644 ultramarine/ultramarine-mock-configs/ultramarine-39-x86_64.cfg diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 6e38d96..cbe8ebd 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -8,7 +8,7 @@ on: - ultramarine/** branches: - main - - um38 + - um39 workflow_dispatch: jobs: @@ -51,7 +51,7 @@ jobs: strategy: matrix: pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }} - version: ["38"] + version: ["39"] arch: ["x86_64", "aarch64"] fail-fast: false #if: ${{ matrix.changed_folders != '' }} diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 89e5774..196f436 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -6,7 +6,7 @@ jobs: build: strategy: matrix: - version: ["38"] + version: ["39"] arch: ["x86_64", "aarch64"] fail-fast: false runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} diff --git a/.github/workflows/mass-rebuild.yml b/.github/workflows/mass-rebuild.yml index 416294c..e19e6bb 100644 --- a/.github/workflows/mass-rebuild.yml +++ b/.github/workflows/mass-rebuild.yml @@ -9,7 +9,7 @@ jobs: manifest: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:f38 + image: ghcr.io/terrapkg/builder:f39 options: --cap-add=SYS_ADMIN --privileged outputs: @@ -41,7 +41,7 @@ jobs: strategy: matrix: pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }} - version: ["38"] + version: ["39"] fail-fast: false #if: ${{ matrix.changed_folders != '' }} runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index 36da64b..afda4b8 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -1,7 +1,7 @@ %undefine _disable_source_fetch Name: ultramarine-backgrounds -Version: 38 +Version: 39 Release: 2%{?dist} BuildArch: noarch # details for the artworks' licenses can be seen in the COPYING file diff --git a/ultramarine/flatpak-selinux-fix/.gitignore b/ultramarine/flatpak-selinux-fix/.gitignore deleted file mode 100644 index d163863..0000000 --- a/ultramarine/flatpak-selinux-fix/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build/ \ No newline at end of file diff --git a/ultramarine/flatpak-selinux-fix/anda.hcl b/ultramarine/flatpak-selinux-fix/anda.hcl deleted file mode 100644 index 58551aa..0000000 --- a/ultramarine/flatpak-selinux-fix/anda.hcl +++ /dev/null @@ -1,6 +0,0 @@ -project "pkg" { - rpm { - spec = "flatpak-selinux-fix.spec" - sources = "." - } -} \ No newline at end of file diff --git a/ultramarine/flatpak-selinux-fix/flatpak-selinux-fix.spec b/ultramarine/flatpak-selinux-fix/flatpak-selinux-fix.spec deleted file mode 100644 index f38f51f..0000000 --- a/ultramarine/flatpak-selinux-fix/flatpak-selinux-fix.spec +++ /dev/null @@ -1,83 +0,0 @@ -%global selinux_variants mls targeted -%global selinux_policyver %(%{__sed} -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp || echo 0.0.0) -%global modulename flatpak-timeout-fix - -Name: flatpak-selinux-fix -Version: 1 -Release: 1%{?dist} -Summary: A .pp file to fix Flatpak on SELinux -License: GPL v3 -URL: https://github.com/risiOS/risiOS-meta - -BuildRequires: checkpolicy, selinux-policy-devel, hardlink -%if "%{selinux_policyver}" != "" -Requires: selinux-policy >= %{selinux_policyver} -%endif -Requires(post): /usr/sbin/semodule, /sbin/fixfiles, flatpak -Requires(postun): /usr/sbin/semodule - -%description -Fixes an issue where SELinux will not allow Flatpak to install a package. - -%prep -mkdir SELinux - -%build -cd SELinux -cat > flatpak-timeout-fix.te < /dev/null || : -done - -%postun -if [ $1 -eq 0 ] ; then - for selinuxvariant in %{selinux_variants} - do - /usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || : - done -fi - -%files -%defattr(-,root,root,0755) -%{_datadir}/selinux/*/%{modulename}.pp - -%changelog -* Mon Jul 31 2006 John Doe 0.01-1 -- Initial version \ No newline at end of file diff --git a/ultramarine/flatpak-selinux-fix/umpkg.toml b/ultramarine/flatpak-selinux-fix/umpkg.toml deleted file mode 100644 index 7201934..0000000 --- a/ultramarine/flatpak-selinux-fix/umpkg.toml +++ /dev/null @@ -1,6 +0,0 @@ -[flatpak-selinux-fix] -spec = "flatpak-selinux-fix.spec" -build_script = "" -build_method = "mock" -owner = "cappy" -git_repo = "https://github.com/ultramarine-linux/pkg-flatpak-selinux-fix.git" diff --git a/ultramarine/kde-settings/kde-settings.spec b/ultramarine/kde-settings/kde-settings.spec index 5c16aa1..bb74f5d 100644 --- a/ultramarine/kde-settings/kde-settings.spec +++ b/ultramarine/kde-settings/kde-settings.spec @@ -1,7 +1,7 @@ Summary: Config files for KDE Name: kde-settings Epoch: 1 -Version: 38.1 +Version: 39 Release: 10%{?dist} License: MIT diff --git a/ultramarine/logos/ultramarine-logos.spec b/ultramarine/logos/ultramarine-logos.spec index ed85db2..8ad4248 100644 --- a/ultramarine/logos/ultramarine-logos.spec +++ b/ultramarine/logos/ultramarine-logos.spec @@ -3,7 +3,7 @@ Name: ultramarine-logos %define _alt_name fedora-logos Summary: Icons and pictures related to Ultramarine Linux -Version: 38 +Version: 39 %define _release 3%{?dist} Release: 3%{?dist} URL: https://github.com/Ultramarine-Linux/logos-src diff --git a/ultramarine/mock-core-configs/.gitignore b/ultramarine/mock-core-configs/.gitignore deleted file mode 100644 index b9bdb50..0000000 --- a/ultramarine/mock-core-configs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/mock-core-configs-*.tar.gz -build/ \ No newline at end of file diff --git a/ultramarine/mock-core-configs/anda.hcl b/ultramarine/mock-core-configs/anda.hcl deleted file mode 100644 index b5a40c5..0000000 --- a/ultramarine/mock-core-configs/anda.hcl +++ /dev/null @@ -1,6 +0,0 @@ -project "pkg" { - rpm { - spec = "mock-core-configs.spec" - sources = "." - } -} \ No newline at end of file diff --git a/ultramarine/mock-core-configs/mock-core-configs.spec b/ultramarine/mock-core-configs/mock-core-configs.spec deleted file mode 100644 index 614ba21..0000000 --- a/ultramarine/mock-core-configs/mock-core-configs.spec +++ /dev/null @@ -1,515 +0,0 @@ -%undefine _disable_source_fetch -Name: mock-core-configs -Version: 37.8 -Epoch: 1 -Release: 3%{?dist} -Summary: Mock core config files basic chroots - -License: GPLv2+ -URL: https://github.com/rpm-software-management/mock/ -# Source is created by -# git clone https://github.com/rpm-software-management/mock.git -# cd mock/mock-core-configs -# git reset --hard %%{name}-%%{version} -# tito build --tgz -Source: https://github.com/rpm-software-management/mock/archive/refs/tags/mock-core-configs-%{version}-1.tar.gz -BuildArch: noarch - -# The mock.rpm requires this. Other packages may provide this if they tend to -# replace the mock-core-configs.rpm functionality. -Provides: mock-configs - -# distribution-gpg-keys contains GPG keys used by mock configs -Requires: distribution-gpg-keys >= 1.60 -# specify minimal compatible version of mock -Requires: mock >= 2.5 -# BuildRequires: ultramarine-mock-configs -Recommends: ultramarine-mock-configs -Requires: mock-filesystem - -Requires(post): coreutils -# to detect correct default.cfg -Requires(post): python3-dnf -Requires(post): python3-hawkey -Requires(post): system-release -Requires(post): python3 -Requires(post): sed - -%description -Config files which allow you to create chroots for: - * Fedora - * Epel - * Mageia - * Custom chroot - * OpenSuse Tumbleweed and Leap - -%prep -%setup -q -n mock-%{name}-%{version}-1/%{name}/ - -%build -HOST=none -%if 0%{?fedora} -HOST="fedora-%{fedora}" -%endif -%if 0%{?rhel} -HOST="rhel-%{rhel}" -%endif - -# host overrides -case $HOST in - rhel-7) - # RPM on EL7 doesn't link against libzstd, and newer Fedora is compressed - # using ZSTD. We need to enable bootstrap image here to be able to - # initialize the Fedora bootstrap chroot. - for config in etc/mock/fedora-*-*.cfg; do - version=$(echo "$config" | cut -d- -f2) - if test $version = rawhide || test $version -ge 31; then - echo "config_opts['use_bootstrap_image'] = True" >> "$config" - fi - done - ;; -esac - - -%install -mkdir -p %{buildroot}%{_sysusersdir} - -mkdir -p %{buildroot}%{_sysconfdir}/mock/eol/templates -mkdir -p %{buildroot}%{_sysconfdir}/mock/templates -cp -a etc/mock/*.cfg %{buildroot}%{_sysconfdir}/mock -cp -a etc/mock/templates/*.tpl %{buildroot}%{_sysconfdir}/mock/templates -cp -a etc/mock/eol/*cfg %{buildroot}%{_sysconfdir}/mock/eol -cp -a etc/mock/eol/templates/*.tpl %{buildroot}%{_sysconfdir}/mock/eol/templates - -# generate files section with config - there is many of them -echo "%defattr(0644, root, mock)" > %{name}.cfgs -find %{buildroot}%{_sysconfdir}/mock -name "*.cfg" -o -name '*.tpl' \ - | grep -v chroot-aliases \ - | sed -e "s|^%{buildroot}|%%config(noreplace) |" >> %{name}.cfgs -echo "%%config %{_sysconfdir}/mock/chroot-aliases.cfg" >> %{name}.cfgs - -# just for %%ghosting purposes -ln -s fedora-rawhide-x86_64.cfg %{buildroot}%{_sysconfdir}/mock/default.cfg -# bash-completion -if [ -d %{buildroot}%{_datadir}/bash-completion ]; then - echo %{_datadir}/bash-completion/completions/mock >> %{name}.cfgs - echo %{_datadir}/bash-completion/completions/mockchain >> %{name}.cfgs -elif [ -d %{buildroot}%{_sysconfdir}/bash_completion.d ]; then - echo %{_sysconfdir}/bash_completion.d/mock >> %{name}.cfgs -fi - -# reference valid mock.rpm's docdir with example site-defaults.cfg -mock_docs=%{_pkgdocdir} -mock_docs=${mock_docs//mock-core-configs/mock} -mock_docs=${mock_docs//-%version/-*} -sed -i "s~@MOCK_DOCS@~$mock_docs~" %{buildroot}%{_sysconfdir}/mock/site-defaults.cfg - -%post -if [ -s /etc/os-release ]; then - # fedora and rhel7+ - if grep -Fiq Rawhide /etc/os-release; then - ver=rawhide - # mageia - elif [ -s /etc/mageia-release ]; then - if grep -Fiq Cauldron /etc/mageia-release; then - ver=cauldron - fi - else - ver=$(source /etc/os-release && echo $VERSION_ID | cut -d. -f1 | grep -o '[0-9]\+') - fi -else - # something obsure, use buildtime version - ver=%{?rhel}%{?fedora}%{?mageia} -fi -if [ -s /etc/mageia-release ]; then - mock_arch=$(sed -n '/^$/!{$ s/.* \(\w*\)$/\1/p}' /etc/mageia-release) -else - mock_arch=$(python3 -c "import dnf.rpm; import hawkey; print(dnf.rpm.basearch(hawkey.detect_arch()))") -fi - -%if 0%{?ultramarine} -# Ultramarine chroot -%define consumerlinux ultramarine -%elif 0%{?fedora} -%define consumerlinux fedora -%endif - -cfg=%{?consumerlinux:%consumerlinux}%{?rhel:epel}%{?mageia:mageia}-$ver-${mock_arch}.cfg -if [ -e %{_sysconfdir}/mock/$cfg ]; then - if [ "$(readlink %{_sysconfdir}/mock/default.cfg)" != "$cfg" ]; then - ln -s $cfg %{_sysconfdir}/mock/default.cfg 2>/dev/null || ln -s -f $cfg %{_sysconfdir}/mock/default.cfg.rpmnew - fi -else - echo "Warning: file %{_sysconfdir}/mock/$cfg does not exist." - echo " unable to update %{_sysconfdir}/mock/default.cfg" -fi -: - - -%files -f %{name}.cfgs -%license COPYING -%ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg - -%changelog -* Fri Oct 07 2022 Cappy Ishihara - 37.4-3.um37 -- Separate Ultramarine configs to somewhere else - -* Fri Jan 07 2022 Cappy Ishihara - 36.4-1.um35 -- add Ultramarine Linux -- added Consumer Linux class (Fedora and Ultramarine) -- umpkg configuration -* Thu Dec 16 2021 Pavel Raiskup 36.4-1 -- add CentOS Stream 9 + EPEL Next 9 (ngompa13@gmail.com) -- add compatibility symlinks for EPEL 7 to centos+epel-7-* (ngompa13@gmail.com) -- EPEL 7 for AArch64 and PPC64 are EOL (ngompa13@gmail.com) -- resolve the multiple "local" repo collision (from multiple templates) -- configure the alternative help for missing 'epel-8-*' configs -- Fedora 33 is EOL -- rhelepel moved to rhel+epel -- EOL the EPEL Playground configs (ngompa13@gmail.com) -- Add rocky+epel confs + Disable devel-debug (tucklesepk@gmail.com) -- Rename epel to centos+epel (ngompa13@gmail.com) -- fix the root name and remove Next from the EPEL 9 configs (ngompa13@gmail.com) -- rename 'epel-next' to 'centos-stream+epel-next' (ngompa13@gmail.com) -- add epel9 repos to epel9 template (carl@george.computer) -- rhbz#2026571 - expand dnf_vars (msuchy@redhat.com) -- oraclelinux+epel configs (carl@george.computer) -- Add AlmaLinux+EPEL configs (ngompa13@gmail.com) -- add navy-8-x86_64 (adil@linux.com) -- use quay.io Almalinux image (gotmax@e.email) -- use fully qualified bootstrap_image name (gotmax@e.email) -- update almalinux-8.tpl bootstrap_image (gotmax@e.email) -- add Koji local repos to CentOS Stream configs (ngompa13@gmail.com) -- reduce packages installed in epel chroots (carl@george.computer) - -* Fri Oct 29 2021 Pavel Raiskup 36.3-1 -- add EuroLinux 8 aarch64 (alex@euro-linux.com) -- add HA and RS configs to EuroLinux configs (alex@euro-linux.com) -- Add epel9-next configs (carl@george.computer) - -* Tue Oct 26 2021 Pavel Raiskup 36.2-1 -- bump eln to F36 (praiskup@redhat.com) - -* Fri Oct 08 2021 Pavel Raiskup 36.1-1 -- Finalize CentOS Stream 9 configuration (ngompa13@gmail.com) -- Update Oraclelinux 7/8 configs and add Oraclelinux EPEL 7/8 configs (darren.archibald@oracle.com) - -* Thu Sep 16 2021 Miroslav Suchý 36-1 -- config: Align CentOS Stream 9 with the production configuration - (ngompa13@gmail.com) -- config: Disable installing weak dependencies on RHEL rebuilds - (ngompa13@gmail.com) -- config: Disable installing weak dependencies on CentOS Stream - (ngompa13@gmail.com) -- config: Validate GPG signatures for CentOS Stream 9 (ngompa13@gmail.com) -- Add eurolinux-8 x86_64 and i686 buildroots (alex@euro-linux.com) - -* Mon Aug 16 2021 Pavel Raiskup 35-1 -- config: add Fedora 35 configs - -* Mon Jul 19 2021 Pavel Raiskup 34.6-1 -- Disable Rocky Linux "Devel" repo by default (ngompa13@gmail.com) -- Fix URL for Rocky Linux repos in commented out "baseurl" lines - (ngompa13@gmail.com) - -* Mon Jul 19 2021 Pavel Raiskup 34.5-1 -- Add CentOS Stream 9 "preview" files -- Add rocky support to mock (tucklesepk@gmail.com) -- Add AlmaLinux 8 AArch64 target (ngompa13@gmail.com) -- Add AlmaLinux Devel repo as an optional repo for AlmaLinux 8 (ngompa13@gmail.com) -- Fix GPG key path for SLE updates in openSUSE Leap 15.3 (ngompa13@gmail.com) -- Move Requires of shadow-utils from mock-core-configs to mock-filesystem (msuchy@redhat.com) -- Switch CentOS templates to use quay.io images for bootstrap (carl@george.computer) -- Add epel-next-8 configs (carl@george.computer) - -* Tue Jun 08 2021 Pavel Raiskup 34.4-1 -- Add GPG keys and RPM repositories for openSUSE Leap 15.3 (ngompa13@gmail.com) -- EOL Fedora 32 (msuchy@redhat.com) -- sync centos-stream-8 with centos-stream-repos (msuchy@redhat.com) - -* Tue Apr 27 2021 Pavel Raiskup 34.3-1 -- Add Oracle Linux 8 (ngompa13@gmail.com) -- Add Oracle Linux 7 (ngompa13@gmail.com) -- Add openSUSE Leap 15.3 (ngompa13@gmail.com) -- openSUSE Leap 15.1 is EOL (ngompa13@gmail.com) -- Add openSUSE Tumbleweed s390x config (ngompa13@gmail.com) -- Add AlmaLinux 8 configs (ngompa13@gmail.com) -- Remove make from default ELN buildroot (miro@hroncok.cz) - -* Mon Feb 22 2021 Pavel Raiskup 34.2-1 -- configs: use Fedora N-1 gpg keys for ELN (praiskup@redhat.com) - -* Thu Feb 11 2021 Pavel Raiskup 34.1-1 -- fix rawhide config after branching - -* Mon Feb 08 2021 Pavel Raiskup 34-1 -- add fedora 34 configs (msuchy@redhat.com) -- require distribution-gpg-keys with F35 keys (msuchy@redhat.com) -- make F35 symlink to rawhide (msuchy@redhat.com) -- Rename centos-stream centos-stream-8 (orion@nwra.com) - -* Tue Feb 02 2021 Pavel Raiskup 33.6-1 -- Add Mageia 8 stable release configs (ngompa13@gmail.com) -- Update Mageia Cauldron configuration for Mageia 9 (ngompa13@gmail.com) -- add RHEL 6 x86_64 configuration - -* Mon Jan 18 2021 Pavel Raiskup 33.5-1 -- fix typo in host-specific config generater - -* Mon Jan 18 2021 Pavel Raiskup 33.4-1 -- fix bootstrapping of newer Fedora on EL7 -- efine a bootstrap image for openSUSE Tumbleweed (ngompa13@gmail.com) -- use fully qualified paths for Fedora/CentOS/RHEL images (ngompa13@gmail.com) -- rename repoid for centos8 (msuchy@redhat.com) -- EOL CentOS 6 (msuchy@redhat.com) -- EOL Fedora 31 (msuchy@redhat.com) - -* Fri Nov 20 2020 Pavel Raiskup 33.3-1 -- ELN should use for build Everything repository (jkonecny@redhat.com) - -* Wed Nov 11 2020 Pavel Raiskup 33.2-1 -- Add missing CRB repository (jkonecny@redhat.com) - -* Wed Nov 11 2020 Pavel Raiskup 33.1-1 -- ELN fixups (mmathesi@redhat.com) -- EPEL: fix repo-id and name= -- Add missing repos to CentOS 6 and CentOS 7 configs -- Do --disablerepo=centos-sclo* in templates -- Add plain CentOS 6/7/8 configs (without epel) -- EPEL Playground depends on normal EPEL - -* Thu Sep 03 2020 Pavel Raiskup 33-1 -- bump version to 33, as we already ship F33 configs -- because of the mock-filesystem change, depend on mock 2.5 - -* Thu Sep 03 2020 Pavel Raiskup 32.8-1 -- set the DNF user_agent in dnf.conf (msuchy@redhat.com) -- add Fedora ELN configs -- introduce mock-filesystem subpackage (msuchy@redhat.com) - -* Thu Aug 06 2020 Pavel Raiskup 32.7-1 -- add branched Fedora 33 configs -- eol Fedora 30 -- tolerate a 1-minute baseurl outages in OpenSUSE configs -- fix site-defaults.cfg reference to docs -- change all openSUSE configs to use the download redirector (baseurl) - -* Wed Apr 01 2020 Pavel Raiskup 32.6-1 -- the site-defaults.cfg file moved from mock to mock-core-configs -- new option config_opts['isolation'], obsoletes 'use_nspawn' -- declare minimal version of mock, and set this to v2.2 as we use the new - 'isolation' config option now, and we provide site-defaults.cfg file -- specify amazonlinux bootstrap image, to fix --use-bootstrap-image -- allow to replace mock-core-configs by packages that 'Provides: mock-configs' -- rpmlint: remove macro in comment - -* Thu Mar 26 2020 Pavel Raiskup 32.5-1 -- Add Devel repo to CentOS 8 and CentOS Stream (ngompa13@gmail.com) -- Add PowerTools sources repo entry to CentOS 8 and CentOS Stream - (ngompa13@gmail.com) -- Fix openSUSE Leap 15.1 aarch64 update repo & package filters - (ngompa13@gmail.com) -- Add openSUSE Leap 15.2 (ngompa13@gmail.com) -- openSUSE Leap 15.0 is EOL (ngompa13@gmail.com) -- Add OpenMandriva Lx 4.1 (ngompa13@gmail.com) -- OpenMandriva Lx 4.0 is EOL (ngompa13@gmail.com) - -* Wed Mar 11 2020 Pavel Raiskup 32.4-1 -- disable package_state plugin for openmandriva 4.0/Cooker -- Mageia 6 is EOL -- opensuse: copy ssl ca bundle to correct path - -* Fri Feb 21 2020 Pavel Raiskup 32.3-2 -- bump version for lost git tag - -* Fri Feb 21 2020 Pavel Raiskup 32.3-1 -- put back the opensuse-leap-15.1-x86_64 config - -* Thu Feb 20 2020 Pavel Raiskup 32.2-1 -- use one template for branched fedoras -- templatize F31+ i386 -- use 'dnf.conf' in mageia, opensuse and openmandriva configs - -* Sat Feb 08 2020 Pavel Raiskup 32.1-1 -- centos-8 and centos-stream to use dnf.conf - -* Fri Feb 07 2020 Pavel Raiskup 32.0-2 -- solve yum.conf vs. dnf.conf inconsistency in config and code - -* Thu Feb 06 2020 Pavel Raiskup 32.0-1 -- add F32 configs and move rawhide to F33 -- make compatibility changes with mock 2.0 -- allow host overrides (build-time for now) -- use jinja for gpgkey= in rawhide template -- add rhel-{7,8}-s390x configs -- drop rhel-8-ppc64, it was never supported -- fix rhel-7 configs -- update epel-8 config template to include modular repos as well as missing - non-modular source repo (mmathesi@redhat.com) -- drop for a long time useless epel-6-ppc64 config -- use template for opensuse, openmandriva, mageia, epel, custom ... -- fix epel-6.tpl config bug -- set default podman image for centos-stream -- remove aarch64 string from repo name in template [RHBZ#1780977] -- EOL F29 configs -- fix rhelepel configs -- allow including configs and templates from relative path (frostyx@email.cz) -- configs: drop cost=2000 from fedora-31+-i386 -- add missing metadata_expire=0 to epel configs -- change default of 'package_manager' to 'dnf', and use 'dnf.conf' -- remove rhelbeta-8-* - -* Fri Nov 01 2019 Miroslav Suchý 31.7-1 -- Add configs for epel8-playground (mmathesi@redhat.com) -- add 3 base packages to epel-playground buildroot [RHBZ#1764445] -- add 3 base packages to epel buildroot [RHBZ#1764445] - -* Fri Oct 04 2019 Miroslav Suchý 31.6-1 -- disable modular repo for f29 -- configure podman containers for Fedora, EPEL and Mageia (frostyx@email.cz) -- Fix baseurl typo in centos-stream config (dollierp@redhat.com) - -* Thu Sep 26 2019 Miroslav Suchý 31.5-1 -- expand contentdir for now -- expand $stream for now -- add extra_chroot_dirs to centos8 -- use dnf for centos8 -- add centos-stream-8 -- rhelepel: reuse epel-8.tpl (praiskup@redhat.com) -- Add Amazon Linux 2 configs (haroldji@amazon.com) -- centos-8: enable PowerTools repo (praiskup@redhat.com) - -* Tue Sep 24 2019 Miroslav Suchý 31.4-1 -- provide explanation why modular repos are disabled -- add epel-8 -- Changing cfg files for fedora rawhide to use tpl file - (sisi.chlupova@gmail.com) -- Changing cfg files for fedora 31 to use tpl file (sisi.chlupova@gmail.com) -- Changing cfg files for fedora 29 to use tpl file (sisi.chlupova@gmail.com) - -* Sat Sep 14 2019 Miroslav Suchý 31.3-1 -- mock-core-configs: installroot fix for fedora 31+ i386 (praiskup@redhat.com) -- Moving templates into templates dir (sisi.chlupova@gmail.com) -- Changing cfg files for fedora 30 to use tpl file (sisi.chlupova@gmail.com) -- Moving fedora-30-x86_64.cfg into templates/fedora-30.tpl - (sisi.chlupova@gmail.com) -- baseurl for f30-build was changed (sisi.chlupova@gmail.com) -- no i686 repositories [GH#325] -- adds equation sign to --disablerepo (thrnciar@reedhat.com) - -* Mon Aug 26 2019 Miroslav Suchý 31.2-1 -- revert sysusers setting [RHBZ#1740545] -- add rhelepel-8 configs (praiskup@redhat.com) -- add RHEL 7/8 (praiskup@redhat.com) - -* Mon Aug 19 2019 Miroslav Suchý 31.1-1 -- add fedora 31 configs and rawhide is now 32 -- Add local-source repo definition to Fedora Rawhide (miro@hroncok.cz) - -* Mon Aug 19 2019 Miroslav Suchý -- add fedora 31 configs and rawhide is now 32 -- Add local-source repo definition to Fedora Rawhide (miro@hroncok.cz) - -* Thu Aug 08 2019 Miroslav Suchý 30.5-1 -- disable updates-modulare repos for now -- buildrequire systemd-srpm-macros to get _sysusersdir -- removed info about metadata expire (khoidinhtrinh@gmail.com) -- added updates-modular to 29 and 30 (khoidinhtrinh@gmail.com) -- replace groupadd using sysusers.d -- core-configs: epel-7 profiles to use mirrorlists (praiskup@redhat.com) -- EOL Fedora 28 -- do not protect packages in chroot [GH#286] -- Fix value for dist for OpenMandriva 4.0 configs (ngompa13@gmail.com) -- Add initial OpenMandriva distribution targets (ngompa13@gmail.com) - -* Thu Jun 06 2019 Miroslav Suchý 30.4-1 -- Add 'fastestmirror=1' to Mageia mock configs (ngompa13@gmail.com) -- bootstrap: disable sclo* repos for epel --installroot (praiskup@redhat.com) -- drop Fedora ppc64 configs [RHBZ#1714489] - -* Thu May 16 2019 Miroslav Suchý 30.3-1 -- Allow AArch64 systems to build 32-bit ARM packages (ngompa13@gmail.com) -- Fix openSUSE Tumbleweed DistTag definition (ngompa13@gmail.com) - -* Fri Mar 01 2019 Miroslav Suchý 30.2-1 -- disable modular repos -- Add openSUSE Leap AArch64 configs (ngompa13@gmail.com) -- Add openSUSE Leap 15.1 configuration (ngompa13@gmail.com) -- Bump releasever in Cauldron to 8 and create symlinks to cauldron configs - (ngompa13@gmail.com) -- Add Mageia 7 configs (ngompa13@gmail.com) - -* Tue Feb 19 2019 Miroslav Suchý 30.1-1 -- default for config['decompress_program'] (praiskup@redhat.com) -- require recent distribution-gpg-keys which has F31 key -- add examples how to enable/install module in F29+ configs -- add module_platform_id -- add modular repos -- enable gpgcheck for debuginfo for rawhide -- enable gpgcheck for testing and debuginfo for F30 -- EOL Fedora 27 configs -- remove mdpolicy from F30 -- add Fedora 30 configs -- add link to distribution-gpg-keys for rhel8 bootstrap - -* Fri Nov 16 2018 Miroslav Suchý 29.4-1 -- use correct gpg keys for rhelbeta-8 -- add virtual platform module - -* Thu Nov 15 2018 Miroslav Suchý 29.3-1 -- add rhelbeta-8-* configs -- move EOLed configs to /etc/mock/eol directory -- Add source repos to all fedora configs (sfowler@redhat.com) -- add epel-7-ppc64.cfg - -* Thu Aug 16 2018 Miroslav Suchý 29.2-1 -- add gpg keys for release rawhide-1 (msuchy@redhat.com) - -* Mon Aug 13 2018 Miroslav Suchý 29.1-1 -- add fedora 29 configs and change rawhide to F30 -- defattr is not needed since rpm 4.2 -- Replace armv5tl with aarch64 for Mageia Cauldron (ngompa13@gmail.com) -- check gpg keys for rawhide - -* Wed May 02 2018 Miroslav Suchý 28.4-1 -- requires distribution-gpg-keys with opensuse keys -- Add initial openSUSE distribution targets (ngompa13@gmail.com) -- provide fedora-29 configs as symlinks to fedora-rawhide -- use cp instead of install to preserve symlinks -- use correct url for local repos for s390x for F27+ [RHBZ#1553678] -- add CentOS SCL repositories to EPEL 7 (aarch64 & ppc64le) - (tmz@pobox.com) - -* Thu Mar 01 2018 Miroslav Suchý 28.3-1 -- bump up releasever in rawhide configs -- add CentOS SCL repositories to EPEL 6 & 7 (x86_64) - (tmz@pobox.com) - -* Mon Jan 22 2018 Miroslav Suchý 28.2-1 -- fix wrong RHEL condition - -* Mon Jan 22 2018 Miroslav Suchý 28.1-1 -- bump up version to 28.1 - -* Mon Jan 22 2018 Miroslav Suchý 27.5-1 -- add fedora 28 configs -- remove failovermethod=priority for repos which use dnf -- remove fedora 24 configs -- set skip_if_unavailable=False for all repos - -* Mon Oct 09 2017 Miroslav Suchý 27.4-1 -- Fix mock & mock-core-config specs to support Mageia (ngompa13@gmail.com) -- Ensure mock-core-configs will select the right default on Mageia - (ngompa13@gmail.com) - -* Wed Sep 27 2017 Miroslav Suchý 27.3-1 -- use primary key for F-27+ on s390x (dan@danny.cz) - -* Tue Sep 12 2017 Miroslav Suchý 27.2-1 -- add source url -- grammar fix - -* Thu Sep 07 2017 Miroslav Suchý 27.1-1 -- Split from Mock package. - - diff --git a/ultramarine/mock-core-configs/mock-core-configs.spec.rpmlintrc b/ultramarine/mock-core-configs/mock-core-configs.spec.rpmlintrc deleted file mode 100644 index 03bf4b0..0000000 --- a/ultramarine/mock-core-configs/mock-core-configs.spec.rpmlintrc +++ /dev/null @@ -1,6 +0,0 @@ -addFilter(r'macro-in-comment %{name}') -addFilter(r'macro-in-comment %{version}') -addFilter(r'specfile-error warning: Macro expanded in comment on line [0-9]*: %{name}-%{version}') - -# SPELLING ERRORS -addFilter(r'spelling-error .* en_US (chroots|Config|chroot) ') diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 7fbbe2d..3519662 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -1,7 +1,7 @@ %global is_rawhide 0 %global release_name tortuga -%define dist_version 38 +%define dist_version 39 %if %{is_rawhide} %define bug_version rawhide @@ -16,7 +16,7 @@ Summary: Ultramarine Linux release files Name: ultramarine-release -Version: 38 +Version: 39 Release: 6%?dist License: MIT Source0: LICENSE @@ -202,9 +202,9 @@ EOF install -d $RPM_BUILD_ROOT/etc/upstream-release cat << EOF >>$RPM_BUILD_ROOT/etc/upstream-release/lsb-release ID=Fedora -VERSION_ID=38 -VERSION_CODENAME="Thirty Eight" -PRETTY_NAME="Fedora Linux 38 (Thirty Eight)" +VERSION_ID=39 +VERSION_CODENAME="Thirty Nine" +PRETTY_NAME="Fedora Linux 39 (Thirty Nine)" EOF # Create custom Anaconda config diff --git a/ultramarine/repos/repos.spec b/ultramarine/repos/repos.spec index c72f0cf..9cfcc59 100644 --- a/ultramarine/repos/repos.spec +++ b/ultramarine/repos/repos.spec @@ -1,5 +1,5 @@ %global _disable_source_fetch 0 -%global _dist_version 38 +%global _dist_version 39 Name: ultramarine-repos Version: %{_dist_version} diff --git a/ultramarine/ultramarine-mock-configs/ultramarine-38-aarch64.cfg b/ultramarine/ultramarine-mock-configs/ultramarine-38-aarch64.cfg index 457a152..4a9168f 100644 --- a/ultramarine/ultramarine-mock-configs/ultramarine-38-aarch64.cfg +++ b/ultramarine/ultramarine-mock-configs/ultramarine-38-aarch64.cfg @@ -1,4 +1,4 @@ -config_opts['releasever'] = '38' +config_opts['releasever'] = '39' config_opts['target_arch'] = 'aarch64' config_opts['legal_host_arches'] = ('aarch64',) diff --git a/ultramarine/ultramarine-mock-configs/ultramarine-38-x86_64.cfg b/ultramarine/ultramarine-mock-configs/ultramarine-38-x86_64.cfg index 4c6729c..cb26df9 100644 --- a/ultramarine/ultramarine-mock-configs/ultramarine-38-x86_64.cfg +++ b/ultramarine/ultramarine-mock-configs/ultramarine-38-x86_64.cfg @@ -1,4 +1,4 @@ -config_opts['releasever'] = '38' +config_opts['releasever'] = '39' config_opts['target_arch'] = 'x86_64' config_opts['legal_host_arches'] = ('x86_64',) diff --git a/ultramarine/ultramarine-mock-configs/ultramarine-39-aarch64.cfg b/ultramarine/ultramarine-mock-configs/ultramarine-39-aarch64.cfg new file mode 100644 index 0000000..4a9168f --- /dev/null +++ b/ultramarine/ultramarine-mock-configs/ultramarine-39-aarch64.cfg @@ -0,0 +1,5 @@ +config_opts['releasever'] = '39' +config_opts['target_arch'] = 'aarch64' +config_opts['legal_host_arches'] = ('aarch64',) + +include('templates/ultramarine.tpl') diff --git a/ultramarine/ultramarine-mock-configs/ultramarine-39-x86_64.cfg b/ultramarine/ultramarine-mock-configs/ultramarine-39-x86_64.cfg new file mode 100644 index 0000000..cb26df9 --- /dev/null +++ b/ultramarine/ultramarine-mock-configs/ultramarine-39-x86_64.cfg @@ -0,0 +1,5 @@ +config_opts['releasever'] = '39' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) + +include('templates/ultramarine.tpl') diff --git a/ultramarine/ultramarine-mock-configs/ultramarine-mock-configs.spec b/ultramarine/ultramarine-mock-configs/ultramarine-mock-configs.spec index dbbec9e..4397549 100644 --- a/ultramarine/ultramarine-mock-configs/ultramarine-mock-configs.spec +++ b/ultramarine/ultramarine-mock-configs/ultramarine-mock-configs.spec @@ -1,6 +1,6 @@ Name: ultramarine-mock-configs Version: 1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Ultramarine Linux mock configs License: MIT @@ -13,6 +13,8 @@ Source5: ultramarine-37-x86_64.cfg Source6: ultramarine-37-aarch64.cfg Source7: ultramarine-38-x86_64.cfg Source8: ultramarine-38-aarch64.cfg +Source9: ultramarine-39-x86_64.cfg +Source10: ultramarine-39-aarch64.cfg BuildArch: noarch %description @@ -33,6 +35,8 @@ cp -v %{SOURCE5} %{buildroot}/etc/mock/ cp -v %{SOURCE6} %{buildroot}/etc/mock/ cp -v %{SOURCE7} %{buildroot}/etc/mock/ cp -v %{SOURCE8} %{buildroot}/etc/mock/ +cp -v %{SOURCE9} %{buildroot}/etc/mock/ +cp -v %{SOURCE10} %{buildroot}/etc/mock/ %files From 54c54328520fa1fb0813c418318dbfc32f780820 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 17 Aug 2023 10:55:31 +0800 Subject: [PATCH 2/2] fix(ci/autobuild): workflow_call --- .github/workflows/autobuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index cbe8ebd..be9162b 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -10,6 +10,7 @@ on: - main - um39 workflow_dispatch: + workflow_call: jobs: manifest: