openstack
/
neutron
Code Issues Proposed changes

devstack ovs: get correct kernel rpm version on customed kernel 

When building custom kernel version
uname -r returns 4.10.0-00054-ge4cd924
but the rpm name is kernel-4.10.0_00054_ge4cd924-1.x86_64
This is because dash is illegal character in rpm version

This patch fix the kernel version is rpm based OS
but converting all the dashes to underscores

Change-Id: I3d0981fbe30f2436f00c200919b50aeb97491252
This commit is contained in:
Moshe Levi 2017-07-06 12:58:47 +03:00
parent 243c742f4e
commit 908f0e4f04
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devstack/lib/ovs
View File

@ -49,18 +49,23 @@ function prepare_for_compilation {
# TODO: Can you create package list files like you can inside devstack?
install_package autoconf automake libtool gcc patch make
KERNEL_VERSION=`uname -r`
if is_fedora ; then
# is_fedora covers Fedora, RHEL, CentOS, etc...
echo NOTE: if kernel-devel-$(uname -r) or kernel-headers-$(uname -r) installation
# dash is illegal character in rpm version so replace
# them with underscore like it is done in the kernel
# https://github.com/torvalds/linux/blob/master/scripts/package/mkspec#L25
KERNEL_VERSION=`echo $KERNEL_VERSION | sed -e "s/-/_/g"`
echo NOTE: if kernel-devel-$KERNEL_VERSION or kernel-headers-$KERNEL_VERSION installation
echo failed, please, provide a repository with the package, or yum update / reboot
echo your machine to get the latest kernel.
install_package kernel-devel-$(uname -r)
install_package kernel-headers-$(uname -r)
install_package kernel-devel-$KERNEL_VERSION
install_package kernel-headers-$KERNEL_VERSION
elif is_ubuntu ; then
install_package linux-headers-$(uname -r)
install_package linux-headers-$KERNEL_VERSION
fi
}