mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-20 05:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

portage: fix stage1 builds involving new slot dependencies

Browse Source 
Really screwy crud going on here, see the upstream bug for details:
https://bugs.gentoo.org/show_bug.cgi?id=520112
This commit is contained in:
Michael Marineau 2014-08-18 10:38:45 -07:00
parent 0adce60061
commit 63eecc79d8
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sdk_container/src/third_party/coreos-overlay/sys-apps/portage/files/portage-2.2.8-rebuild-in-correct-root.patch vendored Normal file
View File

@ -0,0 +1,23 @@
https://bugs.gentoo.org/show_bug.cgi?id=520112
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index a10297a..2d30966 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3496,13 +3496,13 @@ class depgraph(object):
a favorite list."""
debug = "--debug" in self._frozen_config.myopts
onlydeps = "--onlydeps" in self._frozen_config.myopts
- myroot = self._frozen_config.target_root
- pkgsettings = self._frozen_config.pkgsettings[myroot]
- pprovideddict = pkgsettings.pprovideddict
- virtuals = pkgsettings.getvirtuals()
args = self._dynamic_config._initial_arg_list[:]
for arg in self._expand_set_args(args, add_to_digraph=True):
+ myroot = arg.root_config.root
+ pkgsettings = self._frozen_config.pkgsettings[myroot]
+ pprovideddict = pkgsettings.pprovideddict
+ virtuals = pkgsettings.getvirtuals()
for atom in arg.pset.getAtoms():
self._spinner_update()
dep = Dependency(atom=atom, onlydeps=onlydeps,

3
sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.8-r3.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/portage/portage-2.2.8-r4.ebuild vendored
View File

@ -228,8 +228,11 @@ src_prepare() {
fi fi
epatch "${WORKDIR}/${PN}-${PATCHVER}.patch" epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
fi fi
epatch "${FILESDIR}/${P}-add-disabled.patch" epatch "${FILESDIR}/${P}-add-disabled.patch"
epatch "${FILESDIR}/${P}-filter-eroot.patch" epatch "${FILESDIR}/${P}-filter-eroot.patch"
epatch "${FILESDIR}/${P}-rebuild-in-correct-root.patch"
einfo "Setting portage.VERSION to ${PVR} ..." einfo "Setting portage.VERSION to ${PVR} ..."
sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \ sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
die "Failed to patch portage.VERSION" die "Failed to patch portage.VERSION"