--- elwix/build_rootfs.sh	2012/10/12 08:22:43	1.3
+++ elwix/build_rootfs.sh	2021/03/11 13:59:50	1.11
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_rootfs.sh,v 1.3 2012/10/12 08:22:43 misho Exp $
+# $Id: build_rootfs.sh,v 1.11 2021/03/11 13:59:50 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -30,18 +30,24 @@ if [ "${USER}" != "root" ]; then
 	exit 1
 fi
 
-NEWKERN="${REL}/kernel"
+KRNNAME="kernel_rootfs"
+NEWKERN="${REL}/${KRNNAME}"
+MKF="Makefile.elwix"
+MKH="Makefile.inc"
 
+# Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
+X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
+
 clean_elwix()
 {
-	echo "+++ Clean elwix binary from ELWIX World ..."
+	echo "+++ Clean elwix binary from ELWIX World ... $BSDOBJ/elwix"
 	rm -rf $BSDOBJ/elwix
 
-	echo "+++ Clean ELWIX RootFS firmware ..."
-	rm -rf $MKDIR
-	mkdir $MKDIR
+	echo "+++ Clean ELWIX RootFS firmware ... $ROOTFS_MKDIR"
+	rm -rf $ROOTFS_MKDIR
+	mkdir $ROOTFS_MKDIR
 
-	echo "+++ Clean RootFS directory ..."
+	echo "+++ Clean RootFS directory ... $ROOTFS"
 	chflags -R noschg $ROOTFS
 	rm -rf $ROOTFS
 	mkdir $ROOTFS
@@ -52,8 +58,8 @@ clean_elwix()
 
 prepare_elwix()
 {
-	echo "+++ Prepair ELWIX RootFS firmware ..."
-	cd $MKDIR
+	echo "+++ Prepair ELWIX RootFS firmware ... $ROOTFS_MKDIR"
+	cd $ROOTFS_MKDIR
 	cat >$MKH <<_EOF
 # Auto-generated Makefile include for crungegen
 # !!! Dont edit by hand !!!
@@ -68,25 +74,52 @@ srcdirs ${BSDSRC}/bin ${BSDSRC}/sbin ${BSDSRC}/libexec
 srcdirs ${BSDSRC}/usr.bin ${BSDSRC}/usr.sbin ${BSDSRC}/usr.sbin/wpa
 srcdirs ${BSDSRC}/secure/usr.bin ${BSDSRC}/secure/usr.sbin ${BSDSRC}/secure/libexec
 
+buildopts TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF}
 buildopts -DNO_PAM -DNO_KERBEROS WITHOUT_PAM_SUPPORT=yes WITHOUT_KERBEROS_SUPPORT=yes WITHOUT_KERBEROS=yes
-buildopts TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} MAKEOBJDIRPREFIX=${BSDOBJ}/elwix
+buildopts -DMK_CASPER=no WITHOUT_CASPER=yes MK_TESTS=no UPDATE_DEPENDFILE=no _RECURSING_CRUNCH=1
+
 _EOF
 	cat $CFGDIR/$ROOTFS_CONF >>$ROOTFS_CONF
+	echo "+++ Prepared RootFS config ... $CFGDIR/$ROOTFS_CONF"
 
-	. ${CENV}
 	install -d ${BSDOBJ}/elwix
