--- elwix/build_romfs.sh 2013/07/31 13:41:43 1.6.2.9 +++ elwix/build_romfs.sh 2013/08/02 13:55:36 1.6.2.10 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: build_romfs.sh,v 1.6.2.9 2013/07/31 13:41:43 misho Exp $ +# $Id: build_romfs.sh,v 1.6.2.10 2013/08/02 13:55:36 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -43,83 +43,41 @@ clean_romfs() build_romfs() { echo "+++ Build ELWIX RomFS directory ..." - mkdir -p $ROMFS + mkdir -p $ROMFS_USR - cd $ROMFS + cd $ROMFS_USR install -d bin; - install -d boot; - install -d boot/defaults; - install -d boot/firmware; - install -d boot/kernel; - install -d boot/modules; - install -d boot/zfs; - install -d dev; - install -d elwix; - install -d elwix/altroot; - install -d elwix/altroot/var; - install -d elwix/cf; - install -d elwix/etc; - install -d -o 883 -g 883 elwix/etc/mqtt; - install -d elwix/exports; - install -d elwix/home; - install -d -m 0750 elwix/root; - install -d -m 0750 elwix/root/.ssh; - install -d elwix/system; - install -d elwix/tftpboot; - install -d elwix/pkg; - install -d elwix/pkg/bin; - install -d elwix/pkg/lib; - install -d elwix/pkg/libexec; - install -d elwix/pkg/libdata; - install -d elwix/pkg/sbin; - ln -fs /elwix/etc etc; - ln -fs /elwix/exports exports; - ln -fs /elwix/home home; - ln -fs /elwix/root root; - ln -fs /elwix/system system; - ln -fs /elwix/tftpboot tftpboot; - install -d mnt; - install -d -m 0555 proc; install -d sbin; - install -d tmp; - install -d usr; - install -d usr/bin; - install -d usr/lib; - ln -fs /usr/lib lib; - install -d usr/lib/engines; - install -d usr/lib/geom; - install -d usr/lib32; - install -d usr/libdata; - install -d usr/libexec; - ln -fs /usr/libexec libexec; - install -d usr/local; - install -d usr/local/bin; - install -d usr/local/lib; - install -d usr/local/libexec; - install -d usr/local/libdata; - install -d usr/local/sbin; - install -d usr/sbin; - install -d usr/share; - install -d usr/share/misc; - install -d usr/share/skel; - install -d usr/share/zoneinfo; - install -d var; + install -d lib; + install -d lib/geom; + install -d libdata; + install -d libexec; + install -d local; + install -d local/bin; + install -d local/lib; + install -d local/libexec; + install -d local/libdata; + install -d local/sbin; + install -d share; + install -d share/misc; + install -d share/skel; + install -d share/zoneinfo; + ln -s /elwix/pkg pkg; + chown -hR root:wheel . cd - } install_romfs() { - LIBS="${ROMFS}/usr/lib" - LIBEXEC="${ROMFS}/usr/libexec" - LIBDATA="${ROMFS}/usr/libdata" - BIN="${ROMFS}/bin" - UBIN="${ROMFS}/usr/bin" - SBIN="${ROMFS}/sbin" - USBIN="${ROMFS}/usr/sbin" - SHARE="${ROMFS}/usr/share" + LIBS="${ROMFS_USR}/lib" + LIBEXEC="${ROMFS_USR}/libexec" + LIBDATA="${ROMFS_USR}/libdata" + BIN="${ROMFS_USR}/bin" + SBIN="${ROMFS_USR}/sbin" + SHARE="${ROMFS_USR}/share" SKEL="${SHARE}/skel" MISC="${SHARE}/misc" @@ -138,82 +96,46 @@ install_romfs() install -v ${CFGDIR}/root.skel/profile $SKEL/dot.profile; install -v ${CFGDIR}/root.skel/vimrc $SKEL/dot.vimrc; - find ${WORLD}/libexec -type f -name ld-elf.so\* -exec install {} $LIBEXEC \; - find ${WORLD}/lib -type f -name \*.so.\* -exec install {} $LIBS \; find ${WORLD}/lib -type f -name libalias_\*.so -exec install {} $LIBS \; find ${WORLD}/lib/geom -type f -name \*.so -exec install {} $LIBS/geom \; 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_ROMFS} ${WORLD} ${ROMFS} - ln ${BIN}/tcsh ${UBIN}/tcsh - - InstallDir ${WORLD}/usr/local/bin $UBIN - InstallDir ${WORLD}/usr/local/sbin $USBIN - InstallFiles \*.so\* ${WORLD}/usr/local/lib $LIBS + InstallDir ${WORLD}/usr/local/bin $BIN + InstallDir ${WORLD}/usr/local/sbin $SBIN + InstallDir ${WORLD}/usr/local/lib $LIBS InstallDir ${WORLD}/usr/local/libdata $LIBDATA - chown -R root:wheel $SBIN $BIN $USBIN $UBIN $LIBDATA $LIBEXEC $LIBS + chown -R root:wheel $SBIN $BIN $LIBDATA $LIBEXEC $LIBS } -build_image2() +build_image() { - echo "+++ Build ELWIX Firmware secondary image ..." + echo "+++ Build ELWIX Firmware system image ..." - cd ${ROMFS_USR2} - pax -w -z -v -f${REL}/${ROMFS_IMG2} . + cd ${ROMFS_USR} + pax -w -z -v -f${REL}/${ROMFS_IMG} . cd - # Stop using uzip fs -# makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${ROMFS_SIZE2} \ -# ${REL}/${ROMFS_IMG2} ${ROMFS_USR2} +# makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${ROMFS_SIZE} \ +# ${REL}/${ROMFS_IMG} ${ROMFS_USR} -# MDDEV=$(mdconfig -a -t vnode -f ${REL}/${ROMFS_IMG2}); -# tunefs -L elwixFirmware2 /dev/$MDDEV; +# MDDEV=$(mdconfig -a -t vnode -f ${REL}/${ROMFS_IMG}); +# tunefs -L elwixFirmware /dev/$MDDEV; # mdconfig -d -u $MDDEV; -# mkuzip -s 8192 -o ${REL}/${ROMFS_IMG2}.uzip ${REL}/${ROMFS_IMG2}; -# mv ${REL}/${ROMFS_IMG2}.uzip ${REL}/${ROMFS_IMG2} +# mkuzip -s 8192 -o ${REL}/${ROMFS_IMG}.uzip ${REL}/${ROMFS_IMG}; +# mv ${REL}/${ROMFS_IMG}.uzip ${REL}/${ROMFS_IMG} } -install_romfs2() -{ - LIBS="${ROMFS_USR2}/lib" - LIBEXEC="${ROMFS_USR2}/libexec" - LIBDATA="${ROMFS_USR2}/libdata" - BIN="${ROMFS_USR2}/bin" - SBIN="${ROMFS_USR2}/sbin" - - echo "+++ Install ELWIX RomFS secondary software ..." - - install -d ${PKGDIR}/bin -# InstallDir ${PKGDIR}/bin $BIN - install -d ${PKGDIR}/sbin - InstallDir ${PKGDIR}/sbin $SBIN - - StripFiles \*.so\* ${PKG}/lib - InstallFiles \*.so\* ${PKG}/lib $LIBS - StripFiles \* ${PKG}/libexec - InstallFiles \* ${PKG}/libexec $LIBEXEC - StripFiles \* ${PKG}/libdata - InstallFiles \* ${PKG}/libdata $LIBDATA - StripFiles \* ${PKG}/bin - InstallFiles \* ${PKG}/bin $BIN - StripFiles \* ${PKG}/sbin - InstallFiles \* ${PKG}/sbin $SBIN - - chown -R root:wheel $SBIN $BIN $LIBDATA $LIBEXEC $LIBS -} - ### main() clean_romfs build_romfs install_romfs - -#install_romfs2 -#build_image2 +build_image echo "+++ Complete build ELWIX RomFS"