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)

1 files changed, 48 insertions, 15 deletions

diff --git a/remote/modules/vmware/vmware.build b/remote/modules/vmware/vmware.build
index 2ff6e895..16ee4c77 100644
--- a/remote/modules/vmware/vmware.build
+++ b/remote/modules/vmware/vmware.build
@@ -136,24 +136,46 @@ EOF
 	ln -sf "appLoader" "$MODULE_BUILD_DIR/usr/lib/vmware/bin/vmware-modconfig"
 	ln -sf "appLoader" "$MODULE_BUILD_DIR/usr/lib/vmware/bin/vmware-modconfig-console"
 
-	[ ! -e "$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h" ] && perror "Could not find uts release!!!"
-	local UTS_RELEASE="$(cat "$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h" | awk -F '"' '{print $2}')"
-	pinfo "Patching vmblock.tar"
+	# See what we need to patch
 	cd "$MODULE_BUILD_DIR/usr/lib/vmware/modules/source" || perror "cd failed."
-	tar xf "vmblock.tar" || perror "untar of vmblock.tar failed."
-	for sourcefile in $(grep -l -r -E '\sputname' "vmblock-only/"); do
-		sed -r -i 's/\sputname/__putname/g' "$sourcefile" || perror "sed of $sourcefile failed."
+	local KMOD SHORT PATCH MIN_KERN MAX_KERN
+	for KMOD in *.tar; do
+		SHORT="${KMOD%%.tar}"
+		[ -e ".${SHORT}.patched" ] && continue
+		for PATCH in $(find "${MODULE_DIR}/patches/" -name "${SHORT}__*__*.patch"); do
+			parse_patch_name "$PATCH"
+			[ -z "${MIN_KERN}" -o -z "${MAX_KERN}" ] && perror "Could not parse patch filename"
+			if version_lt "$SYS_KERNEL" "$MIN_KERN" || version_gt "$SYS_KERNEL" "$MAX_KERN"; then
+				pinfo "*NOT* applying $PATCH (min=$MIN_KERN max=$MAX_KERN cmp=$SYS_KERNEL)"
+				continue # Not suitable for our kernel
+			fi
+			pinfo "Applying $PATCH (min=$MIN_KERN max=$MAX_KERN cmp=$SYS_KERNEL)"
+			[ ! -d "${SHORT}-only" ] && tar xf "$KMOD"
+			[ ! -d "${SHORT}-only" ] && perror "untar of $KMOD failed."
+			cd "${SHORT}-only" || perror "Where is ${SHORT}-only?"
+			if ! patch -p1 < "$PATCH"; then
+				cd ..
+				rm -rf -- "${SHORT}-only"
+				perror "Applying $PATCH failed."
+			fi
+			cd ..
+		done
+		if [ -d "${SHORT}-only" ]; then
+			tar cf "$KMOD" "${SHORT}-only/" || perror "repacking of $KMOD failed."
+			rm -rf -- "${SHORT}-only"
+			touch ".${SHORT}.patched"
+		fi
 	done
-	tar cf "vmblock.tar" "vmblock-only/" || perror "repacking of vmblock.tar failed."
-	cd -
-	
+	cd "$MODULE_DIR" || perror "wat."
+	#
+	# Then, compile
 	pinfo "KOMPILIERE VMWARE KERNEL MODULE"
 	for MOD in vsock vmblock vmmon vmnet vmci; do
 		pinfo "Kompiliere $MOD"
-		[ -s "/lib/modules/$UTS_RELEASE/vmplayer/$MOD.ko" ] && unlink "/lib/modules/$UTS_RELEASE/vmplayer/$MOD.ko"
-		"$VMWARE_MODCONFIG" --console --build-mod -k "$UTS_RELEASE" "$MOD" "$(which gcc)" "$MODULES_DIR/kernel/ksrc/include" "vmplayer" "$MOD"
-		[ ! -s "/lib/modules/$UTS_RELEASE/vmplayer/$MOD.ko" ] && perror "Error compiling via $VMWARE_MODCONFIG"
-	done	
+		[ -s "/lib/modules/$SYS_UTS_RELEASE/vmplayer/$MOD.ko" ] && unlink "/lib/modules/$SYS_UTS_RELEASE/vmplayer/$MOD.ko"
+		"$VMWARE_MODCONFIG" --console --build-mod -k "$SYS_UTS_RELEASE" "$MOD" "$(which gcc)" "$MODULES_DIR/kernel/ksrc/include" "vmplayer" "$MOD"
+		[ ! -s "/lib/modules/$SYS_UTS_RELEASE/vmplayer/$MOD.ko" ] && perror "Error compiling via $VMWARE_MODCONFIG"
+	done
 
 	cd -
 
@@ -163,8 +185,19 @@ EOF
 }
 
 function copy_modules() {
-	local UTS_RELEASE="$(cat "$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h" | awk -F '"' '{print $2}')"
 	mkdir -p "$TARGET_BUILD_DIR/lib/modules/vmware/"
-	cp "/lib/modules/$UTS_RELEASE/vmplayer/"* "$TARGET_BUILD_DIR/lib/modules/vmware/" || perror "Could not cp vmware modules to target!"
+	cp "/lib/modules/$SYS_UTS_RELEASE/vmplayer/"* "$TARGET_BUILD_DIR/lib/modules/vmware/" || perror "Could not cp vmware modules to target!"
+}
+
+function parse_patch_name() {
+	[ $# -ne 1 ] && perror "parse_patch_name: Wrong parameter count."
+	local PATCH="$1"
+	MIN_KERN=$(echo "$PATCH" | sed -r 's/^[^_]+__([0-9\.]+)-[0-9\.]+__[^_]+\.patch$/\1/g')
+	[[ "$MIN_KERN" == /* ]] && MIN_KERN=$(echo "$PATCH" | sed -r 's/^[^_]+__([0-9\.]+)__[^_]+\.patch$/\1/g')
+	MAX_KERN=$(echo "$PATCH" | sed -r 's/^[^_]+__[0-9\.]+-([0-9\.]+)__[^_]+\.patch$/\1/g')
+	[[ "$MAX_KERN" == /* ]] && MAX_KERN=$(echo "$PATCH" | sed -r 's/^[^_]+__([0-9\.]+)__[^_]+\.patch$/\1/g')
+	[[ "$MIN_KERN" == /* ]] && MIN_KERN=
+	[[ "$MAX_KERN" == /* ]] && MAX_KERN=
+	# TODO: Parse min and max vmplayer/workstation version
 }