Your message dated Sun, 14 Feb 2010 16:02:58 +0000 with message-id <e1nggvy-00010e...@ries.debian.org> and subject line Bug#569721: fixed in xenomai 2.5.1-3 has caused the Debian Bug report #569721, regarding Hard-coded line numbers in generated kernel patches break kernelconfiguration to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 569721: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=569721 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: linux-patch-xenomai Version: 2.5.1-2 Severity: grave Hello, I have tried compiling Linux 2.6.32.7 with the patches provided by the new version of the linux-patch-xenomai package. Unfortunately, I noticed that running "make defconfig" or "make silentoldconfig" print the following errors messages and make exits with an error: === 8< === *** Default configuration is based on 'i386_defconfig' arch/x86/Kconfig:74: unexpected option "select" arch/x86/Kconfig:75: unexpected option "select" arch/x86/Kconfig:76: unexpected option "select" arch/x86/Kconfig:77: unexpected option "select" arch/x86/Kconfig:78: unexpected option "select" arch/x86/Kconfig:79: unexpected option "select" arch/x86/Kconfig:80: unexpected option "select" arch/x86/Kconfig:81: unexpected option "select" arch/x86/Kconfig:82: unexpected option "select" arch/x86/Kconfig:83: unexpected option "select" arch/x86/Kconfig:84: unexpected option "select" arch/x86/Kconfig:85: unexpected option "select" make[1]: *** [defconfig] Error 1 make: *** [defconfig] Error 2 === >8 === Please note that no such errors occur with the vanilla Xenomai 2.5.1 source code. As one can see from the errors, the source of this problem is the arch/x86/Kconfig file. Here are the relevant lines: === 8< === ### Arch settings config X86 def_bool y select HAVE_AOUT if X86_32 select HAVE_READQ select HAVE_WRITEQ select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_IDE select HAVE_OPROFILE select HAVE_PERF_EVENTS if (!M386 && !M486) select HAVE_IOREMAP_PROT select HAVE_KPROBES select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_FRAME_POINTERS select HAVE_DMA_ATTRS select HAVE_KRETPROBES select HAVE_FTRACE_MCOUNT_RECORD select HAVE_DYNAMIC_FTRACE select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_GRAPH_FP_TEST select HAVE_FUNCTION_TRACE_MCOUNT_TEST select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE menu "Real-time sub-system" comment "WARNING! You enabled APM, CPU Frequency scaling or ACPI 'processor'" depends on APM || CPU_FREQ || ACPI_PROCESSOR comment "option. These options are known to cause troubles with Xenomai." depends on APM || CPU_FREQ || ACPI_PROCESSOR comment "NOTE: Xenomai conflicts with PC speaker support." depends on !X86_TSC && X86 && INPUT_PCSPKR comment "(menu Device Drivers/Input device support/Miscellaneous devices)" depends on !X86_TSC && X86 && INPUT_PCSPKR comment "NOTE: Xenomai needs either X86_LOCAL_APIC enabled or HPET_TIMER disabled." depends on (!X86_LOCAL_APIC || !X86_TSC) && X86 && HPET_TIMER comment "(menu Processor type and features)" depends on (!X86_LOCAL_APIC || !X86_TSC) && X86 && HPET_TIMER config XENOMAI depends on ((X86_TSC || !X86 || !INPUT_PCSPKR) && (!HPET_TIMER || !X86 || (X86_LOCAL_APIC && X86_TSC))) bool "Xenomai" default y select IPIPE help Xenomai is a real-time extension to the Linux kernel. Note that Xenomai relies on Adeos interrupt pipeline (CONFIG_IPIPE option) to be enabled, so enabling this option selects the CONFIG_IPIPE option. source "arch/x86/xenomai/Kconfig" endmenu select HAVE_SYSCALL_TRACEPOINTS select HAVE_KVM select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK select HAVE_GENERIC_DMA_COHERENT if X86_32 select HAVE_EFFICIENT_UNALIGNED_ACCESS select USER_STACKTRACE_SUPPORT select HAVE_DMA_API_DEBUG select HAVE_KERNEL_GZIP select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_LZMA select HAVE_ARCH_KMEMCHECK === >8 === As you can see, the options for "config X86" are cut off in the middle, and then the menu for Xenomai related settings is inserted. Then, after Xenomai settings menu, the options for X86 continue. This suggests a problem with the generated Xenomai patch. After having a look at the Debian package, I noticed that the problem is caused by the following lines in "debian/prepare-patch.sh" === 8< === 77 diff_addons() { 78 lines=`(echo ; echo ; cat $xenomai_root/scripts/Kconfig.frag) | wc -l` 79 80 echo "--- linux/arch/$linux_arch/Kconfig 1970-01-01 01:00:00.000000000 +0100" >> $patch_file 81 echo "+++ linux-patched/arch/$linux_arch/Kconfig 2007-03-06 17:55:58.000000000 +0000" >> $patch_file 82 echo "@@ -40,2 +40,$lines @@" >> $patch_file 83 echo " source \"init/Kconfig\"" >> $patch_file 84 sed -e "s,@LINUX_ARCH@,$linux_arch,g" $xenomai_root/scripts/Kconfig.frag | sed 's/^/+/' >> $patch_file 85 echo " " >> $patch_file 86 } === >8 === As you can see, the line number 40 is hard-coded to the patch. Unfortunately, this ends up putting the Xenomai related options right in the middle of "config X86" options, which causes the errors shown above. Then I looked at how Xenomai (upstream) handles this issue. I saw that it also uses hard-coded line numbers, however in this case they use a very large number (1400) as the initial line number so the new lines of the patch get inserted to the *end* of the init/Kconfig file. I have not come up with a solution to this problem, but I believe the solution should involve hard-coding "safer" line numbers into the patch, like upstream does. I chose "grave" as the severity as I believe that this bug makes the "linux-patch-xenomai" package unusuable for its main purpose. Dear Roland Stigge, I know the following request should be separate wishlist bug, but can you please use a patch system like quilt or something similar so it would be easy to see what changes you made to the original Xenomai source code without having to dig through the diff.gz file? Regards, M. Vefa Bicakci
--- End Message ---
--- Begin Message ---Source: xenomai Source-Version: 2.5.1-3 We believe that the bug you reported is fixed in the latest version of xenomai, which is due to be installed in the Debian FTP archive: libxenomai-dev_2.5.1-3_i386.deb to main/x/xenomai/libxenomai-dev_2.5.1-3_i386.deb libxenomai1_2.5.1-3_i386.deb to main/x/xenomai/libxenomai1_2.5.1-3_i386.deb linux-patch-xenomai_2.5.1-3_all.deb to main/x/xenomai/linux-patch-xenomai_2.5.1-3_all.deb xenomai-doc_2.5.1-3_all.deb to main/x/xenomai/xenomai-doc_2.5.1-3_all.deb xenomai-runtime_2.5.1-3_i386.deb to main/x/xenomai/xenomai-runtime_2.5.1-3_i386.deb xenomai_2.5.1-3.diff.gz to main/x/xenomai/xenomai_2.5.1-3.diff.gz xenomai_2.5.1-3.dsc to main/x/xenomai/xenomai_2.5.1-3.dsc A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 569...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Roland Stigge <sti...@antcom.de> (supplier of updated xenomai package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.8 Date: Sun, 14 Feb 2010 13:35:15 +0100 Source: xenomai Binary: xenomai-runtime linux-patch-xenomai libxenomai1 libxenomai-dev xenomai-doc Architecture: source all i386 Version: 2.5.1-3 Distribution: unstable Urgency: low Maintainer: Roland Stigge <sti...@antcom.de> Changed-By: Roland Stigge <sti...@antcom.de> Description: libxenomai-dev - Headers and static libs for Xenomai libxenomai1 - Shared libraries for Xenomai linux-patch-xenomai - Linux kernel patches for Xenomai xenomai-doc - Xenomai documentation xenomai-runtime - Xenomai runtime utilities Closes: 569721 Changes: xenomai (2.5.1-3) unstable; urgency=low . * xenomai-runtime: Replaced "xenomai-" prefixed executables with wrapper script /usr/bin/xeno to call original executables from /usr/lib/xenomai/, e.g. "xeno latency" * debian/prepare-patch.sh: Synchronized from upstream (Closes: #569721) * Removed 2.6.24 adeos-ipipe patches * Enabled patching/use of Debian's kernel (2.6.32) Checksums-Sha1: 5073407a86199fefaca919e22fc7f5793d37f68a 1126 xenomai_2.5.1-3.dsc cf816a9e32b20a7f1acd1f8bd80829e6f6dbbde3 169000 xenomai_2.5.1-3.diff.gz f0c635054fcd0cefc8fe23d542982c53a435f759 9600750 linux-patch-xenomai_2.5.1-3_all.deb f60f0546e2d9a656f14ef3b769534eabd34d6c66 6819510 xenomai-doc_2.5.1-3_all.deb 798349f86f94a2f4a5da0395d2c6ac1a8049f5ae 129008 xenomai-runtime_2.5.1-3_i386.deb 9fc808787c8a8602cf878fab087e1ae5692d4187 97182 libxenomai1_2.5.1-3_i386.deb 3a3c0a9f97c4d7f1fdbbcc1c6350077761269889 359950 libxenomai-dev_2.5.1-3_i386.deb Checksums-Sha256: fd1bdbfc5e206f808b47dbad1391358776fdbfd89b58466d48376919d895633a 1126 xenomai_2.5.1-3.dsc 2ad145880fe67e6cbf97421281896607c2338b013a192a6eaa36187fc3f005dc 169000 xenomai_2.5.1-3.diff.gz 8c20728d2a14e56d6eeab42cff3f3351585150f88bd8343eb8c0de7d2efa88df 9600750 linux-patch-xenomai_2.5.1-3_all.deb 37be15878f6eb091345c97947c2a3a6a0bf2ae84e17e91ea6c5534ae895b0d9f 6819510 xenomai-doc_2.5.1-3_all.deb 71cfb5557ad61f52de49c1365c8aa6df2e14602429cee52328ff09252682fd4d 129008 xenomai-runtime_2.5.1-3_i386.deb 5e84227e2635b722a085e2592455bd410e16c939f1c854602b5218472f6c76c5 97182 libxenomai1_2.5.1-3_i386.deb 7ce36067712a913b419ac979ba194abb0a49f9336b1a3e81687f8b700e530c91 359950 libxenomai-dev_2.5.1-3_i386.deb Files: 35d39b565904f586026414f854e98f9f 1126 devel extra xenomai_2.5.1-3.dsc 84d05cd1a1002d76cd5350651abb1fdf 169000 devel extra xenomai_2.5.1-3.diff.gz d3d6070f0b9e8f909ed4983e1613d47a 9600750 kernel extra linux-patch-xenomai_2.5.1-3_all.deb e3e804e48223b1af4745261f6352f66a 6819510 doc extra xenomai-doc_2.5.1-3_all.deb 795a1963d0f8c70512e8144712cd069f 129008 devel extra xenomai-runtime_2.5.1-3_i386.deb 234811f04b42651e92e5ccc2ae3cdbe4 97182 libs extra libxenomai1_2.5.1-3_i386.deb d8eece195aa8556b3f32e96bce1a7b32 359950 libdevel extra libxenomai-dev_2.5.1-3_i386.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iD8DBQFLeBhKcaH/YBv43g8RAuqEAKCNSqSbGa98Kp5YMC746vxbn/9+mgCfRfmp 8mH2Kc5PaZ7QpsbSfBVB/58= =QIi4 -----END PGP SIGNATURE-----
--- End Message ---
