Fix the patch
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
parent
928890a514
commit
1d8dce145d
|
@ -4,7 +4,7 @@
|
|||
|
||||
Name: mock-core-configs
|
||||
Version: 40.3
|
||||
Release: 1.1.riscv64%{?dist}
|
||||
Release: 1.2.riscv64%{?dist}
|
||||
Summary: Mock core config files basic chroots
|
||||
|
||||
License: GPL-2.0-or-later
|
||||
|
@ -155,6 +155,10 @@ fi
|
|||
|
||||
%changelog
|
||||
* Fri Apr 26 2024 David Abdurachmanov <davidlt@rivosinc.com> 40.3-1.1.riscv64
|
||||
- Fix the patch
|
||||
|
||||
* Fri Apr 26 2024 David Abdurachmanov <davidlt@rivosinc.com> 40.3-1.1.riscv64
|
||||
- Apply the patch properly
|
||||
|
||||
* Fri Apr 26 2024 David Abdurachmanov <davidlt@rivosinc.com> 40.3-1.0.riscv64
|
||||
- Add configs for riscv64 (only F40 is working)
|
||||
|
|
|
@ -0,0 +1,133 @@
|
|||
diff --git a/etc/mock/fedora-38-riscv64.cfg b/etc/mock/fedora-38-riscv64.cfg
|
||||
new file mode 100644
|
||||
index 0000000..d939844
|
||||
--- /dev/null
|
||||
+++ b/etc/mock/fedora-38-riscv64.cfg
|
||||
@@ -0,0 +1,5 @@
|
||||
+config_opts['releasever'] = '38'
|
||||
+config_opts['target_arch'] = 'riscv64'
|
||||
+config_opts['legal_host_arches'] = ('riscv64',)
|
||||
+
|
||||
+include('templates/fedora-branched.tpl')
|
||||
diff --git a/etc/mock/fedora-39-riscv64.cfg b/etc/mock/fedora-39-riscv64.cfg
|
||||
new file mode 100644
|
||||
index 0000000..b996fbe
|
||||
--- /dev/null
|
||||
+++ b/etc/mock/fedora-39-riscv64.cfg
|
||||
@@ -0,0 +1,5 @@
|
||||
+config_opts['releasever'] = '39'
|
||||
+config_opts['target_arch'] = 'riscv64'
|
||||
+config_opts['legal_host_arches'] = ('riscv64',)
|
||||
+
|
||||
+include('templates/fedora-branched.tpl')
|
||||
diff --git a/etc/mock/fedora-40-riscv64.cfg b/etc/mock/fedora-40-riscv64.cfg
|
||||
new file mode 100644
|
||||
index 0000000..ae8dac1
|
||||
--- /dev/null
|
||||
+++ b/etc/mock/fedora-40-riscv64.cfg
|
||||
@@ -0,0 +1,74 @@
|
||||
+config_opts['releasever'] = '40'
|
||||
+config_opts['target_arch'] = 'riscv64'
|
||||
+config_opts['legal_host_arches'] = ('riscv64',)
|
||||
+
|
||||
+config_opts['root'] = 'fedora-{{ releasever }}-{{ target_arch }}'
|
||||
+
|
||||
+config_opts['description'] = 'Fedora {{ releasever }}'
|
||||
+# Pull directly from Koji working repositories
|
||||
+config_opts['koji_direct'] = False
|
||||
+
|
||||
+config_opts['chroot_setup_cmd'] = 'install @{% if not koji_direct %}buildsys-{% endif %}build'
|
||||
+
|
||||
+config_opts['dist'] = 'fc{{ releasever }}' # only useful for --resultdir variable subst
|
||||
+config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
|
||||
+
|
||||
+# https://fedoraproject.org/wiki/Changes/BuildWithDNF5 for Fedora 40+
|
||||
+config_opts['package_manager'] = '{% if releasever|int >= 40 %}dnf5{% else %}dnf{% endif %}'
|
||||
+
|
||||
+# Disabled, until Fedora 40 (riscv64) container image is generated
|
||||
+config_opts['use_bootstrap'] = False
|
||||
+#config_opts['bootstrap_image'] = 'fedora.riscv.rocks:3000/davidlt/fedora:{{ releasever }}'
|
||||
+#config_opts['bootstrap_image'] = 'fedora.riscv.rocks:3000/davidlt/fedora:38'
|
||||
+
|
||||
+config_opts['dnf.conf'] = """
|
||||
+[main]
|
||||
+keepcache=1
|
||||
+system_cachedir=/var/cache/dnf
|
||||
+debuglevel=2
|
||||
+reposdir=/dev/null
|
||||
+logfile=/var/log/yum.log
|
||||
+retries=20
|
||||
+obsoletes=1
|
||||
+gpgcheck=0
|
||||
+assumeyes=1
|
||||
+syslog_ident=mock
|
||||
+syslog_device=
|
||||
+install_weak_deps=0
|
||||
+metadata_expire=0
|
||||
+best=1
|
||||
+module_platform_id=platform:f{{ releasever }}
|
||||
+protected_packages=
|
||||
+user_agent={{ user_agent }}
|
||||
+
|
||||
+# repos
|
||||
+
|
||||
+[local]
|
||||
+name=local
|
||||
+baseurl=http://fedora.riscv.rocks/repos/f{{ releasever }}-build/latest/$basearch/
|
||||
+cost=2000
|
||||
+enabled={{ koji_direct }}
|
||||
+skip_if_unavailable=False
|
||||
+
|
||||
+{% if not koji_direct %}
|
||||
+[fedora]
|
||||
+name=fedora
|
||||
+baseurl=http://fedora.riscv.rocks/repos-dist/f{{ releasever }}/latest/$basearch/
|
||||
+gpgcheck=0
|
||||
+skip_if_unavailable=False
|
||||
+
|
||||
+[fedora-debuginfo]
|
||||
+name=fedora-debuginfo
|
||||
+baseurl=http://fedora.riscv.rocks/repos-dist/f{{ releasever }}/latest/$basearch/debug/
|
||||
+enabled=0
|
||||
+gpgcheck=0
|
||||
+skip_if_unavailable=False
|
||||
+
|
||||
+[fedora-source]
|
||||
+name=fedora-source
|
||||
+baseurl=http://fedora.riscv.rocks/repos-dist/f{{ releasever }}/latest/src/
|
||||
+gpgcheck=0
|
||||
+enabled=0
|
||||
+skip_if_unavailable=False
|
||||
+{% endif %}
|
||||
+"""
|
||||
diff --git a/etc/mock/fedora-41-riscv64.cfg b/etc/mock/fedora-41-riscv64.cfg
|
||||
new file mode 100644
|
||||
index 0000000..65beeab
|
||||
--- /dev/null
|
||||
+++ b/etc/mock/fedora-41-riscv64.cfg
|
||||
@@ -0,0 +1,4 @@
|
||||
+config_opts['target_arch'] = 'riscv64'
|
||||
+config_opts['legal_host_arches'] = ('riscv64',)
|
||||
+
|
||||
+include('templates/fedora-rawhide.tpl')
|
||||
diff --git a/etc/mock/fedora-eln-riscv64.cfg b/etc/mock/fedora-eln-riscv64.cfg
|
||||
new file mode 100644
|
||||
index 0000000..3cf209c
|
||||
--- /dev/null
|
||||
+++ b/etc/mock/fedora-eln-riscv64.cfg
|
||||
@@ -0,0 +1,5 @@
|
||||
+config_opts['target_arch'] = 'riscv64'
|
||||
+config_opts['legal_host_arches'] = ('riscv64',)
|
||||
+
|
||||
+include('templates/fedora-eln.tpl')
|
||||
+config_opts['description'] = 'Fedora ELN'
|
||||
diff --git a/etc/mock/fedora-rawhide-riscv64.cfg b/etc/mock/fedora-rawhide-riscv64.cfg
|
||||
new file mode 100644
|
||||
index 0000000..65beeab
|
||||
--- /dev/null
|
||||
+++ b/etc/mock/fedora-rawhide-riscv64.cfg
|
||||
@@ -0,0 +1,4 @@
|
||||
+config_opts['target_arch'] = 'riscv64'
|
||||
+config_opts['legal_host_arches'] = ('riscv64',)
|
||||
+
|
||||
+include('templates/fedora-rawhide.tpl')
|
Loading…
Reference in New Issue