Update of /cvsroot/leaf/src/bering-uclibc/apps/initrd
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13199
Modified Files:
buildtool.cfg common.cfg root.linuxrc
Log Message:
new config system
Index: root.linuxrc
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/initrd/root.linuxrc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** root.linuxrc 29 Jun 2005 20:21:18 -0000 1.3
--- root.linuxrc 26 Jun 2006 17:31:17 -0000 1.4
***************
*** 27,30 ****
--- 27,33 ----
DEF_log_size=2M # Size of /var/log partition
usb_wait=1 # Wait time in sec. for USB drive
+ DEF_CONFIGDB=configdb
+ DEF_MODDB=moddb
+
if [ $DEBUG ] ; then
***************
*** 121,125 ****
# Set config variables, falling back to defaults
! for i in LRP PKGPATH syst_size tmp_size log_size ; do
eval $i=\"\${$i:-\${KCMD_$i:-\$DEF_$i}}\"
done
--- 124,128 ----
# Set config variables, falling back to defaults
! for i in LRP PKGPATH CONFIGDB MODDB syst_size tmp_size log_size ; do
eval $i=\"\${$i:-\${KCMD_$i:-\$DEF_$i}}\"
done
***************
*** 201,208 ****
echo "$dev $t" >>$PFX/pkgpath.disks
devlist="$dev:+/mnt$devcount:-$t,$devlist"
- rdevlist="$rdevlist,$dev:+/mnt$devcount:-$t"
if [ $devcount -eq 1 ] ; then
echo "${KCMD_initrd%.lrp}">$PFX/packages
- echo "${KCMD_initrd%.lrp}=-t $t
$dev">$PFX/backdisk
fi
break
--- 204,209 ----
***************
*** 217,244 ****
devlist=${devlist%,}
- rdevlist=${rdevlist#,}
if [ ! "$LRP" = "" ]; then
echo -n "LINUXRC: Installing -"
!
IFS="$IFS,"
! for f in ${LRP}; do
! backdisk=""
IFS=':'
set -- $f
f=$1
! multi=1; revrs=0
! case $2 in
! f) multi=1 ; revrs=0 ;;
! F) multi=0 ; revrs=0 ;;
! r) multi=1 ; revrs=1 ;;
! R) multi=0 ; revrs=1 ;;
! esac
! if [ "$revrs" = 1 ]; then
! usedevlist=$rdevlist
! else
! usedevlist=$devlist
! fi
fnd=0
echo -n " $f:"
--- 218,235 ----
devlist=${devlist%,}
if [ ! "$LRP" = "" ]; then
echo -n "LINUXRC: Installing -"
!
! echo configdb=$CONFIGDB >$PFX/backup
! echo moddb=$MODDB >>$PFX/backup
!
IFS="$IFS,"
! for f in ${LRP} $CONFIGDB $MODDB; do
IFS=':'
set -- $f
f=$1
! usedevlist=$devlist
fnd=0
echo -n " $f:"
***************
*** 250,262 ****
t="${devtype#*:-}"
[ "$VERBOSE" ] && echo -n " dev: $dev mnt: $mnt t: $t
f: $mnt/$f.lrp"
! if [ $multi -eq 1 -o $fnd -ne 1 ]; then
if [ -f $mnt/$f.lrp ]; then
echo -n " $dev"
gunzip -c $mnt/$f.lrp > /dev/null
if [ $? -eq 0 ]; then
gunzip -c $mnt/$f.lrp | qt tar -x
#Update installed packages file
[ $fnd -ne 1 ] && echo
"$f">>$PFX/packages
! backdisk="$f=-t $t $dev"
fnd=1
else
--- 241,259 ----
t="${devtype#*:-}"
[ "$VERBOSE" ] && echo -n " dev: $dev mnt: $mnt t: $t
f: $mnt/$f.lrp"
! if [ $fnd -ne 1 ]; then
if [ -f $mnt/$f.lrp ]; then
echo -n " $dev"
gunzip -c $mnt/$f.lrp > /dev/null
if [ $? -eq 0 ]; then
+ #tar -ztf $mnt/$f.lrp > $PFX/$f.list
gunzip -c $mnt/$f.lrp | qt tar -x
#Update installed packages file
[ $fnd -ne 1 ] && echo
"$f">>$PFX/packages
! #Calculate sha1sum
! if [ -f $PFX/$f.local ] ; then
! cat $PFX/$f.local | while read x ;
do
! [ -e "$x" ] && find "$x" -type
f | xargs sha1sum >> $PFX/$f.sha1
! done
! fi
fnd=1
else
***************
*** 267,273 ****
fi
done
-
- [ -n "$backdisk" ] && echo $backdisk >> $PFX/backdisk
-
if [ $fnd -eq 0 ]; then
echo -n " $f(nf!)"
--- 264,267 ----
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/initrd/buildtool.cfg,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** buildtool.cfg 18 Jun 2006 21:20:04 -0000 1.22
--- buildtool.cfg 26 Jun 2006 17:31:17 -0000 1.23
***************
*** 92,96 ****
Filename = boot/etc/modules
Type = binary
- Type = conf
Description = Modules to load before any
other package
Permissions = 644
--- 92,95 ----
***************
*** 131,135 ****
Filename = boot/etc/modules
Type = binary
- Type = conf
Description = Modules to load before any
other package
Permissions = 644
--- 130,133 ----
***************
*** 194,198 ****
Filename = boot/etc/modules
Type = binary
- Type = conf
Description = Modules to load before any
other package
Permissions = 644
--- 192,195 ----
***************
*** 276,280 ****
Filename = boot/etc/modules
Type = binary
- Type = conf
Description = Modules to load before any
other package
Permissions = 644
--- 273,276 ----
Index: common.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/initrd/common.cfg,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** common.cfg 18 Jun 2006 21:20:04 -0000 1.7
--- common.cfg 26 Jun 2006 17:31:17 -0000 1.8
***************
*** 7,11 ****
Permissions = 644
</File>
-
<File>
Source = lib/ld-uClibc-target.so
--- 7,10 ----
***************
*** 14,18 ****
Permissions = 755
</File>
-
<File>
Source = lib/libcrypt-0.9.28.so
--- 13,16 ----
***************
*** 21,25 ****
Permissions = 644
</File>
-
<File>
Source = lib/libuClibc-0.9.28.so
--- 19,22 ----
***************
*** 28,32 ****
Permissions = 644
</File>
-
<File>
Filename = lib/libcrypt.so.0
--- 25,28 ----
***************
*** 34,38 ****
Type = link
</File>
-
<File>
Filename = lib/ld-uClibc.so.0
--- 30,33 ----
***************
*** 51,55 ****
Permissions = 755
</File>
-
<File>
Filename = bin/sh
--- 46,49 ----
***************
*** 72,87 ****
Filename = boot/etc/README
Type = binary
! Type = conf
! Description = Readme first
Permissions = 644
</File>
-
- <File>
- Filename = boot
- # Type = directory
- Type = list
- Permissions = 755
- </File>
-
<File>
Filename = boot/lib/modules
--- 66,73 ----
Filename = boot/etc/README
Type = binary
! # Type = conf
! # Description = Readme first
Permissions = 644
</File>
<File>
Filename = boot/lib/modules
***************
*** 89,93 ****
Permissions = 755
</File>
-
<File>
Filename = usr/bin
--- 75,78 ----
***************
*** 95,99 ****
Permissions = 755
</File>
-
<File>
Filename = usr/sbin
--- 80,83 ----
***************
*** 118,126 ****
</File>
<File>
- Source = bin/busybox.links
- Filename = var/lib/lrpkg/root.bb.links
- Type = binary
- </File>
- <File>
Source = var/lib/lrpkg/root.blk.mk
Filename = var/lib/lrpkg/root.blk.mk
--- 102,105 ----
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
leaf-cvs-commits mailing list
leaf-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
