From 44b715baf6f0c8b721d202cda050f75b587888ed Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 11 Jul 2007 12:36:10 +0000 Subject: [PATCH] * merged r21223 from kernel-cleanup2: * removed obsolete SDECFG_PKG_LINUX_USE25MODTOOLS config option git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21655 10447126-35f2-4685-b0cf-6dd780d3921f --- base/linux26/config-700.hlp | 11 ++++------- base/linux26/config-700.in | 10 ++-------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/base/linux26/config-700.hlp b/base/linux26/config-700.hlp index 1fd666adf..d7de066fa 100644 --- a/base/linux26/config-700.hlp +++ b/base/linux26/config-700.hlp @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../linux24/config-700.hlp +# Filename: package/.../linux26/config-700.hlp +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -11,7 +12,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- MENU_PKG_LINUX Here you will find options to configure the kernel. @@ -33,10 +34,6 @@ SDECFG_PKG_LINUX_CONFIG_STYLE Manually supplied kernel config options will be applied whatever option is choosen here. -SDECFG_PKG_LINUX_USE25MODTOOLS - Please check here if you want to use the newer modutils. This is - needed if you want to use a 2.5.x kernel. - SDECFG_PKG_LINUX_UML_STYLE Here you can define UML (User Mode Linux) specific kernel optimizations. diff --git a/base/linux26/config-700.in b/base/linux26/config-700.in index 61f379946..5cb8880e5 100644 --- a/base/linux26/config-700.in +++ b/base/linux26/config-700.in @@ -1,8 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../linux24/config-700.in -# Copyright (C) 2006 The OpenSDE Project +# Filename: package/.../linux26/config-700.in +# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -40,12 +40,6 @@ menu_begin MENU_PKG_LINUX 'Linux Kernel Options' nomodules 'Perform normal kernel configuration without modules' \ modules 'Perform normal kernel configuration including modules' - bool 'Build kernel 2.5.x module utils (module-init-tools)' \ - SDECFG_PKG_LINUX_USE25MODTOOLS 1 - if [ $SDECFG_PKG_LINUX_USE25MODTOOLS = 0 ] ; then - pkgdisable module-init-tools - fi - if pkgcheck uml_utilities X ; then choice SDECFG_PKG_LINUX_UML_STYLE modules \ none 'Do not perform any automatic UML related optimization' \