[OM Cooker] Inconsistency in versioning

Crispin Boylan cris at beebgames.com
Mon May 23 05:12:32 EDT 2016



On 22/05/16 22:25, Tomasz Paweł Gajc wrote:
> Dnia niedziela, 22 maja 2016 09:08:41 Crispin Boylan pisze:
>> why don't we just leave the distepoch tag as 2015.0, and stop us using
>> /etc/release as the source of distepoch (just hard code) in
>> OpenMandiva.macros.  Then /etc/release can be 3.0 in all places.
>>
> Cris this does not fully address the problem described by me.
>
>> we must remove all omv3.0 rpms though.
> +1
>
>
true but the disto-release patch below should sort out the mixture in 
the files without causing any issues i think.  I think we're stuck with 
using 2015.0 as the distepoch for now, but that's no big deal imho.

but what difference does the name of the github branch or the name of 
the repo directory make? (apart from consistency)

for the mirrors the software looks in:

http://downloads.openmandriva.org/mirrors/openmandriva.3.0.x86_64.list 
(with below patch and if we add the correct file).  which is ok isnt it? 
  i dont think anywhere actually constructs the url manually does it?

finally for new releases we should add lx3 to:

http://downloads.openmandriva.org/releases/basic.x86_64.list

if we add it as the first entry then the software will see that as the 
latest version, regardless of 3.0 < 2014.0 etc.



diff --git a/distro.py b/distro.py
index 5f3e56b..8e7ce3e 100644
--- a/distro.py
+++ b/distro.py
@@ -47,7 +47,7 @@ def 
release_install(distribution,product,Vendor,codename,disturl,bugurl,disttag,

       print(rpm.expandMacro("""
   cat > %{buildroot}%{_sysconfdir}/product.id."""+product+""" << EOF
-vendor="""+Vendor+""",distribution="""+distribution+""",type=%{product_type},version=%{distepoch},branch=%{product_branch},release=%{product_release},arch=%{product_arch},product="""+product+"""
+vendor="""+Vendor+""",distribution="""+distribution+""",type=%{product_type},version=%{version},branch=%{product_branch},release=%{product_release},arch=%{product_arch},product="""+product+"""
   EOF

   mkdir -p %{buildroot}%{_sys_macros_dir}
@@ -63,7 +63,7 @@ cat > 
%{buildroot}%{_sys_macros_dir}/"""+Vendor+""".macros << EOF
   %%mdvver            %%mdkver

   # productid variable
-%%product_id 
vendor="""+vendor+",distribution="+distribution+",type=%product_type,version=%{distepoch},branch=%{product_branch},release=%{product_release},arch=%{product_arch},product="+product+"""
+%%product_id 
vendor="""+vendor+",distribution="+distribution+",type=%product_type,version=%{version},branch=%{product_branch},release=%{product_release},arch=%{product_arch},product="+product+"""

   %%product_vendor        """+vendor+"""
   %%product_distribution  """+distribution+"""
@@ -80,6 +80,7 @@ cat > 
%{buildroot}%{_sys_macros_dir}/"""+Vendor+""".macros << EOF
   %%vendor               """+Vendor+"""
   %%_vendor              """+vendor+"""
   %%disttag              """+disttag+"""
+%%distepoch            %distepoch
   EOF

   mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
@@ -94,7 +95,7 @@ cat > 
%{buildroot}%{_sysconfdir}/"""+vendor+"""-release << EOF
   """+distribution+""" release %{version} """+codename+""" for 
%{_target_cpu}
   EOF
   cat > %{buildroot}%{_sysconfdir}/version."""+vendor+""" << EOF
-%{distepoch} %{release} """+codename+"""
+%{version} %{release} """+codename+"""
   EOF

   # (tpg) follow standard specifications 
http://www.freedesktop.org/software/systemd/man/os-release.html
@@ -102,7 +103,7 @@ cat > 
%{buildroot}%{_sysconfdir}/os-release."""+vendor+""" << EOF
   NAME=\""""+distribution+"""\"
   VERSION=\"%{version} """+codename+"""\"
   ID=\""""+vendor+"""\"
-VERSION_ID=\"%{distepoch}\"
+VERSION_ID=\"%{version}\"
   BUILD_ID=\"%(echo `date +"%Y%m%d.%H"`)\"
   PRETTY_NAME=\""""+distribution+""" %{version} """+codename+"""\"
   ANSI_COLOR=\""""+ansiColor+"""\"






More information about the OM-Cooker mailing list