diff options
| -rwxr-xr-x | libvasile | 36 | ||||
| -rwxr-xr-x | vasile | 37 |
2 files changed, 37 insertions, 36 deletions
@@ -1,27 +1,3 @@ -# generic variables -export local releasename="kogaion" -export local releaseversion="3" - -# arch independent build variables - -export local rodir="rodir" -export local rwdir="rwdir" -export local workdir="workdir" # only needed for overlayfs on kernel greather than 3.18 -export local overlaydir="overlaydir" -export local chrootuser="root" -export local chroottarget="${@:2}" -export local chrootbuildtarget="emerge -kav "$chroottarget"" -export local chrootoverlay="layman -f -a "$releasename" -o https://gitlab.com/"$releasename"/"$releasename"-main/raw/master/overlay.xml" -export local chrootdesktopoverlay="layman -f -a "$releasename"-desktop -o https://gitlab.com/"$releasename"/"$releasename"-desktop/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" -export local chrootprofile="eselect profile set 1" - -# arch independent iso variables - -export local kernelver="3.14.0-"$releasename"" - # generic arch independent functions (used for both build && iso creation) kernelconfig () { @@ -107,12 +83,6 @@ chrootstop () { umount -l "$rodir" > /dev/null 2>&1 } -# x64 specific build variables - -export local chrootx64=""$releasename"_"$releaseversion"_core_x64.squashfs" -export local chrootx64md5=""$chrootx64".md5" -export local chrootmakeconfx64="ln -sf /opt/kogaion-build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf" - # x64 specific build functions chrootstartx64 () { @@ -195,12 +165,6 @@ chrootx64 () { chroot "$overlaydir" su - "$chrootuser" } -# x86 specific build variables - -export local chrootx86=""$releasename"_"$releaseversion"_core_x86.squashfs" -export local chrootx86md5=""$chrootx86".md5" -export local chrootmakeconfx86="ln -sf /opt/kogaion-build/conf/intel/portage/make.conf.x86 /etc/portage/make.conf" - # x86 specific build functions chrootstartx86 () { @@ -5,6 +5,43 @@ # Dependencies : kernel built with squashfs + overlayfs support # +# generic variables +export local releasename="kogaion" +export local releaseversion="3" + +# arch independent build variables + +export local rodir="rodir" +export local rwdir="rwdir" +export local workdir="workdir" # only needed for overlayfs on kernel greather than 3.18 +export local overlaydir="overlaydir" +export local chrootuser="root" +export local chroottarget="${@:2}" +export local chrootbuildtarget="emerge -kav "$chroottarget"" +export local chrootoverlay="layman -f -a "$releasename" -o https://gitlab.com/"$releasename"/"$releasename"-main/raw/master/overlay.xml" +export local chrootdesktopoverlay="layman -f -a "$releasename"-desktop -o https://gitlab.com/"$releasename"/"$releasename"-desktop/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" +export local chrootprofile="eselect profile set 1" + +# arch independent iso variables + +export local kernelver="3.14.0-"$releasename"" + +# x64 specific build variables + +export local chrootx64=""$releasename"_"$releaseversion"_core_x64.squashfs" +export local chrootx64md5=""$chrootx64".md5" +export local chrootmakeconfx64="ln -sf /opt/"$releasename"-build/conf/intel/portage/make.conf.amd64 /etc/portage/make.conf" + +# x86 specific build variables + +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" + + source /usr/lib/vasile/libvasile case $1 in |