merge of '0b604857bbf871639fdb43ee8380222e8ef64bb7'
authorGraeme Gregory <dp@xora.org.uk>
Thu, 20 Mar 2008 06:23:52 +0000 (06:23 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Thu, 20 Mar 2008 06:23:52 +0000 (06:23 +0000)
     and 'f2611b9289af3945942b74edcc7ef91fb0a597bd'

66 files changed:
classes/sourcepkg.bbclass
conf/checksums.ini
conf/distro/include/preferred-om-2008-versions.inc [deleted file]
conf/distro/include/sane-srcdates.inc
packages/alsa/alsa-state.bb
packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty [new file with mode: 0644]
packages/busybox/busybox-1.9.1/openmoko/defconfig [new file with mode: 0644]
packages/efl1/edbus_cvs.bb
packages/efl1/exml_cvs.bb
packages/geoclue/geoclue_git.bb
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
packages/gpsdrive/gpsdrive_2.10pre4.bb
packages/images/openmoko-image.bb
packages/images/openmoko-minimal-image.bb [new file with mode: 0644]
packages/images/openmoko-qtopia-image.bb [new file with mode: 0644]
packages/images/openmoko-qtopia-x11-image.bb [new file with mode: 0644]
packages/intltool/intltool-native_0.37.1.bb [new file with mode: 0644]
packages/intltool/intltool_0.37.1.bb [new file with mode: 0644]
packages/ipkg/files/ipkg_bugfix.patch [deleted file]
packages/linux/linux-openmoko_2.6.22.5.bb
packages/openmoko-projects.merge/.mtn2git_empty [new file with mode: 0644]
packages/openmoko-projects.merge/assassin_svn.bb [new file with mode: 0644]
packages/openmoko-projects.merge/diversity-daemon_svn.bb [new file with mode: 0644]
packages/openmoko-projects.merge/diversity-nav_svn.bb [new file with mode: 0644]
packages/openmoko-projects.merge/illume/.mtn2git_empty [new file with mode: 0644]
packages/openmoko-projects.merge/illume/include-path.diff [new file with mode: 0644]
packages/openmoko-projects.merge/illume_svn.bb [new file with mode: 0644]
packages/openmoko-projects.merge/tangogps/.mtn2git_empty [new file with mode: 0644]
packages/openmoko-projects.merge/tangogps/global-config-h.patch [new file with mode: 0644]
packages/openmoko-projects.merge/tangogps_0.7.bb [new file with mode: 0644]
packages/openmoko-tools/pty-forward-native.bb [new file with mode: 0644]
packages/openmoko-tools/serial-forward.bb [new file with mode: 0644]
packages/openmoko2/openmoko-session2.bb
packages/packagekit.merge/.mtn2git_empty [new file with mode: 0644]
packages/packagekit.merge/files/.mtn2git_empty [new file with mode: 0644]
packages/packagekit.merge/files/disable-docbook2man.patch [new file with mode: 0644]
packages/packagekit.merge/packagekit_git.bb [new file with mode: 0644]
packages/qtopia-phone/.mtn2git_empty [new file with mode: 0644]
packages/qtopia-phone/files/.mtn2git_empty [new file with mode: 0644]
packages/qtopia-phone/files/fic-gta01/.mtn2git_empty [new file with mode: 0644]
packages/qtopia-phone/files/fic-gta01/device-conf [new file with mode: 0644]
packages/qtopia-phone/files/fic-gta01/device-conf.old [new file with mode: 0644]
packages/qtopia-phone/files/fic-gta01/qplatformdefs.h [new file with mode: 0644]
packages/qtopia-phone/files/fic-gta02/.mtn2git_empty [new file with mode: 0644]
packages/qtopia-phone/files/fic-gta02/device-conf [new file with mode: 0644]
packages/qtopia-phone/files/fic-gta02/device-conf.old [new file with mode: 0644]
packages/qtopia-phone/files/fic-gta02/qplatformdefs.h [new file with mode: 0644]
packages/qtopia-phone/qtopia-phone-x11/.mtn2git_empty [new file with mode: 0644]
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/.mtn2git_empty [new file with mode: 0644]
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty [new file with mode: 0644]
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia [new file with mode: 0644]
packages/qtopia-phone/qtopia-phone-x11/qtopia.sh [new file with mode: 0644]
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb [new file with mode: 0644]
packages/qtopia-phone/qtopia-phone.inc [new file with mode: 0644]
packages/qtopia-phone/qtopia-phone_4.3.0.bb [new file with mode: 0644]
packages/qtopia-phone/qtopia-phone_4.3.1.bb [new file with mode: 0644]
packages/qtopia-phone/qtopia-phone_arch.inc [new file with mode: 0644]
packages/swt/files/make_linux-fix.patch [new file with mode: 0644]
packages/swt/swt3.4-gtk_3.3+3.4M3.bb
packages/tasks/task-openmoko-feed.bb
packages/tasks/task-openmoko-qtopia-x11.bb [new file with mode: 0644]
packages/tasks/task-openmoko-qtopia.bb [new file with mode: 0644]
packages/tzdata/tzdata_2007k.bb
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb [deleted file]
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge [new file with mode: 0644]
packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb

index bbc9f18..f7daa9f 100644 (file)
@@ -18,14 +18,20 @@ def get_src_tree(d):
                bb.error("S not defined, unable to find source tree.")
                return
 
-       s_tree_raw = s.split('/')[1]
+       try:
+               s_tree_raw = s.split('/')[1]
+       except IndexError:
+               return
+
        s_tree = bb.data.expand(s_tree_raw, d)
 
        src_tree_path = os.path.join(workdir, s_tree)
        try:
                os.listdir(src_tree_path)
        except OSError:
-               bb.fatal("Expected to find source tree in '%s' which doesn't exist." % src_tree_path)
+               bb.error("Expected to find source tree in '%s' which doesn't exist." % src_tree_path, s)
+               return
+
        bb.debug("Assuming source tree is '%s'" % src_tree_path)
 
        return s_tree
@@ -39,11 +45,14 @@ sourcepkg_do_create_orig_tgz(){
        done
 
        src_tree=${@get_src_tree(d)}
-       
-       echo $src_tree
+       if test x${src_tree} = x; then
+               oenote "Skipping empty source tree"
+               return
+       fi
+
        oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
        tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
-       cp -pPR $src_tree $src_tree.orig
+       cp -av $src_tree $src_tree.orig
 }
 
 sourcepkg_do_archive_bb() {
@@ -74,7 +83,14 @@ python sourcepkg_do_dumpdata() {
        bb.note("Dumping metadata into '%s'" % dumpfile)
        f = open(dumpfile, "w")
        # emit variables and shell functions
-        bb.data.emit_env(f, d, True)
+
+       # FIXME: if we emit all, bitbake will get error while
+       # evaluating AUTOREV since we have AUTOREV =
+       # "${@bb.fetch.get_srcrev(d)}" in bitbake.conf, but get_srcrev
+       # without a valid SRC_URI will cause problem.
+
+       bb.data.emit_env(f, d, True)
+
        # emit the metadata which isnt valid shell
        for e in d.keys():
                if bb.data.getVarFlag(e, 'python', d):
@@ -89,8 +105,11 @@ sourcepkg_do_create_diff_gz(){
                echo $i >> temp/exclude-from-file
        done
 
-
        src_tree=${@get_src_tree(d)}
+       if test x${src_tree} = x; then
+               oenote "Skipping empty source tree"
+               return
+       fi
 
        for i in `find . -maxdepth 1 -type f`; do
                mkdir -p $src_tree/${DISTRO}/files
@@ -102,10 +121,10 @@ sourcepkg_do_create_diff_gz(){
        rm -rf $src_tree.orig
 }
 
-EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
+#EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz
+EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_create_diff_gz
 
 addtask create_orig_tgz after do_unpack before do_patch
-addtask archive_bb after do_patch before do_dumpdata
-addtask dumpdata after do_archive_bb before do_create_diff_gz
-addtask create_diff_gz after do_dump_data before do_configure
-
+addtask archive_bb after do_patch before do_configure
+#addtask dumpdata after do_archive_bb before do_configure
+addtask create_diff_gz after do_archive_bb before do_configure
index da12955..8ad4f9b 100644 (file)
@@ -286,6 +286,10 @@ sha256=5194ae0f07aaf274e46712cd3f2be553ca75970d2124ac388ce444adee5e2878
 md5=b014170483cf85a93d08ee59196c53f9
 sha256=1428a61246a98411c2f16fcaf051c7acb53fb1507b1982da52d5b6aa70f78c2b
 
+[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.808.tar.gz]
+md5=72120d9195ab1649c2d787eb1102a90c
+sha256=22e0778a16bb9ac0526efc99f7e03265e19ca5844aee7540f3f47a643ad5b9e4
+
 [http://downloads.sourceforge.net/plone/Plone-2.1.2.tar.gz]
 md5=863311e29550f9b4bf6c2502fdbed1fa
 sha256=e9c0b53d887b53310daab656ef83b0abecdde39b679806a0f04f3cda222fbac2
@@ -5206,6 +5210,10 @@ sha256=38bd74418bbac5a34884221e2b710a81876d445d8acfc7d22bde67fe882f96d8
 md5=1822943ce6745596b2510d2b425cb90d
 sha256=b27763c368ceb6744bf687ba371566697a2828d11b576cd4ac853f0a582b0845
 
+[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.37/intltool-0.37.1.tar.bz2]
+md5=860d392f04299c2740d0752501639c3b
+sha256=76cceaaaf188dfac032b21eb5dc4c7d231efe7ff180dee85dbf5e18bc5d27fe7
+
 [http://www.iozone.org/src/current/iozone3_263.tar]
 md5=44fd88df361ec4508e10c8d6615245fa
 sha256=920fde1a3843539570e2df4aa611e74df102e52d363c5973d5a9d15bdf976461
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
deleted file mode 100644 (file)
index a54cf91..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-PREFERRED_VERSION_asterisk = "1.4.17"
-PREFERRED_VERSION_busybox = "1.9.1"
-PREFERRED_VERSION_dbus = "1.1.20"
-PREFERRED_VERSION_dbus-glib = "0.74"
-PREFERRED_VERSION_gnash = "0.8.2"
-PREFERRED_VERSION_gpsdrive = "2.10pre4"
-PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_intltool = "0.35.5"
-PREFERRED_VERSION_intltool-native = "0.35.5"
-PREFERRED_VERSION_libtool = "1.5.24"
-PREFERRED_VERSION_midori = "0.0.17"
-PREFERRED_VERSION_pulseaudio = "0.9.9"
-PREFERRED_VERSION_udev = "118"
-PREFERRED_VERSION_vte = "0.16.9"
-
index 5a1e8f2..deac4e9 100644 (file)
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20080216"
+EFL_SRCDATE = "20080311"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"
index 7a95b55..fa9dbe0 100644 (file)
@@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.1.0"
-PR = "r11"
+PR = "r14"
 
 SRC_URI = " \
   file://asoundrc \
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 (file)
index 0000000..e69de29
diff --git a/packages/busybox/busybox-1.9.1/openmoko/defconfig b/packages/busybox/busybox-1.9.1/openmoko/defconfig
new file mode 100644 (file)
index 0000000..d0505e4
--- /dev/null
@@ -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
index 28bcbb1..d9c2b83 100644 (file)
@@ -1,6 +1,7 @@
 DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
 DEPENDS = "dbus ecore"
 LICENSE = "MIT BSD"
+PV = "0.1.0.042+cvs${SRCDATE}"
 PR = "r2"
 
 inherit efl_library
index add3053..b94af05 100644 (file)
@@ -1,6 +1,7 @@
 DESCRIPTION = "Exml is a generic XML parser wrapper."
 LICENSE = "MIT"
 DEPENDS = "libxml2 libxslt ecore"
+PV = "0.1.1+cvs${SRCDATE}"
 
 inherit efl_library
 
index bd67782..b4a0cbd 100644 (file)
@@ -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
index 70af29d..96e8155 100644 (file)
@@ -1,9 +1,10 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=GPSDrive
 Comment=GPS map software
 Exec=gpsdrive -M pda -1
+Icon=gpsicon
 Terminal=false
 Type=Application
-Icon=gpsicon
-Categories=Graphics;Network;Geography;
-StartupNotify=false
+Categories=Graphics;Network;Geography;Application;Other
+StartupNotify=true
index 102a917..071a569 100644 (file)
@@ -1,9 +1,10 @@
-require gpsdrive.inc
-
-DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql"
-RDEPENDS_${PN} += "libwww-perl"
-
-PR = "r2"
+DESCRIPTION = "GPS navigation/map display software"
+SECTION = "x11"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql"
+RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl"
+PR = "r1"
 
 SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive_2.10pre4.desktop \
@@ -11,6 +12,10 @@ SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive-ifdef-mapnik.patch;patch=1 \
            file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"
 
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-garmin"
+
 do_install_append () {
         mkdir -p  ${D}${datadir}/applications
         install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop
@@ -31,3 +36,7 @@ FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small"
 FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"
 FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"
 FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+DEFAULT_PREFERENCE = "1"
index 1e8b363..9dd8496 100644 (file)
@@ -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 (file)
index 0000000..15506c4
--- /dev/null
@@ -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 (file)
index 0000000..351e17e
--- /dev/null
@@ -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/images/openmoko-qtopia-x11-image.bb b/packages/images/openmoko-qtopia-x11-image.bb
new file mode 100644 (file)
index 0000000..3291c53
--- /dev/null
@@ -0,0 +1,7 @@
+#------------------------------------------------------
+# OpenMoko Qtopia/X11 Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+IMAGE_INSTALL += "task-openmoko-qtopia-x11"
diff --git a/packages/intltool/intltool-native_0.37.1.bb b/packages/intltool/intltool-native_0.37.1.bb
new file mode 100644 (file)
index 0000000..bac5378
--- /dev/null
@@ -0,0 +1,7 @@
+require intltool_${PV}.bb
+
+inherit native
+DEPENDS = "libxml-parser-perl-native"
+
+export PERL = "/usr/bin/env perl"
+SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
diff --git a/packages/intltool/intltool_0.37.1.bb b/packages/intltool/intltool_0.37.1.bb
new file mode 100644 (file)
index 0000000..e482625
--- /dev/null
@@ -0,0 +1 @@
+require intltool.inc
diff --git a/packages/ipkg/files/ipkg_bugfix.patch b/packages/ipkg/files/ipkg_bugfix.patch
deleted file mode 100644 (file)
index 51eccbb..0000000
+++ /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) {
index fe46c59..fc702c8 100644 (file)
@@ -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/openmoko-projects.merge/.mtn2git_empty b/packages/openmoko-projects.merge/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/openmoko-projects.merge/assassin_svn.bb b/packages/openmoko-projects.merge/assassin_svn.bb
new file mode 100644 (file)
index 0000000..987d440
--- /dev/null
@@ -0,0 +1,16 @@
+DESCRIPTION = "Action GUI for Installer"
+HOMEPAGE = "http://assassin.projects.openmoko.org/"
+LICENSE = "GPL"
+DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus"
+PV = "0.2+svn${SRCREV}"
+PR = "r4"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
+
+S = "${WORKDIR}/assassin"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = ""
+
+FILES_${PN} += "${prefix}/share/*"
diff --git a/packages/openmoko-projects.merge/diversity-daemon_svn.bb b/packages/openmoko-projects.merge/diversity-daemon_svn.bb
new file mode 100644 (file)
index 0000000..02e1ea2
--- /dev/null
@@ -0,0 +1,19 @@
+DESCRIPTION = "Diveristy Daemon"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "net/misc"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
+RDEPENDS = "eds-dbus openmoko-dialer2"
+PV = "0.0+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
+
+S = "${WORKDIR}/diversity-daemon"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-nm --disable-xmpp --enable-session-bus"
+
+FILES_${PN} += "${datadir}/dbus-1/"
+FILES_${PN} += "${sysconfdir}/dbus-1/"
diff --git a/packages/openmoko-projects.merge/diversity-nav_svn.bb b/packages/openmoko-projects.merge/diversity-nav_svn.bb
new file mode 100644 (file)
index 0000000..23d6b4d
--- /dev/null
@@ -0,0 +1,16 @@
+DESCRIPTION = "Diversity_nav - a GPS location based communicative application"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "openmoko/applications"
+LICENSE = "GPL"
+DEPENDS = "evas edje ecore edbus"
+RDEPENDS = "diversity-daemon"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
+
+S = "${WORKDIR}/diversity-nav"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
diff --git a/packages/openmoko-projects.merge/illume/.mtn2git_empty b/packages/openmoko-projects.merge/illume/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/openmoko-projects.merge/illume/include-path.diff b/packages/openmoko-projects.merge/illume/include-path.diff
new file mode 100644 (file)
index 0000000..0b5ed8a
--- /dev/null
@@ -0,0 +1,16 @@
+Include path fixes for Illume:
+
+$(includedir) is pointing to /usr/include, we do not want to have this when compiling
+
+Index: src/Makefile.am
+===================================================================
+--- a/src/Makefile.am  (Revision 12)
++++ b/src/Makefile.am  (Arbeitskopie)
+@@ -3,7 +3,6 @@
+ INCLUDES = -I. \
+        -I$(top_srcdir) \
+-       -I$(includedir) \
+        @e_cflags@
+ pkgdir = $(datadir)/$(MODULE_ARCH)
diff --git a/packages/openmoko-projects.merge/illume_svn.bb b/packages/openmoko-projects.merge/illume_svn.bb
new file mode 100644 (file)
index 0000000..f7dec16
--- /dev/null
@@ -0,0 +1,26 @@
+DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
+DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
+LICENSE = "MIT BSD"
+PV = "svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
+           file://include-path.diff;patch=1"
+S = "${WORKDIR}/${PN}"
+
+EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
+                --x-libraries=${STAGING_LIBDIR} \
+               --enable-simple-x11 \
+                --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+                
+FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*"
+FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
+
+do_install_append() {
+  for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
+  for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
+  for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
+  for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
+}
diff --git a/packages/openmoko-projects.merge/tangogps/.mtn2git_empty b/packages/openmoko-projects.merge/tangogps/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/openmoko-projects.merge/tangogps/global-config-h.patch b/packages/openmoko-projects.merge/tangogps/global-config-h.patch
new file mode 100644 (file)
index 0000000..973710c
--- /dev/null
@@ -0,0 +1,30 @@
+Index: tangoGPS-0.7/src/globals.c
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.c    2008-03-13 14:21:02.000000000 +0800
++++ tangoGPS-0.7/src/globals.c 2008-03-13 14:28:49.000000000 +0800
+@@ -3,11 +3,11 @@
+  *  License    GPLv2
+  ****************************************************************************/
++#include "globals.h"
++
+ #include <gtk/gtk.h>
+ #include <gps.h>
+-#include "globals.h"
+-
+ GdkPixmap *pixmap = NULL;
+ GtkWidget *window1 = NULL;
+ GtkWidget *window2 = NULL;
+Index: tangoGPS-0.7/src/globals.h
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.h    2008-03-13 14:27:46.000000000 +0800
++++ tangoGPS-0.7/src/globals.h 2008-03-13 14:27:48.000000000 +0800
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++#  include <config.h>
++#endif
++
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
diff --git a/packages/openmoko-projects.merge/tangogps_0.7.bb b/packages/openmoko-projects.merge/tangogps_0.7.bb
new file mode 100644 (file)
index 0000000..63513ff
--- /dev/null
@@ -0,0 +1,17 @@
+DESCRIPTION = "tangoGPS map"
+AUTHOR = "Marcus Bauer <marcus.bauer@gmail.com>"
+HOMEPAGE = "http://tangogps.org/"
+SECTION = "openmoko/pim"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "curl gtk+ gpsd"
+PR = "r1"
+
+SRC_URI = "http://tangogps.org/tangoGPS-0.7.tar.gz \
+           file://global-config-h.patch;patch=1"
+
+S = "${WORKDIR}/tangoGPS-0.7"
+
+inherit autotools
+
+CPPFLAGS += "-I${STAGING_INCDIR}/gconf/2/"
diff --git a/packages/openmoko-tools/pty-forward-native.bb b/packages/openmoko-tools/pty-forward-native.bb
new file mode 100644 (file)
index 0000000..972070d
--- /dev/null
@@ -0,0 +1,24 @@
+LICENSE="GPL"
+SUMMARY="Receive a forwarded serial from serial-forward and provide a PTY"
+
+SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"
+S = "${WORKDIR}/serial_forward"
+
+inherit native
+
+do_compile() {
+    cd ${S}
+    oe_runmake
+}
+
+do_stage() {
+    :
+}
+
+do_deploy() {
+    install -d ${DEPLOY_DIR_IMAGE}
+    install -m 0755 ${S}/pty_forward ${DEPLOY_DIR_IMAGE}/pty-forward
+}
+
+addtask deploy before do_package after do_install
+
diff --git a/packages/openmoko-tools/serial-forward.bb b/packages/openmoko-tools/serial-forward.bb
new file mode 100644 (file)
index 0000000..3cc3377
--- /dev/null
@@ -0,0 +1,15 @@
+LICENSE="GPL"
+SUMMARY="Forward a serial using TCP/IP"
+
+SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"
+S="${WORKDIR}/serial_forward"
+
+do_compile() {
+    cd ${S}
+    oe_runmake
+}
+
+do_install() {
+    install -d ${D}/${bindir}
+    install -m 0755 ${S}/forward ${D}/${bindir}/${PN}
+}
index 02489f5..a031c91 100644 (file)
@@ -1,10 +1,10 @@
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
-RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
+RDEPENDS = "matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-PR = "r64"
+PR = "r65"
 
 SRC_URI = "\
   file://etc \
diff --git a/packages/packagekit.merge/.mtn2git_empty b/packages/packagekit.merge/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/packagekit.merge/files/.mtn2git_empty b/packages/packagekit.merge/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/packagekit.merge/files/disable-docbook2man.patch b/packages/packagekit.merge/files/disable-docbook2man.patch
new file mode 100644 (file)
index 0000000..0c7d423
--- /dev/null
@@ -0,0 +1,12 @@
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac      2008-02-20 17:57:44.000000000 +0800
++++ git/configure.ac   2008-02-20 17:58:30.000000000 +0800
+@@ -115,6 +115,7 @@
+ if test "$DOCBOOK2MAN" = "no" ; then
+       AC_MSG_WARN([docbook2man not found, will not be able to build man documentation])
+       fi
++DOCBOOK2MAN="no"
+ AM_CONDITIONAL(HAVE_DOCBOOK2MAN, [test "$DOCBOOK2MAN" != "no"])
+ dnl ---------------------------------------------------------------------------
diff --git a/packages/packagekit.merge/packagekit_git.bb b/packages/packagekit.merge/packagekit_git.bb
new file mode 100644 (file)
index 0000000..6f3419a
--- /dev/null
@@ -0,0 +1,28 @@
+DESCRIPTION = "PackageKit package management abstraction"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)"
+RDEPENDS = "opkg"
+PV = "0.1+git${SRCREV}"
+PR = "r8"
+
+SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
+           file://disable-docbook2man.patch;patch=1"
+
+SRCREV = "${AUTOREV}"
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-security-framework=dummy --with-default-backend=opkg --enable-opkg"
+
+do_configure_prepend() {
+        echo "EXTRA_DIST=" > gtk-doc.make
+}
+do_stage () {
+        autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/packagekit-backend/*.so ${datadir}/dbus-1/system-services/"
+FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so "
diff --git a/packages/qtopia-phone/.mtn2git_empty b/packages/qtopia-phone/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/qtopia-phone/files/.mtn2git_empty b/packages/qtopia-phone/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/qtopia-phone/files/fic-gta01/.mtn2git_empty b/packages/qtopia-phone/files/fic-gta01/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/qtopia-phone/files/fic-gta01/device-conf b/packages/qtopia-phone/files/fic-gta01/device-conf
new file mode 100644 (file)
index 0000000..f1c3b21
--- /dev/null
@@ -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 (file)
index 0000000..37a9d1e
--- /dev/null
@@ -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 (file)
index 0000000..c216578
--- /dev/null
@@ -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 (file)
index 0000000..e69de29
diff --git a/packages/qtopia-phone/files/fic-gta02/device-conf b/packages/qtopia-phone/files/fic-gta02/device-conf
new file mode 100644 (file)
index 0000000..f1c3b21
--- /dev/null
@@ -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 (file)
index 0000000..37a9d1e
--- /dev/null
@@ -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 (file)
index 0000000..c216578
--- /dev/null
@@ -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 (file)
index 0000000..e69de29
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 (file)
index 0000000..e69de29
diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia
new file mode 100644 (file)
index 0000000..c987e26
--- /dev/null
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# xmodmap to allow the soft-menu to work
+xmodmap -e "keycode 180 = 0x11000601"
+xmodmap -e "keycode 181 = 0x11000602"
+xmodmap -e "keycode 182 = 0x11000603"
+xmodmap -e "keycode 183 = 0x11000604"
+xmodmap -e "keycode 184 = 0x11000605"
+xmodmap -e "keycode 185 = 0x11000606"
+xmodmap -e "keycode 186 = 0x11000607"
+xmodmap -e "keycode 187 = 0x11000608"
+xmodmap -e "keycode 188 = 0x11000609"
+xmodmap -e "keycode 189 = 0x1100060A"
+xmodmap -e "keycode 190 = 0x1100060B"
+xmodmap -e "keycode 191 = 0x1100060B"
+xmodmap -e "keycode 192 = 0x1100060A"
+xmodmap -e "keycode 193 = 0x1100060C"
+xmodmap -e "keycode 194 = 0x1100060D"
+xmodmap -e "keycode 195 = 0x1100060E"
+xmodmap -e "keycode 196 = 0x1100060F"
+xmodmap -e "keycode 197 = 0x11000610"
+xmodmap -e "keycode 198 = 0x1008ff26"
+
+# path setup
+export QPEDIR=/opt/Qtopia
+export PATH=$QPEDIR/bin:$PATH
+export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH
+
+#tell Qtopia how to inform illume on incoming phone calls
+#export ILLUME_PHONE_CALL=
+export QTOPIA_PHONE_VENDOR=ficgta01
+export QTOPIA_PHONE_MUX=ficgta01
+
+
+# Now start Qtopia
+qpe &
diff --git a/packages/qtopia-phone/qtopia-phone-x11/qtopia.sh b/packages/qtopia-phone/qtopia-phone-x11/qtopia.sh
new file mode 100644 (file)
index 0000000..b28001d
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/sh
+export QPEDIR=/opt/Qtopia
+export PATH=$PATH:$QPEDIR/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$QPEDIR/lib
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 (file)
index 0000000..9dfbd8a
--- /dev/null
@@ -0,0 +1,123 @@
+# 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 freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"
+RDEPENDS = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
+PROVIDES = "qtopia-phone"
+PR = "r8"
+SRCREV = "${AUTOREV}"
+SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \
+           file://Xsession.d/99qtopia \
+           file://qtopia.sh"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
+
+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)}"
+
+require qtopia-phone_arch.inc
+
+QT_ARCH = "${@qtopia_arch(d)}"
+QT_ENDIAN = "${@qtopia_endian(d)}"
+PLATFORM = "${BUILD_OS}-g++"
+BUILDDIR = "${WORKDIR}/build"
+OE_QT_PREFIX = "/opt/Qtopia"
+
+export OE_QMAKE_CC="${CC}"
+export OE_QMAKE_CFLAGS="${CFLAGS}"
+export OE_QMAKE_CXX="${CXX}"
+export OE_QMAKE_LDFLAGS="${LDFLAGS}"
+export OE_QMAKE_AR="${AR}"
+export OE_QMAKE_STRIP="echo"
+export OE_QMAKE_RPATH="-Wl,-rpath-link,"
+
+do_configure() {
+
+# This qmake some how does not honor env var, let us fix it by sed force
+sed -i s%$\(OE_QMAKE_CC\)%"${CC}"%g               ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_CFLAGS\)%"${CFLAGS}"%g       ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_CXX\)%"${CXX}"%g             ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_CXXFLAGS\)%"${CXXFLAGS}"%g   ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_LINK\)%"${CXX}"%g            ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_LDFLAGS\)%"${LDFLAGS}"%g     ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_AR\)%"${AR}"%g               ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+sed -i s%$\(OE_QMAKE_STRIP\)%"echo"%g             ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf
+
+
+unset CC
+unset CXX
+unset CFLAGS
+unset CXXFLAGS
+unset LDFLAGS
+
+
+mkdir -p ${BUILDDIR}
+cd ${BUILDDIR}
+echo yes | ${S}/configure -xplatform linux-oe-g++ -arch ${QT_ARCH} ${QT_ENDIAN} -prefix ${OE_QT_PREFIX} -device ${TARGET-DEVICE} -verbose \
+                          -no-drm -no-sxe -displaysize 480x640 -dbus -debug -extra-qtopiacore-config "-qt-libjpeg -qt-zlib -qt-libpng -no-iconv -no-sm -fontconfig -xrender -xrandr" \
+                           -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig -I${STAGING_INCDIR}/dbus-1.0
+
+}
+
+do_compile() {
+    cd ${BUILDDIR}
+    oe_runmake
+}
+
+do_stage() {
+}
+
+
+do_install() {
+   cd ${BUILDDIR}
+   oe_runmake install INSTALL_ROOT=${D}${OE_QT_PREFIX} IMAGE=${D}${OE_QT_PREFIX}
+
+   # Install freedesktop.org .desktop files for enlightenment
+   install -d ${D}${datadir}/applications
+   for app in "${S}/apps-fdo/"*; do
+     for file in "$app"/*.desktop; do
+        install -m 0644 $file ${D}${datadir}/applications/
+     done
+   done 
+
+   # Install good icons for the desktop files
+
+   # Make sure qpe gets launched by X
+   install -d ${D}/${sysconfdir}/X11/Xsession.d
+   install -m 0755 ${WORKDIR}/Xsession.d/99qtopia ${D}${sysconfdir}/X11/Xsession.d/
+
+   # Install some scripts
+   install -d ${D}${bindir}
+   install -m 0755 ${S}/bin/qcop-x11-launch ${D}${bindir}
+
+   install -d ${D}${sysconfdir}/profile.d/
+   install -m 0755 ${WORKDIR}/qtopia.sh ${D}${sysconfdir}/profile.d/
+}
+
+FILES_${PN} += "${OE_QT_PREFIX}/bin ${OE_QT_PREFIX}/help  \
+                ${OE_QT_PREFIX}/lib/*.so.* ${OE_QT_PREFIX}/plugins/*/*.so \
+                ${OE_QT_PREFIX}/qtopia_db.sqlite ${OE_QT_PREFIX}/sounds \
+                ${OE_QT_PREFIX}/etc ${OE_QT_PREFIX}/i18n \
+                ${OE_QT_PREFIX}/pics ${OE_QT_PREFIX}/qt_plugins/*/*.so \
+                ${OE_QT_PREFIX}/services"
+
+FILES_${PN}-dbg += "${OE_QT_PREFIX}/lib/.debug/ ${OE_QT_PREFIX}/bin/.debug/ \
+                    ${OE_QT_PREFIX}/plugins/*/.debug/ ${OE_QT_PREFIX}/qt_plugins/*/.debug/ "
+
+FILES_${PN}-dev += "${OE_QT_PREFIX}/lib/*.so"
+
diff --git a/packages/qtopia-phone/qtopia-phone.inc b/packages/qtopia-phone/qtopia-phone.inc
new file mode 100644 (file)
index 0000000..ed6e153
--- /dev/null
@@ -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 (file)
index 0000000..ca6978b
--- /dev/null
@@ -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 (file)
index 0000000..ca6978b
--- /dev/null
@@ -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 (file)
index 0000000..84f0e51
--- /dev/null
@@ -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 (file)
index 0000000..1c98f5c
--- /dev/null
@@ -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
index 5d411f1..701339d 100644 (file)
@@ -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"
index ee8cdf8..beb72cd 100644 (file)
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r20"
+PR = "r26"
 
 inherit task
 
@@ -35,5 +35,15 @@ RDEPENDS_task-openmoko-feed = "\
   vnc \
   wxwidgets \
   x11vnc \
+  libswt3.4-gtk-java \
+  cacao \
+  gpsdrive \
+  asterisk \
+  qtopia-phone \
+  gnash \
+  mono \
+  diversity-daemon \
+  diversity-nav \
+  assassin \
+  tangogps \
 "
-
diff --git a/packages/tasks/task-openmoko-qtopia-x11.bb b/packages/tasks/task-openmoko-qtopia-x11.bb
new file mode 100644 (file)
index 0000000..801e0e4
--- /dev/null
@@ -0,0 +1,35 @@
+DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+LICENSE = "MIT"
+PR = "r46"
+
+inherit task
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+PACKAGES = "task-openmoko-qtopia-x11"
+
+#
+# task-openmoko-qtopia-x11
+#
+DESCRIPTION_task-openmoko-qtopia-x11 = "OpenMoko: The Qtopia/X11 based User Interface"
+RDEPENDS_task-openmoko-qtopia-x11 = "\
+  alsa-state \
+  bluez-hcidump \
+  readline \
+  qtopia-phone-x11 \
+  e-wm \
+  illume \
+  ${XSERVER} \
+  xserver-kdrive-common \
+  xserver-nodm-init \
+  xauth \
+  xhost \
+  xset \
+  xrandr \
+  neod \
+  libnotify \
+"
+
diff --git a/packages/tasks/task-openmoko-qtopia.bb b/packages/tasks/task-openmoko-qtopia.bb
new file mode 100644 (file)
index 0000000..6179bae
--- /dev/null
@@ -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 \
+"
+
index c4a2ade..7a4e431 100644 (file)
@@ -41,7 +41,6 @@ do_install () {
 PACKAGES = "${PN}-dbg tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \
     tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
     tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
-
 ALLOW_EMPTY_${PN}-dbg = "1"
 
 FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*"
@@ -157,3 +156,6 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu     \
                 ${datadir}/zoneinfo/WET                  \
                 ${datadir}/zoneinfo/Zulu                 \
                 ${datadir}/zoneinfo/Etc/*"
+                ${datadir}/zoneinfo/WET                  \
+                ${datadir}/zoneinfo/Zulu                 \
+                ${datadir}/zoneinfo/Etc/*"
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
deleted file mode 100644 (file)
index 1fb9be4..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
-AUTHOR = "Harald Welte <laforge@openmoko.org>, OpenMoko <openmoko-kernel@lists.openmoko.org>"
-LICENSE = "GPL"
-SECTION = "bootloader"
-PRIORITY = "optional"
-
-UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e"
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5"
-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};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 \
-"
-
-EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
-TARGET_LDFLAGS = ""
-
-do_quilt() {
-        mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
-        rm -Rf patches .pc
-}
-
-do_svnrev() {
-       mv -f tools/setlocalversion tools/setlocalversion.old
-       echo "echo ${LOCALVERSION}" >>tools/setlocalversion
-}
-
-do_compile () {
-        chmod +x board/neo1973/gta*/split_by_variant.sh
-        for mach in ${UBOOT_MACHINES}
-        do
-                oe_runmake ${mach}_config
-                oe_runmake clean
-                find board -name lowlevel_foo.bin -exec rm '{}' \;
-                oe_runmake all
-                oe_runmake u-boot.udfu
-                if [ -f u-boot.udfu ]; then
-                        mv u-boot.udfu u-boot_${mach}.bin
-                else
-                        mv u-boot.bin u-boot_${mach}.bin
-                fi
-                if [ -f board/${mach}/lowlevel_foo.bin ]; then
-                        mv board/${mach}/lowlevel_foo.bin \
-                            lowlevel_foo_${mach}.bin
-                else
-                        find board -name lowlevel_foo.bin \
-                            -exec mv '{}' lowlevel_foo_${mach}.bin \;
-                fi
-        done
-}
-
-do_deploy () {
-       install -d ${DEPLOY_DIR_IMAGE}
-       for mach in ${UBOOT_MACHINES}
-       do
-               install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin
-               ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin
-               if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then
-                       install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin
-                       ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin
-               fi
-       done
-       install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
-}
-
-do_deploy[dirs] = "${S}"
-addtask deploy before do_package after do_install
-addtask quilt before do_patch after do_unpack
-addtask svnrev before do_patch after do_quilt
diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge
new file mode 100644 (file)
index 0000000..d8a51ea
--- /dev/null
@@ -0,0 +1,79 @@
+DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
+AUTHOR = "Harald Welte <laforge@openmoko.org>, OpenMoko <openmoko-kernel@lists.openmoko.org>"
+LICENSE = "GPL"
+SECTION = "bootloader"
+PRIORITY = "optional"
+
+UBOOT_UPSTREAM_REV = "b29661fc1151077776454288051bc9a488351ce8"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5"
+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};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 \
+"
+
+EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
+TARGET_LDFLAGS = ""
+
+do_quilt() {
+        mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+        rm -Rf patches .pc
+}
+
+do_svnrev() {
+       mv -f tools/setlocalversion tools/setlocalversion.old
+       echo "echo ${LOCALVERSION}" >>tools/setlocalversion
+}
+
+do_compile () {
+        chmod +x board/neo1973/gta*/split_by_variant.sh
+        for mach in ${UBOOT_MACHINES}
+        do
+                oe_runmake ${mach}_config
+                oe_runmake clean
+                find board -name lowlevel_foo.bin -exec rm '{}' \;
+                oe_runmake all
+                oe_runmake u-boot.udfu
+                if [ -f u-boot.udfu ]; then
+                        mv u-boot.udfu u-boot_${mach}.bin
+                else
+                        mv u-boot.bin u-boot_${mach}.bin
+                fi
+                if [ -f board/${mach}/lowlevel_foo.bin ]; then
+                        mv board/${mach}/lowlevel_foo.bin \
+                            lowlevel_foo_${mach}.bin
+                else
+                        find board -name lowlevel_foo.bin \
+                            -exec mv '{}' lowlevel_foo_${mach}.bin \;
+                fi
+        done
+}
+
+do_deploy () {
+       install -d ${DEPLOY_DIR_IMAGE}
+       for mach in ${UBOOT_MACHINES}
+       do
+               install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin
+               ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin
+               if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then
+                       install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin
+                       ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin
+               fi
+       done
+       install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
+}
+
+do_deploy[dirs] = "${S}"
+addtask deploy before do_package after do_install
+addtask quilt before do_patch after do_unpack
+addtask svnrev before do_patch after do_quilt
index 9f38760..8310db1 100644 (file)
@@ -9,9 +9,9 @@ DEPENDS += "libxkbfile libxcalibrate"
 RDEPENDS_${PN} = "xserver-kdrive"
 PROVIDES = "virtual/xserver"
 PE = "1"
-PR = "r0"
+PR = "r1"
 
-XGLAMO_GIT_REV = "d96175a2db993ef4bc7d9d910e0b47ec7ff20561"
+XGLAMO_GIT_REV = "0d2605edeb50a4b118ac00ae1f00abd085477323"
 
 SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_GIT_REV} \
         file://kmode.patch;patch=1 \