Skip to contentSkip to conversation

kernel.bbclass: fix hardlink test

PATCH New Bruce Ashfield 1 participant 2 messages Nov 16, 2013

lore
Share & tools
lore
#0 lore raw

cover kernel.bbclass: fix hardlink test

Richard/Saul,

It's sometimes nice when you get to clean up your own mess. While all my build tests passed on Friday to fix the "vmlinux" and "usr/src/kernel/vmlinux" are the same file, it was because the install failed in all cases, not just the one we wanted to prevent.

I bumped into a build failure when assembling xen hdmimage, since it could find the bzImage in the kernel source directory. I tracked it back to the hardlink fix, and on debugging, noticed that the test wasn't good on all machines.

An extra space fixes everything up, and I'm now able to build my xen image AND build linux-yocto for qemumips, and another other target you should favour.

Take this for spin .. since it is late at night when I did this, but it should be fine :)

Cheers,

Bruce

The following changes since commit db7f8d4114267ed34c19dc66dd56c2372354b43f:

kernel.bbclass: test for hardlinks before installing (2013-11-15 15:27:08 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (1):
kernel.bbclass: fix hardlink test

 meta/classes/kernel.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 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.

---
 meta/classes/kernel.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/kernel.bbclass +1 -1
index 624b151..6959aa1 100644
@@ -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
Signature · 1 line
1.8.1.2