[oe-commits] org.oe.dev merge of '87fd9620e17c2f95921fa9efc06c497fd665ce42'
thesing commit
oe at amethyst.openembedded.net
Fri Apr 4 13:18:32 UTC 2008
merge of '87fd9620e17c2f95921fa9efc06c497fd665ce42'
and 'd4ada8446f36d70f32222f306b5709b1048f47d7'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: c89f8d947c6b86b58fd1337e27c43626e0c7ee3d
ViewMTN: http://monotone.openembedded.org/revision/info/c89f8d947c6b86b58fd1337e27c43626e0c7ee3d
Files:
1
packages/libopieobex/files
packages/libopieobex/files/disable-bt-check.patch
packages/libopieobex/libopieobex0_1.2.3.bb
packages/libopieobex/libopieobex0_cvs.bb
packages/tasks/task-opie-all.bb
packages/linux/linux-rp-2.6.24/defconfig-collie
packages/linux/linux-rp_2.6.24.bb
Diffs:
#
# mt diff -r87fd9620e17c2f95921fa9efc06c497fd665ce42 -rc89f8d947c6b86b58fd1337e27c43626e0c7ee3d
#
#
#
# add_dir "packages/libopieobex/files"
#
# add_file "packages/libopieobex/files/disable-bt-check.patch"
# content [4531ca6db356b9e34c43ab4986901f13cbef2ad4]
#
# patch "packages/libopieobex/libopieobex0_1.2.3.bb"
# from [d78020e74a92f741a163fff78e554f93bd96f91e]
# to [0c803763dbf3b86af956d5c0b3d2520ece6bcc8c]
#
# patch "packages/libopieobex/libopieobex0_cvs.bb"
# from [0e5adb40de222cf5c66a7884fa46c00160d179a7]
# to [8f777b6cc6d58e21975d108a806c55a81f01f4a4]
#
# patch "packages/tasks/task-opie-all.bb"
# from [15c14539dc8f8cae41b6fac4fa108dce9012a130]
# to [247d329aa6a21cecb1f4f74f1a838072b8aa22d8]
#
============================================================
--- packages/libopieobex/files/disable-bt-check.patch 4531ca6db356b9e34c43ab4986901f13cbef2ad4
+++ packages/libopieobex/files/disable-bt-check.patch 4531ca6db356b9e34c43ab4986901f13cbef2ad4
@@ -0,0 +1,19 @@
+--- obex/obex.pro 2007-07-20 23:44:06.000000000 +1200
++++ obex/obex.pro 2007-10-18 17:57:15.000000000 +1300
+@@ -13,12 +13,12 @@
+ include( $(OPIEDIR)/include.pro )
+ target.path = $$prefix/plugins/applets
+
+-#FIXME: These parameters are used if bluetooth is used
+-CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH )
+-contains( CONFTEST, y ){
++#FIXME: This test does not work under OE. Instead, just always enable bluetooth.
++#CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH )
++#contains( CONFTEST, y ){
+ HEADERS += btobex.h
+ SOURCES += btobex.cpp
+ INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
+ LIBS += -lopietooth1 -lbluetooth
+ DEFINES += BLUETOOTH
+-}
++#}
============================================================
--- packages/libopieobex/libopieobex0_1.2.3.bb d78020e74a92f741a163fff78e554f93bd96f91e
+++ packages/libopieobex/libopieobex0_1.2.3.bb 0c803763dbf3b86af956d5c0b3d2520ece6bcc8c
@@ -1,5 +1,6 @@ require libopieobex0.inc
require libopieobex0.inc
+PR = "r1"
-
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+ file://disable-bt-check.patch;patch=1"
- ${HANDHELDS_CVS};tag=${TAG};module=opie/pics "
============================================================
--- packages/libopieobex/libopieobex0_cvs.bb 0e5adb40de222cf5c66a7884fa46c00160d179a7
+++ packages/libopieobex/libopieobex0_cvs.bb 8f777b6cc6d58e21975d108a806c55a81f01f4a4
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
require libopieobex0.inc
PV = "${OPIE_CVS_PV}"
-PR = "r6"
+PR = "r7"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
+ ${HANDHELDS_CVS};module=opie/pics \
+ file://disable-bt-check.patch;patch=1"
- ${HANDHELDS_CVS};module=opie/pics"
============================================================
--- packages/tasks/task-opie-all.bb 15c14539dc8f8cae41b6fac4fa108dce9012a130
+++ packages/tasks/task-opie-all.bb 247d329aa6a21cecb1f4f74f1a838072b8aa22d8
@@ -24,7 +24,7 @@ RDEPENDS_task-opie-applets = "opie-about
opie-screenshotapplet opie-suspendapplet opie-vmemo \
opie-volumeapplet opie-vtapplet opie-zkbapplet \
"
-RDEPENDS_task-opie-inputmethods = "opie-dasher opie-dvorak opie-handwriting \
+RDEPENDS_task-opie-inputmethods = "opie-dvorak opie-handwriting \
opie-handwriting-classicset opie-jumpx opie-keyboard \
opie-keyview opie-kjumpx opie-multikey opie-unikeyboard"
#
# mt diff -rd4ada8446f36d70f32222f306b5709b1048f47d7 -rc89f8d947c6b86b58fd1337e27c43626e0c7ee3d
#
#
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-collie"
# from [00f12162c27b673416c405423b28120b2a874dfe]
# to [8208bbebbe88540eb31ca08464d577669e2350f2]
#
# patch "packages/linux/linux-rp_2.6.24.bb"
# from [ce10df6d3a73ef3738f0718a582cff77e16c5954]
# to [57db448f20e39546eebbc6770507fc68be79e571]
#
============================================================
--- packages/linux/linux-rp-2.6.24/defconfig-collie 00f12162c27b673416c405423b28120b2a874dfe
+++ packages/linux/linux-rp-2.6.24/defconfig-collie 8208bbebbe88540eb31ca08464d577669e2350f2
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.24
-# Sun Jan 27 14:12:17 2008
+# Fri Apr 4 14:44:13 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -150,6 +150,7 @@ CONFIG_SA1100_COLLIE=y
# CONFIG_SA1100_ASSABET is not set
# CONFIG_SA1100_CERF is not set
CONFIG_SA1100_COLLIE=y
+CONFIG_COLLIE_PM=y
# CONFIG_SA1100_H3100 is not set
# CONFIG_SA1100_H3600 is not set
# CONFIG_SA1100_H3800 is not set
@@ -962,6 +963,7 @@ CONFIG_SND_PCM=m
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
+CONFIG_SND_RAWMIDI=m
# CONFIG_SND_SEQUENCER is not set
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=m
@@ -1012,7 +1014,48 @@ CONFIG_HID=m
CONFIG_HID=m
# CONFIG_HID_DEBUG is not set
# CONFIG_HIDRAW is not set
-# CONFIG_USB_SUPPORT is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_AT91 is not set
+CONFIG_USB_GADGET_SA1100=y
+CONFIG_USB_SA1100=m
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_ETH=m
+# CONFIG_USB_ETH_RNDIS is not set
+# CONFIG_USB_ETH_NO_MDLM is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
============================================================
--- packages/linux/linux-rp_2.6.24.bb ce10df6d3a73ef3738f0718a582cff77e16c5954
+++ packages/linux/linux-rp_2.6.24.bb 57db448f20e39546eebbc6770507fc68be79e571
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r7"
+PR = "r8"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_collie = "1"
@@ -95,10 +95,12 @@ SRC_URI_append_collie = "\
${TKSRC}/pcmcia_suspend.patch;patch=1 \
${TKSRC}/locomo_spi-6.patch;patch=1 \
${TKSRC}/config.patch;patch=1 \
- ${TKSRC}/locomokeyb.patch;patch=1 \
+ ${TKSRC}/locomokeyb-2.patch;patch=1 \
${TKSRC}/mmc-spi.patch;patch=1 \
${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \
${TKSRC}/sa1100_spinlock.patch;patch=1 \
+ ${TKSRC}/sa1100-dma.patch;patch=1 \
+ ${TKSRC}/sa1100_udc_g_ether.patch;patch=1 \
"
SRC_URI_append_poodle = "\
More information about the Openembedded-commits
mailing list