use only one overlay on top of portage tree

2 files changed, 6 insertions, 20 deletions

diff --git a/libvasile b/libvasile
index 922b615..1029690 100755
--- a/libvasile
+++ b/libvasile
@@ -123,12 +123,9 @@ chrootstartx64 () {
 }
 
 chrootoverlaysx64 () {
-	echo "injecting "$releasename" main overlay into x64 environment"
-	sleep 1
-	chroot "$overlaydir" su - "$chrootuser" -c "$chrootmainoverlay"
 	echo "injecting "$releasename" "$releasetarget" overlay into x64 environment"
 	sleep 1
-	chroot "$overlaydir" su - "$chrootuser" -c "$chrootaddonoverlay"
+	chroot "$overlaydir" su - "$chrootuser" -c "$chrootmainoverlay"
 }
 
 chrootbuildsystemx64 () {
@@ -205,12 +202,9 @@ chrootstartx86 () {
 }
 
 chrootoverlaysx86 () {
-	echo "injecting "$releasename" main overlay into x86 environment"
-	sleep 1
-	linux32 chroot "$overlaydir" su - "$chrootuser" -c "$chrootmainoverlay"
 	echo "injecting "$releasename" "$releasetarget" overlay into x86 environment"
 	sleep 1
-	linux32 chroot "$overlaydir" su - "$chrootuser" -c "$chrootaddonoverlay"
+	linux32 chroot "$overlaydir" su - "$chrootuser" -c "$chrootmainoverlay"
 }
 
 chrootbuildsystemx86 () {
@@ -273,12 +267,9 @@ isostopx64 () {
 }
 
 isooverlaysx64 () {
-	echo "injecting "$releasename" main overlay into x64 environment"
-	sleep 1
-	chroot "$isosyncdirx64" su - "$isouser" -c "$isomainoverlay"
 	echo "injecting "$releasename" "$releasetarget" overlay into x64 environment"
 	sleep 1
-	chroot "$isosyncdirx64" su - "$isouser" -c "$isoaddonoverlay"
+	chroot "$isosyncdirx64" su - "$isouser" -c "$isomainoverlay"
 }
 
 isobuildsystemx64 () {
@@ -332,12 +323,9 @@ isostopx86 () {
 }
 
 isooverlaysx86 () {
-	echo "injecting "$releasename" main overlay into x86 environment"
-	sleep 1
-	linux32 chroot "$isosyncdirx86" su - "$isouser" -c "$isomainoverlay"
 	echo "injecting "$releasename" "$releasetarget" overlay into x86 environment"
 	sleep 1
-	linux32 chroot "$isosyncdirx86" su - "$isouser" -c "$isoaddonoverlay"
+	linux32 chroot "$isosyncdirx86" su - "$isouser" -c "$isomainoverlay"
 }
 
 isobuildsystemx86 () {
diff --git a/vasile b/vasile
index ed1b3e2..85c7f29 100755
--- a/vasile
+++ b/vasile
@@ -44,8 +44,7 @@ export local overlaydir="overlaydir"
 export local chrootuser="root"
 export local chroottarget="${@:2}"
 export local chrootbuildtarget="emerge -kav "$chroottarget""
-export local chrootmainoverlay="layman -f -a "$releasename" -o https://gitlab.com/"$releasename"/"$releasename"-main/raw/master/overlay.xml"
-export local chrootaddonoverlay="layman -f -a "$releasename"-"$releasetarget" -o https://gitlab.com/"$releasename"/"$releasename"-"$releasetarget"/raw/master/overlay.xml"
+export local chrootmainoverlay="layman -f -a "$releasename"-"$releasetarget" -o https://gitlab.com/"$releasename"/"$releasename"-"$releasetarget"/raw/master/overlay.xml"
 export local chrootbuildgit="cd /opt && git clone https://gitlab.com/"$releasename"/"$releasename"-build.git"
 export local chrootportageconfig="ln -sf /opt/"$releasename"-build/conf/intel/portage /etc/portage"
 export local chrootenvupdate="/usr/sbin/env-update && . /etc/profile"
@@ -58,8 +57,7 @@ export local bootcorefiles="/tmp/bootcore/cdroot/boot"
 export local isouser="root"
 export local isotarget="${@:2}"
 export local isoinstalltarget="emerge -Kav "$isotarget""
-export local isomainoverlay="layman -f -a "$releasename" -o https://gitlab.com/"$releasename"/"$releasename"-main/raw/master/overlay.xml"
-export local isoaddonoverlay="layman -f -a "$releasename"-"$releasetarget" -o https://gitlab.com/"$releasename"/"$releasename"-"$releasetarget"/raw/master/overlay.xml"
+export local isomainoverlay="layman -f -a "$releasename"-"$releasetarget" -o https://gitlab.com/"$releasename"/"$releasename"-"$releasetarget"/raw/master/overlay.xml"
 export local isobuildgit="cd /opt && git clone https://gitlab.com/"$releasename"/"$releasename"-build.git"
 export local isoportageconfig="ln -sf /opt/"$releasename"-build/conf/intel/portage /etc/portage"
 export local isoenvupdate="/usr/sbin/env-update && . /etc/profile"