[oe-commits] org.oe.dev merge of '4a597627acd6eec179bb1a03405d92cf8b871ac0'

mickeyl commit openembedded-commits at lists.openembedded.org
Mon Jul 30 11:36:20 UTC 2007


merge of '4a597627acd6eec179bb1a03405d92cf8b871ac0'
     and '6c89e16689bde0d5bff8b0e47eea04a458190a56'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: f87475ccf1fd18294a9edb79090422cc8f201753
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f87475ccf1fd18294a9edb79090422cc8f201753
Files:
1
packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb
packages/opie-reader/files/opie-reader-unicode-copy.patch
packages/blassic
packages/gnome/gnome-vfs-2.18.1
packages/gnuradio/gnuradio
packages/opie-taskbar/opie-taskbar-images
conf/machine/palmt680.conf
packages/blassic/blassic_0.10.1.bb
packages/bluez/bluez-gnome_0.10.bb
packages/bluez/bluez-hcidump_1.38.bb
packages/bluez/bluez-libs_3.13.bb
packages/bluez/bluez-utils_3.13.bb
packages/classpath/classpath-minimal-native_0.95.bb
packages/classpath/classpath-minimal.inc
packages/classpath/classpath-minimal_0.95.bb
packages/gnome/gnome-keyring_0.6.0.bb
packages/gnome/gnome-panel_2.18.1.bb
packages/gnome/gnome-power-manager_2.18.3.bb
packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch
packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch
packages/gnome/gnome-vfs_2.18.1.bb
packages/gnome/libwnck_2.13.5.bb
packages/gnuradio/gnuradio/no-trellis-doc.patch
packages/gnuradio/gnuradio.inc
packages/gnuradio/gnuradio_3.0.4.bb
packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch
packages/gtk+/gtk+-2.10.14/range-no-redraw.patch
packages/gtk+/gtk+-2.10.14/scrolled-placement.patch
packages/gtk+/gtk+-2.10.14/toggle-font.diff
packages/guile/guile-native_1.8.2.bb
packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb
packages/networkmanager/network-manager-applet_0.6.5.bb
packages/networkmanager/networkmanager.inc
packages/networkmanager/networkmanager_0.6.5.bb
packages/openmoko-apps/omext_0.2.bb
packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg
packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg
packages/opie-taskbar/opie-taskbar-images_1.2.3.bb
packages/synergy/synergy_1.3.1.bb
classes/base.bbclass
classes/image.bbclass
classes/pkgconfig.bbclass
classes/sanity.bbclass
conf/bitbake.conf
conf/distro/include/preferred-opie-versions-1.2.3.inc
conf/machine/include/palm.conf
conf/machine/palmld.conf
conf/machine/palmt650.conf
conf/machine/palmtc.conf
conf/machine/palmtt5.conf
conf/machine/palmtx.conf
packages/bluez/bluez-gnome_cvs.bb
packages/bluez/bluez-gnome_git.bb
packages/glibc/glibc_2.6.bb
packages/gnome/gnome-desktop_2.18.3.bb
packages/gnome/gnome-menus_2.16.1.bb
packages/gnuradio/gnuradio_svn.bb
packages/gtk+/gtk+_2.10.14.bb
packages/jack/jack_0.103.0.bb
packages/linux/linux-hackndev-2.6/palmld/defconfig
packages/linux/linux-hackndev-2.6/palmtc/defconfig
packages/linux/linux-hackndev-2.6/palmtt3/defconfig
packages/linux/linux-hackndev-2.6/palmtt5/defconfig
packages/linux/linux-hackndev-2.6/palmtx/defconfig
packages/linux/linux-hackndev-2.6/palmz72/defconfig
packages/linux/linux-handhelds-2.6_cvs.bb
packages/networkmanager/networkmanager_svn.bb
packages/opie-reader/opie-reader_1.2.3.bb
packages/opie-reader/opie-reader_cvs.bb
packages/opie-taskbar/opie-taskbar-images.inc
packages/opie-taskbar/opie-taskbar-images_cvs.bb
packages/xorg-xserver/xserver-kdrive_1.2.0.bb
site/common
mtn:manual_merge
true
classes/openmoko-panel-plugin.bbclass
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
Diffs:

