Overhauled vmware kernel module patching, also added global kernel version variables

Variables are now:
KERNEL_CURRENT_VERSION - currently running kernel (uname -r)
SYS_UTS_RELEASE - What uname -r will yield on the generated system
SYS_KERNEL - Just version number of SYS_UTS_RELEASE (eg. 3.5.6-12-openslx -> 3.5.6)

2 files changed, 77 insertions, 4 deletions

diff --git a/remote/includes/kernel.inc b/remote/includes/kernel.inc
index ae5791df..ccd10970 100644
--- a/remote/includes/kernel.inc
+++ b/remote/includes/kernel.inc
@@ -13,13 +13,23 @@
 #     must be given as  kernel/fs/nfs/nfs.ko
 #
 
-# determine kernel version
-KERNEL_CURRENT_VERSION=$(uname -r)
-[ -z "$KERNEL_CURRENT_VERSION" ] && pwarning "Could not determine kernel version."
-
 # set global KERNEL_TARGET_NAME
 KERNEL_TARGET_NAME="kernel"
 
+get_kernel_version () {
+	# determine kernel version currently running on this machine
+	KERNEL_CURRENT_VERSION=$(uname -r)
+	[ -z "$KERNEL_CURRENT_VERSION" ] && pwarning "Could not determine kernel version."
+	# determine kernel version that will be running in the generated system
+	if [ -e "$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h" ]; then
+		SYS_UTS_RELEASE=$(grep 'UTS_RELEASE' "$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h" | awk -F '"' '{print $2}')
+		SYS_KERNEL=$(echo "$SYS_UTS_RELEASE" | grep -o -E '^[0-9\.]+')
+	else
+		SYS_UTS_RELEASE="(unknown-not-compiled-yet)"
+		SYS_KERNEL="$SYS_UTS_RELEASE"
+	fi
+}
+
 check_kernel_build_dir() {
 	[ -d "${MODULES_DIR}/kernel/build" ] && KERNEL_BUILD_DIR="${MODULES_DIR}/kernel/build" \
 	|| perror "No build directory set for the kernel. Was is built?"
diff --git a/remote/includes/versioncompare.inc b/remote/includes/versioncompare.inc
new file mode 100644
index 00000000..75f59456
--- /dev/null
+++ b/remote/includes/versioncompare.inc
@@ -0,0 +1,63 @@
+
+# From http://stackoverflow.com/a/4025065/2043481
+# Returns 0 when equal, 1 when $1 > $2, 2 otherwise
+version_compare () {
+	if [[ "$1" == "$2" ]]; then
+		return 0
+	fi
+	local IFS=".-_"
+	local i ver1=($1) ver2=($2)
+	# fill empty fields in ver1 with zeros
+	for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do
+		ver1[i]=0
+	done
+	for ((i=0; i<${#ver1[@]}; i++)); do
+		if [[ -z "${ver2[i]}" ]]; then
+			# fill empty fields in ver2 with zeros
+			ver2[i]=0
+		fi
+		if ((10#${ver1[i]} > 10#${ver2[i]})); then
+			return 1
+		fi
+		if ((10#${ver1[i]} < 10#${ver2[i]})); then
+			return 2
+		fi
+	done
+	return 0
+}
+
+version_ge () {
+	version_compare "$1" "$2"
+	local RET=$?
+	[ "$RET" == "2" ] && return 1
+	return 0
+}
+
+version_le () {
+	version_compare "$1" "$2"
+	local RET=$?
+	[ "$RET" == "1" ] && return 1
+	return 0
+}
+
+version_gt () {
+	version_compare "$1" "$2"
+	local RET=$?
+	[ "$RET" == "1" ] && return 0
+	return 1
+}
+
+version_lt () {
+	version_compare "$1" "$2"
+	local RET=$?
+	[ "$RET" == "2" ] && return 0
+	return 1
+}
+
+version_eq () {
+	version_compare "$1" "$2"
+	return $?
+}
+
+version_eq "1.0" "1" && ! version_eq "1.0" "1.1" && version_ge "1.1" "1.0"
+