From dfd2d49e968c4892b1823b5414700d99d4292acf Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sat, 29 Aug 2015 20:24:55 +0100
Subject: masive refactoring of vasile, our supreme tool...first make it
 modular so we can add more functions to it

---
 build32 | 193 +++++++++++++++++++++++++++++++++++++++++++++
 build64 | 195 +++++++++++++++++++++++++++++++++++++++++++++
 vasile  | 276 ++++++----------------------------------------------------------
 3 files changed, 413 insertions(+), 251 deletions(-)
 create mode 100755 build32
 create mode 100755 build64

diff --git a/build32 b/build32
new file mode 100755
index 0000000..c51d03d
--- /dev/null
+++ b/build32
@@ -0,0 +1,193 @@
+#!/usr/bin/env bash
+
+# env mount variables
+export local rodir="rodir"
+export local rwdir="rwdir"
+export local overlaydir="overlaydir"
+
+# env user variable
+export local envkogaionuser="root"
+
+# env target variable (can be a single package, multiple packages, or a target file passed as parameter)
+export local envkogaiontarget="$@"
+export local envkogaionbuildtarget="emerge -kav "$envkogaiontarget""
+
+# env buildsystem variables
+export local envkogaionoverlay="layman -f -a kogaion -o https://raw.github.com/Rogentos/kogaion/master/overlay.xml"
+export local envkogaiondesktopoverlay="layman -f -a kogaion-desktop -o https://raw.github.com/Rogentos/kogaion-desktop/master/overlay.xml"
+export local envkogaionbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git"
+export local envkogaionportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage"
+export local envkogaionenvupdate="/usr/sbin/env-update && . /etc/profile"
+
+envkogaionstart () {
+	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
+	mount -t squashfs "$sqfsroot" "$rodir"
+	mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir"
+	# portage buildpkg feature is now enabled by default, so all built packages or targets will also have binary packages created
+	# each target depends on previous one, building a target will most likely pull packages from previous one
+	# to avoid useless rebuilds, bind mount portage binary packages folder, and use binaries if needed
+	# every binary was built in same clean build environment managed by vasile, so they are safe to reuse
+	# vasile will still clean the build environment, but will leave binaries in place
+	while : true ; do
+		if [[ ! -d packages ]] ; then
+			mkdir packages
+			mount -o bind packages "$overlaydir"/usr/portage/packages
+			break
+		elif [[ -d packages ]] ; then
+			mount -o bind packages "$overlaydir"/usr/portage/packages
+			break
+		fi
+	done
+	# keep distfiles around
+	while : true ; do
+		if [[ ! -d distfiles ]] ; then
+			mkdir distfiles
+			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
+			break
+		elif [[ -d distfiles ]] ; then
+			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
+			break
+		fi
+	done
+	# bind mount targets inside clean build environment managed by vasile, we really need them to be in there
+	mount -o bind targets "$overlaydir"/mnt
+	mount -t proc proc "$overlaydir"/proc
+	mount -t sysfs sysfs "$overlaydir"/sys
+	mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$overlaydir"/dev
+	mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$overlaydir"/dev/pts
+	mount -t tmpfs -o nosuid,nodev none "$overlaydir"/dev/shm
+	mount -t tmpfs -o nosuid,nodev,noexec none  "$overlaydir"/tmp
+}
+
+envkogaionstop () {
+	# umount squashfs + overlayfs chroot
+	umount -l "$overlaydir"/proc > /dev/null 2>&1
+	umount -l "$overlaydir"/sys > /dev/null 2>&1
+	umount -l "$overlaydir"/dev/pts > /dev/null 2>&1
+	umount -l "$overlaydir"/dev/shm > /dev/null 2>&1
+	umount -l "$overlaydir"/dev > /dev/null 2>&1
+	umount -l "$overlaydir"/tmp > /dev/null 2>&1
+	umount -l "$overlaydir"/usr/portage/packages > /dev/null 2>&1
+	umount -l "$overlaydir"/mnt > /dev/null 2>&1
+	umount -l "$overlaydir" > /dev/null 2>&1
+	umount -l "$rodir" > /dev/null 2>&1
+}
+
+envcheckroot () {
+	if [[ "$(whoami)" != root ]] ; then
+		echo ""
+		echo "You're not root?...No cookies for you, go away !!!"
+		echo ""
+		exit 1
+	fi
+}
+	
+envkogaionsquashfsintegrity () {
+	# our bare metal buildserver is x86_64 but we want to build 32bit packages as well
+	# run this script with linux32 to fool it we run i686 and to build 32bit packages
+	while : true ; do
+		export local sqfsroot="kogaiondevelx86.squashfs"
+		export local sqfsrootmd5file=""$sqfsroot".md5"
+		export local sqfsrootmd5="$(cat "$sqfsrootmd5file" | awk {'print $1'})"
+		if [[ -f "$sqfsroot" && -f "$sqfsrootmd5file" ]] ; then
+			echo "Good, i686 squashed chroot && checksum file FOUND ... verifying integrity"
+			echo ""
+			if [[ "$(md5sum "$sqfsroot" | awk {'print $1'})" = "$sqfsrootmd5" ]] ; then
+				echo "Good, i686 squashed chroot checksum PASSED ... starting environment"
+				echo ""
+				sleep 1
+				break
+			else
+				echo "Ooops, i686 squashed chroot checksum FAILED ... aborting"
+			fi
+		else
+			echo "Ooops, i686 squashed chroot of checksum file NOT FOUND ... aborting"
+			exit 1
+		fi
+	done
+}
+
+envkogaionprepare () {
+	# check our environment for sanity
+	# if safe, trigger start && break the loop to build packages
+	# else trigger stop && cleanup && check again
+	while : true ; do
+		if [[ ! -d "$rodir" && ! -d "$rwdir" && ! -d "$overlaydir" ]] ; then
+			for i in "$rodir" "$rwdir" "$overlaydir" ; do
+				mkdir "$i"
+			done
+			envkogaionstart
+			break
+		elif [[ -d "$rodir" && -d "$rwdir" && -d "$overlaydir" ]] ; then
+			envkogaionstop
+			for i in "$rodir" "$rwdir" "$overlaydir" ; do
+				rm -rf "$i"
+			done
+			continue
+		fi
+	done
+}
+
+envkogaionoverlays() {
+	# inject our overlays into squashfs + overlayfs chroot
+	echo "Injecting Kogaion Linux Main Overlay into i686 environment"
+	sleep 1
+	linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionoverlay"
+	echo "Injecting Kogaion Linux Desktop Overlay into i686 environment"
+	linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaiondesktopoverlay"
+}
+
+envkogaionbuildsystem() {
+	# inject our buildsystem into squashfs + overlayfs chroot
+	export local envkogaionmakeconf="ln -sf /opt/build/conf/intel/portage/make.conf.x86 /etc/portage/make.conf"
+	export local envkogaionprofile="eselect profile set 1"
+	echo "Injecting Kogaion Linux i686 Buildsystem && Setting up Portage && Setting up make.conf"
+	echo ""
+	sleep 1
+	for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconf" "$envkogaionprofile" "$envkogaionenvupdate" ; do
+		linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$cmd"
+	done
+}
+
+envkogaionbuild () {
+	# build packages in squashfs + overlayfs chroot
+	echo ""
+	echo "i686 Environment is UP && RUNNING ... building targets"
+	sleep 1
+	linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionbuildtarget"
+}
+
+envkogaionchroot() {
+	# enter squashfs + overlayfs chroot to push packages, or debug build errors
+	echo -e ""
+	echo -e "#################################################################"
+	echo -e "#       ENTERING CHROOT ENV FOR YOU TO PUSH BUILT PACKAGES      #"
+	echo -e "#               OR TO FIX EVENTUAL BUILD ERRORS                 #"
+	echo -e "#################################################################"
+	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
+	echo -e "#################################################################"
+	echo -e "#       NEXT RUN OF THIS SCRIPT WILL DESTROY ALL YOUR WORK      #"
+	echo -e "#   DO NOT EXIT CHROOT UNTIL ALL PACKAGES ARE PUSHED TO REPOS   #"
+	echo -e "#  OR, IN CASE OF BUILD FAILURES, UNTIL ALL FIXES ARE COMMITED  #"
+	echo -e "#################################################################"
+	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
+	echo -e "#################################################################"
+	echo -e ""
+	echo -e ""
+	linux32 chroot "$overlaydir" su - "$envkogaionuser"
+}
+
+main () {
+	if envcheckroot ; then
+		envkogaionsquashfsintegrity
+		envkogaionprepare
+		envkogaionoverlays
+		envkogaionbuildsystem
+		envkogaionbuild
+		envkogaionchroot
+		envkogaionstop
+	fi
+}
+
+main 
+exit 0
diff --git a/build64 b/build64
new file mode 100755
index 0000000..1e6cf23
--- /dev/null
+++ b/build64
@@ -0,0 +1,195 @@
+#!/usr/bin/env bash
+
+# env mount variables
+export local rodir="rodir"
+export local rwdir="rwdir"
+export local overlaydir="overlaydir"
+
+# env user variable
+export local envkogaionuser="root"
+
+# env target variable (can be a single package, multiple packages, or a target file passed as parameter)
+export local envkogaiontarget="$@"
+export local envkogaionbuildtarget="emerge -kav "$envkogaiontarget""
+
+# env buildsystem variables
+export local envkogaionoverlay="layman -f -a kogaion -o https://raw.github.com/Rogentos/kogaion/master/overlay.xml"
+export local envkogaiondesktopoverlay="layman -f -a kogaion-desktop -o https://raw.github.com/Rogentos/kogaion-desktop/master/overlay.xml"
+export local envkogaionbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git"
+export local envkogaionportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage"
+export local envkogaionenvupdate="/usr/sbin/env-update && . /etc/profile"
+
+envkogaionstart () {
+	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
+	mount -t squashfs "$sqfsroot" "$rodir"
+	mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir"
+	# portage buildpkg feature is now enabled by default, so all built packages or targets will also have binary packages created
+	# each target depends on previous one, building a target will most likely pull packages from previous one
+	# to avoid useless rebuilds, bind mount portage binary packages folder, and use binaries if needed
+	# every binary was built in same clean build environment managed by vasile, so they are safe to reuse
+	# vasile will still clean the build environment, but will leave binaries in place
+	while : true ; do
+		if [[ ! -d packages ]] ; then
+			mkdir packages
+			mount -o bind packages "$overlaydir"/usr/portage/packages
+			break
+		elif [[ -d packages ]] ; then
+			mount -o bind packages "$overlaydir"/usr/portage/packages
+			break
+		fi
+	done
+	# keep distfiles around
+	while : true ; do
+		if [[ ! -d distfiles ]] ; then
+			mkdir distfiles
+			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
+			break
+		elif [[ -d distfiles ]] ; then
+			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
+			break
+		fi
+	done
+	# bind mount targets inside clean build environment managed by vasile, we really need them to be in there
+	mount -o bind targets "$overlaydir"/mnt
+	mount -t proc proc "$overlaydir"/proc
+	mount -t sysfs sysfs "$overlaydir"/sys
+	mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$overlaydir"/dev
+	mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$overlaydir"/dev/pts
+	mount -t tmpfs -o nosuid,nodev none "$overlaydir"/dev/shm
+	mount -t tmpfs -o nosuid,nodev,noexec none  "$overlaydir"/tmp
+}
+
+envkogaionstop () {
+	# umount squashfs + overlayfs chroot
+	umount -l "$overlaydir"/proc > /dev/null 2>&1
+	umount -l "$overlaydir"/sys > /dev/null 2>&1
+	umount -l "$overlaydir"/dev/pts > /dev/null 2>&1
+	umount -l "$overlaydir"/dev/shm > /dev/null 2>&1
+	umount -l "$overlaydir"/dev > /dev/null 2>&1
+	umount -l "$overlaydir"/tmp > /dev/null 2>&1
+	umount -l "$overlaydir"/usr/portage/packages > /dev/null 2>&1
+	umount -l "$overlaydir"/mnt > /dev/null 2>&1
+	umount -l "$overlaydir" > /dev/null 2>&1
+	umount -l "$rodir" > /dev/null 2>&1
+}
+
+envcheckroot () {
+	if [[ "$(whoami)" != root ]] ; then
+		echo ""
+		echo "You're not root?...No cookies for you, go away !!!"
+		echo ""
+		exit 1
+	fi
+}
+	
+envkogaionsquashfsintegrity () {
+	# our bare metal buildserver is x86_64 but we want to build 32bit packages as well
+	# run this script with linux32 to fool it we run i686 and to build 32bit packages
+	while : true ; do
+		export local sqfsroot="kogaiondevelx64.squashfs"
+		export local sqfsrootmd5file=""$sqfsroot".md5"
+		export local sqfsrootmd5="$(cat "$sqfsrootmd5file" | awk {'print $1'})"
+		if [[ -f "$sqfsroot" && -f "$sqfsrootmd5file" ]] ; then
+			echo "Good, x86_64 squashed chroot && checksum file FOUND ... verifying integrity"
+			echo ""
+			if [[ "$(md5sum "$sqfsroot" | awk {'print $1'})" = "$sqfsrootmd5" ]] ; then
+				echo "Good, x86_64 squashed chroot checksum PASSED ... starting environment"
+				echo ""
+				sleep 1
+				break
+			else
+				echo "Ooops, x86_64 squashed chroot checksum FAILED ... aborting"
+				exit 1
+			fi
+		else
+			echo "Ooops, x86_64 squashed chroot or checksum file NOT FOUND ... aborting"
+			exit 1
+		fi
+	done
+}
+
+envkogaionprepare () {
+	# check our environment for sanity
+	# if safe, trigger start && break the loop to build packages
+	# else trigger stop && cleanup && check again
+	while : true ; do
+		if [[ ! -d "$rodir" && ! -d "$rwdir" && ! -d "$overlaydir" ]] ; then
+			for i in "$rodir" "$rwdir" "$overlaydir" ; do
+				mkdir "$i"
+			done
+			envkogaionstart
+			break
+		elif [[ -d "$rodir" && -d "$rwdir" && -d "$overlaydir" ]] ; then
+			envkogaionstop
+			for i in "$rodir" "$rwdir" "$overlaydir" ; do
+				rm -rf "$i"
+			done
+			continue
+		fi
+	done
+}
+
+envkogaionoverlays() {
+	# inject our overlays into squashfs + overlayfs chroot
+	echo "Injecting Kogaion Linux Main Overlay into x86_64 environment"
+	sleep 1
+	chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionoverlay"
+	echo "Injecting Kogaion Linux Desktop Overlay into x86_64 environment"
+	sleep 1
+	chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaiondesktopoverlay"
+}
+
+envkogaionbuildsystem() {
+	# inject our buildsystem into squashfs + overlayfs chroot
+	export local envkogaionmakeconf="ln -sf /opt/build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf"
+	export local envkogaionprofile="eselect profile set 1"
+	echo "Injecting Kogaion Linux X86_64 Buildsystem && Setting up Portage && Setting up make.conf"
+	echo ""
+	sleep 1
+	for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconf" "$envkogaionprofile" "$envkogaionenvupdate" ; do
+		chroot "$overlaydir" su - "$envkogaionuser" -c "$cmd"
+	done
+}
+
+envkogaionbuild () {
+	# build packages in squashfs + overlayfs chroot
+	echo ""
+	echo "x86_46 Environment is UP && RUNNING ... building targets"
+	sleep 1
+	chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionbuildtarget"
+}
+
+envkogaionchroot() {
+# enter squashfs + overlayfs chroot to push packages, or debug build errors
+	echo -e ""
+	echo -e "#################################################################"
+	echo -e "#       ENTERING CHROOT ENV FOR YOU TO PUSH BUILT PACKAGES      #"
+	echo -e "#               OR TO FIX EVENTUAL BUILD ERRORS                 #"
+	echo -e "#################################################################"
+	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
+	echo -e "#################################################################"
+	echo -e "#       NEXT RUN OF THIS SCRIPT WILL DESTROY ALL YOUR WORK      #"
+	echo -e "#   DO NOT EXIT CHROOT UNTIL ALL PACKAGES ARE PUSHED TO REPOS   #"
+	echo -e "#  OR, IN CASE OF BUILD FAILURES, UNTIL ALL FIXES ARE COMMITED  #"
+	echo -e "#################################################################"
+	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
+	echo -e "#################################################################"
+	echo -e ""
+	echo -e ""
+	chroot "$overlaydir" su - "$envkogaionuser"
+}
+
+main () {
+	if envcheckroot ; then
+		envkogaionsquashfsintegrity
+		envkogaionprepare
+		envkogaionoverlays
+		envkogaionbuildsystem
+		envkogaionbuild
+		envkogaionchroot
+		envkogaionstop
+	fi
+}
+
+main 
+exit 0
diff --git a/vasile b/vasile
index d13ac5d..8011fae 100755
--- a/vasile
+++ b/vasile
@@ -1,254 +1,28 @@
 #!/usr/bin/env bash
