|
 |
51d367 |
From af34ffb86a1b8717e542edca97d7d96e6bd90f08 Mon Sep 17 00:00:00 2001
|
|
|
867c1e |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
867c1e |
Date: Thu, 22 Aug 2013 12:06:40 +0200
|
|
|
51d367 |
Subject: Place rpm version info into version banner
|
|
|
867c1e |
|
|
|
867c1e |
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
867c1e |
Message-id: <1377173200-17433-1-git-send-email-mrezanin@redhat.com>
|
|
|
867c1e |
Patchwork-id: 53692
|
|
|
867c1e |
O-Subject: [RHEL7 seabios PATCH] Place rpm version info into version banner
|
|
|
867c1e |
Bugzilla: 894979
|
|
|
867c1e |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
867c1e |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
867c1e |
RH-Acked-by: Michal Novotny <minovotn@redhat.com>
|
|
|
867c1e |
|
|
|
867c1e |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
867c1e |
|
|
|
867c1e |
Bugzilla: 894979
|
|
|
867c1e |
Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6199274
|
|
|
867c1e |
|
|
|
867c1e |
This patch introduces two changes:
|
|
|
867c1e |
|
|
|
867c1e |
1) Do not append date and hostname to version string.
|
|
|
867c1e |
|
|
|
867c1e |
2) Use rpm version insted of git commit as the version string.
|
|
|
867c1e |
|
|
|
867c1e |
Both changes are trivial so they are not posted in separate patches.
|
|
|
867c1e |
|
|
|
867c1e |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
867c1e |
---
|
|
|
867c1e |
redhat/seabios.spec.template | 5 ++---
|
|
|
867c1e |
tools/buildversion.sh | 1 -
|
|
|
867c1e |
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
867c1e |
|
|
|
867c1e |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
51d367 |
|
|
|
51d367 |
Conflicts:
|
|
|
51d367 |
redhat/seabios.spec.template - We solved 1) in rebase commit
|
|
|
867c1e |
---
|
|
|
51d367 |
scripts/buildversion.sh | 1 -
|
|
|
51d367 |
1 file changed, 1 deletion(-)
|
|
|
867c1e |
|
|
|
51d367 |
diff --git a/scripts/buildversion.sh b/scripts/buildversion.sh
|
|
|
51d367 |
index e5ce96c..338b7f0 100755
|
|
|
51d367 |
--- a/scripts/buildversion.sh
|
|
|
51d367 |
+++ b/scripts/buildversion.sh
|
|
|
867c1e |
@@ -11,7 +11,6 @@ elif [ -f .version ]; then
|
|
|
867c1e |
else
|
|
|
867c1e |
VERSION="?"
|
|
|
867c1e |
fi
|
|
|
867c1e |
-VERSION="${VERSION}-`date +"%Y%m%d_%H%M%S"`-`hostname`"
|
|
|
867c1e |
echo "Version: ${VERSION}"
|
|
|
867c1e |
|
|
|
867c1e |
# Build header file
|
|
|
867c1e |
--
|
|
|
51d367 |
1.9.3
|
|
|
867c1e |
|