From d7ce03e4059c74e9cb0a964c4d89ba63547849ff Mon Sep 17 00:00:00 2001 From: Brenden Blanco Date: Tue, 1 Sep 2015 23:19:27 -0700 Subject: [PATCH 1/3] Update tag to v0.1.6, include finall llvm 3.7.0 release * Update llvm to 3.7.0 release Signed-off-by: Brenden Blanco --- SPECS/Dockerfile.el6 | 8 ++++---- SPECS/Dockerfile.el6.in | 4 ++-- SPECS/Dockerfile.el7 | 8 ++++---- SPECS/Dockerfile.el7.in | 4 ++-- SPECS/Dockerfile.f22 | 8 ++++---- SPECS/Dockerfile.f22.in | 4 ++-- SPECS/bcc.el6.spec | 8 ++++---- SPECS/bcc.el6.spec.in | 6 +++--- SPECS/bcc.el7.spec | 8 ++++---- SPECS/bcc.el7.spec.in | 6 +++--- SPECS/bcc.f22.spec | 8 ++++---- SPECS/bcc.f22.spec.in | 6 +++--- debian/changelog | 7 +++++++ 13 files changed, 46 insertions(+), 39 deletions(-) diff --git a/SPECS/Dockerfile.el6 b/SPECS/Dockerfile.el6 index 2d5eabd4ed9b..8ada3336f8f8 100644 --- a/SPECS/Dockerfile.el6 +++ b/SPECS/Dockerfile.el6 @@ -11,11 +11,11 @@ WORKDIR /root RUN mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS} RUN cd SOURCES && wget https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz RUN cd SOURCES && wget https://ftp.gnu.org/gnu/gcc/gcc-5.1.0/gcc-5.1.0.tar.gz -RUN cd SOURCES && wget http://llvm.org/pre-releases/3.7.0/rc3/llvm-3.7.0rc3.src.tar.xz -RUN cd SOURCES && wget http://llvm.org/pre-releases/3.7.0/rc3/cfe-3.7.0rc3.src.tar.xz -RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v0.1.5.tar.gz +RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz +RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz +RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v0.1.6.tar.gz -RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v0.1.5/SPECS/bcc.el6.spec +RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v0.1.6/SPECS/bcc.el6.spec #COPY SPECS/bcc.el6.spec SPECS/ RUN rpmbuild --define "_topdir `pwd`" -ba SPECS/bcc.el6.spec diff --git a/SPECS/Dockerfile.el6.in b/SPECS/Dockerfile.el6.in index 2d9512745f5f..87933204a20a 100644 --- a/SPECS/Dockerfile.el6.in +++ b/SPECS/Dockerfile.el6.in @@ -11,8 +11,8 @@ WORKDIR /root RUN mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS} RUN cd SOURCES && wget https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz RUN cd SOURCES && wget https://ftp.gnu.org/gnu/gcc/gcc-5.1.0/gcc-5.1.0.tar.gz -RUN cd SOURCES && wget http://llvm.org/pre-releases/3.7.0/rc3/llvm-3.7.0rc3.src.tar.xz -RUN cd SOURCES && wget http://llvm.org/pre-releases/3.7.0/rc3/cfe-3.7.0rc3.src.tar.xz +RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz +RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v@REVISION_LAST@.tar.gz RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v@REVISION_LAST@/SPECS/bcc.el6.spec diff --git a/SPECS/Dockerfile.el7 b/SPECS/Dockerfile.el7 index 83c748dda7b2..253f5221f766 100644 --- a/SPECS/Dockerfile.el7 +++ b/SPECS/Dockerfile.el7 @@ -9,11 +9,11 @@ RUN yum -y install bison cmake flex gcc gcc-c++ make python2-devel rpm-build wge WORKDIR /root RUN mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS} -RUN cd SOURCES && wget http://llvm.org/pre-releases/3.7.0/rc3/llvm-3.7.0rc3.src.tar.xz -RUN cd SOURCES && wget http://llvm.org/pre-releases/3.7.0/rc3/cfe-3.7.0rc3.src.tar.xz -RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v0.1.5.tar.gz +RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz +RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz +RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v0.1.6.tar.gz -RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v0.1.5/SPECS/bcc.el7.spec +RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v0.1.6/SPECS/bcc.el7.spec #COPY SPECS/bcc.el7.spec SPECS/ RUN rpmbuild --define "_topdir `pwd`" -ba SPECS/bcc.el7.spec diff --git a/SPECS/Dockerfile.el7.in b/SPECS/Dockerfile.el7.in index f1f6b8e2fd5b..5a82058d01a9 100644 --- a/SPECS/Dockerfile.el7.in +++ b/SPECS/Dockerfile.el7.in @@ -9,8 +9,8 @@ RUN yum -y install bison cmake flex gcc gcc-c++ make python2-devel rpm-build wge WORKDIR /root RUN mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS} -RUN cd SOURCES && wget http://llvm.org/pre-releases/3.7.0/rc3/llvm-3.7.0rc3.src.tar.xz -RUN cd SOURCES && wget http://llvm.org/pre-releases/3.7.0/rc3/cfe-3.7.0rc3.src.tar.xz +RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz +RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v@REVISION_LAST@.tar.gz RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v@REVISION_LAST@/SPECS/bcc.el7.spec diff --git a/SPECS/Dockerfile.f22 b/SPECS/Dockerfile.f22 index efd293cca46a..892c576f7176 100644 --- a/SPECS/Dockerfile.f22 +++ b/SPECS/Dockerfile.f22 @@ -10,11 +10,11 @@ WORKDIR /root RUN mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS} -RUN cd SOURCES && wget http://llvm.org/pre-releases/3.7.0/rc3/llvm-3.7.0rc3.src.tar.xz -RUN cd SOURCES && wget http://llvm.org/pre-releases/3.7.0/rc3/cfe-3.7.0rc3.src.tar.xz -RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v0.1.5.tar.gz +RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz +RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz +RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v0.1.6.tar.gz -RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v0.1.5/SPECS/bcc.f22.spec +RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v0.1.6/SPECS/bcc.f22.spec #COPY SPECS/bcc.f22.spec SPECS/ RUN rpmbuild --define "_topdir `pwd`" -ba SPECS/bcc.f22.spec diff --git a/SPECS/Dockerfile.f22.in b/SPECS/Dockerfile.f22.in index 43916b080eea..5b32d4d1b65a 100644 --- a/SPECS/Dockerfile.f22.in +++ b/SPECS/Dockerfile.f22.in @@ -10,8 +10,8 @@ RUN dnf -y install bison cmake flex gcc gcc-c++ libstdc++-static make python2-de WORKDIR /root RUN mkdir -p {BUILD,RPMS,SOURCES,SPECS,SRPMS} -RUN cd SOURCES && wget http://llvm.org/pre-releases/3.7.0/rc3/llvm-3.7.0rc3.src.tar.xz -RUN cd SOURCES && wget http://llvm.org/pre-releases/3.7.0/rc3/cfe-3.7.0rc3.src.tar.xz +RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/llvm-3.7.0.src.tar.xz +RUN cd SOURCES && wget http://llvm.org/releases/3.7.0/cfe-3.7.0.src.tar.xz RUN cd SOURCES && wget https://github.com/iovisor/bcc/archive/v@REVISION_LAST@.tar.gz RUN cd SPECS && wget https://raw.githubusercontent.com/iovisor/bcc/v@REVISION_LAST@/SPECS/bcc.f22.spec diff --git a/SPECS/bcc.el6.spec b/SPECS/bcc.el6.spec index 7768aa9d2f3d..79dec94b2e9b 100644 --- a/SPECS/bcc.el6.spec +++ b/SPECS/bcc.el6.spec @@ -2,12 +2,12 @@ # Licensed under the Apache License, Version 2.0 (the "License") %define debug_package %{nil} -%define llvmver 3.7.0rc3 +%define llvmver 3.7.0 %define gccver 5.1.0 %define pythonver 2.7.10 Name: bcc -Version: 0.1.5 +Version: 0.1.6 Release: 1%{?dist} Summary: BPF Compiler Collection (BCC) @@ -17,8 +17,8 @@ URL: https://github.com/iovisor/bcc Source0: https://github.com/iovisor/bcc/archive/v%{version}.tar.gz Source1: https://ftp.gnu.org/gnu/gcc/gcc-%{gccver}/gcc-%{gccver}.tar.gz Source2: https://www.python.org/ftp/python/%{pythonver}/Python-%{pythonver}.tgz -Source3: http://llvm.org/pre-releases/3.7.0/rc3/llvm-%{llvmver}.src.tar.xz -Source4: http://llvm.org/pre-releases/3.7.0/rc3/cfe-%{llvmver}.src.tar.xz +Source3: http://llvm.org/releases/3.7.0/llvm-%{llvmver}.src.tar.xz +Source4: http://llvm.org/releases/3.7.0/cfe-%{llvmver}.src.tar.xz BuildArch: x86_64 BuildRequires: bison, bzip2, cmake >= 2.8.7, file, flex, gcc, gcc-c++, git, glibc-devel, glibc-utils, python2-devel, rpm-build, svn, tar, texinfo-tex, wget, zip, zlib-devel diff --git a/SPECS/bcc.el6.spec.in b/SPECS/bcc.el6.spec.in index 02da2d5fac49..f37a57bfada7 100644 --- a/SPECS/bcc.el6.spec.in +++ b/SPECS/bcc.el6.spec.in @@ -2,7 +2,7 @@ # Licensed under the Apache License, Version 2.0 (the "License") %define debug_package %{nil} -%define llvmver 3.7.0rc3 +%define llvmver 3.7.0 %define gccver 5.1.0 %define pythonver 2.7.10 @@ -17,8 +17,8 @@ URL: https://github.com/iovisor/bcc Source0: https://github.com/iovisor/bcc/archive/v%{version}.tar.gz Source1: https://ftp.gnu.org/gnu/gcc/gcc-%{gccver}/gcc-%{gccver}.tar.gz Source2: https://www.python.org/ftp/python/%{pythonver}/Python-%{pythonver}.tgz -Source3: http://llvm.org/pre-releases/3.7.0/rc3/llvm-%{llvmver}.src.tar.xz -Source4: http://llvm.org/pre-releases/3.7.0/rc3/cfe-%{llvmver}.src.tar.xz +Source3: http://llvm.org/releases/3.7.0/llvm-%{llvmver}.src.tar.xz +Source4: http://llvm.org/releases/3.7.0/cfe-%{llvmver}.src.tar.xz BuildArch: x86_64 BuildRequires: bison, bzip2, cmake >= 2.8.7, file, flex, gcc, gcc-c++, git, glibc-devel, glibc-utils, python2-devel, rpm-build, svn, tar, texinfo-tex, wget, zip, zlib-devel diff --git a/SPECS/bcc.el7.spec b/SPECS/bcc.el7.spec index e7ba518351be..7991649cad7b 100644 --- a/SPECS/bcc.el7.spec +++ b/SPECS/bcc.el7.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} -%define llvmver 3.7.0rc3 +%define llvmver 3.7.0 Name: bcc -Version: 0.1.5 +Version: 0.1.6 Release: 1%{?dist} Summary: BPF Compiler Collection (BCC) @@ -10,8 +10,8 @@ Group: Development/Languages License: ASL 2.0 URL: https://github.com/iovisor/bcc Source0: https://github.com/iovisor/bcc/archive/v%{version}.tar.gz -Source1: http://llvm.org/pre-releases/3.7.0/rc3/llvm-%{llvmver}.src.tar.xz -Source2: http://llvm.org/pre-releases/3.7.0/rc3/cfe-%{llvmver}.src.tar.xz +Source1: http://llvm.org/releases/3.7.0/llvm-%{llvmver}.src.tar.xz +Source2: http://llvm.org/releases/3.7.0/cfe-%{llvmver}.src.tar.xz BuildArch: x86_64 BuildRequires: bison, cmake >= 2.8.7, flex, gcc, gcc-c++, python2-devel diff --git a/SPECS/bcc.el7.spec.in b/SPECS/bcc.el7.spec.in index 0a30da219db5..fa173d499aff 100644 --- a/SPECS/bcc.el7.spec.in +++ b/SPECS/bcc.el7.spec.in @@ -1,5 +1,5 @@ %define debug_package %{nil} -%define llvmver 3.7.0rc3 +%define llvmver 3.7.0 Name: bcc Version: @REVISION_LAST@ @@ -10,8 +10,8 @@ Group: Development/Languages License: ASL 2.0 URL: https://github.com/iovisor/bcc Source0: https://github.com/iovisor/bcc/archive/v%{version}.tar.gz -Source1: http://llvm.org/pre-releases/3.7.0/rc3/llvm-%{llvmver}.src.tar.xz -Source2: http://llvm.org/pre-releases/3.7.0/rc3/cfe-%{llvmver}.src.tar.xz +Source1: http://llvm.org/releases/3.7.0/llvm-%{llvmver}.src.tar.xz +Source2: http://llvm.org/releases/3.7.0/cfe-%{llvmver}.src.tar.xz BuildArch: x86_64 BuildRequires: bison, cmake >= 2.8.7, flex, gcc, gcc-c++, python2-devel diff --git a/SPECS/bcc.f22.spec b/SPECS/bcc.f22.spec index e7ba518351be..7991649cad7b 100644 --- a/SPECS/bcc.f22.spec +++ b/SPECS/bcc.f22.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} -%define llvmver 3.7.0rc3 +%define llvmver 3.7.0 Name: bcc -Version: 0.1.5 +Version: 0.1.6 Release: 1%{?dist} Summary: BPF Compiler Collection (BCC) @@ -10,8 +10,8 @@ Group: Development/Languages License: ASL 2.0 URL: https://github.com/iovisor/bcc Source0: https://github.com/iovisor/bcc/archive/v%{version}.tar.gz -Source1: http://llvm.org/pre-releases/3.7.0/rc3/llvm-%{llvmver}.src.tar.xz -Source2: http://llvm.org/pre-releases/3.7.0/rc3/cfe-%{llvmver}.src.tar.xz +Source1: http://llvm.org/releases/3.7.0/llvm-%{llvmver}.src.tar.xz +Source2: http://llvm.org/releases/3.7.0/cfe-%{llvmver}.src.tar.xz BuildArch: x86_64 BuildRequires: bison, cmake >= 2.8.7, flex, gcc, gcc-c++, python2-devel diff --git a/SPECS/bcc.f22.spec.in b/SPECS/bcc.f22.spec.in index 0a30da219db5..fa173d499aff 100644 --- a/SPECS/bcc.f22.spec.in +++ b/SPECS/bcc.f22.spec.in @@ -1,5 +1,5 @@ %define debug_package %{nil} -%define llvmver 3.7.0rc3 +%define llvmver 3.7.0 Name: bcc Version: @REVISION_LAST@ @@ -10,8 +10,8 @@ Group: Development/Languages License: ASL 2.0 URL: https://github.com/iovisor/bcc Source0: https://github.com/iovisor/bcc/archive/v%{version}.tar.gz -Source1: http://llvm.org/pre-releases/3.7.0/rc3/llvm-%{llvmver}.src.tar.xz -Source2: http://llvm.org/pre-releases/3.7.0/rc3/cfe-%{llvmver}.src.tar.xz +Source1: http://llvm.org/releases/3.7.0/llvm-%{llvmver}.src.tar.xz +Source2: http://llvm.org/releases/3.7.0/cfe-%{llvmver}.src.tar.xz BuildArch: x86_64 BuildRequires: bison, cmake >= 2.8.7, flex, gcc, gcc-c++, python2-devel diff --git a/debian/changelog b/debian/changelog index 6fd7fee588d0..55319cb636af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +bcc (0.1.6-1) unstable; urgency=low + + * Stability fixes + * Improvements to python API + * Tracing features + * Support for kernel 4.2 features + bcc (0.1.5-1) unstable; urgency=low * Initial release From 4a36a5418e6c632c737762d19da437f1b4dee4c7 Mon Sep 17 00:00:00 2001 From: Brenden Blanco Date: Wed, 2 Sep 2015 09:23:56 -0700 Subject: [PATCH 2/3] Fix debian changelog formatting Signed-off-by: Brenden Blanco --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 55319cb636af..467d3c45d66a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ bcc (0.1.6-1) unstable; urgency=low * Tracing features * Support for kernel 4.2 features + -- Brenden Blanco Wed, 02 Sep 2015 16:23:19 +0000 + bcc (0.1.5-1) unstable; urgency=low * Initial release From c234344f98a332589dc6666a640fb0c6acaab39e Mon Sep 17 00:00:00 2001 From: Brenden Blanco Date: Wed, 2 Sep 2015 10:26:59 -0700 Subject: [PATCH 3/3] Add debian builder script that is versioned * This script can be run by buildbot to generate the debian files e.g.: PARALLEL=4 scripts/build-deb.sh Signed-off-by: Brenden Blanco --- scripts/build-deb.sh | 22 ++++++++++++++++++++++ scripts/build-deb.sh.in | 22 ++++++++++++++++++++++ scripts/bump_version.cmake | 1 + 3 files changed, 45 insertions(+) create mode 100755 scripts/build-deb.sh create mode 100755 scripts/build-deb.sh.in diff --git a/scripts/build-deb.sh b/scripts/build-deb.sh new file mode 100755 index 000000000000..1c849fbba90b --- /dev/null +++ b/scripts/build-deb.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +set -x +set -e + +PARALLEL=${PARALLEL:-1} +TMP=$(mktemp -d /tmp/debuild.XXXXXX) + +function cleanup() { + [[ -d $TMP ]] && rm -rf $TMP +} +trap cleanup EXIT + +mkdir $TMP/bcc +cp -a * $TMP/bcc +pushd $TMP +tar zcf bcc_0.1.6.orig.tar.gz bcc/ +cd bcc +DEB_BUILD_OPTIONS="nocheck parallel=${PARALLEL}" debuild -us -uc +popd + +cp $TMP/*.deb . diff --git a/scripts/build-deb.sh.in b/scripts/build-deb.sh.in new file mode 100755 index 000000000000..ec0cee9b8b80 --- /dev/null +++ b/scripts/build-deb.sh.in @@ -0,0 +1,22 @@ +#!/bin/bash + +set -x +set -e + +PARALLEL=${PARALLEL:-1} +TMP=$(mktemp -d /tmp/debuild.XXXXXX) + +function cleanup() { + [[ -d $TMP ]] && rm -rf $TMP +} +trap cleanup EXIT + +mkdir $TMP/bcc +cp -a * $TMP/bcc +pushd $TMP +tar zcf bcc_@REVISION_LAST@.orig.tar.gz bcc/ +cd bcc +DEB_BUILD_OPTIONS="nocheck parallel=${PARALLEL}" debuild -us -uc +popd + +cp $TMP/*.deb . diff --git a/scripts/bump_version.cmake b/scripts/bump_version.cmake index d7888622a982..ac9dda3d6a31 100644 --- a/scripts/bump_version.cmake +++ b/scripts/bump_version.cmake @@ -7,3 +7,4 @@ configure_file(SPECS/Dockerfile.f22.in SPECS/Dockerfile.f22 @ONLY) configure_file(SPECS/bcc.el6.spec.in SPECS/bcc.el6.spec @ONLY) configure_file(SPECS/bcc.el7.spec.in SPECS/bcc.el7.spec @ONLY) configure_file(SPECS/bcc.f22.spec.in SPECS/bcc.f22.spec @ONLY) +configure_file(scripts/build-deb.sh.in scripts/build-deb.sh @ONLY)