scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2026-01-07 15:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkinstaller.py: Substitude ONLVERSION in installer.sh.in template

Browse Source 
To show ONL version at image installation time add --onl-version
option to mkinstaller.py and pass VERSION_STRING to it.

Fixes: 9a98e40c09 ("Use the new mkinstaller script.")
Signed-off-by: Sergey Popovich <sergey.popovich@ordnance.co>
This commit is contained in:
Sergey Popovich
2018-11-06 18:43:34 +02:00
parent a5ec39317e
commit ce306bfe03
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builds/any/installer/grub/builds/Makefile
View File

@@ -11,6 +11,7 @@ include $(ONL)/make/versions/version-onl.mk
INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
MKINSTALLER_OPTS = \
--onl-version "$(VERSION_STRING)" \
--arch $(ARCH) \
--boot-config boot-config \
--add-dir config \

1
builds/any/installer/uboot/builds/Makefile
View File

@@ -11,6 +11,7 @@ include $(ONL)/make/versions/version-onl.mk
INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
MKINSTALLER_OPTS = \
--onl-version "$(VERSION_STRING)" \
--arch $(ARCH) \
--boot-config boot-config \
--add-dir config \

7
tools/mkinstaller.py
View File

@@ -23,7 +23,7 @@ if ONL is None:
sys.exit(1)
class InstallerShar(object):
def __init__(self, arch, template=None, work_dir=None):
def __init__(self, onl_version, arch, template=None, work_dir=None):
self.ONL = ONL
if template is None:
@@ -60,6 +60,8 @@ class InstallerShar(object):
else:
self.setvar("ARCH", self.arch)
self.setvar("ONLVERSION", onl_version)
def abort(self, msg):
logger.error(msg)
sys.exit(1)
@@ -174,6 +176,7 @@ class InstallerShar(object):
if __name__ == '__main__':
ap = argparse.ArgumentParser(NAME)
ap.add_argument("--onl-version", help="Installer ONL Version.", required=True)
ap.add_argument("--arch", help="Installer Architecture.", required=True,
choices = ['amd64', 'powerpc', 'armel', 'arm64'])
ap.add_argument("--initrd", nargs=2, help="The system initrd.")
@@ -195,7 +198,7 @@ if __name__ == '__main__':
help="Specify a Python plugin (runs from within the installer chroot)")
ops = ap.parse_args()
installer = InstallerShar(ops.arch, ops.work_dir)
installer = InstallerShar(ops.onl_version, ops.arch, ops.work_dir)
if ops.arch == 'amd64':
if ops.initrd is None:

1
tools/onl-nos-create.py
View File

@@ -920,6 +920,7 @@ include %(MTOP)s/make/versions/version-%(prefix)s.mk
INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
MKINSTALLER_OPTS := \
--onl-version "$(VERSION_STRING)" \
--arch $(ARCH) \
--boot-config boot-config \
--swi %(prefix)s-swi:$(ARCH)