Menu
▾
▴
[Devil-linux-commit] build/scripts build.sh,1.69,1.70 cdrtools,1.6,1.7 functions,1.48,1.49 iproute2,1.20,1.21 iputils,1.7,1.8 lilo,1.9,1.10 reiserfsprogs,1.12,1.13 strace,1.10,1.11 sysklogd,1.10,1.11
Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv2009/scripts
Modified Files:
build.sh cdrtools functions iproute2 iputils lilo
reiserfsprogs strace sysklogd
Log Message:
added support for compiling many programs with Kernel 2.6
added functions to switch between new and old kernel headers
Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- build.sh 13 Jan 2004 13:52:08 -0000 1.69
+++ build.sh 14 Jan 2004 03:32:26 -0000 1.70
@@ -297,6 +297,9 @@
# (re-)enable the compilation as ET_DYN in case a script disabled it
enable_et_dyn
+ # reset to the new kernel includes
+ reset_kernel_includes
+
echo
t1=$(date +"%s")
Index: cdrtools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cdrtools,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cdrtools 11 Jan 2004 14:43:04 -0000 1.6
+++ cdrtools 14 Jan 2004 03:32:26 -0000 1.7
@@ -25,6 +25,11 @@
case $1 in
build )
+ if [ ! -f cdrtools-2.0-patch.done ]; then
+ bzcat $SRCDIR/cdrtools-2.0-kernel-26-patch.bz2 | patch -p1 || exit 1
+ touch cdrtools-2.0-patch.done
+ fi
+
./Gmake.linux CCOM=gcc all || exit 1
strip_debug
;;
Index: functions
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/functions,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- functions 11 Jan 2004 15:17:01 -0000 1.48
+++ functions 14 Jan 2004 03:32:26 -0000 1.49
@@ -414,3 +414,17 @@
ln -sf specs.et_dyn $GCCSPECDIR/specs || exit 1
fi
}
+
+function reset_kernel_includes () {
+ ln -sf $KERNELDIR/include/linux /usr/include/linux || exit 1
+ ln -sf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1
+ ln -sf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1
+}
+
+function old_kernel_includes () {
+ OLDINCLUDEDIR=$(find_src_dir 2.4.21-include)
+ ln -sf $OLDINCLUDEDIR/include/linux /usr/include/linux || exit 1
+ ln -sf $OLDINCLUDEDIR/include/asm-i386 /usr/include/asm || exit 1
+ ln -sf $OLDINCLUDEDIR/include/asm-generic /usr/include/asm-generic || exit 1
+}
+
Index: iproute2
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iproute2,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- iproute2 11 Jan 2004 14:43:04 -0000 1.20
+++ iproute2 14 Jan 2004 03:32:26 -0000 1.21
@@ -24,7 +24,6 @@
source $MYDIR/settings
MYNAME=IPROUTE2
-OLDINCLUDEDIR=$(find_src_dir 2.4.21-include)
case $1 in
build )
@@ -35,7 +34,9 @@
fi
replace_str Makefile /usr/src/linux $KERNELDIR
replace_str Config "TC_CONFIG_ATM=y" "TC_CONFIG_ATM=n"
- make $PMAKE KERNEL_INCLUDE=$OLDINCLUDEDIR all || exit 1
+
+ old_kernel_includes
+ make $PMAKE all || exit 1
strip_debug
fi
;;
Index: iputils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iputils,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- iputils 11 Jan 2004 14:43:04 -0000 1.7
+++ iputils 14 Jan 2004 03:32:26 -0000 1.8
@@ -22,7 +22,6 @@
# source functions and config
source $MYDIR/settings
-OLDINCLUDEDIR=$(find_src_dir 2.4.21-include)
case $1 in
build )
@@ -30,7 +29,9 @@
touch devil-linux-patches.done
zcat $DL_DIR/src/iputils*.diff.gz | patch -p1 || exit 1
fi
- make $PMAKE KERNEL_INCLUDE=$OLDINCLUDEDIR all || exit 1
+
+ old_kernel_includes
+ make $PMAKE all || exit 1
strip_debug
;;
Index: lilo
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lilo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- lilo 13 Jan 2004 02:29:49 -0000 1.9
+++ lilo 14 Jan 2004 03:32:26 -0000 1.10
@@ -25,14 +25,10 @@
case $1 in
build )
-
- if [ ! -f lilo-patches.done ]; then
- bzcat $DL_DIR/src/lilo_22.5.8_header.diff.bz2 | patch -p1
- touch lilo-patches.done
- fi
-
+
disable_et_dyn
+ old_kernel_includes
make $PMAKE || exit 1
strip_debug
;;
Index: reiserfsprogs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/reiserfsprogs,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- reiserfsprogs 11 Jan 2004 14:43:05 -0000 1.12
+++ reiserfsprogs 14 Jan 2004 03:32:26 -0000 1.13
@@ -26,6 +26,7 @@
case $1 in
build )
disable_et_dyn
+ old_kernel_includes
./configure --prefix= || exit 1
make $PMAKE all || exit 1
strip_debug
Index: strace
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/strace,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- strace 11 Jan 2004 14:43:05 -0000 1.10
+++ strace 14 Jan 2004 03:32:26 -0000 1.11
@@ -25,6 +25,7 @@
case $1 in
build )
+ old_kernel_includes
./configure --prefix=/usr || exit 1
make $PMAKE all || exit 1
strip_debug
Index: sysklogd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sysklogd,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sysklogd 11 Jan 2004 14:43:05 -0000 1.10
+++ sysklogd 14 Jan 2004 03:32:26 -0000 1.11
@@ -25,6 +25,7 @@
case $1 in
build )
+ old_kernel_includes
make $PMAKE || exit 1
strip_debug
;;
|
