Accepting request 305460 from Virtualization:VMware

Fix applying of patch with kernel 4.0

OBS-URL: https://build.opensuse.org/request/show/305460
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-vm-tools?expand=0&rev=57
This commit is contained in:
Stephan Kulow 2015-05-07 06:28:53 +00:00 committed by Git OBS Bridge
commit bbd8bc7ff5
4 changed files with 18 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 5 14:31:19 UTC 2015 - dimstar@opensuse.org
- Handle kernel 4.0: we can't just compare the 'minor' part of the
version anymore when applying patches.
-------------------------------------------------------------------
Thu Feb 19 13:35:44 UTC 2015 - dimstar@opensuse.org

View File

@ -235,8 +235,9 @@ sed -i -e "s/\r//" README
%patch10 -p1
%patch11 -p1
%patch12 -p1
KVER=$(rpm -q kernel-syms --qf %%{version}\n | awk -F. '{print $2}')
if [ $KVER -ge 19 ]; then
KVERMAJ=$(rpm -q kernel-syms --qf %%{version}\n | awk -F. '{print $1}')
KVERMIN=$(rpm -q kernel-syms --qf %%{version}\n | awk -F. '{print $2}')
if [ $KVERMAJ -ge 4 -o $KVERMIN -ge 19 ]; then
%patch13 -p1
fi

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 5 14:31:19 UTC 2015 - dimstar@opensuse.org
- Handle kernel 4.0: we can't just compare the 'minor' part of the
version anymore when applying patches.
-------------------------------------------------------------------
Thu Feb 19 13:35:44 UTC 2015 - dimstar@opensuse.org

View File

@ -235,8 +235,9 @@ sed -i -e "s/\r//" README
%patch10 -p1
%patch11 -p1
%patch12 -p1
KVER=$(rpm -q kernel-syms --qf %%{version}\n | awk -F. '{print $2}')
if [ $KVER -ge 19 ]; then
KVERMAJ=$(rpm -q kernel-syms --qf %%{version}\n | awk -F. '{print $1}')
KVERMIN=$(rpm -q kernel-syms --qf %%{version}\n | awk -F. '{print $2}')
if [ $KVERMAJ -ge 4 -o $KVERMIN -ge 19 ]; then
%patch13 -p1
fi