rpms/psb-kmod/devel 0001-psb-Declare-firmware.patch, NONE, 1.1 0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch, NONE, 1.1 0003-psb-Fix-framebuffer.patch, NONE, 1.1 psb-kernel-source-4.41.1-2.6.32.patch, NONE, 1.1 psb-kernel-source-4.41.1-agp_memory.patch, NONE, 1.1 psb-kernel-source-4.41.1-drmpsb.patch, NONE, 1.1 psb-kernel-source-4.41.1-i2c-intelfb.patch, NONE, 1.1 psb-kmd-4.34-current_euid.patch, NONE, 1.1 psb-kmod-4.41.1-2.6.34.patch, NONE, 1.1 psb-kmod-4.41.1_busid.patch, NONE, 1.1 psb-kmod-4.41.1_irqreturn.patch, NONE, 1.1 psb-kmod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Adam Williamson adamwill at rpmfusion.org
Fri Sep 17 12:39:24 CEST 2010


Author: adamwill

Update of /cvs/nonfree/rpms/psb-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6514/devel

Modified Files:
	.cvsignore sources 
Added Files:
	0001-psb-Declare-firmware.patch 
	0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch 
	0003-psb-Fix-framebuffer.patch 
	psb-kernel-source-4.41.1-2.6.32.patch 
	psb-kernel-source-4.41.1-agp_memory.patch 
	psb-kernel-source-4.41.1-drmpsb.patch 
	psb-kernel-source-4.41.1-i2c-intelfb.patch 
	psb-kmd-4.34-current_euid.patch psb-kmod-4.41.1-2.6.34.patch 
	psb-kmod-4.41.1_busid.patch psb-kmod-4.41.1_irqreturn.patch 
	psb-kmod.spec 
Log Message:
- import F-13 build to devel


0001-psb-Declare-firmware.patch:
 psb_drv.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE 0001-psb-Declare-firmware.patch ---
>From 0149839482b34dc7fe399c0cc7ee4747279b5eab Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg at redhat.com>
Date: Mon, 2 Aug 2010 11:16:29 -0400
Subject: [PATCH 1/3] psb: Declare firmware

---
 psb_drv.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/psb_drv.c b/psb_drv.c
index 2a2e8d4..618dfcd 100644
--- a/psb_drv.c
+++ b/psb_drv.c
@@ -55,6 +55,8 @@ int psb_init_yres;
 extern int SII_1392;
 #endif
 
+MODULE_FIRMWARE("msvdx_fw.bin");
+
 MODULE_PARM_DESC(debug, "Enable debug output");
 MODULE_PARM_DESC(clock_gating, "clock gating");
 MODULE_PARM_DESC(no_fb, "Disable FBdev");
-- 
1.7.2


0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch:
 psb_drv.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch ---
>From 7051c003142ed6340b14783d7e4dc6386ccfebe8 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg at redhat.com>
Date: Mon, 2 Aug 2010 11:41:54 -0400
Subject: [PATCH 2/3] psb: If not asking for debug is an error, I want to be right

---
 psb_drv.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/psb_drv.c b/psb_drv.c
index 618dfcd..76b4a01 100644
--- a/psb_drv.c
+++ b/psb_drv.c
@@ -265,7 +265,8 @@ static int psb_do_init(struct drm_device *dev)
 
 	int ret = -ENOMEM;
 
-	DRM_ERROR("Debug is 0x%08x\n", drm_psb_debug);
+	if (drm_psb_debug)
+		DRM_ERROR("Debug is 0x%08x\n", drm_psb_debug);
 
 	dev_priv->ta_mem_pages =
 	    PSB_ALIGN_TO(drm_psb_ta_mem_size * 1024, PAGE_SIZE) >> PAGE_SHIFT;
-- 
1.7.2


0003-psb-Fix-framebuffer.patch:
 psb_fb.c |   31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

