libdrm-psb: Update to use a 2.6.27 kernel and simplify patches

meta-moblin/packages/drm/files/menlow-config

@@ -1,84 +1,84 @@
 # Ubuntu config
 
 
-CONFIG_BLK_DEV_GNBD=m
+# CONFIG_BLK_DEV_GNBD is not set
 
 # Requires some headers from drivers/md
 #CONFIG_BLK_DEV_DM_BBR=m
 
-CONFIG_SND_BTSCO=m
+# CONFIG_SND_BTSCO is not set
 
-CONFIG_INPUT_ACERHK=m
-CONFIG_AVERATEC_5100P=m
-CONFIG_PACKARDBELL_E5=m
-CONFIG_LMPCM_USB=m
-CONFIG_NOZOMI=m
+# CONFIG_INPUT_ACERHK is not set
+# CONFIG_AVERATEC_5100P is not set
+# CONFIG_PACKARDBELL_E5 is not set
+# CONFIG_LMPCM_USB is not set
+# CONFIG_NOZOMI is not set
 
-CONFIG_NDISWRAPPER=m
-  CONFIG_NDISWRAPPER_WQ=y
+# CONFIG_NDISWRAPPER is not set
+# CONFIG_NDISWRAPPER_WQ is not set
 
-#CONFIG_MOL=m
+# CONFIG_MOL is not set
 
-CONFIG_ASFS_FS=m
+# CONFIG_ASFS_FS is not set
 
 # Uses unexported functions from gfs2
-CONFIG_GFS_FS=m
+# CONFIG_GFS_FS is not set
 
-CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS is not set
 # CONFIG_UNION_FS is not set
 
-CONFIG_USB_APPLEIR=m
+# CONFIG_USB_APPLEIR is not set
 
-CONFIG_GSPCA=m
+# CONFIG_GSPCA is not set
 
-CONFIG_USB_OV511_NEW=m
-CONFIG_QUICKCAM=m
-CONFIG_USB_UVCCAM=m
+# CONFIG_USB_OV511_NEW is not set
+# CONFIG_QUICKCAM is not set
+# CONFIG_USB_UVCCAM is not set
 
-CONFIG_NET_ACX=m
-CONFIG_IPW3945=m
-CONFIG_IWLWIFI=m
-CONFIG_USB_ATMEL=m
-CONFIG_PRISM2_USB=m
+# CONFIG_NET_ACX is not set
+# CONFIG_IPW3945 is not set
+# CONFIG_IWLWIFI is not set
+# CONFIG_USB_ATMEL is not set
+# CONFIG_PRISM2_USB is not set
 
 
-CONFIG_IPW2100_FS_AMILO_M7400=m
+# CONFIG_IPW2100_FS_AMILO_M7400 is not set
 
 
-CONFIG_LIRC_DEV=m
-CONFIG_LIRC_ATIUSB=m
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_CMDIR=m
-#CONFIG_LIRC_GPIO=m
-CONFIG_LIRC_I2C=m
-CONFIG_LIRC_IGORPLUGUSB=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_IT87=m
-CONFIG_LIRC_MCEUSB=m
-CONFIG_LIRC_MCEUSB2=m
-#CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_PVR150=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_IGOR=m
-CONFIG_LIRC_SIR=m
-CONFIG_LIRC_STREAMZAP=m
-CONFIG_LIRC_TTUSBIR=m
+# CONFIG_LIRC_DEV is not set
+# CONFIG_LIRC_ATIUSB is not set
+# CONFIG_LIRC_BT829 is not set
+# CONFIG_LIRC_CMDIR is not set
+# CONFIG_LIRC_GPIO is not set
+# CONFIG_LIRC_I2C is not set
+# CONFIG_LIRC_IGORPLUGUSB is not set
+# CONFIG_LIRC_IMON is not set
+# CONFIG_LIRC_IT87 is not set
+# CONFIG_LIRC_MCEUSB is not set
+# CONFIG_LIRC_MCEUSB2 is not set
+# CONFIG_LIRC_PARALLEL is not set
+# CONFIG_LIRC_PVR150 is not set
+# CONFIG_LIRC_SASEM is not set
+# CONFIG_LIRC_SERIAL is not set
+# CONFIG_LIRC_SERIAL_IGOR is not set
+# CONFIG_LIRC_SIR is not set
+# CONFIG_LIRC_STREAMZAP is not set
+# CONFIG_LIRC_TTUSBIR is not set
 
 
 CONFIG_DRM_PSB=m
 
 
