Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
baab14ab3f
GPG Key ID:
8B7F1DA0E2C9FDBB
14
.gitignore
vendored
14
.gitignore
vendored
@ -1,13 +1 @@
|
||||
/mock-core-configs-27.2.tar.gz
|
||||
/mock-core-configs-27.3.tar.gz
|
||||
/mock-core-configs-27.4.tar.gz
|
||||
/mock-core-configs-28.1.tar.gz
|
||||
/mock-core-configs-28.2.tar.gz
|
||||
/mock-core-configs-28.3.tar.gz
|
||||
/mock-core-configs-28.4.tar.gz
|
||||
/mock-core-configs-29.1.tar.gz
|
||||
/mock-core-configs-29.2.tar.gz
|
||||
/mock-core-configs-29.3.tar.gz
|
||||
/mock-core-configs-29.4.tar.gz
|
||||
/mock-core-configs-30.1.tar.gz
|
||||
/mock-core-configs-30.2.tar.gz
|
||||
/mock-core-configs-*.tar.gz
|
||||
|
||||
@ -1,41 +1,47 @@
|
||||
# mock group id allocate for Fedora
|
||||
%global mockgid 135
|
||||
|
||||
Name: mock-core-configs
|
||||
Version: 30.2
|
||||
Release: 1.0.riscv64%{?dist}
|
||||
Summary: Mock core config files basic chroots
|
||||
Name: mock-core-configs
|
||||
Version: 32.6
|
||||
Release: 1.0.riscv64%{?dist}
|
||||
Summary: Mock core config files basic chroots
|
||||
|
||||
License: GPLv2+
|
||||
URL: https://github.com/rpm-software-management/mock/
|
||||
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}
|
||||
# git reset --hard %%{name}-%%{version}
|
||||
# tito build --tgz
|
||||
Source: https://github.com/rpm-software-management/mock/releases/download/%{name}-%{version}-1/%{name}-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
Source: https://github.com/rpm-software-management/mock/releases/download/%{name}-%{version}-1/%{name}-%{version}.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
|
||||
|
||||
Patch0: mock-riscv64-rawhide.patch
|
||||
|
||||
# distribution-gpg-keys contains GPG keys used by mock configs
|
||||
Requires: distribution-gpg-keys >= 1.29
|
||||
Requires: distribution-gpg-keys >= 1.36
|
||||
# specify minimal compatible version of mock
|
||||
Requires: mock >= 2.2
|
||||
|
||||
Requires(pre): shadow-utils
|
||||
Requires(post): coreutils
|
||||
%if 0%{?fedora} || 0%{?mageia} || 0%{?rhel} > 7
|
||||
# to detect correct default.cfg
|
||||
Requires(post): python3-dnf
|
||||
Requires(post): python3-hawkey
|
||||
Requires(post): system-release
|
||||
Requires(post): python3
|
||||
Requires(post): sed
|
||||
Requires(post): python3-dnf
|
||||
Requires(post): python3-hawkey
|
||||
Requires(post): system-release
|
||||
Requires(post): python3
|
||||
Requires(post): sed
|
||||
%endif
|
||||
Requires(pre): shadow-utils
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
# to detect correct default.cfg
|
||||
Requires(post): python
|
||||
Requires(post): yum
|
||||
Requires(post): /etc/os-release
|
||||
Requires(post): python
|
||||
Requires(post): yum
|
||||
Requires(post): /etc/os-release
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -51,17 +57,37 @@ Config files which allow you to create chroots for:
|
||||
%patch0 -p1 -b .riscv64
|
||||
|
||||
%build
|
||||
# nothing to do here
|
||||
cd etc/host-overrides
|
||||
HOST=none
|
||||
%if 0%{?fedora}
|
||||
HOST="fedora-%{fedora}"
|
||||
%endif
|
||||
%if 0%{?rhel}
|
||||
HOST="rhel-%{rhel}"
|
||||
%endif
|
||||
|
||||
if [ -d "$HOST" ]; then
|
||||
pushd "$HOST"
|
||||
for i in *.cfg; do
|
||||
cat "$i" >> "../../mock/$i"
|
||||
done
|
||||
popd
|
||||
fi
|
||||
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/mock/eol
|
||||
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" \
|
||||
find %{buildroot}%{_sysconfdir}/mock -name "*.cfg" -o -name '*.tpl' \
|
||||
| sed -e "s|^%{buildroot}|%%config(noreplace) |" >> %{name}.cfgs
|
||||
# just for %%ghosting purposes
|
||||
ln -s fedora-rawhide-x86_64.cfg %{buildroot}%{_sysconfdir}/mock/default.cfg
|
||||
@ -73,6 +99,11 @@ 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}
|
||||
sed -i "s~@MOCK_DOCS@~$mock_docs~" %{buildroot}%{_sysconfdir}/mock/site-defaults.cfg
|
||||
|
||||
%pre
|
||||
# check for existence of mock group, create it if not found
|
||||
getent group mock > /dev/null || groupadd -f -g %mockgid -r mock
|
||||
@ -120,12 +151,150 @@ fi
|
||||
%license COPYING
|
||||
%dir %{_sysconfdir}/mock
|
||||
%dir %{_sysconfdir}/mock/eol
|
||||
%dir %{_sysconfdir}/mock/templates
|
||||
%ghost %config(noreplace,missingok) %{_sysconfdir}/mock/default.cfg
|
||||
|
||||
%changelog
|
||||
* Tue Apr 02 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> 30.2-1.0.riscv64
|
||||
* Fri Jul 24 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> 32.6-1.0.riscv64
|
||||
- Add fake fedora-rawhide-riscv64.cfg
|
||||
|
||||
* Wed Apr 01 2020 Pavel Raiskup <praiskup@redhat.com> 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 <praiskup@redhat.com> 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 <praiskup@redhat.com> 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 <praiskup@redhat.com> 32.3-2
|
||||
- bump version for lost git tag
|
||||
|
||||
* Fri Feb 21 2020 Pavel Raiskup <praiskup@redhat.com> 32.3-1
|
||||
- put back the opensuse-leap-15.1-x86_64 config
|
||||
|
||||
* Thu Feb 20 2020 Pavel Raiskup <praiskup@redhat.com> 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 <praiskup@redhat.com> 32.1-1
|
||||
- centos-8 and centos-stream to use dnf.conf
|
||||
|
||||
* Fri Feb 07 2020 Pavel Raiskup <praiskup@redhat.com> 32.0-2
|
||||
- solve yum.conf vs. dnf.conf inconsistency in config and code
|
||||
|
||||
* Thu Feb 06 2020 Pavel Raiskup <praiskup@redhat.com> 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ý <msuchy@redhat.com> 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ý <msuchy@redhat.com> 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ý <msuchy@redhat.com> 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ý <msuchy@redhat.com> 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ý <msuchy@redhat.com> 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ý <msuchy@redhat.com> 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ý <msuchy@redhat.com> 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ý <msuchy@redhat.com>
|
||||
- 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ý <msuchy@redhat.com> 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ý <msuchy@redhat.com> 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ý <msuchy@redhat.com> 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ý <msuchy@redhat.com> 30.2-1
|
||||
- disable modular repos
|
||||
- Add openSUSE Leap AArch64 configs (ngompa13@gmail.com)
|
||||
|
||||
6
mock-core-configs.spec.rpmlintrc
Normal file
6
mock-core-configs.spec.rpmlintrc
Normal file
@ -0,0 +1,6 @@
|
||||
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) ')
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (mock-core-configs-30.2.tar.gz) = 1247a80e4414a1ae61fcda0070e0e95ff6eb720bade17270dd0f5d9e271f004dd793099d8544f91d73aada6fb6e7ba6806becc60f70dd23ad02e181fa750bff0
|
||||
SHA512 (mock-core-configs-32.6.tar.gz) = 519c73e3f9d34d748a21cfba95324dfdc3ba920475bd0dc9e8dc3e02ed95b7ad8c9d804412a812349553add603f24cd845850679e753bf42a97bf861684c01a5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user