From 843dfef73c86a8ad71afe36e2db9e711dddc199a Mon Sep 17 00:00:00 2001 From: shravani Date: Tue, 20 Dec 2016 15:09:34 +0530 Subject: Combine the common code for kernel building on deb/rpm This patch removes the duplication of code in rpm/debian build scripts. Change-Id: I88edc93df488bd01a43cd98e4f69f35e09f8f61c Signed-off-by: Shravani --- ci/build_rpm/build_rpms.sh | 20 ------------- ci/build_rpm/build_rpms_docker.sh | 21 ------------- ci/build_rpm/kernel_rpm_build.sh | 53 --------------------------------- ci/build_rpm/qemu_rpm_build.sh | 62 --------------------------------------- 4 files changed, 156 deletions(-) delete mode 100755 ci/build_rpm/build_rpms.sh delete mode 100755 ci/build_rpm/build_rpms_docker.sh delete mode 100755 ci/build_rpm/kernel_rpm_build.sh delete mode 100755 ci/build_rpm/qemu_rpm_build.sh (limited to 'ci/build_rpm') diff --git a/ci/build_rpm/build_rpms.sh b/ci/build_rpm/build_rpms.sh deleted file mode 100755 index 40cae6ccf..000000000 --- a/ci/build_rpm/build_rpms.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -set -eux -BUILD_FOR=${BUILD_FOR:-centos} - -function build_rpm_pkg { - case $1 in - centos) - sudo docker build -t kvm_rpm . - sudo docker run -v $WORKSPACE:/opt/kvmfornfv -t kvm_rpm \ - /opt/kvmfornfv/ci/build_rpm/build_rpms_docker.sh - ;; - *) echo "Not supported system"; exit 1;; - esac -} - -for system in $BUILD_FOR -do - build_rpm_pkg $system -done diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh deleted file mode 100755 index 708c8acbf..000000000 --- a/ci/build_rpm/build_rpms_docker.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -tmp_rpm_build_dir=/root/kvmfornfv -rpm_build_dir=/opt/kvmfornfv -tmp_rpm_output_dir=$tmp_rpm_build_dir/build_output -rpm_output_dir=$rpm_build_dir/build_output -cp -r $rpm_build_dir $tmp_rpm_build_dir - -# Build qemu rpm packages -cd $tmp_rpm_build_dir/qemu -make clean -./configure -cd $tmp_rpm_build_dir -./ci/build_rpm/qemu_rpm_build.sh build_output - -# Build kernel rpm packages -./ci/build_rpm/kernel_rpm_build.sh build_output - -# Move Kernel and Qemu Rpm builds from tmp_output_dir to output_dir -mv $tmp_rpm_output_dir/qemu-* $rpm_output_dir -mv $tmp_rpm_output_dir/kernel-* $rpm_output_dir diff --git a/ci/build_rpm/kernel_rpm_build.sh b/ci/build_rpm/kernel_rpm_build.sh deleted file mode 100755 index fa6383eb8..000000000 --- a/ci/build_rpm/kernel_rpm_build.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -kernel_src_dir=kernel -rpmbuild_dir=/tmp/kvmfornfv_rpmbuild.$$ -artifact_dir=${rpmbuild_dir}/RPMS/x86_64 -mkdir -p $artifact_dir -config_file="${kernel_src_dir}/arch/x86/configs/opnfv.config" -output_dir="$1" - -usage () { - echo "usage: ${0} output_dir" - exit 1 -} - -if [[ -z "$@" ]]; then - usage -fi - -if [ ! -d ${output_dir} -o ! -w ${output_dir} ] ; then - echo "${0}: Output directory '${output_dir}' does not exist or cannot \ - be written" - exit 1 -fi - -if [ ! -d ${kernel_src_dir} ] ; then - echo "${0}: Directory '${kernel_src_dir}' does not exist, run this script \ - from the root of kvmfornfv source tree" - exit 1 -fi - -if [ ! -f ${config_file} ] ; then - echo "${0}: ${config_file} does not exist" - exit 1 -fi - -echo -echo "Build" -echo - -cp -f ${config_file} "${kernel_src_dir}/.config" - -# Make timestamp part of version string for automated kernel boot verification -date "+-%y%m%d%H%M" > "${kernel_src_dir}/localversion-zzz" - -(cd ${kernel_src_dir}; make RPMOPTS="--define '_topdir ${rpmbuild_dir}'" rpm-pkg) -if [ ${?} -ne 0 ] ; then - echo "${0}: Kernel build failed" - rm -rf ${rpmbuild_dir} - exit 1 -fi - -cp -f ${artifact_dir}/* ${output_dir} - -rm -rf ${rpmbuild_dir} diff --git a/ci/build_rpm/qemu_rpm_build.sh b/ci/build_rpm/qemu_rpm_build.sh deleted file mode 100755 index 302d00354..000000000 --- a/ci/build_rpm/qemu_rpm_build.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -qemu_src_dir=qemu -workspace=/root -rpmbuild_dir=$workspace/rpmbuild -artifact_rpms=$rpmbuild_dir/RPMS -artifact_dir=$artifact_rpms/x86_64 -scripts_dir=ci/build_rpm -output_dir="$1" -VERSION=`grep -m 1 "VERSION" ${qemu_src_dir}/config-host.mak | cut -d= -f2-` - -usage () { - echo "usage: ${0} output_dir" - exit 1 -} - -if [[ -z "$@" ]]; then - usage -fi - -if [ ! -d ${output_dir} -o ! -w ${output_dir} ] ; then - echo "${0}: Output directory '${output_dir}' does not exist or cannot \ - be written" - exit 1 -fi - -if [ ! -d ${qemu_src_dir} ] ; then - echo "${0}: Directory '${qemu_src_dir}' does not exist, run this script \ - from the root of kvmfornfv source tree" - exit 1 -fi - -echo -echo "Build" -echo - -qemu_rpm_build() { - cp -r ${qemu_src_dir} ${qemu_src_dir}-$VERSION - tar -zcvf ${qemu_src_dir}-$VERSION.tar.gz ${qemu_src_dir}-$VERSION - mv ${qemu_src_dir}-$VERSION.tar.gz ${rpmbuild_dir}/SOURCES/ - - #create a spec file for rpm creation. - (cd ${scripts_dir}; ./mkspec $VERSION > qemu.spec) - cp ${scripts_dir}/qemu.spec ${rpmbuild_dir}/SPECS/ - - #build the qemu rpm with spec file developed - rpmbuild -ba ${rpmbuild_dir}/SPECS/qemu.spec - if [ ${?} -ne 0 ] ; then - echo "${0}: qemu build failed" - exit 1 - fi - rm -rf ${qemu_src_dir}-$VERSION - rm -rf ${rpmbuild_dir}/SOURCES/${qemu_src_dir}-$VERSION.tar.gz -} - -if [ ! -d ${rpmbuild_dir} ] ; then - mkdir -p ${rpmbuild_dir}/{BUILD,RPMS,SOURCES,SPECS,SRPMS} -fi - -qemu_rpm_build -latest_qemu_build=`ls -rt $artifact_dir | grep qemu-2.6* | tail -1` -cp $artifact_dir/$latest_qemu_build build_output -- cgit 1.2.3-korg