X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=recipes%2Flinux%2Fomap3-pandora-kernel2_3.2-pandora.bb;h=0ce47185a803b6a0720602def3ae408e2fe41398;hb=f3a5d86fdb9a98e8193abec161ae2704796db596;hp=a435aa695afc7930f82390d566810596ed2bf2c7;hpb=cf6a9a5906f072b8f425c9b690efd7e71b952f24;p=openpandora.oe.git

diff --git a/recipes/linux/omap3-pandora-kernel2_3.2-pandora.bb b/recipes/linux/omap3-pandora-kernel2_3.2-pandora.bb
index a435aa6..0ce4718 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 = "r8"
+PR = "r21"
 
 # 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: 598a3aac17511c02f9884711b25463ec5a5eeb4b
-SRC_URI = "http://notaz.gp2x.de/misc/pnd/oe_rootfs_extra_r8.tar.bz2"
+# commit: a4cb4b1277a499ebced7f7534d5cfb11a30eb224
+# 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] = "1a98932c37b5516cd734f5a95620f0aa"
-SRC_URI[sha256sum] = "816c518470ab5c358bec86ddb1890df8764d3f6e23d8cf6150fd8907389c1ee3"
+SRC_URI[md5sum] = "006041b93006d2df353ca8cdf25edbf1"
+SRC_URI[sha256sum] = "f317b31c69e23071a104f12be9ca17b261784110933237bfbfc1909d7d6ccdd5"