--- elwix/build_romfs.sh 2011/07/05 23:43:00 1.1.1.1 +++ elwix/build_romfs.sh 2013/07/29 15:06:59 1.6.2.6 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: build_romfs.sh,v 1.1.1.1 2011/07/05 23:43:00 misho Exp $ +# $Id: build_romfs.sh,v 1.6.2.6 2013/07/29 15:06:59 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -43,35 +43,79 @@ clean_romfs() build_romfs() { echo "+++ Build ELWIX RomFS directory ..." - mkdir -p $ROMFS_USR + mkdir -p $ROMFS - cd $ROMFS_USR + cd $ROMFS 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; + 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 lib; - install -d lib/geom; - install -d libdata; - install -d libexec; - install -d share; - install -d share/misc; - install -d share/skel; - install -d share/zoneinfo; + ln -fs /var/tmp 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; - ln -s /elwix/local local; - chown -hR root:wheel . cd - } install_romfs() { - LIBS="${ROMFS_USR}/lib" - LIBEXEC="${ROMFS_USR}/libexec" - SKEL="${ROMFS_USR}/share/skel" - MISC="${ROMFS_USR}/share/misc" - BIN="${ROMFS_USR}/bin" - SBIN="${ROMFS_USR}/sbin" + 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" + SKEL="${SHARE}/skel" + MISC="${SHARE}/misc" echo "+++ Install ELWIX RomFS software ..." if [ -r ${BSDSRC}/release/picobsd/mfs_tree/etc/termcap ]; then @@ -82,125 +126,86 @@ install_romfs() install -v -m 644 ${BSDSRC}/etc/services $MISC; fi - install -v -m 0555 /libexec/ld-elf.so.1 ${ROMFS_USR}/libexec - install -v ${CFGDIR}/root.skel/cshrc $SKEL/dot.cshrc; install -v ${CFGDIR}/root.skel/login $SKEL/dot.login; install -v ${CFGDIR}/root.skel/logout $SKEL/dot.logout; 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} - InstallProg ${ELWIX_LIB_AITIO} $LIBS; - InstallProg ${ELWIX_LIB_AITCRC} $LIBS; - InstallProg ${ELWIX_LIB_AITCFG} $LIBS; - InstallProg ${ELWIX_LIB_AITSESS} $LIBS; - InstallProg ${ELWIX_LIB_AITRPC} $LIBS; - InstallProg ${ELWIX_LIB_AITPELCO} $LIBS; - InstallProg ${ELWIX_LIB_AITPWD} $LIBS; - InstallProg ${ELWIX_LIB_AITSYNC} $LIBS; - InstallProg ${ELWIX_LIB_AITCLI} $LIBS; + InstallDir ${WORLD}/usr/local/bin $UBIN + InstallDir ${WORLD}/usr/local/sbin $USBIN + InstallFiles \*.so\* ${WORLD}/usr/local/lib $LIBS + InstallDir ${WORLD}/usr/local/libdata $LIBDATA - InstallProg ${AXL_LIB} $LIBS; - InstallProg ${AXL_LIB_NS} $LIBS; - InstallProg ${AXL_LIB_BABEL} $LIBS; + chown -R root:wheel $SBIN $BIN $USBIN $UBIN $LIBDATA $LIBEXEC $LIBS +} -# find $PKG/elwix_tools/bin -type f -perm +111 -exec install -v {} $BIN \; -# find $PKG/elwix_tools/sbin -type f -perm +111 -exec install -v {} $SBIN \; +build_image2() +{ + echo "+++ Build ELWIX Firmware secondary image ..." -# content of OS from 3th party software -# echo "+++ Install elwix additional programes ..." -# install -v -m 0111 $PKG/sudo/sudoreplay $BIN; -# install -v -o root -g wheel -m 4111 $PKG/sudo/sudo $BIN; -# ln -f $BIN/sudo $BIN/sudoedit; -# install -v -m 0111 $PKG/sudo/visudo $SBIN; -# install -v $PKG/sudo/.libs/libsudo_noexec.so $LIBS; -# -# install -v $PKG/ttcp/ttcp $BIN; -# install -v $PKG/ntpd/ntpd $SBIN; -# install -v $PKG/choparp/choparp $SBIN; -# install -v $PKG/ipguard/ipguard $SBIN; -# install -v $PKG/mini_sendmail/mini_sendmail $SBIN/sendmail; -# -# install -v $PKG/pftop/pftop $BIN; -# install -v $PKG/pfflowd/pfflowd $SBIN; -# -# install -v $PKG/dhcp/work.freebsd/dhcpctl/omshell $BIN; -# install -v $PKG/dhcp/work.freebsd/server/dhcpd $SBIN; -# install -v $PKG/dhcp/work.freebsd/relay/dhcrelay $SBIN; -# install -v $PKG/dhcping/dhcping $SBIN; -# install -v $PKG/dhcdrop/src/dhcdrop $SBIN; -# -# install -v $PKG/mrouted/map-mbone $SBIN; -# install -v $PKG/mrouted/mrinfo $SBIN; -# install -v $PKG/mrouted/mrouted $SBIN; -# -# install -v $PKG/bmon/src/bmon $BIN; -# install -v $PKG/iftop/iftop $BIN; -# install -v $PKG/trafshow/trafshow $BIN; -# -# install -v $PKG/libevent/.libs/libevent-1.4.so.4 $LIBS; -# install -v $PKG/libevent/.libs/libevent_extra-1.4.so.4 $LIBS; -# install -v $PKG/expat/.libs/libexpat.so.6 $LIBS; -# install -v $PKG/libpdel/libpdel.so.0 $LIBS; -# -# install -v $PKG/mpd/src/mpd5 $SBIN; -# install -v $PKG/ifstated/ifstated $SBIN; -# -# install -v $PKG/ipsec-tools/src/libipsec/.libs/libipsec.so.0 $LIBS; -# install -v $PKG/ipsec-tools/src/racoon/.libs/libracoon.so.0 $LIBS; -# install -v $PKG/ipsec-tools/src/racoon/eaytest $BIN; -# install -v $PKG/ipsec-tools/src/racoon/plainrsa-gen $BIN; -# install -v $PKG/ipsec-tools/src/racoon/.libs/racoonctl $BIN; -# install -v $PKG/ipsec-tools/src/racoon/.libs/racoon $SBIN; -# install -v $PKG/ipsec-tools/src/setkey/.libs/setkey $BIN; -# -# install -v $PKG/arping/src/arping $SBIN; -# install -v $PKG/hping2/hping2 $SBIN; -# install -v $PKG/mtr/mtr $SBIN; -# -# install -v $PKG/smartmontools/smartctl $BIN; -# install -v $PKG/smartmontools/smartd $SBIN; -# -# install -v $PKG/conserver/conserver/conserver $SBIN; -# install -v $PKG/conserver/console/console $BIN; -# -## eeproms for atheros, used from elwix service tools -# cp -r /usr/local/libdata/athprom $FW_USR/libdata; + cd ${ROMFS_USR2} + pax -w -z -v -f${REL}/${ROMFS_IMG2} . + cd - + +# Stop using uzip fs +# makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${ROMFS_SIZE2} \ +# ${REL}/${ROMFS_IMG2} ${ROMFS_USR2} + +# MDDEV=$(mdconfig -a -t vnode -f ${REL}/${ROMFS_IMG2}); +# tunefs -L elwixFirmware2 /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} } -build_image() +install_romfs2() { - echo "+++ Build elwix firmware image ..." - makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${FW_SIZE} \ - $REL/$FW_IMG $FW_USR + LIBS="${ROMFS_USR2}/lib" + LIBEXEC="${ROMFS_USR2}/libexec" + LIBDATA="${ROMFS_USR2}/libdata" + BIN="${ROMFS_USR2}/bin" + SBIN="${ROMFS_USR2}/sbin" - MDDEV=$(mdconfig -a -t vnode -f $REL/$FW_IMG); - tunefs -L elwixFirmware /dev/$MDDEV; -# mount /dev/$MDDEV /mnt -# umount /mnt - mdconfig -d -u $MDDEV; + echo "+++ Install ELWIX RomFS secondary software ..." - mkuzip -s 8192 -o $REL/${FW_IMG}.uzip $REL/$FW_IMG; - mv $REL/${FW_IMG}.uzip $REL/${FW_IMG} + 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() -if SnitVer ${WORLD}/elwix.ver; then - clean_romfs +clean_romfs +build_romfs - build_romfs - install_romfs +install_romfs -#build_image -else - echo "Skipped ELWIX RomFS build ..." -fi +install_romfs2 +build_image2 echo "+++ Complete build ELWIX RomFS"