Andreas V. Meier:

package/base/uml_utilities/pkg_linux24_pre.conf

@@ -1,17 +0,0 @@
-uml_patch=$(ls $base/download/mirror/u/uml-patch-${ver}-*.bz2 | head -n 1)
-uml_host26=$(ls $base/download/mirror/u/uml-patch-hostis26.diff.bz2)
-uml_cmdline=$(ls $base/download/mirror/u/uml-patch-kernel-cmdline.diff.bz2)
-
-var_remove patchfiles " " "$uml_patch"
-var_remove patchfiles " " "$uml_host26"
-var_remove patchfiles " " "$uml_cmdline"
-if [ "$ROCKCFG_KERNEL_UMLPATCH" == '1' ] ; then
-	if [ -f "$uml_patch" ] ; then
-		echo_status "Including UML Patch."
-		var_append patchfiles " " "$uml_patch"
-		var_append patchfiles " " "$uml_host26"
-		var_append patchfiles " " "$uml_cmdline"
-	fi
-	export arch_machine="um"
-	var_insert makeopt " " "ARCH=um"
-fi

package/base/uml_utilities/pkg_linux26_pre.conf

@@ -1,10 +0,0 @@
-uml_patch=$(ls $base/download/mirror/u/uml-patch-${ver}-*.bz2 | head -n 1)
-var_remove patchfiles " " "$uml_patch"
-if [ "$ROCKCFG_KERNEL_UMLPATCH" == '1' ] ; then
-	if [ -f "$uml_patch" ] ; then
-		echo_status "Including UML Patch."
-		var_append patchfiles " " "$uml_patch"
-	fi
-	export arch_machine="um"
-	var_insert makeopt " " "ARCH=um"
-fi

package/base/uml_utilities/pkg_linux_pre.conf

@@ -0,0 +1,20 @@
+uml_patch=$(ls $base/download/mirror/u/uml-patch-${ver}-*.bz2 | tail -n 1)
+uml_24host26=$(ls $base/download/mirror/u/uml-patch-hostis26.diff.bz2)
+uml_24cmdline=$(ls $base/download/mirror/u/uml-patch-kernel-cmdline.diff.bz2)
+
+for i in $uml_patch $uml_host26 $uml_24cmdline; do
+	 var_remove patchfiles " " $i;
+done
+
+if [ "$ROCKCFG_KERNEL_UMLPATCH" == '1' ] ; then
+	echo_status "Including UML Patch for $xpkg ($ver): $uml_patch."
+	 if [ "$xpkg" = "linux24" ] ; then
+		var_append patchfiles " " "$uml_patch"
+		var_append patchfiles " " "$uml_24host26"
+		var_append patchfiles " " "$uml_24cmdline"
+	elif [ "$xpkg" = "linux26" ] ; then
+		var_append patchfiles " " "$uml_patch"
+	fi
+	export arch_machine="um"
+	var_insert makeopt " " "ARCH=um"
+fi

package/base/uml_utilities/uml_utilities.desc

@@ -38,7 +38,7 @@
 [P] X ---3-----9 179.300
 
 [D] 1163032836 uml_utilities_20040406.tar.bz2 http://dl.sourceforge.net/sourceforge/user-mode-linux/
-[D] 3995679603 uml-patch-2.6.6-1.bz2 http://dl.sourceforge.net/user-mode-linux/
-[D] 3676523031 uml-patch-2.4.26-1.bz2 http://dl.sourceforge.net/user-mode-linux/
+[D] 4254403986 uml-patch-2.6.7-1.bz2 http://dl.sourceforge.net/user-mode-linux/
+[D] 1615459300 uml-patch-2.4.26-2.bz2 http://dl.sourceforge.net/user-mode-linux/
 [D] 2612233733 uml-patch-hostis26.diff.bz2 http://home.in.tum.de/~meiera/projects/rocklinux/download/base/uml_utilities/
 [D] 1813879424 uml-patch-kernel-cmdline.diff.bz2 http://home.in.tum.de/~meiera/projects/rocklinux/download/base/uml_utilities/