From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: <54C1110C.7090803@siemens.com> Date: Thu, 22 Jan 2015 16:02:36 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <1537147.Wm9AbiuW5D@soho> <2296691.2JpS0rAJbA@soho> <20150122114038.GE23461@hermes.click-hack.org> <4743020.6q5RsBy8Ia@soho> <54C0F262.6010806@siemens.com> <20150122144930.GL30245@csclub.uwaterloo.ca> <20150122145624.GF26731@hermes.click-hack.org> In-Reply-To: <20150122145624.GF26731@hermes.click-hack.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Xenomai] Xenomai-3 creating debian packages List-Id: Discussions about the Xenomai project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gilles Chanteperdrix , Lennart Sorensen Cc: xenomai@xenomai.org On 2015-01-22 15:56, Gilles Chanteperdrix wrote: > On Thu, Jan 22, 2015 at 09:49:30AM -0500, Lennart Sorensen wrote: >> On Thu, Jan 22, 2015 at 01:51:46PM +0100, Jan Kiszka wrote: >>> See >>> http://git.xenomai.org/xenomai-jki.git/commit/?h=for-forge&id=5d104b1de84c8f4cbfb9d6b79cfaa633ef550e1c >>> for the fix. The bug was the improper variable use in the Kconfig >>> fragment. You only had to revert the whole commit as you were falling >>> back to the obsolete prepare-time patching then, which involved the script. >> >> What a handy change. That should make multiple architectures in one >> source tree finally possible without merge conflicts in that file. > > Unfortunately not, if you want to work with the I-pipe git, you can > not run prepare-kernel.sh in that directory anyway, otherwise you > could end-up commiting the Xenomai fragments with the I-pipe kernel. You can, we are doing this for ages. You only need to clean up your repo from the additional changes Xenomai introduced (a hand full) before moving HEAD (unless those files aren't affected by the move). Find my script below. Works with x86 and ARM so far, but only with one arch when using 2.6. The risk of committing preparation fragments is not higher than committing anything else accidentally that you may have added to test or debug a local version. When producing images, you don't have that problem and can automatize the cleaning. Jan --- rm -rf kernel/xenomai drivers/xenomai arch/x86/include/asm/xenomai arch/x86/xenomai include/xenomai include/asm-generic/xenomai arch/x86/include/ipipe 2>/dev/null rm -rf drivers/xenomai arch/arm/include/asm/xenomai arch/arm/xenomai arch/arm/include/ipipe 2>/dev/null rm -rf include/trace/events/xn_*.h include/trace/events/cobalt-*.h 2>/dev/null git checkout -- arch/x86/Makefile arch/arm/Makefile drivers/Makefile init/Kconfig kernel/Makefile -- Siemens AG, Corporate Technology, CT RTC ITP SES-DE Corporate Competence Center Embedded Linux