From e540047d7b0ba37c48bfea896721c3e5e83dffda Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 8 Aug 2022 10:50:11 +0200
Subject: memcached modules + cleanup

---
 el8x72.cfg |  7 +------
 el8x73.cfg |  7 +------
 el8x74.cfg |  7 +------
 el8x80.cfg |  7 +------
 el8x81.cfg |  7 +------
 el9am.cfg  | 17 +++++++++++++++++
 el9x74.cfg |  1 +
 el9x80.cfg |  1 +
 el9x81.cfg |  1 +
 el9xm.cfg  | 17 +++++++++++++++++
 fc36xm.cfg | 28 ++++++++++++++++++++++++++++
 11 files changed, 70 insertions(+), 30 deletions(-)
 create mode 100644 el9am.cfg
 create mode 100644 el9xm.cfg
 create mode 100644 fc36xm.cfg

diff --git a/el8x72.cfg b/el8x72.cfg
index b24c615..750430a 100644
--- a/el8x72.cfg
+++ b/el8x72.cfg
@@ -16,16 +16,11 @@ config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[remi-php72]
-name=remi php72
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/php72/x86_64/
-enabled=0
-metadata_expire=15
-
 [result-el8x72]
 name=result-el8x
 baseurl=file:/var/lib/mock/el8x72/
 metadata_expire=15
 enabled=1
+module_hotfixes=1
 
 """
diff --git a/el8x73.cfg b/el8x73.cfg
index 7965a50..015638a 100644
--- a/el8x73.cfg
+++ b/el8x73.cfg
@@ -16,16 +16,11 @@ config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[remi-php73]
-name=remi php73
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/php73/x86_64/
-enabled=0
-metadata_expire=15
-
 [result-el8x73]
 name=result-el8x
 baseurl=file:/var/lib/mock/el8x73/
 metadata_expire=15
 enabled=1
+module_hotfixes=1
 
 """
diff --git a/el8x74.cfg b/el8x74.cfg
index 2570d16..03b8ad4 100644
--- a/el8x74.cfg
+++ b/el8x74.cfg
@@ -17,16 +17,11 @@ config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[remi-php74]
-name=remi php74
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/php74/x86_64/
-enabled=0
-metadata_expire=15
-
 [result-el8x74]
 name=result-el8x
 baseurl=file:/var/lib/mock/el8x74/
 metadata_expire=15
 enabled=1
+module_hotfixes=1
 
 """
diff --git a/el8x80.cfg b/el8x80.cfg
index fede2e1..9fa94bf 100644
--- a/el8x80.cfg
+++ b/el8x80.cfg
@@ -17,16 +17,11 @@ config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[remi-php80]
-name=remi php80
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/php80/x86_64/
-enabled=0
-metadata_expire=15
-
 [result-el8x80]
 name=result-el8x
 baseurl=file:/var/lib/mock/el8x80/
 metadata_expire=15
 enabled=1
+module_hotfixes=1
 
 """
diff --git a/el8x81.cfg b/el8x81.cfg
index 4d16e1d..713d795 100644
--- a/el8x81.cfg
+++ b/el8x81.cfg
@@ -17,16 +17,11 @@ config_opts['macros']['%_module_context']="00000000"
 config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
 
 config_opts['yum.conf'] += """
-[remi-php81]
-name=remi php81
-baseurl=file:/home/rpmbuild/site/rpms/enterprise/8/php81/x86_64/
-enabled=0
-metadata_expire=15
-
 [result-el8x81]
 name=result-el8x
 baseurl=file:/var/lib/mock/el8x81/
 metadata_expire=15
 enabled=1
+module_hotfixes=1
 
 """
diff --git a/el9am.cfg b/el9am.cfg
new file mode 100644
index 0000000..71df272
--- /dev/null
+++ b/el9am.cfg
@@ -0,0 +1,17 @@
+import datetime;
+
+include('el9a.tpl')
+
+config_opts['root'] = 'el9a'
+config_opts['resultdir'] = "/var/lib/mock/el9a"
+
+# config_opts['module_enable']  = ['memcached:remi']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="memcached"
+config_opts['macros']['%_module_stream']="remi"
+config_opts['macros']['%_module_version']="90000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
diff --git a/el9x74.cfg b/el9x74.cfg
index 9f3b490..8e7e9fc 100644
--- a/el9x74.cfg
+++ b/el9x74.cfg
@@ -28,5 +28,6 @@ name=result-el9x
 baseurl=file:/var/lib/mock/el9x74/
 metadata_expire=15
 enabled=1
+module_hotfixes=1
 
 """
diff --git a/el9x80.cfg b/el9x80.cfg
index c908244..021765e 100644
--- a/el9x80.cfg
+++ b/el9x80.cfg
@@ -28,5 +28,6 @@ name=result-el9x
 baseurl=file:/var/lib/mock/el9x80/
 metadata_expire=15
 enabled=1
+module_hotfixes=1
 
 """
diff --git a/el9x81.cfg b/el9x81.cfg
index 93e30d3..70784e1 100644
--- a/el9x81.cfg
+++ b/el9x81.cfg
@@ -28,5 +28,6 @@ name=result-el9x
 baseurl=file:/var/lib/mock/el9x81/
 metadata_expire=15
 enabled=1
+module_hotfixes=1
 
 """
diff --git a/el9xm.cfg b/el9xm.cfg
new file mode 100644
index 0000000..587205f
--- /dev/null
+++ b/el9xm.cfg
@@ -0,0 +1,17 @@
+import datetime;
+
+include('el9x.tpl')
+
+config_opts['root'] = 'el9x'
+config_opts['resultdir'] = "/var/lib/mock/el9x"
+
+# config_opts['module_enable'] = ['memcached:remi']
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="memcached"
+config_opts['macros']['%_module_stream']="remi"
+config_opts['macros']['%_module_version']="90000" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
diff --git a/fc36xm.cfg b/fc36xm.cfg
new file mode 100644
index 0000000..a564f15
--- /dev/null
+++ b/fc36xm.cfg
@@ -0,0 +1,28 @@
+import datetime;
+
+include('fc36x.tpl')
+
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache php-devel php-pear'
+config_opts['root'] = 'fc36x'
+config_opts['resultdir'] = "/var/lib/mock/fc36x"
+
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="memcached"
+config_opts['macros']['%_module_stream']="remi"
+config_opts['macros']['%_module_version']="36" + nn;
+config_opts['macros']['%_module_context']="00000000"
+config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}"
+
+config_opts['yum.conf'] += """
+
+[result-fc36x]
+name=result-fc36x
+baseurl=file:/var/lib/mock/fc36x/
+enabled=1
+metadata_expire=1
+module_hotfixes=1
+priority=1
+
+"""
+
-- 
cgit