On 7/9/2022 12:02 AM, David Marchand wrote:
On Fri, Jul 8, 2022 at 10:04 PM Greg Rose <[email protected]> wrote:
Remove the kernel driver specification for RHEL 6.x, 7.x, 8.x and Fedora.
Signed-off-by: Greg Rose <[email protected]>
---
Documentation/intro/install/rhel.rst | 18 ----
Vagrantfile | 9 +-
poc/playbook-centos-builder.yml | 8 --
poc/playbook-fedora-builder.yml | 13 ---
rhel/.gitignore | 4 -
rhel/automake.mk | 22 ----
rhel/kmod-openvswitch-rhel6.spec.in | 123 ----------------------
rhel/openvswitch-dkms.spec.in | 103 ------------------
rhel/openvswitch-kmod-fedora.spec.in | 152 ---------------------------
9 files changed, 1 insertion(+), 451 deletions(-)
delete mode 100644 rhel/kmod-openvswitch-rhel6.spec.in
delete mode 100644 rhel/openvswitch-dkms.spec.in
delete mode 100644 rhel/openvswitch-kmod-fedora.spec.in
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/Vagrantfile b/Vagrantfile
index 2cd603932..c2c59265d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -54,7 +54,7 @@ cd /vagrant
[ -f Makefile ] && ./configure && make distclean
mkdir -p ~/build
cd ~/build
-/vagrant/configure --with-linux=/lib/modules/`uname -r`/build
--enable-silent-rules
+/vagrant/configure --enable-silent-rules
SCRIPT
$build_ovs = <<SCRIPT
@@ -62,18 +62,12 @@ cd ~/build
make
SCRIPT
-$test_kmod = <<SCRIPT
-cd ~/build
-make check-kmod RECHECK=yes
-SCRIPT
-
There are remaining references to test_kmod.
Like:
debian.vm.provision "test_ovs_kmod", type: "shell", inline: $test_kmod
fedora.vm.provision "test_ovs_kmod", type: "shell", inline: $test_kmod
centos.vm.provision "test_ovs_kmod", type: "shell", inline: $test_kmod
But since it touches debian too, maybe we need a separate patch
updating this vagrantfile?
Another option would be to move the patch removing kmod tests removal
earlier in the series (and removing callers of those kmod tests at the
same time).
I'll try out this approach.
$install_rpm = <<SCRIPT
cd ~/build
PACKAGE_VERSION=`autom4te -l Autoconf -t 'AC_INIT:$2' /vagrant/configure.ac`
make && make dist
rpmdev-setuptree
cp openvswitch-$PACKAGE_VERSION.tar.gz $HOME/rpmbuild/SOURCES
-rpmbuild --bb -D "kversion `uname -r`"
/vagrant/rhel/openvswitch-kmod-fedora.spec
rpmbuild --bb --without check /vagrant/rhel/openvswitch-fedora.spec
rpm -e openvswitch
rpm -ivh
$HOME/rpmbuild/RPMS/x86_64/openvswitch-$PACKAGE_VERSION-1.fc23.x86_64.rpm
@@ -88,7 +82,6 @@ PACKAGE_VERSION=`autom4te -l Autoconf -t 'AC_INIT:$2'
/vagrant/configure.ac`
make && make dist
rpmdev-setuptree
cp openvswitch-$PACKAGE_VERSION.tar.gz $HOME/rpmbuild/SOURCES
-rpmbuild --bb -D "kversion `uname -r`"
/vagrant/rhel/openvswitch-kmod-fedora.spec
rpmbuild --bb --without check /vagrant/rhel/openvswitch-fedora.spec
rpm -e openvswitch
rpm -ivh $HOME/rpmbuild/RPMS/x86_64/openvswitch-$PACKAGE_VERSION-1.x86_64.rpm
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/poc/playbook-fedora-builder.yml b/poc/playbook-fedora-builder.yml
index 70f0b6ff2..e4be8dc22 100644
--- a/poc/playbook-fedora-builder.yml
+++ b/poc/playbook-fedora-builder.yml
@@ -53,8 +53,6 @@
chdir: /git/ovs/rhel
with_items:
- openvswitch-fedora.spec
- - openvswitch-kmod-fedora.spec
- - openvswitch-dkms.spec
- name: Install build dependencies specified from spec files
shell: echo "y" | yum-builddep /tmp/{{item}}
I see two references to those spec left, right after this block:
- name: Install build dependencies specified from spec files
shell: echo "y" | yum-builddep /tmp/{{item}}
with_items:
- openvswitch-fedora.spec
- openvswitch-kmod-fedora.spec
- openvswitch-dkms.spec
Alright, thanks for finding that. I'm not really familiar with the
Vagrant blobs so appreciate the help.
@@ -95,23 +93,12 @@
line: "Release: {{ ansible_local.builder.release }}"
with_items:
- openvswitch-fedora.spec
- - openvswitch-kmod-fedora.spec
- - openvswitch-dkms.spec
- name: Build Open vSwitch user space rpms
command: rpmbuild -bb --without check rhel/openvswitch-fedora.spec
args:
chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}"
- - name: Build Open vSwitch kmod rpm
- command: rpmbuild -bb --without check rhel/openvswitch-fedora.spec
- args:
- chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}"
-
- - name: Build Open vSwitch dkms rpm
- command: rpmbuild -bb --without check rhel/openvswitch-dkms.spec
- args:
- chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}"
This leaves an extra empty line.
Oops - alright, I'll fix that up.
Thanks for the review!
- Greg
- name: Copy RPM packages to /var/www/html
command: cp -r /root/rpmbuild/RPMS/ /var/www/html
[snip]
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
