Menu
▾
▴
[Devil-linux-commit] build/scripts build-iso,1.51,1.52 dosfstools,1.6,1.7 e100,1.11,1.12 e1000,1.11,1.12 gcc,1.16,1.17 gdbm,1.9,1.10 glibc,1.27,1.28 i2c,1.5,1.6 iANS,1.15,1.16 shadow,1.15,1.16 util-linux,1.20,1.21
Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv18532/scripts
Modified Files:
build-iso dosfstools e100 e1000 gcc gdbm glibc i2c iANS shadow
util-linux
Log Message:
- disabled e100, e1000, i2c, ians for kernel 2.6 builds (Heiko + Oliver
Jehle)
- disabled zisofs and cramfs initrd for kernel 2.6 builds (Heiko + Oliver
Jehle)
- updated strace to v4.5.1
Index: build-iso
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- build-iso 13 Jan 2004 02:29:49 -0000 1.51
+++ build-iso 14 Jan 2004 21:31:36 -0000 1.52
@@ -71,7 +71,13 @@
echo "do a 'make clean' in order to get it updated"
$NORMAL
fi
-
+ #===========================================================================
+ # workaround ... for kernel 2.6
+ #===========================================================================
+ if [ "$CONFIG_LINUX_VERSON" = "2.6" ]; then
+ CONFIG_ZISOFS=n
+ CONFIG_INITRD_FS = EXT2
+ fi
#===========================================================================
@@ -160,7 +166,7 @@
tune2fs -c 0 -i 0 /dev/loop2
# we mount it...
- mount /dev/loop2 $WORKDIR/mnt/loop2
+ mount -t ext2 /dev/loop2 $WORKDIR/mnt/loop2
# ... and delete the lost+found directory
rm -rf $WORKDIR/mnt/loop2/lost+found
Index: dosfstools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dosfstools,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- dosfstools 11 Jan 2004 14:43:04 -0000 1.6
+++ dosfstools 14 Jan 2004 21:31:36 -0000 1.7
@@ -38,6 +38,7 @@
touch dosfsutils-patches.done
fi
+ old_kernel_includes
make $PMAKE || exit 1
strip_debug
fi
Index: e100
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/e100,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- e100 11 Jan 2004 14:43:04 -0000 1.11
+++ e100 14 Jan 2004 21:31:36 -0000 1.12
@@ -23,6 +23,7 @@
# source functions and config
source $MYDIR/settings
+test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 0
case $1 in
build )
Index: e1000
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/e1000,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- e1000 11 Jan 2004 14:43:04 -0000 1.11
+++ e1000 14 Jan 2004 21:31:36 -0000 1.12
@@ -22,6 +22,7 @@
# source functions and config
source $MYDIR/settings
+test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 0
case $1 in
Index: gcc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/gcc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gcc 11 Jan 2004 14:43:04 -0000 1.16
+++ gcc 14 Jan 2004 21:31:36 -0000 1.17
@@ -38,7 +38,11 @@
if [ ! -f devil-linux-kernel-protector-patche.done ]; then
touch devil-linux-kernel-protector-patche.done
- bzcat $DL_DIR/src/linux-2.4.23-protector-1.patch.bz2 | patch -p1 -d $KERNELDIR || exit 1
+ if [ "$KERNELVERSION" = "2.4" ]; then
+ bzcat $DL_DIR/src/linux-2.4.23-protector-1.patch.bz2 | patch -p1 -d $KERNELDIR || exit 1
+ else
+ bzcat $DL_DIR/src/linux-2.6.0-protector-1.patch.bz2 | patch -p1 -d $KERNELDIR || exit 1
+ fi
fi
fi
Index: gdbm
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/gdbm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gdbm 11 Jan 2004 14:43:04 -0000 1.9
+++ gdbm 14 Jan 2004 21:31:36 -0000 1.10
@@ -25,6 +25,10 @@
case $1 in
build )
+ rc=`getent passwd bin`
+ if [ -z "$rc" ]; then
+ useradd -u 1 bin
+ fi
./configure --prefix=/usr || exit 1
# prefix is needed, because it's not correct update in the Makefile
Index: glibc
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/glibc,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- glibc 13 Jan 2004 17:55:38 -0000 1.27
+++ glibc 14 Jan 2004 21:31:36 -0000 1.28
@@ -50,8 +50,13 @@
mkdir ../glibc-build || exit 1
cd ../glibc-build || exit 1
# unfortunately we can only go as high as the host kernel version
- #KVER=$(uname -r)
- KVER=$(cat //proc/sys/kernel/osrelease)
+
+ KVER_RUN=$(cat //proc/sys/kernel/osrelease)
+ if [ "$KERNELVERSION" > "$KVER_RUN" ]; then
+ KVER=$KVER_RUN
+ else
+ KVER=$KERNELVERSION
+ fi
../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --libexecdir=/usr/bin --enable-kernel=$KVER --without-gd || exit 1
make $PMAKE || exit 1
Index: i2c
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/i2c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- i2c 14 Jan 2004 03:43:31 -0000 1.5
+++ i2c 14 Jan 2004 21:31:36 -0000 1.6
@@ -26,6 +26,9 @@
case $1 in
build )
+ if [ "$KERNELVERSION" != "2.4" ]; then
+ exit 0
+ fi
if [ "$CONFIG_LM_SENSORS" = "y" ]; then
echo preparing patch
cd mkpatch || exit 1
@@ -38,8 +41,7 @@
echo "$CFG=y" >> $KERNELDIR/.config
done
fi
- ;;
-
+ ;;
* )
echo "ERROR ($0)"
echo "please add parameter so I know what to do"
Index: iANS
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/iANS,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- iANS 11 Jan 2004 14:43:04 -0000 1.15
+++ iANS 14 Jan 2004 21:31:36 -0000 1.16
@@ -25,6 +25,8 @@
MYNAME=IANS
+test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 0
+
case $1 in
build )
if [ "$CONFIG_IANS" = "y" ]; then
Index: shadow
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/shadow,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- shadow 11 Jan 2004 14:43:05 -0000 1.15
+++ shadow 14 Jan 2004 21:31:36 -0000 1.16
@@ -34,6 +34,11 @@
;;
install )
+ rc=`getent group wheel`
+ if [ -z "$rc" ]; then
+ groupadd -g 15 wheel
+ fi
+
rm -rf $WORKDIR/tmp || exit 1
mkdir -p $WORKDIR/tmp || exit 1
make DESTDIR=$WORKDIR/tmp install || exit 1
Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- util-linux 11 Jan 2004 14:43:05 -0000 1.20
+++ util-linux 14 Jan 2004 21:31:36 -0000 1.21
@@ -26,7 +26,15 @@
case $1 in
build )
disable_et_dyn
- bzcat $SRCDIR/util-linux-2.12.diff.bz2 | patch -p1 || exit 1
+ if [ ! -f util-linux-patch.done ]; then
+ if [ "$CONFIG_LINUX_VERSON" = "2.4" ]; then
+ echo "patch 2.4 "
+ bzcat $SRCDIR/util-linux-2.12.diff.bz2 | patch -p1 || exit 1
+ fi
+ echo "patch for adding kernel 2.6 support"
+ bzcat $SRCDIR/util-linux-2.12-kernel-2.6.patch.bz2 | patch -p1 || exit 1
+ touch util-linux-patch.done
+ fi
./configure || exit 1
replace_str defines.h "#define ENABLE_NLS" ""
if [ "$CONFIG_GCC_ET_DYN" = "y" ]; then
|
