Message ID | 20220708161417.12438-4-gvrose8192@gmail.com |
---|---|
State | Superseded |
Headers | show |
Series | Remove OVS kernel driver | expand |
Context | Check | Description |
---|---|---|
ovsrobot/apply-robot | warning | apply and check: warning |
ovsrobot/intel-ovs-compilation | success | test: success |
Bleep bloop. Greetings Greg 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. Patch skipped due to previous failure. 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 9:14 AM, Greg Rose wrote: > Remove the RHEL 6 kernel driver module specification. > > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > --- > Documentation/intro/install/rhel.rst | 18 ---- > poc/playbook-centos-builder.yml | 8 -- > rhel/automake.mk | 10 --- > rhel/kmod-openvswitch-rhel6.spec.in | 123 --------------------------- > 4 files changed, 159 deletions(-) > delete mode 100644 rhel/kmod-openvswitch-rhel6.spec.in I think I need to squash this patch and patch 2/8 together or else it will cause build errors. I'll do that in V3. - Greg > > diff --git a/Documentation/intro/install/rhel.rst b/Documentation/intro/install/rhel.rst > index b21b274b7..d1fc42021 100644 > --- a/Documentation/intro/install/rhel.rst > +++ b/Documentation/intro/install/rhel.rst > @@ -194,24 +194,6 @@ the unit tests, run:: > /lib/modules/2.6.32-279.el6.x86_64/build doesn't exist`` or similar, then > the kernel-devel package is missing or buggy. > > -Kernel Module > -~~~~~~~~~~~~~ > - > -On RHEL 6, to build the Open vSwitch kernel module run:: > - > - $ rpmbuild -bb rhel/kmod-openvswitch-rhel6.spec > - > -You might have to specify a kernel version and/or variants, e.g.:: > - > - $ rpmbuild -bb \ > - -D "kversion 2.6.32-131.6.1.el6.x86_64" \ > - -D "kflavors default debug kdump" \ > - rhel/kmod-openvswitch-rhel6.spec > - > -This produces an "kmod-openvswitch" RPM for each kernel variant, in this > -example: "kmod-openvswitch", "kmod-openvswitch-debug", and > -"kmod-openvswitch-kdump". > - > .. _rhel-script-integrations: > > Red Hat Network Scripts Integration > diff --git a/poc/playbook-centos-builder.yml b/poc/playbook-centos-builder.yml > index e902db75d..b38a6c4ef 100644 > --- a/poc/playbook-centos-builder.yml > +++ b/poc/playbook-centos-builder.yml > @@ -41,13 +41,11 @@ > chdir: /git/ovs/rhel > with_items: > - openvswitch.spec > - - kmod-openvswitch-rhel6.spec > > - name: Install build dependencies specified from spec files > shell: echo "y" | yum-builddep /tmp/{{item}} > with_items: > - openvswitch.spec > - - kmod-openvswitch-rhel6.spec > > - name: Create rpm dev tree > command: rpmdev-setuptree > @@ -81,18 +79,12 @@ > line: "Release: {{ ansible_local.builder.release }}" > with_items: > - openvswitch.spec > - - kmod-openvswitch-rhel6.spec > > - name: Build Open vSwitch user space rpms > command: rpmbuild -bb --without check rhel/openvswitch.spec > args: > chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}" > > - - name: Build Open vSwitch kmod rpms (only for currently loaded kernel) > - command: rpmbuild -bb --without check rhel/kmod-openvswitch-rhel6.spec > - args: > - chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}" > - > - name: Copy RPM packages to /var/www/html > command: cp -r /root/rpmbuild/RPMS/ /var/www/html > > diff --git a/rhel/automake.mk b/rhel/automake.mk > index 235779b49..51ee9b961 100644 > --- a/rhel/automake.mk > +++ b/rhel/automake.mk > @@ -13,10 +13,6 @@ EXTRA_DIST += \ > rhel/etc_openvswitch_default.conf \ > rhel/etc_sysconfig_network-scripts_ifdown-ovs \ > rhel/etc_sysconfig_network-scripts_ifup-ovs \ > - rhel/openvswitch-dkms.spec \ > - rhel/openvswitch-dkms.spec.in \ > - rhel/kmod-openvswitch-rhel6.spec \ > - rhel/kmod-openvswitch-rhel6.spec.in \ > rhel/openvswitch.spec \ > rhel/openvswitch.spec.in \ > rhel/openvswitch-fedora.spec \ > @@ -39,12 +35,6 @@ update_rhel_spec = \ > < $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \ > if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi > > -$(srcdir)/rhel/openvswitch-dkms.spec: rhel/openvswitch-dkms.spec.in $(top_builddir)/config.status > - $(update_rhel_spec) > - > -$(srcdir)/rhel/kmod-openvswitch-rhel6.spec: rhel/kmod-openvswitch-rhel6.spec.in $(top_builddir)/config.status > - $(update_rhel_spec) > - > $(srcdir)/rhel/openvswitch.spec: rhel/openvswitch.spec.in $(top_builddir)/config.status > $(update_rhel_spec) > > diff --git a/rhel/kmod-openvswitch-rhel6.spec.in b/rhel/kmod-openvswitch-rhel6.spec.in > deleted file mode 100644 > index de69863d7..000000000 > --- a/rhel/kmod-openvswitch-rhel6.spec.in > +++ /dev/null > @@ -1,123 +0,0 @@ > -# Spec file for Open vSwitch kernel modules on Red Hat Enterprise > -# Linux 6. > - > -# Copyright (C) 2011, 2012, 2018 Nicira, Inc. > -# > -# Copying and distribution of this file, with or without modification, > -# are permitted in any medium without royalty provided the copyright > -# notice and this notice are preserved. This file is offered as-is, > -# without warranty of any kind. > - > -%define oname openvswitch > -%{!?release_number:%define release_number 1} > - > -Name: kmod-%{oname} > -Version: @VERSION@ > -Release: %{release_number}%{?dist} > -Summary: Open vSwitch kernel module > - > -Group: System/Kernel > -License: GPLv2 > -URL: http://openvswitch.org/ > -Source0: %{oname}-%{version}.tar.gz > -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) > - > -# Without this we get an empty openvswitch-debuginfo package (whose name > -# conflicts with the openvswitch-debuginfo package for OVS userspace). > -%undefine _enable_debug_packages > - > -%define kernel_source_extended() /usr/src/kernels/%{2}$([ %{1} = default ] || echo ".%{1}") > - > -# Use -D 'kversion 2.6.32-131.6.1.el6.x86_64' to build package > -# for specified kernel version. > -# Use -D 'kversion 3.10.0-693.1.1.el7.x86_64 3.10.0-693.17.1.el7.x86_64' > -# to build package for mulitple kernel versions in the same package > -# This only works for kernel 3.10.0 major revision 693 (RHEL 7.4) > -# and major revision 327 (RHEL 7.2) > -# By default, build against the latest installed kernel-devel > -%{!?kversion:%global kversion %(rpm -qa | egrep "^kernel(-rt|-aarch64)?-devel" | /usr/lib/rpm/redhat/rpmsort -r | head -n 1| sed "s/^kernel.*-devel-//")} > - > -# Use -D 'kflavors default debug kdump' to build packages for > -# specified kernel variants. > -%{!?kflavors:%global kflavors default} > - > -%description > -Open vSwitch Linux kernel module. > - > -%prep > - > -%setup -n %{oname}-%{version} > - > -%build > -for kv in %{kversion}; do > - for flavor in %{kflavors}; do > - mkdir -p _$flavor/_$kv > - (cd _$flavor/_$kv && ../../configure --with-linux="%{kernel_source_extended $flavor $kv}") > - %{__make} -C _$flavor/_$kv/datapath/linux %{?_smp_mflags} > - done > -done > - > -%install > -export INSTALL_MOD_PATH=$RPM_BUILD_ROOT > -export INSTALL_MOD_DIR=extra/%{oname} > -for kv in %{kversion}; do > - for flavor in %{kflavors} ; do > - make -C %{kernel_source_extended $flavor $kv} modules_install \ > - M="`pwd`"/_$flavor/_$kv/datapath/linux > - # Cleanup unnecessary kernel-generated module dependency files. > - find $INSTALL_MOD_PATH/lib/modules -iname 'modules.*' -exec rm {} \; > - done > -done > -install -d %{buildroot}%{_sysconfdir}/depmod.d/ > -for kv in %{kversion}; do > - for module in %{buildroot}/lib/modules/$kv/$INSTALL_MOD_DIR/*.ko; > - do > - modname="$(basename ${module})" > - grep -qsPo "^\s*override ${modname%.ko} \* extra\/%{oname}" %{oname}.conf || \ > - echo "override ${modname%.ko} * extra/%{oname}" >> %{oname}.conf > - grep -qsPo "^\s*override ${modname%.ko} \* weak-updates\/%{oname}" %{oname}.conf || \ > - echo "override ${modname%.ko} * weak-updates/%{oname}" >> %{oname}.conf > - done > -done > -install -m 644 %{oname}.conf %{buildroot}%{_sysconfdir}/depmod.d/ > -install -d -m 0755 $RPM_BUILD_ROOT/usr/share/%{oname}/scripts > -install -p -m 0755 rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh \ > - $RPM_BUILD_ROOT/usr/share/%{oname}/scripts/ovs-kmod-manage.sh > - > -%post > -current_kernel=$(uname -r) > -IFS=. read installed_major installed_minor installed_micro installed_arch \ > - installed_build <<<"${current_kernel##*-}" > -if [ "$installed_major" = "327" ] || [ "$installed_major" = "693" ]; then > - # Workaround for RHEL 7.2 and 7.4 > - if [ -x "/usr/share/%{oname}/scripts/ovs-kmod-manage.sh" ]; then > - /usr/share/%{oname}/scripts/ovs-kmod-manage.sh > - fi > -else > - # Ensure that modprobe will find our modules. > - for k in $(cd /lib/modules && /bin/ls); do > - [ -d "/lib/modules/$k/kernel/" ] && /sbin/depmod -a "$k" > - done > - if [ -x "/sbin/weak-modules" ]; then > - rpm -ql kmod-%{oname} | grep '\.ko$' | \ > - /sbin/weak-modules --add-modules > - fi > -fi > - > -%postun > -if [ "$1" = 0 ]; then # Erase, not upgrade > - for kname in `ls -d /lib/modules/*` > - do > - rm -rf $kname/weak-updates/openvswitch > - done > -fi > -/sbin/depmod -a > - > -%files > -%defattr(644,root,root,755) > -/etc/depmod.d/%{oname}.conf > -/lib/modules/ > -%attr(755,root,root) /usr/share/%{oname}/scripts/ovs-kmod-manage.sh > - > -%clean > -rm -rf $RPM_BUILD_ROOT
diff --git a/Documentation/intro/install/rhel.rst b/Documentation/intro/install/rhel.rst index b21b274b7..d1fc42021 100644 --- a/Documentation/intro/install/rhel.rst +++ b/Documentation/intro/install/rhel.rst @@ -194,24 +194,6 @@ the unit tests, run:: /lib/modules/2.6.32-279.el6.x86_64/build doesn't exist`` or similar, then the kernel-devel package is missing or buggy. -Kernel Module -~~~~~~~~~~~~~ - -On RHEL 6, to build the Open vSwitch kernel module run:: - - $ rpmbuild -bb rhel/kmod-openvswitch-rhel6.spec - -You might have to specify a kernel version and/or variants, e.g.:: - - $ rpmbuild -bb \ - -D "kversion 2.6.32-131.6.1.el6.x86_64" \ - -D "kflavors default debug kdump" \ - rhel/kmod-openvswitch-rhel6.spec - -This produces an "kmod-openvswitch" RPM for each kernel variant, in this -example: "kmod-openvswitch", "kmod-openvswitch-debug", and -"kmod-openvswitch-kdump". - .. _rhel-script-integrations: Red Hat Network Scripts Integration diff --git a/poc/playbook-centos-builder.yml b/poc/playbook-centos-builder.yml index e902db75d..b38a6c4ef 100644 --- a/poc/playbook-centos-builder.yml +++ b/poc/playbook-centos-builder.yml @@ -41,13 +41,11 @@ chdir: /git/ovs/rhel with_items: - openvswitch.spec - - kmod-openvswitch-rhel6.spec - name: Install build dependencies specified from spec files shell: echo "y" | yum-builddep /tmp/{{item}} with_items: - openvswitch.spec - - kmod-openvswitch-rhel6.spec - name: Create rpm dev tree command: rpmdev-setuptree @@ -81,18 +79,12 @@ line: "Release: {{ ansible_local.builder.release }}" with_items: - openvswitch.spec - - kmod-openvswitch-rhel6.spec - name: Build Open vSwitch user space rpms command: rpmbuild -bb --without check rhel/openvswitch.spec args: chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}" - - name: Build Open vSwitch kmod rpms (only for currently loaded kernel) - command: rpmbuild -bb --without check rhel/kmod-openvswitch-rhel6.spec - args: - chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}" - - name: Copy RPM packages to /var/www/html command: cp -r /root/rpmbuild/RPMS/ /var/www/html diff --git a/rhel/automake.mk b/rhel/automake.mk index 235779b49..51ee9b961 100644 --- a/rhel/automake.mk +++ b/rhel/automake.mk @@ -13,10 +13,6 @@ EXTRA_DIST += \ rhel/etc_openvswitch_default.conf \ rhel/etc_sysconfig_network-scripts_ifdown-ovs \ rhel/etc_sysconfig_network-scripts_ifup-ovs \ - rhel/openvswitch-dkms.spec \ - rhel/openvswitch-dkms.spec.in \ - rhel/kmod-openvswitch-rhel6.spec \ - rhel/kmod-openvswitch-rhel6.spec.in \ rhel/openvswitch.spec \ rhel/openvswitch.spec.in \ rhel/openvswitch-fedora.spec \ @@ -39,12 +35,6 @@ update_rhel_spec = \ < $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \ if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi -$(srcdir)/rhel/openvswitch-dkms.spec: rhel/openvswitch-dkms.spec.in $(top_builddir)/config.status - $(update_rhel_spec) - -$(srcdir)/rhel/kmod-openvswitch-rhel6.spec: rhel/kmod-openvswitch-rhel6.spec.in $(top_builddir)/config.status - $(update_rhel_spec) - $(srcdir)/rhel/openvswitch.spec: rhel/openvswitch.spec.in $(top_builddir)/config.status $(update_rhel_spec) diff --git a/rhel/kmod-openvswitch-rhel6.spec.in b/rhel/kmod-openvswitch-rhel6.spec.in deleted file mode 100644 index de69863d7..000000000 --- a/rhel/kmod-openvswitch-rhel6.spec.in +++ /dev/null @@ -1,123 +0,0 @@ -# Spec file for Open vSwitch kernel modules on Red Hat Enterprise -# Linux 6. - -# Copyright (C) 2011, 2012, 2018 Nicira, Inc. -# -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. This file is offered as-is, -# without warranty of any kind. - -%define oname openvswitch -%{!?release_number:%define release_number 1} - -Name: kmod-%{oname} -Version: @VERSION@ -Release: %{release_number}%{?dist} -Summary: Open vSwitch kernel module - -Group: System/Kernel -License: GPLv2 -URL: http://openvswitch.org/ -Source0: %{oname}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -# Without this we get an empty openvswitch-debuginfo package (whose name -# conflicts with the openvswitch-debuginfo package for OVS userspace). -%undefine _enable_debug_packages - -%define kernel_source_extended() /usr/src/kernels/%{2}$([ %{1} = default ] || echo ".%{1}") - -# Use -D 'kversion 2.6.32-131.6.1.el6.x86_64' to build package -# for specified kernel version. -# Use -D 'kversion 3.10.0-693.1.1.el7.x86_64 3.10.0-693.17.1.el7.x86_64' -# to build package for mulitple kernel versions in the same package -# This only works for kernel 3.10.0 major revision 693 (RHEL 7.4) -# and major revision 327 (RHEL 7.2) -# By default, build against the latest installed kernel-devel -%{!?kversion:%global kversion %(rpm -qa | egrep "^kernel(-rt|-aarch64)?-devel" | /usr/lib/rpm/redhat/rpmsort -r | head -n 1| sed "s/^kernel.*-devel-//")} - -# Use -D 'kflavors default debug kdump' to build packages for -# specified kernel variants. -%{!?kflavors:%global kflavors default} - -%description -Open vSwitch Linux kernel module. - -%prep - -%setup -n %{oname}-%{version} - -%build -for kv in %{kversion}; do - for flavor in %{kflavors}; do - mkdir -p _$flavor/_$kv - (cd _$flavor/_$kv && ../../configure --with-linux="%{kernel_source_extended $flavor $kv}") - %{__make} -C _$flavor/_$kv/datapath/linux %{?_smp_mflags} - done -done - -%install -export INSTALL_MOD_PATH=$RPM_BUILD_ROOT -export INSTALL_MOD_DIR=extra/%{oname} -for kv in %{kversion}; do - for flavor in %{kflavors} ; do - make -C %{kernel_source_extended $flavor $kv} modules_install \ - M="`pwd`"/_$flavor/_$kv/datapath/linux - # Cleanup unnecessary kernel-generated module dependency files. - find $INSTALL_MOD_PATH/lib/modules -iname 'modules.*' -exec rm {} \; - done -done -install -d %{buildroot}%{_sysconfdir}/depmod.d/ -for kv in %{kversion}; do - for module in %{buildroot}/lib/modules/$kv/$INSTALL_MOD_DIR/*.ko; - do - modname="$(basename ${module})" - grep -qsPo "^\s*override ${modname%.ko} \* extra\/%{oname}" %{oname}.conf || \ - echo "override ${modname%.ko} * extra/%{oname}" >> %{oname}.conf - grep -qsPo "^\s*override ${modname%.ko} \* weak-updates\/%{oname}" %{oname}.conf || \ - echo "override ${modname%.ko} * weak-updates/%{oname}" >> %{oname}.conf - done -done -install -m 644 %{oname}.conf %{buildroot}%{_sysconfdir}/depmod.d/ -install -d -m 0755 $RPM_BUILD_ROOT/usr/share/%{oname}/scripts -install -p -m 0755 rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh \ - $RPM_BUILD_ROOT/usr/share/%{oname}/scripts/ovs-kmod-manage.sh - -%post -current_kernel=$(uname -r) -IFS=. read installed_major installed_minor installed_micro installed_arch \ - installed_build <<<"${current_kernel##*-}" -if [ "$installed_major" = "327" ] || [ "$installed_major" = "693" ]; then - # Workaround for RHEL 7.2 and 7.4 - if [ -x "/usr/share/%{oname}/scripts/ovs-kmod-manage.sh" ]; then - /usr/share/%{oname}/scripts/ovs-kmod-manage.sh - fi -else - # Ensure that modprobe will find our modules. - for k in $(cd /lib/modules && /bin/ls); do - [ -d "/lib/modules/$k/kernel/" ] && /sbin/depmod -a "$k" - done - if [ -x "/sbin/weak-modules" ]; then - rpm -ql kmod-%{oname} | grep '\.ko$' | \ - /sbin/weak-modules --add-modules - fi -fi - -%postun -if [ "$1" = 0 ]; then # Erase, not upgrade - for kname in `ls -d /lib/modules/*` - do - rm -rf $kname/weak-updates/openvswitch - done -fi -/sbin/depmod -a - -%files -%defattr(644,root,root,755) -/etc/depmod.d/%{oname}.conf -/lib/modules/ -%attr(755,root,root) /usr/share/%{oname}/scripts/ovs-kmod-manage.sh - -%clean -rm -rf $RPM_BUILD_ROOT
Remove the RHEL 6 kernel driver module specification. Signed-off-by: Greg Rose <gvrose8192@gmail.com> --- Documentation/intro/install/rhel.rst | 18 ---- poc/playbook-centos-builder.yml | 8 -- rhel/automake.mk | 10 --- rhel/kmod-openvswitch-rhel6.spec.in | 123 --------------------------- 4 files changed, 159 deletions(-) delete mode 100644 rhel/kmod-openvswitch-rhel6.spec.in