Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2021-11-22 20:53:55 -08:00
2 changed files with 4 additions and 1 deletions

View File

@@ -125,7 +125,7 @@ function specialize_patch {
fi
;;
UEK)
ao=(-v UEK_KABI_RENAME=1)
ao=(-v UEK_KABI_RENAME=1 -v UEK_RELEASE=${releasevermajor})
;;
esac
local kver3

View File

@@ -249,6 +249,8 @@ function evaluate(stmnt, pattern, arg, op, result) {
gsub("defined\\(_COMPAT_LINUX_MM_H\\)", "0", stmnt)
gsub("defined\\(UEK_KABI_RENAME\\)", UEK_KABI_RENAME ? "1" : "0", stmnt)
gsub("defined\\(UEK_RELEASE\\)", UEK_RELEASE ? "1" : "0", stmnt)
gsub("UEK_RELEASE", UEK_RELEASE ? UEK_RELEASE : "0", stmnt)
if (SCST_IO_CONTEXT != "")
{
@@ -454,6 +456,7 @@ function handle_if(evaluated)
|| $0 ~ "RHEL_RELEASE_CODE" \
|| $0 ~ "SOCK_RECVMSG_HAS_FOUR_ARGS" \
|| $0 ~ "UEK_KABI_RENAME" \
|| $0 ~ "UEK_RELEASE" \
|| $0 ~ "USE_PRE_440_WR_STRUCTURE" \
|| $0 ~ "_COMPAT_LINUX_MM_H" \
|| $0 ~ "bio_multiple_segments" \