Bug 137712 – x11-drm/x11-drm-20060608 - fixup for linux 2.6.17

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Alon Bar-Lev (RETIRED) 2006-06-23 04:54:07 UTC]

Hello,

1. Strange fix (I don't know how it worked so far: is_kernel->kernel_is).
2. TRUE, FALSE addition.

[Comment 1 Alon Bar-Lev (RETIRED) 2006-06-23 04:54:37 UTC]

Created attachment 89892 [details, diff]
x11-drm.diff

Patch

[Comment 2 Donnie Berkholz (RETIRED) 2006-08-17 17:53:55 UTC]

(In reply to comment #0)
> Hello,
> 
> 1. Strange fix (I don't know how it worked so far: is_kernel->kernel_is).

Came from x11.eclass before others existed to do the same.

> 2. TRUE, FALSE addition.

Still needed? ChangeLog says it works on .17.

[Comment 3 Todd Merrill 2006-08-20 23:06:20 UTC]

(In reply to comment #2)
> (In reply to comment #0)
> > 2. TRUE, FALSE addition.
> 
> Still needed? ChangeLog says it works on .17.

I haven't needed the bool.patch for any 2.6.17 variants or any of the 2.6.18 release candidates.  However, in my experience, the is_kernel to kernel_is changes are needed in order for x11-drm-20060608 to compile with the 2.6.18 release candidates, otherwise I get these during the emerge process:

 * Found kernel source directory:
 *     /usr/src/linux
 * Found sources for kernel version:
 *     2.6.18-rc4
/usr/portage/eclass/x11.eclass: line 70: [: : integer expression expected
/usr/portage/eclass/x11.eclass: line 70: [: : integer expression expected

And this:

 * Installing DRM...
/usr/portage/eclass/x11.eclass: line 70: [: : integer expression expected
mkdir -p /var/tmp/portage/x11-drm-20060608/image//lib/modules/2.6.18-rc4/x11-drm
cp -p radeon.ko /var/tmp/portage/x11-drm-20060608/image//lib/modules/2.6.18-rc4/x11-drm

And lastly:

>>> Merging x11-base/x11-drm-20060608 to /
--- /etc/
--- /etc/modules.d/
>>> /etc/modules.d/x11-drm
>>> /etc/modules.d/.keep_x11-base_x11-drm-0
--- /usr/
--- /usr/bin/
>>> /usr/bin/dristat
>>> /usr/bin/drmstat
--- /usr/share/
--- /usr/share/doc/
>>> /usr/share/doc/x11-drm-20060608/
>>> /usr/share/doc/x11-drm-20060608/README.drm.gz
--- /lib/
--- /lib/modules/
--- /lib/modules/2.6.18-rc4/
--- /lib/modules/2.6.18-rc4/x11-drm/
>>> /lib/modules/2.6.18-rc4/x11-drm/radeon.ko

Notice that drm.ko is not being copied over, even though it has been built.

ls -l /lib/modules/2.6.18-rc4/x11-drm/
total 104
-rw-r--r-- 1 root root 101127 08/21/06 02:04 radeon.ko

ls -l /var/tmp/portage/x11-drm-20060608/work/drm/linux-core/drm.ko 
-rw-r--r-- 1 root root 76991 08/21/06 02:04 /var/tmp/portage/x11-drm-20060608/work/drm/linux-core/drm.ko

In my case, simply changing all instances of is_kernel to kernel_is results in a sucessful build with none of the problems mentioned above.

[Comment 4 Mike Russo 2006-08-27 19:13:13 UTC]

> > 2. TRUE, FALSE addition.
> 
> Still needed? ChangeLog says it works on .17.
> 

I get the problem on 2.6.17-gentoo-r6:

... from earlier in the build:
make -C /usr/src/linux  SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules
make[1]: Entering directory `/usr/src/linux-2.6.17-gentoo-r6'
  CC [M]  /var/tmp/portage/x11-drm-20060608/work/drm/linux-core/drm_auth.o
...
  CC [M]  /var/tmp/portage/x11-drm-20060608/work/drm/linux-core/drm_sman.o
/var/tmp/portage/x11-drm-20060608/work/drm/linux-core/drm_sman.c: In function 'drm_sman_mm_allocate':
/var/tmp/portage/x11-drm-20060608/work/drm/linux-core/drm_sman.c:94: error: 'TRUE' undeclared (first use in this function)

I'll try applying this patch to see if it helps.

[Comment 5 Mike Russo 2006-08-27 20:28:13 UTC]

After applying the patch and digesting the ebuild, I built and installed x11-drm successfully.

[Comment 6 Bryan Stine (RETIRED) 2006-09-06 21:52:35 UTC]

The patch has been added to 20060608's patchball (version 0.2) and is_kernel has been changed to kernel_is in all the snapshot ebuilds.

Thanks.