--- NEW FILE 0003-psb-Fix-framebuffer.patch ---
>From 302d40a1664d1d1dbf8a3b0408736f091c397030 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg at redhat.com>
Date: Mon, 2 Aug 2010 13:03:21 -0400
Subject: [PATCH 3/3] psb: Fix framebuffer

---
 psb_fb.c |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/psb_fb.c b/psb_fb.c
index 72d1d14..2f10b90 100644
--- a/psb_fb.c
+++ b/psb_fb.c
@@ -420,8 +420,22 @@ static int psbfb_set_par(struct fb_info *info)
 	fb->depth = depth;
 
 	info->fix.line_length = fb->pitch;
-	info->fix.visual =
-	    (fb->depth == 8) ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_DIRECTCOLOR;
+
+	switch (fb->depth) {
+	case 8:
+		info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
+		break;
+	case 15:
+	case 16:
+		info->fix.visual = FB_VISUAL_DIRECTCOLOR;
+		break;
+	case 24:
+	case 32:
+		info->fix.visual = FB_VISUAL_TRUECOLOR;
+		break;
+	default:
+		BUG();
+	}
 
 	/* some fbdev's apps don't want these to change */
 	info->fix.smem_start = dev->mode_config.fb_base + fb->offset;
@@ -990,8 +1004,13 @@ void psbfb_resume(struct drm_device *dev)
  * Also, these should be the default vm ops for buffer object type fbs.
  */
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
+extern int drm_bo_vm_nopfn(struct vm_area_struct *vma,
+			   struct vm_fault *vmf );
+#else
 extern unsigned long drm_bo_vm_nopfn(struct vm_area_struct *vma,
 				     unsigned long address);