-	crunchgen -f -o -p ${BSDOBJ}/elwix -h $MKDIR/$MKH -m $MKF -c elwix.c -e elwix $ROOTFS_CONF
+	env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix ${CEXEC} crunchgen -f \
+		-h $ROOTFS_MKDIR/$MKH -m $MKF \
+		-c elwix.c -e elwix $ROOTFS_CONF
+	if [ $? -ne 0 ]; then
+		exit 1
+	fi
+#	cat >>$MKF << _EOF
+#
+#.for _tool in ${CRUNCH_BUILDTOOLS}
+#build-tools-${_tool}:
+#	${_+_}cd ${.CURDIR}/../../${_tool}; \
+#	    if [ "${MK_AUTO_OBJ}" = "no" ]; then \
+#	        ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} obj; \
+#	    fi; \
+#	    ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} build-tools
+#
+#build-tools: build-tools-${_tool}
+#	/usr/bin ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET}
+#
+#.endfor
+#_EOF
 	cd -
 }
 
 build_elwix()
 {
-	echo "+++ Build ELWIX RootFS firmware ..."
-	cd $MKDIR
-	. ${CENV}
-	MAKEOBJDIRPREFIX=${BSDOBJ}/elwix
-	make -f $MKF clean
-	make -f $MKF
+	echo "+++ Build ELWIX RootFS firmware ... $ROOTFS_MKDIR"
+	cd $ROOTFS_MKDIR
+	${CBUILD} -f $MKF \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} clean
+	${CBUILD} -f $MKF \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} objs
+	${CBUILD} -f $MKF \
+		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+		${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF}
 	if [ $? -ne 0 ]; then
 		exit 1
 	fi
