commit: 354e66075d711f757c94ae8a27a5e9d28365456c
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri May 16 19:14:35 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri May 16 19:14:35 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=354e6607
kmerge.sh: fix lack of exported clst_make_conf variable
This patch fixes commit:
63e36535a830364948a3ee258e7ab1e13905d6da
Fix merging kernel without kerncache enabled.
Guy Martin <gmsoft <AT> gentoo.org> (Wed Feb 5 02:39:59 2014)
Commited by me, cherry-picked from the 3.0 branch.
Also replace the hard-coded sed make.conf path.
---
targets/support/kmerge.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index c1b6a35..9786fdd 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -263,16 +263,18 @@ else
fi
fi
+# temp define this until make.conf path is exported to the bash environment
+export clst_make_conf=/etc/portage/make.conf
# Update USE flag in make.conf
-[ -e ${clst_make_conf} ] && \
+[[ -e ${clst_make_conf} ]] && \
echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> ${clst_make_conf}
make_destpath
build_kernel
-sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" /etc/portage/make.conf
+sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" ${clst_make_conf}
# grep out the kernel version so that we can do our modules magic
VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
