[Kernelloader-cvs] linux/busybox build-busybox.sh,1.17,1.18

[Mega M. <kl...@us...>]

Update of /cvsroot/kernelloader/linux/busybox
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32566/busybox

Modified Files:
	build-busybox.sh 
Log Message:
When building from there is + added behind the kernel version.
Add configuration entry in config.cfg for kernel version.


Index: build-busybox.sh
===================================================================
RCS file: /cvsroot/kernelloader/linux/busybox/build-busybox.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** build-busybox.sh	6 May 2014 23:09:12 -0000	1.17
--- build-busybox.sh	30 Jul 2014 23:50:22 -0000	1.18
***************
*** 4,7 ****
--- 4,16 ----
  # Second parameter: Compiler prefix.
  
+ WORKDIR="`pwd`"
+ 
+ cd "`dirname $0`" || exit -1
+ BASEDIR="`pwd`/.."
+ 
+ cd "$WORKDIR" || exit -1
+ 
+ source "$BASEDIR/config.cfg"
+ 
  SUDO=
  REBUILD="n"
***************
*** 47,54 ****
  MODULEDIR="$BASEDIR/../modules"
  if [ ! -d "$MODULEDIR" ]; then
! 	if [ ! -e linux-2.6.35.4-mipsel-ps2-modules-v$MODULEVERSION.tar.bz2 ]; then
! 		wget http://downloads.sourceforge.net/project/kernelloader/Linux%202.6/Linux%202.6%20Test%20Files%20Version%20$MODULEVERSION/linux-2.6.35.4-mipsel-ps2-modules-v$MODULEVERSION.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fkernelloader%2Ffiles%2FLinux%25202.6%2FLinux%25202.6%2520Test%2520Files%2520Version%25207%2F&ts=1330876025&use_mirror=switch || exit -1
! 		mv -i linux-2.6.35.4-mipsel-ps2-modules-v$MODULEVERSION.tar.bz2* linux-2.6.35.4-mipsel-ps2-modules-v$MODULEVERSION.tar.bz2 || exit -1
! 	fi
  fi
  
--- 56,61 ----
  MODULEDIR="$BASEDIR/../modules"
  if [ ! -d "$MODULEDIR" ]; then
! 	echo "Please install modules first or run ../build-all.sh" >&2
! 	exit -1
  fi
  
***************
*** 160,187 ****
  
  # Copy useful kernel modules:
! if [ ! -d "$MODULEDIR" ]; then
! 	tar -xjf ../../linux-2.6.35.4-mipsel-ps2-modules-v$MODULEVERSION.tar.bz2 \
! 		lib/modules/2.6.35.4/modules.dep \
! 		lib/modules/2.6.35.4/kernel/fs/cifs/cifs.ko \
! 		lib/modules/2.6.35.4/kernel/fs/isofs/isofs.ko \
! 		lib/modules/2.6.35.4/kernel/fs/smbfs/smbfs.ko \
! 		lib/modules/2.6.35.4/kernel/drivers/input/joydev.ko \
! 		|| exit -1
! else
! 	# Use modules from current build:
! 	mkdir -p lib/modules/2.6.35.4/kernel/fs/cifs || exit -1
! 	mkdir -p lib/modules/2.6.35.4/kernel/fs/isofs || exit -1
! 	mkdir -p lib/modules/2.6.35.4/kernel/fs/smbfs || exit -1
! 	mkdir -p lib/modules/2.6.35.4/kernel/drivers/input || exit -1
! 	cp "$MODULEDIR/lib/modules/2.6.35.4/modules.dep" lib/modules/2.6.35.4/ || exit -1
! 	cp "$MODULEDIR/lib/modules/2.6.35.4/kernel/fs/cifs/cifs.ko" lib/modules/2.6.35.4/kernel/fs/cifs/ || exit -1
! 	cp "$MODULEDIR/lib/modules/2.6.35.4/kernel/fs/isofs/isofs.ko" lib/modules/2.6.35.4/kernel/fs/isofs || exit -1
! 	cp "$MODULEDIR/lib/modules/2.6.35.4/kernel/fs/smbfs/smbfs.ko" lib/modules/2.6.35.4/kernel/fs/smbfs || exit -1
! 	cp "$MODULEDIR/lib/modules/2.6.35.4/kernel/drivers/input/joydev.ko" lib/modules/2.6.35.4/kernel/drivers/input/joydev.ko || exit -1
  
! 	if [ -d "$BASEDIR/../sps2mod-0.5.0-unofficial" ]; then
! 		mkdir -p lib/modules/2.6.35.4/kernel/drivers/ps2/sps2_mod || exit -1
! 		cp "$BASEDIR/../sps2mod-0.5.0-unofficial/sps2_mod.ko" lib/modules/2.6.35.4/kernel/drivers/ps2/sps2_mod/sps2_mod.ko || exit -1
! 	fi
  fi
  #ln -s /sbin/init init || exit -1
--- 167,184 ----
  
  # Copy useful kernel modules:
! # Use modules from current build:
! mkdir -p lib/modules/${KERNELVERSION}/kernel/fs/cifs || exit -1
! mkdir -p lib/modules/${KERNELVERSION}/kernel/fs/isofs || exit -1
! mkdir -p lib/modules/${KERNELVERSION}/kernel/fs/smbfs || exit -1
! mkdir -p lib/modules/${KERNELVERSION}/kernel/drivers/input || exit -1
! cp "$MODULEDIR/lib/modules/${KERNELVERSION}/modules.dep" lib/modules/${KERNELVERSION}/ || exit -1
! cp "$MODULEDIR/lib/modules/${KERNELVERSION}/kernel/fs/cifs/cifs.ko" lib/modules/${KERNELVERSION}/kernel/fs/cifs/ || exit -1
! cp "$MODULEDIR/lib/modules/${KERNELVERSION}/kernel/fs/isofs/isofs.ko" lib/modules/${KERNELVERSION}/kernel/fs/isofs || exit -1
! cp "$MODULEDIR/lib/modules/${KERNELVERSION}/kernel/fs/smbfs/smbfs.ko" lib/modules/${KERNELVERSION}/kernel/fs/smbfs || exit -1
! cp "$MODULEDIR/lib/modules/${KERNELVERSION}/kernel/drivers/input/joydev.ko" lib/modules/${KERNELVERSION}/kernel/drivers/input/joydev.ko || exit -1
  
! if [ -d "$BASEDIR/../sps2mod-0.5.0-unofficial" ]; then
! 	mkdir -p lib/modules/${KERNELVERSION}/kernel/drivers/ps2/sps2_mod || exit -1
! 	cp "$BASEDIR/../sps2mod-0.5.0-unofficial/sps2_mod.ko" lib/modules/${KERNELVERSION}/kernel/drivers/ps2/sps2_mod/sps2_mod.ko || exit -1
  fi
  #ln -s /sbin/init init || exit -1