Attachment 1692 Details for Bug 2277 – Check kernel version

[patch] Check kernel version

diff.fontfix_alan (text/plain), 3.65 KB, created by Egbert Eich on 2005-01-17 08:53:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2005-01-17 08:53:38 UTC

Size: 3.65 KB

patch

obsolete

>? diff.fontfix
>Index: config/cf/linux.cf
>===================================================================
>RCS file: /home/eich/cvs/xc/config/cf/linux.cf,v
>retrieving revision 1.1.1.60.2.1
>diff -u -r1.1.1.60.2.1 linux.cf
>--- config/cf/linux.cf	17 Jan 2005 16:43:09 -0000	1.1.1.60.2.1
>+++ config/cf/linux.cf	17 Jan 2005 16:43:31 -0000
>@@ -333,6 +333,13 @@
> # define DoOSFontRestore YES
> #endif
> 
>+/* Should we check the OS version to determine if the kernel supports it? */
>+#if DoOSFontRestore
>+# ifndef FontRestoreCheckOsVersion
>+#  define FontRestoreCheckOsVersion YES
>+# endif
>+#endif
>+
> /* The DRM module requires kernel services that appeared in late 2.1.x
>    kernels and are known to be present in 2.2.x kernels. */
> #ifndef BuildXF86DRI
>Index: programs/Xserver/hw/xfree86/os-support/linux/Imakefile
>===================================================================
>RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile,v
>retrieving revision 1.1.1.16.8.1
>diff -u -r1.1.1.16.8.1 Imakefile
>--- programs/Xserver/hw/xfree86/os-support/linux/Imakefile	17 Jan 2005 16:43:09 -0000	1.1.1.16.8.1
>+++ programs/Xserver/hw/xfree86/os-support/linux/Imakefile	17 Jan 2005 16:43:31 -0000
>@@ -50,7 +50,10 @@
> #if DoOSFontRestore
> FONTSRC=lnx_font.c
> FONTOBJ=lnx_font.o
>-FONT_DEFINES=-DDO_OS_FONTRESTORE
>+# ifndef FontRestoreCheckOsVersion
>+#  define FontRestoreCheckOsVersion YES
>+# endif
>+FONT_DEFINES=-DDO_OS_FONTRESTORE -DCHECK_OS_VERSION=FontRestoreCheckOsVersion
> #endif
> 
> SRCS = lnx_init.c lnx_video.c lnx_io.c libc_wrapper.c bios_mmap.c \
>Index: programs/Xserver/hw/xfree86/os-support/linux/lnx_font.c
>===================================================================
>RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/os-support/linux/Attic/lnx_font.c,v
>retrieving revision 1.1.2.1
>diff -u -r1.1.2.1 lnx_font.c
>--- programs/Xserver/hw/xfree86/os-support/linux/lnx_font.c	17 Jan 2005 16:43:09 -0000	1.1.2.1
>+++ programs/Xserver/hw/xfree86/os-support/linux/lnx_font.c	17 Jan 2005 16:43:31 -0000
>@@ -112,10 +112,16 @@
> 
> }
> 
>+#define VERSION_LEN 31
>+
> Bool
> lnx_savefont(void)
> {
>     unsigned char *fontdata;
>+#if CHECK_OS_VERSION
>+    char kernel_version[VERSION_LEN + 1];
>+    int k_major, k_minor, k_release;
>+#endif
>     int size;
>     int fd;
>     int width = 32, height = 32, charcount = 2048;
>@@ -123,6 +129,29 @@
> #ifdef DEBUG
>     ErrorF("SAVE font\n");
> #endif
>+
>+#if CHECK_OS_VERSION
>+    /* Check if the kernel has full support for this */
>+    if ((fd = open ("/proc/sys/kernel/osrelease",O_RDONLY)) == -1) {
>+	close (fd);
>+	return TRUE;
>+    }
>+    size = read(fd, kernel_version, VERSION_LEN);
>+    close (fd);
>+
>+    if (size < 0)
>+	return TRUE;
>+
>+    size = sscanf(kernel_version, "%d.%d.%d",&k_major,&k_minor,&k_release);
>+    if (size < 3 
>+	|| (k_major < 2) 
>+	|| ((k_major == 2) 
>+	    && ((k_minor < 6) 
>+		|| ( k_minor == 6 
>+		     && k_release < 11))))
>+	return TRUE;
>+#endif
>+							    
>     /* if we are in fbdev mode we don't bother saving fonts */
>     if ((fd = open ("/dev/fb0",O_RDWR)) != -1) {
> 	close (fd);
>Index: programs/Xserver/hw/xfree86/vgahw/Imakefile
>===================================================================
>RCS file: /home/eich/cvs/xc/programs/Xserver/hw/xfree86/vgahw/Imakefile,v
>retrieving revision 1.1.1.3.90.1
>diff -u -r1.1.1.3.90.1 Imakefile
>--- programs/Xserver/hw/xfree86/vgahw/Imakefile	17 Jan 2005 16:43:09 -0000	1.1.1.3.90.1
>+++ programs/Xserver/hw/xfree86/vgahw/Imakefile	17 Jan 2005 16:43:31 -0000
>@@ -15,7 +15,8 @@
> MODOBJ = vgaHWmodule.o
> #endif
> 
>-#if DoOSFontRestore
>+#if DoOSFontRestore && \
>+	(defined(FontRestoreCheckOsVersion) && !FontRestoreCheckOsVersion)
> FONT_DEFINES = -DSAVE_FONT1=0 -DSAVE_FONT2=0 -DSAVE_TEXT=0
> #endif
>

Actions: View | Splinter Review

Attachments on bug 2277: 1679 | 1692

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.