#
# mt diff -r4a597627acd6eec179bb1a03405d92cf8b871ac0 -rf87475ccf1fd18294a9edb79090422cc8f201753
#
# 
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.20-hh6.bb"
# 
# delete "packages/opie-reader/files/opie-reader-unicode-copy.patch"
# 
# add_dir "packages/blassic"
# 
# add_dir "packages/gnome/gnome-vfs-2.18.1"
# 
# add_dir "packages/gnuradio/gnuradio"
# 
# add_dir "packages/opie-taskbar/opie-taskbar-images"
# 
# add_file "conf/machine/palmt680.conf"
#  content [69ee49c52bab331c54d8e101461ea4c62b9af0db]
# 
# add_file "packages/blassic/blassic_0.10.1.bb"
#  content [05a9598501383ac4a00f7312f0582e93fa40e9bd]
# 
# add_file "packages/bluez/bluez-gnome_0.10.bb"
#  content [6841233421c5e08a0657919d990abdc76ffac9e7]
# 
# add_file "packages/bluez/bluez-hcidump_1.38.bb"
#  content [d6f52cd2d74e198d022f5fd58a152c8d4eb73945]
# 
# add_file "packages/bluez/bluez-libs_3.13.bb"
#  content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
# 
# add_file "packages/bluez/bluez-utils_3.13.bb"
#  content [aa82bb7f1840874ad74d6cd0bdc28cae81267c85]
# 
# add_file "packages/classpath/classpath-minimal-native_0.95.bb"
#  content [a3710719a4819aacb9839dd5aaa9a92b703a74f6]
# 
# add_file "packages/classpath/classpath-minimal.inc"
#  content [5e5496a7c00f20f9627e30d5618d192684f71eba]
# 
# add_file "packages/classpath/classpath-minimal_0.95.bb"
#  content [1e37a31c37529a51633ba1087ed6429090784b95]
# 
# add_file "packages/gnome/gnome-keyring_0.6.0.bb"
#  content [0258d06fec84805ef12456590304787aba774bc5]
# 
# add_file "packages/gnome/gnome-panel_2.18.1.bb"
#  content [8f758fa8b2e8964d4583148f88ffe57da3fb063d]
# 
# add_file "packages/gnome/gnome-power-manager_2.18.3.bb"
#  content [e3370b98c7460b12a915c696bf311cee824c55c1]
# 
# add_file "packages/gnome/gnome-vfs-2.18.1/gconftool-lossage.patch"
#  content [86cd941ab9eb83fe517a655dd2efc89636d8d97c]
# 
# add_file "packages/gnome/gnome-vfs-2.18.1/gnome-vfs-no-kerberos.patch"
#  content [860446c945edbfcc96fafaaca0498b642e6a22dc]
# 
# add_file "packages/gnome/gnome-vfs_2.18.1.bb"
#  content [71ed32902ca195b29624c31b59b3a5f6d80a83d0]
# 
# add_file "packages/gnome/libwnck_2.13.5.bb"
#  content [dded17b49bf6ac38c86536a0a76e4d5e1b24b9de]
# 
# add_file "packages/gnuradio/gnuradio/no-trellis-doc.patch"
#  content [d5c686ac12fd6206586be1587735047f2ea35191]
# 
# add_file "packages/gnuradio/gnuradio.inc"
#  content [3f1b2b5f3c69879f89afcc926dccabf8d0e5d5fe]
# 
# add_file "packages/gnuradio/gnuradio_3.0.4.bb"
#  content [e935ec6d343e8fdb415db8992f198c118b3780af]
# 
# add_file "packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch"
#  content [86b154ddff681414b9ee93698f070af87eba8941]
# 
# add_file "packages/gtk+/gtk+-2.10.14/range-no-redraw.patch"
#  content [fadba3283e8dae1738b804181142adffac9acaf9]
# 
# add_file "packages/gtk+/gtk+-2.10.14/scrolled-placement.patch"
#  content [5595a91bea95e537af2a4b206b0d047577a92459]
# 
# add_file "packages/gtk+/gtk+-2.10.14/toggle-font.diff"
#  content [adee72a5d3cc2b226ad2c8ee4bb656ffc42ce676]
# 
# add_file "packages/guile/guile-native_1.8.2.bb"
#  content [5620660481d437ae965ccd3a6b88b1fd8d7cd254]
# 
# add_file "packages/linux/linux-handhelds-2.6_2.6.20-hh10.bb"
#  content [ba1ce0179ca1b72c3fd57043acd194eaf61bcae6]
# 
# add_file "packages/networkmanager/network-manager-applet_0.6.5.bb"
#  content [89490a85b03233d018dfa1a07704c8b98ab45b4d]
# 
# add_file "packages/networkmanager/networkmanager.inc"
#  content [d09f3129b2af07e182c0baace78a8a5bd5595f43]
# 
# add_file "packages/networkmanager/networkmanager_0.6.5.bb"
#  content [c44eba44dd018961750b625359c57e42f53463aa]
# 
# add_file "packages/openmoko-apps/omext_0.2.bb"
#  content [6941b61878fbc884b235aa3c8ab130b688077582]
# 
# add_file "packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg"
#  content [fa0276a0e0b6dc68a281e947c7103eba9fa39c86]
# 
# add_file "packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg"
#  content [3e2fc630413d05944b90a0f31f514262c20e46f6]
# 
# add_file "packages/opie-taskbar/opie-taskbar-images_1.2.3.bb"
#  content [d8972ce32ccf3ccd77f9e7cf60410b292cb04f45]
# 
# add_file "packages/synergy/synergy_1.3.1.bb"
#  content [860f8088a0473a57ace13cb733b57d532eac0148]
# 
# patch "classes/base.bbclass"
#  from [8a173bf48780618b184587ac961f0648715285fe]
#    to [8ae82b899b740b9da403e698610bf6ca49f8e64c]
# 
# patch "classes/image.bbclass"
#  from [cf408c603e14de57c839124bce87cc2ffce1d4cb]
#    to [ce0f0d35208d7dd219730207d787be86751416c5]
# 
# patch "classes/pkgconfig.bbclass"
#  from [0640502b335626fbfb58ae88b1b95ee44d078148]
#    to [7fbd67747ce8dbd5a57e8e7b03e4b94c34647b0c]
# 
# patch "classes/sanity.bbclass"
#  from [95fd13bb43f72d6183d34fd1c7babdc5fd181427]
#    to [65290f02acaa4917c43f42c7082a62768f5fb0ca]
# 
# patch "conf/bitbake.conf"
#  from [1a40a8a4b4660be43379de36b41dceabe1bebd19]
#    to [cb6550c833966af0deba898eb3e14cf54b4bd8c8]
# 
# patch "conf/distro/include/preferred-opie-versions-1.2.3.inc"
#  from [809befc195410fe1c02e56fd813603bfc80f6cc2]
#    to [9a067222c36557f64b1ad239657000b6669f1f41]
# 
# patch "conf/machine/include/palm.conf"
#  from [a32a7efd0b14ab2ca61bcb26d18444c5d97a6811]
#    to [02a8ab95afa85b4244a8bbfd6bce7a8f6891b86e]
# 
# patch "conf/machine/palmld.conf"
#  from [c75733b268f0ce8ecaf2561319e45d09e23ede02]
#    to [32bc1c9362a8e33bf31d59dce4b088b4e0f91bf4]
# 
# patch "conf/machine/palmt650.conf"
#  from [70d68f5ee3d7207f56f931ed592a634437a77eeb]
#    to [f175f87ac47a8138dd84ae41af9c9f19c53b23ab]
# 
# patch "conf/machine/palmtc.conf"
#  from [a19f6efa84036425f08bff9a59dcb1a5a920e19c]
#    to [db3fb94e943a205af995e6f086a4c9ecbb2ccccf]
# 
# patch "conf/machine/palmtt5.conf"
#  from [070b5873c71a74acc4fbe15b97cfaa6a4eabfea8]
#    to [276b5db2305a291b7de8cde31cfebfeef69aced2]
# 
# patch "conf/machine/palmtx.conf"
#  from [7b01875a26f5fa407501b3e1f67a25b6045a478f]
#    to [38355b635339a2229931554bb4d724e928cca980]
# 
# patch "packages/bluez/bluez-gnome_cvs.bb"
#  from [2c54e310db5bf56a6944e0952087979c42cfaf75]
#    to [3bba4cb3f81e6a9ae4ffa53731ee63fd302300ba]
# 
# patch "packages/bluez/bluez-gnome_git.bb"
#  from [ad5f43c2750098ef22df298f118dfcd64ccffd01]
#    to [5367f6822e3f3a11b3977d70ef24c0956ae2fe85]
# 
# patch "packages/glibc/glibc_2.6.bb"
#  from [35376f46839262776b45522e81b4acebf5c5cda0]
#    to [40ce06520a4af3a8602e69c014855bb6bf0d2cf7]
# 
# patch "packages/gnome/gnome-desktop_2.18.3.bb"
#  from [aedf2dc2ff050fdb7531f504b91874001a221108]
#    to [a7f4cc115ba1482a66bab169559ea62d8c2dcf79]
# 
# patch "packages/gnome/gnome-menus_2.16.1.bb"
#  from [acfc4912da86e931241a2f854f9c1e666e1acb3a]
#    to [ab6c7a51ef721915631d929345f3fcd649ab6ba8]
# 
# patch "packages/gnuradio/gnuradio_svn.bb"
#  from [c84aae656d1d4f53c459daeb8792487b157f949f]
#    to [a884e96d58dc5d6fe78c3e176d52eb47219c0d69]
# 
# patch "packages/gtk+/gtk+_2.10.14.bb"
#  from [e6069d663f44b850fc362305e7de211e0f29afd7]
#    to [5334ae3cb851a4bd67bacc6373c37cb286d09808]
# 
# patch "packages/jack/jack_0.103.0.bb"
#  from [38301156b99692f53152d7bda1cbe2c7070d0e11]
#    to [0a6bdf66361f8f89f25cef87d8f7823d918a1790]
# 
# patch "packages/linux/linux-hackndev-2.6/palmld/defconfig"
#  from [d32cf1b06324559befddf07b45b8d50a55cc2ca0]
#    to [8b8614a2d76d06afec60ad0f59033d9cf7f34a8a]
# 
# patch "packages/linux/linux-hackndev-2.6/palmtc/defconfig"
#  from [6a90aecfffa987846d830ca8125c00ca82b42aef]
#    to [f4dca660646e0447bb0a29aa904103e73502ca16]
# 
# patch "packages/linux/linux-hackndev-2.6/palmtt3/defconfig"
#  from [0fcb79bf97d81befdd5c158707b99fa7111b76cf]
#    to [e3381f26064e6975ff90cb1022d56920fcfd09f0]
# 
# patch "packages/linux/linux-hackndev-2.6/palmtt5/defconfig"
#  from [232750e39146377ba0c8d79cc9ce2934c90cbcbf]
#    to [12fe84b6a494d3fc59fa7792f14856c7b54f9ec9]
# 
# patch "packages/linux/linux-hackndev-2.6/palmtx/defconfig"
#  from [44f3af42fdc34681b7cda5079087b1d7dc76bfa1]
#    to [5483606dd753ca721bc46ba6b2b4ef24739a2878]
# 
# patch "packages/linux/linux-hackndev-2.6/palmz72/defconfig"
#  from [af20c920243feef216e18bbbcae35201646910b8]
#    to [7eed23ea365636d4857dc0dcbd71d326366de012]
# 
# patch "packages/linux/linux-handhelds-2.6_cvs.bb"
#  from [f5c9a7190251b159f0f1867ffadca6de1ce347ed]
#    to [cde5e382dd8c6dd8cc444aa1729ad55e47f7e066]
# 
# patch "packages/networkmanager/networkmanager_svn.bb"
#  from [2a50cff7e9023cedbaa77252fbd4ff3c576130a8]
#    to [67a3194a0095654cfeaf4fb2a3a4a6934e8c2849]
# 
# patch "packages/opie-reader/opie-reader_1.2.3.bb"
#  from [65bc4187cdb64f2360eb9647cc2ecb9a4813e57a]
#    to [033692dcf60e7fe13c3c0df55568cc761aee905a]
# 
# patch "packages/opie-reader/opie-reader_cvs.bb"
#  from [89abf39be36f3ad5af45c2c04e8d5323f5c3429d]
#    to [db2afd64b56e834d968e4bf27c9d8b6ac8db94ec]
# 
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
#  from [af9f1520fa611e94512ba6574a480e95de8a16bd]
#    to [fa74199fe1a5102d17da7ed6417c493736dc2272]
# 
# patch "packages/opie-taskbar/opie-taskbar-images_cvs.bb"
#  from [1bba5e8ec05293d5c7cc7bb8b1381f603bec4e86]
#    to [6e2e43b9defd2572266fc75bac6aad2cb5a06999]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.2.0.bb"
#  from [834985b6b73b0e9bc4599b915d8857bd80d40094]
#    to [25f60a16c5e4f8c1191858a7e16e298ec11b693d]
# 
# patch "site/common"
#  from [6eae0417ff3edc787217f2ff632bbb0ab574d681]
#    to [4c5717589511ac949a398eafd210fdd7e1acbe0a]
# 
#   set "packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg"
#  attr "mtn:manual_merge"
# value "true"
# 
#   set "packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
--- conf/machine/palmt680.conf	69ee49c52bab331c54d8e101461ea4c62b9af0db
+++ conf/machine/palmt680.conf	69ee49c52bab331c54d8e101461ea4c62b9af0db
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: Palm Treo 680
+#@DESCRIPTION: Machine configuration for the Palm TX
+
+require conf/machine/include/palm.conf
+
+ROOT_FLASH_SIZE = "100"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
+                           kernel-module-wm97xx-ts"
============================================================
--- packages/blassic/blassic_0.10.1.bb	05a9598501383ac4a00f7312f0582e93fa40e9bd
+++ packages/blassic/blassic_0.10.1.bb	05a9598501383ac4a00f7312f0582e93fa40e9bd
@@ -0,0 +1,11 @@
+DESCRIPTION = "classic basic interpreter"
+LICENSE = "GPLv2"
+DEPENDS = "ncurses"
+
+SRC_URI = "http://www.blassic.org/bin/blassic-${PV}.tgz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-graphics=yes"
+
+
============================================================
--- packages/bluez/bluez-gnome_0.10.bb	6841233421c5e08a0657919d990abdc76ffac9e7
+++ packages/bluez/bluez-gnome_0.10.bb	6841233421c5e08a0657919d990abdc76ffac9e7
@@ -0,0 +1,11 @@
+DESCRIPTION = "BLuetooth configuration applet"
+LICENSE = "GPL+LGPL"
+
+DEPENDS = "dbus-glib gconf libnotify gtk+"
+
+SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+inherit autotools pkgconfig gconf
+
+FILES_${PN} += "${datadir}/gconf"
+
============================================================
--- packages/bluez/bluez-hcidump_1.38.bb	d6f52cd2d74e198d022f5fd58a152c8d4eb73945
+++ packages/bluez/bluez-hcidump_1.38.bb	d6f52cd2d74e198d022f5fd58a152c8d4eb73945
@@ -0,0 +1,13 @@
+DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
+S = "${WORKDIR}/bluez-hcidump-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
============================================================
--- packages/bluez/bluez-libs_3.13.bb	dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
+++ packages/bluez/bluez-libs_3.13.bb	dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
@@ -0,0 +1 @@
+require bluez-libs.inc
============================================================
--- packages/bluez/bluez-utils_3.13.bb	aa82bb7f1840874ad74d6cd0bdc28cae81267c85
+++ packages/bluez/bluez-utils_3.13.bb	aa82bb7f1840874ad74d6cd0bdc28cae81267c85
@@ -0,0 +1,114 @@
+require bluez-utils.inc
+
+DEPENDS += "glib-2.0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+           file://hcid.conf \
+          "
+PR = "r0"
+
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --enable-hid2hci \
+                 --enable-alsa \ 
+		 --enable-cups \
+		 --enable-glib \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+# The config options are explained below:
+
+#  --enable-obex           enable OBEX support
+#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+#  --enable-cups           install CUPS backend support
+#  --enable-bccmd          install BCCMD interface utility
+#  --enable-avctrl         install Audio/Video control utility
+#  --enable-hid2hci        install HID mode switching utility
+#  --enable-dfutool        install DFU firmware upgrade utility
+
+#  --enable-glib           For systems that use and install GLib anyway
+#  --disable-sdpd          The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
+
+#Following services can be enabled so far:
+#	--enable-network
+#	--enable-serial
+#	--enable-input
+#	--enable-audio
+#	--enable-echo
+
+#There is no need to modify any init script. They will be started
+#automatically or on demand. Only /etc/bluetooth/*.service files should
+#be patched to change name or the autostart value.
+#	--enable-configfile
+#	--enable-initscripts
+
+#For even smaller -doc packages
+#	--disable-manpages
+#	--disable-pcmciarules
+
+#I haven't seen any embedded device with HID proxy support. So simply
+#disable it:
+#	--disable-hid2hci
+
+
+PACKAGES =+ "${PN}-compat ${PN}-alsa"
+
+CONFFILES_${PN} = " \
+                   ${sysconfdir}/bluetooth/hcid.conf \
+                   ${sysconfdir}/default/bluetooth \
+                  "
+
+CONFFILES_${PN}-compat = " \
+                          ${sysconfdir}/bluetooth/rfcomm.conf \
+			 " 
+
+FILES_${PN} = " \
+               ${base_sbindir}/hcid \
+               ${libdir}/bluetooth \
+               ${sysconfdir}/init.d/bluetooth \
+               ${sysconfdir}/bluetooth/*.service \
+               ${sysconfdir}/bluetooth/hcid.conf \
+               ${sysconfdir}/default \
+               ${sysconfdir}/dbus-1 \
+	       ${base_sbindir}/hciattach \
+              "
+
+FILES_${PN}-dbg += " \
+                   ${libdir}/bluetooth/.debug \
+		   ${libdir}/cups/backend/.debug \
+		   ${libdir}/alsa-lib/.debug \
+		  " 
+
+FILES_${PN}-compat = " \
+                    ${base_bindir}/sdptool \
+                    ${base_bindir}/dund \
+		    ${base_bindir}/rctest \
+		    ${base_bindir}/ciptool \
+		    ${base_bindir}/l2test \
+		    ${base_bindir}/rfcomm \
+		    ${base_bindir}/hcitool \
+		    ${base_bindir}/pand \
+		    ${base_bindir}/hidd \
+		    ${base_bindir}/l2ping \
+		    ${base_sbindir}/hciconfig \
+                    ${base_sbindir}/bccmd \
+		    ${base_sbindir}/hciemu \
+		    ${base_sbindir}/hid2hci \
+		    ${base_bindir}/passkey-agent \
+		    ${sysconfdir}/bluetooth/rfcomm.conf \
+		   " 
+
+FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*"
+
+FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_bluez-cups-backend = "cups"
+
+
============================================================
--- packages/classpath/classpath-minimal-native_0.95.bb	a3710719a4819aacb9839dd5aaa9a92b703a74f6
+++ packages/classpath/classpath-minimal-native_0.95.bb	a3710719a4819aacb9839dd5aaa9a92b703a74f6
@@ -0,0 +1,8 @@
+
+# classpath-minimal-native has no packages
+# primary goal is to speed up building of java virtual machines
+
+inherit native
+
+require classpath-minimal.inc
+
============================================================
--- packages/classpath/classpath-minimal.inc	5e5496a7c00f20f9627e30d5618d192684f71eba
+++ packages/classpath/classpath-minimal.inc	5e5496a7c00f20f9627e30d5618d192684f71eba
@@ -0,0 +1,39 @@
+DESCRIPTION = "GNU Classpath standard Java libraries"
+HOMEPAGE = "http://www.gnu.org/%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r6c89e16689bde0d5bff8b0e47eea04a458190a56 -rf87475ccf1fd18294a9edb79090422cc8f201753
#
# 
# 
# patch "classes/openmoko-panel-plugin.bbclass"
#  from [ab5e8526c41ab342808418a27680dd97b13f18c3]
#    to [012f38a2bf927dd13a92d1a76a02c43173db369f]
# 
# patch "conf/machine/fic-gta01.conf"
#  from [1c8e90287feedbc8f33cb1859b4e13cbf1007c10]
#    to [466d77dadd32f0dc79d242207f09ccd87533b0aa]
# 
# patch "conf/machine/fic-gta02.conf"
#  from [35a3ed508f3117b908249db21b5778bc4578be37]
#    to [02cbabf3237da327316e9124d6c52fce6776baeb]
# 
============================================================
--- classes/openmoko-panel-plugin.bbclass	ab5e8526c41ab342808418a27680dd97b13f18c3
+++ classes/openmoko-panel-plugin.bbclass	012f38a2bf927dd13a92d1a76a02c43173db369f
@@ -1,6 +1,6 @@ DEPENDS += "matchbox-panel-2"
 SECTION = "openmoko/panel-plugin"
 DEPENDS += "matchbox-panel-2"
 
-inherit openmoko
+inherit openmoko2
 
 FILES_${PN} = "${libdir}/matchbox-panel/lib*.so* ${datadir}"
============================================================
--- conf/machine/fic-gta01.conf	1c8e90287feedbc8f33cb1859b4e13cbf1007c10
+++ conf/machine/fic-gta01.conf	466d77dadd32f0dc79d242207f09ccd87533b0aa
@@ -35,8 +35,8 @@ EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4
 # extra jffs2 tweaks
 EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
 
-# build tools
-EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
+# build / upload tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.conf
============================================================
--- conf/machine/fic-gta02.conf	35a3ed508f3117b908249db21b5778bc4578be37
+++ conf/machine/fic-gta02.conf	02cbabf3237da327316e9124d6c52fce6776baeb
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Machine
 #@NAME: FIC GTA02 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
+#@DESCRIPTION: Machine configuration for the FIC Neo1973.2 GSM phone
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
@@ -32,10 +32,10 @@ ROOT_FLASH_SIZE = "256"
 ROOT_FLASH_SIZE = "256"
 
 # extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
 
-# build tools
-EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
+# build / upload tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.conf






More information about the Openembedded-commits mailing list