summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/alsa/alsa-state.bb2
-rw-r--r--packages/alsa/alsa-state/fic-gta02/gsmhandset.state142
-rw-r--r--packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty0
-rw-r--r--packages/busybox/busybox-1.9.1/openmoko/defconfig777
-rw-r--r--packages/e17/e-wm_cvs.bb1
-rw-r--r--packages/geoclue/geoclue_git.bb4
-rw-r--r--packages/gnash/gnash.inc6
-rw-r--r--packages/gypsy/gypsy.inc4
-rw-r--r--packages/images/openmoko-image.bb16
-rw-r--r--packages/images/openmoko-minimal-image.bb21
-rw-r--r--packages/images/openmoko-qtopia-image.bb22
-rw-r--r--packages/intltool/files/intltool-0.35.5-polkit.patch32
-rw-r--r--packages/intltool/intltool_0.35.5.bb4
-rw-r--r--packages/ipkg/files/ipkg_bugfix.patch44
-rw-r--r--packages/linux/linux-openmoko_2.6.22.5.bb22
-rw-r--r--packages/mono/mono-1.2.5.1/disable-monoburg.patch22
-rw-r--r--packages/mono/mono-native_1.2.5.1.bb8
-rw-r--r--packages/mono/mono_1.2.5.1.bb5
-rw-r--r--packages/qtopia-phone/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/files/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/files/fic-gta01/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/files/fic-gta01/device-conf46
-rw-r--r--packages/qtopia-phone/files/fic-gta01/device-conf.old48
-rw-r--r--packages/qtopia-phone/files/fic-gta01/qplatformdefs.h146
-rw-r--r--packages/qtopia-phone/files/fic-gta02/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/files/fic-gta02/device-conf46
-rw-r--r--packages/qtopia-phone/files/fic-gta02/device-conf.old48
-rw-r--r--packages/qtopia-phone/files/fic-gta02/qplatformdefs.h146
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11/fic-gta02/.mtn2git_empty0
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf41
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h146
-rw-r--r--packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb116
-rw-r--r--packages/qtopia-phone/qtopia-phone.inc114
-rw-r--r--packages/qtopia-phone/qtopia-phone_4.3.0.bb1
-rw-r--r--packages/qtopia-phone/qtopia-phone_4.3.1.bb1
-rw-r--r--packages/qtopia-phone/qtopia-phone_arch.inc23
-rw-r--r--packages/swt/files/make_linux-fix.patch22
-rw-r--r--packages/swt/swt3.4-gtk_3.3+3.4M3.bb3
-rw-r--r--packages/tasks/task-openmoko-feed.bb13
-rw-r--r--packages/tasks/task-openmoko-qtopia.bb22
-rw-r--r--packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch13
-rw-r--r--packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb10
43 files changed, 1965 insertions, 172 deletions
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 7a95b55f34..3d12b5d3cd 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration"
LICENSE = "GPL"
RRECOMMENDS_alsa-state = "alsa-states"
PV = "0.1.0"
-PR = "r11"
+PR = "r12"
SRC_URI = " \
file://asoundrc \
diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
index 722ce88425..cc0d32a7c7 100644
--- a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
+++ b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
@@ -26,8 +26,8 @@ state.neo1973gta02 {
comment.range '0 - 127'
iface MIXER
name 'Headphone Playback Volume'
- value.0 0
- value.1 0
+ value.0 121
+ value.1 121
}
control.4 {
comment.access 'read write'
@@ -46,7 +46,7 @@ state.neo1973gta02 {
comment.range '0 - 127'
iface MIXER
name 'Mono Playback Volume'
- value 121
+ value 115
}
control.6 {
comment.access 'read write'
@@ -85,7 +85,7 @@ state.neo1973gta02 {
iface MIXER
name 'Headphone Playback ZC Switch'
value.0 false
- value.1 false
+ value.1 true
}
control.10 {
comment.access 'read write'
@@ -94,7 +94,7 @@ state.neo1973gta02 {
iface MIXER
name 'Speaker Playback ZC Switch'
value.0 false
- value.1 false
+ value.1 true
}
control.11 {
comment.access 'read write'
@@ -103,7 +103,7 @@ state.neo1973gta02 {
comment.range '0 - 7'
iface MIXER
name 'Mono Bypass Playback Volume'
- value 2
+ value 3
}
control.12 {
comment.access 'read write'
@@ -112,7 +112,7 @@ state.neo1973gta02 {
comment.range '0 - 7'
iface MIXER
name 'Mono Sidetone Playback Volume'
- value 2
+ value 1
}
control.13 {
comment.access 'read write'
@@ -121,7 +121,7 @@ state.neo1973gta02 {
comment.range '0 - 7'
iface MIXER
name 'Mono Voice Playback Volume'
- value 2
+ value 1
}
control.14 {
comment.access 'read write'
@@ -171,7 +171,7 @@ state.neo1973gta02 {
comment.range '0 - 15'
iface MIXER
name 'Treble Volume'
- value 0
+ value 7
}
control.19 {
comment.access 'read write'
@@ -209,8 +209,8 @@ state.neo1973gta02 {
comment.range '0 - 63'
iface MIXER
name 'Capture Volume'
- value.0 23
- value.1 23
+ value.0 24
+ value.1 24
}
control.23 {
comment.access 'read write'
@@ -276,7 +276,7 @@ state.neo1973gta02 {
comment.range '0 - 7'
iface MIXER
name 'ALC Capture Max Volume'
- value 7
+ value 1
}
control.30 {
comment.access 'read write'
@@ -288,7 +288,7 @@ state.neo1973gta02 {
comment.item.3 Stereo
iface MIXER
name 'ALC Capture Function'
- value Left
+ value Stereo
}
control.31 {
comment.access 'read write'
@@ -305,7 +305,7 @@ state.neo1973gta02 {
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Hold Time'
- value 15
+ value 7
}
control.33 {
comment.access 'read write'
@@ -495,16 +495,6 @@ state.neo1973gta02 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
- comment.item.0 'Non Inverted'
- comment.item.1 Inverted
- iface MIXER
- name 'ROUT2 Phase'
- value Inverted
- }
- control.53 {
- comment.access 'read write'
- comment.type ENUMERATED
- comment.count 1
comment.item.0 'Mic 1'
comment.item.1 'Mic 2'
comment.item.2 'Mic 3'
@@ -512,7 +502,7 @@ state.neo1973gta02 {
name 'Mic Selection Mux'
value 'Mic 1'
}
- control.54 {
+ control.53 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -524,7 +514,7 @@ state.neo1973gta02 {
name 'Rx Mixer'
value 'RXP - RXN'
}
- control.55 {
+ control.54 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -536,7 +526,7 @@ state.neo1973gta02 {
name 'Line Mixer'
value 'Line 1 + 2'
}
- control.56 {
+ control.55 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -546,7 +536,7 @@ state.neo1973gta02 {
name 'Line Mono Mux'
value 'Line Mix'
}
- control.57 {
+ control.56 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -556,7 +546,7 @@ state.neo1973gta02 {
name 'Line Right Mux'
value 'Rx Mix'
}
- control.58 {
+ control.57 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -566,7 +556,7 @@ state.neo1973gta02 {
name 'Line Left Mux'
value 'Rx Mix'
}
- control.59 {
+ control.58 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -574,7 +564,7 @@ state.neo1973gta02 {
name 'ALC Mixer Line Capture Switch'
value false
}
- control.60 {
+ control.59 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -582,7 +572,7 @@ state.neo1973gta02 {
name 'ALC Mixer Mic2 Capture Switch'
value true
}
- control.61 {
+ control.60 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -590,7 +580,7 @@ state.neo1973gta02 {
name 'ALC Mixer Mic1 Capture Switch'
value false
}
- control.62 {
+ control.61 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -598,7 +588,7 @@ state.neo1973gta02 {
name 'ALC Mixer Rx Capture Switch'
value false
}
- control.63 {
+ control.62 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -610,7 +600,7 @@ state.neo1973gta02 {
name 'Mic Sidetone Mux'
value 'Left PGA'
}
- control.64 {
+ control.63 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -621,7 +611,7 @@ state.neo1973gta02 {
name 'Capture Right Mux'
value PGA
}
- control.65 {
+ control.64 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -632,7 +622,7 @@ state.neo1973gta02 {
name 'Capture Left Mux'
value PGA
}
- control.66 {
+ control.65 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -644,7 +634,7 @@ state.neo1973gta02 {
name 'Capture Right Mixer'
value Stereo
}
- control.67 {
+ control.66 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -656,7 +646,7 @@ state.neo1973gta02 {
name 'Capture Left Mixer'
value Stereo
}
- control.68 {
+ control.67 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -664,7 +654,7 @@ state.neo1973gta02 {
name 'Playback Mixer Voice Capture Sw'
value false
}
- control.69 {
+ control.68 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -672,7 +662,7 @@ state.neo1973gta02 {
name 'Playback Mixer Left Capture Swi'
value false
}
- control.70 {
+ control.69 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -680,7 +670,7 @@ state.neo1973gta02 {
name 'Playback Mixer Right Capture Sw'
value false
}
- control.71 {
+ control.70 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -691,7 +681,7 @@ state.neo1973gta02 {
name 'Out4 Mux'
value VREF
}
- control.72 {
+ control.71 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -702,7 +692,7 @@ state.neo1973gta02 {
name 'Out3 Mux'
value VREF
}
- control.73 {
+ control.72 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -714,7 +704,7 @@ state.neo1973gta02 {
name 'Mono 2 Mux'
value 'Inverted Mono 1'
}
- control.74 {
+ control.73 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -722,7 +712,7 @@ state.neo1973gta02 {
name 'Mono Mixer Left Playback Switch'
value false
}
- control.75 {
+ control.74 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -730,7 +720,7 @@ state.neo1973gta02 {
name 'Mono Mixer Right Playback Switc'
value false
}
- control.76 {
+ control.75 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -738,7 +728,7 @@ state.neo1973gta02 {
name 'Mono Mixer Voice Playback Switc'
value false
}
- control.77 {
+ control.76 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -746,7 +736,7 @@ state.neo1973gta02 {
name 'Mono Mixer Sidetone Playback Sw'
value true
}
- control.78 {
+ control.77 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -754,7 +744,7 @@ state.neo1973gta02 {
name 'Mono Mixer Bypass Playback Swit'
value false
}
- control.79 {
+ control.78 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -762,31 +752,31 @@ state.neo1973gta02 {
name 'Right Mixer Voice Playback Swit'
value false
}
- control.80 {
+ control.79 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
iface MIXER
name 'Right Mixer Sidetone Playback S'
- value false
+ value true
}
- control.81 {
+ control.80 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
iface MIXER
name 'Right Mixer Right Playback Swit'
- value true
+ value false
}
- control.82 {
+ control.81 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
iface MIXER
name 'Right Mixer Bypass Playback Swi'
- value true
+ value false
}
- control.83 {
+ control.82 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -794,7 +784,7 @@ state.neo1973gta02 {
name 'Left Mixer Voice Playback Switc'
value false
}
- control.84 {
+ control.83 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -802,15 +792,15 @@ state.neo1973gta02 {
name 'Left Mixer Sidetone Playback Sw'
value false
}
- control.85 {
+ control.84 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
iface MIXER
name 'Left Mixer Left Playback Switch'
- value true
+ value false
}
- control.86 {
+ control.85 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -818,15 +808,15 @@ state.neo1973gta02 {
name 'Left Mixer Bypass Playback Swit'
value true
}
- control.87 {
+ control.86 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
iface MIXER
name 'DAPM Stereo Out Switch'
- value false
+ value true
}
- control.88 {
+ control.87 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -834,7 +824,7 @@ state.neo1973gta02 {
name 'DAPM GSM Line Out Switch'
value true
}
- control.89 {
+ control.88 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -842,7 +832,7 @@ state.neo1973gta02 {
name 'DAPM GSM Line In Switch'
value false
}
- control.90 {
+ control.89 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -850,7 +840,7 @@ state.neo1973gta02 {
name 'DAPM Headset Mic Switch'
value false
}
- control.91 {
+ control.90 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -858,7 +848,7 @@ state.neo1973gta02 {
name 'DAPM Handset Mic Switch'
value true
}
- control.92 {
+ control.91 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 1
@@ -866,20 +856,4 @@ state.neo1973gta02 {
name 'DAPM Handset Spk Switch'
value true
}
- control.93 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Amp State Switch'
- value false
- }
- control.94 {
- comment.access 'read write'
- comment.type BOOLEAN
- comment.count 1
- iface MIXER
- name 'Amp Spk Switch'
- value false
- }
}
diff --git a/packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty b/packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.9.1/openmoko/defconfig b/packages/busybox/busybox-1.9.1/openmoko/defconfig
new file mode 100644
index 0000000000..d0505e4481
--- /dev/null
+++ b/packages/busybox/busybox-1.9.1/openmoko/defconfig
@@ -0,0 +1,777 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.9.1
+# Thu Feb 14 11:54:00 2008
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_NITPICK is not set
+# CONFIG_DESKTOP is not set
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+CONFIG_FEATURE_COMPRESS_USAGE=y
+# CONFIG_FEATURE_INSTALLER is not set
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+# CONFIG_INCLUDE_SUSv2 is not set
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_FANCY_KEYS=y
+# CONFIG_FEATURE_EDITING_VI is not set
+CONFIG_FEATURE_EDITING_HISTORY=15
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+CONFIG_FEATURE_USERNAME_COMPLETION=y
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+# CONFIG_BZIP2 is not set
+CONFIG_CPIO=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+# CONFIG_FEATURE_RPM_BZ2 is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+# CONFIG_FEATURE_DF_INODE is not set
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+# CONFIG_NICE is not set
+CONFIG_NOHUP=y
+CONFIG_OD=y
+# CONFIG_PRINTENV is not set
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+# CONFIG_SHA1SUM is not set
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TEST=y
+# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+# CONFIG_FEATURE_VI_DOT_CMD is not set
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+
+#
+# Init Utilities
+#
+# CONFIG_INIT is not set
+# CONFIG_DEBUG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_INIT_SYSLOG is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+# CONFIG_HALT is not set
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
+CONFIG_ADDUSER=y
+CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_NOLOGIN=y
+CONFIG_FEATURE_SECURETTY=y
+CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
+# CONFIG_SULOGIN is not set
+CONFIG_VLOCK=y
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+# CONFIG_LSATTR is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FREERAMDISK is not set
+CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+# CONFIG_GETOPT is not set
+CONFIG_HEXDUMP=y
+# CONFIG_HD is not set
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+CONFIG_LOSETUP=y
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+CONFIG_FEATURE_MOUNT_NFS=y
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+# CONFIG_FEATURE_UMOUNT_ALL is not set
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_CHRT is not set
+# CONFIG_CROND is not set
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_EJECT is not set
+# CONFIG_LAST is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MICROCOM is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TTYSIZE is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+# CONFIG_ARPING is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+# CONFIG_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+CONFIG_NC=y
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
+CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_PING6=y
+# CONFIG_PSCAN is not set
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+CONFIG_TELNET=y
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+CONFIG_APP_UDHCPD=y
+# CONFIG_APP_DHCPRELAY is not set
+CONFIG_APP_DUMPLEASES=y
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_APP_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_KILLALL5 is not set
+# CONFIG_NMETER is not set
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+CONFIG_UPTIME=y
+CONFIG_WATCH=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_MATH_SUPPORT_64 is not set
+CONFIG_ASH_GETOPTS=y
+# CONFIG_ASH_BUILTIN_ECHO is not set
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_CTTYHACK is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# ipsvd utilities
+#
+# CONFIG_TCPSVD is not set
+# CONFIG_UDPSVD is not set
diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb
index 4dbacffe1b..c3a243a675 100644
--- a/packages/e17/e-wm_cvs.bb
+++ b/packages/e17/e-wm_cvs.bb
@@ -9,7 +9,6 @@ inherit e update-alternatives
SRC_URI = "${E_CVS};module=e17/apps/e \
file://Xsession.d/98enlightenment \
file://applications.menu \
- file://Makefile.in.in \
"
S = "${WORKDIR}/e"
diff --git a/packages/geoclue/geoclue_git.bb b/packages/geoclue/geoclue_git.bb
index bd6778213a..b4a0cbda3a 100644
--- a/packages/geoclue/geoclue_git.bb
+++ b/packages/geoclue/geoclue_git.bb
@@ -20,6 +20,10 @@ EXTRA_OECONF = " --enable-applet=no \
--enable-gpsd \
--enable-system-bus"
+do_stage() {
+ autotools_stage_all
+}
+
do_install_append() {
mkdir -p ${D}/usr/share/
cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share
diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc
index 197cea06b6..2168de48c2 100644
--- a/packages/gnash/gnash.inc
+++ b/packages/gnash/gnash.inc
@@ -73,7 +73,7 @@ FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"
FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
-do_stage() {
- autotools_stage_all
-}
+#do_stage() {
+# autotools_stage_all
+#}
diff --git a/packages/gypsy/gypsy.inc b/packages/gypsy/gypsy.inc
index 57f88dc3bd..e3a682bae4 100644
--- a/packages/gypsy/gypsy.inc
+++ b/packages/gypsy/gypsy.inc
@@ -5,6 +5,10 @@ DEPENDS = "glib-2.0 dbus bluez-libs"
inherit autotools pkgconfig
+do_stage () {
+ autotools_stage_all
+}
+
do_configure_prepend () {
touch ${S}/gtk-doc.make
}
diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb
index 1e8b36318c..9dd849608d 100644
--- a/packages/images/openmoko-image.bb
+++ b/packages/images/openmoko-image.bb
@@ -2,11 +2,9 @@
# OpenMoko Image Recipe
#------------------------------------------------------
-IMAGE_LINGUAS = ""
+require openmoko-minimal-image.bb
-IMAGE_INSTALL = "\
- ${MACHINE_TASK_PROVIDER} \
- task-openmoko-linux \
+IMAGE_INSTALL += "\
task-openmoko-net \
task-openmoko-ui \
task-openmoko-base \
@@ -15,12 +13,6 @@ IMAGE_INSTALL = "\
task-openmoko-pim \
"
-DEPENDS = "\
- ${MACHINE_TASK_PROVIDER} \
+DEPENDS += "\
task-openmoko \
-"
-
-
-inherit image
-
-ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
+ "
diff --git a/packages/images/openmoko-minimal-image.bb b/packages/images/openmoko-minimal-image.bb
new file mode 100644
index 0000000000..15506c42e3
--- /dev/null
+++ b/packages/images/openmoko-minimal-image.bb
@@ -0,0 +1,21 @@
+#------------------------------------------------------
+# OpenMoko Minimal Image Recipe
+# other openmoko images should include this.
+# -----------------------------------------------------
+
+IMAGE_LINGUAS = ""
+
+IMAGE_INSTALL = "\
+ ${MACHINE_TASK_PROVIDER} \
+ task-openmoko-linux \
+ "
+
+DEPENDS = "\
+ ${MACHINE_TASK_PROVIDER} \
+ task-openmoko-linux \
+ "
+
+
+inherit image
+
+ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
diff --git a/packages/images/openmoko-qtopia-image.bb b/packages/images/openmoko-qtopia-image.bb
new file mode 100644
index 0000000000..351e17e1d8
--- /dev/null
+++ b/packages/images/openmoko-qtopia-image.bb
@@ -0,0 +1,22 @@
+#------------------------------------------------------
+# OpenMoko Qtopia Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+export IMAGE_BASENAME = "${PN}"
+
+IMAGE_INSTALL += "\
+ alsa-state \
+ bluez-hcidump \
+ bluez-utils \
+ task-openmoko-qtopia \
+"
+
+DEPENDS += "\
+ task-openmoko-qtopia \
+"
+
+RDEPENDS = "${PACKAGE_INSTALL}"
+
+LICENSE = MIT
diff --git a/packages/intltool/files/intltool-0.35.5-polkit.patch b/packages/intltool/files/intltool-0.35.5-polkit.patch
new file mode 100644
index 0000000000..2d89fbe04c
--- /dev/null
+++ b/packages/intltool/files/intltool-0.35.5-polkit.patch
@@ -0,0 +1,32 @@
+diff -up intltool-0.35.5/intltool.m4.polkit intltool-0.35.5/intltool.m4
+--- intltool-0.35.5/intltool.m4.polkit 2007-07-31 17:23:52.000000000 -0400
++++ intltool-0.35.5/intltool.m4 2007-07-31 17:24:20.000000000 -0400
+@@ -65,6 +65,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+ AC_SUBST(INTLTOOL_DESKTOP_RULE)
+ AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+@@ -84,6 +85,7 @@ AC_SUBST(INTLTOOL_CAVES_RULE)
+ AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+ AC_SUBST(INTLTOOL_THEME_RULE)
+ AC_SUBST(INTLTOOL_SERVICE_RULE)
++AC_SUBST(INTLTOOL_POLICY_RULE)
+
+ # Use the tools built into the package, not the ones that are installed.
+ AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+diff -up intltool-0.35.5/intltool-update.in.in.polkit intltool-0.35.5/intltool-update.in.in
+--- intltool-0.35.5/intltool-update.in.in.polkit 2007-07-31 17:10:52.000000000 -0400
++++ intltool-0.35.5/intltool-update.in.in 2007-07-31 17:21:45.000000000 -0400
+@@ -71,7 +71,8 @@ my $xml_support =
+ "sheet(?:\\.in)+|". # ?
+ "schemas(?:\\.in)+|". # GConf specific
+ "pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
+-"kbd(?:\\.in)+"; # GOK specific.
++"kbd(?:\\.in)+|". # GOK specific.
++"policy(?:\\.in)+"; # PolicyKit files
+
+ my $ini_support =
+ "icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
diff --git a/packages/intltool/intltool_0.35.5.bb b/packages/intltool/intltool_0.35.5.bb
index fc713172f9..092689b24b 100644
--- a/packages/intltool/intltool_0.35.5.bb
+++ b/packages/intltool/intltool_0.35.5.bb
@@ -3,8 +3,10 @@ require intltool.inc
DEPENDS = "libxml-parser-perl-native"
RDEPENDS = "perl-module-text-wrap perl-module-re"
-PR = "r1"
+PR = "r2"
RRECOMMENDS = "perl-modules"
DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "file://intltool-0.35.5-polkit.patch;patch=1"
diff --git a/packages/ipkg/files/ipkg_bugfix.patch b/packages/ipkg/files/ipkg_bugfix.patch
deleted file mode 100644
index 51eccbb2bd..0000000000
--- a/packages/ipkg/files/ipkg_bugfix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: C/ipkg_conf.c
-===================================================================
---- C.orig/ipkg_conf.c 2005-06-21 13:59:32.000000000 +0000
-+++ C/ipkg_conf.c 2007-11-27 01:11:17.000000000 +0000
-@@ -423,6 +423,7 @@
- nv_pair_t *nv_pair;
- pkg_dest_t *dest;
- char *root_dir;
-+ char *list_dir2;
-
- for (iter = nv_pair_list->head; iter; iter = iter->next) {
- nv_pair = iter->data;
-@@ -432,8 +433,14 @@
- } else {
- root_dir = strdup(nv_pair->value);
- }
-- dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir);
-+ if (conf->offline_root) {
-+ sprintf_alloc(&list_dir2, "%s%s", conf->offline_root, lists_dir);
-+ } else {
-+ list_dir2 = strdup(lists_dir);
-+ }
-+ dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, list_dir2);
- free(root_dir);
-+ free(list_dir2);
- if (dest == NULL) {
- continue;
- }
-@@ -562,13 +569,13 @@
- } else if (strcmp(type, "dest") == 0) {
- nv_pair_list_append(tmp_dest_nv_pair_list, name, value);
- } else if (strcmp(type, "lists_dir") == 0) {
-- *lists_dir = realloc(*lists_dir,strlen(value)+1);
-+ *lists_dir = realloc(*lists_dir,strlen(name)+1);
- if (*lists_dir == NULL) {
- ipkg_message(conf, IPKG_ERROR, "ERROR: Not enough memory\n");
- free(options);
- return EINVAL;
- }
-- sprintf (*lists_dir,"%s",value);
-+ sprintf (*lists_dir,"%s", name);
- } else if (strcmp(type, "arch") == 0) {
- ipkg_message(conf, IPKG_INFO, "supported arch %s priority (%s)\n", name, value);
- if (!value) {
diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb
index fe46c59a58..fc702c8719 100644
--- a/packages/linux/linux-openmoko_2.6.22.5.bb
+++ b/packages/linux/linux-openmoko_2.6.22.5.bb
@@ -60,12 +60,18 @@ module_autoload_snd-mixer-oss = "snd-mixer-oss"
# sd/mmc
module_autoload_s3cmci = "s3cmci"
-do_prepatch() {
- mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
- mv patches patches.openmoko
- mv .pc .pc.old
- mv ${WORKDIR}/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig
+python do_patch_prepend() {
+ def runcmd(cmd):
+ import commands
+ (status, output) = commands.getstatusoutput(cmd)
+ if status != 0:
+ raise Exception, "Status %i: %s" % (status >> 8, output)
+ return output
+ runcmd('mv %(WORKDIR)s/patches %(S)s/patches && cd %(S)s && '
+ 'quilt push -av && mv patches patches.openmoko && '
+ 'mv .pc .pc.old && mv %(WORKDIR)s/defconfig-%(KERNEL_RELEASE)s %(WORKDIR)s/defconfig' %
+ {'WORKDIR': bb.data.getVar('WORKDIR', d, 1),
+ 'S': bb.data.getVar('S', d, 1),
+ 'KERNEL_RELEASE': bb.data.getVar('KERNEL_RELEASE', d, 1)})
+ del runcmd
}
-
-addtask prepatch after do_unpack before do_patch
-
diff --git a/packages/mono/mono-1.2.5.1/disable-monoburg.patch b/packages/mono/mono-1.2.5.1/disable-monoburg.patch
new file mode 100644
index 0000000000..21c1e30f07
--- /dev/null
+++ b/packages/mono/mono-1.2.5.1/disable-monoburg.patch
@@ -0,0 +1,22 @@
+Index: mono-1.2.5.1/mono/Makefile.am
+===================================================================
+--- mono-1.2.5.1.orig/mono/Makefile.am 2008-03-05 15:52:06.000000000 +0800
++++ mono-1.2.5.1/mono/Makefile.am 2008-03-05 15:52:23.000000000 +0800
+@@ -1,3 +1,3 @@
+
+-SUBDIRS = utils io-layer monoburg os cil metadata \
++SUBDIRS = utils io-layer os cil metadata \
+ arch interpreter mini dis monograph tests benchmark profiler
+Index: mono-1.2.5.1/mono/mini/Makefile.am
+===================================================================
+--- mono-1.2.5.1.orig/mono/mini/Makefile.am 2008-03-05 16:02:51.000000000 +0800
++++ mono-1.2.5.1/mono/mini/Makefile.am 2008-03-05 16:02:57.000000000 +0800
+@@ -436,7 +436,7 @@
+ $(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc
+
+ inssel.c inssel.h: $(BURGSRC)
+- $(monodir)/mono/monoburg/monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
++ monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
+
+ testi: mono test.exe
+ $(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe
diff --git a/packages/mono/mono-native_1.2.5.1.bb b/packages/mono/mono-native_1.2.5.1.bb
index 7ac2246b3a..8506a20867 100644
--- a/packages/mono/mono-native_1.2.5.1.bb
+++ b/packages/mono/mono-native_1.2.5.1.bb
@@ -1,5 +1,5 @@
require mono_1.2.5.inc
-PR = "r1"
+PR = "r2"
DEPENDS = "glib-2.0-native perl-native"
SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
@@ -8,9 +8,9 @@ PARALLEL_MAKE = ""
inherit native
-#do_stage_prepend() {
-# install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
-#}
+do_stage_prepend() {
+ install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
+}
do_fix_libtool_name() {
# inherit native will make that all native tools that are being
diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb
index 55f601bcb7..d073aa7d98 100644
--- a/packages/mono/mono_1.2.5.1.bb
+++ b/packages/mono/mono_1.2.5.1.bb
@@ -2,10 +2,11 @@ require mono_1.2.5.inc
DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
-PR = "r3"
+PR = "r4"
SRC_URI += "file://configure.patch;patch=1 \
- file://genmdesc-cpp.patch;patch=1"
+ file://genmdesc-cpp.patch;patch=1 \
+ file://disable-monoburg.patch;patch=1"
# Per http://www.mono-project.com/Mono:ARM
EXTRA_OECONF += " --disable-mcs-build "
diff --git a/packages/qtopia-phone/.mtn2git_empty b/packages/qtopia-phone/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qtopia-phone/.mtn2git_empty
diff --git a/packages/qtopia-phone/files/.mtn2git_empty b/packages/qtopia-phone/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qtopia-phone/files/.mtn2git_empty
diff --git a/packages/qtopia-phone/files/fic-gta01/.mtn2git_empty b/packages/qtopia-phone/files/fic-gta01/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qtopia-phone/files/fic-gta01/.mtn2git_empty
diff --git a/packages/qtopia-phone/files/fic-gta01/device-conf b/packages/qtopia-phone/files/fic-gta01/device-conf
new file mode 100644
index 0000000000..f1c3b21f24
--- /dev/null
+++ b/packages/qtopia-phone/files/fic-gta01/device-conf
@@ -0,0 +1,46 @@
+-arch OE_QT_ARCH
+-xplatform OE_QT_XPLATFORM
+-verbose
+-qtopiamedia
+-mediaengines gstreamer
+-extra-qtopiacore-config "-qt-mouse-linuxtp"
+-extra-qtopiacore-config "-depths 16"
+-no-infrared
+-dbus
+-dbuspath OE_QT_DBUSPATH
+-iconsize 22
+-displaysize 480x640
+-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS"
+-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"
+-extra-qtopiacore-config "-fast"
+-extra-qtopiacore-config "-no-accessibility"
+-extra-qtopiacore-config "-no-cups"
+-extra-qtopiacore-config "-no-freetype"
+-extra-qtopiacore-config "-nomake demos"
+-extra-qtopiacore-config "-nomake examples"
+-extra-qtopiacore-config "-qt-gfx-linuxfb"
+-extra-qtopiacore-config "-qt-libjpeg"
+-extra-qtopiacore-config "-qt-libmng"
+-extra-qtopiacore-config "-qt-libpng"
+-extra-qtopiacore-config "-qt-mouse-tslib"
+-extra-qtopiacore-config "-qt-zlib"
+-extra-qtopiacore-config "-release"
+-extra-qtopiacore-config "OE_QT_ENDIAN"
+-extra-qt-config "-nomake examples"
+-extra-qt-config "-nomake demos"
+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
+-image OE_QT_RPREFIX
+-launch-method quicklaunch
+-force-quicklaunch
+-no-clean
+-no-drm
+-no-qvfb
+-no-vpn
+-no-sxe
+-no-silent
+-prefix OE_QT_RPREFIX
+-reduce-exports=yes
+-release
+-confirm-license
+OE_QT_EXTRACONFIG
+
diff --git a/packages/qtopia-phone/files/fic-gta01/device-conf.old b/packages/qtopia-phone/files/fic-gta01/device-conf.old
new file mode 100644
index 0000000000..37a9d1e7de
--- /dev/null
+++ b/packages/qtopia-phone/files/fic-gta01/device-conf.old
@@ -0,0 +1,48 @@
+-arch OE_QT_ARCH
+-xplatform OE_QT_XPLATFORM
+-verbose
+-qtopiamedia
+-mediaengines gstreamer
+-extra-qtopiacore-config "-qt-mouse-linuxtp"
+-extra-qtopiacore-config "-depths OE_QT_DEPTHS"
+-no-infrared
+-dbus
+-dbuspath OE_QT_DBUSPATH
+-iconsize OT_QT_ICONSIZE
+-displaysize OE_QT_DISPLAYSIZE
+-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS"
+-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"
+-extra-qtopiacore-config "-fast"
+-extra-qtopiacore-config "-no-accessibility"
+-extra-qtopiacore-config "-no-cups"
+-extra-qtopiacore-config "-no-freetype"
+-extra-qtopiacore-config "-nomake demos"
+-extra-qtopiacore-config "-nomake examples"
+-extra-qtopiacore-config "-qt-gfx-linuxfb"
+-extra-qtopiacore-config "-qt-libjpeg"
+-extra-qtopiacore-config "-qt-libmng"
+-extra-qtopiacore-config "-qt-libpng"
+-extra-qtopiacore-config "-qt-mouse-tslib"
+-extra-qtopiacore-config "-qt-zlib"
+-extra-qtopiacore-config "-release"
+#-extra-qtopiacore-config "-LOE_QT_LIBDIR"
+#-extra-qtopiacore-config "-IOE_QT_INCDIR"
+-extra-qtopiacore-config "OE_QT_ENDIAN"
+-extra-qt-config "-nomake examples"
+-extra-qt-config "-nomake demos"
+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
+-image OE_QT_RPREFEX
+-launch-method quicklaunch
+-force-quicklaunch
+-no-clean
+-no-drm
+-no-qvfb
+-no-vpn
+-no-sxe
+-no-silent
+-prefix OE_QT_RPREFIX
+-reduce-exports=yes
+-release
+-confirm-license
+OE_QT_EXTRACONFIG
+
diff --git a/packages/qtopia-phone/files/fic-gta01/qplatformdefs.h b/packages/qtopia-phone/files/fic-gta01/qplatformdefs.h
new file mode 100644
index 0000000000..c216578d97
--- /dev/null
+++ b/packages/qtopia-phone/files/fic-gta01/qplatformdefs.h
@@ -0,0 +1,146 @@
+/****************************************************************************
+**
+** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved.
+**
+** This file is part of the Opensource Edition of the Qtopia Toolkit.
+**
+** This software is licensed under the terms of the GNU General Public
+** License (GPL) version 2.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+#include <features.h>
+#include <pthread.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
+#endif
+
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_STATBUF struct stat64
+#define QT_STATBUF4TSTAT struct stat64
+#define QT_STAT ::stat64
+#define QT_FSTAT ::fstat64
+#define QT_LSTAT ::lstat64
+#define QT_OPEN ::open64
+#define QT_TRUNCATE ::truncate64
+#define QT_FTRUNCATE ::ftruncate64
+#define QT_LSEEK ::lseek64
+#else
+#define QT_STATBUF struct stat
+#define QT_STATBUF4TSTAT struct stat
+#define QT_STAT ::stat
+#define QT_FSTAT ::fstat
+#define QT_LSTAT ::lstat
+#define QT_OPEN ::open
+#define QT_TRUNCATE ::truncate
+#define QT_FTRUNCATE ::ftruncate
+#define QT_LSEEK ::lseek
+#endif
+
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_FOPEN ::fopen64
+#define QT_FSEEK ::fseeko64
+#define QT_FTELL ::ftello64
+#define QT_FGETPOS ::fgetpos64
+#define QT_FSETPOS ::fsetpos64
+#define QT_FPOS_T fpos64_t
+#define QT_OFF_T off64_t
+#else
+#define QT_FOPEN ::fopen
+#define QT_FSEEK ::fseek
+#define QT_FTELL ::ftell
+#define QT_FGETPOS ::fgetpos
+#define QT_FSETPOS ::fsetpos
+#define QT_FPOS_T fpos_t
+#define QT_OFF_T long
+#endif
+
+#define QT_STAT_REG S_IFREG
+#define QT_STAT_DIR S_IFDIR
+#define QT_STAT_MASK S_IFMT
+#define QT_STAT_LNK S_IFLNK
+#define QT_SOCKET_CONNECT ::connect
+#define QT_SOCKET_BIND ::bind
+#define QT_SOCKET_BIND ::bind
+#define QT_FILENO fileno
+#define QT_CLOSE ::close
+#define QT_READ ::read
+#define QT_WRITE ::write
+#define QT_ACCESS ::access
+#define QT_GETCWD ::getcwd
+#define QT_CHDIR ::chdir
+#define QT_MKDIR ::mkdir
+#define QT_RMDIR ::rmdir
+#define QT_OPEN_LARGEFILE O_LARGEFILE
+#define QT_OPEN_RDONLY O_RDONLY
+#define QT_OPEN_WRONLY O_WRONLY
+#define QT_OPEN_RDWR O_RDWR
+#define QT_OPEN_CREAT O_CREAT
+#define QT_OPEN_TRUNC O_TRUNC
+#define QT_OPEN_APPEND O_APPEND
+
+#define QT_SIGNAL_RETTYPE void
+#define QT_SIGNAL_ARGS int
+#define QT_SIGNAL_IGNORE SIG_IGN
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+#define QT_SOCKLEN_T socklen_t
+#else
+#define QT_SOCKLEN_T int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+#define QT_SNPRINTF ::snprintf
+#define QT_VSNPRINTF ::vsnprintf
+#endif
+
+#define QT_QLOCALE_USES_FCVT
+
+#endif // QPLATFORMDEFS_H
diff --git a/packages/qtopia-phone/files/fic-gta02/.mtn2git_empty b/packages/qtopia-phone/files/fic-gta02/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qtopia-phone/files/fic-gta02/.mtn2git_empty
diff --git a/packages/qtopia-phone/files/fic-gta02/device-conf b/packages/qtopia-phone/files/fic-gta02/device-conf
new file mode 100644
index 0000000000..f1c3b21f24
--- /dev/null
+++ b/packages/qtopia-phone/files/fic-gta02/device-conf
@@ -0,0 +1,46 @@
+-arch OE_QT_ARCH
+-xplatform OE_QT_XPLATFORM
+-verbose
+-qtopiamedia
+-mediaengines gstreamer
+-extra-qtopiacore-config "-qt-mouse-linuxtp"
+-extra-qtopiacore-config "-depths 16"
+-no-infrared
+-dbus
+-dbuspath OE_QT_DBUSPATH
+-iconsize 22
+-displaysize 480x640
+-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS"
+-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"
+-extra-qtopiacore-config "-fast"
+-extra-qtopiacore-config "-no-accessibility"
+-extra-qtopiacore-config "-no-cups"
+-extra-qtopiacore-config "-no-freetype"
+-extra-qtopiacore-config "-nomake demos"
+-extra-qtopiacore-config "-nomake examples"
+-extra-qtopiacore-config "-qt-gfx-linuxfb"
+-extra-qtopiacore-config "-qt-libjpeg"
+-extra-qtopiacore-config "-qt-libmng"
+-extra-qtopiacore-config "-qt-libpng"
+-extra-qtopiacore-config "-qt-mouse-tslib"
+-extra-qtopiacore-config "-qt-zlib"
+-extra-qtopiacore-config "-release"
+-extra-qtopiacore-config "OE_QT_ENDIAN"
+-extra-qt-config "-nomake examples"
+-extra-qt-config "-nomake demos"
+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
+-image OE_QT_RPREFIX
+-launch-method quicklaunch
+-force-quicklaunch
+-no-clean
+-no-drm
+-no-qvfb
+-no-vpn
+-no-sxe
+-no-silent
+-prefix OE_QT_RPREFIX
+-reduce-exports=yes
+-release
+-confirm-license
+OE_QT_EXTRACONFIG
+
diff --git a/packages/qtopia-phone/files/fic-gta02/device-conf.old b/packages/qtopia-phone/files/fic-gta02/device-conf.old
new file mode 100644
index 0000000000..37a9d1e7de
--- /dev/null
+++ b/packages/qtopia-phone/files/fic-gta02/device-conf.old
@@ -0,0 +1,48 @@
+-arch OE_QT_ARCH
+-xplatform OE_QT_XPLATFORM
+-verbose
+-qtopiamedia
+-mediaengines gstreamer
+-extra-qtopiacore-config "-qt-mouse-linuxtp"
+-extra-qtopiacore-config "-depths OE_QT_DEPTHS"
+-no-infrared
+-dbus
+-dbuspath OE_QT_DBUSPATH
+-iconsize OT_QT_ICONSIZE
+-displaysize OE_QT_DISPLAYSIZE
+-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS"
+-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"
+-extra-qtopiacore-config "-fast"
+-extra-qtopiacore-config "-no-accessibility"
+-extra-qtopiacore-config "-no-cups"
+-extra-qtopiacore-config "-no-freetype"
+-extra-qtopiacore-config "-nomake demos"
+-extra-qtopiacore-config "-nomake examples"
+-extra-qtopiacore-config "-qt-gfx-linuxfb"
+-extra-qtopiacore-config "-qt-libjpeg"
+-extra-qtopiacore-config "-qt-libmng"
+-extra-qtopiacore-config "-qt-libpng"
+-extra-qtopiacore-config "-qt-mouse-tslib"
+-extra-qtopiacore-config "-qt-zlib"
+-extra-qtopiacore-config "-release"
+#-extra-qtopiacore-config "-LOE_QT_LIBDIR"
+#-extra-qtopiacore-config "-IOE_QT_INCDIR"
+-extra-qtopiacore-config "OE_QT_ENDIAN"
+-extra-qt-config "-nomake examples"
+-extra-qt-config "-nomake demos"
+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
+-image OE_QT_RPREFEX
+-launch-method quicklaunch
+-force-quicklaunch
+-no-clean
+-no-drm
+-no-qvfb
+-no-vpn
+-no-sxe
+-no-silent
+-prefix OE_QT_RPREFIX
+-reduce-exports=yes
+-release
+-confirm-license
+OE_QT_EXTRACONFIG
+
diff --git a/packages/qtopia-phone/files/fic-gta02/qplatformdefs.h b/packages/qtopia-phone/files/fic-gta02/qplatformdefs.h
new file mode 100644
index 0000000000..c216578d97
--- /dev/null
+++ b/packages/qtopia-phone/files/fic-gta02/qplatformdefs.h
@@ -0,0 +1,146 @@
+/****************************************************************************
+**
+** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved.
+**
+** This file is part of the Opensource Edition of the Qtopia Toolkit.
+**
+** This software is licensed under the terms of the GNU General Public
+** License (GPL) version 2.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+#include <features.h>
+#include <pthread.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
+#endif
+
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_STATBUF struct stat64
+#define QT_STATBUF4TSTAT struct stat64
+#define QT_STAT ::stat64
+#define QT_FSTAT ::fstat64
+#define QT_LSTAT ::lstat64
+#define QT_OPEN ::open64
+#define QT_TRUNCATE ::truncate64
+#define QT_FTRUNCATE ::ftruncate64
+#define QT_LSEEK ::lseek64
+#else
+#define QT_STATBUF struct stat
+#define QT_STATBUF4TSTAT struct stat
+#define QT_STAT ::stat
+#define QT_FSTAT ::fstat
+#define QT_LSTAT ::lstat
+#define QT_OPEN ::open
+#define QT_TRUNCATE ::truncate
+#define QT_FTRUNCATE ::ftruncate
+#define QT_LSEEK ::lseek
+#endif
+
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_FOPEN ::fopen64
+#define QT_FSEEK ::fseeko64
+#define QT_FTELL ::ftello64
+#define QT_FGETPOS ::fgetpos64
+#define QT_FSETPOS ::fsetpos64
+#define QT_FPOS_T fpos64_t
+#define QT_OFF_T off64_t
+#else
+#define QT_FOPEN ::fopen
+#define QT_FSEEK ::fseek
+#define QT_FTELL ::ftell
+#define QT_FGETPOS ::fgetpos
+#define QT_FSETPOS ::fsetpos
+#define QT_FPOS_T fpos_t
+#define QT_OFF_T long
+#endif
+
+#define QT_STAT_REG S_IFREG
+#define QT_STAT_DIR S_IFDIR
+#define QT_STAT_MASK S_IFMT
+#define QT_STAT_LNK S_IFLNK
+#define QT_SOCKET_CONNECT ::connect
+#define QT_SOCKET_BIND ::bind
+#define QT_SOCKET_BIND ::bind
+#define QT_FILENO fileno
+#define QT_CLOSE ::close
+#define QT_READ ::read
+#define QT_WRITE ::write
+#define QT_ACCESS ::access
+#define QT_GETCWD ::getcwd
+#define QT_CHDIR ::chdir
+#define QT_MKDIR ::mkdir
+#define QT_RMDIR ::rmdir
+#define QT_OPEN_LARGEFILE O_LARGEFILE
+#define QT_OPEN_RDONLY O_RDONLY
+#define QT_OPEN_WRONLY O_WRONLY
+#define QT_OPEN_RDWR O_RDWR
+#define QT_OPEN_CREAT O_CREAT
+#define QT_OPEN_TRUNC O_TRUNC
+#define QT_OPEN_APPEND O_APPEND
+
+#define QT_SIGNAL_RETTYPE void
+#define QT_SIGNAL_ARGS int
+#define QT_SIGNAL_IGNORE SIG_IGN
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+#define QT_SOCKLEN_T socklen_t
+#else
+#define QT_SOCKLEN_T int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+#define QT_SNPRINTF ::snprintf
+#define QT_VSNPRINTF ::vsnprintf
+#endif
+
+#define QT_QLOCALE_USES_FCVT
+
+#endif // QPLATFORMDEFS_H
diff --git a/packages/qtopia-phone/qtopia-phone-x11/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qtopia-phone/qtopia-phone-x11/.mtn2git_empty
diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/.mtn2git_empty
diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf
new file mode 100644
index 0000000000..fa44869e4a
--- /dev/null
+++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf
@@ -0,0 +1,41 @@
+-arch OE_QT_ARCH
+-xplatform OE_QT_XPLATFORM
+-verbose
+-qtopiamedia
+-no-infrared
+-dbus
+-dbuspath OE_QT_DBUSPATH
+-iconsize 22
+-displaysize 480x640
+-extra-qtopiacore-config "-fast"
+-extra-qtopiacore-config "-no-accessibility"
+-extra-qtopiacore-config "-no-cups"
+-extra-qtopiacore-config "-nomake demos"
+-extra-qtopiacore-config "-nomake examples"
+-extra-qtopiacore-config "-qt-libjpeg"
+-extra-qtopiacore-config "-qt-libmng"
+-extra-qtopiacore-config "-qt-libpng"
+-extra-qtopiacore-config "-qt-zlib"
+-extra-qtopiacore-config "-release"
+-extra-qtopiacore-config "-no-sm"
+-extra-qtopiacore-config "OE_QT_ENDIAN"
+-extra-qt-config "-nomake examples"
+-extra-qt-config "-nomake demos"
+-extra-qt-config "-no-sm"
+-extra-qtopiacore-config "OE_QT_ENDIAN"
+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75
+-image OE_QT_RPREFIX
+-launch-method quicklaunch
+-force-quicklaunch
+-no-clean
+-no-drm
+-no-qvfb
+-no-vpn
+-no-sxe
+-no-silent
+-prefix OE_QT_RPREFIX
+-reduce-exports=yes
+-release
+-confirm-license
+OE_QT_EXTRACONFIG
+
diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h
new file mode 100644
index 0000000000..c216578d97
--- /dev/null
+++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h
@@ -0,0 +1,146 @@
+/****************************************************************************
+**
+** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved.
+**
+** This file is part of the Opensource Edition of the Qtopia Toolkit.
+**
+** This software is licensed under the terms of the GNU General Public
+** License (GPL) version 2.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+#include <features.h>
+#include <pthread.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+#include <dlfcn.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
+#endif
+
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_STATBUF struct stat64
+#define QT_STATBUF4TSTAT struct stat64
+#define QT_STAT ::stat64
+#define QT_FSTAT ::fstat64
+#define QT_LSTAT ::lstat64
+#define QT_OPEN ::open64
+#define QT_TRUNCATE ::truncate64
+#define QT_FTRUNCATE ::ftruncate64
+#define QT_LSEEK ::lseek64
+#else
+#define QT_STATBUF struct stat
+#define QT_STATBUF4TSTAT struct stat
+#define QT_STAT ::stat
+#define QT_FSTAT ::fstat
+#define QT_LSTAT ::lstat
+#define QT_OPEN ::open
+#define QT_TRUNCATE ::truncate
+#define QT_FTRUNCATE ::ftruncate
+#define QT_LSEEK ::lseek
+#endif
+
+#ifdef QT_LARGEFILE_SUPPORT
+#define QT_FOPEN ::fopen64
+#define QT_FSEEK ::fseeko64
+#define QT_FTELL ::ftello64
+#define QT_FGETPOS ::fgetpos64
+#define QT_FSETPOS ::fsetpos64
+#define QT_FPOS_T fpos64_t
+#define QT_OFF_T off64_t
+#else
+#define QT_FOPEN ::fopen
+#define QT_FSEEK ::fseek
+#define QT_FTELL ::ftell
+#define QT_FGETPOS ::fgetpos
+#define QT_FSETPOS ::fsetpos
+#define QT_FPOS_T fpos_t
+#define QT_OFF_T long
+#endif
+
+#define QT_STAT_REG S_IFREG
+#define QT_STAT_DIR S_IFDIR
+#define QT_STAT_MASK S_IFMT
+#define QT_STAT_LNK S_IFLNK
+#define QT_SOCKET_CONNECT ::connect
+#define QT_SOCKET_BIND ::bind
+#define QT_SOCKET_BIND ::bind
+#define QT_FILENO fileno
+#define QT_CLOSE ::close
+#define QT_READ ::read
+#define QT_WRITE ::write
+#define QT_ACCESS ::access
+#define QT_GETCWD ::getcwd
+#define QT_CHDIR ::chdir
+#define QT_MKDIR ::mkdir
+#define QT_RMDIR ::rmdir
+#define QT_OPEN_LARGEFILE O_LARGEFILE
+#define QT_OPEN_RDONLY O_RDONLY
+#define QT_OPEN_WRONLY O_WRONLY
+#define QT_OPEN_RDWR O_RDWR
+#define QT_OPEN_CREAT O_CREAT
+#define QT_OPEN_TRUNC O_TRUNC
+#define QT_OPEN_APPEND O_APPEND
+
+#define QT_SIGNAL_RETTYPE void
+#define QT_SIGNAL_ARGS int
+#define QT_SIGNAL_IGNORE SIG_IGN
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+#define QT_SOCKLEN_T socklen_t
+#else
+#define QT_SOCKLEN_T int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+#define QT_SNPRINTF ::snprintf
+#define QT_VSNPRINTF ::vsnprintf
+#endif
+
+#define QT_QLOCALE_USES_FCVT
+
+#endif // QPLATFORMDEFS_H
diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
new file mode 100644
index 0000000000..dbc985dc06
--- /dev/null
+++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
@@ -0,0 +1,116 @@
+# This is qtopia-phone recipe heavilly based off the one in the qtopia-phone
+# distribution.
+#
+# Please DO NOT merge this file into OE, it is not suitable for that yet as
+# it compiles both native and target binaries. This requires stuff to be
+# installed on the host which is against the aim of OE.
+
+DESCRIPTION = "Qtopia OpenSource"
+SECTION = "qtopia-phone"
+LICENSE = "GPL"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+DEPENDS = "glib-2.0 dbus tslib freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"
+PROVIDES = "qtopia-phone"
+PR = "r1"
+SRCREV = "${AUTOREV}"
+SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
+ file://device-conf \
+ file://qplatformdefs.h"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig update-rc.d
+
+TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'spitz', ' c3200', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta02', 'ficgta01', '',d)}"
+
+INITSCRIPT_NAME = "qpe"
+INITSCRIPT_PARAMS = "defaults 98"
+
+export QTOPIA_DEPOT_PATH = "${S}"
+
+require qtopia-phone_arch.inc
+
+QT_ARCH = "${@qtopia_arch(d)}"
+QT_ENDIAN = "${@qtopia_endian(d)}"
+PLATFORM = "${BUILD_OS}-g++"
+XPLATFORM = "linux-oe-g++"
+BUILDDIR = "${WORKDIR}/build"
+
+OE_QT_DBUSPATH = "${STAGING_DIR_HOST}"
+OE_QT_ARCH = "${QT_ARCH}"
+OE_QT_XPLATFORM = "${XPLATFORM}"
+OE_QT_LIBDIR = "${STAGING_LIBDIR}"
+OE_QT_INCDIR = "${STAGING_INCDIR}"
+OE_QT_RPREFIX = "/opt/Qtopia"
+OE_QT_ENDIAN = "${QT_ENDIAN}"
+OE_QT_EXTRACONFIG = "-I${STAGING_INCDIR}/dbus-1.0"
+
+do_configure() {
+
+unset CC
+unset CXX
+unset CFLAGS
+unset CXXFLAGS
+unset LDFLAGS
+
+mkdir -p ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}
+install -m 644 ${S}/qtopiacore/qt/mkspecs/qws/linux-arm-g++/qmake.conf \
+ ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}
+install -m 644 ${WORKDIR}/qplatformdefs.h \
+ ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}
+sed -i -e "s@arm-linux-@${TARGET_SYS}-@" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf
+sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf
+
+# sed the dynamic config into the file
+sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_ARCH|${OE_QT_ARCH}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_LIBDIR|${OE_QT_LIBDIR}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_INCDIR|${OE_QT_INCDIR}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_ENDIAN|${OE_QT_ENDIAN}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_EXTRACONFIG|${OE_QT_EXTRACONFIG}|" ${WORKDIR}/device-conf
+
+rm -f ${S}/devices/${TARGET-DEVICE}/configure
+cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure
+rm -f ${S}/devices/${TARGET-DEVICE}/environment
+echo "" > ${S}/devices/${TARGET-DEVICE}/environment
+
+mkdir -p ${BUILDDIR}
+cd ${BUILDDIR}
+echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM}
+
+}
+
+do_compile() {
+ cd ${BUILDDIR}
+ oe_runmake
+}
+
+do_stage() {
+}
+
+
+do_install() {
+ cd ${BUILDDIR}
+ oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX}
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${S}/devices/${TARGET-DEVICE}/src/devtools/startup/qpe.sh ${D}${sysconfdir}/init.d/qpe
+
+}
+
+FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \
+ ${OE_QT_RPREFIX}/lib/*.so.* ${OE_QT_RPREFIX}/plugins \
+ ${OE_QT_RPREFIX}/qtopia_db.sqlite ${OE_QT_RPREFIX}/sounds \
+ ${OE_QT_RPREFIX}/etc ${OE_QT_RPREFIX}/i18n \
+ ${OE_QT_RPREFIX}/pics ${OE_QT_RPREFIX}/qt_plugins \
+ ${OE_QT_RPREFIX}/services ${OE_QT_RPREFIX}/lib/fonts"
+
+FILES_${PN}-dev += "${OE_QT_RPREFIX}/lib/*.so"
+
diff --git a/packages/qtopia-phone/qtopia-phone.inc b/packages/qtopia-phone/qtopia-phone.inc
new file mode 100644
index 0000000000..ed6e153559
--- /dev/null
+++ b/packages/qtopia-phone/qtopia-phone.inc
@@ -0,0 +1,114 @@
+# This is qtopia-phone recipe heavilly based off the one in the qtopia-phone
+# distribution.
+#
+# Please DO NOT merge this file into OE, it is not suitable for that yet as
+# it compiles both native and target binaries. This requires stuff to be
+# installed on the host which is against the aim of OE.
+
+DESCRIPTION = "Qtopia OpenSource"
+SECTION = "qtopia-phone"
+LICENSE = "GPL"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+DEPENDS = "glib-2.0 dbus tslib gstreamer"
+PROVIDES = "qtopia-phone"
+PR = "r1"
+SRC_URI = "ftp://ftp.trolltech.com/qtopia/source/qtopia-opensource-src-${PV}.tar.gz \
+ file://device-conf \
+ file://qplatformdefs.h"
+
+S = "${WORKDIR}/qtopia-opensource-${PV}"
+
+inherit pkgconfig update-rc.d
+
+TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'spitz', ' c3200', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}"
+TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}"
+
+INITSCRIPT_NAME = "qpe"
+INITSCRIPT_PARAMS = "defaults 98"
+
+export QTOPIA_DEPOT_PATH = "${S}"
+
+require qtopia-phone_arch.inc
+
+QT_ARCH = "${@qtopia_arch(d)}"
+QT_ENDIAN = "${@qtopia_endian(d)}"
+PLATFORM = "${BUILD_OS}-g++"
+XPLATFORM = "linux-oe-g++"
+BUILDDIR = "${WORKDIR}/build"
+
+OE_QT_DBUSPATH = "${STAGING_DIR_HOST}"
+OE_QT_ARCH = "${QT_ARCH}"
+OE_QT_XPLATFORM = "${XPLATFORM}"
+OE_QT_LIBDIR = "${STAGING_LIBDIR}"
+OE_QT_INCDIR = "${STAGING_INCDIR}"
+OE_QT_RPREFIX = "/opt/Qtopia"
+OE_QT_ENDIAN = "${QT_ENDIAN}"
+OE_QT_EXTRACONFIG = "-I${STAGING_INCDIR}/dbus-1.0"
+
+do_configure() {
+
+unset CC
+unset CXX
+unset CFLAGS
+unset CXXFLAGS
+unset LDFLAGS
+
+mkdir -p ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}
+install -m 644 ${S}/qtopiacore/qt/mkspecs/qws/linux-arm-g++/qmake.conf \
+ ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}
+install -m 644 ${WORKDIR}/qplatformdefs.h \
+ ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}
+sed -i -e "s@arm-linux-@${TARGET_SYS}-@" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf
+sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf
+
+# sed the dynamic config into the file
+sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_ARCH|${OE_QT_ARCH}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_LIBDIR|${OE_QT_LIBDIR}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_INCDIR|${OE_QT_INCDIR}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_ENDIAN|${OE_QT_ENDIAN}|" ${WORKDIR}/device-conf
+sed -i -e "s|OE_QT_EXTRACONFIG|${OE_QT_EXTRACONFIG}|" ${WORKDIR}/device-conf
+
+rm -f ${S}/devices/${TARGET-DEVICE}/configure
+cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure
+rm -f ${S}/devices/${TARGET-DEVICE}/environment
+echo "" > ${S}/devices/${TARGET-DEVICE}/environment
+
+mkdir -p ${BUILDDIR}
+cd ${BUILDDIR}
+echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM}
+
+}
+
+do_compile() {
+ cd ${BUILDDIR}
+ oe_runmake
+}
+
+do_stage() {
+}
+
+
+do_install() {
+ cd ${BUILDDIR}
+ oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX}
+ install -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${S}/devices/${TARGET-DEVICE}/src/devtools/startup/qpe.sh ${D}${sysconfdir}/init.d/qpe
+
+}
+
+FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \
+ ${OE_QT_RPREFIX}/lib/*.so.* ${OE_QT_RPREFIX}/plugins \
+ ${OE_QT_RPREFIX}/qtopia_db.sqlite ${OE_QT_RPREFIX}/sounds \
+ ${OE_QT_RPREFIX}/etc ${OE_QT_RPREFIX}/i18n \
+ ${OE_QT_RPREFIX}/pics ${OE_QT_RPREFIX}/qt_plugins \
+ ${OE_QT_RPREFIX}/services ${OE_QT_RPREFIX}/lib/fonts"
+
+FILES_${PN}-dev += "${OE_QT_RPREFIX}/lib/*.so"
+
diff --git a/packages/qtopia-phone/qtopia-phone_4.3.0.bb b/packages/qtopia-phone/qtopia-phone_4.3.0.bb
new file mode 100644
index 0000000000..ca6978b952
--- /dev/null
+++ b/packages/qtopia-phone/qtopia-phone_4.3.0.bb
@@ -0,0 +1 @@
+require qtopia-phone.inc
diff --git a/packages/qtopia-phone/qtopia-phone_4.3.1.bb b/packages/qtopia-phone/qtopia-phone_4.3.1.bb
new file mode 100644
index 0000000000..ca6978b952
--- /dev/null
+++ b/packages/qtopia-phone/qtopia-phone_4.3.1.bb
@@ -0,0 +1 @@
+require qtopia-phone.inc
diff --git a/packages/qtopia-phone/qtopia-phone_arch.inc b/packages/qtopia-phone/qtopia-phone_arch.inc
new file mode 100644
index 0000000000..84f0e51d01
--- /dev/null
+++ b/packages/qtopia-phone/qtopia-phone_arch.inc
@@ -0,0 +1,23 @@
+inherit siteinfo
+
+def qtopia_arch(d):
+ import bb, re
+ arch = bb.data.getVar('TARGET_ARCH', d, 1)
+ if re.match("^i.86$", arch):
+ arch = "i386"
+ elif re.match("^arm.*", arch):
+ arch = "arm"
+ elif arch == "x86_64":
+ arch = "x86"
+ elif arch == "mipsel":
+ arch = "mips"
+ return arch
+
+def qtopia_endian(d):
+ import bb
+ if bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "le":
+ return "-little-endian"
+ elif bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "be":
+ return "-big-endian"
+ else:
+ assert False
diff --git a/packages/swt/files/make_linux-fix.patch b/packages/swt/files/make_linux-fix.patch
new file mode 100644
index 0000000000..1c98f5cad2
--- /dev/null
+++ b/packages/swt/files/make_linux-fix.patch
@@ -0,0 +1,22 @@
+Index: swt-source/make_linux.mak
+===================================================================
+--- swt-source.orig/make_linux.mak 2008-01-23 15:08:02.000000000 +0800
++++ swt-source/make_linux.mak 2008-01-23 15:08:21.000000000 +0800
+@@ -74,8 +74,6 @@
+ -Wno-non-virtual-dtor \
+ -fPIC \
+ -I. \
+- -I$(JAVA_HOME)/include \
+- -I$(JAVA_HOME)/include/linux \
+ ${SWT_PTR_CFLAGS}
+ MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
+ MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
+@@ -96,8 +94,6 @@
+ -DSWT_VERSION=$(SWT_VERSION) \
+ $(NATIVE_STATS) \
+ -DLINUX -DGTK \
+- -I$(JAVA_HOME)/include \
+- -I$(JAVA_HOME)/include/linux \
+ -fPIC \
+ ${SWT_PTR_CFLAGS}
+ LIBS = -shared -fPIC
diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
index 5d411f1be6..701339d374 100644
--- a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
+++ b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
@@ -1,7 +1,8 @@
require swt-gtk.inc
SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip \
- file://Makefile"
+ file://Makefile \
+ file://make_linux-fix.patch;patch=1"
# A number which is used by SWT to mark the shared libraries.
SWTVERSION = "3416"
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 97f24a7624..3f1604c4cb 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "OpenMoko: Misc. Feed Items"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r20"
+PR = "r25"
inherit task
@@ -24,7 +24,8 @@ RDEPENDS_task-openmoko-feed = "\
nano \
ntpclient ntp \
openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
- python python-pygtk python-pyserial python-efl \
+ python python-pygtk python-pyserial \
+# python-efl \
ruby \
libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
settingsgui \
@@ -34,5 +35,11 @@ RDEPENDS_task-openmoko-feed = "\
vnc \
wxwidgets \
x11vnc \
+ libswt3.4-gtk-java \
+ cacao \
+ gpsdrive \
+ asterisk \
+ qtopia-phone \
+ gnash \
+ mono \
"
-
diff --git a/packages/tasks/task-openmoko-qtopia.bb b/packages/tasks/task-openmoko-qtopia.bb
new file mode 100644
index 0000000000..6179bae8e6
--- /dev/null
+++ b/packages/tasks/task-openmoko-qtopia.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "all"
+LICENSE = "MIT"
+PR = "r45"
+
+PACKAGES = "task-openmoko-qtopia"
+
+#
+# task-openmoko-qtopia
+#
+DESCRIPTION_task-openmoko-qtopia = "OpenMoko: The Qtopia based native User Interface"
+RDEPENDS_task-openmoko-qtopia = "\
+ alsa-state \
+ bluez-hcidump \
+ readline \
+ gstreamer \
+ bootchart \
+ qtopia-phone \
+"
+
diff --git a/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch b/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch
index e90cc0de71..eca50615ad 100644
--- a/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch
+++ b/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch
@@ -1,6 +1,8 @@
---- a/tools/Makefile 2007-03-11 00:55:44.000000000 +0000
-+++ b/tools/Makefile 2007-03-11 00:55:52.000000000 +0000
-@@ -194,14 +194,14 @@
+Index: git/tools/Makefile
+===================================================================
+--- git.orig/tools/Makefile 2008-03-03 13:32:32.000000000 +0800
++++ git/tools/Makefile 2008-03-03 13:40:23.000000000 +0800
+@@ -208,18 +208,18 @@
$(obj)environment.c:
@rm -f $(obj)environment.c
@@ -15,5 +17,10 @@
- ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c
+ ln -sf $(src)../lib_generic/crc32.c $(obj)crc32.c
+ $(obj)sha1.c:
+ @rm -f $(obj)sha1.c
+- ln -s $(src)../lib_generic/sha1.c $(obj)sha1.c
++ ln -sf $(src)../lib_generic/sha1.c $(obj)sha1.c
+
$(LOGO_H): $(obj)bmp_logo $(LOGO_BMP)
$(obj)./bmp_logo $(LOGO_BMP) >$@
diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
index 020fd421c6..1fb9be4f43 100644
--- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
+++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
@@ -5,18 +5,18 @@ SECTION = "bootloader"
PRIORITY = "optional"
UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e"
-UBOOT_OPENMOKO_REV = "4118"
UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5"
-LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
-PV = "1.3.1${LOCALVERSION}"
+SRCREV_FORMAT = "+gitupstream+svnpatchset"
+
+PV = "1.3.1${SRCREV}"
PR = "r3"
PROVIDES = "virtual/bootloader"
S = "${WORKDIR}/git"
SRC_URI = "\
- git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \
- svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
+ git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV};name=upstream \
+ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patchset \
file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
# file://makefile-no-dirafter.patch;patch=1 \
# file://fix-data-abort-from-sd-ombug799.patch;patch=1 \