[oe-commits] org.oe.dev merge of '46bdfedbe1ecde1685daaddc2f0b8a46939f17c4'

[coredump2 commit]

merge of '46bdfedbe1ecde1685daaddc2f0b8a46939f17c4'
     and 'fd22e92470cbc7bd32d4c2d747a6577afd80516e'

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 625351d555e311369171d2264262fb95f728b65c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=625351d555e311369171d2264262fb95f728b65c
Files:
1
packages/usb-gadget-mode/files/spitz
packages/usb-gadget-mode/files/spitz/usb-gadget.conf
packages/efl1/imlib2_1.4.0.001.bb
packages/phalanx/phalanx_22.bb
packages/usb-gadget-mode/files/usb-gadget
packages/usb-gadget-mode/usb-gadget-mode.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh6.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh10.bb
Diffs:

#
# mt diff -r46bdfedbe1ecde1685daaddc2f0b8a46939f17c4 -r625351d555e311369171d2264262fb95f728b65c
#
# 
# 
# add_dir "packages/usb-gadget-mode/files/spitz"
# 
# add_file "packages/usb-gadget-mode/files/spitz/usb-gadget.conf"
#  content [c6dc2faccdf836cab1db005d0218fe321a7d43c4]
# 
# patch "packages/efl1/imlib2_1.4.0.001.bb"
#  from [b020b08a41d3be7b6799b0cec84e1bdf2daf2963]
#    to [a234478e69ae1e65eaa10c5042cedf110b7721c5]
# 
# patch "packages/phalanx/phalanx_22.bb"
#  from [e3381adcfec7c19aa74c36c84772e18be326673f]
#    to [977094a4ed80107e90502a283f75463be1614cb6]
# 
# patch "packages/usb-gadget-mode/files/usb-gadget"
#  from [1fa6c0e2f6526845f7cf5d86db4a4be1d4f975cc]
#    to [38aa3c6b26c6b9473ced7a15bcd3fba903ba5e0a]
# 
# patch "packages/usb-gadget-mode/usb-gadget-mode.bb"
#  from [42d48b72661e355aadc5b25f5cadb73dcf5328ce]
#    to [896ed80eabe12c8d269e13068df33cb66c5e3cd3]
# 
============================================================
--- packages/usb-gadget-mode/files/spitz/usb-gadget.conf	c6dc2faccdf836cab1db005d0218fe321a7d43c4
+++ packages/usb-gadget-mode/files/spitz/usb-gadget.conf	c6dc2faccdf836cab1db005d0218fe321a7d43c4
@@ -0,0 +1,3 @@
+USB_MODE="networking"
+MODULE_OPTIONS=""
+
============================================================
--- packages/efl1/imlib2_1.4.0.001.bb	b020b08a41d3be7b6799b0cec84e1bdf2daf2963
+++ packages/efl1/imlib2_1.4.0.001.bb	a234478e69ae1e65eaa10c5042cedf110b7721c5
@@ -5,9 +5,11 @@ inherit efl1
 
 inherit efl1
 
+PR = "r1"
+
 PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
 FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
-FILES_${PN}-dbg = "${libdir}/.debug/"
+FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/"
 FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}"
 FILES_${PN}-bin = "${bindir}"
 FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
============================================================
--- packages/phalanx/phalanx_22.bb	e3381adcfec7c19aa74c36c84772e18be326673f
+++ packages/phalanx/phalanx_22.bb	977094a4ed80107e90502a283f75463be1614cb6
@@ -1,13 +1,13 @@ PRIORITY = "optional"
 DESCRIPTION = "Phalanx is a chess playing engine."
 SECTION = "opie/libs"
 PRIORITY = "optional"
-PR = "r3"
+PR = "r4"
 LICENSE = "GPL"
-SRC_URI = "ftp://ftp.math.muni.cz/pub/math/people/Dobes/phalanx-22.tar.gz \
+SRC_URI = "http://ftp.debian.org/debian/pool/main/p/phalanx/phalanx_22.orig.tar.gz \
            file://gcc3.patch;patch=1 \
            file://capabilities \
            file://description"
-S = "${WORKDIR}/Phalanx-XXII"
+S = "${WORKDIR}/phalanx-22.orig"
 
 do_compile() {
 	oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" STRIP=echo LD="${CC}"
@@ -24,3 +24,4 @@ FILES_${PN} = "${palmtopdir}/chess"
 }
 
 FILES_${PN} = "${palmtopdir}/chess"
+FILES_${PN}-dbg += "${palmtopdir}/chess/engines/Phalanx/.debug"
============================================================
--- packages/usb-gadget-mode/files/usb-gadget	1fa6c0e2f6526845f7cf5d86db4a4be1d4f975cc
+++ packages/usb-gadget-mode/files/usb-gadget	38aa3c6b26c6b9473ced7a15bcd3fba903ba5e0a
@@ -9,6 +9,7 @@
 #################################################################################
 #
 # 20070606 - v0.0.1	- Initial release
+# 20070630 - v0.0.2	- Add forgotten host mode
 
 CONF_FILE="/etc/default/usb-gadget"
 
@@ -23,6 +24,8 @@ go() {
 	case "$USB_MODE" in
 	networking)	setup_usb g_ether "$MODULE_OPTIONS" ;;
 	storage)	setup_usb g_file_storage "$MODULE_OPTIONS" ;;
+	hostmode)	unload_usb_gadgets
+			setup_usb ohci_hcd "$MODULE_OPTIONS" ;;
 	none)		unload_usb_gadgets ;;
 	esac		
 		
============================================================
--- packages/usb-gadget-mode/usb-gadget-mode.bb	42d48b72661e355aadc5b25f5cadb73dcf5328ce
+++ packages/usb-gadget-mode/usb-gadget-mode.bb	896ed80eabe12c8d269e13068df33cb66c5e3cd3
@@ -13,8 +13,8 @@ LICENSE = "GPL"
 
 ######################################################################################
 
-PV = "0.0.1"
-PR = "r3"
+PV = "0.0.2"
+PR = "r0"
 
 ######################################################################################
 


#
# mt diff -rfd22e92470cbc7bd32d4c2d747a6577afd80516e -r625351d555e311369171d2264262fb95f728b65c
#
# 
# 
# rename "packages/linux/linux-handhelds-2.6_2.6.21-hh6.bb"
#     to "packages/linux/linux-handhelds-2.6_2.6.21-hh10.bb"
#