From a7e4cde8dce06886d00fc9ebfeed3cb8dca0a7c2 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Mon, 4 Feb 2019 20:43:48 +0000 Subject: [PATCH] Add the debian release number as part of the installer name. --- builds/any/installer/grub/builds/Makefile | 8 +++++--- builds/any/installer/uboot/builds/Makefile | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/builds/any/installer/grub/builds/Makefile b/builds/any/installer/grub/builds/Makefile index 4092fc27..6f2342e0 100644 --- a/builds/any/installer/grub/builds/Makefile +++ b/builds/any/installer/grub/builds/Makefile @@ -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" - - diff --git a/builds/any/installer/uboot/builds/Makefile b/builds/any/installer/uboot/builds/Makefile index f835ae1d..f6527e86 100644 --- a/builds/any/installer/uboot/builds/Makefile +++ b/builds/any/installer/uboot/builds/Makefile @@ -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" - -