Update libvirt script to use fedora22

* Install into lib64 instead of lib
* Pull 4.2 kernel from rawhide instead of building it

Signed-off-by: Brenden Blanco <bblanco@plumgrid.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3641c8b..5a53049 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,10 @@ set(CMAKE_BUILD_TYPE Debug)
 enable_testing()
 
 include(scripts/GetGitRevisionDescription.cmake)
+get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
+if(LIB64)
+  set(LIBSUFFIX 64)
+endif()
 
 find_package(BISON)
 find_package(FLEX)

diff --git a/scripts/bpf_demo.ks.erb b/scripts/bpf_demo.ks.erb
index 8cddf10..a285864 100644 (file)
--- a/scripts/bpf_demo.ks.erb
+++ b/scripts/bpf_demo.ks.erb
@@ -33,9 +33,9 @@ vim
 bc
 kexec-tools
 cmake
-clang
 libstdc++-static
 python-netaddr
+python-futures
 %end
 
 %post --log=/root/anaconda-post.log
@@ -46,6 +46,8 @@ chkconfig network on
 
 chkconfig ntpd on
 
+dnf config-manager --add-repo=http://alt.fedoraproject.org/pub/alt/rawhide-kernel-nodebug/fedora-rawhide-kernel-nodebug.repo
+
 yum -y clean metadata
 yum -y update
 
@@ -108,15 +110,11 @@ cat > /usr/local/bin/bcc-setup <<'DELIM__'
 set -e -x
 numcpu=$(grep -c ^processor /proc/cpuinfo)
 
-repo=ssh://git@github.com/iovisor/bcc.git
-git ls-remote $repo 2>&1 > /dev/null
-if [[ $? -ne 0 ]]; then
-  repo=https://<%= @github_access_token %>@github.com/iovisor/bcc.git
-fi
-git clone $repo
+git clone https://github.com/iovisor/bcc.git
 mkdir bcc/build/
 cd bcc/build/
-cmake ..
+export PATH=/opt/local/llvm/bin:$PATH
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr
 make -j$numcpu
 make test
 DELIM__

diff --git a/scripts/build_bpf_demo.sh b/scripts/build_bpf_demo.sh
index cfeb055..ce26914 100755 (executable)
--- a/scripts/build_bpf_demo.sh
+++ b/scripts/build_bpf_demo.sh
@@ -48,7 +48,7 @@ done
 
 PASSWORD=${PASSWORD:-"iovisor"}
 BRIDGE=${BRIDGE:-virbr0}
-MIRROR=${MIRROR:-http://mirror.pnl.gov/fedora/linux/releases/21}
+MIRROR=${MIRROR:-http://mirror.pnl.gov/fedora/linux/releases/22}
 MEM=${MEM:-4094}
 CPU=${CPU:-4}
 SIZE=${SIZE:-40}

diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
index f0a97c2..351a265 100644 (file)
--- a/src/cc/CMakeLists.txt
+++ b/src/cc/CMakeLists.txt
@@ -39,6 +39,6 @@ set(clang_libs ${libclangFrontend} ${libclangSerialization} ${libclangDriver} ${
 # Link against LLVM libraries
 target_link_libraries(bpfprog ${clang_libs} ${llvm_libs} LLVMBPFCodeGen)
 
-install(TARGETS bpfprog LIBRARY DESTINATION lib)
+install(TARGETS bpfprog LIBRARY DESTINATION lib${LIBSUFFIX})
 install(DIRECTORY export/ DESTINATION share/bcc/include/bcc
   FILES_MATCHING PATTERN "*.h")