diff --git a/package/base/uml_utilities/pkg_linux26_pre.conf b/package/base/uml_utilities/pkg_linux26_pre.conf index 2d9b580c3..5cf584d2a 100644 --- a/package/base/uml_utilities/pkg_linux26_pre.conf +++ b/package/base/uml_utilities/pkg_linux26_pre.conf @@ -1,10 +1,13 @@ +#!/bin/bash + if [ "$ROCKCFG_KERNEL_UMLPATCH" == '1' ] ; then # fix for the arch/um/kernel/ksyms.c:90: # redefinition of `__kstrtab_os_ioctl_generic' - hook_add postpatch 3 \ - "sed -e 's,\(EXPORT_SYMBOL(os_ioctl_generic);\),// \1,1' -i arch/um/kernel/ksyms.c" - fi - echo_status "Building UML kernel for $xpkg ($ver)." - export arch_machine="um" - var_insert makeopt " " "ARCH=um" +# hook_add postpatch 3 \ +# "sed -e 's,\(EXPORT_SYMBOL(os_ioctl_generic);\),// \1,1' -i arch/um/kernel/ksyms.c" + var_append patchfiles " " "$base/download/mirror/s/skas-2.6.20-v8.2.patch.bz2" fi + +echo_status "Building UML kernel for $xpkg ($ver)." +export arch_machine="um" +var_insert makeopt " " "ARCH=um" diff --git a/package/base/uml_utilities/uml_utilities.desc b/package/base/uml_utilities/uml_utilities.desc index 9e2b9df0c..669f4d16a 100644 --- a/package/base/uml_utilities/uml_utilities.desc +++ b/package/base/uml_utilities/uml_utilities.desc @@ -34,11 +34,13 @@ [L] GPL [S] Stable -[V] 20040406 +[V] 20060323 [P] X --?--5---9 213.800 -[D] 1163032836 uml_utilities_20040406.tar.bz2 http://dl.sourceforge.net/sourceforge/user-mode-linux/ -[D] 3565257192 uml-patch-2.6.8.1-1.bz2 http://dl.sourceforge.net/user-mode-linux/ +[D] 2993943975 uml_utilities_20060323.tar.bz2 http://www.user-mode-linux.org/~blaisorblade/uml-utilities/ +[D] 1343796481 skas-2.6.20-v8.2.patch.bz2 http://www.user-mode-linux.org/~blaisorblade/patches/skas3-2.6/skas-2.6.20-v8.2/ + +# The files below are for 2.4 kernels only [D] 3715834792 uml-patch-2.4.27-1.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/