From 843dfef73c86a8ad71afe36e2db9e711dddc199a Mon Sep 17 00:00:00 2001
From: shravani <shravani.p@tcs.com>
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 <shravani.p@tcs.com>
---
 ci/build_deb/build_debs.sh        | 20 ------------
 ci/build_deb/build_debs_docker.sh | 22 -------------
 ci/build_deb/kernel_deb_build.sh  | 69 ---------------------------------------
 ci/build_deb/qemu_deb_build.sh    | 60 ----------------------------------
 4 files changed, 171 deletions(-)
 delete mode 100755 ci/build_deb/build_debs.sh
 delete mode 100755 ci/build_deb/build_debs_docker.sh
 delete mode 100755 ci/build_deb/kernel_deb_build.sh
 delete mode 100755 ci/build_deb/qemu_deb_build.sh

(limited to 'ci/build_deb')

diff --git a/ci/build_deb/build_debs.sh b/ci/build_deb/build_debs.sh
deleted file mode 100755
index 2fcd3629b..000000000
--- a/ci/build_deb/build_debs.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -eux
-BUILD_FOR=${BUILD_FOR:-ubuntu}
-
-function build_deb_pkg {
-  case $1 in
-    ubuntu)
-      sudo docker build -t kvm_deb .
-      sudo docker run -v $WORKSPACE:/opt/kvmfornfv -t  kvm_deb \
-                      /opt/kvmfornfv/ci/build_deb/build_debs_docker.sh
-    ;;
-    *) echo "Not supported system"; exit 1;;
-  esac
-}
-
-for system in $BUILD_FOR
-do
-  build_deb_pkg $system
-done
diff --git a/ci/build_deb/build_debs_docker.sh b/ci/build_deb/build_debs_docker.sh
deleted file mode 100755
index 3fd35ff54..000000000
--- a/ci/build_deb/build_debs_docker.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-tmp_deb_build_dir=/root/kvmfornfv
-deb_build_dir=/opt/kvmfornfv
-tmp_deb_output_dir=$tmp_deb_build_dir/build_output
-deb_output_dir=$deb_build_dir/build_output
-cp -r $deb_build_dir $tmp_deb_build_dir
-
-# Build qemu debian packages
-cd $tmp_deb_build_dir/qemu
-make clean
-./configure
-make
-cd $tmp_deb_build_dir
-./ci/build_deb/qemu_deb_build.sh build_output
-
-# Build kernel debian packages
-./ci/build_deb/kernel_deb_build.sh build_output
-
-# Move Kernel and Qemu Debian builds from tmp_output_dir to output_dir
-mv $tmp_deb_output_dir/qemu-* $deb_output_dir
-mv $tmp_deb_output_dir/linux-* $deb_output_dir
diff --git a/ci/build_deb/kernel_deb_build.sh b/ci/build_deb/kernel_deb_build.sh
deleted file mode 100755
index 824960e7f..000000000
--- a/ci/build_deb/kernel_deb_build.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-SRC=/root
-kernel_src_dir=kernel
-config_file="arch/x86/configs/opnfv.config"
-VERSION="1.0.OPNFV"
-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
-
-quirks() {
-#
-# Apply out of tree patches
-#
-for i in $SRC/kvmfornfv/patches/$1/*.patch
-do
-    if [ -f "$i" ]
-    then
-        echo "Applying: $i"
-        patch -p1 <$i
-    fi
-done
-}
-
-quirks kernel
-
-cd kernel
-
-if [ ! -f ${config_file} ] ; then
-    echo "${0}: ${config_file} does not exist"
-    exit 1
-fi
-
-# Workaround build bug on Ubuntu 14.04
-cat <<EOF > arch/x86/boot/install.sh
-#!/bin/sh
-cp -a -- "\$2" "\$4/vmlinuz-\$1"
-EOF
-
-# Configure the kernel
-cp $config_file .config
-
-make oldconfig </dev/null
-
-# Build the kernel debs
-make-kpkg clean
-
-fakeroot make-kpkg --initrd --revision=$VERSION kernel_image kernel_headers
-
-make
-
-mv /root/kvmfornfv/linux-* /root/kvmfornfv/build_output
diff --git a/ci/build_deb/qemu_deb_build.sh b/ci/build_deb/qemu_deb_build.sh
deleted file mode 100755
index f6d398a36..000000000
--- a/ci/build_deb/qemu_deb_build.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-qemu_src_dir=qemu
-workspace=/root
-debbuild_dir=$workspace/debbuild
-scripts_dir=ci/build_deb
-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_deb_build() {
-    mkdir -p $debbuild_dir/qemu-$VERSION
-    cp -r $qemu_src_dir $debbuild_dir/qemu-$VERSION
-    mkdir -p $debbuild_dir/qemu-$VERSION/DEBIAN
-    touch control
-
-#creating control file for debian build.
-    (cd ${scripts_dir}; ./mkcontrol.sh $VERSION > control)
-    mv $scripts_dir/control $debbuild_dir/qemu-$VERSION/DEBIAN/control
-
-#building the qemu debian with control file developed.
-    dpkg-deb --build $debbuild_dir/qemu-$VERSION
-    if [ ${?} -ne 0 ] ; then
-        echo "${0}: qemu build failed"
-        exit 1
-    fi
-}
-
-if [ ! -d ${debbuild_dir} ] ; then
-    echo "creating debbuild directory"
-    mkdir -p $debbuild_dir
-fi
-
-qemu_deb_build
-latest_qemu_build=`ls -rt $debbuild_dir | tail -1`
-cp $debbuild_dir/$latest_qemu_build build_output
-- 
cgit 1.2.3-korg