summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavidjchou <david.j.chou@intel.com>2016-08-11 12:22:01 -0700
committerdavidjchou <david.j.chou@intel.com>2016-08-12 07:24:22 -0700
commitc149674b4725b5d9bcdab22c180ef8ecba033523 (patch)
tree790f6b349cec4180e7f6470a91d6c328f28681db
parent1f0befb721c82e39c4839a552b3933f417317e00 (diff)
Build kernel in another directory and README.md update for fuel-plugin
1. Since some files generated during kernel building are only root writeable, this will cause "permission denied" issue in "make clean" in fuel@opnfv iso building which uses normal user priviledge. Building kernel in another directory than the directory mapped into Docker container can resolve the issue. 2. Update and typing error correction for README.md Upstream status - NA Change-Id: Icdd1a12d38f90619dd91588cb9e0f5b9bdfe95d1 Signed-off-by: davidjchou <david.j.chou@intel.com>
-rw-r--r--fuel-plugin/README.md8
-rwxr-xr-xfuel-plugin/build_kvm.sh10
2 files changed, 13 insertions, 5 deletions
diff --git a/fuel-plugin/README.md b/fuel-plugin/README.md
index 77dee17c2..63ddc4eb9 100644
--- a/fuel-plugin/README.md
+++ b/fuel-plugin/README.md
@@ -38,12 +38,12 @@ Buiding system pre-requistes
Buid instruction
----------------
1. Clone the kvmfornfv repo from https://gerrit.opnfv.org/gerrit/kvmfornfv by
- "git clone https://gerrit.opnfv.org/gerrit/kvmfornfv"
-2. You can modify the kernel code in kvmfornfv/kernel as you want
+ "git clone https://gerrit.opnfv.org/gerrit/kvmfornfv".
+2. You can modify the kernel code in kvmfornfv/kernel as you want.
3. Go to kvmfornfv/fuel-plugin/vagrant, type "vagrant destroy -f; vagrant up;
- estroy -f", the building will start
+ vagarant destroy -f", the building will start.
4. When the building completes, you should find the built fuel-plugin-kvm in
- kvmfornfv/fuel-plugin with the name as "fuel-plugin-kvm-0.9-0.9.0-1.noarch.rpm",
+ kvmfornfv/fuel-plugin/vagrant with the name as "fuel-plugin-kvm-0.9-0.9.0-1.noarch.rpm",
where "0.9-0.9.0-1" is the version information for this plugin, this version info
may be changed in future. The built plugin incules the changes you made.
diff --git a/fuel-plugin/build_kvm.sh b/fuel-plugin/build_kvm.sh
index 9984f3bab..befadd95f 100755
--- a/fuel-plugin/build_kvm.sh
+++ b/fuel-plugin/build_kvm.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-SRC=/
+SRC=/root
CONFIG="arch/x86/configs/opnfv.config"
VERSION="1.0.OPNFV"
OVS_COMMIT="4ff6642f3c1dd8949c2f42b3310ee2523ee970a6"
@@ -22,6 +22,11 @@ done
apt-get update
apt-get install -y git fakeroot build-essential ncurses-dev xz-utils kernel-package bc autoconf automake libtool python python-pip
+#
+# Build kernel in another directory, so some files (which are root writeable only) generated during kernel
+# building wouldn't remain in the source directory mapped into Docker container
+#
+cp -r /kvmfornfv $SRC/.
cd $SRC
# Get the Open VSwitch sources
@@ -68,3 +73,6 @@ depmod -b ovs.$$ -a `ls ovs.$$/lib/modules`
dpkg-deb -b ovs.$$ $SRC/kvmfornfv/linux-image*.deb
rm -rf ovs.$$
+cp $SRC/kvmfornfv/linux-headers*.deb /kvmfornfv/.
+cp $SRC/kvmfornfv/linux-image*.deb /kvmfornfv/.
+