@@ -95,16 +128,17 @@ build_elwix()
 
 build_rootdir()
 {
-	echo "+++ Build RootFS directory ..."
+	echo "+++ Build RootFS directory ... $ROOTFS"
 	cd $ROOTFS
 
 	install -d bin;
 	install -d dev;
 	install -d elwix;
-	install -d elwix/etc;
+	install -d etc;
 	install -d libexec;
 	install -d mnt;
 	install -d -m 0555 proc;
+	install -d rescue;
 	install -d sbin;
 	install -d -m 1777 tmp;
 	install -d usr;
@@ -117,7 +151,7 @@ build_rootdir()
 
 	ln -fs /usr/lib lib;
 
-	ln -fs /elwix/etc etc;
+	ln -fs /elwix/boot boot;
 	ln -fs /elwix/exports exports;
 	ln -fs /elwix/home home;
 	ln -fs /elwix/root root;
@@ -132,13 +166,14 @@ install_rootfs()
 	SBIN="${ROOTFS}/sbin"
 	UBIN="${ROOTFS}/usr/bin"
 	LIBEXEC="${ROOTFS}/usr/libexec"
-	ETC="${ROOTFS}/elwix/etc"
+	ETC="${ROOTFS}/etc"
+	RESCUE="${ROOTFS}/rescue"
 
 	PRG="/sbin/elwix"
 	LNPRG="${SBIN}/elwix"
 
-	echo "+++ Install ELWIX into RootFS directory ..."
-	install $MKDIR/elwix $SBIN
+	echo "+++ Install ELWIX into RootFS directory ... $ROOTFS"
+	install $ROOTFS_MKDIR/elwix $SBIN
 
 	InstallList ${ELWIX_ROOTFS} ${WORLD} ${ROOTFS}
 
@@ -153,6 +188,12 @@ install_rootfs()
 	ln -s $PRG $BIN/chio
 	ln -s $PRG $BIN/chmod
 	ln -s $PRG $BIN/cp
+	ln -s $PRG $RESCUE/cp
+	ln -s $PRG $BIN/csh
+	ln -s $PRG $BIN/-csh
+	ln -s $PRG $RESCUE/csh
+	ln -s $PRG $BIN/tcsh
+	ln -s $PRG $BIN/-tcsh
 	ln -s $PRG $BIN/date
 	ln -s $PRG $BIN/dd
 	ln -s $PRG $BIN/df
@@ -172,17 +213,19 @@ install_rootfs()
 	ln -s $PRG $BIN/pgrep
 	ln -s $PRG $BIN/sh
 	ln -s $PRG $BIN/-sh
+	ln -s $PRG $RESCUE/sh
 	ln -s $PRG $BIN/ps
 	ln -s $PRG $BIN/pwait
 	ln -s $PRG $BIN/pwd
 	ln -s $PRG $BIN/realpath
 	ln -s $PRG $BIN/rm
+	ln -s $PRG $RESCUE/rm
 	ln -s $PRG $BIN/unlink
-	ln -s $PRG $BIN/rmdir
+#	ln -s $PRG $BIN/rmdir
 	ln -s $PRG $BIN/sleep
 	ln -s $PRG $BIN/stty
 	ln -s $PRG $BIN/sync
-	ln -s $PRG $BIN/uuidgen
+#	ln -s $PRG $BIN/uuidgen
 
 	ln -s $PRG $BIN/true
 	ln -s $PRG $BIN/false
@@ -203,6 +246,7 @@ install_rootfs()
 	ln -s $PRG $BIN/cap_mkdb
 	ln -s $PRG $BIN/sed
 	ln -s $PRG $BIN/vi
+	ln -s $PRG $RESCUE/vi
 	ln -s $PRG $BIN/du
 	ln -s $PRG $BIN/getopt
 	ln -s $PRG $BIN/logger
@@ -235,9 +279,9 @@ install_rootfs()
 
 	ln -s $PRG $SBIN/bsdlabel
 	ln -s $PRG $SBIN/disklabel
-	ln -s $PRG $SBIN/camcontrol
-	ln -s $PRG $SBIN/comcontrol
-	ln -s $PRG $SBIN/conscontrol
+#	ln -s $PRG $SBIN/camcontrol
+#	ln -s $PRG $SBIN/comcontrol
+#	ln -s $PRG $SBIN/conscontrol
 	ln -s $PRG $SBIN/devfs
 	ln -s $PRG $SBIN/dhclient
 	ln -s $PRG $SBIN/dmesg
@@ -246,19 +290,21 @@ install_rootfs()
 	ln -s $PRG $SBIN/dumpon
 	ln -s $PRG $SBIN/fdisk
 	ln -s $PRG $SBIN/fsck
+	ln -s $PRG $RESCUE/fsck
 	ln -s $PRG $SBIN/fsck_ffs
 	ln -s $PRG $SBIN/fsck_ufs
 	ln -s $PRG $SBIN/fsck_4.2bsd
 	ln -s $PRG $SBIN/fsck_msdosfs
 	ln -s $PRG $SBIN/etherswitchcfg
-	ln -s $PRG $SBIN/-geom
-	ln -s $PRG $SBIN/glabel
-	ln -s $PRG $SBIN/gpart
-	ln -s $PRG $SBIN/graid
-	ln -s $PRG $SBIN/growfs
-	ln -s $PRG $SBIN/hastctl
-	ln -s $PRG $SBIN/hastd
+#	ln -s $PRG $SBIN/-geom
+#	ln -s $PRG $SBIN/glabel
+#	ln -s $PRG $SBIN/gpart
+#	ln -s $PRG $SBIN/graid
+#	ln -s $PRG $SBIN/growfs
+#	ln -s $PRG $SBIN/hastctl
+#	ln -s $PRG $SBIN/hastd
 	ln -s $PRG $SBIN/ifconfig
+	ln -s $PRG $RESCUE/ifconfig
 	ln -s $PRG $SBIN/init
 	ln -s $PRG $SBIN/ipfw
 	ln -s $PRG $SBIN/iscontrol
@@ -272,40 +318,45 @@ install_rootfs()
 	ln -s $PRG $SBIN/sha256
 	ln -s $PRG $SBIN/rmd160
 	ln -s $PRG $SBIN/mdconfig
+	ln -s $PRG $RESCUE/mdconfig
 	ln -s $PRG $SBIN/mdmfs
 	ln -s $PRG $SBIN/mount_mfs
 	ln -s $PRG $SBIN/mknod
-	ln -s $PRG $SBIN/mksnap_ffs
+#	ln -s $PRG $SBIN/mksnap_ffs
 	ln -s $PRG $SBIN/mount
-	ln -s $PRG $SBIN/mount_cd9660
+	ln -s $PRG $RESCUE/mount
+#	ln -s $PRG $SBIN/mount_cd9660
 	ln -s $PRG $SBIN/mount_msdosfs
 	ln -s $PRG $SBIN/mount_nfs
-	ln -s $PRG $SBIN/mount_ntfs
+#	ln -s $PRG $SBIN/mount_ntfs
 	ln -s $PRG $SBIN/mount_nullfs
-	ln -s $PRG $SBIN/mount_udf
+#	ln -s $PRG $SBIN/mount_udf
 	ln -s $PRG $SBIN/mount_unionfs
 	ln -s $PRG $SBIN/newfs
+	ln -s $PRG $RESCUE/newfs
 	ln -s $PRG $SBIN/newfs_msdos
-	ln -s $PRG $SBIN/nfsiod
-	ln -s $PRG $SBIN/nos-tun
-	ln -s $PRG $SBIN/nvmecontrol
+#	ln -s $PRG $SBIN/nfsiod
+#	ln -s $PRG $SBIN/nos-tun
+#	ln -s $PRG $SBIN/nvmecontrol
 	ln -s $PRG $SBIN/pfctl
 	ln -s $PRG $SBIN/pflogd
 	ln -s $PRG $SBIN/quotacheck
 	ln -s $PRG $SBIN/reboot
+	ln -s $PRG $RESCUE/reboot
 	ln -s $PRG $SBIN/halt
+	ln -s $PRG $RESCUE/halt
 	ln -s $PRG $SBIN/fastboot
 	ln -s $PRG $SBIN/fasthalt
-	ln -s $PRG $SBIN/recoverdisk
+#	ln -s $PRG $SBIN/recoverdisk
 	ln -s $PRG $SBIN/restore
 	ln -s $PRG $SBIN/rrestore
 	ln -s $PRG $SBIN/route
 	ln -s $PRG $SBIN/rtsol
 	ln -s $PRG $SBIN/shutdown
-	ln -s $PRG $SBIN/savecore
-	ln -s $PRG $SBIN/swapon
-	ln -s $PRG $SBIN/swapoff
-	ln -s $PRG $SBIN/swapctl
+#	ln -s $PRG $SBIN/savecore
+#	ln -s $PRG $SBIN/swapon
+#	ln -s $PRG $SBIN/swapoff
+#	ln -s $PRG $SBIN/swapctl
 	ln -s $PRG $SBIN/sysctl
 	ln -s $PRG $SBIN/tunefs
 	ln -s $PRG $SBIN/umount
@@ -329,14 +380,14 @@ install_rootfs()
 	ln -s $PRG $SBIN/wake
 	ln -s $PRG $SBIN/watchdog
 	ln -s $PRG $SBIN/watchdogd
-	ln -s $PRG $SBIN/inetd
+#	ln -s $PRG $SBIN/inetd
 	ln -s $PRG $SBIN/wlandebug
 	ln -s $PRG $SBIN/chroot
 	ln -s $PRG $SBIN/i2c
 	ln -s $PRG $SBIN/iostat
-	ln -s $PRG $SBIN/jail
-	ln -s $PRG $SBIN/jexec
-	ln -s $PRG $SBIN/jls
+#	ln -s $PRG $SBIN/jail
+#	ln -s $PRG $SBIN/jexec
+#	ln -s $PRG $SBIN/jls
 	ln -s $PRG $SBIN/ndp
 	ln -s $PRG $SBIN/newsyslog
 	ln -s $PRG $SBIN/nologin
@@ -353,7 +404,7 @@ install_rootfs()
 	ln -s $PRG $UBIN/passwd
 
 	ln -s $PRG $LIBEXEC/getty
-	ln -s $PRG $LIBEXEC/tftpd
+#	ln -s $PRG $LIBEXEC/tftpd
 
 	strip -s $LNPRG
 
@@ -361,44 +412,67 @@ install_rootfs()
 
 	echo "+++ ELWIX clean CVS tags ..."
 	CleanCVS $ETC
-	CleanCVS $ETC/etc
+	echo
 }
 
 build_image()
 {
-	echo "+++ Build ELWIX RootFS image ..."
-	makefs -s ${ROOTFS_SIZE} -o minfree=0 $REL/$ROOTFS_IMG $ROOTFS
+	echo "+++ Build ELWIX RootFS image ... $ROOTFS --> $REL/$ROOTFS_IMG"
+	makefs -s ${ROOTFS_SIZE} -o minfree=0 $REL/$ROOTFS_IMG $ROOTFS || exit 1
+	echo "+++ Completed ELWIX RootFS image ... $ROOTFS --> $REL/$ROOTFS_IMG"
 }
 
 install_image()
 {
-	echo "+++ Install ELWIX RootFS Image into kernel ..."
-	START=`strings -td $KERNEL | grep "MFS Filesystem" | cut -d ' ' -f 1 | head -1`
-	STOP=`strings -td $KERNEL | grep "MFS Filesystem" | cut -d ' ' -f 1 | tail -1`
-	STOP=$(($STOP + 1))
+	echo "+++ Install ELWIX RootFS Image into kernel ... $REL/$ROOTFS_IMG"
+	echo "exec> stat -f '%z' $REL/$ROOTFS_IMG"
+	mfs_size=`stat -f '%z' $REL/$ROOTFS_IMG 2>/dev/null`
+	[ -z ${mfs_size} ] && echo "Can't determine MFS image size" && exit 1
 
-	head -c $START $KERNEL >$NEWKERN
-	cat $REL/$ROOTFS_IMG >>$NEWKERN
-	tail -c +$STOP $KERNEL >>$NEWKERN
+	echo "exec> ${CROSSTOOLDIR}/usr/bin/objdump -h $KERNEL_ROOTFS 2> /dev/null | grep \" oldmfs \""
+	sec_info=`${CROSSTOOLDIR}/usr/bin/objdump -h $KERNEL_ROOTFS 2> /dev/null | grep " oldmfs "`
+	[ -z "${sec_info}" ] && echo "Can't locate mfs section within kernel" && exit 1
+	echo "'-> Object dump { ${sec_info} }"
 
+	sec_size=`echo ${sec_info} | awk '{printf("%d", "0x" $3)}' 2> /dev/null`
+	sec_start=`echo ${sec_info} | awk '{printf("%d", "0x" $6)}' 2> /dev/null`
+	echo "'-> Start offset from $sec_start and rootfs size $sec_size byte"
+	[ ${sec_size} -lt ${mfs_size} ] && echo "MFS image too large" && exit 1
+
+	cp $KERNEL_ROOTFS $NEWKERN
+	dd if=$REL/$ROOTFS_IMG ibs=8192 of=$NEWKERN obs=${sec_start} oseek=1 conv=notrunc \
+		2>/dev/null && echo "'-> Completed MFS image embedded into kernel"
+
+#	START=`strings -td $KERNEL_ROOTFS | grep "MFS Filesystem" | cut -d ' ' -f 1 | head -1`
+#	STOP=`strings -td $KERNEL_ROOTFS | grep "MFS Filesystem" | cut -d ' ' -f 1 | tail -1`
+#	STOP=$(($STOP + 1))
+#	echo "'-> Start offset from $START to $STOP byte"
+
+#	head -c $START $KERNEL_ROOTFS >$NEWKERN
+#	cat $REL/$ROOTFS_IMG >>$NEWKERN
+#	tail -c +$STOP $KERNEL_ROOTFS >>$NEWKERN
+
+	echo "'-> Compress kernel"
 	cd $REL
-	gzip -9 kernel
+	gzip -9 $KRNNAME
 	cd -
+
+	echo "+++ Completed ELWIX RootFS kernel ... $NEWKERN.gz"
 }
 
 ### main()
 if SnitVer ${WORLD}/elwix.ver; then
 	clean_elwix
-	prepare_elwix
-	build_elwix
+	prepare_elwix || exit 1
+	build_elwix || exit 1
 
-	build_rootdir
-	install_rootfs
+	build_rootdir || exit 1
+	install_rootfs || exit 1
 
-	build_image
-	install_image
+	build_image || exit 1
+	install_image || exit 1
 else
-	echo "Skipped ELWIX RootFS build ..."
+	echo "$? Skipped ELWIX RootFS build ..."
 fi
 
 echo "+++ Complete build ELWIX RootFS"