summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-11-16 01:17:24 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-16 10:03:33 +0000
commit0704648e9dfd2897f6f54773a0e7d2762117970c (patch)
tree89cd6889bbd0c67678062cbe14c10f147bf8ffa7
parent6a3b3e501c66733216ac43d3f020cfdb512dd640 (diff)
downloadopenembedded-core-contrib-0704648e9dfd2897f6f54773a0e7d2762117970c.tar.gz
openembedded-core-contrib-0704648e9dfd2897f6f54773a0e7d2762117970c.tar.bz2
openembedded-core-contrib-0704648e9dfd2897f6f54773a0e7d2762117970c.zip
kernel.bbclass: fix hardlink test
The commit [kernel.bbclass: test for hardlinks before installing] doesn't work on all build machines without a space between the ! and the test for hardlink equivalance. The build continues, while the test fails and no copy is made into the sysroot. Eventually tasks like build_hdimg will fail with the missing kernel with the root cause being less than obvious. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 624b15101e..6959aa1614 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -248,7 +248,7 @@ kernel_do_install() {
# Test to ensure that the output file and image type are not actually
# the same file. If hardlinking is used, they will be the same, and there's
# no need to install.
- ![ ${KERNEL_OUTPUT} -ef $kerneldir/${KERNEL_IMAGETYPE} ] && install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE}
+ ! [ ${KERNEL_OUTPUT} -ef $kerneldir/${KERNEL_IMAGETYPE} ] && install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE}
install -m 0644 System.map $kerneldir/System.map-${KERNEL_VERSION}
# Dummy Makefile so the clean below works