[gentoo-commits] proj/catalyst:unversioned-cachedir commit in: targets/support/

[gentoo-commits] proj/catalyst:unversioned-cachedir commit in: targets/support/

[Robin H. Johnson]

commit:     d0d5260bc23edc1ef41fa0150767e9a4e848eb78
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Wed Oct 11 17:26:52 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 17:31:58 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d0d5260b

kmerge.sh: ensure bc is installed when kerncache is active

When options=kerncache is on, catalyst finds cached kernel sources and
generates a package.provided entry so these sources aren't reinstalled.
However, this causes all RDEPEND in *-sources to be ignored.  This patch
forces dependencies to be installed beforepackage.provided is generated.

 targets/support/kmerge.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index fc066cc0..f29cd385 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -195,6 +195,10 @@ then
 		fi
 	fi
 
+	# install dependencies of kernel sources ahead of time in case
+	# package.provided generated below causes them not to be (re)installed
+	PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse --onlydeps" run_merge "${clst_ksource}" || exit 1
+
 	# Create the kerncache directory if it doesn't exists
 	mkdir -p /tmp/kerncache/${clst_kname}