From 8838fba7ac8e4952af91940466a9642950ac8fc0 Mon Sep 17 00:00:00 2001
From: Brenden Blanco <bblanco@plumgrid.com>
Date: Mon, 22 Feb 2016 10:29:36 -0800
Subject: [PATCH] Prepare deb build for nightly target

Add incremental release numbering for deb targets.
Tweak rpm release numbering as well.

Signed-off-by: Brenden Blanco <bblanco@plumgrid.com>
---
 debian/control               |  2 +-
 scripts/build-deb.sh         | 17 ++++++++++++++---
 scripts/build-release-rpm.sh |  8 +++++---
 scripts/build-rpm.sh         |  8 +++++---
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 51a77791311f..fb4156bd3480 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Brenden Blanco <bblanco@plumgrid.com>
 Section: misc
 Priority: optional
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), cmake, libllvm3.8, llvm-3.8-dev, libclang-3.8-dev
+Build-Depends: debhelper (>= 9), cmake, libllvm3.7, llvm-3.7-dev, libclang-3.7-dev
 Homepage: https://github.com/iovisor/bcc
 
 Package: libbcc
diff --git a/scripts/build-deb.sh b/scripts/build-deb.sh
index b33b1f87d850..7cd4441a9399 100755
--- a/scripts/build-deb.sh
+++ b/scripts/build-deb.sh
@@ -11,11 +11,22 @@ function cleanup() {
 }
 trap cleanup EXIT
 
-mkdir $TMP/bcc
-cp -a * $TMP/bcc
+git_tag_latest=$(git describe --abbrev=0)
+git_rev_count=$(git rev-list $git_tag_latest.. --count)
+git_rev_count=$[$git_rev_count+1]
+git_subject=$(git log --pretty="%s" -n 1)
+release=$git_rev_count
+if [[ "$release" != "1" ]]; then
+  release="${release}.git.$(git log --pretty='%h' -n 1)"
+fi
+revision=${git_tag_latest:1}
+
+git archive HEAD --prefix=bcc/ --format=tar.gz -o $TMP/bcc_$revision.orig.tar.gz
+
 pushd $TMP
-tar zcf bcc_0.1.7.orig.tar.gz bcc/
+tar xf bcc_$revision.orig.tar.gz
 cd bcc
+dch -v $revision-$release "$git_subject"
 DEB_BUILD_OPTIONS="nocheck parallel=${PARALLEL}" debuild -us -uc
 popd
 
diff --git a/scripts/build-release-rpm.sh b/scripts/build-release-rpm.sh
index 26a039a40492..62c563389b98 100755
--- a/scripts/build-release-rpm.sh
+++ b/scripts/build-release-rpm.sh
@@ -16,9 +16,11 @@ llvmver=3.7.1
 # only the most recent tag
 git_tag_latest=$(git describe --abbrev=0)
 git_rev_count=$(git rev-list $git_tag_latest.. --count)
-release=0
-if [[ "$git_rev_count" != "0" ]]; then
-  release=$(git log --pretty='g%h' -n 1)
+git_rev_count=$[$git_rev_count+1]
+git_subject=$(git log --pretty="%s" -n 1)
+release=$git_rev_count
+if [[ "$git_rev_count" != "1" ]]; then
+  release="${release}.git.$(git log --pretty='%h' -n 1)"
 fi
 revision=${git_tag_latest:1}
 
diff --git a/scripts/build-rpm.sh b/scripts/build-rpm.sh
index a6678fdf03ee..9a5185c80d06 100755
--- a/scripts/build-rpm.sh
+++ b/scripts/build-rpm.sh
@@ -16,9 +16,11 @@ llvmver=3.7.1
 # only the most recent tag
 git_tag_latest=$(git describe --abbrev=0)
 git_rev_count=$(git rev-list $git_tag_latest.. --count)
-release=0
-if [[ "$git_rev_count" != "0" ]]; then
-  release=$(git log --pretty='g%h' -n 1)
+git_rev_count=$[$git_rev_count+1]
+git_subject=$(git log --pretty="%s" -n 1)
+release=$git_rev_count
+if [[ "$git_rev_count" != "1" ]]; then
+  release="${release}.git.$(git log --pretty='%h' -n 1)"
 fi
 revision=${git_tag_latest:1}