[oe-commits] org.oe.dev merge of '2d19f916b7cff472234f979a8f11d862485c1bd9'
rwhitby commit
oe at amethyst.openembedded.net
Mon Sep 1 18:08:31 UTC 2008
merge of '2d19f916b7cff472234f979a8f11d862485c1bd9'
and 'f3a59ad5e403b3a25a1e7cc944e5abf2dbc52e92'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 7d53e767fa431d48b1e4fab7c949747d774d0112
ViewMTN: http://monotone.openembedded.org/revision/info/7d53e767fa431d48b1e4fab7c949747d774d0112
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/portaudio/portaudio-v19_20071207.bb
packages/gpsbabel/gpsbabel_1.3.3.bb
packages/gpsbabel/gpsbabel_1.3.5.bb
packages/portaudio/portaudio_0.0.19.bb
packages/portaudio/portaudio-v19_svn.bb
packages/rdesktop/rdesktop_1.5.0.bb
packages/rdesktop/rdesktop_1.6.0.bb
packages/phoneme
packages/phoneme/files
packages/gtk-webcore/midori_0.0.19.bb
packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch
packages/phoneme/files/phoneme-makefile-fix.patch
packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb
packages/phoneme/phoneme-advanced.inc
packages/python/python-ptrace_0.3.2.bb
classes/kernel.bbclass
conf/checksums.ini
conf/machine/om-gta01.conf
conf/machine/om-gta02.conf
packages/busybox/busybox.inc
packages/busybox/busybox_1.9.2.bb
packages/classpath/classpath.inc
packages/linux/linux-omap2_git.bb
packages/linux/linux-rp-2.6.26/defconfig-akita
packages/linux/linux-rp-2.6.26/defconfig-bootcdx86
packages/linux/linux-rp-2.6.26/defconfig-c7x0
packages/linux/linux-rp-2.6.26/defconfig-hx2000
packages/linux/linux-rp-2.6.26/defconfig-poodle
packages/linux/linux-rp-2.6.26/defconfig-qemuarm
packages/linux/linux-rp-2.6.26/defconfig-qemux86
packages/linux/linux-rp-2.6.26/defconfig-spitz
packages/linux/linux-rp-2.6.26/defconfig-zylonite
packages/lzma/lzma-native_4.17.bb
packages/tasks/task-python-everything.bb
Diffs:
#
# mt diff -r2d19f916b7cff472234f979a8f11d862485c1bd9 -r7d53e767fa431d48b1e4fab7c949747d774d0112
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [e4429231d4f16a36eda8a63ea02bdb4ec703e0ff]
# to [3695a9c6c8bc8f564bfab557a07a7e454aa63eb3]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc e4429231d4f16a36eda8a63ea02bdb4ec703e0ff
+++ conf/distro/include/sane-srcrevs.inc 3695a9c6c8bc8f564bfab557a07a7e454aa63eb3
@@ -49,7 +49,7 @@ SRCREV_pn-illume-theme-asu ?= "170"
SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-illume ?= "170"
SRCREV_pn-illume-theme-asu ?= "170"
-SRCREV_pn-illume-theme-freesmartphone ?= "5cdedae0e45911ef10f6966587e7f3e842b5d2bd"
+SRCREV_pn-illume-theme-freesmartphone ?= "0f27c0b52b8dad255349e6c72d590fa787be8c3b"
SRCREV_pn-kismet ?= "2285"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
#
# mt diff -rf3a59ad5e403b3a25a1e7cc944e5abf2dbc52e92 -r7d53e767fa431d48b1e4fab7c949747d774d0112
#
#
#
# delete "packages/portaudio/portaudio-v19_20071207.bb"
#
# rename "packages/gpsbabel/gpsbabel_1.3.3.bb"
# to "packages/gpsbabel/gpsbabel_1.3.5.bb"
#
# rename "packages/portaudio/portaudio_0.0.19.bb"
# to "packages/portaudio/portaudio-v19_svn.bb"
#
# rename "packages/rdesktop/rdesktop_1.5.0.bb"
# to "packages/rdesktop/rdesktop_1.6.0.bb"
#
# add_dir "packages/phoneme"
#
# add_dir "packages/phoneme/files"
#
# add_file "packages/gtk-webcore/midori_0.0.19.bb"
# content [ca09653d60b9011202d481bd484270b7c09b43d2]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch"
# content [95eea5cc96584fc3e342db6e81d5ad7a88218a80]
#
# add_file "packages/phoneme/files/phoneme-makefile-fix.patch"
# content [17a4c4f069d714e21e70a25fcbc9cd8d788082db]
#
# add_file "packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb"
# content [aa80f45ba22c3a76ef6825a5ac1e27ba443a968a]
#
# add_file "packages/phoneme/phoneme-advanced.inc"
# content [007bcceb2ee829e446bc8efb4e871e5750fabb1b]
#
# add_file "packages/python/python-ptrace_0.3.2.bb"
# content [0f90f9660627795440c3166b852a0eece9b71cfa]
#
# add_file "packages/rdesktop/rdesktop_1.5.0.bb"
# content [9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd]
#
# patch "classes/kernel.bbclass"
# from [fd4d710e7db2886e29dc83097649bf1ad8661939]
# to [772e3ddb49b5122286d15dfc10a357056263d0e7]
#
# patch "conf/checksums.ini"
# from [220049577807c299e5636ee748e66a9f43cd5e48]
# to [a666fe7c398e19b3ec806de77c7d74799ebe271a]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [e9b5bae96cb8cf409fb21e4e9f3d2940a6fc9b55]
# to [3695a9c6c8bc8f564bfab557a07a7e454aa63eb3]
#
# patch "conf/machine/om-gta01.conf"
# from [a9074ead3cca6d3eb6fdc837d712eecfb35d4e91]
# to [11955cc67c94d27c50a49e55a06ef8c96af9ad6e]
#
# patch "conf/machine/om-gta02.conf"
# from [1320182b35aa623d42f9cb99022c0533b54d5996]
# to [857a1ed4810a63a7d75a7c68d2523b971f9a6c8a]
#
# patch "packages/busybox/busybox.inc"
# from [99fe4e1235f3e8d6f57649a3b0c84a1fd120d775]
# to [1bd8d9defd1e1be813cfb434b4b578697b1b33a7]
#
# patch "packages/busybox/busybox_1.9.2.bb"
# from [d57bfa894a3e0caf97bd34c841fbe24ab3b167fd]
# to [e67cffcad4bfadee85161e3e26073ad85cd557d2]
#
# patch "packages/classpath/classpath.inc"
# from [38c3e19b11832c4ee048c930972f95afbc256c0c]
# to [ec953cce26d7aeec31b06aa3dbce43c70686a735]
#
# patch "packages/gpsbabel/gpsbabel_1.3.5.bb"
# from [74c8983bc789932d363fc987244b08d4fab8b521]
# to [3e5a504ca8d2083bad1497af1995f2f25510f74c]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [87915c4f021c2162daeb74e1fb307a622f4600c6]
# to [fe0807df08f9b386baae24813ff6aa3f5636acc8]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-akita"
# from [064c36530b213dae882be1b6bb2cbab8615906f8]
# to [a0a3429c4b8ccf2f435e890ead2c2c201c5c904f]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-bootcdx86"
# from [83dbfc0474bb18348ca67718d27d2dcc262095a3]
# to [d1900766f3a9e8322678ced49e5a5bb93b2f332a]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-c7x0"
# from [9840eec605b360f4cdcf976973331ce274a89b6f]
# to [5c533bfba4b4fbfde44ddf442337a158ecc8a5fe]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-hx2000"
# from [8d4023e3a924b2d01a60011c6aa81cca7bc83d06]
# to [53a11bd3d87b58b40c49ee4586ab730d462b379c]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-poodle"
# from [823d2a1579f2e5312396ba4c0d40a7405bcebd4f]
# to [4c70a99ea564dc7a44015887b731791964dc9ee5]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-qemuarm"
# from [19a7a240f8a4fd58732db1ccb11767dac8fc7221]
# to [5b90b4f63559daa07eddb8a15d4226670dd5bf25]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-qemux86"
# from [8f2d48208eb79e7a2e00941efcaee2cad2d34737]
# to [d47c9d63424aa0cd8dcf1f956fd8af65f05f56b7]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-spitz"
# from [121ce2ca2da79de4072c338f63ad9e345f2674bb]
# to [3e79a57deaec2eed97be90695ff0b6abdcdc8a63]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-zylonite"
# from [71cf26b625ad773ac5468869fe7052854759f70f]
# to [22182e2386826a6baf8d411b182d4bdaad6a91c0]
#
# patch "packages/lzma/lzma-native_4.17.bb"
# from [5311eac6c46a2960d3490db56ea225d1f8b06ade]
# to [e156289d106897d745394d560b98ffb79ad68f0b]
#
# patch "packages/portaudio/portaudio-v19_svn.bb"
# from [6e0e4519a0c491b4df8965004e222f426ae15d72]
# to [2412bb2e306a60afa27283238b90b401ca15749c]
#
# patch "packages/rdesktop/rdesktop_1.6.0.bb"
# from [9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd]
# to [dc304a9614cfa828cc7dd1d4a36c43a3e68434c1]
#
# patch "packages/tasks/task-python-everything.bb"
# from [76ee4d36dc4c36625b1459bd63528acdd32188db]
# to [51a6e92c2c5bb538d4094dea12781c8d68eb9746]
#
============================================================
--- packages/gtk-webcore/midori_0.0.19.bb ca09653d60b9011202d481bd484270b7c09b43d2
+++ packages/gtk-webcore/midori_0.0.19.bb ca09653d60b9011202d481bd484270b7c09b43d2
@@ -0,0 +1,5 @@
+require midori.inc
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.bz2"
+
+
============================================================
--- packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch 95eea5cc96584fc3e342db6e81d5ad7a88218a80
+++ packages/linux/linux-omap2-git/beagleboard/musb-dmafix.patch 95eea5cc96584fc3e342db6e81d5ad7a88218a80
@@ -0,0 +1,275 @@
+From: Gadiyar, Anand <gadiyar at 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 at 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 |
============================================================
--- packages/phoneme/files/phoneme-makefile-fix.patch 17a4c4f069d714e21e70a25fcbc9cd8d788082db
+++ packages/phoneme/files/phoneme-makefile-fix.patch 17a4c4f069d714e21e70a25fcbc9cd8d788082db
@@ -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%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list