[IPCop-cvs] CVS: ipcop/lfs/ipcop 73-busybox,1.1,1.2 74-sysvinit,1.1,1.2 75-util-linux,1.1,1.2 76-e2fsprogs,1.1,1.2 compile-busybox,1.4,1.5 compile-e2fsprogs,1.3,1.4 compile-newt,1.1,1.2 compile-sysvinit,1.3,1.4 compile-util-linux,1.3,1.4

[Mark W. <ri...@us...>]

Update of /cvsroot/ipcop/ipcop/lfs/ipcop
In directory usw-pr-cvs1:/tmp/cvs-serv6933/lfs/ipcop

Modified Files:
	73-busybox 74-sysvinit 75-util-linux 76-e2fsprogs 
	compile-busybox compile-e2fsprogs compile-newt 
	compile-sysvinit compile-util-linux 
Log Message:
Fixed some minor installer problems

Index: 73-busybox
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/ipcop/73-busybox,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 73-busybox	2002/01/25 17:25:10	1.1
--- 73-busybox	2002/01/31 21:11:21	1.2
***************
*** 1,5 ****
  . /install/scripts/setup2
  [ -f /install/ipcop/postsetup-$N ] && . /install/ipcop/postsetup-$N
! . /install/scripts/installedp
  . /install/scripts/extract2
  . /install/scripts/patch
--- 1,5 ----
  . /install/scripts/setup2
  [ -f /install/ipcop/postsetup-$N ] && . /install/ipcop/postsetup-$N
! #. /install/scripts/installedp
  . /install/scripts/extract2
  . /install/scripts/patch
***************
*** 7,10 ****
  . /install/ipcop/compile-$N
  . /install/scripts/remove
! . /install/scripts/postinstalledp
! . /install/scripts/failed
--- 7,10 ----
  . /install/ipcop/compile-$N
  . /install/scripts/remove
! #. /install/scripts/postinstalledp
! #. /install/scripts/failed

Index: 74-sysvinit
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/ipcop/74-sysvinit,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 74-sysvinit	2002/01/25 17:25:10	1.1
--- 74-sysvinit	2002/01/31 21:11:21	1.2
***************
*** 1,5 ****
  . /install/scripts/setup2
  [ -f /install/ipcop/postsetup-$N ] && . /install/ipcop/postsetup-$N
! . /install/scripts/installedp
  . /install/scripts/extract2
  . /install/scripts/patch
--- 1,5 ----
  . /install/scripts/setup2
  [ -f /install/ipcop/postsetup-$N ] && . /install/ipcop/postsetup-$N
! #. /install/scripts/installedp
  . /install/scripts/extract2
  . /install/scripts/patch
***************
*** 7,10 ****
  . /install/ipcop/compile-$N
  . /install/scripts/remove
! . /install/scripts/postinstalledp
! . /install/scripts/failed
--- 7,10 ----
  . /install/ipcop/compile-$N
  . /install/scripts/remove
! #. /install/scripts/postinstalledp
! #. /install/scripts/failed

Index: 75-util-linux
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/ipcop/75-util-linux,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 75-util-linux	2002/01/25 17:25:10	1.1
--- 75-util-linux	2002/01/31 21:11:21	1.2
***************
*** 1,5 ****
  . /install/scripts/setup2
  [ -f /install/ipcop/postsetup-$N ] && . /install/ipcop/postsetup-$N
! . /install/scripts/installedp
  . /install/scripts/extract2
  . /install/scripts/patch
--- 1,5 ----
  . /install/scripts/setup2
  [ -f /install/ipcop/postsetup-$N ] && . /install/ipcop/postsetup-$N
! #. /install/scripts/installedp
  . /install/scripts/extract2
  . /install/scripts/patch
***************
*** 7,10 ****
  . /install/ipcop/compile-$N
  . /install/scripts/remove
! . /install/scripts/postinstalledp
! . /install/scripts/failed
--- 7,10 ----
  . /install/ipcop/compile-$N
  . /install/scripts/remove
! #. /install/scripts/postinstalledp
! #. /install/scripts/failed

Index: 76-e2fsprogs
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/ipcop/76-e2fsprogs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 76-e2fsprogs	2002/01/25 17:25:10	1.1
--- 76-e2fsprogs	2002/01/31 21:11:21	1.2
***************
*** 1,5 ****
  . /install/scripts/setup2
  [ -f /install/ipcop/postsetup-$N ] && . /install/ipcop/postsetup-$N
