From 9b764da8f52d499035bdb0020091446a37f92836 Mon Sep 17 00:00:00 2001 From: bms8197 Date: Sat, 17 Jun 2023 19:40:56 +0300 Subject: [PATCH] committing changes in /etc made by "-bash" Package changes: --- .etckeeper | 48 ++++++++++++------------ mock/{ => eol}/fedora-35-aarch64.cfg | 0 mock/{ => eol}/fedora-35-armhfp.cfg | 0 mock/{ => eol}/fedora-35-i386.cfg | 0 mock/{ => eol}/fedora-35-ppc64le.cfg | 0 mock/{ => eol}/fedora-35-s390x.cfg | 0 mock/{ => eol}/fedora-35-x86_64.cfg | 0 mock/{ => eol}/fedora-36-aarch64.cfg | 0 mock/{ => eol}/fedora-36-armhfp.cfg | 0 mock/{ => eol}/fedora-36-i386.cfg | 0 mock/{ => eol}/fedora-36-ppc64le.cfg | 0 mock/{ => eol}/fedora-36-s390x.cfg | 0 mock/{ => eol}/fedora-36-x86_64.cfg | 0 mock/eol/templates/centos-6.tpl | 2 - mock/templates/centos-7.tpl | 2 - mock/templates/mageia-7.tpl | 1 - mock/templates/mageia-branched.tpl | 1 - mock/templates/mageia-cauldron.tpl | 1 - mock/templates/openeuler-20.03.tpl | 13 +++---- mock/templates/openeuler-22.03.tpl | 15 ++++---- mock/templates/openmandriva-branched.tpl | 1 - mock/templates/openmandriva-cooker.tpl | 1 - mock/templates/openmandriva-rolling.tpl | 1 - mock/templates/opensuse-leap-15.3.tpl | 1 - mock/templates/opensuse-leap-15.4.tpl | 1 - mock/templates/opensuse-tumbleweed.tpl | 6 ++- mock/templates/oraclelinux-7.tpl | 1 - 27 files changed, 41 insertions(+), 54 deletions(-) rename mock/{ => eol}/fedora-35-aarch64.cfg (100%) rename mock/{ => eol}/fedora-35-armhfp.cfg (100%) rename mock/{ => eol}/fedora-35-i386.cfg (100%) rename mock/{ => eol}/fedora-35-ppc64le.cfg (100%) rename mock/{ => eol}/fedora-35-s390x.cfg (100%) rename mock/{ => eol}/fedora-35-x86_64.cfg (100%) rename mock/{ => eol}/fedora-36-aarch64.cfg (100%) rename mock/{ => eol}/fedora-36-armhfp.cfg (100%) rename mock/{ => eol}/fedora-36-i386.cfg (100%) rename mock/{ => eol}/fedora-36-ppc64le.cfg (100%) rename mock/{ => eol}/fedora-36-s390x.cfg (100%) rename mock/{ => eol}/fedora-36-x86_64.cfg (100%) diff --git a/.etckeeper b/.etckeeper index 4939c66..444f591 100755 --- a/.etckeeper +++ b/.etckeeper @@ -3924,6 +3924,30 @@ maybe chgrp 'mock' 'mock/eol/fedora-34-s390x.cfg' maybe chmod 0644 'mock/eol/fedora-34-s390x.cfg' maybe chgrp 'mock' 'mock/eol/fedora-34-x86_64.cfg' maybe chmod 0644 'mock/eol/fedora-34-x86_64.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-35-aarch64.cfg' +maybe chmod 0644 'mock/eol/fedora-35-aarch64.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-35-armhfp.cfg' +maybe chmod 0644 'mock/eol/fedora-35-armhfp.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-35-i386.cfg' +maybe chmod 0644 'mock/eol/fedora-35-i386.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-35-ppc64le.cfg' +maybe chmod 0644 'mock/eol/fedora-35-ppc64le.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-35-s390x.cfg' +maybe chmod 0644 'mock/eol/fedora-35-s390x.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-35-x86_64.cfg' +maybe chmod 0644 'mock/eol/fedora-35-x86_64.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-36-aarch64.cfg' +maybe chmod 0644 'mock/eol/fedora-36-aarch64.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-36-armhfp.cfg' +maybe chmod 0644 'mock/eol/fedora-36-armhfp.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-36-i386.cfg' +maybe chmod 0644 'mock/eol/fedora-36-i386.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-36-ppc64le.cfg' +maybe chmod 0644 'mock/eol/fedora-36-ppc64le.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-36-s390x.cfg' +maybe chmod 0644 'mock/eol/fedora-36-s390x.cfg' +maybe chgrp 'mock' 'mock/eol/fedora-36-x86_64.cfg' +maybe chmod 0644 'mock/eol/fedora-36-x86_64.cfg' maybe chgrp 'mock' 'mock/eol/mageia-6-armv5tl.cfg' maybe chmod 0644 'mock/eol/mageia-6-armv5tl.cfg' maybe chgrp 'mock' 'mock/eol/mageia-6-armv7hl.cfg' @@ -3985,30 +4009,6 @@ maybe chgrp 'mock' 'mock/eurolinux-9-i686.cfg' maybe chmod 0644 'mock/eurolinux-9-i686.cfg' maybe chgrp 'mock' 'mock/eurolinux-9-x86_64.cfg' maybe chmod 0644 'mock/eurolinux-9-x86_64.cfg' -maybe chgrp 'mock' 'mock/fedora-35-aarch64.cfg' -maybe chmod 0644 'mock/fedora-35-aarch64.cfg' -maybe chgrp 'mock' 'mock/fedora-35-armhfp.cfg' -maybe chmod 0644 'mock/fedora-35-armhfp.cfg' -maybe chgrp 'mock' 'mock/fedora-35-i386.cfg' -maybe chmod 0644 'mock/fedora-35-i386.cfg' -maybe chgrp 'mock' 'mock/fedora-35-ppc64le.cfg' -maybe chmod 0644 'mock/fedora-35-ppc64le.cfg' -maybe chgrp 'mock' 'mock/fedora-35-s390x.cfg' -maybe chmod 0644 'mock/fedora-35-s390x.cfg' -maybe chgrp 'mock' 'mock/fedora-35-x86_64.cfg' -maybe chmod 0644 'mock/fedora-35-x86_64.cfg' -maybe chgrp 'mock' 'mock/fedora-36-aarch64.cfg' -maybe chmod 0644 'mock/fedora-36-aarch64.cfg' -maybe chgrp 'mock' 'mock/fedora-36-armhfp.cfg' -maybe chmod 0644 'mock/fedora-36-armhfp.cfg' -maybe chgrp 'mock' 'mock/fedora-36-i386.cfg' -maybe chmod 0644 'mock/fedora-36-i386.cfg' -maybe chgrp 'mock' 'mock/fedora-36-ppc64le.cfg' -maybe chmod 0644 'mock/fedora-36-ppc64le.cfg' -maybe chgrp 'mock' 'mock/fedora-36-s390x.cfg' -maybe chmod 0644 'mock/fedora-36-s390x.cfg' -maybe chgrp 'mock' 'mock/fedora-36-x86_64.cfg' -maybe chmod 0644 'mock/fedora-36-x86_64.cfg' maybe chgrp 'mock' 'mock/fedora-37-aarch64.cfg' maybe chmod 0644 'mock/fedora-37-aarch64.cfg' maybe chgrp 'mock' 'mock/fedora-37-i386.cfg' diff --git a/mock/fedora-35-aarch64.cfg b/mock/eol/fedora-35-aarch64.cfg similarity index 100% rename from mock/fedora-35-aarch64.cfg rename to mock/eol/fedora-35-aarch64.cfg diff --git a/mock/fedora-35-armhfp.cfg b/mock/eol/fedora-35-armhfp.cfg similarity index 100% rename from mock/fedora-35-armhfp.cfg rename to mock/eol/fedora-35-armhfp.cfg diff --git a/mock/fedora-35-i386.cfg b/mock/eol/fedora-35-i386.cfg similarity index 100% rename from mock/fedora-35-i386.cfg rename to mock/eol/fedora-35-i386.cfg diff --git a/mock/fedora-35-ppc64le.cfg b/mock/eol/fedora-35-ppc64le.cfg similarity index 100% rename from mock/fedora-35-ppc64le.cfg rename to mock/eol/fedora-35-ppc64le.cfg diff --git a/mock/fedora-35-s390x.cfg b/mock/eol/fedora-35-s390x.cfg similarity index 100% rename from mock/fedora-35-s390x.cfg rename to mock/eol/fedora-35-s390x.cfg diff --git a/mock/fedora-35-x86_64.cfg b/mock/eol/fedora-35-x86_64.cfg similarity index 100% rename from mock/fedora-35-x86_64.cfg rename to mock/eol/fedora-35-x86_64.cfg diff --git a/mock/fedora-36-aarch64.cfg b/mock/eol/fedora-36-aarch64.cfg similarity index 100% rename from mock/fedora-36-aarch64.cfg rename to mock/eol/fedora-36-aarch64.cfg diff --git a/mock/fedora-36-armhfp.cfg b/mock/eol/fedora-36-armhfp.cfg similarity index 100% rename from mock/fedora-36-armhfp.cfg rename to mock/eol/fedora-36-armhfp.cfg diff --git a/mock/fedora-36-i386.cfg b/mock/eol/fedora-36-i386.cfg similarity index 100% rename from mock/fedora-36-i386.cfg rename to mock/eol/fedora-36-i386.cfg diff --git a/mock/fedora-36-ppc64le.cfg b/mock/eol/fedora-36-ppc64le.cfg similarity index 100% rename from mock/fedora-36-ppc64le.cfg rename to mock/eol/fedora-36-ppc64le.cfg diff --git a/mock/fedora-36-s390x.cfg b/mock/eol/fedora-36-s390x.cfg similarity index 100% rename from mock/fedora-36-s390x.cfg rename to mock/eol/fedora-36-s390x.cfg diff --git a/mock/fedora-36-x86_64.cfg b/mock/eol/fedora-36-x86_64.cfg similarity index 100% rename from mock/fedora-36-x86_64.cfg rename to mock/eol/fedora-36-x86_64.cfg diff --git a/mock/eol/templates/centos-6.tpl b/mock/eol/templates/centos-6.tpl index 81b0f46..e9d4baa 100644 --- a/mock/eol/templates/centos-6.tpl +++ b/mock/eol/templates/centos-6.tpl @@ -78,7 +78,6 @@ name=CentOS-$releasever - SCLo sclo baseurl=https://vault.centos.org/6.10/sclo/$basearch/sclo/ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-SCLo gpgcheck=1 -includepkgs=devtoolset* skip_if_unavailable=False [centos-sclo-rh] @@ -86,7 +85,6 @@ name=CentOS-$releasever - SCLo rh baseurl=https://vault.centos.org/6.10/sclo/$basearch/rh/ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-SCLo gpgcheck=1 -includepkgs=devtoolset* skip_if_unavailable=False {% endif %} """ diff --git a/mock/templates/centos-7.tpl b/mock/templates/centos-7.tpl index a723e58..66880d1 100644 --- a/mock/templates/centos-7.tpl +++ b/mock/templates/centos-7.tpl @@ -85,7 +85,6 @@ name=CentOS-$releasever - SCLo sclo baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/sclo/ gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-SCLo gpgcheck=1 -includepkgs=devtoolset* skip_if_unavailable=False {% endif %} @@ -95,7 +94,6 @@ name=CentOS-$releasever - SCLo rh mirrorlist=http://mirrorlist.centos.org/?release=7&arch=$basearch&repo=sclo-rh gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-SCLo gpgcheck=1 -includepkgs=devtoolset* skip_if_unavailable=False {% endif %} """ diff --git a/mock/templates/mageia-7.tpl b/mock/templates/mageia-7.tpl index e7c1049..3a4d6f9 100644 --- a/mock/templates/mageia-7.tpl +++ b/mock/templates/mageia-7.tpl @@ -1,7 +1,6 @@ config_opts['chroot_setup_cmd'] = 'install basesystem-minimal rpm-build rpm-mageia-setup rpm-mageia-setup-build' config_opts['dist'] = 'mga7' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}' config_opts['releasever'] = '7' config_opts['macros']['%distro_section'] = 'core' config_opts['package_manager'] = 'dnf' diff --git a/mock/templates/mageia-branched.tpl b/mock/templates/mageia-branched.tpl index b165162..cde97c6 100644 --- a/mock/templates/mageia-branched.tpl +++ b/mock/templates/mageia-branched.tpl @@ -2,7 +2,6 @@ config_opts['root'] = 'mageia-{{ releasever }}-{{ target_arch }}' config_opts['chroot_setup_cmd'] = 'install basesystem-minimal-core rpm-build rpm-mageia-setup rpm-mageia-setup-build' config_opts['dist'] = 'mga{{ releasever }}' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}' config_opts['macros']['%distro_section'] = 'core' config_opts['package_manager'] = 'dnf' config_opts['bootstrap_image'] = 'docker.io/library/mageia:{{ releasever }}' diff --git a/mock/templates/mageia-cauldron.tpl b/mock/templates/mageia-cauldron.tpl index b969fcd..7f9f6f4 100644 --- a/mock/templates/mageia-cauldron.tpl +++ b/mock/templates/mageia-cauldron.tpl @@ -2,7 +2,6 @@ config_opts['root'] = 'mageia-cauldron-{{ target_arch }}' config_opts['chroot_setup_cmd'] = 'install basesystem-minimal-core rpm-build rpm-mageia-setup rpm-mageia-setup-build' config_opts['dist'] = 'cauldron' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}' config_opts['releasever'] = '9' config_opts['macros']['%distro_section'] = 'core' config_opts['package_manager'] = 'dnf' diff --git a/mock/templates/openeuler-20.03.tpl b/mock/templates/openeuler-20.03.tpl index a32cb0e..a5706b0 100644 --- a/mock/templates/openeuler-20.03.tpl +++ b/mock/templates/openeuler-20.03.tpl @@ -4,7 +4,6 @@ config_opts['releasever'] = '20.03-LTS' config_opts['package_manager'] = 'dnf' config_opts['description'] = 'openEuler 20.03 LTS' config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}' config_opts['bootstrap_image'] = 'docker.io/openeuler/openeuler:20.03-lts' config_opts['dnf.conf'] = """ @@ -29,42 +28,42 @@ user_agent={{ user_agent }} [OS] name=OS -baseurl=http://repo.openeuler.org/openEuler-20.03-LTS-SP3/OS/$basearch/ +metalink=https://mirrors.openeuler.org/metalink?repo=openEuler-20.03-LTS-SP3/OS&arch=$basearch enabled=1 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler [everything] name=everything -baseurl=http://repo.openeuler.org/openEuler-20.03-LTS-SP3/everything/$basearch/ +metalink=https://mirrors.openeuler.org/metalink?repo=openEuler-20.03-LTS-SP3/everything&arch=$basearch enabled=1 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler [EPOL] name=EPOL -baseurl=http://repo.openeuler.org/openEuler-20.03-LTS-SP3/EPOL/main/$basearch/ +metalink=https://mirrors.openeuler.org/metalink?repo=openEuler-20.03-LTS-SP3/EPOL/main&arch=$basearch enabled=1 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler [debuginfo] name=debuginfo -baseurl=http://repo.openeuler.org/openEuler-20.03-LTS-SP3/debuginfo/$basearch/ +metalink=https://mirrors.openeuler.org/metalink?repo=openEuler-20.03-LTS-SP3/debuginfo&arch=$basearch enabled=0 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler [source] name=source -baseurl=http://repo.openeuler.org/openEuler-20.03-LTS-SP3/source/ +metalink=https://mirrors.openeuler.org/metalink?path=openeuler/openEuler-20.03-LTS-SP3/source/repodata/repomd.xml enabled=0 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler [update] name=update -baseurl=http://repo.openeuler.org/openEuler-20.03-LTS-SP3/update/$basearch/ +metalink=https://mirrors.openeuler.org/metalink?repo=openEuler-20.03-LTS-SP3/update&arch=$basearch enabled=1 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler diff --git a/mock/templates/openeuler-22.03.tpl b/mock/templates/openeuler-22.03.tpl index e5fe93e..7724688 100644 --- a/mock/templates/openeuler-22.03.tpl +++ b/mock/templates/openeuler-22.03.tpl @@ -4,7 +4,6 @@ config_opts['releasever'] = '22.03' config_opts['package_manager'] = 'dnf' config_opts['description'] = 'openEuler 22.03' config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}' config_opts['bootstrap_image'] = 'docker.io/openeuler/openeuler:22.03-lts' config_opts['dnf.conf'] = """ @@ -32,49 +31,49 @@ user_agent={{ user_agent }} # all LTS-SPx is compatible with its LTS release [OS] name=OS -baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/OS/$basearch/ +metalink=https://mirrors.openeuler.org/metalink?repo=openEuler-22.03-LTS-SP1/OS&arch=$basearch enabled=1 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker [everything] name=everything -baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/everything/$basearch/ +metalink=https://mirrors.openeuler.org/metalink?repo=openEuler-22.03-LTS-SP1/everything&arch=$basearch enabled=1 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker [EPOL] name=EPOL -baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/EPOL/main/$basearch/ +metalink=https://mirrors.openeuler.org/metalink?repo=openEuler-22.03-LTS-SP1/EPOL/main&arch=$basearch enabled=1 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker [debuginfo] name=debuginfo -baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/debuginfo/$basearch/ +metalink=https://mirrors.openeuler.org/metalink?repo=openEuler-22.03-LTS-SP1/debuginfo&arch=$basearch enabled=0 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker [source] name=source -baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/source/ +metalink=https://mirrors.openeuler.org/metalink?path=openeuler/openEuler-22.03-LTS-SP1/source/repodata/repomd.xml enabled=0 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker [update] name=update -baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/update/$basearch/ +metalink=https://mirrors.openeuler.org/metalink?repo=openEuler-22.03-LTS-SP1/update&arch=$basearch enabled=1 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker [update-source] name=update-source -baseurl=http://repo.openeuler.org/openEuler-22.03-LTS-SP1/update/source/ +metalink=https://mirrors.openeuler.org/metalink?path=openeuler/openEuler-22.03-LTS-SP1/update/source/repodata/repomd.xml enabled=0 gpgcheck=1 gpgkey=file:///usr/share/distribution-gpg-keys/openeuler/RPM-GPG-KEY-openEuler-EulerMaker diff --git a/mock/templates/openmandriva-branched.tpl b/mock/templates/openmandriva-branched.tpl index 13fbc65..97030da 100644 --- a/mock/templates/openmandriva-branched.tpl +++ b/mock/templates/openmandriva-branched.tpl @@ -1,7 +1,6 @@ config_opts['root'] = 'openmandriva-{{ releasever }}-{{ target_arch }}' config_opts['chroot_setup_cmd'] = 'install basesystem-build' config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}' config_opts['macros']['%cross_compiling'] = '0' # Mock should generally be considered native builds config_opts['package_manager'] = 'dnf' config_opts['description'] = 'OpenMandriva {{ releasever }}' diff --git a/mock/templates/openmandriva-cooker.tpl b/mock/templates/openmandriva-cooker.tpl index d63ed30..7a5b4db 100644 --- a/mock/templates/openmandriva-cooker.tpl +++ b/mock/templates/openmandriva-cooker.tpl @@ -1,7 +1,6 @@ config_opts['chroot_setup_cmd'] = 'install basesystem-minimal rpm-build rpm-openmandriva-setup rpm-openmandriva-setup-build' config_opts['dist'] = 'cooker' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}' config_opts['releasever'] = '5.0' config_opts['macros']['%cross_compiling'] = '0' # Mock should generally be considered native builds config_opts['package_manager'] = 'dnf' diff --git a/mock/templates/openmandriva-rolling.tpl b/mock/templates/openmandriva-rolling.tpl index 15f5df3..e3a76d2 100644 --- a/mock/templates/openmandriva-rolling.tpl +++ b/mock/templates/openmandriva-rolling.tpl @@ -1,7 +1,6 @@ config_opts['chroot_setup_cmd'] = 'install basesystem-minimal rpm-build rpm-openmandriva-setup rpm-openmandriva-setup-build' config_opts['dist'] = 'rolling' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}' config_opts['releasever'] = '5.0' config_opts['macros']['%cross_compiling'] = '0' # Mock should generally be considered native builds config_opts['package_manager'] = 'dnf' diff --git a/mock/templates/opensuse-leap-15.3.tpl b/mock/templates/opensuse-leap-15.3.tpl index a775a71..730a628 100644 --- a/mock/templates/opensuse-leap-15.3.tpl +++ b/mock/templates/opensuse-leap-15.3.tpl @@ -1,7 +1,6 @@ config_opts['chroot_setup_cmd'] = 'install patterns-devel-base-devel_rpm_build' config_opts['dist'] = 'suse.lp153' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}' config_opts['releasever'] = '15.3' config_opts['macros']['%dist'] = '.suse.lp153' config_opts['package_manager'] = 'dnf' diff --git a/mock/templates/opensuse-leap-15.4.tpl b/mock/templates/opensuse-leap-15.4.tpl index 39d9a07..38da567 100644 --- a/mock/templates/opensuse-leap-15.4.tpl +++ b/mock/templates/opensuse-leap-15.4.tpl @@ -1,7 +1,6 @@ config_opts['chroot_setup_cmd'] = 'install patterns-devel-base-devel_rpm_build' config_opts['dist'] = 'suse.lp154' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}' config_opts['releasever'] = '15.4' config_opts['macros']['%dist'] = '.suse.lp154' config_opts['package_manager'] = 'dnf' diff --git a/mock/templates/opensuse-tumbleweed.tpl b/mock/templates/opensuse-tumbleweed.tpl index 86941cf..30a73d8 100644 --- a/mock/templates/opensuse-tumbleweed.tpl +++ b/mock/templates/opensuse-tumbleweed.tpl @@ -1,7 +1,6 @@ config_opts['chroot_setup_cmd'] = 'install patterns-devel-base-devel_rpm_build' config_opts['dist'] = 'tumbleweed' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['useradd'] = '/usr/sbin/useradd -o -m -u {{chrootuid}} -g {{chrootgid}} -d {{chroothome}} {{chrootuser}}' config_opts['releasever'] = '0' config_opts['macros']['%dist'] = '.suse.tw%(sh -c ". /etc/os-release; echo \$VERSION_ID")' config_opts['package_manager'] = 'dnf' @@ -48,7 +47,7 @@ user_agent={{ user_agent }} [opensuse-tumbleweed-oss] name=openSUSE Tumbleweed - {{ target_arch }} - OSS -{% if target_arch in ['x86_64', 'i586'] %} +{% if target_arch in ['x86_64'] %} baseurl=https://download.opensuse.org/tumbleweed/repo/oss/ #metalink=https://download.opensuse.org/tumbleweed/repo/oss/repodata/repomd.xml.metalink {% elif target_arch in ['ppc64le', 'ppc64'] %} @@ -57,6 +56,9 @@ baseurl=https://download.opensuse.org/ports/ppc/tumbleweed/repo/oss/ {% elif target_arch in ['aarch64'] %} baseurl=https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/ #metalink=https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml.metalink +{% elif target_arch in ['i586'] %} +baseurl=https://download.opensuse.org/ports/i586/tumbleweed/repo/oss/ +#metalink=https://download.opensuse.org/ports/i586/tumbleweed/repo/oss/repodata/repomd.xml.metalink {% elif target_arch in ['s390x'] %} baseurl=https://download.opensuse.org/ports/zsystems/tumbleweed/repo/oss/ #metalink=https://download.opensuse.org/ports/zsystems/tumbleweed/repo/oss/repodata/repomd.xml.metalink diff --git a/mock/templates/oraclelinux-7.tpl b/mock/templates/oraclelinux-7.tpl index da7266e..0db49a6 100644 --- a/mock/templates/oraclelinux-7.tpl +++ b/mock/templates/oraclelinux-7.tpl @@ -52,7 +52,6 @@ baseurl=https://yum.oracle.com/repo/OracleLinux/OL7/SoftwareCollections/$basearc gpgkey=file:///usr/share/distribution-gpg-keys/oraclelinux/RPM-GPG-KEY-oracle-ol7 gpgcheck=1 enabled=1 -includepkgs=devtoolset* skip_if_unavailable=False {% for uekver in range(3,7) %}