omap3-pandora-kernel2: update

[openpandora.oe.git] / recipes / linux / omap3-pandora-kernel2_3.2-pandora.bb

diff --git a/recipes/linux/omap3-pandora-kernel2_3.2-pandora.bb b/recipes/linux/omap3-pandora-kernel2_3.2-pandora.bb
index c035496..37532bf 100644 (file)
--- a/recipes/linux/omap3-pandora-kernel2_3.2-pandora.bb
+++ b/recipes/linux/omap3-pandora-kernel2_3.2-pandora.bb
@@ -4,13 +4,13 @@ LICENSE = "GPLv2"
 COMPATIBLE_MACHINE = "omap3-pandora"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-PR = "r17"
+PR = "r25"
 
 # we already build 2.6 kernel using OE infrastructure, and
 # as we don't know how to build another one into the same image
 # (especially out-of-tree modules), we just package manually prebuilt one
 # git://git.openpandora.org/pandora-kernel.git , branch pandora-3.2
-# commit: 9135d540c517a62b0c4855112bae50d8d537c79d
+# commit: 52ea40e670c7ec5b6a523ed9dab180df3801f757
 # out-of-tree modules are built from:
 # http://git.openpandora.org/cgi-bin/gitweb.cgi?p=sgx.git
 # http://notaz.gp2x.de/misc/pnd/oe_rootfs_extra_modules.tar.bz2
@@ -21,9 +21,17 @@ S = "${WORKDIR}"
 do_install() {
   cp -a ${S}/boot ${D}/
   cp -a ${S}/lib ${D}/
+  rm -f ${D}/lib/modules/*/modules.dep*
+
+  # dupes from other OE packages..
+  rm -rf ${D}/lib/firmware/vicam
+  rm -rf ${D}/lib/firmware/ttusb-budget
 }
 
+PACKAGES =+ "linux-firmware-media"
+
 FILES_${PN} = "boot lib"
+FILES_linux-firmware-media = "lib/firmware"
 
 pkg_postinst_${PN} () {
   # this will cause depmod to be run on next boot
@@ -31,10 +39,10 @@ pkg_postinst_${PN} () {
   sync
 
   if ! grep -q '[[:blank:]]/[[:blank:]]*ubifs' /proc/mounts; then
-    test -e /media/PANDORABOOT/uImage && oldkernel=/media/PANDORABOOT/uImage
-    test -e /media/PANDORABOOT/uImage-3 && oldkernel=/media/PANDORABOOT/uImage-3
-    test -e /media/BOOT/uImage && oldkernel=/media/BOOT/uImage
-    test -e /media/BOOT/uImage-3 && oldkernel=/media/BOOT/uImage-3
+    for dir in `ls -d /media/*boot* 2> /dev/null` `ls -d /media/*BOOT* 2> /dev/null`; do
+      test -e $dir/uImage && oldkernel=$dir/uImage
+      test -e $dir/uImage-3 && oldkernel=$dir/uImage-3
+    done
 
     if test -n "$oldkernel"; then
       cp /boot/uImage-3 $oldkernel
@@ -58,5 +66,5 @@ boot.txt / autoboot.txt) or the system might not start after reboot."
 }
 
 PACKAGE_STRIP = "no"
-SRC_URI[md5sum] = "b1df32a7dbb1012a448eabac25b6f0a9"
-SRC_URI[sha256sum] = "cee5df42ae35c704d34552c7ca0b445ff97575087e14c9c68ad023132a4b1680"
+SRC_URI[md5sum] = "08f425f1f031272e3f12029abbe9468f"
+SRC_URI[sha256sum] = "5747b357651c7fe3ccb2410217f12a653f223ce011f51908e31a862979443554"