Browse Source

linux26: removed obsolete SDECFG_PKG_LINUX_CUSTCONFIG config, we always apply linux.cfg

user/chris/old/ruby
Alejandro Mery 16 years ago
parent
commit
a8651fd497
2 changed files with 2 additions and 26 deletions
  1. +1
    -6
      base/linux26/config-700.hlp
  2. +1
    -20
      base/linux26/config-700.in

+ 1
- 6
base/linux26/config-700.hlp

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../linux26/config-700.hlp # Filename: package/.../linux26/config-700.hlp
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2007 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -17,11 +17,6 @@
MENU_PKG_LINUX MENU_PKG_LINUX
Here you will find options to configure the kernel. Here you will find options to configure the kernel.
SDECFG_PKG_LINUX_CUSTCONFIG
Here you can define custom configurations to the kernel.
Please note that these will apply _after_ the default kernel config
has been created.
SDECFG_PKG_LINUX_CONFIG_STYLE SDECFG_PKG_LINUX_CONFIG_STYLE
This options selects whether to not perform an automated kernel This options selects whether to not perform an automated kernel
configuration generation, to parse the normal ROCK Linux configuraton configuration generation, to parse the normal ROCK Linux configuraton

+ 1
- 20
base/linux26/config-700.in

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../linux26/config-700.in # Filename: package/.../linux26/config-700.in
# Copyright (C) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2006 - 2008 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -16,25 +16,6 @@
menu_begin MENU_PKG_LINUX 'Linux Kernel Options' menu_begin MENU_PKG_LINUX 'Linux Kernel Options'
if [ "$SDECFG_PKG_LINUX_CONFIG_STYLE" = none ] ; then
SDECFGSET_PKG_LINUX_CUSTCONFIG=1
fi
bool 'Apply custom kernel build configuration settings' \
SDECFG_PKG_LINUX_CUSTCONFIG 0
if [ "$SDECFG_PKG_LINUX_CUSTCONFIG" = 1 ] ; then
block_begin 3
comment 'The kernel config is stored in:'
comment "config/$config/linux.cfg"
editfile SDECFG_PKG_LINUX_CUSTCONFIG_FILE \
$cfgtmpdir/config/linux.cfg \
'Linux kernel build config settings'
block_end
else
rm -f $cfgtmpdir/config/linux.cfg
fi
choice SDECFG_PKG_LINUX_CONFIG_STYLE modules \ choice SDECFG_PKG_LINUX_CONFIG_STYLE modules \
none 'Do not perform any automatic kernel configuration' \ none 'Do not perform any automatic kernel configuration' \
nomodules 'Perform normal kernel configuration without modules' \ nomodules 'Perform normal kernel configuration without modules' \

Loading…
Cancel
Save