move last variables into libvasile

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"