-CONFIG_AMT_HECI=m
+# CONFIG_AMT_HECI is not set
 
 
-CONFIG_ET131X=m
+# CONFIG_ET131X is not set
 
 
-CONFIG_STK11XX=m
+# CONFIG_STK11XX is not set
 
-CONFIG_MMC_SD8686=m
-CONFIG_MMC_SD8688=m
+# CONFIG_MMC_SD8686 is not set
+# CONFIG_MMC_SD8688 is not set
 
-CONFIG_WIMAX_I2400M=m
+# CONFIG_WIMAX_I2400M is not set
 # CONFIG_DVB_SIANO_SMS1XXX is not set

meta-moblin/packages/drm/libdrm-psb_2.3.1.bb

@@ -0,0 +1,17 @@
+SECTION = "x11/base"
+LICENSE = "MIT"
+SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2 \
+           file://poulsbo.patch;patch=1"
+PROVIDES = "drm libdrm"
+
+S = ${WORKDIR}/libdrm-${PV}
+
+DEPENDS = "libpthread-stubs"
+
+PR = "r7"
+
+COMPATIBLE_MACHINE = "menlow"
+
+LEAD_SONAME = "libdrm.so"
+
+inherit autotools_stage pkgconfig

meta-moblin/packages/drm/libdrm-psb_git.bb

@@ -1,21 +0,0 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
-SRC_URI = "git://git.moblin.org/projects/libdrm.git/;protocol=git \
-           file://poulsbo_libdrm_update.patch;patch=1"
-PROVIDES = "drm libdrm"
-
-S = ${WORKDIR}/git
-
-DEPENDS = "libpthread-stubs"
-
-PR = "r2"
-PV = "2.3.0+git${SRCREV}"
-
-#PROVIDES = "libdrm"
-COMPATIBLE_MACHINE = "menlow"
-#DEFAULT_PREFERENCE_menlow = "5"
-#PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-LEAD_SONAME = "libdrm.so"
-
-inherit autotools_stage pkgconfig

meta-moblin/packages/drm/linux-psb-modules_2.6.27.bb

@@ -1,6 +1,9 @@
 SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/l/linux-ubuntu-modules-2.6.24/linux-ubuntu-modules-2.6.24_2.6.24-22.35.tar.gz \
+           file://fixes-kernversion.patch;patch=1 \
            file://menlow-config"
 
+PR = "r4"
+
 S = "${WORKDIR}/lum/ubuntu"
 
 inherit module
@@ -19,9 +22,9 @@ do_compile() {
 MODULE_PATH = "/lib/modules/${KERNEL_VERSION}"
 
 do_install () {
-        install -d ${D}${MODULE_PATH}/kernel/drivers/char/drm/
-	install -m 644 ${S}/media/drm-poulsbo/drm.ko ${D}${MODULE_PATH}/kernel/drivers/char/drm/
-	install -m 644 ${S}/media/drm-poulsbo/psb.ko ${D}${MODULE_PATH}/kernel/drivers/char/drm/
+        install -d ${D}${MODULE_PATH}/tmp/kernel/drivers/char/drm/
+	install -m 644 ${S}/media/drm-poulsbo/drm.ko ${D}${MODULE_PATH}/tmp/kernel/drivers/char/drm/
+	install -m 644 ${S}/media/drm-poulsbo/psb.ko ${D}${MODULE_PATH}/tmp/kernel/drivers/char/drm/
 }
 
 COMPATIBLE_MACHINE = "menlow"