From 81fc2bae5f5dba6fbec1a1944b8b94d9a7c5c1d3 Mon Sep 17 00:00:00 2001 From: "Andreas V. 'netrunner' Meier" Date: Thu, 24 Jun 2004 11:10:51 +0000 Subject: [PATCH] Andreas V. Meier: linux24.conf: add build option for uml Andreas V. Meier: uml_utilities: add config.in to have a switch for the kernelpatch [2004061301555602168] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3356 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/linux24/linux24.conf | 6 ++++ package/base/uml_utilities/config.in | 28 +++++++++++++++++++ .../base/uml_utilities/pkg_linux24_pre.conf | 17 +++++++++++ .../base/uml_utilities/pkg_linux26_pre.conf | 10 +++++++ package/base/uml_utilities/uml_utilities.desc | 5 +++- 5 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 package/base/uml_utilities/config.in create mode 100644 package/base/uml_utilities/pkg_linux24_pre.conf create mode 100644 package/base/uml_utilities/pkg_linux26_pre.conf diff --git a/package/base/linux24/linux24.conf b/package/base/linux24/linux24.conf index bd84cabe0..440125852 100644 --- a/package/base/linux24/linux24.conf +++ b/package/base/linux24/linux24.conf @@ -89,6 +89,12 @@ main_lx() { [ "$default" ] && \ cp -vf vmlinux $root/boot/vmlinux ;; + um) + eval $MAKE linux + cp -vf linux $root/boot/linux_${lx_kernelrelease} + [ "$default" ] && \ + cp -vf linux $root/boot/linux + ;; *) eval $MAKE vmlinux cp -vf vmlinux $root/boot/vmlinux_${lx_kernelrelease} diff --git a/package/base/uml_utilities/config.in b/package/base/uml_utilities/config.in new file mode 100644 index 000000000..4a126846f --- /dev/null +++ b/package/base/uml_utilities/config.in @@ -0,0 +1,28 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/x86/lilo/config.in +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +menu_begin MENU_PKG_UML 'UML Options' +bool 'Patch the kernel with the UML patch' \ + ROCKCFG_KERNEL_UMLPATCH 0 +comment 'Please also activate "Apply custom kernel build configuration settings' +comment ' (you find it under Linux Kernel Options)' +menu_end diff --git a/package/base/uml_utilities/pkg_linux24_pre.conf b/package/base/uml_utilities/pkg_linux24_pre.conf new file mode 100644 index 000000000..7e67753d4 --- /dev/null +++ b/package/base/uml_utilities/pkg_linux24_pre.conf @@ -0,0 +1,17 @@ +uml_patch=$(ls $base/download/base/uml_utilities/uml-patch-${ver}-*.bz2 | head -n 1) +uml_host26=$(ls $base/download/base/uml_utilities/uml-patch-hostis26.diff.bz2) +uml_cmdline=$(ls $base/download/base/uml_utilities/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 diff --git a/package/base/uml_utilities/pkg_linux26_pre.conf b/package/base/uml_utilities/pkg_linux26_pre.conf new file mode 100644 index 000000000..88039f84c --- /dev/null +++ b/package/base/uml_utilities/pkg_linux26_pre.conf @@ -0,0 +1,10 @@ +uml_patch=$(ls $base/download/base/uml_utilities/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 diff --git a/package/base/uml_utilities/uml_utilities.desc b/package/base/uml_utilities/uml_utilities.desc index 385dacce6..0e8d63a53 100644 --- a/package/base/uml_utilities/uml_utilities.desc +++ b/package/base/uml_utilities/uml_utilities.desc @@ -38,4 +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] 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/