diff options
33 files changed, 553 insertions, 444 deletions
diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass index a1e00e72c1..bc0a1dfaba 100644 --- a/classes/gettext.bbclass +++ b/classes/gettext.bbclass @@ -1,3 +1,4 @@ +DEPENDS =+ "gettext-native" def gettext_after_parse(d): import bb # Remove the NLS bits if USE_NLS is no. @@ -14,3 +15,4 @@ python () { DEPENDS =+ "gettext-native" EXTRA_OECONF += "--enable-nls" + diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 16753863b5..72a7c625c8 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -43,13 +43,14 @@ SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-fbgrab-viewer-native ?= "1943" -SRCREV_pn-frameworkd ?= "86a660108f988f5611cc796d33911cca8836004e" +SRCREV_pn-frameworkd ?= "5a292ced8330ace191d66fc1b655e921fa442fdf" SRCREV_pn-fso-gpsd ?= "fd1cd578d6ba9fa13aadceb59a9b46345108583b" SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "9721" SRCREV_pn-gpe-contacts ?= "9312" +SRCREV_pn-gpe-sketchbook ?= "9547" SRCREV_pn-gsm0710muxd ?= "3ff86b129640b647ccba3d86eb243d864671b039" SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" @@ -80,8 +81,8 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1066" -SRCREV_pn-linux-openmoko ?= "968c41d0c32099d78927849a71e2ef3143cc05e7" -SRCREV_pn-linux-openmoko-devel ?= "e20ce2bd6fc6e711eed58a580ae117cb574abe96" +SRCREV_pn-linux-openmoko ?= "a2ef813d2f439a3e9f377d33a2e5baad098afb7e" +SRCREV_pn-linux-openmoko-devel ?= "04f54c7001fb609e11ff4b2b4575c04188dbefef" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" @@ -90,8 +91,8 @@ SRCREV_pn-matchbox-keyboard ?= "1910" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-matchbox-stroke ?= "1820" -SRCREV_pn-mickeydbus ?= "d1f32060474767582dd4248d5e5c2adc63931d5a" -SRCREV_pn-mickeyterm ?= "d1f32060474767582dd4248d5e5c2adc63931d5a" +SRCREV_pn-mickeydbus ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a" +SRCREV_pn-mickeyterm ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a" SRCREV_pn-moko-gtk-engine ?= "3612" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer ?= "27659" @@ -178,7 +179,7 @@ SRCREV_pn-sphyrna-python ?= "45" SRCREV_pn-starling ?= "9574" SRCREV_pn-tichy ?= "168" SRCREV_pn-tmut ?= "60" -SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" +SRCREV_pn-u-boot-openmoko ?= "414367bf5b65942947dd5d569c27d2a8e8e5e562" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" @@ -190,12 +191,12 @@ SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "4067470ea4d569bae7b4161ca998645a0c9b96e7" -SRCREV_pn-zhone ?= "11392b1d2ee3a0622dc324e1805699e4301249c4" +SRCREV_pn-zhone ?= "2cccdc592d10c15509d974dfbba493e95a776530" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "36204" +EFL_SRCREV ?= "36540" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eet-native ?= "${EFL_SRCREV}" @@ -239,8 +240,7 @@ SRCREV_pn-python-etk ?= "${EFL_SRCREV}" # Enlightenment Applications SRCREV_pn-edje-editor ?= "${EFL_SRCREV}" -#SRCREV_pn-edje-player ?= "${EFL_SRCREV}" -SRCREV_pn-edje-player ?= "36296" +SRCREV_pn-edje-player ?= "${EFL_SRCREV}" SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}" SRCREV_pn-emphasis ?= "${EFL_SRCREV}" SRCREV_pn-ephoto ?= "${EFL_SRCREV}" @@ -254,6 +254,12 @@ SRCREV_pn-e-utils ?= "${EFL_SRCREV}" SRCREV_pn-e-wm ?= "${EFL_SRCREV}" SRCREV_pn-enna ?= "${EFL_SRCREV}" SRCREV_pn-exquisite ?= "${EFL_SRCREV}" +SRCREV_pn-exquisite-theme-illume ?= "${EFL_SRCREV}" SRCREV_pn-rage ?= "${EFL_SRCREV}" - SRCREV_pn-illume ?= "${EFL_SRCREV}" +SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}" + +# Enlightenment ST +SRCREV_pn-alarm ?= "${EFL_SRCREV}" +SRCREV_pn-waker ?= "${EFL_SRCREV}" +SRCREV_pn-elementary ?= "${EFL_SRCREV}" diff --git a/packages/beecrypt/beecrypt_3.1.0.bb b/packages/beecrypt/beecrypt_3.1.0.bb index 3187b9b12a..f9a45e74df 100644 --- a/packages/beecrypt/beecrypt_3.1.0.bb +++ b/packages/beecrypt/beecrypt_3.1.0.bb @@ -6,7 +6,23 @@ DESCRIPTION="Beecrypt is a general-purpose cryptography library." HOMEPAGE="http://sourceforge.net/projects/beecrypt" SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz" +PR = "r2" + inherit autotools acpaths="" EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static" + +do_stage() { + +# oe_libinstall -a -C .libs libbeecrypt ${STAGING_LIBDIR} + cp .libs/libbeecrypt.a ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/ + install -d ${STAGING_INCDIR}/beecrypt + for X in beecrypt.h beecrypt.api.h memchunk.h mpnumber.h beecrypt.gnu.h mp.h mpopt.h blockmode.h endianness.h + do + install -m 0644 ${X} ${STAGING_INCDIR}/beecrypt/${X} + done + +} + diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb index 46ade701a3..e16cad051d 100644 --- a/packages/e17/e-wm_svn.bb +++ b/packages/e17/e-wm_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17" DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" PV = "0.16.999.043+svnr${SRCREV}" -PR = "r13" +PR = "r14" inherit e update-alternatives @@ -10,7 +10,6 @@ RDEPENDS += "shared-mime-info mime-support" SRC_URI = "\ svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \ - file://disable-e-cursor.patch;patch=1 \ file://enlightenment_start.oe \ file://applications.menu \ " diff --git a/packages/portabase/beecrypt/.mtn2git_empty b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/portabase/beecrypt/.mtn2git_empty +++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/.mtn2git_empty diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch new file mode 100644 index 0000000000..29edaeb93c --- /dev/null +++ b/packages/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch @@ -0,0 +1,13 @@ +Index: e2fsprogs-libs-1.41.2/MCONFIG.in +=================================================================== +--- e2fsprogs-libs-1.41.2.orig/MCONFIG.in 2008-09-12 15:28:13.000000000 +0200 ++++ e2fsprogs-libs-1.41.2/MCONFIG.in 2008-10-08 01:01:49.539806918 +0200 +@@ -64,7 +64,7 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ ++MKINSTALLDIRS = @MKDIR_P@ + + # + # Library definitions diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb new file mode 100644 index 0000000000..87bc2d7e6a --- /dev/null +++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.41.2.bb @@ -0,0 +1,14 @@ +require e2fsprogs-libs.inc + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ + file://mkinstalldirs.patch;patch=1 \ + " + +EXTRA_OECONF=" --enable-elf-shlibs " + +do_compile_prepend () { + find ./ -print|xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 74ec3615a9..63da1dffa2 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -4,8 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al." SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -PV = "0.8.2+${PR}-gitr${SRCREV}" -PR = "r2" +PV = "0.8.3+${PR}-gitr${SRCREV}" +PR = "r0" inherit distutils update-rc.d @@ -26,6 +26,7 @@ do_install_append() { RDEPENDS_${PN} += "\ python-dbus \ python-datetime \ + python-pprint \ python-pygobject \ python-pyrtc \ python-pyserial \ diff --git a/packages/freesmartphone/mickeydbus_git.bb b/packages/freesmartphone/mickeydbus_git.bb index cbd90e5030..648cc48f91 100644 --- a/packages/freesmartphone/mickeydbus_git.bb +++ b/packages/freesmartphone/mickeydbus_git.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Mickey's DBus introspection and calling Program" AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" LICENSE = "GPLv2" -PV = "0.9.0+gitr${SRCREV}" -PR = "r0" +PV = "0.9.1+gitr${SRCREV}" +PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" S = "${WORKDIR}/git" @@ -15,4 +15,8 @@ do_install() { RDEPENDS_${PN} = "\ python-dbus \ + python-pprint \ " + +PACKAGE_ARCH_${PN} = "all" + diff --git a/packages/freesmartphone/mickeyterm_git.bb b/packages/freesmartphone/mickeyterm_git.bb index 243354cc91..0ecc8bbbea 100644 --- a/packages/freesmartphone/mickeyterm_git.bb +++ b/packages/freesmartphone/mickeyterm_git.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Mickey's Terminal Program" AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" LICENSE = "GPLv2" -PV = "2.9.0+gitr${SRCREV}" -PR = "r0" +PV = "2.9.1+gitr${SRCREV}" +PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" S = "${WORKDIR}/git" @@ -23,3 +23,6 @@ RRECOMMENDS_${PN} += "\ gsm0710muxd \ python-dbus \ " + +PACKAGE_ARCH_${PN} = "all" + diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb index 1bd275d7e7..d8c678ce59 100644 --- a/packages/freesmartphone/zhone_git.bb +++ b/packages/freesmartphone/zhone_git.bb @@ -2,9 +2,8 @@ DESCRIPTION = "Zhone: Zen Phone" LICENSE = "GPL" SECTION = "x11" DEPENDS = "edje-native python-pyrex-native python-cython-native" -RDEPENDS = "task-python-efl python-textutils python-dbus python-pycairo" PV = "0.0.0+${PR}-gitr${SRCREV}" -PR = "r9" +PR = "r10" SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \ file://80zhone" @@ -18,3 +17,10 @@ do_install_append() { } FILES_${PN} += "${datadir} ${sysconfdir}" + +RDEPENDS = "\ + task-python-efl \ + python-textutils \ + python-dbus \ + python-pycairo \ +" diff --git a/packages/gettext/gettext-native_0.17.bb b/packages/gettext/gettext-native_0.17.bb index c6daf7b782..5d44db5a62 100644 --- a/packages/gettext/gettext-native_0.17.bb +++ b/packages/gettext/gettext-native_0.17.bb @@ -1,4 +1,5 @@ require gettext_${PV}.bb +PR = "r2" DEPENDS = "" PROVIDES = "" @@ -56,4 +57,11 @@ do_stage_append() { fi install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i done + + # config.rpath is needed by some configure macros and needs to be autoinstalled. + # automake will do this but config.rpath needs to be visible to automake + for i in `ls -d ${STAGING_DATADIR}/automake*` + do + cp ${STAGING_DATADIR}/gettext/config.rpath $i + done } diff --git a/packages/gettext/gettext_0.17.bb b/packages/gettext/gettext_0.17.bb index 7beaee1294..3dac87a09b 100644 --- a/packages/gettext/gettext_0.17.bb +++ b/packages/gettext/gettext_0.17.bb @@ -3,7 +3,6 @@ HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPL" PR = "r1" -DEFAULT_PREFERENCE = "-1" DEPENDS = "gettext-native virtual/libiconv ncurses expat" PROVIDES = "virtual/libintl" diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb index b4878406de..b04cfc39bf 100644 --- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb +++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb @@ -1,15 +1,10 @@ +DEPENDS = "libgpewidget sqlite" LICENSE = "GPL" -PR = "r4" - -inherit gpe pkgconfig - -DEPENDS = "libgpewidget" -SECTION = "gpe" -SECTION = "gpe" -PRIORITY = "optional" DESCRIPTION = "A GPE notebook to sketch your notes" export CVSBUILD = "no" +inherit gpe pkgconfig + CFLAGS +="-D_GNU_SOURCE" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \ diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb index 60bb1b3d76..488e32f55b 100644 --- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb +++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb @@ -1,14 +1,10 @@ +DEPENDS = "libgpewidget sqlite" LICENSE = "GPL" - -inherit gpe pkgconfig - -DEPENDS = "libgpewidget" -SECTION = "gpe" -SECTION = "gpe" -PRIORITY = "optional" DESCRIPTION = "A GPE notebook to sketch your notes" export CVSBUILD = "no" +inherit gpe pkgconfig + CFLAGS +="-D_GNU_SOURCE" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" diff --git a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb index 8884746136..929d622a51 100644 --- a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb +++ b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb @@ -1,18 +1,23 @@ DESCRIPTION = "A GPE notebook to sketch your notes" SECTION = "gpe" -SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "libgpewidget" -PV = "0.2.9+svn-${SRCDATE}" +DEPENDS = "libgpewidget sqlite" +PV = "0.2.9+svnr${SRCREV}" -inherit pkgconfig autotools +DEFAULT_PREFERENCE = "-1" -SRC_URI = "${GPE_SVN} \ - file://svn-build.patch;patch=1" +inherit pkgconfig autotools +SRC_URI = "\ + ${GPE_SVN} \ + file://svn-build.patch;patch=1 \ +" S = "${WORKDIR}/${PN}" +export CVSBUILD = "no" +CFLAGS += "-D_GNU_SOURCE" + do_compile () { oe_runmake PREFIX=${prefix} oe_runmake all-desktop PREFIX=${prefix} @@ -23,10 +28,3 @@ do_install () { FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" FILES_${PN} += " ${datadir}/gpe/pixmaps" - -export CVSBUILD = "no" - -CFLAGS += "-D_GNU_SOURCE" - -DEFAULT_PREFERENCE = "-1" - diff --git a/packages/linux/linux-omap/dvb-fix-dma.diff b/packages/linux/linux-omap/dvb-fix-dma.diff new file mode 100644 index 0000000000..e05473fc7f --- /dev/null +++ b/packages/linux/linux-omap/dvb-fix-dma.diff @@ -0,0 +1,60 @@ +Hi, +I post this patch that fixes a kernel crash that happens when using a dvb +usb stick on a mips platform and I think even on other platforms on which +the dma access in not cache-coherent. + +The problem's origin is that, inside the method usb_bulk_urb_init of file +drivers/media/dvb/dvb-usb/usb-urb.c, stream->urb_list[i]->transfer_buffer +points to a memory area that has been allocated to be dma-coherent but +stream->urb_list[i]->transfer_flags doesn't include the +URB_NO_TRANSFER_DMA_MAP flag and stream->urb_list[i]->transfer_dma is not +set. +When later on the stream->urb_list[i]->transfer_buffer pointer is used +inside function usb_hcd_submit_urb of file drivers/usb/core/hcd.c since the +flag URB_NO_TRANSFER_DMA_MAP is not set the urb->transfer_buffer pointer is +passed to the dma_map_single function that since the address is dma-coherent +returns a wrong tranfer_dma address that later on leads to the kernel crash. + +The problem is solved by setting the URB_NO_TRANSFER_DMA_MAP flag and the +stream->urb_list[i]->transfer_dma address. + +Perhaps to be more safe the URB_NO_TRANSFER_DMA_MAP flag can be set only +if stream->urb_list[i]->transfer_dma != 0. + +I don't know if half of the fault can be of the dma_map_single function that +should anyway returns a valid address both for a not dma-coherent and a +dma-coherent address. + +Just to be clear: +I've done this patch to solve my problem and I tested it only on a mips +platform +but I think it should not cause any problems on other platforms. +I posted it here to help someone else that can have my same problem and to +point it out +to the mantainer of this part of code. +You can use it at your own risk and I'm not resposible in any way for any +problem or +damage that it can cause. +I'm available to discuss about it + +Bye + +Michele Scorcia + +-------------------- + + + + +--- /tmp/usb-urb.c 2008-10-08 09:53:23.000000000 +0200 ++++ git/drivers/media/dvb/dvb-usb/usb-urb.c 2008-10-08 09:54:16.000000000 +0200 +@@ -152,7 +152,8 @@ + stream->props.u.bulk.buffersize, + usb_urb_complete, stream); + +- stream->urb_list[i]->transfer_flags = 0; ++ stream->urb_list[i]->transfer_flags = URB_NO_TRANSFER_DMA_MAP; ++ stream->urb_list[i]->transfer_dma = stream->dma_addr[i]; + stream->urbs_initialized++; + } + return 0; diff --git a/packages/linux/linux-omap/fix-irq33.diff b/packages/linux/linux-omap/fix-irq33.diff new file mode 100644 index 0000000000..709f042ab7 --- /dev/null +++ b/packages/linux/linux-omap/fix-irq33.diff @@ -0,0 +1,111 @@ +From: "Nathan Monson" <nmonson@gmail.com> +To: "linux-omap@vger.kernel.org List" <linux-omap@vger.kernel.org> +Subject: Re: omapfb: help from userspace +Cc: "TK, Pratheesh Gangadhar" <pratheesh@ti.com> + +On Wed, Oct 8, 2008 at 11:36 AM, Nathan Monson <nmonson@gmail.com> wrote: +> "Felipe Contreras" <felipe.contreras@gmail.com> writes: +>> irq -33, desc: c0335cf8, depth: 0, count: 0, unhandled: 0 +> +> On the BeagleBoard list, Pratheesh Gangadhar said that mapping I/O +> regions as Strongly Ordered suppresses this problem: +> http://groups.google.com/group/beagleboard/browse_thread/thread/23e1c95b4bfb09b5/70d12dca569ca503?show_docid=70d12dca569ca503 + +Pratheesh helped me make a patch against the latest linux-omap git to +try this. + +With this patch, my IRQ -33 problems with the DSP have disappeared. +Before, I would end up in IRQ -33 loop after 10 invocations of the DSP +Bridge 'ping.out' utility. I just finished running it 50,000 times +without error. + +As stated before, this patch is just a workaround for testing +purposes, not a fix. Who knows what performance side effects it +has... + +--- +diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h +index 9eb936e..5cb4f5f 100644 +--- a/arch/arm/include/asm/mach/map.h ++++ b/arch/arm/include/asm/mach/map.h +@@ -25,6 +25,7 @@ struct map_desc { + #define MT_HIGH_VECTORS 8 + #define MT_MEMORY 9 + #define MT_ROM 10 ++#define MT_MEMORY_SO 11 + + #define MT_NONSHARED_DEVICE MT_DEVICE_NONSHARED + #define MT_IXP2000_DEVICE MT_DEVICE_IXP2000 +diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c +index adbe21f..c11c0e8 100644 +--- a/arch/arm/mach-omap2/io.c ++++ b/arch/arm/mach-omap2/io.c +@@ -119,13 +119,13 @@ static struct map_desc omap34xx_io_desc[] __initdata = { + .virtual = L3_34XX_VIRT, + .pfn = __phys_to_pfn(L3_34XX_PHYS), + .length = L3_34XX_SIZE, +- .type = MT_DEVICE ++ .type = MT_MEMORY_SO + }, + { + .virtual = L4_34XX_VIRT, + .pfn = __phys_to_pfn(L4_34XX_PHYS), + .length = L4_34XX_SIZE, +- .type = MT_DEVICE ++ .type = MT_MEMORY_SO + }, + { + .virtual = L4_WK_34XX_VIRT, +@@ -137,19 +137,19 @@ static struct map_desc omap34xx_io_desc[] __initdata = { + .virtual = OMAP34XX_GPMC_VIRT, + .pfn = __phys_to_pfn(OMAP34XX_GPMC_PHYS), + .length = OMAP34XX_GPMC_SIZE, +- .type = MT_DEVICE ++ .type = MT_MEMORY_SO + }, + { + .virtual = OMAP343X_SMS_VIRT, + .pfn = __phys_to_pfn(OMAP343X_SMS_PHYS), + .length = OMAP343X_SMS_SIZE, +- .type = MT_DEVICE ++ .type = MT_MEMORY_SO + }, + { + .virtual = OMAP343X_SDRC_VIRT, + .pfn = __phys_to_pfn(OMAP343X_SDRC_PHYS), + .length = OMAP343X_SDRC_SIZE, +- .type = MT_DEVICE ++ .type = MT_MEMORY_SO + }, + { + .virtual = L4_PER_34XX_VIRT, +@@ -161,7 +161,7 @@ static struct map_desc omap34xx_io_desc[] __initdata = { + .virtual = L4_EMU_34XX_VIRT, + .pfn = __phys_to_pfn(L4_EMU_34XX_PHYS), + .length = L4_EMU_34XX_SIZE, +- .type = MT_DEVICE ++ .type = MT_MEMORY_SO + }, + }; + #endif +diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c +index a713e40..d5f25ad 100644 +--- a/arch/arm/mm/mmu.c ++++ b/arch/arm/mm/mmu.c +@@ -245,6 +245,10 @@ static struct mem_type mem_types[] = { + .prot_sect = PMD_TYPE_SECT, + .domain = DOMAIN_KERNEL, + }, ++ [MT_MEMORY_SO] = { ++ .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_UNCACHED, ++ .domain = DOMAIN_KERNEL, ++ }, + }; + + const struct mem_type *get_mem_type(unsigned int type) +-- +-- +To unsubscribe from this list: send the line "unsubscribe linux-omap" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html + diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index 290d90084b..14de954e7c 100644 --- a/packages/linux/linux-omap_git.bb +++ b/packages/linux/linux-omap_git.bb @@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| SRCREV = "e1c49d7d22af768188e2a54c167ed79919361e55" PV = "2.6.26+2.6.27-rc7+${PR}+git${SRCREV}" -PR = "r12" +PR = "r14" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -34,6 +34,8 @@ SRC_URI_append = " \ file://musb-fix-multiple-bulk-transfers.diff;patch=1 \ file://mru-256MB.diff;patch=1 \ file://musb-fix-endpoints.diff;patch=1 \ + file://dvb-fix-dma.diff;patch=1 \ + file://fix-irq33.diff;patch=1 \ " diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb index c68b5c2e69..dac670abf9 100644 --- a/packages/linux/linux-openmoko-devel_git.bb +++ b/packages/linux/linux-openmoko-devel_git.bb @@ -5,21 +5,14 @@ DESCRIPTION = "Linux 2.6.x (development) kernel for the Openmoko Neo Smartphones DEFAULT_PREFERENCE = "-1" -KERNEL_RELEASE = "2.6.24" +KERNEL_RELEASE = "2.6.26" KERNEL_VERSION = "${KERNEL_RELEASE}" -PV = "${KERNEL_RELEASE}+gitr${SRCREV}" -PR = "r4" +PV = "${KERNEL_RELEASE}+${PR}-gitr${SRCREV}" +PR = "r0" SRC_URI = "\ - git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy \ - \ - file://0001-squashfs-with-lzma.patch;patch=1 \ - file://0002-squashfs-initrd.patch;patch=1 \ - file://0003-squashfs-force-O2.patch;patch=1 \ - file://0004-squashfs-Kconfig.patch;patch=1 \ - file://0005-squashfs-Makefile.patch;patch=1 \ - \ + git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable-tracking \ file://defconfig-oe \ " S = "${WORKDIR}/git" diff --git a/packages/pmount/pmount-0.9.17/.mtn2git_empty b/packages/pmount/pmount-0.9.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pmount/pmount-0.9.17/.mtn2git_empty diff --git a/packages/pmount/pmount-0.9.17/gettext.patch b/packages/pmount/pmount-0.9.17/gettext.patch new file mode 100644 index 0000000000..dbac93f6ba --- /dev/null +++ b/packages/pmount/pmount-0.9.17/gettext.patch @@ -0,0 +1,133 @@ +Index: pmount-0.9.17/src/pmount-hal.c +=================================================================== +--- pmount-0.9.17.orig/src/pmount-hal.c 2007-07-01 13:58:49.000000000 +0200 ++++ pmount-0.9.17/src/pmount-hal.c 2008-10-08 23:39:20.970178412 +0200 +@@ -16,7 +16,6 @@ + #include <dirent.h> + #include <sys/stat.h> + #include <locale.h> +-#include <libintl.h> + #include <libhal-storage.h> + + #include "policy.h" +@@ -26,7 +25,12 @@ + #include "realpath.h" + + /* gettext abbreviation */ ++#ifdef ENABLE_NLS ++#include <libintl.h> + #define _(String) gettext(String) ++#else ++#define _(String) (String) ++#endif + + void help() { + puts( _( +@@ -196,10 +200,12 @@ + char *dmask = NULL; + char *iocharset = NULL; + ++#ifdef ENABLE_NLS + /* initialize locale */ + setlocale( LC_ALL, "" ); + bindtextdomain( "pmount", NULL ); + textdomain( "pmount" ); ++#endif + + if( argc < 2 ) { + help(); +Index: pmount-0.9.17/src/utils.h +=================================================================== +--- pmount-0.9.17.orig/src/utils.h 2007-07-07 09:05:06.000000000 +0200 ++++ pmount-0.9.17/src/utils.h 2008-10-08 23:19:09.515475595 +0200 +@@ -12,7 +12,12 @@ + #define __utils_h + + /* gettext abbreviation */ ++#ifdef ENABLE_NLS ++#include <libintl.h> + #define _(String) gettext(String) ++#else ++#define _(String) (String) ++#endif + + /* global flag whether to print debug messages (false by default) */ + extern int enable_debug; +Index: pmount-0.9.17/configure.ac +=================================================================== +--- pmount-0.9.17.orig/configure.ac 2007-12-14 20:27:23.000000000 +0100 ++++ pmount-0.9.17/configure.ac 2008-10-08 23:19:09.598820915 +0200 +@@ -77,10 +77,7 @@ + fi + AM_CONDITIONAL(PMOUNT_HAL, test -n "$BUILD_HAL") + +-GETTEXT_PACKAGE="pmount" +-AC_SUBST(GETTEXT_PACKAGE) +-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) +-AM_GLIB_GNU_GETTEXT ++AM_GNU_GETTEXT([external]) + + AC_OUTPUT([ + Makefile +Index: pmount-0.9.17/src/pmount.c +=================================================================== +--- pmount-0.9.17.orig/src/pmount.c 2008-10-08 23:36:44.452037557 +0200 ++++ pmount-0.9.17/src/pmount.c 2008-10-08 23:37:38.778816969 +0200 +@@ -21,9 +21,12 @@ + #include <errno.h> + #include <locale.h> + #include <langinfo.h> +-#include <libintl.h> + #include <sys/stat.h> + ++#ifdef ENABLE_NLS ++#include <libintl.h> ++#endif ++ + #include "fs.h" + #include "policy.h" + #include "utils.h" +@@ -619,10 +622,12 @@ + { NULL, 0, NULL, 0} + }; + ++#ifdef ENABLE_NLS + /* initialize locale */ + setlocale( LC_ALL, "" ); + bindtextdomain( "pmount", NULL ); + textdomain( "pmount" ); ++#endif + |