scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-24 16:57:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the debian release number as part of the installer name.

Browse Source
This commit is contained in:
Jeffrey Townsend
2019-02-04 20:43:48 +00:00
parent bcd9cfd792
commit a7e4cde8dc
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,9 +6,13 @@ ifndef BOOTMODE
$(error $$BOOTMODE not set)
endif
# Arg. This should be extracted from SWI manifest.
include /etc/os-release
DEBIAN_VERSION_ID := $(shell echo $(VERSION_ID))
# Hardcoded to match ONL File naming conventions.
include $(ONL)/make/versions/version-onl.mk
INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS$(DEBIAN_VERSION_ID)_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
MKINSTALLER_OPTS = \
--onl-version "$(VERSION_STRING)" \
@@ -26,5 +30,3 @@ MKINSTALLER_OPTS = \
__installer:
$(ONL)/tools/mkinstaller.py $(MKINSTALLER_OPTS) --out $(INSTALLER_NAME)
md5sum "$(INSTALLER_NAME)" | awk '{ print $$1 }' > "$(INSTALLER_NAME).md5sum"

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

@@ -6,9 +6,13 @@ ifndef BOOTMODE
$(error $$BOOTMODE not set)
endif
# Arg. This should be extracted from SWI manifest.
include /etc/os-release
DEBIAN_VERSION_ID := $(shell echo $(VERSION_ID))
# Hardcoded to match ONL File naming conventions.
include $(ONL)/make/versions/version-onl.mk
INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS$(DEBIAN_VERSION_ID)_$(FNAME_BUILD_ID)_$(UARCH)_$(BOOTMODE)_INSTALLER
MKINSTALLER_OPTS = \
--onl-version "$(VERSION_STRING)" \
@@ -26,5 +30,3 @@ MKINSTALLER_OPTS = \
__installer:
$(ONL)/tools/mkinstaller.py $(MKINSTALLER_OPTS) --out $(INSTALLER_NAME)
md5sum "$(INSTALLER_NAME)" | awk '{ print $$1 }' > "$(INSTALLER_NAME).md5sum"