-# 
-# Say Hello to Vasile , a script to build Kogaion Linux packages in a clean squashfs + overlayfs chroot
-# using predefined targets : kernel.target, libs.target, x11.target, sound.target, artwork.target etc
-# Targets are passed as arguments, and will remain private...for now (not all of them are stable yet)
-# Author : Ghiunhan Mamut (aka V3n3RiX) @ RogentOS Linux Group
-# Dependencies : squashfs + overlayfs kernel support
+# Say Hello to Vasile, a script to build Kogaion Linux packages in a clean squashfs + overlayfs chroot
+# Using predefined targets : kernel.target , xlibs.target , x11.target , sound.target , artwork.target
+# Main author : Ghiunhan Mamut (aka V3n3RiX) @ RogentOS Development Group
+# Dependencies : kernel built with squashfs + overlayfs, app-arch/dpkg (optional for building deb packages in portage)
+#
+
+case $1 in
+	--build64)		source build64
+					;;
+	--build32)		source build32
+					;;
+	--clean)		source cleanup
+					;;
+	--help)			echo -e ""
+					echo -e "Usage: vasile [options]"
+					echo -e ""
+					echo -e "Options:"
+					echo -e "--build64 : build package in a clean x64 environment"
+					echo -e "--build32 : build package in a clean x86 environment"
+					echo -e "--help : display this help and exit"
+					echo -e ""
+					;;
+	*)				echo -e "error: no operation specified, use --help for help"
+					;;
+esac
 
