From b9a952e0049d9be5562a4cd356eec71abb7e5227 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Fri, 30 Jun 2017 16:07:14 +0300 Subject: [PATCH] pkg: put git describe output into pkg.human-version --- usr/src/pkg/Makefile | 3 ++- usr/src/pkg/transforms/common_actions | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile index c98539c85d..9fd3b1e80e 100644 --- a/usr/src/pkg/Makefile +++ b/usr/src/pkg/Makefile @@ -202,7 +202,8 @@ PKGMOG_DEFINES= \ PYTHON_VERSION=$(PYTHON_VERSION) \ PYTHON_PKGVERS=$(PYTHON_PKGVERS) \ JAVA_8_ONLY=$(JAVA_8_ONLY) \ - JAVA_7_ONLY=$(JAVA_7_ONLY) + JAVA_7_ONLY=$(JAVA_7_ONLY) \ + HUMAN_VERSION=$(VERSION) PKGDEP_TOKENS_i386= \ 'PLATFORM=i86hvm' \ diff --git a/usr/src/pkg/transforms/common_actions b/usr/src/pkg/transforms/common_actions index e22e175449..3fa5773340 100644 --- a/usr/src/pkg/transforms/common_actions +++ b/usr/src/pkg/transforms/common_actions @@ -37,3 +37,5 @@ set name=org.opensolaris.consolidation value=osnet # fashion. # set name=variant.opensolaris.zone value=global value=nonglobal + +set name=pkg.human-version value=$(HUMAN_VERSION) -- 2.11.4.GIT