diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2018-12-04 09:05:17 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2018-12-04 11:05:57 +0000 |
| commit | d266c61788fe8457e0ed0d7674bcb5d963692e8c (patch) | |
| tree | 57fa6e71c4be13bb9fbee82ce1833ce73e9bbb78 /eclass/toolchain.eclass | |
| parent | media-radio/KochMorse: upstream release 3.4.0. (diff) | |
| download | gentoo-d266c61788fe8457e0ed0d7674bcb5d963692e8c.tar.gz gentoo-d266c61788fe8457e0ed0d7674bcb5d963692e8c.tar.bz2 gentoo-d266c61788fe8457e0ed0d7674bcb5d963692e8c.zip | |
toolchain.eclass: drop info/dir index, bug #672408
As explained by Zac in #672408 prepinfo() was used to drop 'info/dir'
index to allow portage regenerate it.
gcc package does not always install 'info/dir' files (USE-dependent).
This causes nondeterminism for 'info/dir' to be owned or be an orphan
file.
This change drops 'info/dir' unconditionally to avoid owned/orphan
collisions and always make it an orphan file.
Reported-by: Michal Jakubowski
Bug: https://bugs.gentoo.org/672408
Bug: https://bugs.gentoo.org/587316
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 94f2d3369af8..19564a0652eb 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1851,6 +1851,14 @@ toolchain_src_install() { fi fi fi + + # portage regenerates 'dir' files on it's own: bug #672408 + # Drop 'dir' files to avoid collisions. + if [[ -f "${D}${DATAPATH}"/info/dir ]]; then + einfo "Deleting '${D}${DATAPATH}/info/dir'" + rm "${D}${DATAPATH}"/info/dir || die + fi + # prune empty dirs left behind find "${ED}" -depth -type d -delete 2>/dev/null |