-
-# env mount variables
-export local rodir="rodir"
-export local rwdir="rwdir"
-export local overlaydir="overlaydir"
-
-# env user variable
-export local envkogaionuser="root"
-
-# env target variable (can be a single package, multiple packages, or a target file passed as parameter)
-export local envkogaiontarget="$@"
-export local envkogaionbuildtarget="emerge -kav "$envkogaiontarget""
-
-# env buildsystem variables
-export local envkogaionoverlay="layman -f -a kogaion -o https://raw.github.com/Rogentos/kogaion/master/overlay.xml"
-export local envkogaiondesktopoverlay="layman -f -a kogaion-desktop -o https://raw.github.com/Rogentos/kogaion-desktop/master/overlay.xml"
-export local envkogaionbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git"
-export local envkogaionportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage"
-export local envkogaionenvupdate="/usr/sbin/env-update && . /etc/profile"
-
-envkogaionstart () {
-	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
-	mount -t squashfs "$sqfsroot" "$rodir"
-	mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir"
-	# portage buildpkg feature is now enabled by default, so all built packages or targets will also have binary packages created
-	# each target depends on previous one, building a target will most likely pull packages from previous one
-	# to avoid useless rebuilds, bind mount portage binary packages folder, and use binaries if needed
-	# every binary was built in same clean build environment managed by vasile, so they are safe to reuse
-	# vasile will still clean the build environment, but will leave binaries in place
-	while : true ; do
-		if [[ ! -d packages ]] ; then
-			mkdir packages
-			mount -o bind packages "$overlaydir"/usr/portage/packages
-			break
-		elif [[ -d packages ]] ; then
-			mount -o bind packages "$overlaydir"/usr/portage/packages
-			break
-		fi
-	done
-	# keep distfiles around
-	while : true ; do
-		if [[ ! -d distfiles ]] ; then
-			mkdir distfiles
-			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
-			break
-		elif [[ -d distfiles ]]
-			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
-			break
-		fi
-	done
-	# bind mount targets inside clean build environment managed by vasile, we really need them to be in there
-	mount -o bind targets "$overlaydir"/mnt
-	mount -t proc proc "$overlaydir"/proc
-	mount -t sysfs sysfs "$overlaydir"/sys
-	mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$overlaydir"/dev
-	mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$overlaydir"/dev/pts
-	mount -t tmpfs -o nosuid,nodev none "$overlaydir"/dev/shm
-	mount -t tmpfs -o nosuid,nodev,noexec none  "$overlaydir"/tmp
-}
-
-envkogaionstop () {
-	# umount squashfs + overlayfs chroot
-	umount -l "$overlaydir"/proc > /dev/null 2>&1
-	umount -l "$overlaydir"/sys > /dev/null 2>&1
-	umount -l "$overlaydir"/dev/pts > /dev/null 2>&1
-	umount -l "$overlaydir"/dev/shm > /dev/null 2>&1
-	umount -l "$overlaydir"/dev > /dev/null 2>&1
-	umount -l "$overlaydir"/tmp > /dev/null 2>&1
-	umount -l "$overlaydir"/usr/portage/packages > /dev/null 2>&1
-	umount -l "$overlaydir"/mnt > /dev/null 2>&1
-	umount -l "$overlaydir" > /dev/null 2>&1
-	umount -l "$rodir" > /dev/null 2>&1
-}
-
-envcheckroot () {
-	if [[ "$(whoami)" != root ]] ; then
-		echo ""
-		echo "You're not root?...No cookies for you, go away !!!"
-		echo ""
-		exit 1
-	fi
-}
-	
-envkogaionsquashfsintegrity () {
-	# our bare metal buildserver is x86_64 but we want to build 32bit packages as well
-	# run this script with linux32 to fool it we run i686 and to build 32bit packages
-	while : true ; do
-		if [[ "$(uname -m)" = "x86_64" ]] ; then
-			export local sqfsroot="kogaiondevelx64.squashfs"
-			export local sqfsrootmd5file=""$sqfsroot".md5"
-			export local sqfsrootmd5="$(cat "$sqfsrootmd5file" | awk {'print $1'})"
-			if [[ -f "$sqfsroot" && -f "$sqfsrootmd5file" ]] ; then
-				echo "Good, x86_64 squashed chroot && checksum file FOUND ... verifying integrity"
-				echo ""
-				if [[ "$(md5sum "$sqfsroot" | awk {'print $1'})" = "$sqfsrootmd5" ]] ; then
-					echo "Good, x86_64 squashed chroot checksum PASSED ... starting environment"
-					echo ""
-					sleep 1
-					break
-				else
-					echo "Ooops, x86_64 squashed chroot checksum FAILED ... aborting"
-					exit 1
-				fi
-			else
-				echo "Ooops, x86_64 squashed chroot or checksum file NOT FOUND ... aborting"
-				exit 1
-			fi
-		elif [[ "$(uname -m)" = "i686" ]] ; then
-			export local sqfsroot="kogaiondevelx86.squashfs"
-			export local sqfsrootmd5file=""$sqfsroot".md5"
-			export local sqfsrootmd5="$(cat "$sqfsrootmd5file" | awk {'print $1'})"
-			if [[ -f "$sqfsroot" && -f "$sqfsrootmd5file" ]] ; then
-				echo "Good, i686 squashed chroot && checksum file FOUND ... verifying integrity"
-				echo ""
-				if [[ "$(md5sum "$sqfsroot" | awk {'print $1'})" = "$sqfsrootmd5" ]] ; then
-					echo "Good, i686 squashed chroot checksum PASSED ... starting environment"
-					echo ""
-					sleep 1
-					break
-				else
-					echo "Ooops, i686 squashed chroot checksum FAILED ... aborting"
-				fi
-			else
-				echo "Ooops, i686 squashed chroot of checksum file NOT FOUND ... aborting"
-				exit 1
-			fi
-		fi
-	done
-}
-
-envkogaionprepare () {
-	# check our environment for sanity
-	# if safe, trigger start && break the loop to build packages
-	# else trigger stop && cleanup && check again
-	while : true ; do
-		if [[ ! -d "$rodir" && ! -d "$rwdir" && ! -d "$overlaydir" ]] ; then
-			for i in "$rodir" "$rwdir" "$overlaydir" ; do
-				mkdir "$i"
-			done
-			envkogaionstart
-			break
-		elif [[ -d "$rodir" && -d "$rwdir" && -d "$overlaydir" ]] ; then
-			envkogaionstop
-			for i in "$rodir" "$rwdir" "$overlaydir" ; do
-				rm -rf "$i"
-			done
-			continue
-		fi
-	done
-}
-
-envkogaionoverlays() {
-	# inject our overlays into squashfs + overlayfs chroot
-	if [[ "$(uname -m)" = "x86_64" ]] ; then
-		echo "Injecting Kogaion Linux Main Overlay into x86_64 environment"
-		sleep 1
-		chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionoverlay"
-		echo "Injecting Kogaion Linux Desktop Overlay into x86_64 environment"
-		sleep 1
-		chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaiondesktopoverlay"
-	elif [[ "$(uname -m)" = "i686" ]] ; then
-		echo "Injecting Kogaion Linux Main Overlay into i686 environment"
-		sleep 1
-		linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionoverlay"
-		echo "Injecting Kogaion Linux Desktop Overlay into i686 environment"
-		linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaiondesktopoverlay"
-	fi
-}
-
-envkogaionbuildsystem() {
-	# inject our buildsystem into squashfs + overlayfs chroot
-	if [[ "$(uname -m)" = "x86_64" ]] ; then
-		export local envkogaionmakeconf="ln -sf /opt/build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf"
-		export local envkogaionprofile="eselect profile set 1"
-		echo "Injecting Kogaion Linux X86_64 Buildsystem && Setting up Portage && Setting up make.conf"
-		echo ""
-		sleep 1
-		for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconf" "$envkogaionprofile" "$envkogaionenvupdate" ; do
-			chroot "$overlaydir" su - "$envkogaionuser" -c "$cmd"
-		done
-	elif [[ "$(uname -m)" = "i686" ]] ; then
-		export local envkogaionmakeconf="ln -sf /opt/build/conf/intel/portage/make.conf.x86 /etc/portage/make.conf"
-		export local envkogaionprofile="eselect profile set 1"
-		echo "Injecting Kogaion Linux i686 Buildsystem && Setting up Portage && Setting up make.conf"
-		echo ""
-		sleep 1
-		for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconf" "$envkogaionprofile" "$envkogaionenvupdate" ; do
-			linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$cmd"
-		done
-	fi
-
-}
-
-envkogaionbuild () {
-	# build packages in squashfs + overlayfs chroot
-	if [[ "$(uname -m)" = "x86_64" ]] ; then
-		echo ""
-		echo "x86_46 Environment is UP && RUNNING ... building targets"
-		sleep 1
-		chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionbuildtarget"
-	elif [[ "$(uname -m)" = "i686" ]] ; then
-		echo ""
-		echo "i686 Environment is UP && RUNNING ... building targets"
-		sleep 1
-		linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionbuildtarget"
-	fi
-}
-
-envkogaionchroot() {
-	# enter squashfs + overlayfs chroot to push packages, or debug build errors
-	echo -e ""
-	echo -e "#################################################################"
-	echo -e "#       ENTERING CHROOT ENV FOR YOU TO PUSH BUILT PACKAGES      #"
-	echo -e "#               OR TO FIX EVENTUAL BUILD ERRORS                 #"
-	echo -e "#################################################################"
-	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
-	echo -e "#################################################################"
-	echo -e "#       NEXT RUN OF THIS SCRIPT WILL DESTROY ALL YOUR WORK      #"
-	echo -e "#   DO NOT EXIT CHROOT UNTIL ALL PACKAGES ARE PUSHED TO REPOS   #"
-	echo -e "#  OR, IN CASE OF BUILD FAILURES, UNTIL ALL FIXES ARE COMMITED  #"
-	echo -e "#################################################################"
-	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
-	echo -e "#################################################################"
-	echo -e ""
-	echo -e ""
-	if [[ "$(uname -m)" = "x86_64" ]] ; then
-		chroot "$overlaydir" su - "$envkogaionuser"
-	elif [[ "$(uname -m)" = "i686"  ]] ; then
-		linux32 chroot "$overlaydir" su - "$envkogaionuser"
-	fi
-}
-
-main () {
-	if envcheckroot ; then
-		envkogaionsquashfsintegrity
-		envkogaionprepare
-		envkogaionoverlays
-		envkogaionbuildsystem
-		envkogaionbuild
-		envkogaionchroot
-		envkogaionstop
-	fi
-}
-
-main 
 exit 0
-- 
cgit v1.2.3


From 3a6e918d46840289227e58a5ac1850113fcd2400 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sat, 29 Aug 2015 20:38:24 +0100
Subject: remove previous comments, focus on our next target, transform gentoo
 packages on deb packages to be used by apt

