From bf550ac369ec31a74bbc9a0345967b7269a4f465 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 19 Jul 2015 14:19:19 +0100 Subject: targets depend on each other, so make sure we have them installed, or eit will fail misserably --- vasile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/vasile b/vasile index 1e17927..f437436 100755 --- a/vasile +++ b/vasile @@ -19,6 +19,17 @@ export local envkogaionuser="root" export local envkogaiontarget="$@" export local envkogaionbuildtarget="emerge -kav "$envkogaiontarget"" +# portage buildpkg feature is enabled by default now, so every built target will also have binary packages +# vasile will still clean build environment and reset everything to default, but will let binary packages in place +# each target depends on previous one (building a target will most likely pull packages already built in previous target, causing useless rebuilds) +# to prevent this behaviour install already built targets using binary packages +export local envkerneltarget="$(< kernel.target)" +export local envmultimediatarget="$(< multimedia.target)" +export local envartworktarget="$(< artwork.target)" +export local envxlibstarget="$(< xlibs.target)" +export local envxorgtarget="$(< xorg.target)" +export local envkogaioninstalltarget="emerge -kav "$envkerneltarget" "$envmultimediatarget" "$envartworktarget" "$envxlibstarget" "$envxorgtarget"" + # env buildsystem variables export local envkogaionoverlay="layman -f -a kogaion -o https://raw.github.com/Rogentos/kogaion/master/overlay.xml" export local envkogaiondesktopoverlay="layman -f -a kogaion-desktop -o https://raw.github.com/Rogentos/kogaion-desktop/master/overlay.xml" @@ -200,11 +211,13 @@ envkogaioneit() { envkogaionbuild () { # build packages in squashfs + overlayfs chroot if [[ "$(uname -m)" = "x86_64" ]] ; then + chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaioninstalltarget" echo "" echo "x86_46 Environment is UP && RUNNING ... building targets" sleep 1 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaionbuildtarget" elif [[ "$(uname -m)" = "i686" ]] ; then + linux32 chroot "$overlaydir" su - "$envkogaionuser" -c "$envkogaioninstalltarget" echo "" echo "i686 Environment is UP && RUNNING ... building targets" sleep 1 -- cgit v1.2.3