From patchwork Fri Jul 8 20:03:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1654381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=YbKS6+Pp; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LfkkV2Jslz9s2R for ; Sat, 9 Jul 2022 06:04:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A9EE5848D5; Fri, 8 Jul 2022 20:03:59 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A9EE5848D5 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=YbKS6+Pp X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id clKbBACQz77h; Fri, 8 Jul 2022 20:03:58 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 6E9BE848CF; Fri, 8 Jul 2022 20:03:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6E9BE848CF Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4CDB8C0089; Fri, 8 Jul 2022 20:03:53 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7A5D9C0078 for ; Fri, 8 Jul 2022 20:03:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4478D60AF1 for ; Fri, 8 Jul 2022 20:03:51 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4478D60AF1 Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=YbKS6+Pp X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4cK9MIGQeK-N for ; Fri, 8 Jul 2022 20:03:50 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 629EA60B85 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by smtp3.osuosl.org (Postfix) with ESMTPS id 629EA60B85 for ; Fri, 8 Jul 2022 20:03:50 +0000 (UTC) Received: by mail-pj1-x1034.google.com with SMTP id v4-20020a17090abb8400b001ef966652a3so2980170pjr.4 for ; Fri, 08 Jul 2022 13:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=52wtb5jQf/PAlV4V0wHAdnT6byV1x4r6tHPJGWPhjJM=; b=YbKS6+PpFRPqmBDVkJbICW0rHxFUBagLHp9ccuwE9072YCD7ZU5RuCv3k+KfUUbWMY qT++sYlX//DBaTnuhY7sO5VM7gk/GA8goFsCPaTGFAfwTH7EdowtYN+hAYlDcfJBKJqO aPhCWA9XRMFhZgwr1GskStCH8CBzQfis/1mPdjQniCOw7eNFjBCR+lLno/9b6l0sFuiX Lki6a1mQkMFu8RCaarlUHgUhYBvusWRiyBXAKqr3X0U8Vl3/ChyydPMiiUV3fnLnfNfn 6Ru9NUYqGYnps5g8KyKME5u2GsaiEFN/sQoFH+NZQ1aOIr7Sz5ONifuVJSE+RGTDJR80 qJZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=52wtb5jQf/PAlV4V0wHAdnT6byV1x4r6tHPJGWPhjJM=; b=mzVClW9nBPI81pr1Sz0p6veQCJ9nMzyklvWbDYSvlmUfv9Ph9te+QRhhe0lani/Lva BMzPS1UUkWaUTAYziMFnjt1kVZXaE6Y+87odjCU1kaQpRdDagnw80fanUWR9UTevneZs CPG/MDB5qYPp533biyr8xwylb03p47dNqwzRuaNPJpmVxKfgjYoSUB988Wjaab2R15sx bHjEK837b/VW4rjv9/B4t/jHPHxILMlqwse0pS2M9anm/7R0FcYfrXXKehayctPcJGob SshqFNHl+JD7MlZRzyFiabALxiBATlcSUusxkGblroD+CNutTxHubIfvSVpADGM9pPaN bv8A== X-Gm-Message-State: AJIora/KJHL7ExnXcrmKtWxzFkERHHmvkorLs6dugMjkTqed0VgpMr7E R0nrJ90m3V5/HmErkvTA2sw5tKsfMLA= X-Google-Smtp-Source: AGRyM1sqr1iHwgUCK48jRXbxEj1tOqWCzp5OU3+JlxM4p5aSQopt2/zG/f2H74EicEy21+VkQruAWg== X-Received: by 2002:a17:902:a613:b0:168:a216:f3ff with SMTP id u19-20020a170902a61300b00168a216f3ffmr5316267plq.21.1657310629572; Fri, 08 Jul 2022 13:03:49 -0700 (PDT) Received: from VMware-box.domain ([97.115.145.232]) by smtp.googlemail.com with ESMTPSA id q17-20020a656851000000b003fdc16f5de2sm28311085pgt.15.2022.07.08.13.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 13:03:49 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Fri, 8 Jul 2022 13:03:36 -0700 Message-Id: <20220708200340.13053-4-gvrose8192@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220708200340.13053-1-gvrose8192@gmail.com> References: <20220708200340.13053-1-gvrose8192@gmail.com> Subject: [ovs-dev] [PATCH V3 3/7] aux:utilities: Remove references to the Linux datapath X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Remove references to the Linux datapath from auxiliary files and utilities since it is no longer supported. Signed-off-by: Greg Rose --- build-aux/initial-tab-allowed-files | 1 - utilities/docker/debian/build-kernel-modules.sh | 13 ++++--------- utilities/ovs-dev.py | 17 +++-------------- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/build-aux/initial-tab-allowed-files b/build-aux/initial-tab-allowed-files index 1e9573c69..8bd23698e 100644 --- a/build-aux/initial-tab-allowed-files +++ b/build-aux/initial-tab-allowed-files @@ -3,7 +3,6 @@ \.mk$ \.png$ \.sln$ -^datapath/ ^include/linux/ ^include/sparse/rte_ ^include/windows/ diff --git a/utilities/docker/debian/build-kernel-modules.sh b/utilities/docker/debian/build-kernel-modules.sh index 872ba1eb8..aaee73ff7 100755 --- a/utilities/docker/debian/build-kernel-modules.sh +++ b/utilities/docker/debian/build-kernel-modules.sh @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -KERNEL_VERSION=$1 +KERNEL_VERSION=host OVS_BRANCH=$2 GITHUB_SRC=$3 @@ -39,18 +39,13 @@ cd ovs 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 +eval $config -make -j8; make install; make modules_install +make -j8; make install # remove deps to make the container light weight. apt-get remove --purge -y ${build_deps} apt-get autoremove -y --purge cd ..; rm -rf ovs basic_utils="vim kmod net-tools uuid-runtime iproute2" -apt-get install -y ${basic_utils} \ No newline at end of file +apt-get install -y ${basic_utils} diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py index 534c5e7f1..e85ad6746 100755 --- a/utilities/ovs-dev.py +++ b/utilities/ovs-dev.py @@ -184,12 +184,9 @@ def tag(): ctags = ['ctags', '-R', '-f', '.tags'] try: - _sh(*(ctags + ['--exclude="datapath/"'])) + _sh(*ctags) except: - try: - _sh(*ctags) # Some versions of ctags don't have --exclude - except: - pass + pass try: _sh('cscope', '-R', '-b') @@ -351,7 +348,7 @@ Basic Configuration: # First install the basic requirements needed to build Open vSwitch. sudo apt-get install git build-essential libtool autoconf pkg-config \\ - libssl-dev gdb libcap-ng-dev linux-headers-`uname -r` + libssl-dev gdb libcap-ng-dev # Next clone the Open vSwitch source. git clone https://github.com/openvswitch/ovs.git %(ovs)s @@ -362,14 +359,6 @@ Basic Configuration: # Build the switch. %(v)s conf make - # Install the kernel module - sudo insmod %(ovs)s/datapath/linux/openvswitch.ko - - # If needed, manually load all required vport modules: - sudo insmod %(ovs)s/datapath/linux/vport-vxlan.ko - sudo insmod %(ovs)s/datapath/linux/vport-geneve.ko - [...] - # Run the switch. %(v)s run