+#endif
 
 /*
  * This wrapper is a bit ugly and is here because we need access to a mutex
@@ -1001,6 +1020,7 @@ extern unsigned long drm_bo_vm_nopfn(struct vm_area_struct *vma,
  * recursive locking.
  */
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
 static unsigned long psbfb_nopfn(struct vm_area_struct *vma,
 				 unsigned long address)
 {
@@ -1015,7 +1035,7 @@ static unsigned long psbfb_nopfn(struct vm_area_struct *vma,
 	mutex_unlock(&vi->vm_mutex);
 	return ret;
 }
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
+#else
 static int psbfb_fault(struct vm_area_struct *vma,
 				 struct vm_fault *vmf)
 {
@@ -1023,12 +1043,10 @@ static int psbfb_fault(struct vm_area_struct *vma,
 	struct vm_area_struct tmp_vma;
 	unsigned long ret;
 
-        unsigned long address = (unsigned long)vmf->virtual_address;
-
 	mutex_lock(&vi->vm_mutex);
 	tmp_vma = *vma;
 	tmp_vma.vm_private_data = vi->bo;
-	ret = drm_bo_vm_nopfn(&tmp_vma, address);
+	ret = drm_bo_vm_nopfn(&tmp_vma, vmf);
 	mutex_unlock(&vi->vm_mutex);
 	return ret;
 }
-- 
1.7.2


psb-kernel-source-4.41.1-2.6.32.patch:
 drm_agpsupport.c |    2 +-
 drm_edid.c       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE psb-kernel-source-4.41.1-2.6.32.patch ---
psb: Fix compilation with kernel 2.6.32

This patch made from the Gentoo ebuild written by Zac Medico <zmedico at gentoo.org>,
to fix compilation of the psb module with kernel 2.6.32

It should be safe to be used with older version of the kernel. It fixes two changes:
 * In commit 6a12235c7d2d75c7d94b9afcaaecd422ff845ce0 phys_to_gart was removed
   since it is a 1:1 mapping on all platforms.
 * The acpi PREFIX constant is gone.

---
diff -urP psb-4.41.1-4mdv2010.0.orig/drm_agpsupport.c psb-4.41.1-4mdv2010.0.fix2632/drm_agpsupport.c
--- psb-4.41.1-4mdv2010.0.orig/drm_agpsupport.c	2009-10-08 12:09:11.000000000 +0200
+++ psb-4.41.1-4mdv2010.0.fix2632/drm_agpsupport.c	2009-12-05 02:46:28.000421027 +0100
@@ -524,7 +524,7 @@
 	DRM_DEBUG("Current page count is %ld\n", (long) mem->page_count);
 	mem->page_count = 0;
 	for (cur_page = pages; cur_page < last_page; ++cur_page)
-		mem->pages[mem->page_count++] = phys_to_gart(page_to_phys(*cur_page));
+		mem->pages[mem->page_count++] = page_to_phys(*cur_page);
 	agp_be->mem = mem;
 	return 0;
 }
diff -urP psb-4.41.1-4mdv2010.0.orig/drm_edid.c psb-4.41.1-4mdv2010.0.fix2632/drm_edid.c
--- psb-4.41.1-4mdv2010.0.orig/drm_edid.c	2009-10-08 12:09:11.000000000 +0200
+++ psb-4.41.1-4mdv2010.0.fix2632/drm_edid.c	2009-12-05 02:46:38.155168734 +0100
@@ -39,7 +39,7 @@
 	if (obj && obj->type == ACPI_TYPE_BUFFER)
 		memcpy(edid, obj->buffer.pointer, obj->buffer.length);
 	else {
-		printk(KERN_ERR PREFIX "Invalid _DDC data\n");
+		printk(KERN_ERR "ACPI: " "Invalid _DDC data\n");
 		status = -EFAULT;
 		kfree(obj);
 	}

psb-kernel-source-4.41.1-agp_memory.patch:
 drm_agpsupport.c |    2 +-
 drm_memory.c     |    2 +-
 drm_vm.c         |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE psb-kernel-source-4.41.1-agp_memory.patch ---
diff -ru psb-kernel-source-4.41.1/drm_agpsupport.c psb-kernel-source-4.41.2/drm_agpsupport.c
--- psb-kernel-source-4.41.1/drm_agpsupport.c	2009-04-16 05:25:01.000000000 +0200
+++ psb-kernel-source-4.41.2/drm_agpsupport.c	2009-08-11 20:18:30.000000000 +0200
@@ -524,7 +524,7 @@
 	DRM_DEBUG("Current page count is %ld\n", (long) mem->page_count);
 	mem->page_count = 0;
 	for (cur_page = pages; cur_page < last_page; ++cur_page)
-		mem->memory[mem->page_count++] = phys_to_gart(page_to_phys(*cur_page));
+		mem->pages[mem->page_count++] = phys_to_gart(page_to_phys(*cur_page));
 	agp_be->mem = mem;
 	return 0;
 }
diff -ru psb-kernel-source-4.41.1/drm_memory.c psb-kernel-source-4.41.2/drm_memory.c
--- psb-kernel-source-4.41.1/drm_memory.c	2009-04-16 05:25:01.000000000 +0200
+++ psb-kernel-source-4.41.2/drm_memory.c	2009-08-11 20:18:30.000000000 +0200
@@ -264,7 +264,7 @@
 		return NULL;
 
 	phys_addr_map =
-	    agpmem->memory->memory + (offset - agpmem->bound) / PAGE_SIZE;
+	    agpmem->memory->pages + (offset - agpmem->bound) / PAGE_SIZE;
 	for (i = 0; i < num_pages; ++i)
 		page_map[i] = pfn_to_page(phys_addr_map[i] >> PAGE_SHIFT);
 	addr = vmap(page_map, num_pages, VM_IOREMAP, PAGE_AGP);
diff -ru psb-kernel-source-4.41.1/drm_vm.c psb-kernel-source-4.41.2/drm_vm.c
--- psb-kernel-source-4.41.1/drm_vm.c	2009-04-16 05:25:01.000000000 +0200
+++ psb-kernel-source-4.41.2/drm_vm.c	2009-08-11 20:18:30.000000000 +0200
@@ -145,13 +145,13 @@
 		 * Get the page, inc the use count, and return it
 		 */
 		offset = (baddr - agpmem->bound) >> PAGE_SHIFT;
