diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fd54ed..a8c9e3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,11 @@ 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). -## [4.0.0] - 2025-09-16 +## [3.14.1] - 2025-09-24 -### Changed +### Fixed -- Include oglive version in the filename +- Fix jenkins build with REUSE_PREV_FS=true ## [3.14.0] - 2025-08-14 diff --git a/includes/etc/initramfs-tools/scripts/VERSION.txt b/includes/etc/initramfs-tools/scripts/VERSION.txt index fcdb2e1..d524d5f 100644 --- a/includes/etc/initramfs-tools/scripts/VERSION.txt +++ b/includes/etc/initramfs-tools/scripts/VERSION.txt @@ -1 +1 @@ -4.0.0 +OpenGnsys Client 3.14.1 diff --git a/mkoglive.py b/mkoglive.py index 16b03a9..52ffe66 100755 --- a/mkoglive.py +++ b/mkoglive.py @@ -70,15 +70,8 @@ def _debootstrap (btrootfsimg, btrootfsmnt, osarch, oscodename, oshttp): sys.exit (1) utils.umount (btrootfsmnt) -def _initramfs_version (f, oglive_version, osrelease): - today = datetime.datetime.now(datetime.timezone.utc).strftime ('%Y%m%d') - fd = open (f'{curdir}/gitrelease', 'r') ## per the Dockerfile - gitrelease = fd.readline().strip() - fd.close() - - fd = open (f, 'w') - fd.write (f'OpenGnsys Client {oglive_version} {gitrelease}_{today} ({osrelease})\n') - fd.close() +def _initramfs_version (gitrelease, osrelease, cur_dir): + utils.run (['sed', '-i', f'1 s/$/ {gitrelease} ({osrelease})/', f'{curdir}/includes/etc/initramfs-tools/scripts/VERSION.txt']) def _copy_og_files (btrootfsimg, btrootfsmnt, osdistrib, oscodename): _mount_rootfs (btrootfsimg, btrootfsmnt) @@ -119,12 +112,11 @@ def _mkinitrd_squashfs_isofs (bttargetdir, osrelease, btrootfsimg, btrootfsmnt, def _main (cfgfile, config, type_client): isolinux_tpl = config['General'].get ('isolinux_template') btrootfsimglabel = config['General'].get ('rootfs_image_label') - version_file = f'{curdir}/includes/etc/initramfs-tools/scripts/VERSION.txt' logger.info ('OpenGnsys CLIENT installation begins') - fd = open (version_file, 'r') - oglive_version = fd.readline().strip() + fd = open (f'{curdir}/gitrelease', 'r') ## per the Dockerfile + gitrelease = fd.readline().strip() fd.close() osdistrib, oscodename, osrelease, osarch, oshttp = btog.GetOsInfo (type_client) @@ -143,7 +135,8 @@ def _main (cfgfile, config, type_client): _debootstrap (btrootfsimg, btrootfsmnt, osarch, oscodename, oshttp) logger.info ('STAGE 2 - copy files to the rootfs') - _initramfs_version (version_file, oglive_version, osrelease) + 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') @@ -153,10 +146,11 @@ def _main (cfgfile, config, type_client): logger.info ('STAGE 4 - generate distribution files') pxepkg = _get_pxepkg() - nameisoclient = '-'.join (['ogLive', oscodename, osrelease, osarch, oglive_version]) + nameisoclient = '-'.join (['ogLive', oscodename, osrelease, osarch, gitrelease+'_'+today]) _mkinitrd_squashfs_isofs (bttargetdir, osrelease, btrootfsimg, btrootfsmnt, pxepkg, isolinux_tpl, nameisoclient) logger.info ('OpenGnsys installation finished') + logger.info ('OpenGnsys installation finished') if __name__ == '__main__':