From e28bc3bc338f9b2cfa0e3a8841e76604761712cc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 9 Dec 2015 18:47:39 +0000 Subject: start moving common iso things into libvasile --- iso32 | 2 -- iso64 | 2 -- libvasile | 5 +++++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/iso32 b/iso32 index 332979f..45d2b38 100755 --- a/iso32 +++ b/iso32 @@ -7,8 +7,6 @@ checkroot export local mainarch="x86" export local isoname=""$releasename"-"$releaseversion"-"$mainarch"" -export local coremnt="/tmp/"$isoname"" -export local kernelver="3.14.0-"$releasename"" export local kernelname="kernel-genkernel-"$mainarch"-"$kernelver"" export local ramfsname="initramfs-genkernel-"$mainarch"-"$kernelver"" diff --git a/iso64 b/iso64 index e5a0aa9..38af6d2 100755 --- a/iso64 +++ b/iso64 @@ -7,8 +7,6 @@ checkroot export local mainarch="x86_64" export local isoname=""$releasename"-"$releaseversion"-"$mainarch"" -export local coremnt="/tmp/"$isoname"" -export local kernelver="3.14.0-"$releasename"" export local kernelname="kernel-genkernel-"$mainarch"-"$kernelver"" export local ramfsname="initramfs-genkernel-"$mainarch"-"$kernelver"" diff --git a/libvasile b/libvasile index 3a7085f..de32e38 100755 --- a/libvasile +++ b/libvasile @@ -18,6 +18,11 @@ export local chrootportageconfig="ln -sf /opt/kogaion-build/conf/intel/portage / export local chrootenvupdate="/usr/sbin/env-update && . /etc/profile" export local chrootprofile="eselect profile set 1" +# arch independent iso variables + +export local coremnt="/tmp/"$isoname"" +export local kernelver="3.14.0-"$releasename"" + # generic arch independent functions (used for both build && iso creation) kernelconfig () { -- cgit v1.2.3