fixes for new stuff

funtoo · Aug 25, 2017 · bc6c913 · bc6c913
1 parent f7ea95f
commit bc6c913
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/modules/targets/stage.py b/modules/targets/stage.py
@@ -10,7 +10,7 @@ def __init__(self, settings, cr):
 
 		# define gentoo specific mounts
 		if "path/distfiles" in self.settings:
-			self.mounts["/usr/portage/distfiles"] = self.settings["path/distfiles"]
+			self.mounts["/var/cache/portage/distfiles"] = self.settings["path/distfiles"]
 
 	def run(self):
 		ChrootTarget.run(self)

diff --git a/targets/gentoo/stage1.spec b/targets/gentoo/stage1.spec
@@ -73,7 +73,7 @@ cat > /tmp/build.py << "EOF"
 $[[files/pythonjunk]]
 EOF
 
-export buildpkgs="$(python /tmp/build.py)"
+export buildpkgs="$(python /tmp/build.py) dev-vcs/git"
 
 
 # Gentoo hard-codes the intended python targets into a base profile. Funtoo extracts it from variables

diff --git a/targets/gentoo/steps/epro.spec b/targets/gentoo/steps/epro.spec
@@ -24,6 +24,8 @@ sys.exit(1)
 epro_setup: [
 # make sure we have the latest ego.
 emerge -u --oneshot ego
+# regen profiles
+epro update
 cat > /tmp/epro_getarch.py << "EOF"
 $[[files/epro_getarch]]
 EOF

diff --git a/targets/gentoo/steps/stage.spec b/targets/gentoo/steps/stage.spec
@@ -5,6 +5,8 @@
 #[option parse/lax]
 
 setup: [
+# fix for bogus stages with buggy ego
+sed -i -e /%s/d /etc/portage/make.profile/parent
 /usr/sbin/env-update
 gcc-config 1
 source /etc/profile