---
 build32 | 6 +-----
 build64 | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/build32 b/build32
index c51d03d..e80b736 100755
--- a/build32
+++ b/build32
@@ -23,11 +23,7 @@ envkogaionstart () {
 	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
 	mount -t squashfs "$sqfsroot" "$rodir"
 	mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir"
-	# portage buildpkg feature is now enabled by default, so all built packages or targets will also have binary packages created
-	# each target depends on previous one, building a target will most likely pull packages from previous one
-	# to avoid useless rebuilds, bind mount portage binary packages folder, and use binaries if needed
-	# every binary was built in same clean build environment managed by vasile, so they are safe to reuse
-	# vasile will still clean the build environment, but will leave binaries in place
+	# keep built binary packages around, we will convert them to deb packages using vasile
 	while : true ; do
 		if [[ ! -d packages ]] ; then
 			mkdir packages
diff --git a/build64 b/build64
index 1e6cf23..0aca7a4 100755
--- a/build64
+++ b/build64
@@ -23,11 +23,7 @@ envkogaionstart () {
 	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
 	mount -t squashfs "$sqfsroot" "$rodir"
 	mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir"
-	# portage buildpkg feature is now enabled by default, so all built packages or targets will also have binary packages created
-	# each target depends on previous one, building a target will most likely pull packages from previous one
-	# to avoid useless rebuilds, bind mount portage binary packages folder, and use binaries if needed
-	# every binary was built in same clean build environment managed by vasile, so they are safe to reuse
-	# vasile will still clean the build environment, but will leave binaries in place
+	# keep built binary packages around, we will convert them to deb packages using vasile
 	while : true ; do
 		if [[ ! -d packages ]] ; then
 			mkdir packages
-- 
cgit v1.2.3


From 3126bda8b8e03c1a9ee32aacf5caf6204d958f3f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 08:34:49 +0100
Subject: move some common variables to libvasile, common functions will follow

---
 build32   | 19 +------------------
 build64   | 19 +------------------
 libvasile | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 36 deletions(-)
 create mode 100755 libvasile

diff --git a/build32 b/build32
index e80b736..5ee8e5b 100755
--- a/build32
+++ b/build32
@@ -1,23 +1,6 @@
 #!/usr/bin/env bash
 
-# env mount variables
-export local rodir="rodir"
-export local rwdir="rwdir"
-export local overlaydir="overlaydir"
-
-# env user variable
-export local envkogaionuser="root"
-
-# env target variable (can be a single package, multiple packages, or a target file passed as parameter)
-export local envkogaiontarget="$@"
-export local envkogaionbuildtarget="emerge -kav "$envkogaiontarget""
-
-# env buildsystem variables
-export local envkogaionoverlay="layman -f -a kogaion -o https://raw.github.com/Rogentos/kogaion/master/overlay.xml"
-export local envkogaiondesktopoverlay="layman -f -a kogaion-desktop -o https://raw.github.com/Rogentos/kogaion-desktop/master/overlay.xml"
-export local envkogaionbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git"
-export local envkogaionportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage"
-export local envkogaionenvupdate="/usr/sbin/env-update && . /etc/profile"
+source libvasile
 
 envkogaionstart () {
 	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
diff --git a/build64 b/build64
index 0aca7a4..9f46ac6 100755
--- a/build64
+++ b/build64
@@ -1,23 +1,6 @@
 #!/usr/bin/env bash
 
-# env mount variables
-export local rodir="rodir"
-export local rwdir="rwdir"
-export local overlaydir="overlaydir"
-
-# env user variable
-export local envkogaionuser="root"
-
-# env target variable (can be a single package, multiple packages, or a target file passed as parameter)
-export local envkogaiontarget="$@"
-export local envkogaionbuildtarget="emerge -kav "$envkogaiontarget""
-
-# env buildsystem variables
-export local envkogaionoverlay="layman -f -a kogaion -o https://raw.github.com/Rogentos/kogaion/master/overlay.xml"
-export local envkogaiondesktopoverlay="layman -f -a kogaion-desktop -o https://raw.github.com/Rogentos/kogaion-desktop/master/overlay.xml"
-export local envkogaionbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git"
-export local envkogaionportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage"
-export local envkogaionenvupdate="/usr/sbin/env-update && . /etc/profile"
+source libvasile
 
 envkogaionstart () {
 	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
diff --git a/libvasile b/libvasile
new file mode 100755
index 0000000..0f294a5
--- /dev/null
+++ b/libvasile
@@ -0,0 +1,18 @@
+# env mount variables
+export local rodir="rodir"
+export local rwdir="rwdir"
+export local overlaydir="overlaydir"
+
+# env user variable
+export local envkogaionuser="root"
+
+# env target variable (can be a single package, multiple packages, or a target file passed as parameter)
+export local envkogaiontarget="$@"
+export local envkogaionbuildtarget="emerge -kav "$envkogaiontarget""
+
+# env buildsystem variables
+export local envkogaionoverlay="layman -f -a kogaion -o https://raw.github.com/Rogentos/kogaion/master/overlay.xml"
+export local envkogaiondesktopoverlay="layman -f -a kogaion-desktop -o https://raw.github.com/Rogentos/kogaion-desktop/master/overlay.xml"
+export local envkogaionbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git"
+export local envkogaionportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage"
+export local envkogaionenvupdate="/usr/sbin/env-update && . /etc/profile"
-- 
cgit v1.2.3


From 2821833d2e292ba86d7a4da4a43453f503ff9569 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 09:00:42 +0100
Subject: move more variables into libvasile, refactor md5sum checking using
 md5sum itself

---
 build32   | 9 +++------
 build64   | 9 +++------
 libvasile | 8 ++++++++
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/build32 b/build32
index 5ee8e5b..4cb7d9f 100755
--- a/build32
+++ b/build32
@@ -4,7 +4,7 @@ source libvasile
 
 envkogaionstart () {
 	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
-	mount -t squashfs "$sqfsroot" "$rodir"
+	mount -t squashfs "$sqfsrootx86" "$rodir"
 	mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir"
 	# keep built binary packages around, we will convert them to deb packages using vasile
 	while : true ; do
@@ -65,13 +65,10 @@ envkogaionsquashfsintegrity () {
 	# our bare metal buildserver is x86_64 but we want to build 32bit packages as well
 	# run this script with linux32 to fool it we run i686 and to build 32bit packages
 	while : true ; do
-		export local sqfsroot="kogaiondevelx86.squashfs"
-		export local sqfsrootmd5file=""$sqfsroot".md5"
-		export local sqfsrootmd5="$(cat "$sqfsrootmd5file" | awk {'print $1'})"
-		if [[ -f "$sqfsroot" && -f "$sqfsrootmd5file" ]] ; then
+		if [[ -f "$sqfsrootx86" && -f "$sqfsrootx86md5" ]] ; then
 			echo "Good, i686 squashed chroot && checksum file FOUND ... verifying integrity"
 			echo ""
-			if [[ "$(md5sum "$sqfsroot" | awk {'print $1'})" = "$sqfsrootmd5" ]] ; then
+			if [[ "$(md5sum -c "$sqfsrootx86md5")" ]] ; then
 				echo "Good, i686 squashed chroot checksum PASSED ... starting environment"
 				echo ""
 				sleep 1
diff --git a/build64 b/build64
index 9f46ac6..8736c28 100755
--- a/build64
+++ b/build64
@@ -4,7 +4,7 @@ source libvasile
 
 envkogaionstart () {
 	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
-	mount -t squashfs "$sqfsroot" "$rodir"
+	mount -t squashfs "$sqfsrootx64" "$rodir"
 	mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir"
 	# keep built binary packages around, we will convert them to deb packages using vasile
 	while : true ; do
@@ -65,13 +65,10 @@ envkogaionsquashfsintegrity () {
 	# our bare metal buildserver is x86_64 but we want to build 32bit packages as well
 	# run this script with linux32 to fool it we run i686 and to build 32bit packages
 	while : true ; do
-		export local sqfsroot="kogaiondevelx64.squashfs"
-		export local sqfsrootmd5file=""$sqfsroot".md5"
-		export local sqfsrootmd5="$(cat "$sqfsrootmd5file" | awk {'print $1'})"
-		if [[ -f "$sqfsroot" && -f "$sqfsrootmd5file" ]] ; then
+		if [[ -f "$sqfsrootx64" && -f "$sqfsrootx64md5" ]] ; then
 			echo "Good, x86_64 squashed chroot && checksum file FOUND ... verifying integrity"
 			echo ""
-			if [[ "$(md5sum "$sqfsroot" | awk {'print $1'})" = "$sqfsrootmd5" ]] ; then
+			if [[ "$(md5sum -c "$sqfsrootx64md5")" ]] ; then
 				echo "Good, x86_64 squashed chroot checksum PASSED ... starting environment"
 				echo ""
 				sleep 1
diff --git a/libvasile b/libvasile
index 0f294a5..ffe16cd 100755
--- a/libvasile
+++ b/libvasile
@@ -16,3 +16,11 @@ export local envkogaiondesktopoverlay="layman -f -a kogaion-desktop -o https://r
 export local envkogaionbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git"
 export local envkogaionportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage"
 export local envkogaionenvupdate="/usr/sbin/env-update && . /etc/profile"
+
+# env squashfs chroot variables
+export local sqfsrootx86="kogaiondevelx86.squashfs"
+export local sqfsrootx86md5=""$sqfsrootx86".md5"
+
+export local sqfsrootx64="kogaiondevelx64.squashfs"
+export local sqfsrootx64md5=""$sqfsrootx64".md5"
+
-- 
cgit v1.2.3


From 34ba1e37e44f7b7af2f1243dc9dc75a6a9c6ecdb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 09:15:08 +0100
Subject: move last variables into libvasile

---
 build32   | 4 +---
 build64   | 4 +---
 libvasile | 5 ++++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build32 b/build32
index 4cb7d9f..e7e4859 100755
--- a/build32
+++ b/build32
@@ -115,12 +115,10 @@ envkogaionoverlays() {
 
 envkogaionbuildsystem() {
 	# inject our buildsystem into squashfs + overlayfs chroot
-	export local envkogaionmakeconf="ln -sf /opt/build/conf/intel/portage/make.conf.x86 /etc/portage/make.conf"
-	export local envkogaionprofile="eselect profile set 1"
 	echo "Injecting Kogaion Linux i686 Buildsystem && Setting up Portage && Setting up make.conf"
 	echo ""
 	sleep 1
-	for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconf" "$envkogaionprofile" "$envkogaionenvupdate" ; do
+	for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconfx86" "$envkogaionprofile" "$envkogaionenvupdate" ; do
 		linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$cmd"
 	done
 }
diff --git a/build64 b/build64
index 8736c28..fd83ef7 100755
--- a/build64
+++ b/build64
@@ -117,12 +117,10 @@ envkogaionoverlays() {
 
 envkogaionbuildsystem() {
 	# inject our buildsystem into squashfs + overlayfs chroot
-	export local envkogaionmakeconf="ln -sf /opt/build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf"
-	export local envkogaionprofile="eselect profile set 1"
 	echo "Injecting Kogaion Linux X86_64 Buildsystem && Setting up Portage && Setting up make.conf"
 	echo ""
 	sleep 1
-	for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconf" "$envkogaionprofile" "$envkogaionenvupdate" ; do
+	for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconfx64" "$envkogaionprofile" "$envkogaionenvupdate" ; do
 		chroot "$overlaydir" su - "$envkogaionuser" -c "$cmd"
 	done
 }
diff --git a/libvasile b/libvasile
index ffe16cd..7f9dc51 100755
--- a/libvasile
+++ b/libvasile
@@ -16,11 +16,14 @@ export local envkogaiondesktopoverlay="layman -f -a kogaion-desktop -o https://r
 export local envkogaionbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git"
 export local envkogaionportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage"
 export local envkogaionenvupdate="/usr/sbin/env-update && . /etc/profile"
+export local envkogaionprofile="eselect profile set 1"
 
 # env squashfs chroot variables
 export local sqfsrootx86="kogaiondevelx86.squashfs"
 export local sqfsrootx86md5=""$sqfsrootx86".md5"
-
 export local sqfsrootx64="kogaiondevelx64.squashfs"
 export local sqfsrootx64md5=""$sqfsrootx64".md5"
 
+# env make.conf variables
+export local envkogaionmakeconfx86="ln -sf /opt/build/conf/intel/portage/make.conf.x86 /etc/portage/make.conf"
+export local envkogaionmakeconfx64="ln -sf /opt/build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf"
-- 
cgit v1.2.3


From 92b62f115b2634086483b5bbf7ded04615814c2f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 09:21:16 +0100
Subject: move common functions into libvasile

---
 build32   | 23 -----------------------
 build64   | 23 -----------------------
 libvasile | 23 +++++++++++++++++++++++
 3 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/build32 b/build32
index e7e4859..01939de 100755
--- a/build32
+++ b/build32
@@ -38,29 +38,6 @@ envkogaionstart () {
 	mount -t tmpfs -o nosuid,nodev,noexec none  "$overlaydir"/tmp
 }
 
-envkogaionstop () {
-	# umount squashfs + overlayfs chroot
-	umount -l "$overlaydir"/proc > /dev/null 2>&1
-	umount -l "$overlaydir"/sys > /dev/null 2>&1
-	umount -l "$overlaydir"/dev/pts > /dev/null 2>&1
-	umount -l "$overlaydir"/dev/shm > /dev/null 2>&1
-	umount -l "$overlaydir"/dev > /dev/null 2>&1
-	umount -l "$overlaydir"/tmp > /dev/null 2>&1
-	umount -l "$overlaydir"/usr/portage/packages > /dev/null 2>&1
-	umount -l "$overlaydir"/mnt > /dev/null 2>&1
-	umount -l "$overlaydir" > /dev/null 2>&1
-	umount -l "$rodir" > /dev/null 2>&1
-}
-
-envcheckroot () {
-	if [[ "$(whoami)" != root ]] ; then
-		echo ""
-		echo "You're not root?...No cookies for you, go away !!!"
-		echo ""
-		exit 1
-	fi
-}
-	
 envkogaionsquashfsintegrity () {
 	# our bare metal buildserver is x86_64 but we want to build 32bit packages as well
 	# run this script with linux32 to fool it we run i686 and to build 32bit packages
diff --git a/build64 b/build64
index fd83ef7..cbff47d 100755
--- a/build64
+++ b/build64
@@ -38,29 +38,6 @@ envkogaionstart () {
 	mount -t tmpfs -o nosuid,nodev,noexec none  "$overlaydir"/tmp
 }
 
-envkogaionstop () {
-	# umount squashfs + overlayfs chroot
-	umount -l "$overlaydir"/proc > /dev/null 2>&1
-	umount -l "$overlaydir"/sys > /dev/null 2>&1
-	umount -l "$overlaydir"/dev/pts > /dev/null 2>&1
-	umount -l "$overlaydir"/dev/shm > /dev/null 2>&1
-	umount -l "$overlaydir"/dev > /dev/null 2>&1
-	umount -l "$overlaydir"/tmp > /dev/null 2>&1
-	umount -l "$overlaydir"/usr/portage/packages > /dev/null 2>&1
-	umount -l "$overlaydir"/mnt > /dev/null 2>&1
-	umount -l "$overlaydir" > /dev/null 2>&1
-	umount -l "$rodir" > /dev/null 2>&1
-}
-
-envcheckroot () {
-	if [[ "$(whoami)" != root ]] ; then
-		echo ""
-		echo "You're not root?...No cookies for you, go away !!!"
-		echo ""
-		exit 1
-	fi
-}
-	
 envkogaionsquashfsintegrity () {
 	# our bare metal buildserver is x86_64 but we want to build 32bit packages as well
 	# run this script with linux32 to fool it we run i686 and to build 32bit packages
diff --git a/libvasile b/libvasile
index 7f9dc51..1d6a999 100755
--- a/libvasile
+++ b/libvasile
@@ -27,3 +27,26 @@ export local sqfsrootx64md5=""$sqfsrootx64".md5"
 # env make.conf variables
 export local envkogaionmakeconfx86="ln -sf /opt/build/conf/intel/portage/make.conf.x86 /etc/portage/make.conf"
 export local envkogaionmakeconfx64="ln -sf /opt/build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf"
+
+envcheckroot () {
+	if [[ "$(whoami)" != root ]] ; then
+		echo ""
+		echo "You're not root?...No cookies for you, go away !!!"
+		echo ""
+		exit 1
+	fi
+}
+
+envkogaionstop () {
+	# umount squashfs + overlayfs chroot
+	umount -l "$overlaydir"/proc > /dev/null 2>&1
+	umount -l "$overlaydir"/sys > /dev/null 2>&1
+	umount -l "$overlaydir"/dev/pts > /dev/null 2>&1
+	umount -l "$overlaydir"/dev/shm > /dev/null 2>&1
+	umount -l "$overlaydir"/dev > /dev/null 2>&1
+	umount -l "$overlaydir"/tmp > /dev/null 2>&1
+	umount -l "$overlaydir"/usr/portage/packages > /dev/null 2>&1
+	umount -l "$overlaydir"/mnt > /dev/null 2>&1
+	umount -l "$overlaydir" > /dev/null 2>&1
+	umount -l "$rodir" > /dev/null 2>&1
+}
-- 
cgit v1.2.3


From 3f17e27be05f9a41fe044fbf5ef3c16e6d625be8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 09:25:07 +0100
Subject: forgot a then, StefanCristian are u sure you're using latest code?
 how the hell this worked for you?

---
 vasile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vasile b/vasile
index d13ac5d..ef45594 100755
--- a/vasile
+++ b/vasile
@@ -51,7 +51,7 @@ envkogaionstart () {
 			mkdir distfiles
 			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
 			break
-		elif [[ -d distfiles ]]
+		elif [[ -d distfiles ]] ; then
 			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
 			break
 		fi
-- 
cgit v1.2.3


From 216fdc3715478ffc5306e136064e82d74617c762 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 09:57:31 +0100
Subject: import libvasile into vasile itself, for slaves to use it...no need
 to import twice in each slave

---
 build32 | 2 --
 build64 | 2 --
 vasile  | 1 +
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/build32 b/build32
index 01939de..0c24fc0 100755
--- a/build32
+++ b/build32
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-source libvasile
-
 envkogaionstart () {
 	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
 	mount -t squashfs "$sqfsrootx86" "$rodir"
diff --git a/build64 b/build64
index cbff47d..df0b3aa 100755
--- a/build64
+++ b/build64
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-source libvasile
-
 envkogaionstart () {
 	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
 	mount -t squashfs "$sqfsrootx64" "$rodir"
diff --git a/vasile b/vasile
index 8011fae..47228aa 100755
--- a/vasile
+++ b/vasile
@@ -4,6 +4,7 @@
 # Main author : Ghiunhan Mamut (aka V3n3RiX) @ RogentOS Development Group
 # Dependencies : kernel built with squashfs + overlayfs, app-arch/dpkg (optional for building deb packages in portage)
 #
+source libvasile
 
 case $1 in
 	--build64)		source build64
-- 
cgit v1.2.3


From ae79222cb89bc8644b64bba498a88499da9812e7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 11:37:50 +0100
Subject: revert previous commit, enable debug mode by default, untill we sort
 things out

---
 build32 | 4 +++-
 build64 | 4 +++-
 vasile  | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build32 b/build32
index 0c24fc0..23f2dc0 100755
--- a/build32
+++ b/build32
@@ -1,4 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/bash -x
+
+source libvasile
 
 envkogaionstart () {
 	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
diff --git a/build64 b/build64
index df0b3aa..07d1a5a 100755
--- a/build64
+++ b/build64
@@ -1,4 +1,6 @@
-#!/usr/bin/env bash
+#!/bin/bash -x
+
+source libvasile
 
 envkogaionstart () {
 	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
diff --git a/vasile b/vasile
index 47228aa..d90fae6 100755
--- a/vasile
+++ b/vasile
@@ -1,10 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash -x
 # Say Hello to Vasile, a script to build Kogaion Linux packages in a clean squashfs + overlayfs chroot
 # Using predefined targets : kernel.target , xlibs.target , x11.target , sound.target , artwork.target
 # Main author : Ghiunhan Mamut (aka V3n3RiX) @ RogentOS Development Group
 # Dependencies : kernel built with squashfs + overlayfs, app-arch/dpkg (optional for building deb packages in portage)
 #
-source libvasile
 
 case $1 in
 	--build64)		source build64
-- 
cgit v1.2.3


From b34f0d37cf2c10a2e9d98534bf2e1c9c4bead9a0 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 11:45:28 +0100
Subject: ignore first argument, but use all next ones

---
 libvasile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libvasile b/libvasile
index 1d6a999..aa08f91 100755
--- a/libvasile
+++ b/libvasile
@@ -7,7 +7,7 @@ export local overlaydir="overlaydir"
 export local envkogaionuser="root"
 
 # env target variable (can be a single package, multiple packages, or a target file passed as parameter)
-export local envkogaiontarget="$@"
+export local envkogaiontarget="${@:2}"
 export local envkogaionbuildtarget="emerge -kav "$envkogaiontarget""
 
 # env buildsystem variables
-- 
cgit v1.2.3


From 39624eac34c86a82bcaa1ae87d923c3613890d23 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 14:29:41 +0100
Subject: solved arguments, so import libvasile into vasile itself, and slaves
 can use from over there

---
 build32 | 2 --
 build64 | 2 --
 vasile  | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build32 b/build32
index 23f2dc0..777b36c 100755
--- a/build32
+++ b/build32
@@ -1,7 +1,5 @@
 #!/bin/bash -x
 
-source libvasile
-
 envkogaionstart () {
 	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
 	mount -t squashfs "$sqfsrootx86" "$rodir"
diff --git a/build64 b/build64
index 07d1a5a..2c695b9 100755
--- a/build64
+++ b/build64
@@ -1,7 +1,5 @@
 #!/bin/bash -x
 
-source libvasile
-
 envkogaionstart () {
 	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
 	mount -t squashfs "$sqfsrootx64" "$rodir"
diff --git a/vasile b/vasile
index d90fae6..7bbfb27 100755
--- a/vasile
+++ b/vasile
@@ -5,6 +5,8 @@
 # Dependencies : kernel built with squashfs + overlayfs, app-arch/dpkg (optional for building deb packages in portage)
 #
 
+source libvasile
+
 case $1 in
 	--build64)		source build64
 					;;
-- 
cgit v1.2.3


From 549fc8b9a7a0a7fe7fde974ece70de99658d285f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 15:35:28 +0100
Subject: explain why we had to change target variable

---
 libvasile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libvasile b/libvasile
index aa08f91..bdee7f5 100755
--- a/libvasile
+++ b/libvasile
@@ -7,6 +7,9 @@ export local overlaydir="overlaydir"
 export local envkogaionuser="root"
 
 # env target variable (can be a single package, multiple packages, or a target file passed as parameter)
+# vasile is now splitted, so calling it with one of its build arguments (--build32 or --build64)
+# would import that argument into envkogaiontarget variable and building most likely would fail
+# so change envkogaiontarget variable for vasile to skip build arguments and focus and next ones (target files, or packages)
 export local envkogaiontarget="${@:2}"
 export local envkogaionbuildtarget="emerge -kav "$envkogaiontarget""
 
-- 
cgit v1.2.3


From 354c50630375267dd54780afdedece3896da501e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 17:57:25 +0100
Subject: drop cleanup function, not implemented yet, and vasile cleans after
 himself really nice

---
 vasile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/vasile b/vasile
index 7bbfb27..6218135 100755
--- a/vasile
+++ b/vasile
@@ -12,8 +12,6 @@ case $1 in
 					;;
 	--build32)		source build32
 					;;
-	--clean)		source cleanup
-					;;
 	--help)			echo -e ""
 					echo -e "Usage: vasile [options]"
 					echo -e ""
-- 
cgit v1.2.3


From 86a93edf4d06cb4f03582432bd32a821a687e51a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 18:46:54 +0100
Subject: move almost everything into libvasile

---
 build32   | 127 +++-----------------------------
 build64   | 129 +++-----------------------------
 libvasile | 248 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 238 insertions(+), 266 deletions(-)

diff --git a/build32 b/build32
index 777b36c..161f300 100755
--- a/build32
+++ b/build32
@@ -1,64 +1,6 @@
 #!/bin/bash -x
 
-envkogaionstart () {
-	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
-	mount -t squashfs "$sqfsrootx86" "$rodir"
-	mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir"
-	# keep built binary packages around, we will convert them to deb packages using vasile
-	while : true ; do
-		if [[ ! -d packages ]] ; then
-			mkdir packages
-			mount -o bind packages "$overlaydir"/usr/portage/packages
-			break
-		elif [[ -d packages ]] ; then
-			mount -o bind packages "$overlaydir"/usr/portage/packages
-			break
-		fi
-	done
-	# keep distfiles around
-	while : true ; do
-		if [[ ! -d distfiles ]] ; then
-			mkdir distfiles
-			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
-			break
-		elif [[ -d distfiles ]] ; then
-			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
-			break
-		fi
-	done
-	# bind mount targets inside clean build environment managed by vasile, we really need them to be in there
-	mount -o bind targets "$overlaydir"/mnt
-	mount -t proc proc "$overlaydir"/proc
-	mount -t sysfs sysfs "$overlaydir"/sys
-	mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$overlaydir"/dev
-	mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$overlaydir"/dev/pts
-	mount -t tmpfs -o nosuid,nodev none "$overlaydir"/dev/shm
-	mount -t tmpfs -o nosuid,nodev,noexec none  "$overlaydir"/tmp
-}
-
-envkogaionsquashfsintegrity () {
-	# our bare metal buildserver is x86_64 but we want to build 32bit packages as well
-	# run this script with linux32 to fool it we run i686 and to build 32bit packages
-	while : true ; do
-		if [[ -f "$sqfsrootx86" && -f "$sqfsrootx86md5" ]] ; then
-			echo "Good, i686 squashed chroot && checksum file FOUND ... verifying integrity"
-			echo ""
-			if [[ "$(md5sum -c "$sqfsrootx86md5")" ]] ; then
-				echo "Good, i686 squashed chroot checksum PASSED ... starting environment"
-				echo ""
-				sleep 1
-				break
-			else
-				echo "Ooops, i686 squashed chroot checksum FAILED ... aborting"
-			fi
-		else
-			echo "Ooops, i686 squashed chroot of checksum file NOT FOUND ... aborting"
-			exit 1
-		fi
-	done
-}
-
-envkogaionprepare () {
+chrootpreparex86 () {
 	# check our environment for sanity
 	# if safe, trigger start && break the loop to build packages
 	# else trigger stop && cleanup && check again
@@ -67,10 +9,10 @@ envkogaionprepare () {
 			for i in "$rodir" "$rwdir" "$overlaydir" ; do
 				mkdir "$i"
 			done
-			envkogaionstart
+			chrootstartx86
 			break
 		elif [[ -d "$rodir" && -d "$rwdir" && -d "$overlaydir" ]] ; then
-			envkogaionstop
+			chrootstop
 			for i in "$rodir" "$rwdir" "$overlaydir" ; do
 				rm -rf "$i"
 			done
@@ -79,62 +21,15 @@ envkogaionprepare () {
 	done
 }
 
-envkogaionoverlays() {
-	# inject our overlays into squashfs + overlayfs chroot
-	echo "Injecting Kogaion Linux Main Overlay into i686 environment"
-	sleep 1
-	linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionoverlay"
-	echo "Injecting Kogaion Linux Desktop Overlay into i686 environment"
-	linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaiondesktopoverlay"
-}
-
-envkogaionbuildsystem() {
-	# inject our buildsystem into squashfs + overlayfs chroot
-	echo "Injecting Kogaion Linux i686 Buildsystem && Setting up Portage && Setting up make.conf"
-	echo ""
-	sleep 1
-	for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconfx86" "$envkogaionprofile" "$envkogaionenvupdate" ; do
-		linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$cmd"
-	done
-}
-
-envkogaionbuild () {
-	# build packages in squashfs + overlayfs chroot
-	echo ""
-	echo "i686 Environment is UP && RUNNING ... building targets"
-	sleep 1
-	linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionbuildtarget"
-}
-
-envkogaionchroot() {
-	# enter squashfs + overlayfs chroot to push packages, or debug build errors
-	echo -e ""
-	echo -e "#################################################################"
-	echo -e "#       ENTERING CHROOT ENV FOR YOU TO PUSH BUILT PACKAGES      #"
-	echo -e "#               OR TO FIX EVENTUAL BUILD ERRORS                 #"
-	echo -e "#################################################################"
-	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
-	echo -e "#################################################################"
-	echo -e "#       NEXT RUN OF THIS SCRIPT WILL DESTROY ALL YOUR WORK      #"
-	echo -e "#   DO NOT EXIT CHROOT UNTIL ALL PACKAGES ARE PUSHED TO REPOS   #"
-	echo -e "#  OR, IN CASE OF BUILD FAILURES, UNTIL ALL FIXES ARE COMMITED  #"
-	echo -e "#################################################################"
-	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
-	echo -e "#################################################################"
-	echo -e ""
-	echo -e ""
-	linux32 chroot "$overlaydir" su - "$envkogaionuser"
-}
-
 main () {
-	if envcheckroot ; then
-		envkogaionsquashfsintegrity
-		envkogaionprepare
-		envkogaionoverlays
-		envkogaionbuildsystem
-		envkogaionbuild
-		envkogaionchroot
-		envkogaionstop
+	if checkroot ; then
+		chrootchecksumx86
+		chrootpreparex86
+		chrootoverlaysx86
+		chrootbuildsystemx86
+		chrootbuildx86
+		chrootx86
+		chrootstop
 	fi
 }
 
diff --git a/build64 b/build64
index 2c695b9..6628014 100755
--- a/build64
+++ b/build64
@@ -1,65 +1,6 @@
 #!/bin/bash -x
 
-envkogaionstart () {
-	# mount ro squashfs chroot + add rw overlayfs layer to enable clean package building
-	mount -t squashfs "$sqfsrootx64" "$rodir"
-	mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir"
-	# keep built binary packages around, we will convert them to deb packages using vasile
-	while : true ; do
-		if [[ ! -d packages ]] ; then
-			mkdir packages
-			mount -o bind packages "$overlaydir"/usr/portage/packages
-			break
-		elif [[ -d packages ]] ; then
-			mount -o bind packages "$overlaydir"/usr/portage/packages
-			break
-		fi
-	done
-	# keep distfiles around
-	while : true ; do
-		if [[ ! -d distfiles ]] ; then
-			mkdir distfiles
-			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
-			break
-		elif [[ -d distfiles ]] ; then
-			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
-			break
-		fi
-	done
-	# bind mount targets inside clean build environment managed by vasile, we really need them to be in there
-	mount -o bind targets "$overlaydir"/mnt
-	mount -t proc proc "$overlaydir"/proc
-	mount -t sysfs sysfs "$overlaydir"/sys
-	mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$overlaydir"/dev
-	mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$overlaydir"/dev/pts
-	mount -t tmpfs -o nosuid,nodev none "$overlaydir"/dev/shm
-	mount -t tmpfs -o nosuid,nodev,noexec none  "$overlaydir"/tmp
-}
-
-envkogaionsquashfsintegrity () {
-	# our bare metal buildserver is x86_64 but we want to build 32bit packages as well
-	# run this script with linux32 to fool it we run i686 and to build 32bit packages
-	while : true ; do
-		if [[ -f "$sqfsrootx64" && -f "$sqfsrootx64md5" ]] ; then
-			echo "Good, x86_64 squashed chroot && checksum file FOUND ... verifying integrity"
-			echo ""
-			if [[ "$(md5sum -c "$sqfsrootx64md5")" ]] ; then
-				echo "Good, x86_64 squashed chroot checksum PASSED ... starting environment"
-				echo ""
-				sleep 1
-				break
-			else
-				echo "Ooops, x86_64 squashed chroot checksum FAILED ... aborting"
-				exit 1
-			fi
-		else
-			echo "Ooops, x86_64 squashed chroot or checksum file NOT FOUND ... aborting"
-			exit 1
-		fi
-	done
-}
-
-envkogaionprepare () {
+chrootpreparex64 () {
 	# check our environment for sanity
 	# if safe, trigger start && break the loop to build packages
 	# else trigger stop && cleanup && check again
@@ -68,10 +9,10 @@ envkogaionprepare () {
 			for i in "$rodir" "$rwdir" "$overlaydir" ; do
 				mkdir "$i"
 			done
-			envkogaionstart
+			chrootstartx64
 			break
 		elif [[ -d "$rodir" && -d "$rwdir" && -d "$overlaydir" ]] ; then
-			envkogaionstop
+			chrootstop
 			for i in "$rodir" "$rwdir" "$overlaydir" ; do
 				rm -rf "$i"
 			done
@@ -80,63 +21,15 @@ envkogaionprepare () {
 	done
 }
 
-envkogaionoverlays() {
-	# inject our overlays into squashfs + overlayfs chroot
-	echo "Injecting Kogaion Linux Main Overlay into x86_64 environment"
-	sleep 1
-	chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionoverlay"
-	echo "Injecting Kogaion Linux Desktop Overlay into x86_64 environment"
-	sleep 1
-	chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaiondesktopoverlay"
-}
-
-envkogaionbuildsystem() {
-	# inject our buildsystem into squashfs + overlayfs chroot
-	echo "Injecting Kogaion Linux X86_64 Buildsystem && Setting up Portage && Setting up make.conf"
-	echo ""
-	sleep 1
-	for cmd in "$envkogaionbuildgit" "$envkogaionportageconfig" "$envkogaionmakeconfx64" "$envkogaionprofile" "$envkogaionenvupdate" ; do
-		chroot "$overlaydir" su - "$envkogaionuser" -c "$cmd"
-	done
-}
-
-envkogaionbuild () {
-	# build packages in squashfs + overlayfs chroot
-	echo ""
-	echo "x86_46 Environment is UP && RUNNING ... building targets"
-	sleep 1
-	chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionbuildtarget"
-}
-
-envkogaionchroot() {
-# enter squashfs + overlayfs chroot to push packages, or debug build errors
-	echo -e ""
-	echo -e "#################################################################"
-	echo -e "#       ENTERING CHROOT ENV FOR YOU TO PUSH BUILT PACKAGES      #"
-	echo -e "#               OR TO FIX EVENTUAL BUILD ERRORS                 #"
-	echo -e "#################################################################"
-	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
-	echo -e "#################################################################"
-	echo -e "#       NEXT RUN OF THIS SCRIPT WILL DESTROY ALL YOUR WORK      #"
-	echo -e "#   DO NOT EXIT CHROOT UNTIL ALL PACKAGES ARE PUSHED TO REPOS   #"
-	echo -e "#  OR, IN CASE OF BUILD FAILURES, UNTIL ALL FIXES ARE COMMITED  #"
-	echo -e "#################################################################"
-	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
-	echo -e "#################################################################"
-	echo -e ""
-	echo -e ""
-	chroot "$overlaydir" su - "$envkogaionuser"
-}
-
 main () {
-	if envcheckroot ; then
-		envkogaionsquashfsintegrity
-		envkogaionprepare
-		envkogaionoverlays
-		envkogaionbuildsystem
-		envkogaionbuild
-		envkogaionchroot
-		envkogaionstop
+	if checkroot ; then
+		chrootchecksumx64
+		chrootpreparex64
+		chrootoverlaysx64
+		chrootbuildsystemx64
+		chrootbuildx64
+		chrootx64
+		chrootstop
 	fi
 }
 
diff --git a/libvasile b/libvasile
index bdee7f5..c93e709 100755
--- a/libvasile
+++ b/libvasile
@@ -1,37 +1,18 @@
-# env mount variables
+# arch agnostic code
 export local rodir="rodir"
 export local rwdir="rwdir"
 export local overlaydir="overlaydir"
+export local chrootuser="root"
+export local chroottarget="${@:2}"
+export local chrootbuildtarget="emerge -kav "$chroottarget""
+export local chrootoverlay="layman -f -a kogaion -o https://raw.github.com/Rogentos/kogaion/master/overlay.xml"
+export local chrootdesktopoverlay="layman -f -a kogaion-desktop -o https://raw.github.com/Rogentos/kogaion-desktop/master/overlay.xml"
+export local chrootbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git"
+export local chrootportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage"
+export local chrootenvupdate="/usr/sbin/env-update && . /etc/profile"
+export local chrootprofile="eselect profile set 1"
 
-# env user variable
-export local envkogaionuser="root"
-
-# env target variable (can be a single package, multiple packages, or a target file passed as parameter)
-# vasile is now splitted, so calling it with one of its build arguments (--build32 or --build64)
-# would import that argument into envkogaiontarget variable and building most likely would fail
-# so change envkogaiontarget variable for vasile to skip build arguments and focus and next ones (target files, or packages)
-export local envkogaiontarget="${@:2}"
-export local envkogaionbuildtarget="emerge -kav "$envkogaiontarget""
-
-# env buildsystem variables
-export local envkogaionoverlay="layman -f -a kogaion -o https://raw.github.com/Rogentos/kogaion/master/overlay.xml"
-export local envkogaiondesktopoverlay="layman -f -a kogaion-desktop -o https://raw.github.com/Rogentos/kogaion-desktop/master/overlay.xml"
-export local envkogaionbuildgit="cd /opt && git clone https://github.com/Rogentos/build.git"
-export local envkogaionportageconfig="ln -sf /opt/build/conf/intel/portage /etc/portage"
-export local envkogaionenvupdate="/usr/sbin/env-update && . /etc/profile"
-export local envkogaionprofile="eselect profile set 1"
-
-# env squashfs chroot variables
-export local sqfsrootx86="kogaiondevelx86.squashfs"
-export local sqfsrootx86md5=""$sqfsrootx86".md5"
-export local sqfsrootx64="kogaiondevelx64.squashfs"
-export local sqfsrootx64md5=""$sqfsrootx64".md5"
-
-# env make.conf variables
-export local envkogaionmakeconfx86="ln -sf /opt/build/conf/intel/portage/make.conf.x86 /etc/portage/make.conf"
-export local envkogaionmakeconfx64="ln -sf /opt/build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf"
-
-envcheckroot () {
+checkroot () {
 	if [[ "$(whoami)" != root ]] ; then
 		echo ""
 		echo "You're not root?...No cookies for you, go away !!!"
@@ -40,8 +21,7 @@ envcheckroot () {
 	fi
 }
 
-envkogaionstop () {
-	# umount squashfs + overlayfs chroot
+chrootstop () {
 	umount -l "$overlaydir"/proc > /dev/null 2>&1
 	umount -l "$overlaydir"/sys > /dev/null 2>&1
 	umount -l "$overlaydir"/dev/pts > /dev/null 2>&1
@@ -53,3 +33,207 @@ envkogaionstop () {
 	umount -l "$overlaydir" > /dev/null 2>&1
 	umount -l "$rodir" > /dev/null 2>&1
 }
+
+# x64 specific code
+export local chrootx64="kogaiondevelx64.squashfs"
+export local chrootx64md5=""$chrootx64".md5"
+export local chrootmakeconfx64="ln -sf /opt/build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf"
+
+chrootchecksumx64 () {
+	while : true ; do
+		if [[ -f "$chrootx64" && -f "$chrootx64md5" ]] ; then
+			echo "Good, x64 squashed chroot && checksum file FOUND ... verifying integrity"
+			echo ""
+			if [[ "$(md5sum -c "$chrootx64md5")" ]] ; then
+				echo "Good, x64 squashed chroot checksum PASSED ... starting environment"
+				echo ""
+				sleep 1
+				break
+			else
+				echo "Ooops, x64 squashed chroot checksum FAILED ... aborting"
+				exit 1
+			fi
+		else
+			echo "Ooops, x64 squashed chroot or checksum file NOT FOUND ... aborting"
+			exit 1
+		fi
+	done
+}
+
+chrootstartx64 () {
+	mount -t squashfs "$chrootx64" "$rodir"
+	mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir"
+	while : true ; do
+		if [[ ! -d packages ]] ; then
+			mkdir packages
+			mount -o bind packages "$overlaydir"/usr/portage/packages
+			break
+		elif [[ -d packages ]] ; then
+			mount -o bind packages "$overlaydir"/usr/portage/packages
+			break
+		fi
+	done
+	while : true ; do
+		if [[ ! -d distfiles ]] ; then
+			mkdir distfiles
+			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
+			break
+		elif [[ -d distfiles ]] ; then
+			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
+			break
+		fi
+	done
+	mount -o bind targets "$overlaydir"/mnt
+	mount -t proc proc "$overlaydir"/proc
+	mount -t sysfs sysfs "$overlaydir"/sys
+	mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$overlaydir"/dev
+	mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$overlaydir"/dev/pts
+	mount -t tmpfs -o nosuid,nodev none "$overlaydir"/dev/shm
+	mount -t tmpfs -o nosuid,nodev,noexec none  "$overlaydir"/tmp
+}
+
+chrootoverlaysx64() {
+	echo "Injecting Kogaion Linux Main Overlay into x64 environment"
+	sleep 1
+	chroot "$overlaydir" su - "$chrootuser" -c "$chrootoverlay"
+	echo "Injecting Kogaion Linux Desktop Overlay into x64 environment"
+	sleep 1
+	chroot "$overlaydir" su - "$chrootuser" -c "$chrootdesktopoverlay"
+}
+
+chrootbuildsystemx64() {
+	echo "Injecting Kogaion Linux x64 Buildsystem && Setting up Portage && Setting up make.conf"
+	echo ""
+	sleep 1
+	for cmd in "$chrootbuildgit" "$chrootportageconfig" "$chrootmakeconfx64" "$chrootprofile" "$chrootenvupdate" ; do
+		chroot "$overlaydir" su - "$chrootuser" -c "$cmd"
+	done
+}
+
+chrootbuildx64 () {
+	echo ""
+	echo "x64 Environment is UP && RUNNING ... building targets"
+	sleep 1
+	chroot "$overlaydir" su - "$chrootuser" -c "$chrootbuildtarget"
+}
+
+chrootx64() {
+	echo -e ""
+	echo -e "#################################################################"
+	echo -e "#       ENTERING CHROOT ENV FOR YOU TO PUSH BUILT PACKAGES      #"
+	echo -e "#               OR TO FIX EVENTUAL BUILD ERRORS                 #"
+	echo -e "#################################################################"
+	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
+	echo -e "#################################################################"
+	echo -e "#       NEXT RUN OF THIS SCRIPT WILL DESTROY ALL YOUR WORK      #"
+	echo -e "#   DO NOT EXIT CHROOT UNTIL ALL PACKAGES ARE PUSHED TO REPOS   #"
+	echo -e "#  OR, IN CASE OF BUILD FAILURES, UNTIL ALL FIXES ARE COMMITED  #"
+	echo -e "#################################################################"
+	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
+	echo -e "#################################################################"
+	echo -e ""
+	echo -e ""
+	chroot "$overlaydir" su - "$chrootuser"
+}
+
+# x86 specific code
+export local chrootx86="kogaiondevelx86.squashfs"
+export local chrootx86md5=""$chrootx86".md5"
+export local chrootmakeconfx86="ln -sf /opt/build/conf/intel/portage/make.conf.x86 /etc/portage/make.conf"
+
+chrootchecksumx86 () {
+	while : true ; do
+		if [[ -f "$chrootx86" && -f "$chrootx86md5" ]] ; then
+			echo "Good, x86 squashed chroot && checksum file FOUND ... verifying integrity"
+			echo ""
+			if [[ "$(md5sum -c "$chrootx86md5")" ]] ; then
+				echo "Good, x86 squashed chroot checksum PASSED ... starting environment"
+				echo ""
+				sleep 1
+				break
+			else
+				echo "Ooops, x86 squashed chroot checksum FAILED ... aborting"
+				exit 1
+			fi
+		else
+			echo "Ooops, x86 squashed chroot or checksum file NOT FOUND ... aborting"
+			exit 1
+		fi
+	done
+}
+
+chrootstartx86 () {
+	mount -t squashfs "$chrootx86" "$rodir"
+	mount -t overlayfs -o lowerdir="$rodir",upperdir="$rwdir" overlayfs "$overlaydir"
+	while : true ; do
+		if [[ ! -d packages ]] ; then
+			mkdir packages
+			mount -o bind packages "$overlaydir"/usr/portage/packages
+			break
+		elif [[ -d packages ]] ; then
+			mount -o bind packages "$overlaydir"/usr/portage/packages
+			break
+		fi
+	done
+	while : true ; do
+		if [[ ! -d distfiles ]] ; then
+			mkdir distfiles
+			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
+			break
+		elif [[ -d distfiles ]] ; then
+			mount -o bind distfiles "$overlaydir"/usr/portage/distfiles
+			break
+		fi
+	done
+	mount -o bind targets "$overlaydir"/mnt
+	mount -t proc proc "$overlaydir"/proc
+	mount -t sysfs sysfs "$overlaydir"/sys
+	mount -t devtmpfs -o relatime,size=3055348k,nr_inodes=763837,mode=755 none "$overlaydir"/dev
+	mount -t devpts -o nosuid,noexec,relatime,gid=5,mode=620 none "$overlaydir"/dev/pts
+	mount -t tmpfs -o nosuid,nodev none "$overlaydir"/dev/shm
+	mount -t tmpfs -o nosuid,nodev,noexec none  "$overlaydir"/tmp
+}
+
+chrootoverlaysx86() {
+	echo "Injecting Kogaion Linux Main Overlay into x86 environment"
+	sleep 1
+	linux32 chroot "$overlaydir" su - "$chrootuser" -c "$chrootoverlay"
+	echo "Injecting Kogaion Linux Desktop Overlay into x86 environment"
+	sleep 1
+	linux32 chroot "$overlaydir" su - "$chrootuser" -c "$chrootdesktopoverlay"
+}
+
+chrootbuildsystemx86() {
+	echo "Injecting Kogaion Linux x86 Buildsystem && Setting up Portage && Setting up make.conf"
+	echo ""
+	sleep 1
+	for cmd in "$chrootbuildgit" "$chrootportageconfig" "$chrootmakeconfx86" "$chrootprofile" "$chrootenvupdate" ; do
+		linux32 chroot "$overlaydir" su - "$chrootuser" -c "$cmd"
+	done
+}
+
+chrootbuildx86 () {
+	echo ""
+	echo "x64 Environment is UP && RUNNING ... building targets"
+	sleep 1
+	chroot "$overlaydir" su - "$chrootuser" -c "$chrootbuildtarget"
+}
+
+chrootx86() {
+	echo -e ""
+	echo -e "#################################################################"
+	echo -e "#       ENTERING CHROOT ENV FOR YOU TO PUSH BUILT PACKAGES      #"
+	echo -e "#               OR TO FIX EVENTUAL BUILD ERRORS                 #"
+	echo -e "#################################################################"
+	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
+	echo -e "#################################################################"
+	echo -e "#       NEXT RUN OF THIS SCRIPT WILL DESTROY ALL YOUR WORK      #"
+	echo -e "#   DO NOT EXIT CHROOT UNTIL ALL PACKAGES ARE PUSHED TO REPOS   #"
+	echo -e "#  OR, IN CASE OF BUILD FAILURES, UNTIL ALL FIXES ARE COMMITED  #"
+	echo -e "#################################################################"
+	echo -e "#            !!! WARNING !!! WARNING !!! WARNING !!!            #"
+	echo -e "#################################################################"
+	echo -e ""
+	echo -e ""
+	linux32 chroot "$overlaydir" su - "$chrootuser"
+}
-- 
cgit v1.2.3


From 097ad73f4e3cf05ab290f067f484e482d6a4e421 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 30 Aug 2015 19:17:32 +0100
Subject: typo

---
 libvasile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libvasile b/libvasile
index c93e709..4e7f03f 100755
--- a/libvasile
+++ b/libvasile
@@ -214,7 +214,7 @@ chrootbuildsystemx86() {
 
 chrootbuildx86 () {
 	echo ""
-	echo "x64 Environment is UP && RUNNING ... building targets"
+	echo "x86 Environment is UP && RUNNING ... building targets"
 	sleep 1
 	chroot "$overlaydir" su - "$chrootuser" -c "$chrootbuildtarget"
 }
-- 
cgit v1.2.3