-		page = virt_to_page(__va(agpmem->memory->memory[offset]));
+		page = virt_to_page(__va(agpmem->memory->pages[offset]));
 		get_page(page);
 		vmf->page = page;
 
 		DRM_DEBUG
 		    ("baddr = 0x%lx page = 0x%p, offset = 0x%lx, count=%d\n",
-		     baddr, __va(agpmem->memory->memory[offset]), offset,
+		     baddr, __va(agpmem->memory->pages[offset]), offset,
 		     page_count(page));
 		return 0;
 	}


psb-kernel-source-4.41.1-drmpsb.patch:
 Makefile.kernel |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE psb-kernel-source-4.41.1-drmpsb.patch ---
diff -p -up psb-kernel-source-4.41.1/Makefile.kernel.drmpsb psb-kernel-source-4.41.1/Makefile.kernel
--- psb-kernel-source-4.41.1/Makefile.kernel.drmpsb	2009-04-16 05:25:02.000000000 +0200
+++ psb-kernel-source-4.41.1/Makefile.kernel	2009-09-23 11:56:26.000000000 +0200
@@ -7,7 +7,7 @@
 # $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.18 2003/08/16 17:59:17 dawes Exp $
 #
 
-drm-objs    := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \
+drm-psb-objs    := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \
 		drm_drv.o drm_fops.o drm_ioctl.o drm_irq.o \
 		drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
 		drm_sysfs.o drm_pci.o drm_agpsupport.o drm_scatter.o \
@@ -49,7 +49,7 @@ xgi-objs    := xgi_cmdlist.o xgi_drv.o x
 		xgi_fence.o
 
 ifeq ($(CONFIG_COMPAT),y)
-drm-objs    += drm_ioc32.o
+drm-psb-objs    += drm_ioc32.o
 radeon-objs += radeon_ioc32.o
 mga-objs    += mga_ioc32.o
 r128-objs   += r128_ioc32.o
@@ -58,7 +58,7 @@ nouveau-objs += nouveau_ioc32.o
 xgi-objs    += xgi_ioc32.o
 endif
 
-obj-m			+= drm.o
+obj-m			+= drm-psb.o
 obj-$(CONFIG_DRM_TDFX)	+= tdfx.o
 obj-$(CONFIG_DRM_R128)	+= r128.o
 obj-$(CONFIG_DRM_RADEON)+= radeon.o


psb-kernel-source-4.41.1-i2c-intelfb.patch:
 psb_i2c.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE psb-kernel-source-4.41.1-i2c-intelfb.patch ---
diff -ru psb-kernel-source-4.41.1/psb_i2c.c psb-kernel-source-4.41.2/psb_i2c.c
--- psb-kernel-source-4.41.1/psb_i2c.c  2009-04-16 05:25:01.000000000 +0200
+++ psb-kernel-source-4.41.2/psb_i2c.c  2009-08-11 20:18:30.000000000 +0200
@@ -36,6 +36,8 @@
 #include "intel_drv.h"
 #include "psb_drv.h"

+#define I2C_HW_B_INTELFB 0x010021; /* intel framebuffer driver */
+
 /*
  * Intel GPIO access functions
  */


psb-kmd-4.34-current_euid.patch:
 drm_fops.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE psb-kmd-4.34-current_euid.patch ---
