[oe-commits] Bruce Ashfield : kernel.bbclass: fix hardlink test

git at git.openembedded.org git at git.openembedded.org
Sat Nov 16 10:04:20 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: 0704648e9dfd2897f6f54773a0e7d2762117970c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0704648e9dfd2897f6f54773a0e7d2762117970c

Author: Bruce Ashfield <bruce.ashfield at windriver.com>
Date:   Sat Nov 16 01:17:24 2013 -0500

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 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/kernel.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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



More information about the Openembedded-commits mailing list