summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@rogentos.ro>2015-07-19 14:46:43 +0100
committerV3n3RiX <venerix@rogentos.ro>2015-07-19 14:46:43 +0100
commit3fe941e3d562689a24c87ba6e8d46ecc7271520d (patch)
tree4955f6deb799771954b47e1f916ca9492399ec50
parent04775a1a268472d48b89dc78dc1cee02a4edecdd (diff)
Revert "targets depend on each other, so make sure we have them installed, or eit will fail misserably"
This reverts commit bf550ac369ec31a74bbc9a0345967b7269a4f465.
-rwxr-xr-xvasile13
1 files changed, 0 insertions, 13 deletions
diff --git a/vasile b/vasile
index f437436..1e17927 100755
--- a/vasile
+++ b/vasile
@@ -19,17 +19,6 @@ 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"
@@ -211,13 +200,11 @@ 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