On Thu, Jul 12, 2018 at 10:35:54AM -0700, Martin Xu wrote:
> This patch only affects rhel6 spec file.
>
> The rhel6 kmod spec file is renamed from openvswitch-kmod-rhel6.spec
> to kmod-openvswitch-rhel6.spec . This is to prepare for the next
> patches to support building multiple kernel versions in the main
> package. The rename makes the spec file consistent with the resulted
> kmod-openvswitch-<version>.rpm, which is the real package with
> kernel module files.
>
> Signed-off-by: Martin Xu <[email protected]>
> CC: Greg Rose <[email protected]>
> CC: Ben Pfaff <[email protected]>
> CC: Flavio Leitner <[email protected]>
> CC: Aaron Conole <[email protected]>
> ---
> Documentation/intro/install/rhel.rst | 7 +++----
> poc/playbook-centos-builder.yml | 8
> ++++----
> rhel/.gitignore | 2 +-
> rhel/automake.mk | 6 +++---
> ...nvswitch-kmod-rhel6.spec.in => kmod-openvswitch-rhel6.spec.in} | 0
> 5 files changed, 11 insertions(+), 12 deletions(-)
> rename rhel/{openvswitch-kmod-rhel6.spec.in =>
> kmod-openvswitch-rhel6.spec.in} (100%)
^^^^^^^^^^^^^
Much better to review, thanks!
LGTM
fbl
>
> diff --git a/Documentation/intro/install/rhel.rst
> b/Documentation/intro/install/rhel.rst
> index f8b26069f..6f062e894 100644
> --- a/Documentation/intro/install/rhel.rst
> +++ b/Documentation/intro/install/rhel.rst
> @@ -197,17 +197,16 @@ the unit tests, run::
> Kernel Module
> ~~~~~~~~~~~~~
>
> -On RHEL 6, to build the Open vSwitch kernel module, copy
> -rhel/openvswitch-kmod.files into the RPM sources directory and run::
> +On RHEL 6, to build the Open vSwitch kernel module run::
>
> - $ rpmbuild -bb rhel/openvswitch-kmod-rhel6.spec
> + $ 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/openvswitch-kmod-rhel6.spec
> + rhel/kmod-openvswitch-rhel6.spec
>
> This produces an "kmod-openvswitch" RPM for each kernel variant, in this
> example: "kmod-openvswitch", "kmod-openvswitch-debug", and
> diff --git a/poc/playbook-centos-builder.yml b/poc/playbook-centos-builder.yml
> index 71f104010..e902db75d 100644
> --- a/poc/playbook-centos-builder.yml
> +++ b/poc/playbook-centos-builder.yml
> @@ -41,13 +41,13 @@
> chdir: /git/ovs/rhel
> with_items:
> - openvswitch.spec
> - - openvswitch-kmod-rhel6.spec
> + - kmod-openvswitch-rhel6.spec
>
> - name: Install build dependencies specified from spec files
> shell: echo "y" | yum-builddep /tmp/{{item}}
> with_items:
> - openvswitch.spec
> - - openvswitch-kmod-rhel6.spec
> + - kmod-openvswitch-rhel6.spec
>
> - name: Create rpm dev tree
> command: rpmdev-setuptree
> @@ -81,7 +81,7 @@
> line: "Release: {{ ansible_local.builder.release }}"
> with_items:
> - openvswitch.spec
> - - openvswitch-kmod-rhel6.spec
> + - kmod-openvswitch-rhel6.spec
>
> - name: Build Open vSwitch user space rpms
> command: rpmbuild -bb --without check rhel/openvswitch.spec
> @@ -89,7 +89,7 @@
> chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}"
>
> - name: Build Open vSwitch kmod rpms (only for currently loaded kernel)
> - command: rpmbuild -bb --without check rhel/openvswitch-kmod-rhel6.spec
> + command: rpmbuild -bb --without check rhel/kmod-openvswitch-rhel6.spec
> args:
> chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}"
>
> diff --git a/rhel/.gitignore b/rhel/.gitignore
> index e584a1ed0..a9c047f83 100644
> --- a/rhel/.gitignore
> +++ b/rhel/.gitignore
> @@ -1,6 +1,6 @@
> openvswitch-dkms.spec
> openvswitch-kmod-rhel5.spec
> -openvswitch-kmod-rhel6.spec
> +kmod-openvswitch-rhel6.spec
> openvswitch-kmod-fedora.spec
> openvswitch.spec
> openvswitch-fedora.spec
> diff --git a/rhel/automake.mk b/rhel/automake.mk
> index 137ff4a39..82a450831 100644
> --- a/rhel/automake.mk
> +++ b/rhel/automake.mk
> @@ -15,8 +15,8 @@ EXTRA_DIST += \
> rhel/etc_sysconfig_network-scripts_ifup-ovs \
> rhel/openvswitch-dkms.spec \
> rhel/openvswitch-dkms.spec.in \
> - rhel/openvswitch-kmod-rhel6.spec \
> - rhel/openvswitch-kmod-rhel6.spec.in \
> + rhel/kmod-openvswitch-rhel6.spec \
> + rhel/kmod-openvswitch-rhel6.spec.in \
> rhel/openvswitch-kmod.files \
> rhel/openvswitch-kmod-fedora.spec \
> rhel/openvswitch-kmod-fedora.spec.in \
> @@ -48,7 +48,7 @@ update_rhel_spec = \
> $(srcdir)/rhel/openvswitch-dkms.spec: rhel/openvswitch-dkms.spec.in
> $(top_builddir)/config.status
> $(update_rhel_spec)
>
> -$(srcdir)/rhel/openvswitch-kmod-rhel6.spec:
> rhel/openvswitch-kmod-rhel6.spec.in $(top_builddir)/config.status
> +$(srcdir)/rhel/kmod-openvswitch-rhel6.spec:
> rhel/kmod-openvswitch-rhel6.spec.in $(top_builddir)/config.status
> $(update_rhel_spec)
>
> $(srcdir)/rhel/openvswitch-kmod-fedora.spec:
> rhel/openvswitch-kmod-fedora.spec.in $(top_builddir)/config.status
> diff --git a/rhel/openvswitch-kmod-rhel6.spec.in
> b/rhel/kmod-openvswitch-rhel6.spec.in
> similarity index 100%
> rename from rhel/openvswitch-kmod-rhel6.spec.in
> rename to rhel/kmod-openvswitch-rhel6.spec.in
> --
> 2.15.2 (Apple Git-101.1)
>
--
Flavio
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
