From 9da86fa53880a50bfd04faec61fc11072ad62f59 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Sat, 16 Mar 2024 10:45:12 -0700 Subject: [PATCH] change lorax-templates-rhel and remove genisoimage --- iso/empanadas/empanadas/configs/el10.yaml | 3 +- iso/empanadas/empanadas/configs/el10lh.yaml | 3 +- iso/empanadas/empanadas/configs/el8-beta.yaml | 2 +- iso/empanadas/empanadas/configs/el8.yaml | 2 +- iso/empanadas/empanadas/configs/el8lh.yaml | 2 +- iso/empanadas/empanadas/configs/el9-beta.yaml | 2 +- iso/empanadas/empanadas/configs/el9.yaml | 2 +- iso/empanadas/empanadas/configs/el9lh.yaml | 2 +- iso/empanadas/empanadas/configs/rln.yaml | 2 +- mangle/mock/rl10/rl10-x86_64.cfg | 79 +++++++++++++++++++ 10 files changed, 88 insertions(+), 11 deletions(-) create mode 100644 mangle/mock/rl10/rl10-x86_64.cfg diff --git a/iso/empanadas/empanadas/configs/el10.yaml b/iso/empanadas/empanadas/configs/el10.yaml index e0a214d..0aa493c 100644 --- a/iso/empanadas/empanadas/configs/el10.yaml +++ b/iso/empanadas/empanadas/configs/el10.yaml @@ -73,9 +73,8 @@ - 'libreport-rhel-anaconda-bugzilla' required_pkgs: - 'lorax' - - 'genisoimage' - 'isomd5sum' - - 'lorax-templates-rhel' + - 'lorax-templates-rocky' - 'lorax-templates-generic' - 'xorriso' cloudimages: diff --git a/iso/empanadas/empanadas/configs/el10lh.yaml b/iso/empanadas/empanadas/configs/el10lh.yaml index cc06638..082a2da 100644 --- a/iso/empanadas/empanadas/configs/el10lh.yaml +++ b/iso/empanadas/empanadas/configs/el10lh.yaml @@ -73,9 +73,8 @@ - 'libreport-rhel-anaconda-bugzilla' required_pkgs: - 'lorax' - - 'genisoimage' - 'isomd5sum' - - 'lorax-templates-rhel' + - 'lorax-templates-rocky' - 'lorax-templates-generic' - 'xorriso' cloudimages: diff --git a/iso/empanadas/empanadas/configs/el8-beta.yaml b/iso/empanadas/empanadas/configs/el8-beta.yaml index 17226ce..0469d60 100644 --- a/iso/empanadas/empanadas/configs/el8-beta.yaml +++ b/iso/empanadas/empanadas/configs/el8-beta.yaml @@ -70,7 +70,7 @@ - 'lorax' - 'genisoimage' - 'isomd5sum' - - 'lorax-templates-rhel' + - 'lorax-templates-rocky' - 'lorax-templates-generic' - 'xorriso' cloudimages: diff --git a/iso/empanadas/empanadas/configs/el8.yaml b/iso/empanadas/empanadas/configs/el8.yaml index c7a3502..503a06c 100644 --- a/iso/empanadas/empanadas/configs/el8.yaml +++ b/iso/empanadas/empanadas/configs/el8.yaml @@ -70,7 +70,7 @@ - 'lorax' - 'genisoimage' - 'isomd5sum' - - 'lorax-templates-rhel' + - 'lorax-templates-rocky' - 'lorax-templates-generic' - 'xorriso' cloudimages: diff --git a/iso/empanadas/empanadas/configs/el8lh.yaml b/iso/empanadas/empanadas/configs/el8lh.yaml index 984ef23..6bbd1eb 100644 --- a/iso/empanadas/empanadas/configs/el8lh.yaml +++ b/iso/empanadas/empanadas/configs/el8lh.yaml @@ -70,7 +70,7 @@ - 'lorax' - 'genisoimage' - 'isomd5sum' - - 'lorax-templates-rhel' + - 'lorax-templates-rocky' - 'lorax-templates-generic' - 'xorriso' cloudimages: diff --git a/iso/empanadas/empanadas/configs/el9-beta.yaml b/iso/empanadas/empanadas/configs/el9-beta.yaml index cd7c830..a570058 100644 --- a/iso/empanadas/empanadas/configs/el9-beta.yaml +++ b/iso/empanadas/empanadas/configs/el9-beta.yaml @@ -74,7 +74,7 @@ - 'lorax' - 'genisoimage' - 'isomd5sum' - - 'lorax-templates-rhel' + - 'lorax-templates-rocky' - 'lorax-templates-generic' - 'xorriso' cloudimages: diff --git a/iso/empanadas/empanadas/configs/el9.yaml b/iso/empanadas/empanadas/configs/el9.yaml index 245df62..68718c6 100644 --- a/iso/empanadas/empanadas/configs/el9.yaml +++ b/iso/empanadas/empanadas/configs/el9.yaml @@ -74,7 +74,7 @@ - 'lorax' - 'genisoimage' - 'isomd5sum' - - 'lorax-templates-rhel' + - 'lorax-templates-rocky' - 'lorax-templates-generic' - 'xorriso' cloudimages: diff --git a/iso/empanadas/empanadas/configs/el9lh.yaml b/iso/empanadas/empanadas/configs/el9lh.yaml index c7dad67..fbde45a 100644 --- a/iso/empanadas/empanadas/configs/el9lh.yaml +++ b/iso/empanadas/empanadas/configs/el9lh.yaml @@ -74,7 +74,7 @@ - 'lorax' - 'genisoimage' - 'isomd5sum' - - 'lorax-templates-rhel' + - 'lorax-templates-rocky' - 'lorax-templates-generic' - 'xorriso' cloudimages: diff --git a/iso/empanadas/empanadas/configs/rln.yaml b/iso/empanadas/empanadas/configs/rln.yaml index 08efc78..04c6cb1 100644 --- a/iso/empanadas/empanadas/configs/rln.yaml +++ b/iso/empanadas/empanadas/configs/rln.yaml @@ -75,7 +75,7 @@ - 'lorax' - 'genisoimage' - 'isomd5sum' - - 'lorax-templates-rhel' + - 'lorax-templates-rocky' - 'lorax-templates-generic' - 'xorriso' cloudimages: diff --git a/mangle/mock/rl10/rl10-x86_64.cfg b/mangle/mock/rl10/rl10-x86_64.cfg new file mode 100644 index 0000000..f76820f --- /dev/null +++ b/mangle/mock/rl10/rl10-x86_64.cfg @@ -0,0 +1,79 @@ +# Generated peridot mock config +config_opts['root'] = 'rocky-10-x86_64' +config_opts['target_arch'] = 'noarch' +config_opts['legal_host_arches'] = ['x86_64','noarch'] +config_opts['chroot_setup_cmd'] = 'install bash glibc-minimal-langpack gnupg2 rpm-build shadow-utils system-release redhat-rpm-config' +config_opts['dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}' +config_opts['releasever'] = '10' +config_opts['package_manager'] = 'dnf' +config_opts['extra_chroot_dirs'] = [ '/run/lock' ] +config_opts['rpmbuild_command'] = '/usr/bin/rpmbuild' +config_opts['use_bootstrap_image'] = False +config_opts['plugin_conf']['rpmautospec_enable'] = True +config_opts['plugin_conf']['rpmautospec_opts'] = { + 'requires': ['rpmautospec'], + 'cmd_base': ['/usr/bin/rpmautospec', 'process-distgit'], +} + + +config_opts['plugin_conf']['ccache_enable'] = False +config_opts['plugin_conf']['root_cache_enable'] = False +config_opts['plugin_conf']['yum_cache_enable'] = False +config_opts['rpmbuild_networking'] = True +config_opts['use_host_resolv'] = True +config_opts['print_main_output'] = True + +config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' +config_opts['macros']['%_host'] = 'x86_64-redhat-linux-gnu' +config_opts['macros']['%_host_cpu'] = 'x86_64' +config_opts['macros']['%_vendor'] = "redhat" +config_opts['macros']['%_vendor_host'] = "redhat" + +config_opts['module_setup_commands'] = [] + +config_opts['macros']['%__bootstrap'] = '~bootstrap' +config_opts['macros']['%vendor'] = 'Rocky Enterprise Software Foundation' +config_opts['macros']['%packager'] = 'Rocky Linux Build System (Peridot) ' +config_opts['macros']['%distribution'] = 'Rocky Linux 10.0' +config_opts['macros']['%dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}' +config_opts['macros']['%rhel'] = '10' +config_opts['files']['usr/lib/rpm/macros.d/macros.dist'] = """ +%__bootstrap ~bootstrap +%vendor Rocky Enterprise Software Foundation +%packager Rocky Linux Build System (Peridot) +%distribution Rocky Linux 10.0 +%dist %{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap} +%rhel 10 + +""" + + +config_opts['dnf.conf'] = """ +[main] +debuglevel=1 +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +keepcache=1 +best=1 +syslog_ident=peridotbuilder +syslog_device= +metadata_expire=0 +install_weak_deps=0 +protected_packages= +reposdir=/dev/null +logfile=/var/log/yum.log +mdpolicy=group:primary +metadata_expire=0 +user_agent=peridotbuilder +module_platform_id=platform:el10 +[yumrepofs_0] +name=Peridot Internal - Yumrepofs 0 +baseurl=https://yumrepofs.build.resf.org/v1/projects/e7b83c0a-b514-4903-b739-6943bbb307f7/repo/all/$arch +gpgcheck=0 +enabled=1 +priority=0 +module_hotfixes=0 +skip_if_unavailable=1 +"""