Re: XFree, an on-going story (plus a newbie question)
On Thu, Sep 21, 2000 at 02:20:37PM -0500, Stephen R. Gore wrote:
> >
> > Also, the build system needs to remain intact, as we need all packages of
> > it for now.
> >
> > Please let me know if you think that this is not feasible for the xfree86-1
> > package. I would have to rethink my strategy.
>
> I think it's quite feasible. The only reason I felt it desirable to prune
> the source tree was that most of it would be totally unused. This is not
> the case, obviously.
>
> In fact, it makes my job easier at present :) Simply turning off parts of
> the build process is much simpler than identifying what files are no longer
> used. We can simply turn them back on again in the HURD build.
Great! But probably not disable them by default, but make a special case for
linux, so it will still work for the Hurd (and you need to verify that it
works under Linux anyway). Just protect those parts you want to switch OFF
with
ifeq($(DEB_HOST_GNU_SYSTEM), gnu)
foobar
endif
And have
DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
at the top of debian/rules.
We can probably simplify the build process later. For example, I wouldn't
mind if you strip the libc5 compat stuff out entirely.
Attached is another patch that fixes a grave bug in the keyboard handling. I
don't open a new report for it. Please add it as
062_GNU_kdb_event_handling.diff or whatever.
Thanks,
Marcus
--
`Rhubarb is no Egyptian god.' Debian http://www.debian.org Check Key server
Marcus Brinkmann GNU http://www.gnu.org for public PGP Key
Marcus.Brinkmann@ruhr-uni-bochum.de, marcus@gnu.org PGP Key ID 36E7CD09
http://homepage.ruhr-uni-bochum.de/Marcus.Brinkmann/ brinkmd@debian.org
diff -ru xc.old/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile
--- xc.old/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile Tue Dec 22 13:27:33 1998
+++ xc/programs/Xserver/hw/xfree86/os-support/hurd/Imakefile Thu Sep 21 21:14:56 2000
@@ -6,10 +6,10 @@
BIOS_MOD = bios_mmap
-SRCS = hurd_init.c hurd_video.c hurd_io.c $(BIOS_MOD).c mapVT_noop.c std_mseEv.c std_kbdEv.c\
+SRCS = hurd_init.c hurd_video.c hurd_io.c $(BIOS_MOD).c mapVT_noop.c std_mseEv.c \
VTsw_noop.c posix_tty.c
-OBJS = hurd_init.o hurd_video.o hurd_io.o $(BIOS_MOD).o mapVT_noop.o std_mseEv.o std_kbdEv.o\
+OBJS = hurd_init.o hurd_video.o hurd_io.o $(BIOS_MOD).o mapVT_noop.o std_mseEv.o \
VTsw_noop.o posix_tty.o
INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
@@ -18,7 +18,6 @@
SubdirLibraryRule($(OBJS))
NormalLibraryObjectRule()
-ObjectFromSpecialSource(std_kbdEv,../shared/std_kbdEv,/**/)
ObjectFromSpecialSource(std_mseEv,../shared/std_mseEv,/**/)
ObjectFromSpecialSource(mapVT_noop,../shared/mapVT_noop,/**/)
ObjectFromSpecialSource(VTsw_noop,../shared/VTsw_noop,/**/)
diff -ru xc.old/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c
--- xc.old/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c Tue Dec 22 13:27:34 1998
+++ xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_io.c Thu Sep 21 21:26:24 2000
@@ -288,3 +290,11 @@
if( ioctl( xf86Info.consoleFd, _IOW('k', 1, int),&data) < 0)
FatalError("can't reset keyboard mode (%s)\n",strerror(errno));
}
+void
+xf86KbdEvents()
+{
+ kd_event ke;
+ while( read(xf86Info.consoleFd, &ke, sizeof(ke)) == sizeof(ke) )
+ xf86PostKbdEvent(ke.value.sc);
+}
+
Reply to: