From e620238f5025dc5507feb59270b22ca0baed20ef Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 24 Jul 2020 11:18:55 +0200
Subject: add modularitylabel for EL-8 builds

---
 el8x72.cfg | 10 ++++++++++
 el8x73.cfg | 10 ++++++++++
 el8x74.cfg | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/el8x72.cfg b/el8x72.cfg
index a5a78a0..c42f641 100644
--- a/el8x72.cfg
+++ b/el8x72.cfg
@@ -1,3 +1,5 @@
+import datetime;
+
 include('el8x.tpl')
 
 config_opts['root'] = 'el8x72'
@@ -5,6 +7,14 @@ config_opts['resultdir'] = "/var/lib/mock/el8x72"
 
 config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.2', 'redis:remi-5.0']
 
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-7.2"
+config_opts['macros']['%_module_version']="80200" + nn;
+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
diff --git a/el8x73.cfg b/el8x73.cfg
index ceb1007..6bc1599 100644
--- a/el8x73.cfg
+++ b/el8x73.cfg
@@ -1,3 +1,5 @@
+import datetime;
+
 include('el8x.tpl')
 
 config_opts['root'] = 'el8x73'
@@ -5,6 +7,14 @@ config_opts['resultdir'] = "/var/lib/mock/el8x73"
 
 config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.3', 'redis:remi-5.0']
 
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-7.3"
+config_opts['macros']['%_module_version']="80200" + nn;
+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
diff --git a/el8x74.cfg b/el8x74.cfg
index 9c6fb89..065807b 100644
--- a/el8x74.cfg
+++ b/el8x74.cfg
@@ -1,3 +1,5 @@
+import datetime;
+
 include('el8x.tpl')
 
 config_opts['root'] = 'el8x74'
@@ -5,6 +7,14 @@ config_opts['resultdir'] = "/var/lib/mock/el8x74"
 
 config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-7.4', 'redis:remi-5.0']
 
+nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S");
+config_opts['macros']['%_module_build']="1"
+config_opts['macros']['%_module_name']="php"
+config_opts['macros']['%_module_stream']="remi-7.4"
+config_opts['macros']['%_module_version']="80200" + nn;
+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
-- 
cgit