On 11/02/2012 04:08 PM, John Morris wrote:
Hi Michael,
On 11/02/2012 10:18 AM, Michael Haberler wrote:
I have now integrated the RT-PREEMPT branch as provided by Charles,
added the now-working Xenomai-userland thread style, and massaged
configure to deal with all of this. The Xenomai-kernel branch I
reported about yesterday is fully integrated. If you played with
that branch, it's safe to switch.
this adds the following scenarios:
./configure --with-threads=xenomai-user
[...]
I'm compiling up a Xenomai-patched RPM and utilities right now, and
will report back with results.
There's a small problem when building LinuxCNC --with-xenomai-kernel
under a kernel other than the one built against. The two-liner patch
here fixes it.
It's slow going, getting all this packaged up for el6. The
kernel-xenomai and xenomai RPMs are nearly done. LinuxCNC itself needed
a few required packages to be rebuilt from fedora for el6.
Astonishingly, asciidoc, which LinuxCNC requires v. 8.5 or higher, is
still at v. 8.4.5 for even fedora rawhide, and the package hasn't been
touched since 2009.
I'm guessing there aren't any RH users here on the list, but when the
packages become available sometime this week in my public repo, I'll
post a link.
It might actually make sense someday to get an el6 version of the
rt-preempt package into EPEL, since RH ships an official rt-preempt
kernel as part of the MRG project. That will require an asciidoc86
package (latest is v. 8.6.8) in EPEL that doesn't clobber the existing
asciidoc package, with /usr/bin/{asciidoc86,a2x86}, /etc/asciidoc86,
etc. Ugh.
John
diff -up linuxcnc-2.6.0.pre0/src/Makefile.ksrc_fix linuxcnc-2.6.0.pre0/src/Makefile
--- linuxcnc-2.6.0.pre0/src/Makefile.ksrc_fix 2012-11-03 21:25:29.000000000 -0500
+++ linuxcnc-2.6.0.pre0/src/Makefile 2012-11-05 23:08:15.000000000 -0600
@@ -380,7 +380,8 @@ endif
ifeq ($(BUILD_SYS),kbuild)
modules:
$(PYTHON) modsilent.py $(MAKE) KBUILD_EXTRA_SYMBOLS=$(moduledir)/Module.symvers -C $(KERNELDIR) SUBDIRS=`pwd` CC=$(CC) V=$(BUILD_VERBOSE) modules
- (cd rtapi/xeno_math; $(MAKE) BASEPWD=$(BASEPWD) V=$(BUILD_VERBOSE) modules)
+ (cd rtapi/xeno_math; $(MAKE) BASEPWD=$(BASEPWD) \
+ KERNELDIR=$(KERNELDIR) V=$(BUILD_VERBOSE) modules)
-cp rtapi/xeno_math/xeno_math.ko ../rtlib
-cp Module.symvers *$(MODULE_EXT) ../rtlib/
endif
diff -up linuxcnc-2.6.0.pre0/src/rtapi/xeno_math/Makefile.ksrc_fix linuxcnc-2.6.0.pre0/src/rtapi/xeno_math/Makefile
--- linuxcnc-2.6.0.pre0/src/rtapi/xeno_math/Makefile.ksrc_fix 2012-11-03 21:25:29.000000000 -0500
+++ linuxcnc-2.6.0.pre0/src/rtapi/xeno_math/Makefile 2012-11-05 23:06:54.000000000 -0600
@@ -61,10 +61,9 @@ xeno_math-objs += s_copysign.o
# xeno_math-objs += w_sinh.o
# xeno_math-objs += w_sqrt.o
-KSRC ?= /lib/modules/$(shell uname -r)/build
PWD := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
modules::
- $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules V=$(V)
+ $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules V=$(V)
------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
