| Message ID | 20220708200340.13053-4-gvrose8192@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Remove OVS kernel driver | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | fail | apply and check: fail |
| ovsrobot/github-robot-_Build_and_Test | fail | github build: failed |
| ovsrobot/intel-ovs-compilation | fail | test: fail |
Bleep bloop. Greetings Gregory Rose, I am a robot and I have tried out your patch. Thanks for your contribution. I encountered some error that I wasn't expecting. See the details below. build: datapath/linux/compat/socket.c datapath/linux/compat/stt.c datapath/linux/compat/udp.c datapath/linux/compat/udp_tunnel.c datapath/linux/compat/utils.c datapath/linux/compat/vxlan.c datapath/meter.c datapath/meter.h datapath/nsh.c datapath/vport-geneve.c datapath/vport-gre.c datapath/vport-internal_dev.c datapath/vport-lisp.c datapath/vport-netdev.c datapath/vport-stt.c datapath/vport-vxlan.c datapath/vport.c datapath/vport.h See above for files that use tabs for indentation. Please use spaces instead. make[2]: *** [check-tabs] Error 1 make[2]: Leaving directory `/var/lib/jenkins/jobs/0day_robot_upstream_build_from_pw/workspace' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/var/lib/jenkins/jobs/0day_robot_upstream_build_from_pw/workspace' make: *** [all] Error 2 Please check this out. If you feel there has been an error, please email aconole@redhat.com Thanks, 0-day Robot
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 <gvrose8192@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 >
On Fri, Jul 8, 2022 at 10:29 PM Gregory Rose <gvrose8192@gmail.com> wrote: > 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 <gvrose8192@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. Or move the build-aux/initial-tab-allowed-files update in the same patch that removes the sources.
On 7/9/2022 12:09 AM, David Marchand wrote: > On Fri, Jul 8, 2022 at 10:29 PM Gregory Rose <gvrose8192@gmail.com> wrote: >> 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 <gvrose8192@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. > > Or move the build-aux/initial-tab-allowed-files update in the same > patch that removes the sources. > > That sounds like a good idea. Thanks, - 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
Remove references to the Linux datapath from auxiliary files and utilities since it is no longer supported. Signed-off-by: Greg Rose <gvrose8192@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(-)