On 7/8/2022 1:03 PM, Greg Rose wrote:
Remove references to the Linux datapath from auxiliary files and
utilities since it is no longer supported.
Signed-off-by: Greg Rose <gvrose8...@gmail.com>
---
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(-)
Apparently I need to move this patch to *after* the removal of the
Linux datapath files. I'll do that in V4.
- Greg
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
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
