--with-linux can be made configurable while building containers
for leveraging kernel modules installed on host.
KERNEL_VERSION=host should be used in env variable for the same.
Signed-off-by: Aliasgar Ginwala <aginwala@ebay.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
# make push
REPO = ${DOCKER_REPO}
# make push
REPO = ${DOCKER_REPO}
-tag = ${OVS_VERSION}_${KERNEL_VERSION}
+tag = ${OVS_VERSION}_${DISTRO}_${KERNEL_VERSION}
build: ;docker build -t ${REPO}:${tag} --build-arg DISTRO=${DISTRO} \
--build-arg OVS_BRANCH=${OVS_BRANCH} \
build: ;docker build -t ${REPO}:${tag} --build-arg DISTRO=${DISTRO} \
--build-arg OVS_BRANCH=${OVS_BRANCH} \
GITHUB_SRC=$3
# Install deps
GITHUB_SRC=$3
# Install deps
-linux="linux-image-$KERNEL_VERSION linux-headers-$KERNEL_VERSION"
build_deps="apt-utils libelf-dev build-essential libssl-dev python3 \
wget gdb autoconf libtool git automake bzip2 debhelper dh-autoreconf openssl"
apt-get update
build_deps="apt-utils libelf-dev build-essential libssl-dev python3 \
wget gdb autoconf libtool git automake bzip2 debhelper dh-autoreconf openssl"
apt-get update
-apt-get install -y ${linux} ${build_deps}
+if [ $KERNEL_VERSION != "host" ]; then
+ linux="linux-image-$KERNEL_VERSION linux-headers-$KERNEL_VERSION"
+ apt-get install -y ${linux}
+fi
+
+apt-get install -y ${build_deps}
# get the source
mkdir /build; cd /build
# get the source
mkdir /build; cd /build
# build and install
./boot.sh
# build and install
./boot.sh
-./configure --localstatedir="/var" --sysconfdir="/etc" --prefix="/usr" \
---with-linux=/lib/modules/$KERNEL_VERSION/build --enable-ssl
+
+config="./configure --localstatedir="/var" --sysconfdir="/etc" --prefix="/usr"
+--enable-ssl"
+
+if [ $KERNEL_VERSION = "host" ]; then
+ eval $config
+else
+ withlinux=" --with-linux=/lib/modules/$KERNEL_VERSION/build"
+ eval $config$withlinux
+fi
+
make -j8; make install; make modules_install
# remove deps to make the container light weight.
make -j8; make install; make modules_install
# remove deps to make the container light weight.
-vfile:info --mlockall --no-chdir \
--log-file=/var/log/openvswitch/ovs-vswitchd.log
;;
-vfile:info --mlockall --no-chdir \
--log-file=/var/log/openvswitch/ovs-vswitchd.log
;;
- *) echo "$0 [ovsdb-server|ovs-vswitchd]"
-esac
+ "ovs-vswitchd-host") /usr/share/openvswitch/scripts/ovs-ctl \
+ --no-ovsdb-server start
+ /usr/share/openvswitch/scripts/ovs-ctl stop
+ ovs-vswitchd --pidfile -vconsole:emer \
+ -vsyslog:err -vfile:info --mlockall --no-chdir \
+ --log-file=/var/log/openvswitch/ovs-vswitchd.log
+ ;;
+ *) echo "$0 [ovsdb-server|ovs-vswitchd|ovs-vswitchd-host]"
+esac
\ No newline at end of file