diff -p -up build/drm_fops.c.current_euid build/drm_fops.c
--- build/drm_fops.c.current_euid	2009-05-31 03:22:18.000000000 -0400
+++ build/drm_fops.c	2009-05-31 03:32:00.000000000 -0400
@@ -252,7 +252,7 @@ static int drm_open_helper(struct inode 
 	memset(priv, 0, sizeof(*priv));
 	filp->private_data = priv;
 	priv->filp = filp;
-	priv->uid = current->euid;
+	priv->uid = current_euid();
 	priv->pid = current->pid;
 	priv->minor = minor;
 	priv->head = drm_heads[minor];


psb-kmod-4.41.1-2.6.34.patch:
 intel_lvds.c |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE psb-kmod-4.41.1-2.6.34.patch ---
--- intel_lvds.c.bak	2010-04-02 00:26:45.489008304 +0200
+++ intel_lvds.c	2010-04-02 00:40:51.530267983 +0200
@@ -801,7 +801,14 @@ 
 
 	if ((blc_type == BLC_I2C_TYPE) || (blc_type == BLC_PWM_TYPE)){	
 		/* add /sys/class/backlight interface as standard */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
+		struct backlight_properties props;
+		memset(&props, 0, sizeof(struct backlight_properties));
+		props.max_brightness = BRIGHTNESS_MAX_LEVEL;
+		psbbl_device = backlight_device_register("psblvds", &dev->pdev->dev, dev, &psbbl_ops, &props);
+#else
 		psbbl_device = backlight_device_register("psblvds", &dev->pdev->dev, dev, &psbbl_ops);
+#endif
 		if (psbbl_device){
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,20)
 			down(&psbbl_device->sem);



psb-kmod-4.41.1_busid.patch:
 drm_sysfs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE psb-kmod-4.41.1_busid.patch ---
--- psb-kernel-source-4.41.1/drm_sysfs.c	2009-04-15 20:25:01.000000000 -0700
+++ psb-kernel-source-4.41.1/drm_sysfs.c.new	2009-08-17 22:40:44.635097318 -0700
@@ -168,7 +168,7 @@
 	 * yet...
 	 */
 	/* dev->dev.devt = head->device; */
-	snprintf(dev->dev.bus_id, BUS_ID_SIZE, "card%d", head->minor);
+	dev_set_name(&dev->dev, "card%d", head->minor);
 
 	err = device_register(&dev->dev);
 	if (err) {

psb-kmod-4.41.1_irqreturn.patch:
 drm_os_linux.h |    6 ------
 1 file changed, 6 deletions(-)

--- NEW FILE psb-kmod-4.41.1_irqreturn.patch ---
--- psb-kernel-source-4.41.1/drm_os_linux.h	2009-04-15 20:25:01.000000000 -0700
+++ psb-kernel-source-4.41.1/drm_os_linux.h.new	2009-08-24 17:08:44.896703277 -0700
@@ -49,12 +49,6 @@
 
 /** IRQ handler arguments and return type and values */
 #define DRM_IRQ_ARGS		int irq, void *arg
-/** backwards compatibility with old irq return values */
-#ifndef IRQ_HANDLED
-typedef void irqreturn_t;
-#define IRQ_HANDLED		/* nothing */
-#define IRQ_NONE		/* nothing */
-#endif
 
 /** AGP types */
 #if __OS_HAS_AGP


--- NEW FILE psb-kmod.spec ---
# buildforkernels macro hint: when you build a new version or a new release
# that contains bugfixes or other improvements then you must disable the
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
%define buildforkernels current

Name:		psb-kmod
Version:	4.41.1
Release:	13%{?dist}.6
Summary:	Kernel module for Poulsbo graphics chipsets

Group:		System Environment/Kernel
License:	GPLv2+
URL:		http://ppa.launchpad.net/ubuntu-mobile/ubuntu/pool/main/p/psb-kernel-source/
Source0:	http://ppa.launchpad.net/ubuntu-mobile/ubuntu/pool/main/p/psb-kernel-source/psb-kernel-source_%{version}.orig.tar.gz

# upstream status for all patches: upstream? heh. good joke.

# kernel 2.6.29 build patch, from mandriva
Patch0:		psb-kmd-4.34-current_euid.patch
# kernel 2.6.30 build patch, by me
Patch1:		psb-kmod-4.41.1_irqreturn.patch
# kernel 2.6.30 build patch, by me (mandriva has the same patch
# independently arrived at, they call it dev_set_name.patch)
Patch2:		psb-kmod-4.41.1_busid.patch
# kernel 2.6.30 build patch, from ubuntu via mandriva
Patch3:		psb-kernel-source-4.41.1-agp_memory.patch
# rename drm.ko to drm-psb.ko so we don't get dependency ickiness due
# to competition with the 'real' drm.ko (from mandriva)
Patch4:		psb-kernel-source-4.41.1-drmpsb.patch
# define intel framebuffer driver (fixes a build problem)
# (from mandriva)
Patch5:		psb-kernel-source-4.41.1-i2c-intelfb.patch
# Fix build for 2.6.32 (from Gentoo via Mandriva)
Patch6:		psb-kernel-source-4.41.1-2.6.32.patch
# Fix build for 2.6.34 (Eric Piel: https://patchwork.kernel.org/patch/90678/ )
Patch7:		psb-kmod-4.41.1-2.6.34.patch
# From Matthew Garrett: declare module firmware
Patch8:		0001-psb-Declare-firmware.patch
# From Matthew Garrett: clean up debug error
Patch9:		0002-psb-If-not-asking-for-debug-is-an-error-I-want-to-be.patch
# From Matthew Garrett: fix framebuffer
Patch10:	0003-psb-Fix-framebuffer.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch:	i586 i686

# get the needed BuildRequires (in parts depending on what we build for)
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }

%description
%{summary}.


%prep
%{?kmodtool_check}
kmodtool  --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null


%setup -q -c

for kernel_version  in %{?kernel_versions} ; do
    cp -a psb-kernel-source-%{version} _kmod_build_${kernel_version%%___*}
 pushd _kmod_build_${kernel_version%%___*}
  if [[ $kernel_version > "2.6.28.99" ]]; then
%patch0 -p1 -b .build
%patch5 -p1 -b .intelfb
  fi
  if [[ $kernel_version > "2.6.29.99" ]]; then
%patch1 -p1 -b .irqreturn
%patch2 -p1 -b .busid
  fi
  if [[ $kernel_version > "2.6.30.99" ]]; then
%patch3 -p1 -b .agp
  fi
  if [[ $kernel_version > "2.6.31.99" ]]; then
%patch6 -p1 -b .build2632
  fi
%patch4 -p1 -b .drmpsb
%patch7 -p0 -b .build2634
%patch8 -p1 -b .firmware
%patch9 -p1 -b .debug
%patch10 -p1 -b .framebuffer
 popd
done


%build
for kv in %{?kernel_versions} ; do
    d=$PWD/_kmod_build_${kv%%___*}
    pushd $d
    make LINUXDIR="${kv##*___}" DRM_MODULES=psb
    popd
done


%install
rm -rf $RPM_BUILD_ROOT
for kv in %{?kernel_versions} ; do
    d=$RPM_BUILD_ROOT%{kmodinstdir_prefix}/${kv%%___*}/%{kmodinstdir_postfix}
    install -dm 755 $d
    install -pm 755 _kmod_build_${kv%%___*}/psb.ko $d
    install -pm 755 _kmod_build_${kv%%___*}/drm-psb.ko $d
done

%{?akmod_install}


%clean
rm -rf $RPM_BUILD_ROOT


%changelog
* Sat Sep 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-13.6
- rebuild for new kernel

* Fri Sep 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-13.5
- rebuild for new kernel

* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-13.4
- rebuild for new kernel

* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-13.3
- rebuild for new kernel

* Wed Aug 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-13.2
- rebuild for new kernel

* Sun Aug 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-13.1
- rebuild for new kernel

* Wed Aug 04 2010 Adam Williamson <adamwill AT shaw DOT ca> - 4.41.1-13
- add three patches from Matthew Garrett:
	+ Declare-firmware.patch (declare module firmware)
	+ If-not-asking-for-debug...patch (clean up debug error)
	+ Fix-framebuffer.patch (fix framebuffer)

* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-12.1
- rebuild for new kernel

* Thu Jul 22 2010 Adam Williamson <adamwill AT shaw DOT ca> - 4.41.1-12
- add 2.6.34.patch (from Eric Piel, fixes build on 2.6.34)

* Fri May 21 2010 Adam Williamson <adamwill AT shaw DOT ca> - 4.41.1-11
- add 2.6.32.patch (from Gentoo via Mandriva, fixes build on 2.6.32)

* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-10.10
- rebuild for new kernel

* Mon Feb 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-10.9
- rebuild for new kernel

* Thu Feb 04 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-10.8
- rebuild for new kernel

* Fri Jan 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-10.7
- rebuild for new kernel

* Sat Dec 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-10.6
- rebuild for new kernel

* Sun Dec 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-10.5
- rebuild for new kernel

* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-10.4
- rebuild for new kernels

* Thu Nov 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-10.3
- rebuild for new kernels

* Tue Oct 20 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-10.2
- rebuild for new kernels

* Wed Sep 30 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.41.1-10.1
- rebuild for new kernels

* Thu Sep 24 2009 Adam Williamson <adamwill AT shaw.ca> - 4.41.1-10
- add several patches from mandriva:
	+ replace build.patch with mdv's current_euid.patch (cleaner)
	+ replace agpmem.patch with mdv's agp_memory.patch (cleaner)
	+ add drmpsb.patch (builds drm module as drm-psb.ko)
	+ add intelfb.patch (cleaner fix for a build issue which
	  used to be fixed in my old build.patch)

* Fri Aug 28 2009 Adam Williamson <adamwill AT shaw.ca> - 4.41.1-9
- initial cut at a 2.6.31 patch (taken from corresponding changes in
  upstream files)

* Mon Aug 24 2009 Adam Williamson <adamwill AT shaw.ca> - 4.41.1-8
- try just 'i586 i686' for exclusivearch

* Mon Aug 24 2009 Adam Williamson <adamwill AT shaw.ca> - 4.41.1-7
- drop exclusivearch for now, it is being annoying
- improve irqreturn.patch, should prevent spurious interrupt problem
  (thanks to Konstantin Kletschke)

* Thu Aug 20 2009 Adam Williamson <adamwill AT shaw.ca> - 4.41.1-6
- exclusivearch ix86 (there's no 64-bit poulsbo hardware)
- and drop libdrm-poulsbo BR (doesn't seem necessary)

* Wed Aug 19 2009 Adam Williamson <adamwill AT shaw.ca> - 4.41.1-5
- bump revision to make sure correct patches included

* Mon Aug 17 2009 Adam Williamson <adamwill AT shaw.ca> - 4.41.1-4
- try and fix for 2.6.30

* Tue Aug 11 2009 Adam Williamson <adamwill AT shaw.ca> - 4.41.1-3
- rebuild with changed libdrm-poulsbo just to make sure it works

* Mon Aug 10 2009 Adam Williamson <adamwill AT shaw.ca> - 4.41.1-2
- use AkmodsBuildRequires (so the akmod requires work right)

* Mon Aug 10 2009 Adam Williamson <adamwill AT shaw.ca> - 4.41.1-1
- New version

* Wed May 13 2009 Adam Williamson <adamwill AT shaw.ca> - 4.40-1
- Initial package



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/psb-kmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2009 15:23:26 -0000	1.1
+++ .cvsignore	17 Sep 2010 10:39:24 -0000	1.2
@@ -0,0 +1 @@
+psb-kernel-source_4.41.1.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/psb-kmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2009 15:23:26 -0000	1.1
+++ sources	17 Sep 2010 10:39:24 -0000	1.2
@@ -0,0 +1 @@
+5ca47555507dec0318a6ed4128f73146  psb-kernel-source_4.41.1.orig.tar.gz



More information about the rpmfusion-commits mailing list