[ovs-dev] [PATCH ovn 1/3] Skip using with-linux for ovn container build scripts

amginwal at gmail.com amginwal at gmail.com
Sat Oct 26 01:45:53 UTC 2019


From: Aliasgar Ginwala <aginwala at ebay.com>

Signed-off-by: Aliasgar Ginwala <aginwala at ebay.com>
---
 utilities/docker/Makefile          |  2 --
 utilities/docker/debian/Dockerfile |  3 +--
 utilities/docker/debian/build.sh   | 13 +++++--------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/utilities/docker/Makefile b/utilities/docker/Makefile
index e2b2c2a17..304723f8f 100644
--- a/utilities/docker/Makefile
+++ b/utilities/docker/Makefile
@@ -1,6 +1,5 @@
 #export OVN_BRANCH=master
 #export OVN_VERSION=2.12
-#export KERNEL_VERSION=4.15.0-54-generic
 #export DISTRO=debian
 #export GITHUB_SRC=https://github.com/ovn-org/ovn.git
 #export DOCKER_REPO=ovn-org/ovn
@@ -14,7 +13,6 @@ tag = ${OVN_VERSION}_${KERNEL_VERSION}
 
 build: ;docker build -t ${REPO}:${tag} --build-arg DISTRO=${DISTRO} \
 --build-arg OVN_BRANCH=${OVN_BRANCH} \
---build-arg KERNEL_VERSION=${KERNEL_VERSION} \
 --build-arg GITHUB_SRC=${GITHUB_SRC} -f ${DISTRO}/Dockerfile .
 
 .PHONY: build
diff --git a/utilities/docker/debian/Dockerfile b/utilities/docker/debian/Dockerfile
index 30504480d..9c35f6b16 100644
--- a/utilities/docker/debian/Dockerfile
+++ b/utilities/docker/debian/Dockerfile
@@ -2,12 +2,11 @@ FROM ubuntu:16.04
 MAINTAINER "Aliasgar Ginwala" <aginwala at ebay.com>
 
 ARG OVN_BRANCH
-ARG KERNEL_VERSION
 ARG GITHUB_SRC
 ARG DISTRO
 
 copy $DISTRO/build.sh /build.sh
-RUN /build.sh $KERNEL_VERSION $OVN_BRANCH $GITHUB_SRC
+RUN /build.sh $OVN_BRANCH $GITHUB_SRC
 
 COPY ovn_default_nb_port /etc/ovn/ovn_default_nb_port
 COPY ovn_default_sb_port /etc/ovn/ovn_default_sb_port
diff --git a/utilities/docker/debian/build.sh b/utilities/docker/debian/build.sh
index 981ff796e..8e492bf76 100755
--- a/utilities/docker/debian/build.sh
+++ b/utilities/docker/debian/build.sh
@@ -12,18 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-KERNEL_VERSION=$1
-OVN_BRANCH=$2
-GITHUB_SRC=$3
+OVN_BRANCH=$1
+GITHUB_SRC=$2
 
 # Install deps
-linux="linux-image-$KERNEL_VERSION linux-headers-$KERNEL_VERSION"
 build_deps="apt-utils libelf-dev build-essential libssl-dev python3 \
 python3-six wget gdb autoconf libtool git automake bzip2 debhelper \
 dh-autoreconf openssl"
 
 apt-get update
-apt-get install -y ${linux} ${build_deps}
+apt-get install -y ${build_deps}
 
 # get ovs source always from master as its needed as dependency
 mkdir /build; cd /build
@@ -35,7 +33,7 @@ mkdir _gcc;
 ./boot.sh
 cd _gcc
 ../configure --localstatedir="/var" --sysconfdir="/etc" --prefix="/usr" \
---with-linux=/lib/modules/$KERNEL_VERSION/build --enable-ssl
+--enable-ssl
 cd ..; make -C _gcc install; cd ..
 
 
@@ -46,8 +44,7 @@ cd ovn
 # build and install
 ./boot.sh
 ./configure --localstatedir="/var" --sysconfdir="/etc" --prefix="/usr" \
---with-linux=/lib/modules/$KERNEL_VERSION/build --enable-ssl \
---with-ovs-source=/build/ovs/ --with-ovs-build=/build/ovs/_gcc
+--enable-ssl --with-ovs-source=/build/ovs/ --with-ovs-build=/build/ovs/_gcc
 make -j8; make install
 
 # remove deps to make the container light weight.
-- 
2.20.1 (Apple Git-117)



More information about the dev mailing list