--- elwix/build_uboot.sh	2014/01/20 13:05:17	1.1.2.1
+++ elwix/build_uboot.sh	2014/01/20 13:25:07	1.1.2.2
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_uboot.sh,v 1.1.2.1 2014/01/20 13:05:17 misho Exp $
+# $Id: build_uboot.sh,v 1.1.2.2 2014/01/20 13:25:07 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -134,10 +134,8 @@ install_ubfs()
 	find ${WORLD}/usr/lib -type f -name \*.so.\* -exec install {} $LIBS \;
 	find ${WORLD}/usr/lib/engines -type f -name \*.so -exec install {} $LIBS/engines \;
 
-	InstallList ${ELWIX_BASEFS} ${WORLD} ${BASEFS}
+	InstallList ${ELWIX_UBOOTFS} ${WORLD} ${UBFS}
 
-	ln ${BIN}/tcsh ${UBIN}/tcsh
-
 	InstallDir ${WORLD}/usr/local/bin $UBIN
 	InstallDir ${WORLD}/usr/local/sbin $USBIN
 	InstallFiles \*.so\* ${WORLD}/usr/local/lib $LIBS
@@ -151,8 +149,8 @@ prepare_fs()
 	echo "+++ Prepare ELWIX fs ..."
 	mkdir -p $1
 
-	if [ -d ${BASEFS} ]; then
-		cd ${BASEFS}
+	if [ -d ${UBFS} ]; then
+		cd ${UBFS}
 		pax -rw -pe -X . $1
 		cd -
 	fi
@@ -174,12 +172,6 @@ install_fs()
 	echo "+++ Install ELWIX u-boot $1 in bundle OS install file ..."
 	OSZ=""
 
-#	install -v ${KERNEL} $1/boot/kernel;
-	cd $1/boot/kernel;
-	gzip -9 kernel;
-	cp kernel.gz ${REL}
-	cd -;
-
 	case "$2" in
 		*)
 			OSZ=${REL}/${UBOOT_OS}
@@ -197,13 +189,11 @@ build_basefs
 install_basefs
 
 # build fs
-prepare_fs ${BASE_FS}
-MakeFS_home ${BASE_FS}/elwix
-MakeFS_var ${BASE_FS}/elwix ${BASE_ETC}
-MakeFS_etc ${BASE_FS}/elwix ${BASE_ETC} base
-create_etc_fstab ${BASE_FS}/elwix base
-MakeFS_backup ${BASE_FS}/elwix
-MakeFS_boot ${BASE_FS}
-install_fs ${BASE_FS}
+prepare_fs ${UBOOT_FS}
+MakeFS_home ${UBOOT_FS}/elwix
+MakeFS_var ${UBOOT_FS}/elwix ${UBOOT_ETC}
+MakeFS_etc ${UBOOT_FS}/elwix ${UBOOT_ETC} uboot
+create_etc_fstab ${UBOOT_FS}/elwix uboot
+install_fs ${UBOOT_FS}
 
 echo "+++ Complete build ELWIX u-boot"