Patchwork [1/1] kernel.bbclass: fix hardlink test

login
register
mail settings
Submitter Bruce Ashfield
Date Nov. 16, 2013, 6:17 a.m.
Message ID <c40fe100ff9ab3fcc1374013b882e3e946eb7d87.1384582409.git.bruce.ashfield@windriver.com>
Download mbox | patch
Permalink /patch/61861/
State Accepted
Commit d7ccfc7605f1eb61511b1b2b8db4ac689ce6a468
Headers show

Comments

Bruce Ashfield - Nov. 16, 2013, 6:17 a.m.
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>
---
 meta/classes/kernel.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 624b151..6959aa1 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