| 1 |
commit: d0d5260bc23edc1ef41fa0150767e9a4e848eb78 |
| 2 |
Author: Ben Kohler <bkohler <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Oct 11 17:26:52 2017 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 29 17:31:58 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d0d5260b |
| 7 |
|
| 8 |
kmerge.sh: ensure bc is installed when kerncache is active |
| 9 |
|
| 10 |
When options=kerncache is on, catalyst finds cached kernel sources and |
| 11 |
generates a package.provided entry so these sources aren't reinstalled. |
| 12 |
However, this causes all RDEPEND in *-sources to be ignored. This patch |
| 13 |
forces dependencies to be installed beforepackage.provided is generated. |
| 14 |
|
| 15 |
targets/support/kmerge.sh | 4 ++++ |
| 16 |
1 file changed, 4 insertions(+) |
| 17 |
|
| 18 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
| 19 |
index fc066cc0..f29cd385 100755 |
| 20 |
--- a/targets/support/kmerge.sh |
| 21 |
+++ b/targets/support/kmerge.sh |
| 22 |
@@ -195,6 +195,10 @@ then |
| 23 |
fi |
| 24 |
fi |
| 25 |
|
| 26 |
+ # install dependencies of kernel sources ahead of time in case |
| 27 |
+ # package.provided generated below causes them not to be (re)installed |
| 28 |
+ PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse --onlydeps" run_merge "${clst_ksource}" || exit 1 |
| 29 |
+ |
| 30 |
# Create the kerncache directory if it doesn't exists |
| 31 |
mkdir -p /tmp/kerncache/${clst_kname} |
Archives