diff options
Diffstat (limited to 'packages')
56 files changed, 1128 insertions, 508 deletions
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/boost/boost-jam-native_3.1.16.bb b/packages/boost/boost-jam-native_3.1.16.bb index 955f7bfac8..2e92146a83 100644 --- a/packages/boost/boost-jam-native_3.1.16.bb +++ b/packages/boost/boost-jam-native_3.1.16.bb @@ -1,6 +1,4 @@ include boost-jam-native.inc -DEFAULT_PREFERENCE = "-1" - SRC_URI = "${SOURCEFORGE_MIRROR}/boost/boost-jam-${PV}.tgz" diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb index 3046ff44c1..81ffad3b14 100644 --- a/packages/classpath/classpath-native_0.97.2.bb +++ b/packages/classpath/classpath-native_0.97.2.bb @@ -21,7 +21,7 @@ do_unpackpost() { mv external/w3c_dom/org/w3c/dom/html2 \ external/w3c_dom/org/w3c/dom/html - find gnu/classpath/examples/html gnu/xml/dom/html2 external/w3c_dom/org/w3c/dom/html -name "*.java" \ + find examples/gnu/classpath/examples/html gnu/xml/dom/html2 external/w3c_dom/org/w3c/dom/html -name "*.java" \ -exec sed -i -e"s|org.w3c.dom.html2|org.w3c.dom.html|" {} \; sed -i -e"s|org/w3c/dom/html2|org/w3c/dom/html|" external/w3c_dom/Makefile.am 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/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc index 9cb936a105..a084b1cae0 100644 --- a/packages/gnuradio/gnuradio.inc +++ b/packages/gnuradio/gnuradio.inc @@ -2,7 +2,7 @@ DESCRIPTION = "GNU Radio" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = " guile-native fftwf python libusb-compat virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native" +DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native" RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs python-lang python-textutils" RDEPENDS_gnuradio-usrp = "python-core" @@ -22,6 +22,7 @@ EXTRA_OECONF = " \ --enable-gr-audio-oss \ --enable-mblock \ --disable-html-docs \ + PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/python2.5 \ " do_configure_append() { @@ -55,7 +56,7 @@ FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \ " FILES_gnuradio-usrp = "${libdir}/python*/site-packages/usrpm/* \ - ${datadir}/usrp" + ${datadir}/usrp/*/*" FILES_gnuradio-usrp-dbg = "${libdir}/python*/site-packages/usrpm/.debug" diff --git a/packages/gnuradio/gnuradio/no-usrp2.patch b/packages/gnuradio/gnuradio/no-usrp2.patch new file mode 100644 index 0000000000..fc9e2a736f --- /dev/null +++ b/packages/gnuradio/gnuradio/no-usrp2.patch @@ -0,0 +1,12 @@ +--- gnuradio-trunk-work/configure.ac.orig 2008-10-06 13:38:45.000000000 -0400 ++++ gnuradio-trunk-work/configure.ac 2008-10-06 13:39:02.000000000 -0400 +@@ -272,9 +272,7 @@ + GRC_PMT + GRC_MBLOCK dnl this must come after GRC_PMT + GRC_USRP +-GRC_USRP2 + GRC_GR_USRP dnl this must come after GRC_USRP +-GRC_GR_USRP2 + GRC_GR_GCELL dnl this must come after GRC_GCELL and GRC_GNURADIO_CORE + GRC_GR_MSDD6000 + GRC_GR_AUDIO_ALSA diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb index f72cf2fb9a..3d4f12aa7d 100644 --- a/packages/gnuradio/gnuradio_svn.bb +++ b/packages/gnuradio/gnuradio_svn.bb @@ -2,13 +2,27 @@ require gnuradio.inc DEFAULT_PREFERENCE = "-1" -PV = "3.0.4+svnr${SRCREV}" +PV = "3.1.3+svnr${SRCREV}" PR = "r4" -SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \ - file://no-trellis-doc.patch;patch=1 \ +EXTRA_OECONF += "--with-boost=${STAGING_DIR_TARGET}/usr CXXFLAGS=-DBOOST_SP_USE_PTHREADS --disable-usrp1 --disable--usrp2" + +SRC_URI = "svn://gnuradio.org/svn/gnuradio/;module=trunk;proto=http \ + file://no-usrp2.patch;patch=1 \ +# file://no-trellis-doc.patch;patch=1 \ +# file://gnuradio-neon.patch;patch=1;pnum=0 \ " S="${WORKDIR}/trunk" +#do_configure() { +# ./bootstrap +# oe_runconf +#} + +do_compile_append() { + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + gnuradio-core/gnuradio-core.pc +} 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/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles index b2ae2794dc..fbcc858226 100644 --- a/packages/initscripts/initscripts-1.0/volatiles +++ b/packages/initscripts/initscripts-1.0/volatiles @@ -33,6 +33,7 @@ l root root 0755 /var/run /var/volatile/run l root root 1777 /var/tmp /var/volatile/tmp d root root 0755 /var/lock/subsys none f root root 0664 /var/log/wtmp none +f root root 0644 /var/log/lastlog none f root root 0664 /var/run/utmp none l root root 0644 /etc/resolv.conf /var/run/resolv.conf f root root 0644 /var/run/resolv.conf none diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 2ed20952f1..b1c43174e8 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r108" +PR = "r109" SRC_URI = "file://functions \ file://halt \ 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/musb-fix-endpoints.diff b/packages/linux/linux-omap/musb-fix-endpoints.diff new file mode 100644 index 0000000000..5d1201f014 --- /dev/null +++ b/packages/linux/linux-omap/musb-fix-endpoints.diff @@ -0,0 +1,197 @@ +From: Ajay Kumar Gupta <ajay.gupta@ti.com> +To: linux-usb@vger.kernel.org +Cc: linux-omap@vger.kernel.org, david-b@pacbell.net, me@felipebalbi.com, + Ajay Kumar Gupta <ajay.gupta@ti.com> +Subject: [PATCH] MUSB: BULK request on different available endpoints +Date: Tue, 7 Oct 2008 11:12:24 +0530 + +Fixes co-working issue of usb serial device with usb/net devices while +oter endpoints are free and can be used.This patch implements the policy +that if endpoint resources are available then different BULK request goes +to different endpoint otherwise they are multiplexed to one reserved +endpoint as currently done. + +NAK limit scheme has to be added for multiplexed BULK request scenario +to avoid endpoint starvation due to usb/net devices. + +musb->periodic[] flag setting is also updated.It use to set this flag for +an endpoint even when only rx or tx is used.Now flag setting is done on +rx/tx basis of an endpoint. + +Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> +--- + drivers/usb/musb/musb_host.c | 94 ++++++++++++++++++++++++------------------ + drivers/usb/musb/musb_host.h | 1 + + 2 files changed, 55 insertions(+), 40 deletions(-) + +--- /tmp/musb_host.c 2008-10-07 10:10:49.000000000 +0200 ++++ git/drivers/usb/musb/musb_host.c 2008-10-07 10:13:59.000000000 +0200 +@@ -378,27 +378,32 @@ + + switch (qh->type) { + ++ case USB_ENDPOINT_XFER_CONTROL: ++ case USB_ENDPOINT_XFER_BULK: ++ /* fifo policy for these lists, except that NAKing ++ * should rotate a qh to the end (for fairness). ++ */ ++ if (qh->mux == 1) { ++ head = qh->ring.prev; ++ list_del(&qh->ring); ++ kfree(qh); ++ qh = first_qh(head); ++ break; ++ } + case USB_ENDPOINT_XFER_ISOC: + case USB_ENDPOINT_XFER_INT: + /* this is where periodic bandwidth should be + * de-allocated if it's tracked and allocated; + * and where we'd update the schedule tree... + */ +- musb->periodic[ep->epnum] = NULL; ++ if (is_in) ++ musb->periodic[2 * ep->epnum - 2] = NULL; ++ else ++ musb->periodic[2 * ep->epnum - 1] = NULL; + kfree(qh); + qh = NULL; + break; + +- case USB_ENDPOINT_XFER_CONTROL: +- case USB_ENDPOINT_XFER_BULK: +- /* fifo policy for these lists, except that NAKing +- * should rotate a qh to the end (for fairness). +- */ +- head = qh->ring.prev; +- list_del(&qh->ring); +- kfree(qh); +- qh = first_qh(head); +- break; + } + } + return qh; +@@ -1728,22 +1733,9 @@ + u16 maxpacket; + + /* use fixed hardware for control and bulk */ +- switch (qh->type) { +- case USB_ENDPOINT_XFER_CONTROL: ++ if (qh->type == USB_ENDPOINT_XFER_CONTROL) { + head = &musb->control; + hw_ep = musb->control_ep; +- break; +- case USB_ENDPOINT_XFER_BULK: +- hw_ep = musb->bulk_ep; +- if (is_in) +- head = &musb->in_bulk; +- else +- head = &musb->out_bulk; +- break; +- } +- if (head) { +- idle = list_empty(head); +- list_add_tail(&qh->ring, head); + goto success; + } + +@@ -1778,7 +1770,8 @@ + for (epnum = 1; epnum < musb->nr_endpoints; epnum++) { + int diff; + +- if (musb->periodic[epnum]) ++ if ((is_in && musb->periodic[2 * epnum - 2]) || ++ (!is_in && musb->periodic[2 * epnum - 1])) + continue; + hw_ep = &musb->endpoints[epnum]; + if (hw_ep == musb->bulk_ep) +@@ -1789,19 +1782,36 @@ + else + diff = hw_ep->max_packet_sz_tx - maxpacket; + +- if (diff > 0 && best_diff > diff) { ++ if (diff >= 0 && best_diff > diff) { + best_diff = diff; + best_end = epnum; + } + } +- if (best_end < 0) ++ /* use bulk reserved ep1 if no other ep is free*/ ++ if (best_end < 0 && qh->type == USB_ENDPOINT_XFER_BULK) { ++ hw_ep = musb->bulk_ep; ++ if (is_in) ++ head = &musb->in_bulk; ++ else ++ head = &musb->out_bulk; ++ goto success; ++ } else if (best_end < 0) + return -ENOSPC; + + idle = 1; ++ qh->mux = 0; + hw_ep = musb->endpoints + best_end; +- musb->periodic[best_end] = qh; +- DBG(4, "qh %p periodic slot %d\n", qh, best_end); ++ if (is_in) ++ musb->periodic[2 * best_end - 2] = qh; ++ else ++ musb->periodic[2 * best_end - 1] = qh; ++ DBG(4, "qh %p periodic slot %d%s\n", qh, best_end, is_in ? "Rx" : "Tx"); + success: ++ if (head) { ++ idle = list_empty(head); ++ list_add_tail(&qh->ring, head); ++ qh->mux = 1; ++ } + qh->hw_ep = hw_ep; + qh->hep->hcpriv = qh; + if (idle) +@@ -2065,11 +2075,13 @@ + sched = &musb->control; + break; + case USB_ENDPOINT_XFER_BULK: +- if (usb_pipein(urb->pipe)) +- sched = &musb->in_bulk; +- else +- sched = &musb->out_bulk; +- break; ++ if (qh->mux == 1) { ++ if (usb_pipein(urb->pipe)) ++ sched = &musb->in_bulk; ++ else ++ sched = &musb->out_bulk; ++ break; ++ } + default: + /* REVISIT when we get a schedule tree, periodic + * transfers won't always be at the head of a +@@ -2131,11 +2143,13 @@ + sched = &musb->control; + break; + case USB_ENDPOINT_XFER_BULK: +- if (is_in) +- sched = &musb->in_bulk; +- else +- sched = &musb->out_bulk; +- break; ++ if (qh->mux == 1) { ++ if (is_in) ++ sched = &musb->in_bulk; ++ else ++ sched = &musb->out_bulk; ++ break; ++ } + case USB_ENDPOINT_XFER_ISOC: + case USB_ENDPOINT_XFER_INT: + for (i = 0; i < musb->nr_endpoints; i++) { +--- /tmp/musb_host.h 2008-10-07 08:59:38.000000000 +0200 ++++ git/drivers/usb/musb/musb_host.h 2008-10-07 10:10:54.000000000 +0200 +@@ -53,7 +53,8 @@ + + struct list_head ring; /* of musb_qh */ + /* struct musb_qh *next; */ /* for periodic tree */ +- ++ u8 mux; /* qh multiplexed to hw_ep */ ++ + unsigned offset; /* in urb->transfer_buffer */ + unsigned segsize; /* current xfer fragment */ + diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb index b00572771c..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 = "r11" +PR = "r14" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -33,6 +33,9 @@ SRC_URI_append = " \ file://musb-fix-ISO-in-unlink.diff;patch=1 \ 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/miglayout/miglayout_3.0.3.bb b/packages/miglayout/miglayout_3.0.3.bb new file mode 100644 index 0000000000..2450a7e01f --- /dev/null +++ b/packages/miglayout/miglayout_3.0.3.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Flexible layout classes for Swing and SWT" +LICENSE = "BSD" + +AUTHOR = "Mikael Grev" +HOMEPAGE = "http://www.migcalendar.com/miglayout" + +SRC_URI = "http://www.migcalendar.com/${PN}/versions/${P}.zip" + +S = "${WORKDIR}" + +inherit java-library + +DEPENDS = "unzip-native fastjar-native classpath swt3.4-gtk" + +do_unpackpost() { + find -name "*.jar" -exec rm {} \; + + mkdir sources + unzip miglayout-src.zip -d sources +} + +addtask unpackpost after do_unpack before do_patch + +do_compile() { + oe_makeclasspath cp -s swt + + javac \ + -source 5.0 -sourcepath sources -cp $cp \ + -d build \ + `find sources -name "*.java" -and -not -wholename "*demo*"` \ + + fastjar -C build -c -f ${JARFILENAME} . +} + 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 + + /* If pmount is run without a single argument, print out the list + of removable devices. Does not require root privileges, just read access +Index: pmount-0.9.17/src/pumount.c +=================================================================== +--- pmount-0.9.17.orig/src/pumount.c 2008-10-08 23:38:21.122028300 +0200 ++++ pmount-0.9.17/src/pumount.c 2008-10-08 23:38:47.972023678 +0200 +@@ -16,9 +16,12 @@ + #include <sys/wait.h> + #include <limits.h> + #include <getopt.h> +-#include <libintl.h> + #include <locale.h> + ++#ifdef ENABLE_NLS ++#include <libintl.h> ++#endif ++ + #include "policy.h" + #include "utils.h" + #include "luks.h" +@@ -172,10 +175,12 @@ + { NULL, 0, NULL, 0} + }; + ++#ifdef ENABLE_NLS + /* initialize locale */ + setlocale( LC_ALL, "" ); + bindtextdomain( "pmount", NULL ); + textdomain( "pmount" ); ++#endif + + /* are we root? */ + if( geteuid() ) { diff --git a/packages/pmount/pmount-0.9.17/install.patch b/packages/pmount/pmount-0.9.17/install.patch new file mode 100644 index 0000000000..b02942a591 --- /dev/null +++ b/packages/pmount/pmount-0.9.17/install.patch @@ -0,0 +1,15 @@ +Index: pmount-0.9.17/src/Makefile.am +=================================================================== +--- pmount-0.9.17.orig/src/Makefile.am 2008-10-09 01:22:41.668067209 +0200 ++++ pmount-0.9.17/src/Makefile.am 2008-10-09 01:23:22.144725902 +0200 +@@ -36,8 +36,8 @@ + + install-data-hook: + test -z $(INSTALL_DIR) || mkdir -p -- $(INSTALL_DIR) +- $(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount +- $(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount ++ $(INSTALL_DATA) -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount ++ $(INSTALL_DATA) -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount + + uninstall-hook: + rm -f $(INSTALL_DIR)/pmount diff --git a/packages/pmount/pmount_0.9.17.bb b/packages/pmount/pmount_0.9.17.bb new file mode 100644 index 0000000000..f72534b468 --- /dev/null +++ b/packages/pmount/pmount_0.9.17.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Policy based mounter that gives the ability to mount removable devices as a user" +HOMEPAGE = "http://pmount.alioth.debian.org/" +LICENSE = "GPLv2" +PR = "r0" + +DEPENDS = "hal e2fsprogs-libs sysfsutils" +RDEPENDS_${PN}-hal = "${PN}" +RRECOMMENDS_${PN}-hal = "hal" + +SRC_URI = "http://alioth.debian.org/frs/download.php/2247/${P}.tar.gz \ + file://gettext.patch;patch=1 \ + file://install.patch;patch=1 \ + " + +inherit autotools gettext + +EXTRA_OECONF = "--enable-hal" + +PACKAGES =+ "${PN}-hal" + +FILES_${PN}-hal = "${bindir}/pmount-hal" + diff --git a/packages/portabase/beecrypt/config.m4 b/packages/portabase/beecrypt/config.m4 deleted file mode 100644 index 05d2d1593d..0000000000 --- a/packages/portabase/beecrypt/config.m4 +++ /dev/null @@ -1,16 +0,0 @@ -dnl config.m4 -ifdef(`__CONFIG_M4_INCLUDED__',,` -define(`CONFIG_TOP_SRCDIR',`/home/hrw/zaurus/oe/build/0930/tmp/work/beecrypt-3.1.0-r0/beecrypt-3.1.0') -define(`ASM_OS',`linux-gnu') -define(`ASM_CPU',`arm') -define(`ASM_ARCH',`arm') -define(`ASM_BIGENDIAN',`no') -define(`ASM_SRCDIR',`/home/hrw/zaurus/oe/build/0930/tmp/work/beecrypt-3.1.0-r0/beecrypt-3.1.0/gas') -define(`TEXTSEG',`.text') -define(`GLOBL',`.globl') -define(`GSYM_PREFIX',`') -define(`LSYM_PREFIX',`.L') -define(`ALIGN',`') -define(`__CONFIG_M4_INCLUDED__') -include(asmdefs.m4) -') diff --git a/packages/portabase/beecrypt/gas.patch b/packages/portabase/beecrypt/gas.patch deleted file mode 100644 index bdb20944d3..0000000000 --- a/packages/portabase/beecrypt/gas.patch +++ /dev/null @@ -1,166 +0,0 @@ -diff -ur beecrypt-3.1.0/gas.orig/aesopt.ppc.m4 beecrypt-3.1.0/gas/aesopt.ppc.m4 ---- beecrypt-3.1.0/gas.orig/aesopt.ppc.m4 2003-06-09 08:03:21 +0200 -+++ beecrypt-3.1.0/gas/aesopt.ppc.m4 2004-10-06 17:59:31 +0200 -@@ -21,7 +21,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/ppc.m4) -+include(ppc.m4) - - define(`s0',`r24') - define(`s1',`r25') -diff -ur beecrypt-3.1.0/gas.orig/aesopt.x86.m4 beecrypt-3.1.0/gas/aesopt.x86.m4 ---- beecrypt-3.1.0/gas.orig/aesopt.x86.m4 2003-06-09 10:35:39 +0200 -+++ beecrypt-3.1.0/gas/aesopt.x86.m4 2004-10-06 17:54:36 +0200 -@@ -1,5 +1,5 @@ - include(config.m4) --include(ASM_SRCDIR/x86.m4) -+include(x86.m4) - - ifdef(`USE_MMX',` - -diff -ur beecrypt-3.1.0/gas.orig/blowfishopt.i586.m4 beecrypt-3.1.0/gas/blowfishopt.i586.m4 ---- beecrypt-3.1.0/gas.orig/blowfishopt.i586.m4 2003-06-09 10:25:11 +0200 -+++ beecrypt-3.1.0/gas/blowfishopt.i586.m4 2004-10-06 17:54:58 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/x86.m4) -+include(x86.m4) - - dnl during this macro we assume: - dnl bp in %esi, xl and xr in %ecx and %edx, %eax and %ebx clear -diff -ur beecrypt-3.1.0/gas.orig/blowfishopt.ppc.m4 beecrypt-3.1.0/gas/blowfishopt.ppc.m4 ---- beecrypt-3.1.0/gas.orig/blowfishopt.ppc.m4 2003-06-04 19:39:57 +0200 -+++ beecrypt-3.1.0/gas/blowfishopt.ppc.m4 2004-10-06 17:59:36 +0200 -@@ -21,7 +21,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/ppc.m4) -+include(ppc.m4) - - define(`round',` - lwz r9,$3(r3) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.alpha.m4 beecrypt-3.1.0/gas/mpopt.alpha.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.alpha.m4 2003-05-29 10:44:37 +0200 -+++ beecrypt-3.1.0/gas/mpopt.alpha.m4 2004-10-06 17:57:20 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/alpha.m4) -+include(alpha.m4) - - - C_FUNCTION_BEGIN(mpadd) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.ia64.m4 beecrypt-3.1.0/gas/mpopt.ia64.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.ia64.m4 2003-05-28 10:40:44 +0200 -+++ beecrypt-3.1.0/gas/mpopt.ia64.m4 2004-10-06 17:57:32 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/ia64.m4) -+include(ia64.m4) - - define(`sze',`r14') - define(`dst',`r15') -diff -ur beecrypt-3.1.0/gas.orig/mpopt.m68k.m4 beecrypt-3.1.0/gas/mpopt.m68k.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.m68k.m4 2003-04-26 14:01:57 +0200 -+++ beecrypt-3.1.0/gas/mpopt.m68k.m4 2004-10-06 17:57:38 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/m68k.m4) -+include(m68k.m4) - - dnl works - C_FUNCTION_BEGIN(mpadd) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.ppc64.m4 beecrypt-3.1.0/gas/mpopt.ppc64.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.ppc64.m4 2003-04-19 18:05:43 +0200 -+++ beecrypt-3.1.0/gas/mpopt.ppc64.m4 2004-10-06 17:57:54 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/ppc64.m4) -+include(ppc64.m4) - - - C_FUNCTION_BEGIN(mpaddw) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.ppc.m4 beecrypt-3.1.0/gas/mpopt.ppc.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.ppc.m4 2003-04-19 18:05:43 +0200 -+++ beecrypt-3.1.0/gas/mpopt.ppc.m4 2004-10-06 17:57:50 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/ppc.m4) -+include(ppc.m4) - - - C_FUNCTION_BEGIN(mpaddw) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.sparcv8.m4 beecrypt-3.1.0/gas/mpopt.sparcv8.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.sparcv8.m4 2003-04-19 18:05:43 +0200 -+++ beecrypt-3.1.0/gas/mpopt.sparcv8.m4 2004-10-06 17:56:54 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/sparc.m4) -+include(sparc.m4) - - - C_FUNCTION_BEGIN(mpsetmul) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.sparcv8plus.m4 beecrypt-3.1.0/gas/mpopt.sparcv8plus.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.sparcv8plus.m4 2003-04-19 18:05:43 +0200 -+++ beecrypt-3.1.0/gas/mpopt.sparcv8plus.m4 2004-10-06 17:57:04 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/sparc.m4) -+include(sparc.m4) - - - C_FUNCTION_BEGIN(mpaddw) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.x86_64.m4 beecrypt-3.1.0/gas/mpopt.x86_64.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.x86_64.m4 2003-05-29 14:40:37 +0200 -+++ beecrypt-3.1.0/gas/mpopt.x86_64.m4 2004-10-06 17:56:14 +0200 -@@ -21,7 +21,7 @@ - .file "mpopt.s" - - include(config.m4) --include(ASM_SRCDIR/x86_64.m4) -+include(x86_64.m4) - - - C_FUNCTION_BEGIN(mpzero) -diff -ur beecrypt-3.1.0/gas.orig/mpopt.x86.m4 beecrypt-3.1.0/gas/mpopt.x86.m4 ---- beecrypt-3.1.0/gas.orig/mpopt.x86.m4 2003-06-04 19:39:58 +0200 -+++ beecrypt-3.1.0/gas/mpopt.x86.m4 2004-10-06 17:56:27 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/x86.m4) -+include(x86.m4) - - - C_FUNCTION_BEGIN(mpzero) -diff -ur beecrypt-3.1.0/gas.orig/sha1opt.x86.m4 beecrypt-3.1.0/gas/sha1opt.x86.m4 ---- beecrypt-3.1.0/gas.orig/sha1opt.x86.m4 2003-05-08 19:52:54 +0200 -+++ beecrypt-3.1.0/gas/sha1opt.x86.m4 2004-10-06 17:55:20 +0200 -@@ -19,7 +19,7 @@ - dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - include(config.m4) --include(ASM_SRCDIR/x86.m4) -+include(x86.m4) - - .equ K00, 0x5a827999 - .equ K20, 0x6ed9eba1 diff --git a/packages/portabase/beecrypt/m4.diff b/packages/portabase/beecrypt/m4.diff deleted file mode 100644 index 0d07f75cb2..0000000000 --- a/packages/portabase/beecrypt/m4.diff +++ /dev/null @@ -1,155 +0,0 @@ ---- beecrypt-3.1.0/acinclude.m4.orig 2004-10-06 17:09:25.000000000 +0200 -+++ beecrypt-3.1.0/acinclude.m4 2004-10-06 17:12:22.000000000 +0200 -@@ -9,7 +9,7 @@ - - - dnl BEECRYPT_INT_TYPES --AC_DEFUN(BEECRYPT_INT_TYPES,[ -+AC_DEFUN([BEECRYPT_INT_TYPES],[ - AC_TYPE_SIZE_T - bc_typedef_size_t= - if test $ac_cv_type_size_t != yes; then -@@ -112,7 +112,7 @@ - - - dnl BEECRYPT_CPU_BITS --AC_DEFUN(BEECRYPT_CPU_BITS,[ -+AC_DEFUN([BEECRYPT_CPU_BITS],[ - AC_CHECK_SIZEOF([unsigned long]) - if test $ac_cv_sizeof_unsigned_long -eq 8; then - AC_SUBST(MP_WBITS,64U) -@@ -125,7 +125,7 @@ - - - dnl BEECRYPT_WORKING_AIO --AC_DEFUN(BEECRYPT_WORKING_AIO,[ -+AC_DEFUN([BEECRYPT_WORKING_AIO],[ - AC_CHECK_HEADERS(aio.h) - if test "$ac_cv_header_aio_h" = yes; then - AC_SEARCH_LIBS([aio_read],[c rt aio posix4],[ -@@ -228,7 +228,7 @@ - - - dnl BEECRYPT_CFLAGS_REM --AC_DEFUN(BEECRYPT_CFLAGS_REM,[ -+AC_DEFUN([BEECRYPT_CFLAGS_REM],[ - if test "$CFLAGS" != ""; then - CFLAGS_save="" - for flag in $CFLAGS -@@ -243,7 +243,7 @@ - - - dnl BEECRYPT_GNU_CC --AC_DEFUN(BEECRYPT_GNU_CC,[ -+AC_DEFUN([BEECRYPT_GNU_CC],[ - AC_REQUIRE([AC_PROG_CC]) - case $bc_target_arch in - ia64) -@@ -331,7 +331,7 @@ - - - dnl BEECRYPT_COMPAQ_CC --AC_DEFUN(BEECRYPT_COMPAQ_CC,[ -+AC_DEFUN([BEECRYPT_COMPAQ_CC],[ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_PROG_CPP]) - AC_CACHE_CHECK([whether we are using Compaq's C compiler],bc_cv_prog_COMPAQ_CC,[ -@@ -355,7 +355,7 @@ - - - dnl BEECRYPT_HPUX_CC --AC_DEFUN(BEECRYPT_HPUX_CC,[ -+AC_DEFUN([BEECRYPT_HPUX_CC],[ - if test "$ac_enable_debug" != yes; then - BEECRYPT_CFLAGS_REM([-g]) - CFLAGS="$CFLAGS -fast" -@@ -364,7 +364,7 @@ - - - dnl BEECRYPT_IBM_CC --AC_DEFUN(BEECRYPT_IBM_CC,[ -+AC_DEFUN([BEECRYPT_IBM_CC],[ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_PROG_CPP]) - AC_CACHE_CHECK([whether we are using IBM C],bc_cv_prog_IBM_CC,[ -@@ -398,7 +398,7 @@ - - - dnl BEECRYPT_INTEL_CC --AC_DEFUN(BEECRYPT_INTEL_CC,[ -+AC_DEFUN([BEECRYPT_INTEL_CC],[ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_PROG_CPP]) - AC_CACHE_CHECK([whether we are using Intel C++],bc_cv_prog_INTEL_CC,[ -@@ -448,7 +448,7 @@ - - - dnl BEECRYPT_SUN_FORTE_CC --AC_DEFUN(BEECRYPT_SUN_FORTE_CC,[ -+AC_DEFUN([BEECRYPT_SUN_FORTE_CC],[ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_PROG_CPP]) - AC_CACHE_CHECK([whether we are using Sun Forte C],bc_cv_prog_SUN_FORTE_CC,[ -@@ -485,7 +485,7 @@ - - - dnl BEECRYPT_ASM_DEFS --AC_DEFUN(BEECRYPT_ASM_DEFS,[ -+AC_DEFUN([BEECRYPT_ASM_DEFS],[ - AC_SUBST(ASM_OS,$target_os) - AC_SUBST(ASM_CPU,$bc_target_cpu) - AC_SUBST(ASM_ARCH,$bc_target_arch) -@@ -494,7 +494,7 @@ - - - dnl BEECRYPT_ASM_TEXTSEG --AC_DEFUN(BEECRYPT_ASM_TEXTSEG,[ -+AC_DEFUN([BEECRYPT_ASM_TEXTSEG],[ - AC_CACHE_CHECK([how to switch to text segment], - bc_cv_asm_textseg,[ - case $target_os in -@@ -516,7 +516,7 @@ - - - dnl BEECRYPT_ASM_GLOBL --AC_DEFUN(BEECRYPT_ASM_GLOBL,[ -+AC_DEFUN([BEECRYPT_ASM_GLOBL],[ - AC_CACHE_CHECK([how to declare a global symbol], - bc_cv_asm_globl,[ - case $target_os in -@@ -529,7 +529,7 @@ - - - dnl BEECRYPT_ASM_GSYM_PREFIX --AC_DEFUN(BEECRYPT_ASM_GSYM_PREFIX,[ -+AC_DEFUN([BEECRYPT_ASM_GSYM_PREFIX],[ - AC_CACHE_CHECK([if global symbols need leading underscore], - bc_cv_asm_gsym_prefix,[ - case $target_os in -@@ -542,7 +542,7 @@ - - - dnl BEECRYPT_ASM_LSYM_PREFIX --AC_DEFUN(BEECRYPT_ASM_LSYM_PREFIX,[ -+AC_DEFUN([BEECRYPT_ASM_LSYM_PREFIX],[ - AC_CACHE_CHECK([how to declare a local symbol], - bc_cv_asm_lsym_prefix,[ - case $target_os in -@@ -562,7 +562,7 @@ - - - dnl BEECRYPT_ASM_ALIGN --AC_DEFUN(BEECRYPT_ASM_ALIGN,[ -+AC_DEFUN([BEECRYPT_ASM_ALIGN],[ - AC_CACHE_CHECK([how to align symbols], - bc_cv_asm_align,[ - case $target_cpu in -@@ -587,7 +587,7 @@ - - - dnl BEECRYPT_ASM_SOURCES --AC_DEFUN(BEECRYPT_ASM_SOURCES,[ -+AC_DEFUN([BEECRYPT_ASM_SOURCES],[ - echo > mpopt.s - echo > aesopt.s - echo > blowfishopt.s diff --git a/packages/portabase/beecrypt_3.1.0.bb b/packages/portabase/beecrypt_3.1.0.bb deleted file mode 100644 index bd61bad88e..0000000000 --- a/packages/portabase/beecrypt_3.1.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -SECTION = "console/utils" -DESCRIPTION = "BeeCrypt is an ongoing project to provide a strong and fast cryptography \ -toolkit. Includes entropy sources, random generators, block ciphers, hash functions, \ -message authentication codes, multiprecision integer routines, and public key primitives." - -HOMEPAGE = "http://sourceforge.net/projects/beecrypt/" -LICENSE = "LGPL" -SRC_URI = "${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \ -file://config.m4 \ -file://gas.patch;patch=1 \ -file://m4.diff;patch=1" -PR = "r1" - -inherit autotools - -do_configure_prepend() { - -cp ${WORKDIR}/config.m4 ${S}/gas/ - -} - - -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/portabase/metakit_2.4.9.3.bb b/packages/portabase/metakit_2.4.9.3.bb index 43794f3e6f..404dfcfe1e 100644 --- a/packages/portabase/metakit_2.4.9.3.bb +++ b/packages/portabase/metakit_2.4.9.3.bb @@ -8,13 +8,16 @@ HOMEPAGE = "http://www.equi4.com/metakit.html" SRC_URI = "http://www.equi4.com/pub/mk/metakit-${PV}.tar.gz \ file://metakit-2.4.9.3.patch;patch=1" -PR = "r2" +PR = "r3" + +FILES_${PN} += " ${libdir}/*.so" do_configure_prepend() { # cp ${STAGING_DATADIR}/libtool/*.* ${S}/unix/scripts/ } + do_configure () { cd builds @@ -41,10 +44,8 @@ do_configure () { } - do_stage() { -# oe_libinstall -a -C builds/.libs libmk4 ${STAGING_LIBDIR} - cp builds/.libs/libmk4.a ${STAGING_LIBDIR} + oe_libinstall -a -so -C builds/.libs libmk4 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/ for X in mk4.h mk4.inl do @@ -53,14 +54,12 @@ do_stage() { } - - do_compile () { cd builds oe_runmake } do_install() { - - : + oe_libinstall -so -C builds/.libs libmk4 ${D}${libdir} } + diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb index d43cb520cb..be8fc35a5a 100644 --- a/packages/python/python-native_2.5.1.bb +++ b/packages/python/python-native_2.5.1.bb @@ -26,8 +26,8 @@ exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}" EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \ --without-cxx --with-signal-module --with-wctype-functions" -EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR} \ - STAGING_INCDIR=${STAGING_INCDIR}' +EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \ + STAGING_INCDIR=${STAGING_INCDIR_NATIVE}' do_stage_append() { install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/ diff --git a/packages/splashutils/.mtn2git_empty b/packages/splashutils/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/splashutils/.mtn2git_empty diff --git a/packages/splashutils/splashutils_1.5.4.2.bb b/packages/splashutils/splashutils_1.5.4.2.bb new file mode 100644 index 0000000000..36c11ab2de --- /dev/null +++ b/packages/splashutils/splashutils_1.5.4.2.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Framebuffer splash utilities." +SECTION = "media-gfx" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://dev.gentoo.org/~spock/projects/gensplash/archive/splashutils-${PV}.tar.bz2" + +DEPENDS = "jpeg klibc" + +inherit autotools + +PARALLEL_MAKE = "" + +# klcc doesn't work with -isystem +export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}" +export BUILD_CPPFLAGS = "-I${STAGING_DIR_NATIVE}${layout_includedir}" + +do_configure_prepend() { + if [ -f "${S}"/src/Makefile.am ] ; then + sed -i "s#^INCLUDES = \(.*\)#INCLUDES = \1 $CPPFLAGS#" "${S}"/src/Makefile.am + fi +} + +EXTRA_OECONF = "--without-gpm --without-png --without-mng --without-ttf --without-ttf-kernel" + +# fbcondecor_helper is also useful outside of the main package. +RDEPENDS_${PN} = "${PN}-helper" + +PACKAGES =+ "${PN}-helper" +FILES_${PN}-helper = "${base_sbindir}/fbcondecor_helper ${base_sbindir}/splash_helper" +FILES_${PN} += "/lib" + +do_install_append () { + if [ -f "${S}"/debian/splashutils.dirs ] ; then + for dir in $(cat debian/splashutils.dirs) ; do + mkdir -p ${D}/$dir + done + fi + + ln -s fbcondecor_helper ${D}${base_sbindir}/splash_helper + +} diff --git a/packages/swt/files/Makefile b/packages/swt/files/Makefile index 2eb3557cdd..4835f1410d 100644 --- a/packages/swt/files/Makefile +++ b/packages/swt/files/Makefile @@ -5,8 +5,8 @@ CLEANFILES=*.files *.jar *.so* *-stamp RELEASE=OE_SWT_RELEASE SONAME_VERSION=OE_SWT_API_VERSION -GCJ=gcj -JAR=gjar +GCJ=false +JAR=fastjar JAVAC=javac -classpath . LDCONFIG=/sbin/ldconfig LN_S=ln -s diff --git a/packages/swt/files/swt-hildon.patch b/packages/swt/files/swt-hildon.patch index 5f095e08fc..90ceb1ee0e 100644 --- a/packages/swt/files/swt-hildon.patch +++ b/packages/swt/files/swt-hildon.patch @@ -1,7 +1,7 @@ -Index: swt/swt-source/make_linux.mak +Index: swt-source/make_linux.mak =================================================================== ---- swt.orig/swt-source/make_linux.mak 2007-06-20 12:01:22.000000000 +0200 -+++ swt/swt-source/make_linux.mak 2008-02-14 11:32:49.000000000 +0100 +--- swt-source.orig/make_linux.mak 2007-06-20 12:01:22.000000000 +0200 ++++ swt-source/make_linux.mak 2008-10-08 01:36:56.000000000 +0200 @@ -45,8 +45,8 @@ CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo @@ -31,10 +31,10 @@ Index: swt/swt-source/make_linux.mak -fPIC \ ${SWT_PTR_CFLAGS} LIBS = -shared -fPIC -Index: swt/swt-source/os.c +Index: swt-source/os.c =================================================================== ---- swt.orig/swt-source/os.c 2007-10-30 16:24:28.000000000 +0100 -+++ swt/swt-source/os.c 2008-02-14 09:32:49.000000000 +0100 +--- swt-source.orig/os.c 2008-06-05 13:31:52.000000000 +0200 ++++ swt-source/os.c 2008-10-08 01:36:56.000000000 +0200 @@ -17,6 +17,9 @@ #include "os_structs.h" #include "os_stats.h" @@ -45,7 +45,7 @@ Index: swt/swt-source/os.c #define OS_NATIVE(func) Java_org_eclipse_swt_internal_gtk_OS_##func #ifndef NO_Call -@@ -7015,9 +7018,18 @@ +@@ -7133,9 +7136,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1add) (JNIEnv *env, jclass that, jint arg0, jint arg1) { @@ -66,7 +66,7 @@ Index: swt/swt-source/os.c } #endif -@@ -9121,9 +9133,12 @@ +@@ -9375,9 +9387,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1bar_1new) (JNIEnv *env, jclass that) { @@ -80,7 +80,7 @@ Index: swt/swt-source/os.c OS_NATIVE_EXIT(env, that, _1gtk_1menu_1bar_1new_FUNC); return rc; } -@@ -15464,8 +15479,23 @@ +@@ -15849,8 +15864,23 @@ (JNIEnv *env, jclass that, jint arg0) { jint rc = 0; @@ -105,11 +105,11 @@ Index: swt/swt-source/os.c OS_NATIVE_EXIT(env, that, _1gtk_1window_1new_FUNC); return rc; } -Index: swt/swt-source/org/eclipse/swt/widgets/Menu.java +Index: swt-source/org/eclipse/swt/widgets/Menu.java =================================================================== ---- swt.orig/swt-source/org/eclipse/swt/widgets/Menu.java 2007-05-31 18:03:50.000000000 +0200 -+++ swt/swt-source/org/eclipse/swt/widgets/Menu.java 2008-02-14 09:05:04.000000000 +0100 -@@ -259,9 +259,17 @@ +--- swt-source.orig/org/eclipse/swt/widgets/Menu.java 2008-06-05 13:31:08.000000000 +0200 ++++ swt-source/org/eclipse/swt/widgets/Menu.java 2008-10-08 01:36:56.000000000 +0200 +@@ -287,9 +287,17 @@ if ((style & SWT.BAR) != 0) { handle = OS.gtk_menu_bar_new (); if (handle == 0) error (SWT.ERROR_NO_HANDLES); @@ -127,11 +127,11 @@ Index: swt/swt-source/org/eclipse/swt/widgets/Menu.java } else { handle = OS.gtk_menu_new (); if (handle == 0) error (SWT.ERROR_NO_HANDLES); -Index: swt/swt-source/org/eclipse/swt/internal/gtk/OS.java +Index: swt-source/org/eclipse/swt/internal/gtk/OS.java =================================================================== ---- swt.orig/swt-source/org/eclipse/swt/internal/gtk/OS.java 2007-10-30 16:06:36.000000000 +0100 -+++ swt/swt-source/org/eclipse/swt/internal/gtk/OS.java 2008-02-14 09:05:04.000000000 +0100 -@@ -471,6 +471,11 @@ +--- swt-source.orig/org/eclipse/swt/internal/gtk/OS.java 2008-06-05 13:32:08.000000000 +0200 ++++ swt-source/org/eclipse/swt/internal/gtk/OS.java 2008-10-08 01:36:56.000000000 +0200 +@@ -473,6 +473,11 @@ public static final byte[] window_state_event = ascii("window-state-event"); /** Properties */ @@ -143,11 +143,11 @@ Index: swt/swt-source/org/eclipse/swt/internal/gtk/OS.java public static final byte[] active = ascii("active"); public static final byte[] background_gdk = ascii("background-gdk"); public static final byte[] button_relief = ascii("button-relief"); -Index: swt/swt-source/org/eclipse/swt/widgets/Shell.java +Index: swt-source/org/eclipse/swt/widgets/Shell.java =================================================================== ---- swt.orig/swt-source/org/eclipse/swt/widgets/Shell.java 2007-11-01 11:31:12.000000000 +0100 -+++ swt/swt-source/org/eclipse/swt/widgets/Shell.java 2008-02-14 10:51:37.000000000 +0100 -@@ -1028,6 +1028,14 @@ +--- swt-source.orig/org/eclipse/swt/widgets/Shell.java 2008-06-05 13:31:10.000000000 +0200 ++++ swt-source/org/eclipse/swt/widgets/Shell.java 2008-10-08 01:36:56.000000000 +0200 +@@ -1067,6 +1067,14 @@ int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) { int width = OS.GTK_WIDGET_WIDTH (shellHandle); int height = OS.GTK_WIDGET_HEIGHT (shellHandle); @@ -162,7 +162,7 @@ Index: swt/swt-source/org/eclipse/swt/widgets/Shell.java if (!resized || oldWidth != width || oldHeight != height) { oldWidth = width; oldHeight = height; -@@ -1384,14 +1392,53 @@ +@@ -1472,14 +1480,53 @@ if ((state & FOREIGN_HANDLE) != 0) return; Monitor monitor = getMonitor (); Rectangle rect = monitor.getClientArea (); @@ -216,10 +216,10 @@ Index: swt/swt-source/org/eclipse/swt/widgets/Shell.java public void setMaximized (boolean maximized) { checkWidget(); super.setMaximized (maximized); -Index: swt/swt-source/os_custom.c +Index: swt-source/os_custom.c =================================================================== ---- swt.orig/swt-source/os_custom.c 2007-05-31 18:04:22.000000000 +0200 -+++ swt/swt-source/os_custom.c 2008-02-14 13:55:49.000000000 +0100 +--- swt-source.orig/os_custom.c 2008-06-05 13:31:50.000000000 +0200 ++++ swt-source/os_custom.c 2008-10-08 01:36:56.000000000 +0200 @@ -13,6 +13,8 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ diff --git a/packages/swt/swt-gtk.inc b/packages/swt/swt-gtk.inc index 0bdaaab932..a5e62b7155 100644 --- a/packages/swt/swt-gtk.inc +++ b/packages/swt/swt-gtk.inc @@ -3,7 +3,7 @@ LICENSE = "CPL MPL LGPL" inherit java-library -DEPENDS = "classpath-tools-native cairo gtk+ atk libxtst" +DEPENDS = "fastjar-native cairo gtk+ atk libxtst" S = "${WORKDIR}/swt-source" diff --git a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb b/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb deleted file mode 100644 index 9a74844f59..0000000000 --- a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb +++ /dev/null @@ -1,7 +0,0 @@ -require swt3.4-gtk_${PV}.bb - -PR = "r1" - -DEPENDS += "libhildon libhildonfm" - -SRC_URI += "file://swt-hildon.patch;patch=1;pnum=2" diff --git a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk-hildon_3.4.bb index 7033d0c854..667e516fa0 100644 --- a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb +++ b/packages/swt/swt3.4-gtk-hildon_3.4.bb @@ -1,7 +1,7 @@ require swt3.4-gtk_${PV}.bb -PR = "r3" +PR = "r0" DEPENDS += "libhildon libhildonfm" -SRC_URI += "file://swt-hildon.patch;patch=1;pnum=2" +SRC_URI += "file://swt-hildon.patch;patch=1" diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb deleted file mode 100644 index eda136b329..0000000000 --- a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb +++ /dev/null @@ -1,15 +0,0 @@ -require swt-gtk.inc - -PR = "r1" - -SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip \ - file://Makefile \ - file://make_linux-fix.patch;patch=1" - -# A number which is used by SWT to mark the shared libraries. -SWTVERSION = "3416" -SWT_API_VERSION = "3.4" - -PROVIDES = "swt3.4-gtk" - -RCONFLICTS = "libswt3.3-gtk-java" diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M5.bb b/packages/swt/swt3.4-gtk_3.4.bb index 4cdd7c0f94..b6eafcad8c 100644 --- a/packages/swt/swt3.4-gtk_3.3+3.4M5.bb +++ b/packages/swt/swt3.4-gtk_3.4.bb @@ -1,12 +1,12 @@ require swt-gtk.inc -PR = "r1" +PR = "r0" -SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M5-200802071530/swt-3.4M5-gtk-linux-x86.zip \ +SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip \ file://Makefile" # A number which is used by SWT to mark the shared libraries. -SWTVERSION = "3428" +SWTVERSION = "3448" SWT_API_VERSION = "3.4" PROVIDES = "swt3.4-gtk" diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index ed885703c7..40e97585ea 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r41" +PR = "r42" inherit task @@ -42,12 +42,13 @@ RDEPENDS_task-openmoko-feed = "\ # cacao \ # jamvm \ # classpath \ - gpsdrive \ +# gpsdrive \ + gpsd \ asterisk \ # gnash \ mono \ - diversity-daemon \ - diversity-maps-taipei \ +# diversity-daemon \ +# diversity-maps-taipei \ # om-maps-berlin \ # om-maps-buenos-aires \ # om-maps-london \ diff --git a/packages/tasks/task-opie-all.bb b/packages/tasks/task-opie-all.bb index 47d2eba229..9f1403f050 100644 --- a/packages/tasks/task-opie-all.bb +++ b/packages/tasks/task-opie-all.bb @@ -14,7 +14,7 @@ PACKAGES = "task-opie-applets task-opie-inputmethods task-opie-styles \ # all OPIE stuff
#
RDEPENDS_task-opie-applets = "opie-aboutapplet opie-autorotateapplet opie-batteryapplet \
- opie-bluetoothapplet opie-brightnessapplet opie-cardmon \
+ opie-bluetoothapplet opie-brightnessapplet \
opie-clipboardapplet opie-clockapplet opie-homeapplet \
opie-irdaapplet opie-lockapplet opie-logoutapplet \
opie-mailapplet opie-memoryapplet opie-multikeyapplet \
diff --git a/packages/totem/totem-pl-parser_2.24.1.bb b/packages/totem/totem-pl-parser_2.24.1.bb new file mode 100644 index 0000000000..7f3cd861e9 --- /dev/null +++ b/packages/totem/totem-pl-parser_2.24.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Playlist parser for Totem, a GTK2 based media player" +HOMEPAGE = "http://www.gnome.org/projects/totem/" +LICENSE = "GPL" + +DEPENDS = "eds-dbus" + +inherit gnome + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/totem/totem_2.24.2.bb b/packages/totem/totem_2.24.2.bb new file mode 100644 index 0000000000..a0de5705cf --- /dev/null +++ b/packages/totem/totem_2.24.2.bb @@ -0,0 +1,70 @@ +# totem OE build file +# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "A GTK2 based media player" +HOMEPAGE = "http://www.gnome.org/projects/totem/" +LICENSE = "GPL" + +DEPENDS = " totem-pl-parser gtk+ dbus bluez-libs libglade gconf libxml2 gst-ffmpeg gst-plugins-bad gst-plugins-base" +RDEPENDS_${PN} += "iso-codes" +RRECOMMENDS_${PN} += "gst-plugin-playbin \ + gst-plugin-gconfelements \ + gst-plugin-decodebin \ + gst-plugin-decodebin2 \ + gst-ffmpeg \ + gst-plugin-audioresample \ + gst-plugin-ximagesink \ + gst-plugin-xvimagesink \ + gst-plugin-alsa \ + gst-plugin-avi \ + gst-plugin-ffmpegcolorspace \ + gst-plugin-flvdemux \ + gst-plugin-nuvdemux \ + gst-plugin-videoscale \ + gst-plugin-a52dec \ + gst-plugin-mpegaudioparse \ + gst-plugin-ossaudio \ + gst-plugin-pulse \ + gst-plugin-autodetect \ + " + +inherit gnome + +SRC_URI += "file://gst-detect.diff;patch=1" + +EXTRA_OECONF=" --disable-schemas-install \ + --enable-gtk \ + --disable-iso-codes \ + --disable-debug \ + --enable-gstreamer \ + --enable-browser-plugins \ + --disable-run-in-source-tree \ + --disable-python \ + --disable-vala \ + --with-dbus \ + " + +do_configure_prepend() { + sed -i -e s:help::g ${S}/Makefile.am +} + +PACKAGES += "totem-plugin-bemused totem-plugin-gromit totem-plugin-lirc totem-plugin-media-player-keys totem-plugin-mythtv totem-plugin-ontop totem-plugin-properties totem-plugin-screensaver totem-plugin-skipto totem-plugin-thumbnail totem-plugin-youtube totem-browser-plugin-dbg totem-browser-plugin" + +FILES_totem-plugin-bemused += "${libdir}/totem/plugins/bemused/*" +FILES_totem-plugin-gromit += "${libdir}/totem/plugins/gromit/*" +FILES_totem-plugin-lirc += "${libdir}/totem/plugins/lirc/*" +FILES_totem-plugin-media-player-keys += "${libdir}/totem/plugins/media-player-keys/*" +FILES_totem-plugin-mythtv += "${libdir}/totem/plugins/mythtv/*" +FILES_totem-plugin-ontop += "${libdir}/totem/plugins/ontop/*" +FILES_totem-plugin-properties += "${libdir}/totem/plugins/properties/*" +FILES_totem-plugin-screensaver += "${libdir}/totem/plugins/screensaver/*" +FILES_totem-plugin-skipto += "${libdir}/totem/plugins/skipto/*" +FILES_totem-plugin-thumbnail += "${libdir}/totem/plugins/thumbnail/*" +FILES_totem-plugin-youtube += "${libdir}/totem/plugins/youtube/*" + +FILES_${PN} = "${bindir}/* ${sysconfdir} ${libdir}/lib*.so.* ${libexecdir} ${datadir}/icons ${datadir}/totem ${datadir}/applications" +FILES_${PN}-dbg += "${libdir}/totem/plugins/*/.debug" +FILES_${PN}-dev += "${libdir}/totem/plugins/*/*a" +FILES_totem-browser-plugin-dbg += "${libdir}/mozilla/plugins/.debug" +FILES_totem-browser-plugin += "${libdir}/mozilla/plugins/" diff --git a/packages/ttf-fonts/ttf-liberation_0.2.bb b/packages/ttf-fonts/ttf-liberation_0.2.bb index 95e33daff3..c9737152da 100644 --- a/packages/ttf-fonts/ttf-liberation_0.2.bb +++ b/packages/ttf-fonts/ttf-liberation_0.2.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://www.redhat.com/promo/fonts/" LICENSE = "Liberation" PR = "r3" -SRC_URI = "http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz" +SRC_URI = "http://fedorahosted.org/liberation-fonts/export/807b6dfd069b998cd9b4d3158da98817ef23c79d/F-9/liberation-fonts-ttf-3.tar.gz" S = "${WORKDIR}/liberation-fonts-${PV}" PACKAGES = "${PN}-dbg ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif" diff --git a/packages/u-boot/u-boot-git/beagleboard/beagle-600MHz.diff b/packages/u-boot/u-boot-git/beagleboard/beagle-600MHz.diff new file mode 100644 index 0000000000..fe183ddb77 --- /dev/null +++ b/packages/u-boot/u-boot-git/beagleboard/beagle-600MHz.diff @@ -0,0 +1,21 @@ +From: Mans Rullgard <mans@mansr.com> +Date: Mon, 29 Sep 2008 19:56:45 +0000 (+0100) +Subject: OMAP3: Set MPU clock to 600 MHz +X-Git-Url: http://git.mansr.com/?p=u-boot;a=commitdiff_plain;h=caccdb772c3028a3e3e801fb1554788150752ffc + +OMAP3: Set MPU clock to 600 MHz +--- + +diff --git a/cpu/omap3/lowlevel_init.S b/cpu/omap3/lowlevel_init.S +index 1f9a0e9..f95a65f 100644 +--- a/cpu/omap3/lowlevel_init.S ++++ b/cpu/omap3/lowlevel_init.S +@@ -208,7 +208,7 @@ mpu_dpll_param: + /* ES1 */ + .word 0x17D,0x0C,0x03,0x01 + /* ES2 */ +-.word 0x1F4,0x0C,0x03,0x01 ++.word 0x258,0x0C,0x03,0x01 + /* 3410 */ + .word 0x10A,0x0C,0x03,0x01 + diff --git a/packages/u-boot/u-boot-git/beagleboard/mru-256.diff b/packages/u-boot/u-boot-git/beagleboard/mru-256.diff new file mode 100644 index 0000000000..6099fe6c9d --- /dev/null +++ b/packages/u-boot/u-boot-git/beagleboard/mru-256.diff @@ -0,0 +1,192 @@ +From: Mans Rullgard <mans@mansr.com> +Date: Thu, 2 Oct 2008 01:25:35 +0000 (+0100) +Subject: OMAP3: Beagleboard can have dual-chip RAM +X-Git-Url: http://git.mansr.com/?p=u-boot;a=commitdiff_plain;h=ef6ee5af8d584bddadb2d45ad4320cef96b8a934;hp=caccdb772c3028a3e3e801fb1554788150752ffc + +OMAP3: Beagleboard can have dual-chip RAM + +Some Beagleboards are fitted with dual-chip RAM. Returning DDR_STACKED +from get_mem_type() causes the second chip (on CS1) to be enabled. + +FIXME: need a better way to configure this. + +Signed-off-by: Mans Rullgard <mans@mansr.com> +--- + +diff --git a/cpu/omap3/board.c b/cpu/omap3/board.c +index 804021f..f7cf289 100644 +--- a/cpu/omap3/board.c ++++ b/cpu/omap3/board.c +@@ -265,15 +265,17 @@ int dram_init(void) + * where it can be started. Early init code will init + * memory on CS0. + */ +- if ((mtype == DDR_COMBO) || (mtype == DDR_STACKED)) ++ if ((mtype == DDR_COMBO) || (mtype == DDR_STACKED)) { + do_sdrc_init(SDRC_CS1_OSET, NOT_EARLY); ++ make_cs1_contiguous(); ++ } + + size0 = get_sdr_cs_size(SDRC_CS0_OSET); + size1 = get_sdr_cs_size(SDRC_CS1_OSET); + + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; + gd->bd->bi_dram[0].size = size0; +- gd->bd->bi_dram[1].start = PHYS_SDRAM_1 + size0; ++ gd->bd->bi_dram[1].start = PHYS_SDRAM_1 + get_sdr_cs_offset(1); + gd->bd->bi_dram[1].size = size1; + + return 0; +diff --git a/cpu/omap3/mem.c b/cpu/omap3/mem.c +index 955fa70..53687a5 100644 +--- a/cpu/omap3/mem.c ++++ b/cpu/omap3/mem.c +@@ -114,12 +114,12 @@ void make_cs1_contiguous(void) + * for a part. Helps in guessing which part + * we are currently using. + *******************************************************/ +-u32 mem_ok(void) ++u32 mem_ok(u32 cs) + { + u32 val1, val2, addr; + u32 pattern = 0x12345678; + +- addr = OMAP34XX_SDRC_CS0; ++ addr = OMAP34XX_SDRC_CS0 + get_sdr_cs_offset(cs); + + __raw_writel(0x0, addr + 0x400); /* clear pos A */ + __raw_writel(pattern, addr); /* pattern to pos B */ +@@ -156,43 +156,40 @@ void sdrc_init(void) + + void do_sdrc_init(u32 offset, u32 early) + { ++ u32 actim_offs = offset? 0x28: 0; + +- /* reset sdrc controller */ +- __raw_writel(SOFTRESET, SDRC_SYSCONFIG); +- wait_on_value(BIT0, BIT0, SDRC_STATUS, 12000000); +- __raw_writel(0, SDRC_SYSCONFIG); ++ if (early) { ++ /* reset sdrc controller */ ++ __raw_writel(SOFTRESET, SDRC_SYSCONFIG); ++ wait_on_value(BIT0, BIT0, SDRC_STATUS, 12000000); ++ __raw_writel(0, SDRC_SYSCONFIG); + +- /* setup sdrc to ball mux */ +- __raw_writel(SDP_SDRC_SHARING, SDRC_SHARING); ++ /* setup sdrc to ball mux */ ++ __raw_writel(SDP_SDRC_SHARING, SDRC_SHARING); + +- /* SDRC_MCFG0 register */ +- (*(unsigned int *) 0x6D000080) = 0x02584099; /* from Micron */ ++ /* Disble Power Down of CKE cuz of 1 CKE on combo part */ ++ __raw_writel(0x00000081, SDRC_POWER); + +- /* SDRC_RFR_CTRL0 register */ +- (*(unsigned int *) 0x6D0000a4) = 0x54601; /* for 166M */ ++ __raw_writel(0x0000A, SDRC_DLLA_CTRL); ++ sdelay(0x20000); ++ } + +- /* SDRC_ACTIM_CTRLA0 register */ +- (*(unsigned int *) 0x6D00009c) = 0xa29db4c6; /* for 166M */ ++ __raw_writel(0x02584099, SDRC_MCFG_0 + offset); ++ __raw_writel(0x4e201, SDRC_RFR_CTRL + offset); ++ __raw_writel(0xaa9db4c6, SDRC_ACTIM_CTRLA_0 + actim_offs); ++ __raw_writel(0x11517, SDRC_ACTIM_CTRLB_0 + actim_offs); + +- /* SDRC_ACTIM_CTRLB0 register */ +- (*(unsigned int *) 0x6D0000a0) = 0x12214; /* for 166M */ ++ __raw_writel(CMD_NOP, SDRC_MANUAL_0 + offset); ++ __raw_writel(CMD_PRECHARGE, SDRC_MANUAL_0 + offset); ++ __raw_writel(CMD_AUTOREFRESH, SDRC_MANUAL_0 + offset); ++ __raw_writel(CMD_AUTOREFRESH, SDRC_MANUAL_0 + offset); + +- /* Disble Power Down of CKE cuz of 1 CKE on combo part */ +- (*(unsigned int *) 0x6D000070) = 0x00000081; ++ /* CAS latency 3, Write Burst = Read Burst, Serial Mode, ++ Burst length = 4 */ ++ __raw_writel(0x00000032, SDRC_MR_0 + offset); + +- /* SDRC_Manual command register */ +- (*(unsigned int *) 0x6D0000a8) = 0x00000000; /* NOP command */ +- (*(unsigned int *) 0x6D0000a8) = 0x00000001; /* Precharge command */ +- (*(unsigned int *) 0x6D0000a8) = 0x00000002; /* Auto-refresh command */ +- (*(unsigned int *) 0x6D0000a8) = 0x00000002; /* Auto-refresh command */ +- +- /* SDRC MR0 register */ +- (*(int *) 0x6D000084) = 0x00000032; /* Burst length = 4 */ +- /* CAS latency = 3, Write Burst = Read Burst Serial Mode */ +- +- /* SDRC DLLA control register */ +- (*(unsigned int *) 0x6D000060) = 0x0000A; +- sdelay(0x20000); ++ if (!mem_ok(offset)) ++ __raw_writel(0, SDRC_MCFG_0 + offset); + } + + void enable_gpmc_config(u32 *gpmc_config, u32 gpmc_base, u32 base, u32 size) +diff --git a/cpu/omap3/sys_info.c b/cpu/omap3/sys_info.c +index 12cf5ba..64d9e7e 100644 +--- a/cpu/omap3/sys_info.c ++++ b/cpu/omap3/sys_info.c +@@ -90,8 +90,11 @@ u32 is_mem_sdr(void) + ***********************************************************/ + u32 get_mem_type(void) + { +- /* Current SDP3430 uses 2x16 MDDR Infenion parts */ ++#ifdef CONFIG_OMAP3_BEAGLE ++ return DDR_STACKED; ++#else + return DDR_DISCRETE; ++#endif + } + + /*********************************************************************** +@@ -109,6 +112,22 @@ u32 get_sdr_cs_size(u32 offset) + } + + /*********************************************************************** ++ * get_sdr_cs_offset() - get offset of cs from cs0 start ++ ************************************************************************/ ++u32 get_sdr_cs_offset(u32 cs) ++{ ++ u32 offset; ++ ++ if (!cs) ++ return 0; ++ ++ offset = __raw_readl(SDRC_CS_CFG); ++ offset = (offset & 15) << 27 | (offset & 0x30) >> 17; ++ ++ return offset; ++} ++ ++/*********************************************************************** + * get_board_type() - get board type based on current production stats. + * - NOTE-1-: 2 I2C EEPROMs will someday be populated with proper info. + * when they are available we can get info from there. This should +diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h +index d47defb..df2d150 100644 +--- a/include/asm-arm/arch-omap3/cpu.h ++++ b/include/asm-arm/arch-omap3/cpu.h +@@ -123,7 +123,6 @@ + #define SDRC_ACTIM_CTRLA_1 (OMAP34XX_SDRC_BASE+0xC4) + #define SDRC_ACTIM_CTRLB_1 (OMAP34XX_SDRC_BASE+0xC8) + #define SDRC_RFR_CTRL (OMAP34XX_SDRC_BASE+0xA4) +-#define SDRC_RFR_CTRL (OMAP34XX_SDRC_BASE+0xA4) + #define SDRC_MANUAL_0 (OMAP34XX_SDRC_BASE+0xA8) + #define OMAP34XX_SDRC_CS0 0x80000000 + #define OMAP34XX_SDRC_CS1 0xA0000000 +diff --git a/include/asm-arm/arch-omap3/sys_proto.h b/include/asm-arm/arch-omap3/sys_proto.h +index 279bdce..5b0bd9e 100644 +--- a/include/asm-arm/arch-omap3/sys_proto.h ++++ b/include/asm-arm/arch-omap3/sys_proto.h +@@ -50,6 +50,7 @@ u32 get_gpmc0_width(void); + u32 get_board_type(void); + void display_board_info(u32); + u32 get_sdr_cs_size(u32 offset); ++u32 get_sdr_cs_offset(u32 cs); + u32 running_in_sdram(void); + u32 running_in_sram(void); + u32 running_in_flash(void); diff --git a/packages/u-boot/u-boot-omap3_git.bb b/packages/u-boot/u-boot-omap3_git.bb new file mode 100644 index 0000000000..ce7c5b9433 --- /dev/null +++ b/packages/u-boot/u-boot-omap3_git.bb @@ -0,0 +1,19 @@ +require u-boot.inc + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/u-boot-omap3-git/${MACHINE}" + +SRCREV = "c492706ba046124333323273f6fc21123360cb50" + +PV = "2008.10-rc1+${PR}+git${SRCREV}" +PR="r1" + +SRC_URI = "git://www.sakoman.net/git/u-boot-omap3.git;branch=common;protocol=git \ + " + +UBOOT_MACHINE_beagleboard = "omap3_beagle_config" +UBOOT_MACHINE_omap3evm = "omap3_evm_config" +UBOOT_MACHINE_overo = "omap3_overo_config" + +S = "${WORKDIR}/git" + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb index a887c1641d..6131aa1e3b 100644 --- a/packages/u-boot/u-boot_git.bb +++ b/packages/u-boot/u-boot_git.bb @@ -3,19 +3,24 @@ PR="r18" SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" -SRCREV_beagleboard = "9c1c36409b2cb4e81aab0bd9d0a69c68f4475aae" +SRCREV_beagleboard = "fb479d0418bc7c15d63a131beedbc6f1970fc295" +SRCREV_omap3evm = "9c1c36409b2cb4e81aab0bd9d0a69c68f4475aae" SRCREV_neuros-osd2 = "df6de5f4ff79dc43ba2a79a3afa975d22ec273b5" SRCREV_akita = "9bf86baaa3b35b25baa2d664e2f7f6cafad689ee" SRCREV_spitz = "9bf86baaa3b35b25baa2d664e2f7f6cafad689ee" SRCREV_c7x0 = "9bf86baaa3b35b25baa2d664e2f7f6cafad689ee" +UBOOT_MACHINE_beagleboard = "omap3_beagle_config" +UBOOT_MACHINE_omap3evm = "omap3_evm_config" +UBOOT_MACHINE_overo = "omap3_overo_config" + SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 " SRC_URI_neuros-osd2 = "git://git.neurostechnology.com/git/u-boot;protocol=git;branch=neuros" -SRC_URI_beagleboard = "git://www.sakoman.net/git/u-boot-omap3.git;branch=test;protocol=git \ - file://name.patch;patch=1 \ - file://armv7-a.patch;patch=1 \ - " +SRC_URI_beagleboard = "git://www.sakoman.net/git/u-boot-omap3.git;branch=common;protocol=git \ + file://beagle-600MHz.diff;patch=1 \ + file://mru-256.diff;patch=1 \ + " SRC_URI_neuros-osd2 += "file://Makefile-fix.patch;patch=1" SRC_URI_append_akita = "file://pdaXrom-u-boot.patch;patch=1 \ diff --git a/packages/xorg-driver/xf86-video-omapfb_git.bb b/packages/xorg-driver/xf86-video-omapfb_git.bb index c116f64483..9a6e4d382a 100644 --- a/packages/xorg-driver/xf86-video-omapfb_git.bb +++ b/packages/xorg-driver/xf86-video-omapfb_git.bb @@ -2,10 +2,13 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- OMAP display driver" -SRCREV = "eb05e4446877409b349d8f9ede35052cc7a3432b" +PR ="r4" + +SRCREV = "fc5958ba70ad76aadcf2993d7713ee13fe262b33" PV = "0.0.1+${PR}+git${SRCREV}" SRC_URI = "git://git.pingu.fi/xf86-video-omapfb.git;protocol=http" S = "${WORKDIR}/git" +CFLAGS += " -I${STAGING_INCDIR}/xorg " |