From patchwork Sat Oct 26 01:45:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aginwala aginwala X-Patchwork-Id: 1184539 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pCXwDp+X"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 470P2n1W3hz9sPV for ; Sat, 26 Oct 2019 12:46:08 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C2164EDC; Sat, 26 Oct 2019 01:46:03 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 1153ADD1 for ; Sat, 26 Oct 2019 01:46:02 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 0BC7287B for ; Sat, 26 Oct 2019 01:45:59 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id v4so2846737pff.6 for ; Fri, 25 Oct 2019 18:45:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=//3vZEdQyigAJPzFm0L0NodLXwYiXLJoKI/cGLF7NXA=; b=pCXwDp+XGQGQaNPMyrue6+5SAsyxQPt6cDJ4sBL3PrS6iKH+1HKklSNt9vG5zXwC57 Ut1w+oCgncdxDhQf2J1b/kmv60zsMo+ADJ18aDUf7/TdJlrQR5DmBrvQ3F85ibAR1F5R b1fV89VzCSjOEeYDb2mYrFt70x4/Yg6Ct+XKfnMvF7nWJ7S3RGfhfaLLJR6hmWth8LeA bysDzVEss8afeRNlYbT0szelAMAkwxgU7/66TjxcYbUdnARrpUNIKyfm19Y3kNG6ZSyw ZBcs36YeRu2ExM9qesP0cfvb58bO7vVz7ZFZdoLcHgqp54QeLuKLyEPDy2pqIoc6GWdw +Xtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=//3vZEdQyigAJPzFm0L0NodLXwYiXLJoKI/cGLF7NXA=; b=mZpPuhPZPJOuKAfHFrZqZGR/P8orD1Mrowo7OomDeOrh9IOPSzhFqUrsm+Ebc626rS aY9jtnRkLxrW+ROFuPdp4zcH4Q+BuAMbJc+hbpjnpucW/2DV+lO3AJC4nYis9GSsxecZ Ai4j9flkwz8mgdJjWoBAMDnmF/povaU6doYRg478AH9do81G9ta6ts+LybAhFk1rNmGH 4fYwYaaCy1rCj95T+OErJsSTxO4n79wOpUzP5T2nIgZQFbcI/fPmHCJyGC1mJ1Vrhdb3 Slpd7MlVxyeyzHxCyRFdVNiNpcc4FXxnSsMK1QYpG8iYYzSK03Gx1BR2PG2Wcn98L3gl n+6A== X-Gm-Message-State: APjAAAVPqwK0xeg7b2/K2YtPCDI96B5YHTbr7EAikgIFNgYK9n89cob0 o7FIULVUchHv3TjQHsN+od0lEAy8 X-Google-Smtp-Source: APXvYqxfdIxraBKauThjurWI5+Rf/GqVc4Wh2zFgb3/ZP4Gqk6H3zXNkpRf7MAe45T6Ya7C87QC5+Q== X-Received: by 2002:a17:90a:bd10:: with SMTP id y16mr7553809pjr.111.1572054359202; Fri, 25 Oct 2019 18:45:59 -0700 (PDT) Received: from LM-SJC-11015761.corp.ebay.com ([216.113.160.77]) by smtp.gmail.com with ESMTPSA id x70sm4803869pfd.132.2019.10.25.18.45.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Oct 2019 18:45:58 -0700 (PDT) From: amginwal@gmail.com To: dev@openvswitch.org Date: Fri, 25 Oct 2019 18:45:53 -0700 Message-Id: <20191026014555.4993-1-amginwal@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Aliasgar Ginwala Subject: [ovs-dev] [PATCH ovn 1/3] Skip using with-linux for ovn container build scripts X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Aliasgar Ginwala Signed-off-by: Aliasgar Ginwala --- 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" 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.