X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=blobdiff_plain;f=recipes%2Flinux%2Fomap3-pandora-kernel2_3.2-pandora.bb;h=251d07a9114d24ffa53de49e96b586a3a336df07;hp=c9c96fcbc77d8f22fe1c327202329f0fd3c750ba;hb=d0984a2d8760c8d3235e6ba60749c2fc04d049ec;hpb=62230ce21a3aa61e2744fd6a8ed38257da4d2fe2

diff --git a/recipes/linux/omap3-pandora-kernel2_3.2-pandora.bb b/recipes/linux/omap3-pandora-kernel2_3.2-pandora.bb
index c9c96fc..251d07a 100644
--- a/recipes/linux/omap3-pandora-kernel2_3.2-pandora.bb
+++ b/recipes/linux/omap3-pandora-kernel2_3.2-pandora.bb
@@ -4,23 +4,34 @@ LICENSE = "GPLv2"
 COMPATIBLE_MACHINE = "omap3-pandora"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-PR = "r7"
+PR = "r30"
 
 # 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: db4bd663ea5894d516f75d7a5973303998247f91
-SRC_URI = "http://notaz.gp2x.de/misc/pnd/oe_rootfs_extra_r7.tar.bz2"
+# commit: 96301b3f33648a5880cfd65588a3105f7d51e9d4
+# 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
+SRC_URI = "http://notaz.gp2x.de/misc/pnd/oe_rootfs_extra_${PR}.tar.bz2"
 
 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
@@ -28,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
@@ -55,5 +66,5 @@ boot.txt / autoboot.txt) or the system might not start after reboot."
 }
 
 PACKAGE_STRIP = "no"
-SRC_URI[md5sum] = "37d538020a4b39de549e182ebe4b8e52"
-SRC_URI[sha256sum] = "e007b755a09134f5995c954ed251f822749bf94ddf7ab4c3f773f0802b2669e9"
+SRC_URI[md5sum] = "b6007ac85ffc9e54635a3651accc7962"
+SRC_URI[sha256sum] = "9037ec170769884adab123e4a025a03de4b57080f82fb344018524779faf27c7"