Update of /cvsroot/leaf/src/bering-uclibc/buildtool/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27200
Modified Files:
createimage.sh
Log Message:
changes for using prepareimage.sh
Index: createimage.sh
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/buildtool/tools/createimage.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** createimage.sh 13 Jul 2005 22:56:53 -0000 1.7
--- createimage.sh 18 Jul 2005 12:59:14 -0000 1.8
***************
*** 20,26 ****
print_usage() {
cat <<EOF
! usage: $0 <fd|iso> <version> [<path>]
create an floppy (fd) or iso image, using packages from
! standard buildtool package dir (buildtool/packages) or
<path> if given
EOF
--- 20,26 ----
print_usage() {
cat <<EOF
! usage: $0 <fd|iso> <cvs-bin path> <release version> <kernel version>
create an floppy (fd) or iso image, using packages from
! checked out <cvs-bin path> as <release version>.
<path> if given
EOF
***************
*** 29,33 ****
#### look at how we are called:
! if [ "$1" = "" -o "$2" = "" ] ; then
print_usage
exit 1
--- 29,33 ----
#### look at how we are called:
! if [ "$1" = "" -o "$2" = "" -o "$3" = "" -o "$4" = "" ] ; then
print_usage
exit 1
***************
*** 43,47 ****
#################
DATE=$(date "+%B %Y")
! VERSION=$2
#### get clear path(s):
--- 43,47 ----
#################
DATE=$(date "+%B %Y")
! VERSION=$3
#### get clear path(s):
***************
*** 73,85 ****
exit 1
fi
- # do we get an dir name ?
- if [ "$3" != "" ] ; then
- PKGDIR=$3
- else
- # # no, use bt root dir
- PKGDIR=${BTROOT}/package
- fi
retval=0
--- 73,89 ----
exit 1
fi
+ echo "FILELIST=$FILELIST"
+ # set pkgdir
+ PKGDIR=$2
+
+ #if [ "$4" = "" ] ; then
+ # # find latest version
+ #
+ #
+ #fi
+ KVERSION=$4
+ # check directory
retval=0
***************
*** 91,94 ****
--- 95,107 ----
+ echo "copying files to $TMPDIR"
+ # copy base files
+ find $PKGDIR -maxdepth 1 -type f -exec cp {} $TMPDIR \;
+ mkdir -p $TMPDIR/contrib
+ mkdir -p $TMPDIR/testing
+ find $PKGDIR/testing -maxdepth 1 -type f -exec cp {} $TMPDIR/testing \;
+ find $PKGDIR/contrib -maxdepth 1 -type f -exec cp {} $TMPDIR/contrib \;
+ find $PKGDIR/$KVERSION -maxdepth 1 -type f -exec cp {} $TMPDIR \;
+
echo "creating image"
***************
*** 115,125 ****
echo copying $src to diskimage
tretval=0
! if [ "$dst" != "" ] ; then
! mcopy ${PKGDIR}/$src a:$dst
! tretval=$?
! else
! mcopy ${PKGDIR}/$src a:$dst
! tretval=$?
! fi
if [ $tretval -ne 0 ] ; then
retval=1
--- 128,135 ----
echo copying $src to diskimage
tretval=0
! #if [ "$dst" != "" ] ; then
! mcopy ${PKGDIR}/$src a:$dst
! tretval=$?
! #fi
if [ $tretval -ne 0 ] ; then
retval=1
***************
*** 134,139 ****
cp $FDDIR/syslinux.cfg $TMPDIR
#
! sed -e "s/{DATE}/$DATE/g" -e "s/{VERSION}/$2/g" $FDBASEDIR/syslinux.dpy >
$TMPDIR/syslinux.dpy
! sed -e "s/{DATE}/$DATE/g" -e "s/{VERSION}/$2/g" $FDBASEDIR/readme >
$TMPDIR/readme
mcopy -o $TMPDIR/syslinux.dpy a:syslinux.dpy
mcopy -o $TMPDIR/readme a:readme
--- 144,149 ----
cp $FDDIR/syslinux.cfg $TMPDIR
#
! sed -e "s/{DATE}/$DATE/g" -e "s/{VERSION}/$VERSION/g" $FDBASEDIR/syslinux.dpy
> $TMPDIR/syslinux.dpy
! sed -e "s/{DATE}/$DATE/g" -e "s/{VERSION}/$VERSION/g" $FDBASEDIR/readme >
$TMPDIR/readme
mcopy -o $TMPDIR/syslinux.dpy a:syslinux.dpy
mcopy -o $TMPDIR/readme a:readme
***************
*** 150,157 ****
set -e
mv $IMG ${TMPDIR}/bootdisk.ima
! cp $PKGDIR/* $TMPDIR
mkdir -p $TMPDIR/lib
! (cd $BTROOT/staging ; cp -a lib/modules/ $TMPDIR/lib )
! rm $TMPDIR/lib/modules/*/build
IMGNAME=$IMGPATH/Bering-uClibc-$VERSION-iso.bin
(cd $TMPDIR ; mkisofs -v -b bootdisk.ima -c boot.catalog -r -f
-J -o $IMGNAME .)
--- 160,167 ----
set -e
mv $IMG ${TMPDIR}/bootdisk.ima
! cp -R $PKGDIR/* $TMPDIR
mkdir -p $TMPDIR/lib
! (cd $TMPDIR/lib ; tar xvzf
../Bering-uClibc_modules_$KVERSION.tar.gz )
! rm $TMPDIR/lib/$KVERSION/build
IMGNAME=$IMGPATH/Bering-uClibc-$VERSION-iso.bin
(cd $TMPDIR ; mkisofs -v -b bootdisk.ima -c boot.catalog -r -f
-J -o $IMGNAME .)
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
