diff options
33 files changed, 700 insertions, 140 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 2a335af0b6..d0db4c70d2 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -233,6 +233,9 @@ ALLOW_EMPTY_kernel-image = "1" DEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround" RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround" +# renamed modules +RPROVIDES_kernel-module-aes-generic = "kernel-module-aes" + pkg_postinst_kernel-image () { if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then mkdir -p $D/lib/modules/${KERNEL_VERSION} diff --git a/conf/checksums.ini b/conf/checksums.ini index df007df044..648da96cb6 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9502,7 +9502,7 @@ sha256=2ac2154e3f66b5b32ca25d47e3977db115ac6dc52ddb7442ce16e65a4ac1afee md5=c703192481d94dfa3f4e24eed22c8182 sha256=daa670b686f959ab15e457425e57c50f0b973ee4d24d6a4171c33f467961ad1d -[http://www.7-zip.org/dl/lzma417.tar.bz2] +[http://downloads.sourceforge.net/sevenzip/lzma417.tar.bz2] md5=b1ab85e4dc1eb1323d77fef47a2cb71c sha256=84124d4501798ecb284fceb28931db023850535e1b1146c884add7b3b0331cbc diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index e243818ad5..eed6e42df5 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -71,7 +71,7 @@ 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 ?= "241f69c55ee8f5dd067ebd2d51aa9fdedb212759" +SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e" SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" @@ -146,13 +146,10 @@ SRCREV_pn-opkg-utils ?= "4534" SRCREV_pn-opkg-utils-native ?= "4534" SRCREV_pn-oprofileui ?= "173" SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5" +SRCREV_pn-portaudio-v19 ?= "1387" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "4214" SRCREV_pn-python-etk ?= "8b51535150cbc88467e3d8b578e54df27eac643" -SRCREV_pn-python-odeviced ?= "fcf6f975b18d478ce618284c0dcc2f28f5c43cc1" -SRCREV_pn-python-oeventd ?= "9053e5be847d694681c3664664ed669543a0a777" -SRCREV_pn-python-ophoned ?= "82c318b8592588bc7ce8bccdfc090e59cfc9b98c" -SRCREV_pn-python-ousaged ?= "836c091405eea3e29efdba3e1351befd1c96267b" SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" SRCREV_pn-pylgrim ?= "20" SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a" diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index 46bd42f2a2..57d81c2ade 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -1,7 +1,7 @@ #----------------------------------------------------------------------------- #@TYPE: Machine -#@NAME: FIC GTA01 (Neo1973) -#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone +#@NAME: FIC GTA01 (Neo 1973) +#@DESCRIPTION: Machine configuration for the FIC Neo 1973 GSM phone #----------------------------------------------------------------------------- TARGET_ARCH = "arm" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 45dc0518a4..88aa3881c7 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -1,7 +1,7 @@ #----------------------------------------------------------------------------- #@TYPE: Machine -#@NAME: FIC GTA02 (Neo1973) -#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone +#@NAME: Openmoko GTA02 (NeoFreerunner) +#@DESCRIPTION: Machine configuration for the Openmoko NeoFreerunner GSM phone #----------------------------------------------------------------------------- TARGET_ARCH = "arm" @@ -29,6 +29,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-snd-soc-neo1973-gta02-wm8753 \ " +# no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0 SERIAL_CONSOLE = "115200 ttySAC2" # used by some images diff --git a/packages/busybox/busybox.inc b/packages/busybox/busybox.inc index 04decf61b2..cc196ad767 100644 --- a/packages/busybox/busybox.inc +++ b/packages/busybox/busybox.inc @@ -35,7 +35,7 @@ PACKAGES =+ "${PN}-httpd ${PN}-udhcpd" # We need this RRECOMMENDS because libc dlopens libgcc # and shlib mechanism can not detect it because its not # listed in the NEEDED field. -RDEPENDS += "libgcc" +RRECOMMENDS += "libgcc" FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb index c9440e7b4f..37cd2a86be 100644 --- a/packages/busybox/busybox_1.9.2.bb +++ b/packages/busybox/busybox_1.9.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r1" +PR = "r2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://udhcpscript.patch;patch=1 \ diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index cfb9f1c089..cee09857e4 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -30,6 +30,14 @@ EXTRA_OECONF = "\ inherit autotools +# hack to get config.rpath in, it comes from gettext +do_configure_prepend () { + + ${@['','cp ${STAGING_DATADIR_NATIVE}/automake-1.10/config.rpath ${S}'][bb.data.getVar('PREFERRED_VERSION_automake-native',d,1) == '1.10']} + +} + + do_stage() { install -d ${STAGING_INCDIR}/classpath install -m 0644 include/jni* ${STAGING_INCDIR}/classpath diff --git a/packages/gpsbabel/gpsbabel_1.3.3.bb b/packages/gpsbabel/gpsbabel_1.3.5.bb index b5ff6a8510..c46b9df81d 100644 --- a/packages/gpsbabel/gpsbabel_1.3.3.bb +++ b/packages/gpsbabel/gpsbabel_1.3.5.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/gpsbabel/gpsbabel-${PV}.tar.gz" +SRC_URI = "http://www.gpsbabel.org/plan9.php?dl=gpsbabel-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/packages/gtk-webcore/midori_0.0.19.bb b/packages/gtk-webcore/midori_0.0.19.bb new file mode 100644 index 0000000000..ec81d7fd23 --- /dev/null +++ b/packages/gtk-webcore/midori_0.0.19.bb @@ -0,0 +1,5 @@ +require midori.inc + +SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.bz2" + + diff --git a/packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch b/packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch new file mode 100644 index 0000000000..968cc6cf73 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch @@ -0,0 +1,275 @@ +From: Gadiyar, Anand <gadiyar@ti.com> +Date: Wed, 13 Aug 2008 07:05:29 +0000 (+0530) +Subject: MUSB: Workaround for simultaneous TX and RX usage +X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=2e6aa4efb0e14c51ff0427927b1b38136911fa93 + +MUSB: Workaround for simultaneous TX and RX usage + +MUSB: Workaround for simultaneous TX and RX usage + +MUSB RTL V1.4 has a hardware issue which results in a DMA controller +hang when TX and RX DMA channels are simultaneously enabled. This +affects at least OMAP2430 and OMAP34XX. + +Since RX transfers are in Mode 0 and anyway result in one DMA interrupt +per packet, we can use System DMA to unload the RX fifos. MUSB DMA can +be used for all TX channels as before. + +Tested with full-duplex TX and RX transfers using g_ether. Runs for 24 +hours without a hang. Without this patch, the hang occurs within minutes. + +This issue was first reported by Jon Hunter on [1] + +[1] http://marc.info/?l=linux-omap&m=119634480534453&w=2 + +Signed-off-by: Anand Gadiyar <gadiyar@ti.com> +--- + +diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig +index a485a86..8583e54 100644 +--- a/drivers/usb/musb/Kconfig ++++ b/drivers/usb/musb/Kconfig +@@ -150,6 +150,14 @@ config USB_INVENTRA_DMA + help + Enable DMA transfers using Mentor's engine. + ++config MUSB_USE_SYSTEM_DMA_RX ++ bool 'Use System DMA for RX endpoints' ++ depends on USB_MUSB_HDRC && USB_INVENTRA_DMA ++ help ++ MUSB RTL version 1.4 has a hardware issue when TX and RX DMA ++ channels are simultaneously enabled. To work around this issue, ++ you can choose to use System DMA for RX channels. ++ + config USB_TI_CPPI_DMA + bool + depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY +diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c +index 32bb1e2..d1c1ea0 100644 +--- a/drivers/usb/musb/musbhsdma.c ++++ b/drivers/usb/musb/musbhsdma.c +@@ -34,6 +34,7 @@ + #include <linux/interrupt.h> + #include <linux/platform_device.h> + #include "musb_core.h" ++#include <asm/arch/dma.h> + + #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) + #include "omap2430.h" +@@ -64,6 +65,9 @@ + + #define MUSB_HSDMA_CHANNELS 8 + ++#define MUSB_FIFO_ADDRESS(epnum) \ ++ ((unsigned long) (OMAP_HSOTG_BASE + MUSB_FIFO_OFFSET(epnum))) ++ + struct musb_dma_controller; + + struct musb_dma_channel { +@@ -75,6 +79,8 @@ struct musb_dma_channel { + u8 bIndex; + u8 epnum; + u8 transmit; ++ ++ int sysdma_channel; + }; + + struct musb_dma_controller { +@@ -93,6 +99,42 @@ static int dma_controller_start(struct dma_controller *c) + return 0; + } + ++#ifdef CONFIG_MUSB_USE_SYSTEM_DMA_RX ++static void musb_sysdma_completion(int lch, u16 ch_status, void *data) ++{ ++ u32 dwAddress; ++ unsigned long flags; ++ ++ struct dma_channel *pChannel; ++ ++ struct musb_dma_channel *pImplChannel = ++ (struct musb_dma_channel *) data; ++ struct musb_dma_controller *controller = pImplChannel->controller; ++ struct musb *musb = controller->pDmaPrivate; ++ pChannel = &pImplChannel->Channel; ++ ++ DBG(2, "lch = 0x%d, ch_status = 0x%x\n", lch, ch_status); ++ spin_lock_irqsave(&musb->lock, flags); ++ ++ dwAddress = (u32) omap_get_dma_dst_pos(pImplChannel->sysdma_channel); ++ pChannel->actual_len = dwAddress - pImplChannel->dwStartAddress; ++ ++ DBG(2, "ch %p, 0x%x -> 0x%x (%d / %d) %s\n", ++ pChannel, pImplChannel->dwStartAddress, dwAddress, ++ pChannel->actual_len, pImplChannel->len, ++ (pChannel->actual_len < pImplChannel->len) ? ++ "=> reconfig 0": "=> complete"); ++ ++ pChannel->status = MUSB_DMA_STATUS_FREE; ++ musb_dma_completion(musb, pImplChannel->epnum, pImplChannel->transmit); ++ ++ spin_unlock_irqrestore(&musb->lock, flags); ++ return; ++} ++#else ++#define musb_sysdma_completion NULL ++#endif ++ + static void dma_channel_release(struct dma_channel *pChannel); + + static int dma_controller_stop(struct dma_controller *c) +@@ -144,6 +186,29 @@ static struct dma_channel *dma_channel_allocate(struct dma_controller *c, + /* Tx => mode 1; Rx => mode 0 */ + pChannel->desired_mode = transmit; + pChannel->actual_len = 0; ++ pImplChannel->sysdma_channel = -1; ++ ++#ifdef CONFIG_MUSB_USE_SYSTEM_DMA_RX ++ if (!transmit) { ++ int ret; ++ ret = omap_request_dma(OMAP24XX_DMA_NO_DEVICE, ++ "MUSB SysDMA", musb_sysdma_completion, ++ (void *) pImplChannel, ++ &(pImplChannel->sysdma_channel)); ++ ++ if (ret) { ++ printk(KERN_ERR "request_dma failed:" ++ " %d\n", ret); ++ controller->bmUsedChannels &= ++ ~(1 << bBit); ++ pChannel->status = ++ MUSB_DMA_STATUS_UNKNOWN; ++ pImplChannel->sysdma_channel = -1; ++ pChannel = NULL; ++ } ++ } ++#endif ++ + break; + } + } +@@ -163,6 +228,12 @@ static void dma_channel_release(struct dma_channel *pChannel) + ~(1 << pImplChannel->bIndex); + + pChannel->status = MUSB_DMA_STATUS_UNKNOWN; ++ ++ if (pImplChannel->sysdma_channel != -1) { ++ omap_stop_dma(pImplChannel->sysdma_channel); ++ omap_free_dma(pImplChannel->sysdma_channel); ++ pImplChannel->sysdma_channel = -1; ++ } + } + + static void configure_channel(struct dma_channel *pChannel, +@@ -179,41 +250,69 @@ static void configure_channel(struct dma_channel *pChannel, + DBG(4, "%p, pkt_sz %d, addr 0x%x, len %d, mode %d\n", + pChannel, packet_sz, dma_addr, len, mode); + +- if (mode) { +- csr |= 1 << MUSB_HSDMA_MODE1_SHIFT; +- BUG_ON(len < packet_sz); ++ if (pImplChannel->sysdma_channel != -1) { ++ /* System DMA */ ++ /* RX: set src = FIFO */ ++ ++ omap_set_dma_transfer_params(pImplChannel->sysdma_channel, ++ OMAP_DMA_DATA_TYPE_S8, ++ len, 1, /* One frame */ ++ OMAP_DMA_SYNC_ELEMENT, ++ OMAP24XX_DMA_NO_DEVICE, ++ 0); /* Src Sync */ ++ ++ omap_set_dma_src_params(pImplChannel->sysdma_channel, 0, ++ OMAP_DMA_AMODE_CONSTANT, ++ MUSB_FIFO_ADDRESS(pImplChannel->epnum), ++ 0, 0); + +- if (packet_sz >= 64) { +- csr |= MUSB_HSDMA_BURSTMODE_INCR16 ++ omap_set_dma_dest_params(pImplChannel->sysdma_channel, 0, ++ OMAP_DMA_AMODE_POST_INC, dma_addr, ++ 0, 0); ++ ++ omap_set_dma_dest_data_pack(pImplChannel->sysdma_channel, 1); ++ omap_set_dma_dest_burst_mode(pImplChannel->sysdma_channel, ++ OMAP_DMA_DATA_BURST_16); ++ ++ omap_start_dma(pImplChannel->sysdma_channel); ++ ++ } else { /* Mentor DMA */ ++ if (mode) { ++ csr |= 1 << MUSB_HSDMA_MODE1_SHIFT; ++ BUG_ON(len < packet_sz); ++ ++ if (packet_sz >= 64) { ++ csr |= MUSB_HSDMA_BURSTMODE_INCR16 + << MUSB_HSDMA_BURSTMODE_SHIFT; +- } else if (packet_sz >= 32) { +- csr |= MUSB_HSDMA_BURSTMODE_INCR8 ++ } else if (packet_sz >= 32) { ++ csr |= MUSB_HSDMA_BURSTMODE_INCR8 + << MUSB_HSDMA_BURSTMODE_SHIFT; +- } else if (packet_sz >= 16) { +- csr |= MUSB_HSDMA_BURSTMODE_INCR4 ++ } else if (packet_sz >= 16) { ++ csr |= MUSB_HSDMA_BURSTMODE_INCR4 + << MUSB_HSDMA_BURSTMODE_SHIFT; ++ } + } +- } + +- csr |= (pImplChannel->epnum << MUSB_HSDMA_ENDPOINT_SHIFT) +- | (1 << MUSB_HSDMA_ENABLE_SHIFT) +- | (1 << MUSB_HSDMA_IRQENABLE_SHIFT) +- | (pImplChannel->transmit +- ? (1 << MUSB_HSDMA_TRANSMIT_SHIFT) +- : 0); +- +- /* address/count */ +- musb_writel(mbase, +- MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS), +- dma_addr); +- musb_writel(mbase, +- MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT), +- len); +- +- /* control (this should start things) */ +- musb_writew(mbase, +- MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL), +- csr); ++ csr |= (pImplChannel->epnum << MUSB_HSDMA_ENDPOINT_SHIFT) ++ | (1 << MUSB_HSDMA_ENABLE_SHIFT) ++ | (1 << MUSB_HSDMA_IRQENABLE_SHIFT) ++ | (pImplChannel->transmit ++ ? (1 << MUSB_HSDMA_TRANSMIT_SHIFT) ++ : 0); ++ ++ /* address/count */ ++ musb_writel(mbase, ++ MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_ADDRESS), ++ dma_addr); ++ musb_writel(mbase, ++ MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_COUNT), ++ len); ++ ++ /* control (this should start things) */ ++ musb_writew(mbase, ++ MUSB_HSDMA_CHANNEL_OFFSET(bChannel, MUSB_HSDMA_CONTROL), ++ csr); ++ } /* Mentor DMA */ + } + + static int dma_channel_program(struct dma_channel *pChannel, +@@ -265,6 +364,12 @@ static int dma_channel_abort(struct dma_channel *pChannel) + MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_TXCSR), + csr); + } else { ++ if (pImplChannel->sysdma_channel != -1) { ++ omap_stop_dma(pImplChannel->sysdma_channel); ++ omap_free_dma(pImplChannel->sysdma_channel); ++ pImplChannel->sysdma_channel = -1; ++ } ++ + csr = musb_readw(mbase, + MUSB_EP_OFFSET(pImplChannel->epnum, MUSB_RXCSR)); + csr &= ~(MUSB_RXCSR_AUTOCLEAR | diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 8682c33404..f032f076e8 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -6,7 +6,7 @@ SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848" PV = "2.6.26" #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" -PR = "r60" +PR = "r61" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -52,6 +52,7 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://02-postrate-notifier.eml;patch=1 \ file://01-omap3-cpufreq.eml;patch=1 \ file://01-beagle-cpufreq.diff;patch=1 \ + file://musb-dmafix.patch;patch=1 \ " SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \ diff --git a/packages/linux/linux-rp-2.6.26/defconfig-akita b/packages/linux/linux-rp-2.6.26/defconfig-akita index e630a9abff..27f5dcb781 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-akita +++ b/packages/linux/linux-rp-2.6.26/defconfig-akita @@ -1255,7 +1255,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.26/defconfig-bootcdx86 b/packages/linux/linux-rp-2.6.26/defconfig-bootcdx86 index 35e9b5cd22..397468a366 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-bootcdx86 +++ b/packages/linux/linux-rp-2.6.26/defconfig-bootcdx86 @@ -1612,7 +1612,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.26/defconfig-c7x0 b/packages/linux/linux-rp-2.6.26/defconfig-c7x0 index 6c188e7b57..4c3cbf499c 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-c7x0 +++ b/packages/linux/linux-rp-2.6.26/defconfig-c7x0 @@ -1260,7 +1260,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.26/defconfig-hx2000 b/packages/linux/linux-rp-2.6.26/defconfig-hx2000 index 0f2557c0f7..d023ffecac 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-hx2000 +++ b/packages/linux/linux-rp-2.6.26/defconfig-hx2000 @@ -1249,7 +1249,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.26/defconfig-poodle b/packages/linux/linux-rp-2.6.26/defconfig-poodle index 7d41252b15..4d7acb382f 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-poodle +++ b/packages/linux/linux-rp-2.6.26/defconfig-poodle @@ -1270,7 +1270,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.26/defconfig-qemuarm b/packages/linux/linux-rp-2.6.26/defconfig-qemuarm index e636b6c671..ae7ef52d31 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-qemuarm +++ b/packages/linux/linux-rp-2.6.26/defconfig-qemuarm @@ -1155,7 +1155,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.26/defconfig-qemux86 b/packages/linux/linux-rp-2.6.26/defconfig-qemux86 index 42f6740201..975dbdd85b 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-qemux86 +++ b/packages/linux/linux-rp-2.6.26/defconfig-qemux86 @@ -1611,7 +1611,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.26/defconfig-spitz b/packages/linux/linux-rp-2.6.26/defconfig-spitz index 9c8f0ae8a1..5b5db16979 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-spitz +++ b/packages/linux/linux-rp-2.6.26/defconfig-spitz @@ -1318,7 +1318,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/linux/linux-rp-2.6.26/defconfig-zylonite b/packages/linux/linux-rp-2.6.26/defconfig-zylonite index cc2fc482ae..bdf6a3be8a 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-zylonite +++ b/packages/linux/linux-rp-2.6.26/defconfig-zylonite @@ -1257,7 +1257,7 @@ CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_CH341 is not set # CONFIG_USB_SERIAL_WHITEHEAT is not set CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP2101 is not set +CONFIG_USB_SERIAL_CP2101=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m diff --git a/packages/lzma/lzma-native_4.17.bb b/packages/lzma/lzma-native_4.17.bb index 1ccf005182..24664b32e4 100644 --- a/packages/lzma/lzma-native_4.17.bb +++ b/packages/lzma/lzma-native_4.17.bb @@ -2,9 +2,10 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compress HOMEPAGE = "http://www.7-zip.org/" LICENSE = "LGPL" DEPENDS = "zlib-native" -PR = "r2" +PR = "r3" -SRC_URI = "http://www.7-zip.org/dl/lzma417.tar.bz2 \ +PVNODOT = "${@bb.data.getVar('PV',d,1).split('.')[0]}${@bb.data.getVar('PV',d,1).split('.')[1]}" +SRC_URI = "${SOURCEFORGE_MIRROR}/sevenzip/lzma${PVNODOT}.tar.bz2 \ file://lzma-406-zlib-stream.patch;patch=1;pnum=2" S = "${WORKDIR}/SRC" diff --git a/packages/phoneme/.mtn2git_empty b/packages/phoneme/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/phoneme/.mtn2git_empty diff --git a/packages/phoneme/files/.mtn2git_empty b/packages/phoneme/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/phoneme/files/.mtn2git_empty diff --git a/packages/phoneme/files/phoneme-makefile-fix.patch b/packages/phoneme/files/phoneme-makefile-fix.patch new file mode 100644 index 0000000000..9dc80428f1 --- /dev/null +++ b/packages/phoneme/files/phoneme-makefile-fix.patch @@ -0,0 +1,144 @@ +Index: cdc/build/share/rules_zoneinfo.mk +=================================================================== +--- cdc/build/share/rules_zoneinfo.mk.orig ++++ cdc/build/share/rules_zoneinfo.mk +@@ -45,7 +45,7 @@ $(ZONEINFO_CLASSES_DIR): + .compile.classlist: + $(AT)if [ -s $(ZONEINFO_CLASSES_DIR)/.classes.list ] ; then \ + echo "Compiling zic classes... "; \ +- $(JAVAC_CMD) \ ++ $(JAVAC_CMD) -sourcepath $(CVM_SHAREROOT)/classes \ + -d $(ZONEINFO_CLASSES_DIR) \ + @$(ZONEINFO_CLASSES_DIR)/.classes.list ; \ + fi +Index: cdc/build/share/jcc.mk +=================================================================== +--- cdc/build/share/jcc.mk.orig ++++ cdc/build/share/jcc.mk +@@ -93,7 +93,7 @@ $(CVM_GENOPCODE_DEPEND) :: $(CVM_JCC_SRC + $(CVM_JCC_SRCPATH)/JCCMessage.properties + @echo "... $@" + $(AT)CLASSPATH=$(CVM_JCC_SRCPATH); export CLASSPATH; \ +- $(CVM_JAVAC) $(JAVAC_OPTIONS) -d $(CVM_JCC_CLASSPATH) \ ++ $(CVM_JAVAC) $(JAVAC_OPTIONS) -sourcepath $(CVM_JCC_SRCPATH) -d $(CVM_JCC_CLASSPATH) \ + $(subst /,$(CVM_FILESEP),$(CVM_JCC_SRCPATH)/GenOpcodes.java) + $(AT)rm -f $(CVM_JCC_CLASSPATH)/JCCMessage.properties; \ + cp $(CVM_JCC_SRCPATH)/JCCMessage.properties $(CVM_JCC_CLASSPATH)/JCCMessage.properties +@@ -253,7 +253,7 @@ $(CVM_JCC_DEPEND) :: $(CVM_JCC_SRCPATH)/ + $(CVM_JCC_SRCPATH)/JCCMessage.properties + @echo "... $@" + @CLASSPATH=$(CVM_JCC_CLASSPATH)$(PS)$(CVM_JCC_SRCPATH)$(PS)$(CVM_DERIVEDROOT)/javavm/runtime; export CLASSPATH; \ +- $(CVM_JAVAC) $(JAVAC_OPTIONS) -d $(CVM_JCC_CLASSPATH) \ ++ $(CVM_JAVAC) $(JAVAC_OPTIONS) -classpath $(CVM_JCC_CLASSPATH)$(PS)$(CVM_JCC_SRCPATH)$(PS)$(CVM_DERIVEDROOT)/javavm/runtime -d $(CVM_JCC_CLASSPATH) \ + $(CVM_JCC_CLASSES) + @rm -f $(CVM_JCC_CLASSPATH)/JCCMessage.properties; \ + cp $(CVM_JCC_SRCPATH)/JCCMessage.properties $(CVM_JCC_CLASSPATH)/JCCMessage.properties +Index: cdc/build/share/defs.mk +=================================================================== +--- cdc/build/share/defs.mk.orig ++++ cdc/build/share/defs.mk +@@ -1187,7 +1187,7 @@ BUNDLE_PRODUCT_NAME = $(subst $(TM),$(e + BUNDLE_VERSION = $(subst -,_,$(J2ME_BUILD_VERSION_STRING)) + BUNDLE_TARGET = $(subst -,_,$(CVM_TARGET)) + +-BINARY_BUNDLE_NAME = \ ++BINARY_BUNDLE_NAME ?= \ + $(BUNDLE_PRODUCT_NAME)-$(BUNDLE_VERSION)-$(BUNDLE_TARGET)-bin + BINARY_BUNDLE_DIRNAME = $(BINARY_BUNDLE_NAME) + +@@ -2153,11 +2153,11 @@ endif + + # Note, ALL_INCLUDE_FLAGS flags is setup in rules.mk so + # abs2rel only needs to be called on it once. +-CPPFLAGS += $(CVM_DEFINES) $(ALL_INCLUDE_FLAGS) +-CFLAGS_SPEED = $(CFLAGS) $(CCFLAGS_SPEED) $(CPPFLAGS) +-CFLAGS_SPACE = $(CFLAGS) $(CCFLAGS_SPACE) $(CPPFLAGS) +-CFLAGS_LOOP = $(CFLAGS) $(CCFLAGS_LOOP) $(CPPFLAGS) +-CFLAGS_FDLIB = $(CFLAGS) $(CCFLAGS_FDLIB) $(CPPFLAGS) ++CVM_CPPFLAGS += $(CVM_DEFINES) $(ALL_INCLUDE_FLAGS) ++CFLAGS_SPEED = $(CFLAGS) $(CCFLAGS_SPEED) $(CVM_CPPFLAGS) ++CFLAGS_SPACE = $(CFLAGS) $(CCFLAGS_SPACE) $(CVM_CPPFLAGS) ++CFLAGS_LOOP = $(CFLAGS) $(CCFLAGS_LOOP) $(CVM_CPPFLAGS) ++CFLAGS_FDLIB = $(CFLAGS) $(CCFLAGS_FDLIB) $(CVM_CPPFLAGS) + CFLAGS_JCS = + + LINKFLAGS += -g -Wl,-export-dynamic $(LINK_ARCH_FLAGS) +@@ -2165,13 +2165,13 @@ LINKLIBS += -lpthread -ldl $(LINK_A + LINKLIBS_JCS += + + SO_CCFLAGS = $(CCFLAGS_SPEED) +-SO_CFLAGS = $(CFLAGS) $(SO_CCFLAGS) $(CPPFLAGS) ++SO_CFLAGS = $(CFLAGS) $(SO_CCFLAGS) $(CVM_CPPFLAGS) + SO_LINKFLAGS = $(LINKFLAGS) -shared + + # + # commands for running the tools + # +-ASM_CMD = $(AT)$(TARGET_AS) $(ASM_FLAGS) -D_ASM $(CPPFLAGS) \ ++ASM_CMD = $(AT)$(TARGET_AS) $(ASM_FLAGS) -D_ASM $(CVM_CPPFLAGS) \ + -o $@ $(call abs2rel,$<) + + # compileCCC(flags, objfile, srcfiles) +Index: cdc/build/share/rules.mk +=================================================================== +--- cdc/build/share/rules.mk.orig ++++ cdc/build/share/rules.mk +@@ -521,7 +521,7 @@ endif + # As a performance improvement, evaluate some flags in case + # they contain shell commands. + # FIXME: Disabled because this causes GCI build failures +-#$(J2ME_CLASSLIB):: CPPFLAGS := $(CPPFLAGS) ++#$(J2ME_CLASSLIB):: CVM_CPPFLAGS := $(CVM_CPPFLAGS) + + $(J2ME_CLASSLIB):: initbuild + $(J2ME_CLASSLIB):: btclasses $(CVM_BUILDTIME_CLASSESZIP) +@@ -708,14 +708,14 @@ $(CVM_OBJDIR)/executejava.o: $(CVM_DERIV + # command to use to generate dependency makefiles if requested + ifeq ($(GENERATEMAKEFILES), true) + GENERATEMAKEFILES_CMD = \ +- @$(TARGET_CC) $(CCDEPEND) $(CC_ARCH_FLAGS) $(CPPFLAGS) $< \ ++ @$(TARGET_CC) $(CCDEPEND) $(CC_ARCH_FLAGS) $(CVM_CPPFLAGS) $< \ + 2> /dev/null | sed 's!$*\.o!$(dir $@)&!g' > $(@:.o=.d) + endif + + # command to use to generate stack map analysis files if requested + ifeq ($(CVM_CSTACKANALYSIS), true) + CSTACKANALYSIS_CMD = \ +- $(AT)$(TARGET_CC) -S $(CCFLAGS) $(CPPFLAGS) -o $(@:.o=.asm) $< ++ $(AT)$(TARGET_CC) -S $(CCFLAGS) $(CVM_CPPFLAGS) -o $(@:.o=.asm) $< + endif + + # +@@ -751,7 +753,7 @@ $(CVM_OBJDIR)/%.o: %.S + @echo "as $<" + $(ASM_CMD) + ifeq ($(GENERATEMAKEFILES), true) +- @$(TARGET_CC) $(ASM_ARCH_FLAGS) $(CCDEPEND) $(CPPFLAGS) $< \ ++ @$(TARGET_CC) $(ASM_ARCH_FLAGS) $(CCDEPEND) $(CVM_CPPFLAGS) $< \ + 2> /dev/null | sed 's!$*\.o!$(dir $@)&!g' > $(@:.o=.d) + endif + ifeq ($(CVM_CSTACKANALYSIS), true) +@@ -772,7 +774,7 @@ $(CVM_FDLIB_FILES): $(CVM_OBJDIR)/%.o: $ + @echo "cc $<" + $(CC_CMD_FDLIB) + ifeq ($(GENERATEMAKEFILES), true) +- @$(TARGET_CC) $(CC_ARCH_FLAGS) $(CCDEPEND) $(CPPFLAGS) $< \ ++ @$(TARGET_CC) $(CC_ARCH_FLAGS) $(CCDEPEND) $(CVM_CPPFLAGS) $< \ + 2> /dev/null | sed 's!$*\.o!$(dir $@)&!g' > $(@:.o=.d) + endif + +Index: cdc/src/linux-arm/javavm/runtime/segvhandler_arch.c +=================================================================== +--- cdc/src/linux-arm/javavm/runtime/segvhandler_arch.c.orig ++++ cdc/src/linux-arm/javavm/runtime/segvhandler_arch.c +@@ -41,8 +41,8 @@ + #include <dlfcn.h> + #include <stddef.h> + /* avoid conflicting ucontext definitions */ +-#define ucontext asm_ucontext +-#include <asm/ucontext.h> ++/*#define ucontext asm_ucontext*/ ++#include <ucontext.h> + #include <unistd.h> + + #define MAXSIGNUM 32 diff --git a/packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb b/packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb new file mode 100644 index 0000000000..59dbfb7a3b --- /dev/null +++ b/packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb @@ -0,0 +1,26 @@ +require phoneme-advanced.inc + +BUILDREV = "b73" +SRCREV = "11560" + +SRC_URI += "file://phoneme-makefile-fix.patch;patch=1;pnum=0" + +FILES_${PN} += "\ + ${COMMON_DIR}/bin/cvm \ + ${COMMON_DIR}/lib/btclasses.zip \ + ${COMMON_DIR}/lib/content-types.properties \ + ${COMMON_DIR}/lib/foundation.jar \ + ${COMMON_DIR}/lib/security/java.security \ + ${COMMON_DIR}/lib/security/java.policy \ + ${COMMON_DIR}/lib/zi/Asia/Novosibirsk \ + ${COMMON_DIR}/lib/zi/Asia/Calcutta \ + ${COMMON_DIR}/lib/zi/ZoneInfoMappings \ + ${COMMON_DIR}/lib/zi/GMT \ + ${COMMON_DIR}/lib/zi/America/Los_Angeles \ + ${COMMON_DIR}/democlasses.jar \ + ${COMMON_DIR}/testclasses.zip \ + ${COMMON_DIR}/legal/license.txt \ + ${COMMON_DIR}/legal/thirdpartylicensereadme.txt \ + ${COMMON_DIR}/legal/copyright.txt \ +" + diff --git a/packages/phoneme/phoneme-advanced.inc b/packages/phoneme/phoneme-advanced.inc new file mode 100644 index 0000000000..aad82cfe42 --- /dev/null +++ b/packages/phoneme/phoneme-advanced.inc @@ -0,0 +1,160 @@ +DESCRIPTION = "A free CDC JavaVM and class library from Sun Microsystems." +LICENSE = "GPLv2" +HOMEPAGE = "https://phoneme.dev.java.net" +AUTHOR = "Sun Microsystems, Inc." + +DEPENDS = "classpath-native virtual/javac-native linux-libc-headers" + +inherit java update-alternatives + +# The PhoneME Advanced build system is documented here: http://java.sun.com/javame/reference/docs/cdc_build_system.pdf +# NOTE: We need to provide an empty password. pswd='' seems not to be the correct way. +SRC_URI = "\ + svn://phoneme.dev.java.net/svn/phoneme/builds/phoneme_advanced-mr2-dev-${BUILDREV};module=cdc;proto=https;localdir=cdc;user=guest;pswd='' \ + svn://phoneme.dev.java.net/svn/phoneme/builds/phoneme_advanced-mr2-dev-${BUILDREV};module=tools;proto=https;localdir=tools;user=guest;pswd='' \ + svn://phoneme.dev.java.net/svn/phoneme;module=legal;localdir=legal;proto=https;user=guest;pswd='' \ + " + +PROVIDES = "virtual/java-cdc java-cdc-runtime" +PRIORITY = "optional" +SECTION = "interpreters" + +# PhoneME builds currently cannot be parallel +PARALLEL_MAKE = "" + +S = "${WORKDIR}" + +BUILDREV = ${@bb.fatal('BUILDREV is not defined in this phoneme-advanced recipe!')} +SRCREV = ${@bb.fatal('SRCREV is not defined in this phoneme-advanced recipe!')} + +COMMON_DIR = "${libdir_jvm}/${PN}" + +do_compile() { + set_arch + oe_runmake -C cdc/build/linux-$ARCH-generic bin +} + +do_install() { + install -d ${D}/${libdir_jvm} + + unzip cdc/install/${PN}.zip -d ${D}/${libdir_jvm} + + # Additional link named cvm + install -d ${D}/${bindir} + ln -sf ${libdir_jvm}/${PN}/bin/cvm ${D}${bindir}/cvm +} + +do_configure() { + set_arch + test ! -d cdc/build/linux-$ARCH-generic && mkdir -p cdc/build/linux-$ARCH-generic + cd cdc/build/linux-$ARCH-generic + + echo "Configuring PhoneME Advanced build" + # At the moment we do not support anything else than the foundation + #profiles. + pmo_start J2ME_CLASSLIB foundation + + # Dispatch to arch-specific functions. + oe_phoneme_config$ARCH + + oe_phoneme_configbase + + pmo "# Misc locations and file names." + pmo BINARY_BUNDLE_NAME ${PN} + pmo BINARY_BUNDLE_APPEND_REVISION false + pmo JAVAME_LEGAL_DIR ${WORKDIR}/legal + + pmo "# Java toolchain binaries" + pmo JDK_HOME $JAVA_HOME + pmo CVM_TARGET_TOOLS_PREFIX ${CROSS_DIR}/bin/ + pmo CVM_JAVA java + pmo CVM_JAVAC javac + pmo CVM_JAVADOC true + pmo CVM_JAVAH gjavah + pmo CVM_JAR gjar + pmo CVM_INCLUDE_DIR ${STAGING_INCDIR}/classpath + + pmo JAVAC_OPTIONS -nowarn + + pmo "# Host C/C++ toolchain binaries" + pmo HOST_CC "${BUILD_CC}" + pmo HOST_CC_PATH "${BUILD_CC}" + pmo HOST_CCC "${BUILD_CXX}" + pmo HOST_PATH "${BUILD_CXX}" + pmo HOST_LD "${BUILD_LD}" + pmo HOST_RANLIB "${BUILD_RANLIB}" + + pmo "# C/C++ toolchain binaries" + pmo TARGET_CC "${CC}" + pmo TARGET_CC_PATH "${CC}" + pmo CCFLAGS "${CFLAGS}" + pmo TARGET_CCC "${CXX}" + pmo TARGET_PATH "${CXX}" + pmo CCCFLAGS "${CXXFLAGS}" + pmo TARGET_AR "${AR}" + pmo TARGET_LD "${CC}" + pmo TARGET_RANLIB "${RANLIB}" + + pmo USE_GCC2 false + + pmo "include ../share/top.mk" +} + +pmo_start() { + echo "$1 = $2" > GNUmakefile + echo "$1 = $2" +} + +pmo() { + if [ "$2" ] + then + echo "$1 = $2" >> GNUmakefile + echo "$1 = $2" + else + echo "$1" >> GNUmakefile + echo "$1" + fi +} + +set_arch() { + case ${TARGET_ARCH} in + arm*) ARCH=arm ;; + i*86*) ARCH=x86 ;; + mips*) ARCH=mips ;; + powerpc*) ARCH=powerpc ;; + sparc*) ARCH=sparc ;; + x86_64*) ARCH=x86 ;; + *) die "Sorry, your target architecture is not supported!" ;; + esac +} + +# Default non-arch specific configuration +oe_phoneme_configbase() { + pmo CVM_DEBUG false + pmo CVM_JIT true +} + +# Default arch specific configurations +oe_phoneme_configarm() { + tf=true + if [ Xoabi = X${ARM_ABI} ] + then + tf=false + fi + + pmo USE_AAPCS $tf +} + +oe_phoneme_configx86() { + # Taken from linux-x86-generic/GNUmakefile + pmo CVM_JIT_REGISTER_LOCALS false +} + +ALTERNATIVE_NAME = "java-cdc" +ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}" +ALTERNATIVE_PATH = "${libdir}/jvm/${PN}/bin/cvm" +ALTERNATIVE_PRIORITY = "10" + +FILES_${PN} = "${bindir}" +FILES_${PN}-dbg += "${COMMON_DIR}/bin/.debug/cvm" + diff --git a/packages/portaudio/portaudio-v19_20071207.bb b/packages/portaudio/portaudio-v19_20071207.bb deleted file mode 100644 index f8de2d741d..0000000000 --- a/packages/portaudio/portaudio-v19_20071207.bb +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges <devel@hentges.net> (c) 2008 -# License: MIT (see http://www.opensource.org/licenses/mit-license.php -# for a copy of the license) -# -# Filename: portaudio-v19_20071207.bb -# Date: 20080104 (YMD) - -DESCRIPTION = "portaudio is a portable cross-platform Audio API" -SECTION = "base" -LICENSE = "GPL" - -PR = "r0" - -###################################################################################### - -SRC_URI = "http://www.portaudio.com/archives/pa_stable_v19_${PV}.tar.gz" - -S = "${WORKDIR}/portaudio" - -inherit autotools - -do_stage() { - install -m 0644 ${S}/include/portaudio.h ${STAGING_INCDIR}/ - oe_libinstall -C lib -so libportaudio ${STAGING_LIBDIR}/ -} diff --git a/packages/portaudio/portaudio-v19_svn.bb b/packages/portaudio/portaudio-v19_svn.bb new file mode 100644 index 0000000000..8fe48f8efe --- /dev/null +++ b/packages/portaudio/portaudio-v19_svn.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "A portable audio library" +SECTION = "libs/multimedia" +PRIORITY = "optional" +LICENSE = "GPL" +PV = "v19+svnr${SRCREV}" +PR = "r0" + +SRC_URI = "svn://www.portaudio.com/repos/portaudio;module=trunk;proto=https" +S = "${WORKDIR}/trunk" + +inherit autotools + +TESTS = " pa_devs patest1 patest_hang patest_many patest_prime patest_sine patest_stop patest_write_sine \ +pa_fuzz patest_buffer patest_in_overflow patest_maxsines patest_read_record patest_sine8 patest_sync \ +pa_minlat patest_callbackstop patest_latency patest_multi_sine patest_record patest_sine_formats patest_toomanysines \ +paqa_devs patest_clip patest_leftright patest_out_underflow patest_ringmix patest_sine_time patest_underflow \ +paqa_errs patest_dither patest_longsine patest_pink patest_saw patest_start_stop patest_wire" + +# DEFINES = PA_USE_OSS=1 HAVE_LIBPTHREAD=1 +# DEFINES += PA_LITTLE_ENDIAN + +# INCLUDEPATH = ../pa_common + +do_stage() { + autotools_stage_all +} + +PACKAGES += "portaudio-examples" +FILES_portaudio-examples = "${bindir}" diff --git a/packages/portaudio/portaudio_0.0.19.bb b/packages/portaudio/portaudio_0.0.19.bb deleted file mode 100644 index 748519f5b1..0000000000 --- a/packages/portaudio/portaudio_0.0.19.bb +++ /dev/null @@ -1,87 +0,0 @@ -DESCRIPTION = "A portable audio library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL" -PV = "1:0.0.19+cvs${SRCDATE}" -PR = "r1" - -SRC_URI = "http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz" -S = "${WORKDIR}/portaudio" - -inherit qmake - -TESTS = " pa_devs patest1 patest_hang patest_many patest_prime patest_sine patest_stop patest_write_sine \ -pa_fuzz patest_buffer patest_in_overflow patest_maxsines patest_read_record patest_sine8 patest_sync \ -pa_minlat patest_callbackstop patest_latency patest_multi_sine patest_record patest_sine_formats patest_toomanysines \ -paqa_devs patest_clip patest_leftright patest_out_underflow patest_ringmix patest_sine_time patest_underflow \ -paqa_errs patest_dither patest_longsine patest_pink patest_saw patest_start_stop patest_wire" - -do_configure_prepend() { - echo "TEMPLATE = subdirs" >portaudio.pro - echo "SUBDIRS = lib tests" >>portaudio.pro - - mkdir -p lib - cat <<EOF >lib/lib.pro -TEMPLATE = lib -CONFIG = console debug warn_on -TARGET = portaudio -VERSION = 0.0.19 -DESTDIR = . -DEFINES = PA_USE_OSS=1 HAVE_LIBPTHREAD=1 -DEFINES += PA_LITTLE_ENDIAN - -INCLUDEPATH = ../pa_common - -SOURCES = \ - ../pa_common/pa_allocation.c \ - ../pa_common/pa_converters.c \ - ../pa_common/pa_cpuload.c \ - ../pa_common/pa_dither.c \ - ../pa_common/pa_front.c \ - ../pa_common/pa_process.c \ - ../pa_common/pa_skeleton.c \ - ../pa_common/pa_stream.c \ - ../pa_common/pa_trace.c \ -\ - ../pa_unix_oss/pa_unix_oss.c \ - ../pa_unix/pa_unix_hostapis.c \ - ../pa_unix/pa_unix_util.c -EOF - - mkdir -p tests - echo "TEMPLATE = subdirs" >tests/tests.pro - echo "SUBDIRS = \\" >>tests/tests.pro - - for test in ${TESTS} - do - mkdir -p tests/$test - cat <<EOF >tests/$test/$test.pro -TEMPLATE = app -CONFIG = console debug warn_on thread -DESTDIR = ../../bin -INCLUDEPATH = ../../pa_common/ -LIBS = -L../../lib -lportaudio -lm -SOURCES = ../../pa_tests/$test.c -EOF - echo "$test \\" >>tests/tests.pro - done - echo >>tests/tests.pro -} - -do_stage() { - oe_libinstall -so -C lib libportaudio ${STAGING_LIBDIR} - install -m 0644 pa_common/portaudio.h ${STAGING_INCDIR}/portaudio.h -} - -do_install() { - install -d ${D}${libdir} - install -d ${D}${bindir} - install -d ${D}${includedir} - oe_libinstall -so -C lib libportaudio ${D}${libdir} - install -m 0644 pa_common/portaudio.h ${D}${includedir} - install -m 0755 bin/* ${D}${bindir}/ -} - -PACKAGES = "${PN}-dbg libportaudio0 portaudio-dev portaudio-examples" -FILES_libportaudio0 = "${libdir}" -FILES_portaudio-examples = "${bindir}" diff --git a/packages/python/python-ptrace_0.3.2.bb b/packages/python/python-ptrace_0.3.2.bb new file mode 100644 index 0000000000..a039476c39 --- /dev/null +++ b/packages/python/python-ptrace_0.3.2.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "python-ptrace is a debugger using ptrace." +HOMEPAGE = "http://fusil.hachoir.org/trac/wiki/python-ptrace" +SECTION = "devel/python" +LICENSE = "GPLv2" +PR = "ml0" + +SRC_URI = "http://pypi.python.org/packages/source/p/ptrace/ptrace-${PV}.tar.gz" +S = "${WORKDIR}/ptrace-${PV}" + +inherit distutils diff --git a/packages/rdesktop/rdesktop_1.6.0.bb b/packages/rdesktop/rdesktop_1.6.0.bb new file mode 100644 index 0000000000..b5337f9e83 --- /dev/null +++ b/packages/rdesktop/rdesktop_1.6.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Rdesktop rdp client for X" +DEPENDS = "virtual/libx11 openssl" +HOMEPAGE = "http://www.rdesktop.org" +SECTION = "x11/network" +LICENSE = "GPL" +PV = "1.6.0" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/rdesktop/rdesktop-${PV}.tar.gz" + +inherit autotools + +EXTRA_OECONF = "--with-openssl=${STAGING_EXECPREFIXDIR} " diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index f6aec948bd..08915c033f 100644 --- a/packages/tasks/task-python-everything.bb +++ b/packages/tasks/task-python-everything.bb @@ -1,7 +1,7 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml32" +PR = "ml33" RDEPENDS = "\ python-ao \ @@ -39,6 +39,7 @@ RDEPENDS = "\ python-ogg \ python-opendir \ python-pexpect \ + python-ptrace \ python-pyalsa \ python-pyalsaaudio \ python-pybluez \ |