! . /install/scripts/installedp
  . /install/scripts/extract2
  . /install/scripts/patch
--- 1,5 ----
  . /install/scripts/setup2
  [ -f /install/ipcop/postsetup-$N ] && . /install/ipcop/postsetup-$N
! #. /install/scripts/installedp
  . /install/scripts/extract2
  . /install/scripts/patch
***************
*** 7,10 ****
  . /install/ipcop/compile-$N
  . /install/scripts/remove
! . /install/scripts/postinstalledp
! . /install/scripts/failed
--- 7,10 ----
  . /install/ipcop/compile-$N
  . /install/scripts/remove
! #. /install/scripts/postinstalledp
! #. /install/scripts/failed

Index: compile-busybox
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/ipcop/compile-busybox,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** compile-busybox	2002/01/30 20:25:36	1.4
--- compile-busybox	2002/01/31 21:11:21	1.5
***************
*** 1,2 ****
--- 1,3 ----
+ CCPATH=$PATH &&
  export PATH=/usr/i386-linux-uclibc/bin:$PATH &&
  cp Config.h Config.h.bak &&
***************
*** 35,38 ****
--- 36,40 ----
  cp busybox /install/installroot/bin &&
  cd /install/installroot/bin &&
+ export PATH=$CCPATH
  for i in ash cat chroot echo gzip gunzip halt insmod ifconfig init ls mkswap \
  	modprobe mount reboot rmmod sh sleep swapon swapoff tar umount wget ; do

Index: compile-e2fsprogs
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/ipcop/compile-e2fsprogs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** compile-e2fsprogs	2002/01/30 20:25:36	1.3
--- compile-e2fsprogs	2002/01/31 21:11:21	1.4
***************
*** 1,3 ****
--- 1,6 ----
+ CCPATH=$PATH &&
+ export PATH=/usr/i386-linux-uclibc/bin:$PATH &&
  ./configure &&
+ export PATH=$CCPATH &&
  cd util &&
  make &&
***************
*** 6,8 ****
  make &&
  strip misc/mke2fs &&
! cp misc/mke2fs /install/floppy2/bin
--- 9,12 ----
  make &&
  strip misc/mke2fs &&
! cp misc/mke2fs /install/floppy2/bin &&
! export PATH=$CCPATH

Index: compile-newt
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/ipcop/compile-newt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** compile-newt	2002/01/25 17:25:10	1.1
--- compile-newt	2002/01/31 21:11:21	1.2
***************
*** 1,7 ****
  ./configure --prefix=/usr --sysconfdir=/etc \
  	--sharedstatedir=/var --localstatedir=/var  &&
! make libnewt.a sharedlib &&
  install -m 644 newt.h /usr/include &&
! install -m 644 libnewt.a /usr/lib &&
! install -s -m 755 libnewt.so.0.50.17 /usr/lib &&
! ln -sf libnewt.so.50.17 /usr/lib/libnewt.so
--- 1,5 ----
  ./configure --prefix=/usr --sysconfdir=/etc \
  	--sharedstatedir=/var --localstatedir=/var  &&
! make libnewt.a &&
  install -m 644 newt.h /usr/include &&
! install -m 644 libnewt.a /usr/lib

Index: compile-sysvinit
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/ipcop/compile-sysvinit,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** compile-sysvinit	2002/01/30 20:25:36	1.3
--- compile-sysvinit	2002/01/31 21:11:21	1.4
***************
*** 1,2 ****
--- 1,3 ----
+ CCPATH=$PATH &&
  export PATH=/usr/i386-linux-uclibc/bin:$PATH &&
  cd src &&
***************
*** 4,5 ****
--- 5,7 ----
  strip killall5 &&
  cp killall5 /install/installroot/bin
+ export PATH=$CCPATH

Index: compile-util-linux
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/ipcop/compile-util-linux,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** compile-util-linux	2002/01/30 20:25:36	1.3
--- compile-util-linux	2002/01/31 21:11:21	1.4
***************
*** 1,2 ****
--- 1,3 ----
+ CCPATH=$PATH &&
  export PATH=/usr/i386-linux-uclibc/bin:$PATH &&
  ./configure &&
***************
*** 7,10 ****
  make sfdisk &&
  strip sfdisk &&
! mkdir -p /install/floppy2/bin
! cp sfdisk /install/floppy2/bin
--- 8,12 ----
  make sfdisk &&
  strip sfdisk &&
! mkdir -p /install/floppy2/bin &&
! cp sfdisk /install/floppy2/bin &&
! export PATH=$CCPATH