| Message ID | 20180831185243.115867-2-martinxu9.ovs@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,v1,1/5] rhel: openvswitch-kmod-fedora.spec.in file bug fix | expand |
On Fri, Aug 31, 2018 at 11:52:40AM -0700, Martin Xu wrote: > Fixes 22c33c303932 (rhel: support kmod build against mulitple kernel versions, > fedora) > Fixes c8cd1307b248 (rhel: support kmod build against multiple 7.2 > kernels, rhel6) Out of my curiosity, do you have an alias for depmod? RHEL-6 still uses depmod in /sbin, but on RHEL-7 and Fedora /sbin is a symlink to /usr/sbin and depmod is a symlink to ../bin/kmod So, this should still work :-) Acked-by: Flavio Leitner <fbl@sysclose.org> fbl > > Signed-off-by: Martin Xu <martinxu9.ovs@gmail.com> > CC: Greg Rose <gvrose8192@gmail.com> > --- > datapath/linux/Makefile.main.in | 2 +- > rhel/kmod-openvswitch-rhel6.spec.in | 2 +- > rhel/openvswitch-kmod-fedora.spec.in | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in > index 7d18253be..6e245c70c 100644 > --- a/datapath/linux/Makefile.main.in > +++ b/datapath/linux/Makefile.main.in > @@ -72,7 +72,7 @@ default: > > modules_install: > $(MAKE) -C $(KSRC) M=$(builddir) modules_install > - depmod `sed -n 's/#define UTS_RELEASE "\([^"]*\)"/\1/p' $(KSRC)/include/generated/utsrelease.h` > + /sbin/depmod `sed -n 's/#define UTS_RELEASE "\([^"]*\)"/\1/p' $(KSRC)/include/generated/utsrelease.h` > endif > > # Much of the kernel build system in this file is derived from Intel's > diff --git a/rhel/kmod-openvswitch-rhel6.spec.in b/rhel/kmod-openvswitch-rhel6.spec.in > index afbad96d9..7d3d9b498 100644 > --- a/rhel/kmod-openvswitch-rhel6.spec.in > +++ b/rhel/kmod-openvswitch-rhel6.spec.in > @@ -95,7 +95,7 @@ if [ "$installed_major" = "327" ] || [ "$installed_major" = "693" ]; then > else > # Ensure that modprobe will find our modules. > for k in $(cd /lib/modules && /bin/ls); do > - [ -d "/lib/modules/$k/kernel/" ] && depmod -a "$k" > + [ -d "/lib/modules/$k/kernel/" ] && /sbin/depmod -a "$k" > done > if [ -x "/sbin/weak-modules" ]; then > rpm -ql kmod-%{oname} | grep '\.ko$' | \ > diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in > index 28827e245..7b5c78606 100644 > --- a/rhel/openvswitch-kmod-fedora.spec.in > +++ b/rhel/openvswitch-kmod-fedora.spec.in > @@ -91,7 +91,7 @@ if [ "$installed_major" = "327" ] || [ "$installed_major" = "693" ]; then > else > # Ensure that modprobe will find our modules. > for k in $(cd /lib/modules && /bin/ls); do > - [ -d "/lib/modules/$k/kernel/" ] && depmod -a "$k" > + [ -d "/lib/modules/$k/kernel/" ] && /sbin/depmod -a "$k" > done > if [ -x "/sbin/weak-modules" ]; then > for m in openvswitch vport-gre vport-stt vport-geneve \ > -- > 2.12.3 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in index 7d18253be..6e245c70c 100644 --- a/datapath/linux/Makefile.main.in +++ b/datapath/linux/Makefile.main.in @@ -72,7 +72,7 @@ default: modules_install: $(MAKE) -C $(KSRC) M=$(builddir) modules_install - depmod `sed -n 's/#define UTS_RELEASE "\([^"]*\)"/\1/p' $(KSRC)/include/generated/utsrelease.h` + /sbin/depmod `sed -n 's/#define UTS_RELEASE "\([^"]*\)"/\1/p' $(KSRC)/include/generated/utsrelease.h` endif # Much of the kernel build system in this file is derived from Intel's diff --git a/rhel/kmod-openvswitch-rhel6.spec.in b/rhel/kmod-openvswitch-rhel6.spec.in index afbad96d9..7d3d9b498 100644 --- a/rhel/kmod-openvswitch-rhel6.spec.in +++ b/rhel/kmod-openvswitch-rhel6.spec.in @@ -95,7 +95,7 @@ if [ "$installed_major" = "327" ] || [ "$installed_major" = "693" ]; then else # Ensure that modprobe will find our modules. for k in $(cd /lib/modules && /bin/ls); do - [ -d "/lib/modules/$k/kernel/" ] && depmod -a "$k" + [ -d "/lib/modules/$k/kernel/" ] && /sbin/depmod -a "$k" done if [ -x "/sbin/weak-modules" ]; then rpm -ql kmod-%{oname} | grep '\.ko$' | \ diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in index 28827e245..7b5c78606 100644 --- a/rhel/openvswitch-kmod-fedora.spec.in +++ b/rhel/openvswitch-kmod-fedora.spec.in @@ -91,7 +91,7 @@ if [ "$installed_major" = "327" ] || [ "$installed_major" = "693" ]; then else # Ensure that modprobe will find our modules. for k in $(cd /lib/modules && /bin/ls); do - [ -d "/lib/modules/$k/kernel/" ] && depmod -a "$k" + [ -d "/lib/modules/$k/kernel/" ] && /sbin/depmod -a "$k" done if [ -x "/sbin/weak-modules" ]; then for m in openvswitch vport-gre vport-stt vport-geneve \
Fixes 22c33c303932 (rhel: support kmod build against mulitple kernel versions, fedora) Fixes c8cd1307b248 (rhel: support kmod build against multiple 7.2 kernels, rhel6) Signed-off-by: Martin Xu <martinxu9.ovs@gmail.com> CC: Greg Rose <gvrose8192@gmail.com> --- datapath/linux/Makefile.main.in | 2 +- rhel/kmod-openvswitch-rhel6.spec.in | 2 +- rhel/openvswitch-kmod-fedora.spec.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)