fine tune iso variables

3 files changed, 47 insertions, 44 deletions

diff --git a/iso32 b/iso32
index cae0808..339601c 100755
--- a/iso32
+++ b/iso32
@@ -5,37 +5,29 @@
 kernelconfig
 checkroot
 
-export local mainarch="x86"
-export local isoname=""$releasename"-"$releasetarget"-"$releaseversion"-"$mainarch""
-export local coremnt="/tmp/"$isoname""
-export local livedir=""$isoname"/livecd"
-export local isoboot=""$isoname"/boot/grub"
-export local kernelname="kernel-genkernel-"$mainarch"-"$kernelver""
-export local ramfsname="initramfs-genkernel-"$mainarch"-"$kernelver""
-
 makeisox86 () {
 	# ISO layout
-	mkdir -p "$coremnt"
-	mkdir -p "$isoboot"
+	mkdir -p "$coremntx86"
+	mkdir -p "$isobootx86"
 	# Mount && Sync squashed core (Kogaion stage4) into live environment
-	mount -t squashfs "$chrootx86" "$coremnt"
-	rsync -aHAXr --progress "$coremnt/" "$livedir/"
+	mount -t squashfs "$chrootx86" "$coremntx86"
+	rsync -aHAXr --progress "$coremntx86/" "$livedirx86/"
 	# Put our kernel and initramfs in place
-	cp -avx ""$livedir"/boot/"$kernelname"" ""$isoname"/boot/"$releasename""
-	cp -avx ""$livedir"/boot/"$ramfsname"" ""$isoname"/boot/"$releasename".igz"
+	cp -avx ""$livedirx86"/boot/"$kernelnamex86"" ""$isonamex86"/boot/"$releasename""
+	cp -avx ""$livedirx86"/boot/"$ramfsnamex86"" ""$isonamex86"/boot/"$releasename".igz"
 	# Checksum the kernel && initramfs
-	sha256sum ""$isoname"/boot/"$releasename"" | tee ""$isoname"/boot/"$releasename".sha256"
-	sha256sum ""$isoname"/boot/"$releasename.igz"" | tee ""$isoname"/boot/"$releasename".igz.sha256"
+	sha256sum ""$isonamex86"/boot/"$releasename"" | tee ""$isonamex86"/boot/"$releasename".sha256"
+	sha256sum ""$isonamex86"/boot/"$releasename.igz"" | tee ""$isonamex86"/boot/"$releasename".igz.sha256"
 	# Squash live environment
-	mksquashfs "$livedir" ""$livedir".squashfs" -b 1048576 -comp xz -Xdict-size 100%
+	mksquashfs "$livedirx86" ""$livedirx86".squashfs" -b 1048576 -comp xz -Xdict-size 100%
 	# Checksum the live environment
-	sha256sum ""$livedir".squashfs" | tee ""$livedir".squashfs.sha256"
+	sha256sum ""$livedirx86".squashfs" | tee ""$livedirx86".squashfs.sha256"
 	# Remove live environment directory (we have it squashed now, no longer needed)
-	rm -rf "$livedir"
+	rm -rf "$livedirx86"
 	# Enable liveboot
-	touch "$livedir"
+	touch "$livedirx86"
 	# Umount squashed core (Kogaion stage4)
-	umount "$coremnt"
+	umount "$coremntx86"
 }
 
 main () {
diff --git a/iso64 b/iso64
index 668640a..2dd93c7 100755
--- a/iso64
+++ b/iso64
@@ -5,39 +5,30 @@
 kernelconfig
 checkroot
 
-export local mainarch="x86_64"
-export local isoname=""$releasename"-"$releasetarget"-"$releaseversion"-"$mainarch""
-export local coremnt="/tmp/"$isoname""
-export local livedir=""$isoname"/livecd"
-export local isoboot=""$isoname"/boot/grub"
-export local isoefiboot=""$isoname"/efi/boot"
-export local kernelname="kernel-genkernel-"$mainarch"-"$kernelver""
-export local ramfsname="initramfs-genkernel-"$mainarch"-"$kernelver""
-
 makeisox64 () {
 	# ISO layout
-	mkdir -p "$coremnt"
-	mkdir -p "$isoboot"
-	mkdir -p "$isoefiboot"
+	mkdir -p "$coremntx64"
+	mkdir -p "$isobootx64"
+	mkdir -p "$isoefibootx64"
 	# Mount && Sync squashed core (Kogaion stage4) into live environment
-	mount -t squashfs "$chrootx64" "$coremnt"
-	rsync -aHAXr --progress "$coremnt/" "$livedir/"
+	mount -t squashfs "$chrootx64" "$coremntx64"
+	rsync -aHAXr --progress "$coremntx64/" "$livedirx64/"
 	# Put our kernel and initramfs in place
-	cp -avx ""$livedir"/boot/"$kernelname"" ""$isoname"/boot/"$releasename""
-	cp -avx ""$livedir"/boot/"$ramfsname"" ""$isoname"/boot/"$releasename".igz"
+	cp -avx ""$livedirx64"/boot/"$kernelnamex64"" ""$isonamex64"/boot/"$releasename""
+	cp -avx ""$livedirx64"/boot/"$ramfsnamex64"" ""$isonamex64"/boot/"$releasename".igz"
 	# Checksum the kernel && initramfs
-	sha256sum ""$isoname"/boot/"$releasename"" | tee ""$isoname"/boot/"$releasename".sha256"
-	sha256sum ""$isoname"/boot/"$releasename.igz"" | tee ""$isoname"/boot/"$releasename".igz.sha256"
+	sha256sum ""$isonamex64"/boot/"$releasename"" | tee ""$isonamex64"/boot/"$releasename".sha256"
+	sha256sum ""$isonamex64"/boot/"$releasename.igz"" | tee ""$isonamex64"/boot/"$releasename".igz.sha256"
 	# Squash live environment
-	mksquashfs "$livedir" ""$livedir".squashfs" -b 1048576 -comp xz -Xdict-size 100%
+	mksquashfs "$livedirx64" ""$livedirx64".squashfs" -b 1048576 -comp xz -Xdict-size 100%
 	# Checksum the live environment
-	sha256sum ""$livedir".squashfs" | tee ""$livedir".squashfs.sha256"
+	sha256sum ""$livedirx64".squashfs" | tee ""$livedirx64".squashfs.sha256"
 	# Remove live environment directory (we have it squashed now, no longer needed)
-	rm -rf "$livedir"
+	rm -rf "$livedirx64"
 	# Enable liveboot
-	touch "$livedir"
+	touch "$livedirx64"
 	# Umount squashed core (Kogaion stage4)
-	umount "$coremnt"
+	umount "$coremntx64"
 }
 
 main () {
diff --git a/vasile b/vasile
index 6b8f4ba..27519a4 100755
--- a/vasile
+++ b/vasile
@@ -42,6 +42,26 @@ export local chrootx86=""$releasename"_"$releaseversion"_core_x86.squashfs"
 export local chrootx86md5=""$chrootx86".md5"
 export local chrootmakeconfx86="ln -sf /opt/"$releasename"-build/conf/intel/portage/make.conf.x86 /etc/portage/make.conf"
 
+# x64 specific iso variables
+
+export local mainarchx64="x86_64"
+export local isonamex64=""$releasename"-"$releasetarget"-"$releaseversion"-"$mainarchx64""
+export local kernelnamex64="kernel-genkernel-"$mainarchx64"-"$kernelver""
+export local ramfsnamex64="initramfs-genkernel-"$mainarchx64"-"$kernelver""
+export local coremntx64="/tmp/"$isonamex64""
+export local livedirx64=""$isonamex64"/livecd"
+export local isobootx64=""$isonamex64"/boot/grub"
+export local isoefibootx64=""$isonamex64"/efi/boot"
+
+# x86 specific iso variables
+
+export local mainarchx86="x86"
+export local isonamex86=""$releasename"-"$releasetarget"-"$releaseversion"-"$mainarchx86""
+export local kernelnamex86="kernel-genkernel-"$mainarchx86"-"$kernelver""
+export local ramfsnamex86="initramfs-genkernel-"$mainarchx86"-"$kernelver""
+export local coremntx86="/tmp/"$isonamex86""
+export local livedirx86=""$isonamex86"/livecd"
+export local isobootx86=""$isonamex86"/boot/grub"
 
 source /usr/lib/vasile/libvasile