elwix/build_fs.sh - diff

Return to build_fs.sh CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / elwix

Diff for /elwix/build_fs.sh between versions 1.3.2.8 and 1.3.2.16

version 1.3.2.8, 2012/10/09 12:19:20	version 1.3.2.16, 2012/10/11 13:51:22
Line 33 fi	Line 33 fi
clean_fsdir()	clean_fsdir()
{	{
echo "+++ Clean ELWIX FS ..."	echo "+++ Clean ELWIX FS ..."
rm -rf ${FS}	rm -rf ${FS} ${FS_LITE}

echo "+++ Clean ELWIX FS release ..."	echo "+++ Clean ELWIX FS release ..."
rm -rf ${REL}/${OS}	rm -rf ${REL}/${OS} ${REL}/${OS_LITE}
}	}

build_fsdir()	build_fsdir()
{	{
echo "+++ Build ELWIX FS directory ..."	echo "+++ Build ELWIX FS directory ..."
mkdir -p ${FS}	mkdir -p $1

cd ${FS}	cd $1

# altroot	# altroot
install -d altroot;	install -d altroot;
Line 60 build_fsdir()	Line 60 build_fsdir()
install -d altroot/var/db;	install -d altroot/var/db;
install -d -m 0555 altroot/var/empty;	install -d -m 0555 altroot/var/empty;
install -d altroot/var/log;	install -d altroot/var/log;
# install -d -o 80 -g 80 altroot/var/log/lighttpd;
install -d -o 101 -g 101 altroot/var/log/quagga;	install -d -o 101 -g 101 altroot/var/log/quagga;
	install -d -o 883 -g 883 altroot/var/mqtt;
install -d altroot/var/named;	install -d altroot/var/named;
install -d altroot/var/run;	install -d altroot/var/run;
# install -d -o 80 -g 80 altroot/var/run/lighttpd;	install -d altroot/var/sys;
install -d -o 53 -g 53 altroot/var/run/named;	install -d -o 53 -g 53 altroot/var/run/named;
install -d -o 101 -g 101 altroot/var/run/quagga;	install -d -o 101 -g 101 altroot/var/run/quagga;
install -d altroot/var/spool;	install -d altroot/var/spool;
Line 78 build_fsdir()	Line 78 build_fsdir()
install -d cf;	install -d cf;
# etc	# etc
install -d etc;	install -d etc;
	install -d -o 883 -g 883 etc/mqtt;
# exports	# exports
install -d exports;	install -d exports;
# home	# home
Line 148 mkvar()	Line 149 mkvar()

create_etc_motd()	create_etc_motd()
{	{
ELWIX_VER="ELWIX-${VERSION}_${TARGET_ARCH}";	ELWIX_VER="ELWIX$2-${VERSION}_${TARGET_ARCH}";
ELWIX_HDR_MOTD="${ELWIX_VER} :: Build date ${BUILD_DATE}";	ELWIX_HDR_MOTD="${ELWIX_VER} :: Build date ${BUILD_DATE}";

awk -v fo="${1:-motd}" 'BEGIN { print "'"${ELWIX_HDR_MOTD}"'" > fo; } { print $0 >> fo; }' \	awk -v fo="${1:-motd}" 'BEGIN { print "'"${ELWIX_HDR_MOTD}"'" > fo; } { print $0 >> fo; }' \
Line 158 create_etc_motd()	Line 159 create_etc_motd()
create_etc_fstab()	create_etc_fstab()
{	{
cat >$1 <<_EOF	cat >$1 <<_EOF
# Automatic generated fstab for ELWIX at ${BUILD_DATE}	# Automatic generated fstab for ELWIX$2 at ${BUILD_DATE}
#	#
/dev/ufs/elwix /elwix ufs ro 0 1	/dev/ufs/elwix /elwix ufs ro 0 1
md3 /tmp mfs rw,-s8m,-oasync,-S 0 0	md3 /tmp mfs rw,-s8m,-oasync,-S 0 0
Line 188 mketc()	Line 189 mketc()
chgrp 80 $1/etc/config.xml;	chgrp 80 $1/etc/config.xml;
chmod 0660 $1/etc/config.xml;	chmod 0660 $1/etc/config.xml;

	chgrp -R 883 $1/etc/mqtt;
	chown -R 883 $1/etc/mqtt;

ln -sf /etc/rc.s $1/etc/rc.S	ln -sf /etc/rc.s $1/etc/rc.S

ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime;	ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime;
Line 200 mketc()	Line 204 mketc()

echo ${TARGET_ARCH} >$1/etc/platform;	echo ${TARGET_ARCH} >$1/etc/platform;

create_etc_motd $1/etc/motd;	create_etc_motd $1/etc/motd $2;
create_etc_fstab $1/etc/fstab;	create_etc_fstab $1/etc/fstab $2;

echo "+++ ELWIX clean CVS tags ..."	echo "+++ ELWIX clean CVS tags ..."
CleanCVS ${FS}	CleanCVS $1
CleanCVS ${FS}/etc	CleanCVS $1/etc
}	}

mkbackup()	mkbackup()
Line 237 mkhome()	Line 241 mkhome()

install_fsdir()	install_fsdir()
{	{
echo "+++ Install ELWIX FS in bundle OS install file ..."	echo "+++ Install ELWIX FS $1 in bundle OS install file ..."
	OSZ=""

install -v ${REL}/${ROOTFS_KERN} ${FS}/boot/kernel	install -v ${REL}/${ROOTFS_KERN} $1/boot/kernel

install -v ${REL}/${ROMFS_IMG} ${FS}/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH}	if [ -z "$2" ]; then
ln ${FS}/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/altroot/${ROMFS_IMG}	install -v ${REL}/${ROMFS_IMG} $1/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH}
ln -s /elwix/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} ${FS}/${ROMFS_IMG}	ln $1/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} $1/altroot/${ROMFS_IMG}
	ln -s /elwix/altroot/elwix-firmware-${VERSION}_${TARGET_ARCH} $1/${ROMFS_IMG}

cd $FS	install -v ${REL}/${ROMFS_IMG2} $1/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH}
tar -czvf ${REL}/${OS} .	ln $1/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} $1/altroot/${ROMFS_IMG2}
	ln -s /elwix/altroot/elwix-firmware2-${VERSION}_${TARGET_ARCH} $1/${ROMFS_IMG2}

	OSZ=${REL}/${OS}
	else
	install -d $1/usr
	cd $1/usr
	pax -r -z -pe -f ${REL}/${ROMFS_IMG}
	cd -

	OSZ=${REL}/${OS_LITE}
	fi

	cd $1
	tar -czvf $OSZ .
}	}

### main()	### main()
Line 260 if [ ! -r ${REL}/${ROOTFS_KERN} -o ! -r ${REL}/${ROMFS	Line 280 if [ ! -r ${REL}/${ROOTFS_KERN} -o ! -r ${REL}/${ROMFS
fi	fi

clean_fsdir	clean_fsdir
build_fsdir

	build_fsdir ${FS}
	build_fsdir ${FS_LITE}

mkboot ${FS}	mkboot ${FS}
	mkboot ${FS_LITE}

mkhome ${FS}	mkhome ${FS}
	mkhome ${FS_LITE}

mkvar ${FS}	mkvar ${FS}
	mkvar ${FS_LITE}

mketc ${FS}	mketc ${FS}
	mketc ${FS_LITE} "_lite"

mkbackup ${FS}	mkbackup ${FS}
	mkbackup ${FS_LITE}

install_fsdir	install_fsdir ${FS}
	install_fsdir ${FS_LITE} "_lite"

echo "+++ Complete build ELWIX FS"	echo "+++ Complete build ELWIX FS"
echo "ELWIX finish version ${VERSION}, Good luck!"	echo "ELWIX finish version ${VERSION}, Good luck!"

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.3.2.8
changed lines
	Added in v.1.3.2.16