Package: linux-patch-xenomai Version: 2.5.4-1 Tags: patch Building a kernel patched with adeos-ipipe-2.6.34-x86-2.7-02.patch fails to build with: kernel/xenomai/arch/generic/hal.c:47:29: error: asm/xenomai/hal.h: No such file or directory kernel/xenomai/arch/generic/hal.c:77: error: ‘RTHAL_NR_CPUS’ undeclared here (not in a function) kernel/xenomai/arch/generic/hal.c:79: error: ‘RTHAL_NR_APCS’ undeclared here (not in a function) kernel/xenomai/arch/generic/hal.c:89: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘rthal_apc_lock’ kernel/xenomai/arch/generic/hal.c:93: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘rthal_domain’ kernel/xenomai/arch/generic/hal.c:97: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘rthal_trap_handler’
The arch-specific asm include files are patched to the wrong (old) location in the kernel tree. The kernel build-system symlinked the old to the new location until 2.6.32, this was removed for 2.6.33 [1]. So, kernels patched with the current adeos patches for 2.6.33 and 2.6.34 will not build (tested only 2.6.34-x86). The adeos-patches for older kernels (<2.6.33) contained in the current package should still work with the attached patch (tested with 2.6.32-x86). This problem was discussed on the xenomai-help mailing list [2]. The attached patch fixes the problem. Regards, Stefan [1] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=c95fa08a3e17c3f2983c4cbf409f5c9ae47b7dec [2] https://mail.gna.org/public/xenomai-help/2010-08/msg00188.html
diff --git a/debian/prepare-patch.sh b/debian/prepare-patch.sh
index 296638d..6ca734b 100755
--- a/debian/prepare-patch.sh
+++ b/debian/prepare-patch.sh
@@ -112,7 +112,7 @@ for linux_arch in $supported_arch ; do
esac
patch_link r m ksrc/arch/$base_arch arch/$linux_arch/xenomai
- patch_link r n include/asm-$base_arch include/asm-$linux_arch/xenomai
+ patch_link r n include/asm-$base_arch arch/$linux_arch/include/asm/xenomai
p="+drivers-\$(CONFIG_XENOMAI) += arch/$linux_arch/xenomai/"
echo $p | patch_append arch/$linux_arch/Makefile
signature.asc
Description: OpenPGP digital signature
