diff --git a/python3-k8sapp-portieris/debian/deb_folder/control b/python3-k8sapp-portieris/debian/deb_folder/control index e6f4092..4e68580 100644 --- a/python3-k8sapp-portieris/debian/deb_folder/control +++ b/python3-k8sapp-portieris/debian/deb_folder/control @@ -7,7 +7,8 @@ Build-Depends: debhelper-compat (= 13), python3-all, python3-pbr, python3-setuptools, - python3-wheel + python3-wheel, + build-info Standards-Version: 4.5.1 Homepage: https://www.starlingx.io diff --git a/python3-k8sapp-portieris/debian/deb_folder/rules b/python3-k8sapp-portieris/debian/deb_folder/rules index 5c63b00..4cb4b14 100755 --- a/python3-k8sapp-portieris/debian/deb_folder/rules +++ b/python3-k8sapp-portieris/debian/deb_folder/rules @@ -5,7 +5,7 @@ export APP_NAME = portieris export PYBUILD_NAME = k8sapp-portieris export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') -export MAJOR = $(shell echo $(DEB_VERSION) | cut -f 1 -d '-') +export MAJOR = $(shell cat /etc/build.info | grep SW_VERSION | cut -d'"' -f2) export MINOR_PATCH = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.') export PBR_VERSION = $(MAJOR).$(MINOR_PATCH) diff --git a/stx-portieris-helm/debian/deb_folder/control b/stx-portieris-helm/debian/deb_folder/control index 38425c2..8d2e6bd 100644 --- a/stx-portieris-helm/debian/deb_folder/control +++ b/stx-portieris-helm/debian/deb_folder/control @@ -8,7 +8,8 @@ Build-Depends: debhelper-compat (= 13), portieris-helm, procps, python3-k8sapp-portieris, - python3-k8sapp-portieris-wheels + python3-k8sapp-portieris-wheels, + build-info Standards-Version: 4.5.1 Homepage: https://www.starlingx.io diff --git a/stx-portieris-helm/debian/deb_folder/rules b/stx-portieris-helm/debian/deb_folder/rules index 5786d80..f90d9e9 100755 --- a/stx-portieris-helm/debian/deb_folder/rules +++ b/stx-portieris-helm/debian/deb_folder/rules @@ -5,7 +5,7 @@ export ROOT = debian/tmp export APP_FOLDER = $(ROOT)/usr/local/share/applications/helm export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ') -export RELEASE = $(shell echo $(DEB_VERSION) | cut -f 1 -d '-') +export RELEASE = $(shell cat /etc/build.info | grep SW_VERSION | cut -d'"' -f2) export REVISION = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.') export APP_NAME = portieris