Menu
▾
▴
[Devil-linux-commit] build/scripts/configuration gcc.config,1.6,1.7 grsecurity.config,1.3,1.4 linux.config,1.9,1.10 usbat-02.config,1.1,1.2 xfsprogs.config,1.3,1.4
|
From: <smi...@us...> - 2004-01-11 14:43:09
|
Update of /cvsroot/devil-linux/build/scripts/configuration In directory sc8-pr-cvs1:/tmp/cvs-serv16846/scripts/configuration Modified Files: gcc.config grsecurity.config linux.config usbat-02.config xfsprogs.config Log Message: - some build system cleanups - added perliminary support to the build system for selection of Kernel 2.4 or 2.6 Index: gcc.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/gcc.config,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- gcc.config 27 Dec 2003 03:17:17 -0000 1.6 +++ gcc.config 11 Jan 2004 14:43:05 -0000 1.7 @@ -5,9 +5,9 @@ # http://www.devil-linux.org menu_add "System|Programming" bool "GCC3" CONFIG_GCC3 -menu_add "Build Configuration|Security" bool "GCC Stack Smashing Protector" CONFIG_GCC_STACK_PROTECTOR -menu_add "Build Configuration|Security" bool "GCC enable Position Independent Executables" CONFIG_GCC_PIE -if [ "$CONFIG_GRSECURITY" = "y" ]; then +test "$CONFIG_LINUX_VERSION" = "2.4" && menu_add "Build Configuration|Security" bool "GCC Stack Smashing Protector" CONFIG_GCC_STACK_PROTECTOR +test "$CONFIG_LINUX_VERSION" = "2.4" && menu_add "Build Configuration|Security" bool "GCC enable Position Independent Executables" CONFIG_GCC_PIE +if [ "$CONFIG_GRSECURITY" = "y" ] && [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then menu_add "Build Configuration|Security" bool "GCC compile programs as ET_DYN (EXPERIMENTAL)" CONFIG_GCC_ET_DYN fi Index: grsecurity.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/grsecurity.config,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- grsecurity.config 24 Dec 2003 23:14:37 -0000 1.3 +++ grsecurity.config 11 Jan 2004 14:43:05 -0000 1.4 @@ -5,4 +5,9 @@ # # http://www.devil-linux.org -[ "$CONFIG_XFS" = "y" ] || menu_add "Build Configuration|Security" bool "GRSecurity Patch (enhances system security and will break XFS)" CONFIG_GRSECURITY +if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then + if [ ! "$CONFIG_XFS" = "y" ]; then + menu_add "Build Configuration|Security" bool "GRSecurity Patch (enhances system security and will break XFS)" CONFIG_GRSECURITY + fi +fi + Index: linux.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/linux.config,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- linux.config 24 Dec 2003 23:14:37 -0000 1.9 +++ linux.config 11 Jan 2004 14:43:05 -0000 1.10 @@ -6,6 +6,8 @@ # http://www.devil-linux.org test -z "$CONFIG_LINUX_NR_CPUS" && CONFIG_LINUX_NR_CPUS=4 +test -z "$CONFIG_LINUX_VERSION" && CONFIG_LINUX_VERSION=2.4 menu_add "Build Configuration|Processor and Memory" bool "Symmetric multi-processing support" CONFIG_LINUX_SMP menu_add "Build Configuration|Processor and Memory" list "Maximum number of CPUs" CONFIG_LINUX_NR_CPUS 2 4 8 16 32 -menu_add "System|Hardware Support" bool "Update Philips USB Webcam Kernel Driver (pwc) EXPERIMENTAL" CONFIG_LINUX_UPDATE_PWC +menu_add "Build Configuration" list "Kernel Version" CONFIG_LINUX_VERSION 2.4 2.6 +test "$CONFIG_LINUX_VERSION" = "2.4" && menu_add "System|Hardware Support" bool "Update Philips USB Webcam Kernel Driver (pwc) EXPERIMENTAL" CONFIG_LINUX_UPDATE_PWC Index: usbat-02.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/usbat-02.config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- usbat-02.config 17 Dec 2003 14:55:47 -0000 1.1 +++ usbat-02.config 11 Jan 2004 14:43:05 -0000 1.2 @@ -5,4 +5,4 @@ # # http://www.devil-linux.org -menu_add "System|Hardware Support" bool "USBAT-02 based USB CF card readers" CONFIG_USBAT02 +test "$CONFIG_LINUX_VERSION" = "2.4" && menu_add "System|Hardware Support" bool "USBAT-02 based USB CF card readers" CONFIG_USBAT02 Index: xfsprogs.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/xfsprogs.config,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- xfsprogs.config 17 Dec 2003 14:55:47 -0000 1.3 +++ xfsprogs.config 11 Jan 2004 14:43:05 -0000 1.4 @@ -5,4 +5,9 @@ # # http://www.devil-linux.org -[ "$CONFIG_GRSECURITY" = "y" ] || menu_add "System|Filesystems" bool "XFS Support ( most likely BROKEN )" CONFIG_XFS +if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then + if [ ! "$CONFIG_GRSECURITY" = "y" ]; then + menu_add "System|Filesystems" bool "XFS Support ( most likely BROKEN )" CONFIG_XFS + fi +fi + |
