Merge pull request 'refs #1789 include build date in VERSION.txt' (#7) from improve-version into main

Reviewed-on: #7

CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [3.2.1] - 2025-03-31
+
+### Changed
+
+- Include build date in the final VERSION.txt

boottools/btog.py

@@ -205,7 +205,7 @@ def debootstrap (btrootfsimg, btrootfsmnt, osarch, oscodename, oshttp):
     logger.info (f'debootstrap --arch="{osarch}" --components=main,universe "{oscodename}" "{btrootfsmnt}" "{oshttp}" : ok')
     return 0
 
-def copy_og_files (builder, og_shared, og_engine, ogclientmount, osdistrib, oscodename):
+def copy_og_files (builder, og_shared, ogclientmount, osdistrib, oscodename):
     logger.info ('Iniciando la personalización con datos del repositorio')
 
     sources_list_in  = f'{builder}/includes/etc/apt/sources.list.{osdistrib.lower()}'
@@ -226,9 +226,8 @@ def copy_og_files (builder, og_shared, og_engine, ogclientmount, osdistrib, osco
     os.makedirs (f'{ogclientmount}/usr/local/lib',                 exist_ok=True)
     os.makedirs (f'{ogclientmount}/usr/local/plugins',             exist_ok=True)
 
-    subprocess.run (f'rsync -aH {builder}/includes/* {ogclientmount}/'                             , shell=True)
+    subprocess.run (f'rsync -aH {builder}/includes/* {ogclientmount}/'              , shell=True)
-    subprocess.run (f'rsync -aH {og_shared}/*        {ogclientmount}/opt/opengnsys/'               , shell=True)
+    subprocess.run (f'rsync -aH {og_shared}/*        {ogclientmount}/opt/opengnsys/', shell=True)
-    subprocess.run (f'rsync -aH {og_engine}/*        {ogclientmount}/opt/opengnsys/lib/engine/bin/', shell=True)
 
     if not os.path.exists (f'{ogclientmount}/etc/pci.ids'):
         shutil.copy (f'{og_shared}/lib/pci.ids', f'{ogclientmount}/etc/')
@@ -240,7 +239,7 @@ def copy_og_files (builder, og_shared, og_engine, ogclientmount, osdistrib, osco
     subprocess.run (f'rsync -aH {og_shared}/lib/qtplugins/* {ogclientmount}/usr/local/plugins', shell=True)
 
     # Browser
-    if os.path.exists (f'{og_shared}/bin/browser'):     shutil.copy (f'{og_shared}/bin/browser',     f'{ogclientmount}/bin/')
+    if os.path.exists (f'{og_shared}/bin/browser'): shutil.copy (f'{og_shared}/bin/browser', f'{ogclientmount}/bin/')
 
 def sysctl (btrootfsmnt):
     logger.debug ('copiando sysctl.conf')

chroot-tasks.py

@@ -95,7 +95,7 @@ def boottoolsSoftwareCompile():
     if not os.path.exists ('python-libfdisk'):
         print ('boottoolsSoftwareCompile: python-libfdisk', file=sys.stderr)
         apt.install (['python3-psutil', 'python3-dev', 'libfdisk-dev', 'python3-setuptools'])
-        utils.run (['git', 'clone', 'git://git.48k.eu/python-libfdisk'])
+        utils.run (['git', 'clone', 'https://ognproject.evlt.uma.es/gitea/48k.eu-mirror/python-libfdisk.git'])
         os.chdir ('python-libfdisk')
         utils.run (['python3', 'setup.py', 'install'])
         os.chdir ('..')

includes/etc/apt/sources.list.ubuntu

@@ -59,5 +59,5 @@ deb http://free.nchc.org.tw/ubuntu OSCODENAME-security main restricted universe
 #deb-src http://ppa.launchpad.net/zfs-native/stable/ubuntu OSCODENAME main
 
 
-deb [trusted=yes]  https://ognproject.evlt.uma.es/debian-opengnsys/ OSCODENAME main 
+deb [trusted=yes]  https://ognproject.evlt.uma.es/debian-opengnsys/opengnsys OSCODENAME main 
 

includes/etc/initramfs-tools/scripts/VERSION.txt

@@ -1 +1 @@
-OpenGnsys Client 3.2.0
+OpenGnsys Client 3.2.1

mkoglive.py

@@ -77,8 +77,7 @@ def _copy_og_files (btrootfsimg, btrootfsmnt, osdistrib, oscodename):
     _mount_rootfs (btrootfsimg, btrootfsmnt)
     builder   = '/tmp/opengnsys/oglive_builder'
     og_shared = '/tmp/opengnsys/shared'
-    og_engine = '/tmp/opengnsys/engine'
+    btog.copy_og_files (builder, og_shared, btrootfsmnt, osdistrib, oscodename)
-    btog.copy_og_files (builder, og_shared, og_engine, btrootfsmnt, osdistrib, oscodename)
     utils.umount (btrootfsmnt)
 
 def _chroot_tasks (cfgfile, curdir, osrelease, osarch):
@@ -135,7 +134,8 @@ def _main (cfgfile, config, type_client):
     _debootstrap (btrootfsimg, btrootfsmnt, osarch, oscodename, oshttp)
 
     logger.info ('STAGE 2 - copy files to the rootfs')
-    _initramfs_version (gitrelease, osrelease, curdir)
+    today = datetime.datetime.now(datetime.timezone.utc).strftime ('%Y%m%d')
+    _initramfs_version (gitrelease+'_'+today, osrelease, curdir)
     _copy_og_files (btrootfsimg, btrootfsmnt, osdistrib, oscodename)
 
     logger.info ('STAGE 3 - perform tasks within the chroot')
@@ -145,7 +145,6 @@ def _main (cfgfile, config, type_client):
 
     logger.info ('STAGE 4 - generate distribution files')
     pxepkg = _get_pxepkg()
-    today = datetime.datetime.now(datetime.timezone.utc).strftime ('%Y%m%d')
     nameisoclient  = '-'.join (['ogLive', oscodename, osrelease, osarch, gitrelease+'_'+today])
     _mkinitrd_squashfs_isofs (bttargetdir, osrelease, btrootfsimg, btrootfsmnt, pxepkg, isolinux_tpl, nameisoclient)