Merge pull request iovisor#414 from iovisor/tag_v0.1.8

Prepare debian changelog for v0.1.8 tag
trantor · Feb 23, 2016 · d1a0e7f · d1a0e7f
2 parents 39a4c28 + b195349
commit d1a0e7f
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 30 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,14 @@
+bcc (0.1.8-1) unstable; urgency=low
+
+  * Add many new utilities in tools/
+   * wakeuptime, offwaketime, argdist, {xfs,zfs,ext4}{slower,dist}, others
+  * Support for bpf_perf_event()
+  * Support for public tables shared between programs
+  * Support for up to 4.4 features
+  * Remove external file dependencies from clang lib
+
+ -- Brenden Blanco <bblanco@plumgrid.com>  Mon, 23 Feb 2016 00:41:00 +0000
+
 bcc (0.1.7-1) unstable; urgency=low
 
   * Tracing features and bugfixes

diff --git a/scripts/build-deb.sh b/scripts/build-deb.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# helper script to be invoked by jenkins/buildbot
+
+# $1 [optional]: the build type - release | nightly | test
+buildtype=${1:-test}
+
 set -x
 set -e
 
@@ -11,22 +16,21 @@ function cleanup() {
 }
 trap cleanup EXIT
 
-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}
+. scripts/git-tag.sh
 
 git archive HEAD --prefix=bcc/ --format=tar.gz -o $TMP/bcc_$revision.orig.tar.gz
 
 pushd $TMP
 tar xf bcc_$revision.orig.tar.gz
 cd bcc
-dch -v $revision-$release "$git_subject"
+
+if [[ "$buildtype" = "test" ]]; then
+  dch -b -v $revision-$release "$git_subject"
+fi
+if [[ "$buildtype" = "nightly" ]]; then
+  dch -v $revision-$release "$git_subject"
+fi
+
 DEB_BUILD_OPTIONS="nocheck parallel=${PARALLEL}" debuild -us -uc
 popd
 

diff --git a/scripts/build-release-rpm.sh b/scripts/build-release-rpm.sh
@@ -13,16 +13,8 @@ trap cleanup EXIT
 mkdir $TMP/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 
 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)
-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}
+
+. scripts/git-tag.sh
 
 git archive HEAD --prefix=bcc/ --format=tar.gz -o $TMP/SOURCES/$git_tag_latest.tar.gz
 wget -P $TMP/SOURCES http://llvm.org/releases/$llvmver/{cfe,llvm}-$llvmver.src.tar.xz

diff --git a/scripts/build-rpm.sh b/scripts/build-rpm.sh
@@ -13,16 +13,8 @@ trap cleanup EXIT
 mkdir $TMP/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 
 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)
-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}
+
+. scripts/git-tag.sh
 
 git archive HEAD --prefix=bcc/ --format=tar.gz -o $TMP/SOURCES/bcc.tar.gz
 

diff --git a/scripts/git-tag.sh b/scripts/git-tag.sh
@@ -0,0 +1,9 @@
+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}