summaryrefslogtreecommitdiff
path: root/meta-extras
diff options
context:
space:
mode:
Diffstat (limited to 'meta-extras')
-rw-r--r--meta-extras/COPYING.MIT17
-rw-r--r--meta-extras/conf/machine/android-goldfish.conf18
-rw-r--r--meta-extras/packages/acct/acct_6.3.99+6.4pre1.bb9
-rw-r--r--meta-extras/packages/acct/files/cross-compile.patch34
-rw-r--r--meta-extras/packages/eventlog/eventlog_0.2.5.bb7
-rw-r--r--meta-extras/packages/evince/evince_2.20.0.bb10
-rw-r--r--meta-extras/packages/evince/evince_svn.bb14
-rw-r--r--meta-extras/packages/evince/files/no-icon-theme.diff13
-rw-r--r--meta-extras/packages/flumotion/flumotion/no-check-for-python-stuff.patch68
-rw-r--r--meta-extras/packages/flumotion/flumotion/python-path.patch25
-rw-r--r--meta-extras/packages/flumotion/flumotion_0.4.1.bb41
-rw-r--r--meta-extras/packages/images/poky-image-extras.bb9
-rw-r--r--meta-extras/packages/libol/libol_0.3.18.bb14
-rw-r--r--meta-extras/packages/libxosd/files/autofoo.patch116
-rw-r--r--meta-extras/packages/libxosd/files/use-sane-default-font.patch13
-rw-r--r--meta-extras/packages/libxosd/libxosd_svn.bb20
-rw-r--r--meta-extras/packages/linux/linux-android-goldfish/binutils-buildid-arm.patch16
-rw-r--r--meta-extras/packages/linux/linux-android-goldfish/defconfig-android-goldfish1043
-rw-r--r--meta-extras/packages/linux/linux-android-goldfish_2.6.23-rc20.bb81
-rw-r--r--meta-extras/packages/madplay/madplay_0.15.2b.bb12
-rw-r--r--meta-extras/packages/maemo-mapper/files/fix_segfault.patch31
-rw-r--r--meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb22
-rw-r--r--meta-extras/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb12
-rw-r--r--meta-extras/packages/matchbox-applet-light/matchbox-applet-light_svn.bb10
-rw-r--r--meta-extras/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb11
-rw-r--r--meta-extras/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb12
-rw-r--r--meta-extras/packages/matchbox-common/matchbox-common_0.9.1.bb14
-rw-r--r--meta-extras/packages/matchbox-common/matchbox-common_svn.bb17
-rw-r--r--meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/home-panelapp.desktop7
-rwxr-xr-xmeta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/mb-applet-home2
-rw-r--r--meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.desktop7
-rwxr-xr-xmeta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh9
-rw-r--r--meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.pngbin1651 -> 0 bytes
-rw-r--r--meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb23
-rw-r--r--meta-extras/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb12
-rw-r--r--meta-extras/packages/matchbox-panel/matchbox-panel.inc27
-rw-r--r--meta-extras/packages/matchbox-panel/matchbox-panel_0.9.2.bb6
-rw-r--r--meta-extras/packages/matchbox-panel/matchbox-panel_svn.bb9
-rw-r--r--meta-extras/packages/mc/mc_4.6.0.bb32
-rw-r--r--meta-extras/packages/minicom/minicom-2.1/configure.patch25
-rw-r--r--meta-extras/packages/minicom/minicom-2.1/gcc4-scope.patch44
-rw-r--r--meta-extras/packages/minicom/minicom_2.1.bb12
-rw-r--r--meta-extras/packages/notification-daemon/files/no-wnck-sexy.patch98
-rw-r--r--meta-extras/packages/notification-daemon/notification-daemon_0.3.7.bb21
-rw-r--r--meta-extras/packages/qemu/qemu-android-native.bb25
-rw-r--r--meta-extras/packages/qemu/qemu-android-native/fixes.patch45
-rw-r--r--meta-extras/packages/syslog-ng/files/initscript45
-rw-r--r--meta-extras/packages/syslog-ng/files/syslog-ng.conf89
-rw-r--r--meta-extras/packages/syslog-ng/syslog-ng_2.0.5.bb34
-rw-r--r--meta-extras/packages/tasks/task-poky-extras.bb9
-rw-r--r--meta-extras/packages/twisted/twisted-2.5.0/remove-zope-check.patch18
-rw-r--r--meta-extras/packages/twisted/twisted_2.5.0.bb175
-rw-r--r--meta-extras/packages/zope/zope_3.3.1.bb45
53 files changed, 0 insertions, 2528 deletions
diff --git a/meta-extras/COPYING.MIT b/meta-extras/COPYING.MIT
deleted file mode 100644
index fb950dc69..000000000
--- a/meta-extras/COPYING.MIT
+++ /dev/null
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/meta-extras/conf/machine/android-goldfish.conf b/meta-extras/conf/machine/android-goldfish.conf
deleted file mode 100644
index 099c475f0..000000000
--- a/meta-extras/conf/machine/android-goldfish.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#@TYPE: Machine
-#@NAME: Android Machine setup
-#@DESCRIPTION: Machine configuration for the Android platform
-
-TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
-
-require conf/machine/include/qemu.inc
-require conf/machine/include/tune-arm926ejs.inc
-
-KERNEL_IMAGETYPE = "zImage"
-
-IMAGE_FSTYPES = "tar.bz2 yaffs2"
-EXTRA_IMAGECMD_yaffs2 = "0"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-android-goldfish"
diff --git a/meta-extras/packages/acct/acct_6.3.99+6.4pre1.bb b/meta-extras/packages/acct/acct_6.3.99+6.4pre1.bb
deleted file mode 100644
index 078013c39..000000000
--- a/meta-extras/packages/acct/acct_6.3.99+6.4pre1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "GNU Accounting Utilities - user and process accounting."
-
-SRC_URI = "http://www.physik3.uni-rostock.de/tim/kernel/utils/acct/acct-6.4-pre1.tar.gz \
- file://cross-compile.patch;patch=1"
-
-S = "${WORKDIR}/acct-6.4-pre1"
-
-inherit autotools
diff --git a/meta-extras/packages/acct/files/cross-compile.patch b/meta-extras/packages/acct/files/cross-compile.patch
deleted file mode 100644
index 78b57104c..000000000
--- a/meta-extras/packages/acct/files/cross-compile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur acct-6.4-pre1.org/configure.in acct-6.4-pre1/configure.in
---- acct-6.4-pre1.org/configure.in 2006-01-07 23:56:46.000000000 +0200
-+++ acct-6.4-pre1/configure.in 2006-08-03 21:16:17.000000000 +0300
-@@ -87,6 +87,10 @@
- ACCTON_MAN=accton.8
- LASTCOMM_MAN=lastcomm.1
- SA_MAN=sa.8
-+ WTMP_FILE_LOC=/var/log/wtmp
-+ ACCT_FILE_LOC=/var/account/pacct
-+ SAVACCT_FILE_LOC=/var/account/savacct
-+ USRACCT_FILE_LOC=/var/account/usracct
- AC_DEFINE(HAVE_ACUTIME, ,
- [Define if <sys/acct.h> has the AC_UTIME field.])
- AC_DEFINE(ACUTIME_COMPT, ,
-@@ -130,6 +134,10 @@
- ACCTON_MAN=accton.8
- LASTCOMM_MAN=lastcomm.1
- SA_MAN=sa.8
-+ WTMP_FILE_LOC=/var/log/wtmp
-+ ACCT_FILE_LOC=/var/account/pacct
-+ SAVACCT_FILE_LOC=/var/account/savacct
-+ USRACCT_FILE_LOC=/var/account/usracct
- AC_HEADER_EGREP(ac_utime, sys/acct.h,
- AC_DEFINE(HAVE_ACUTIME, ,
- [Define if <sys/acct.h> has the AC_UTIME field.])
-@@ -277,7 +285,7 @@
- }
- ], . ./locs; rm locs,
- echo "Error -- could not locate your wtmp and acct files."; exit 1,
-- echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 )
-+ echo "Cross-compiling - cannot find out accounting file locations - using Linux defaults."; )
- AC_TYPE_PID_T dnl for sys/acct.h
- AC_TYPE_UID_T dnl same as above
- AC_TYPE_SIZE_T
diff --git a/meta-extras/packages/eventlog/eventlog_0.2.5.bb b/meta-extras/packages/eventlog/eventlog_0.2.5.bb
deleted file mode 100644
index da0e2e003..000000000
--- a/meta-extras/packages/eventlog/eventlog_0.2.5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Replacement syslog API"
-LICENSE = "BSD"
-PR = "r1"
-
-SRC_URI = "http://www.balabit.com/downloads/files/eventlog/0.2/${P}.tar.gz"
-
-inherit autotools_stage pkgconfig
diff --git a/meta-extras/packages/evince/evince_2.20.0.bb b/meta-extras/packages/evince/evince_2.20.0.bb
deleted file mode 100644
index be18d911a..000000000
--- a/meta-extras/packages/evince/evince_2.20.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Evince is a document viewer for document formats like PDF, PS, DjVu."
-LICENSE = "GPL"
-SECTION = "x11/office"
-DEPENDS = "gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring"
-
-inherit gnome pkgconfig gtk-icon-cache
-
-SRC_URI += "file://no-icon-theme.diff;patch=1;pnum=0"
-
-EXTRA_OECONF = "--without-libgnome --disable-thumbnailer"
diff --git a/meta-extras/packages/evince/evince_svn.bb b/meta-extras/packages/evince/evince_svn.bb
deleted file mode 100644
index 8df9577f8..000000000
--- a/meta-extras/packages/evince/evince_svn.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Evince is a document viewer for document formats like PDF, PS, DjVu."
-LICENSE = "GPL"
-SECTION = "x11/office"
-DEPENDS = "gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring"
-PV = "0.9.0+svnr${SRCREV}"
-
-inherit gnome pkgconfig gtk-icon-cache
-
-SRC_URI = "svn://svn.gnome.org/svn/evince;module=trunk \
- file://no-icon-theme.diff;patch=1;pnum=0"
-
-S = "${WORKDIR}/trunk"
-
-EXTRA_OECONF = "--without-libgnome --disable-thumbnailer"
diff --git a/meta-extras/packages/evince/files/no-icon-theme.diff b/meta-extras/packages/evince/files/no-icon-theme.diff
deleted file mode 100644
index 7b7771ba0..000000000
--- a/meta-extras/packages/evince/files/no-icon-theme.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac (revision 2436)
-+++ configure.ac (working copy)
-@@ -57,7 +57,7 @@
- PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED)
- PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0)
- PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 gnome-vfs-2.0)
--PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED)
-+PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED)
-
- AC_ARG_WITH(libgnome,
- AC_HELP_STRING([--without-libgnome],[disable the use of libgnome]),
diff --git a/meta-extras/packages/flumotion/flumotion/no-check-for-python-stuff.patch b/meta-extras/packages/flumotion/flumotion/no-check-for-python-stuff.patch
deleted file mode 100644
index 08503c82e..000000000
--- a/meta-extras/packages/flumotion/flumotion/no-check-for-python-stuff.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: flumotion-0.4.1/configure.ac
-===================================================================
---- flumotion-0.4.1.orig/configure.ac 2007-03-05 17:16:48.121264330 +0100
-+++ flumotion-0.4.1/configure.ac 2007-03-05 17:20:40.343837320 +0100
-@@ -73,13 +73,6 @@
- AC_MSG_ERROR([PyGTK 2.5.2 contains known bugs, please install other version])
- fi
-
--if test "x$DISPLAY" != "x"; then
-- AS_PYTHON_IMPORT([gtk.glade],,
-- AC_MSG_ERROR([You need to have python libglade bindings installed]))
--else
-- AC_MSG_NOTICE([Not trying to import gtk.glade because DISPLAY is unset])
--fi
--
- if test $GST_010_SUPPORTED = "no"; then
- AC_MSG_ERROR([No appropriate version of PyGTK installed. Correct the above
- errors and try again.])
-@@ -94,16 +87,6 @@
- [AC_MSG_RESULT([$PYGST_010_PKG_ERRORS])
- GST_010_SUPPORTED=no])
-
-- if test $GST_010_SUPPORTED = "yes"; then
-- saved_PYTHONPATH=$PYTHONPATH
-- export PYTHONPATH=$PYGST_010_DIR:$PYTHONPATH
-- AS_PYTHON_IMPORT([gst],,
-- [AC_MSG_NOTICE([Unable to import gst-python 0.10 -- check your PYTHONPATH?])
-- GST_010_SUPPORTED=no],
-- [import pygst; pygst.require('0.10')],
-- [assert gst.pygst_version[[1]] == 10 or (gst.pygst_version[[1]] == 9 and gst.pygst_version[[2]] >= 7)])
--
-- fi
- fi
-
- if test $GST_010_SUPPORTED = "no"; then
-@@ -158,32 +141,7 @@
- AC_CHECK_PROG(PYCHECKER, pychecker, yes, no)
- AM_CONDITIONAL(HAVE_PYCHECKER, test "x$PYCHECKER" = "xyes")
-
--dnl check for Twisted
--AS_PYTHON_IMPORT(twisted,
-- [
-- AC_MSG_CHECKING(for Twisted >= 2.0.1)
-- prog="
--import sys
--import twisted.copyright
--minver = '2.0.1'
--if twisted.copyright.version < minver:
-- sys.exit(1)
--sys.exit(0)
--"
-- if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
-- then
-- AC_MSG_RESULT(found)
-- else
-- AC_MSG_RESULT(too old)
-- AC_MSG_ERROR([You need at least version 2.0.1 of Twisted])
-- fi
-- ]
-- ,
-- AC_MSG_ERROR([You need at least version 2.0.1 of Twisted])
--)
-
--TWISTED_MODULE([twisted.names])
--TWISTED_MODULE([twisted.web])
-
- AC_CONFIG_FILES([env], [chmod +x env])
- AC_CONFIG_FILES([bin/flumotion], [chmod +x bin/flumotion])
diff --git a/meta-extras/packages/flumotion/flumotion/python-path.patch b/meta-extras/packages/flumotion/flumotion/python-path.patch
deleted file mode 100644
index 377994e72..000000000
--- a/meta-extras/packages/flumotion/flumotion/python-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: flumotion-0.3.1/common/as-python.m4
-===================================================================
---- flumotion-0.3.1.orig/common/as-python.m4 2007-03-02 15:26:46.704717964 +0100
-+++ flumotion-0.3.1/common/as-python.m4 2007-03-02 15:27:28.601326374 +0100
-@@ -199,6 +199,12 @@
- AC_MSG_CHECKING(for headers required to compile python extensions)
-
- dnl deduce PYTHON_INCLUDES
-+
-+ AC_ARG_WITH(python-includes,
-+ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval)
-+ if test x$py_exec_prefix != x; then
-+ PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-+ else
- py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
- py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-@@ -206,6 +212,7 @@
- if test "$py_prefix" != "$py_exec_prefix"; then
- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
- fi
-+ fi
- AC_SUBST(PYTHON_INCLUDES)
-
- dnl check if the headers exist:
diff --git a/meta-extras/packages/flumotion/flumotion_0.4.1.bb b/meta-extras/packages/flumotion/flumotion_0.4.1.bb
deleted file mode 100644
index 976c8c414..000000000
--- a/meta-extras/packages/flumotion/flumotion_0.4.1.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Fluendo Streaming Server"
-LICENSE = "GPL"
-DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk"
-RDEPENDS = "python-resource python-pprint python-threading \
- python-imaging python-xml python-curses \
- python-compression python-fcntl python-pygobject \
- python-pickle python-netclient python-datetime \
- python-crypt python-twisted-core python-twisted-web \
- python-lang python-zopeinterface python-textutils \
- python-gst python-misc"
-RDEPENDS_${PN}-gui = "${PN} python-pygtk python-pycairo"
-PR = "r10"
-
-SRC_URI = "http://www.flumotion.net/src/flumotion/flumotion-${PV}.tar.bz2 \
- file://python-path.patch;patch=1 \
- file://no-check-for-python-stuff.patch;patch=1"
-
-inherit autotools distutils-base pkgconfig
-
-export EPYDOC = "no"
-
-EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
-
-PACKAGES =+ "flumotion-gui"
-
-FILES_${PN}-dbg += "${libdir}/flumotion/python/flumotion/extern/*/.debug/*"
-FILES_${PN} = "${bindir} ${sbindir} ${libdir}/flumotion"
-FILES_${PN}-dev += "${libdir}/pkgconfig"
-FILES_${PN}-gui = "${bindir}/flumotion-admin ${bindir}/flumotion-tester \
- ${libdir}/flumotion/python/flumotion/admin/gtk \
- ${libdir}/flumotion/python/flumotion/component/*/admin_gtk* \
- ${libdir}/flumotion/python/flumotion/component/*/*/admin_gtk* \
- ${libdir}/flumotion/python/flumotion/extern/*.py* \
- ${libdir}/flumotion/python/flumotion/extern/fdpass/*.py* \
- ${libdir}/flumotion/python/flumotion/extern/fdpass/fdpass.so \
- ${libdir}/flumotion/python/flumotion/extern/pytrayicon/*.py* \
- ${libdir}/flumotion/python/flumotion/extern/pytrayicon/pytrayicon.so \
- ${libdir}/flumotion/python/flumotion/manager \
- ${libdir}/flumotion/python/flumotion/ui \
- ${libdir}/flumotion/python/flumotion/wizard \
- ${datadir}/pixmaps ${datadir}/flumotion ${datadir}/applications"
diff --git a/meta-extras/packages/images/poky-image-extras.bb b/meta-extras/packages/images/poky-image-extras.bb
deleted file mode 100644
index 7ad5fd517..000000000
--- a/meta-extras/packages/images/poky-image-extras.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Copyright (C) 2007 OpenedHand Ltd.
-#
-
-IMAGE_FEATURES += "apps-core apps-pda"
-
-inherit poky-image
-
-IMAGE_INSTALL += "task-poky-extraapps"
diff --git a/meta-extras/packages/libol/libol_0.3.18.bb b/meta-extras/packages/libol/libol_0.3.18.bb
deleted file mode 100644
index 0b6518c43..000000000
--- a/meta-extras/packages/libol/libol_0.3.18.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-PR = "r7"
-
-SRC_URI = "http://www.balabit.com/downloads/files/libol/0.3/${P}.tar.gz"
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-inherit autotools binconfig
-
-do_stage() {
- install -d ${STAGING_INCDIR}/libol
- install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}/
- ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
- install ${S}/src/*.h ${STAGING_INCDIR}/libol/
-}
diff --git a/meta-extras/packages/libxosd/files/autofoo.patch b/meta-extras/packages/libxosd/files/autofoo.patch
deleted file mode 100644
index e26f15e9e..000000000
--- a/meta-extras/packages/libxosd/files/autofoo.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Index: current/configure.ac
-===================================================================
---- current.orig/configure.ac 2007-06-14 09:06:04.000000000 +0000
-+++ current/configure.ac 2007-06-14 09:14:37.000000000 +0000
-@@ -52,8 +52,6 @@
- CFLAGS="$CFLAGS $X_CFLAGS -Wall"
-
- dnl Checks for libraries.
--AM_PATH_GTK(1.2.2,,
-- AC_MSG_WARN([*** GTK+ >= 1.2.2 not found ***]))
- AC_CHECK_LIB(X11, XInitThreads,,
- AC_MSG_ERROR([*** X11 not threadsafe ***]))
- AC_CHECK_LIB(Xext, XShapeQueryExtension,,
-@@ -107,63 +105,6 @@
- AC_MSG_WARN("beep media player not found")
- fi
-
--dnl Check for xmms
--AM_PATH_XMMS(1.2.7,,
-- AC_MSG_WARN("xmms plugins can not be built"))
--dnl Override where to place libxmms_xosd.so
--AC_ARG_WITH([plugindir],
-- AC_HELP_STRING([--with-plugindir=DIR],
-- [Set the xmms plugin directory]),
-- [XMMS_PLUGIN_DIR="$withval"],
-- [XMMS_PLUGIN_DIR="$XMMS_GENERAL_PLUGIN_DIR"])
--
--dnl Check for gdk-pixbuf
--AM_PATH_GDK_PIXBUF(0.22.0,,
-- AC_MSG_WARN("new xmms plugin can not be built"))
--dnl Override where to place pixmaps for libxmms_xosd.so
--AC_ARG_WITH([pixmapdir],
-- AC_HELP_STRING([--with-pixmapdir=DIR],
-- [Set the directory for xmms plugin pixmaps]),
-- [XMMS_PIXMAPDIR="$withval"],
-- [XMMS_PIXMAPDIR="${datadir}/xosd"])
--AC_SUBST(XMMS_PIXMAPDIR)
--
--dnl NEW plugin
--AC_ARG_ENABLE([new-plugin],
-- AC_HELP_STRING([--disable-new-plugin],
-- [Disable new xmms plugin (enabled by default)]),
-- [enable_new_plugin="$enableval"],
-- [enable_new_plugin="yes"])
--AC_MSG_CHECKING([whether new xmms plugin was requested])
--AC_MSG_RESULT($enable_new_plugin)
--AM_CONDITIONAL([BUILD_NEW_PLUGIN],
-- [test x"$enable_new_plugin" = "xyes" -a x"$no_xmms" != "xyes" -a x"$no_gdk_pixbuf" != "xyes"])
--
--
--dnl Check for Beep Media player
--AC_ARG_ENABLE([beep_media_player_plugin],
-- AC_HELP_STRING([--enable-beep_media_player_plugin],
-- [Enable beep media plugin (enabled by default)]),
-- [beep_media_player_plugin="$enableval"],
-- [beep_media_player_plugin="yes"])
--AC_MSG_CHECKING([whether beep media plugin was requested])
--AC_MSG_RESULT($beep_media_player_plugin)
--
--AM_CONDITIONAL([BUILD_BEEP_MEDIA_PLUGIN],
-- [test x"$beep_media_player_plugin" = "xyes" -a x"$no_bmp" == "xyes"])
--
--dnl OLD plugin
--AC_ARG_ENABLE([old-plugin],
-- AC_HELP_STRING([--enable-old-plugin],
-- [Enable old xmms plugin (disabled by default)]),
-- [enable_old_plugin="$enableval"],
-- [enable_old_plugin="no"])
--AC_MSG_CHECKING([whether old xmms plugin was requested])
--AC_MSG_RESULT($enable_old_plugin)
--AM_CONDITIONAL([BUILD_OLD_PLUGIN],
-- [test x"$enable_old_plugin" = "xyes" -a x"$no_xmms" != "xyes"])
--
--
- dnl Define XOSD_VERSION
- AC_DEFINE_UNQUOTED(XOSD_VERSION, "${VERSION}")
-
-@@ -174,8 +115,6 @@
- Makefile
- src/Makefile
- src/libxosd/Makefile
--src/xmms_plugin/Makefile
--src/bmp_plugin/Makefile
- macros/Makefile
- man/Makefile
- pixmaps/Makefile
-Index: current/src/Makefile.am
-===================================================================
---- current.orig/src/Makefile.am 2007-06-14 09:06:04.000000000 +0000
-+++ current/src/Makefile.am 2007-06-14 09:14:37.000000000 +0000
-@@ -10,6 +10,4 @@
-
- include_HEADERS = xosd.h
-
--AM_CFLAGS = ${GTK_CFLAGS}
--
--SUBDIRS=libxosd xmms_plugin bmp_plugin
-+SUBDIRS=libxosd
-Index: current/Makefile.am
-===================================================================
---- current.orig/Makefile.am 2007-06-14 09:06:04.000000000 +0000
-+++ current/Makefile.am 2007-06-14 09:16:15.000000000 +0000
-@@ -1,11 +1,5 @@
--if BUILD_NEW_PLUGIN
-- NEW_SUB = pixmaps
--endif
--if BUILD_BEEP_MEDIA_PLUGIN
-- NEW_SUB = pixmaps
--endif
--SUBDIRS = macros man $(NEW_SUB) src script
--DIST_SUBDIRS = macros man pixmaps src script
-+SUBDIRS = macros man src script
-+DIST_SUBDIRS = macros man src script
-
- DISTCLEANFILES = libtool-disable-static
-
diff --git a/meta-extras/packages/libxosd/files/use-sane-default-font.patch b/meta-extras/packages/libxosd/files/use-sane-default-font.patch
deleted file mode 100644
index 0ede1351e..000000000
--- a/meta-extras/packages/libxosd/files/use-sane-default-font.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: current/src/libxosd/xosd.c
-===================================================================
---- current.orig/src/libxosd/xosd.c 2007-06-16 19:37:48.000000000 +0000
-+++ current/src/libxosd/xosd.c 2007-06-17 05:00:47.000000000 +0000
-@@ -26,7 +26,7 @@
- #define XOFFSET 10
-
- const char * const osd_default_font =
-- "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
-+ "fixed";
- #if 0
- "-adobe-helvetica-bold-r-*-*-10-*";
- #endif
diff --git a/meta-extras/packages/libxosd/libxosd_svn.bb b/meta-extras/packages/libxosd/libxosd_svn.bb
deleted file mode 100644
index da0ba0a41..000000000
--- a/meta-extras/packages/libxosd/libxosd_svn.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "A library for displaying a TV-like on-screen display in X."
-SECTION = "libs/x11"
-DEPENDS = "virtual/libx11 libxext"
-LICENSE = "LGPL"
-PV = "2.2.15+svnr${SRCREV}"
-PR = "r5"
-
-SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \
- file://autofoo.patch;patch=1 \
- file://use-sane-default-font.patch;patch=1"
-
-S = "${WORKDIR}/current"
-
-inherit autotools_stage binconfig
-
-PACKAGES =+ "${PN}-examples-dbg ${PN}-examples"
-FILES_${PN}-examples = "${bindir}/osd_cat"
-FILES_${PN}-examples-dbg += "${bindir}/.debug/"
-FILES_${PN}-dev += "${bindir}/xosd-config"
-FILES_${PN} = "${libdir}/libxosd.so.*"
diff --git a/meta-extras/packages/linux/linux-android-goldfish/binutils-buildid-arm.patch b/meta-extras/packages/linux/linux-android-goldfish/binutils-buildid-arm.patch
deleted file mode 100644
index 68e35e89e..000000000
--- a/meta-extras/packages/linux/linux-android-goldfish/binutils-buildid-arm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
----
- arch/arm/kernel/vmlinux.lds.S | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: linux-2.6.22/arch/arm/kernel/vmlinux.lds.S
-===================================================================
---- linux-2.6.22.orig/arch/arm/kernel/vmlinux.lds.S 2007-09-11 18:32:29.000000000 +0200
-+++ linux-2.6.22/arch/arm/kernel/vmlinux.lds.S 2007-09-11 18:33:42.000000000 +0200
-@@ -94,6 +94,7 @@
- TEXT_TEXT
- SCHED_TEXT
- LOCK_TEXT
-+ *(.note.*)
- #ifdef CONFIG_MMU
- *(.fixup)
- #endif
diff --git a/meta-extras/packages/linux/linux-android-goldfish/defconfig-android-goldfish b/meta-extras/packages/linux/linux-android-goldfish/defconfig-android-goldfish
deleted file mode 100644
index cab2d89e0..000000000
--- a/meta-extras/packages/linux/linux-android-goldfish/defconfig-android-goldfish
+++ /dev/null
@@ -1,1043 +0,0 @@
-
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21
-# Fri Jun 29 20:16:53 2007
-#
-CONFIG_ARM=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_GENERIC_GPIO is not set
-# CONFIG_GENERIC_TIME is not set
-CONFIG_MMU=y
-# CONFIG_NO_IOPORT is not set
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ZONE_DMA=y
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_IPC_NS is not set
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_AUDIT is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_SYSFS_DEPRECATED=y
-# CONFIG_RELAY is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL=y
-CONFIG_PANIC_TIMEOUT=0
-# CONFIG_EMBEDDED is not set
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-
-#
-# Block layer
-#
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-
-#
-# System Type
-#
-# CONFIG_ARCH_AAEC2000 is not set
-CONFIG_ARCH_GOLDFISH=y
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_OMAP is not set
-
-#
-# Goldfish Options
-#
-CONFIG_MACH_GOLDFISH=y
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_ARM926T=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5TJ=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-
-#
-# Processor Features
-#
-CONFIG_ARM_THUMB=y
-# CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
-# CONFIG_OUTER_CACHE is not set
-
-#
-# Bus support
-#
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-# CONFIG_PCCARD is not set
-
-#
-# Kernel Features
-#
-# CONFIG_PREEMPT is not set
-# CONFIG_NO_IDLE_HZ is not set
-CONFIG_HZ=100
-CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=n
-# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-# CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_ALIGNMENT_TRAP=y
-
-#
-# Boot options
-#
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=""
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
-
-#
-# Floating point emulation
-#
-
-#
-# At least one emulation must be selected
-#
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
-# CONFIG_FPE_FASTFPE is not set
-CONFIG_VFP=y
-
-#
-# Userspace binary formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=y
-# CONFIG_ARTHUR is not set
-
-#
-# Power management options
-#
-CONFIG_PM=y
-CONFIG_PM_LEGACY=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_PM_SYSFS_DEPRECATED is not set
-# CONFIG_APM_EMULATION is not set
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-# CONFIG_NETDEBUG is not set
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-CONFIG_NET_IPIP=y
-CONFIG_NET_IPGRE=y
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_ARPD=y
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-CONFIG_INET_XFRM_TUNNEL=y
-CONFIG_INET_TUNNEL=y
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-CONFIG_BRIDGE=y
-CONFIG_VLAN_8021Q=y
-# CONFIG_DECNET is not set
-CONFIG_LLC=y
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-# CONFIG_IEEE80211 is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-
-#
-# Connector - unified userspace <-> kernelspace linker
-#
-CONFIG_CONNECTOR=y
-CONFIG_PROC_EVENTS=y
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_PARTITIONS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_PLATRAM is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GOLDFISH_NAND=y
-
-#
-# NAND Flash Device Drivers
-#
-# CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
-#
-# CONFIG_MTD_ONENAND is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNPACPI is not set
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_NBD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
-# CONFIG_ATA is not set
-
-#
-# Multi-device support (RAID and LVM)
-#
-# CONFIG_MD is not set
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-
-#
-# PHY device support
-#
-# CONFIG_PHYLIB is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_SMC91X=y
-# CONFIG_DM9000 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-CONFIG_KEYBOARD_GOLDFISH_EVENTS=y
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_UINPUT is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-# CONFIG_SERIO_SERPORT is not set
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_NVRAM is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-CONFIG_GOLDFISH_TTY=y
-CONFIG_BINDER=y
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-
-#
-# Dallas's 1-wire bus
-#
-# CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
-# CONFIG_HWMON is not set
-# CONFIG_HWMON_VID is not set
-
-#
-# Misc devices
-#
-# CONFIG_PROC_EXMAP is not set
-CONFIG_LOW_MEMORY_KILLER=y
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_SM501 is not set
-
-#
-# LED devices
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# LED drivers
-#
-
-#
-# LED Triggers
-#
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# Graphics support
-#
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_DDC is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_GOLDFISH=y
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
-# CONFIG_LOGO is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# HID Devices
-#
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-
-#
-# MMC/SD Card support
-#
-CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_GOLDFISH=y
-
-#
-# Real Time Clock
-#
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-
-#
-# RTC drivers
-#
-# CONFIG_RTC_DRV_CMOS is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-CONFIG_RTC_DRV_GOLDFISH=y
-
-#
-# Android
-#
-# CONFIG_ANDROID_GADGET is not set
-# CONFIG_ANDROID_RAM_CONSOLE is not set
-CONFIG_ANDROID_POWER=y
-CONFIG_ANDROID_LOGGER=y
-
-#
-# File systems
-#
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4DEV_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-# CONFIG_CONFIGFS_FS is not set
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_YAFFS1=y
-# CONFIG_YAFFS_DOES_ECC is not set
-CONFIG_YAFFS_YAFFS2=y
-CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-# CONFIG_JFFS2_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-# CONFIG_NFS_FS is not set
-CONFIG_NFSD=y
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFSD_TCP is not set
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-CONFIG_SMB_FS=y
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-
-#
-# Distributed Lock Manager
-#
-# CONFIG_DLM is not set
-
-#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOG_BUF_SHIFT=16
-# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_LIST is not set
-CONFIG_FRAME_POINTER=y
-CONFIG_FORCED_INLINING=y
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_ERRORS is not set
-# CONFIG_DEBUG_LL is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_HMAC=y
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_MD4 is not set
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=y
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=y
-# CONFIG_CRYPTO_LRW is not set
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_DEFLATE=y
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-
-#
-# Hardware crypto devices
-#
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC16 is not set
-CONFIG_CRC32=y
-# CONFIG_LIBCRC32C is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-CONFIG_PLIST=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-
-CONFIG_QEMU_TRACE=y
diff --git a/meta-extras/packages/linux/linux-android-goldfish_2.6.23-rc20.bb b/meta-extras/packages/linux/linux-android-goldfish_2.6.23-rc20.bb
deleted file mode 100644
index 9ee1ae446..000000000
--- a/meta-extras/packages/linux/linux-android-goldfish_2.6.23-rc20.bb
+++ /dev/null
@@ -1,81 +0,0 @@
-DESCRIPTION = "2.6 Linux Android Kernel from Google"
-SECTION = "kernel"
-LICENSE = "GPL"
-
-inherit kernel
-
-PR = "r0"
-
-SRC_URI = "http://android.googlecode.com/files/linux-2.6.23-android-m3-rc20.tar.gz \
- file://binutils-buildid-arm.patch;patch=1 \
- file://defconfig-android-goldfish"
-
-S = "${WORKDIR}/kernel"
-
-RPROVIDES_kernel-base += "hostap-modules"
-
-RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
-
-COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = 'android'
-
-KERNEL_CUSTOM_NAME ?= ""
-KERNEL_DEPLOY_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${KERNEL_CUSTOM_NAME}${MACHINE}-${DATETIME}.bin"
-KERNEL_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${KERNEL_CUSTOM_NAME}${MACHINE}.bin"
-KERNEL_DEFCONFIG ?= "defconfig-${MACHINE}"
-
-CMDLINE = ""
-
-do_configure() {
- rm -f ${S}/.config
-
- if [ ! -e ${WORKDIR}/${KERNEL_DEFCONFIG} ]; then
- die "No default configuration for ${MACHINE} available."
- fi
-
- echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
-
- if [ "${TARGET_OS}" = "linux-gnueabi" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then
- echo "CONFIG_AEABI=y" >> ${S}/.config
- echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config
- else
- echo "# CONFIG_AEABI is not set" >> ${S}/.config
- echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config
- fi
-
- if [ "${DISTRO}" = "poky" -a "${MACHINE}" != "collie" ]; then
- echo "CONFIG_LOGO=y" >> ${S}/.config
- echo "CONFIG_LOGO_OHAND_CLUT224=y" >> ${S}/.config
- echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config
- else
- echo "# CONFIG_LOGO is not set" >> ${S}/.config
- echo "# CONFIG_LOGO_OHAND_CLUT224 is not set" >> ${S}/.config
- echo "# CONFIG_LOGO_LINUX_CLUT224 is not set" >> ${S}/.config
- fi
-
- sed -e '/CONFIG_AEABI/d' \
- -e '/CONFIG_OABI_COMPAT=/d' \
- -e '/CONFIG_CMDLINE=/d' \
- -e '/CONFIG_MTD_MTDRAM_SA1100=/d' \
- -e '/CONFIG_MTDRAM_TOTAL_SIZE=/d' \
- -e '/CONFIG_MTDRAM_ERASE_SIZE=/d' \
- -e '/CONFIG_MTDRAM_ABS_POS=/d' \
- -e '/CONFIG_LOGO=/d' \
- -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \
- -e '/CONFIG_LOGO_OHAND_CLUT224=/d' \
- '${WORKDIR}/${KERNEL_DEFCONFIG}' >>'${S}/.config'
-
- yes '' | oe_runmake oldconfig
-}
-
-do_deploy() {
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME}
- cd ${DEPLOY_DIR_IMAGE}
- ln -sf ${KERNEL_DEPLOY_NAME} ${KERNEL_SYMLINK_NAME}
- #tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_package after do_install
diff --git a/meta-extras/packages/madplay/madplay_0.15.2b.bb b/meta-extras/packages/madplay/madplay_0.15.2b.bb
deleted file mode 100644
index d942b965e..000000000
--- a/meta-extras/packages/madplay/madplay_0.15.2b.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Madplay is a command-line MPEG audio decoder and player"
-SECTION = "console/multimedia"
-DEPENDS = "libmad"
-LICENSE = "GPL"
-AUTHOR = "Robert Leslie <rob@mars.org>"
-HOMEPAGE = "http://www.mars.org/home/rob/proj/mpeg/"
-
-SRC_URI = "ftp://ftp.mars.org/pub/mpeg/${PN}-${PV}.tar.gz"
-
-inherit autotools
-
-FILES_${PN} = "${bindir}/madplay"
diff --git a/meta-extras/packages/maemo-mapper/files/fix_segfault.patch b/meta-extras/packages/maemo-mapper/files/fix_segfault.patch
deleted file mode 100644
index 23730e8c0..000000000
--- a/meta-extras/packages/maemo-mapper/files/fix_segfault.patch
+++ /dev/null
@@ -1,31 +0,0 @@
- src/maemo-mapper.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-Index: trunk/src/maemo-mapper.c
-===================================================================
---- trunk.orig/src/maemo-mapper.c 2006-11-28 15:11:49.000000000 +0000
-+++ trunk/src/maemo-mapper.c 2006-11-28 22:40:19.000000000 +0000
-@@ -140,8 +140,8 @@
- #define HILDON_HARDKEY_RIGHT GDK_Right
- #define HILDON_HARDKEY_SELECT GDK_Return
- #define HILDON_HARDKEY_FULLSCREEN GDK_F10
--#define HILDON_HARDKEY_INCREASE GDK_F6
--#define HILDON_HARDKEY_DECREASE GDK_F5
-+#define HILDON_HARDKEY_INCREASE GDK_plus
-+#define HILDON_HARDKEY_DECREASE GDK_minus
- #define HILDON_HARDKEY_ESC GDK_Escape
- #define HILDON_COLOR_BUTTON GTK_COLOR_BUTTON
-
-@@ -3117,9 +3117,9 @@ set_conn_state(ConnState new_conn_state)
- gtk_widget_destroy(_fix_banner);
- _fix_banner = NULL;
- }
-- if(!_connect_banner)
-- _connect_banner = hildon_banner_show_animation(
-- _window, NULL, _("Searching for GPS receiver"));
-+// if(!_connect_banner)
-+// _connect_banner = hildon_banner_show_animation(
-+// _window, NULL, _("Searching for GPS receiver"));
- break;
- case RCVR_UP:
- if(_connect_banner)
diff --git a/meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb b/meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
deleted file mode 100644
index ceda4ff81..000000000
--- a/meta-extras/packages/maemo-mapper/maemo-mapper-nohildon_svn.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "GPS navigation/map display software"
-LICENSE = "GPL"
-DEPENDS = "sqlite3 gtk+ gnome-vfs dbus bluez-libs"
-RDEPENDS = "bluez-utils"
-PV = "1.2.4+svn${SRCDATE}"
-PR = "r1"
-
-# Only works with SRCDATE_maemo-mapper-nohildon = "20061114"
-SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \
- http://home.tal.org/%7Emilang/n770/maemo-mapper-desktop-20061114-001.patch;patch=1;pnum=0 \
- file://fix_segfault.patch;patch=1"
-
-S = "${WORKDIR}/trunk"
-
-inherit autotools pkgconfig
-
-do_install_append () {
- install -d ${D}${datadir}/applications/
- mv ${D}/maemo-mapper.desktop ${D}${datadir}/applications/
-}
-
-#FILES_${PN} += "${datadir}/icons"
diff --git a/meta-extras/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb b/meta-extras/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
deleted file mode 100644
index d868f148c..000000000
--- a/meta-extras/packages/matchbox-applet-inputmanager/matchbox-applet-inputmanager_0.6.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Matchbox input manager"
-LICENSE = "GPL"
-DEPENDS = "matchbox-wm libmatchbox"
-SECTION = "x11/wm"
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-input-manager/${PV}/mb-applet-input-manager-${PV}.tar.gz"
-S = "${WORKDIR}/mb-applet-input-manager-${PV}"
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps"
-
diff --git a/meta-extras/packages/matchbox-applet-light/matchbox-applet-light_svn.bb b/meta-extras/packages/matchbox-applet-light/matchbox-applet-light_svn.bb
deleted file mode 100644
index 3f1c2d02c..000000000
--- a/meta-extras/packages/matchbox-applet-light/matchbox-applet-light_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "GPLv2"
-PRIORITY = "optional"
-DEPENDS = "libmatchbox gtk+"
-PV = "0.0+svnr${SRCREV}"
-
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=mb-applet-light;proto=http"
-
-S = "${WORKDIR}/mb-applet-light"
-
-inherit autotools pkgconfig
diff --git a/meta-extras/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb b/meta-extras/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
deleted file mode 100644
index 68b224714..000000000
--- a/meta-extras/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Matchbox Startup monitor applet"
-LICENSE = "GPL"
-DEPENDS = "libmatchbox startup-notification"
-SECTION = "x11/wm"
-
-SRC_URI = "http://matchbox-project.org/sources/mb-applet-startup-monitor/${PV}/mb-applet-startup-monitor-${PV}.tar.gz"
-S = "${WORKDIR}/mb-applet-startup-monitor-${PV}"
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps"
diff --git a/meta-extras/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb b/meta-extras/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb
deleted file mode 100644
index e4b843f6b..000000000
--- a/meta-extras/packages/matchbox-applet-volume/matchbox-applet-volume_0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Matchbox Volume Applet"
-LICENSE = "GPL"
-DEPENDS = "matchbox-wm libmatchbox gtk+"
-SECTION = "x11/wm"
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-volume/${PV}/mb-applet-volume-${PV}.tar.gz"
-S = "${WORKDIR}/mb-applet-volume-${PV}"
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "${bindir} ${datadir}/applications ${datadir}/pixmaps"
-
diff --git a/meta-extras/packages/matchbox-common/matchbox-common_0.9.1.bb b/meta-extras/packages/matchbox-common/matchbox-common_0.9.1.bb
deleted file mode 100644
index 2927ccd08..000000000
--- a/meta-extras/packages/matchbox-common/matchbox-common_0.9.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "x11/wm"
-DESCRIPTION = "Matchbox window manager common files"
-LICENSE = "GPL"
-DEPENDS = "libmatchbox"
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--enable-pda-folders"
-
-FILES_${PN} = "${bindir} \
- ${datadir}/matchbox/vfolders \
- ${datadir}/pixmaps"
diff --git a/meta-extras/packages/matchbox-common/matchbox-common_svn.bb b/meta-extras/packages/matchbox-common/matchbox-common_svn.bb
deleted file mode 100644
index ec62ac05a..000000000
--- a/meta-extras/packages/matchbox-common/matchbox-common_svn.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SECTION = "x11/wm"
-DESCRIPTION = "Matchbox window manager common files"
-LICENSE = "GPL"
-DEPENDS = "libmatchbox"
-PV = "0.9.1+svnr${SRCREV}"
-S = "${WORKDIR}/matchbox-common"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-common;proto=http"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = " --enable-pda-folders "
-
-FILES_${PN} = "${bindir} \
- ${datadir}/matchbox/vfolders \
- ${datadir}/pixmaps"
diff --git a/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/home-panelapp.desktop b/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/home-panelapp.desktop
deleted file mode 100644
index 4e08dfd37..000000000
--- a/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/home-panelapp.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Home
-Comment=Home
-Exec=mb-applet-home
-Type=PanelApp
-Icon=xrandr.png
-Categories=Panel;Utility;MB
diff --git a/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/mb-applet-home b/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/mb-applet-home
deleted file mode 100755
index 132e72bdd..000000000
--- a/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/mb-applet-home
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec mb-applet-launcher -na -o -1 -l --title "Home" mbdesktop.png matchbox-remote -d
diff --git a/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.desktop b/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.desktop
deleted file mode 100644
index 512e3771e..000000000
--- a/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Screen Rotator
-Comment=Panel based Rotation tool.
-Exec=mb-applet-launcher -na -l --title "Screen Rotator" /usr/share/pixmaps/xrandr.png xrandr-panelapp.sh
-Type=PanelApp
-Icon=xrandr.png
-Categories=Panel;Utility;MB
diff --git a/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh b/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh
deleted file mode 100755
index d17c805ff..000000000
--- a/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-if [ -n "$(xrandr | grep rotation | grep left)" ]
-then
-xrandr -o normal
-xmodmap /etc/X11/xmodmap-portrait
-else
-xrandr -o left
-xmodmap /etc/X11/xmodmap-left
-fi
diff --git a/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png b/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png
deleted file mode 100644
index 08cd476e8..000000000
--- a/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr.png
+++ /dev/null
Binary files differ
diff --git a/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb b/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb
deleted file mode 100644
index 897585344..000000000
--- a/meta-extras/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Simple dockapps created with monolaunch and shell script"
-DEPENDS = "matchbox-common xmodmap"
-SRC_URI = "file://xrandr-panelapp.sh \
- file://xrandr-panelapp.desktop \
- file://mb-applet-home \
- file://home-panelapp.desktop \
- file://xrandr.png"
-SECTION = "x11/wm"
-PRIORITY = "optional"
-PR = "r8"
-LICENSE = "MIT"
-
-do_install() {
- install -d ${D}${bindir}
- install -d ${D}${datadir}/applications
- install -d ${D}${datadir}/pixmaps
- install -m 0755 ${WORKDIR}/xrandr-panelapp.sh ${D}${bindir}/
- install -m 0644 ${WORKDIR}/xrandr-panelapp.desktop ${D}${datadir}/applications/
- install -m 0644 ${WORKDIR}/xrandr.png ${D}${datadir}/pixmaps/
- install -m 0755 ${WORKDIR}/mb-applet-home ${D}${bindir}/
- install -m 0644 ${WORKDIR}/home-panelapp.desktop ${D}${datadir}/applications/
-
-}
diff --git a/meta-extras/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb b/meta-extras/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb
deleted file mode 100644
index fea6953ec..000000000
--- a/meta-extras/packages/matchbox-panel-manager/matchbox-panel-manager_0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Matchbox Panel Manager"
-LICENSE = "GPL"
-DEPENDS = "gtk+"
-SECTION = "x11/wm"
-
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.bz2"
-S = "${WORKDIR}/${PN}-${PV}"
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps"
-
diff --git a/meta-extras/packages/matchbox-panel/matchbox-panel.inc b/meta-extras/packages/matchbox-panel/matchbox-panel.inc
deleted file mode 100644
index f7d6b9338..000000000
--- a/meta-extras/packages/matchbox-panel/matchbox-panel.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "Matchbox Window Manager Panel"
-LICENSE = "GPL"
-DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
-RDEPENDS = "matchbox-common"
-SECTION = "x11/wm"
-
-PR = "r2"
-
-inherit autotools pkgconfig gettext
-
-CFLAGS += "-D_GNU_SOURCE"
-
-EXTRA_OECONF = " --enable-startup-notification --enable-dnotify "
-EXTRA_OECONF_append_h3600 = " --enable-small-icons "
-EXTRA_OECONF_append_h3900 = " --enable-small-icons "
-EXTRA_OECONF_append_h2200 = " --enable-small-icons "
-EXTRA_OECONF_append_h4000 = " --enable-small-icons "
-EXTRA_OECONF_append_collie = " --enable-small-icons "
-EXTRA_OECONF_append_poodle = " --enable-small-icons "
-EXTRA_OECONF_append_mnci = " --enable-small-icons "
-EXTRA_OECONF_append_integral13 = " --enable-small-icons "
-PACKAGE_ARCH = "${MACHINE}"
-
-FILES_${PN} = "${bindir}/* \
- ${datadir}/applications \
- ${datadir}/pixmaps"
-
diff --git a/meta-extras/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/meta-extras/packages/matchbox-panel/matchbox-panel_0.9.2.bb
deleted file mode 100644
index 2b5f4693a..000000000
--- a/meta-extras/packages/matchbox-panel/matchbox-panel_0.9.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require matchbox-panel.inc
-
-PR="r3"
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz"
-
-
diff --git a/meta-extras/packages/matchbox-panel/matchbox-panel_svn.bb b/meta-extras/packages/matchbox-panel/matchbox-panel_svn.bb
deleted file mode 100644
index 50182dacc..000000000
--- a/meta-extras/packages/matchbox-panel/matchbox-panel_svn.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require matchbox-panel.inc
-PV = "0.9.2+svnr${SRCREV}"
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
-
-EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
-
-S = "${WORKDIR}/${PN}"
diff --git a/meta-extras/packages/mc/mc_4.6.0.bb b/meta-extras/packages/mc/mc_4.6.0.bb
deleted file mode 100644
index 6636c6747..000000000
--- a/meta-extras/packages/mc/mc_4.6.0.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "GNU Midnight Commander is a file \
-manager for free operating systems."
-HOMEPAGE = "http://www.ibiblio.org/mc/"
-LICENSE = "GPLv2"
-SECTION = "console/utils"
-PRIORITY = "optional"
-DEPENDS = "ncurses glib-2.0"
-RDEPENDS = "ncurses-terminfo"
-
-SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-${PV}.tar.gz"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-glibtest --without-x --without-samba \
---without-nfs --without-gpm-mouse"
-
-do_configure() {
- gnu-configize
- oe_runconf
-}
-
-do_install() {
- cd src
- oe_runmake 'DESTDIR=${D}' install
- cd ../syntax
- oe_runmake 'DESTDIR=${D}' install
- cd ../po
- oe_runmake 'DESTDIR=${D}' install
- cd ../vfs
- oe_runmake 'DESTDIR=${D}' install
- cd ..
-}
diff --git a/meta-extras/packages/minicom/minicom-2.1/configure.patch b/meta-extras/packages/minicom/minicom-2.1/configure.patch
deleted file mode 100644
index 4db47fb3d..000000000
--- a/meta-extras/packages/minicom/minicom-2.1/configure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: minicom-2.1/configure.in
-===================================================================
---- minicom-2.1.orig/configure.in 2003-04-29 21:08:25.000000000 +0000
-+++ minicom-2.1/configure.in 2005-07-04 19:03:32.000000000 +0000
-@@ -231,9 +231,9 @@
- AC_HEADER_STAT
- AC_HEADER_TIME
-
--AM_SYS_POSIX_TERMIOS
-+AC_SYS_POSIX_TERMIOS
- AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
--if test $am_cv_sys_posix_termios = yes; then
-+if test $ac_cv_sys_posix_termios = yes; then
- AC_DEFINE(POSIX_TERMIOS)
- fi
-
-@@ -253,7 +253,7 @@
-
- dnl Checks for library functions.
- AC_TYPE_SIGNAL
--AM_FUNC_ERROR_AT_LINE
-+AC_FUNC_ERROR_AT_LINE
- AC_FUNC_CLOSEDIR_VOID
- AM_WITH_DMALLOC
- AC_CHECK_FUNCS(getcwd getwd strerror strstr vsnprintf vprintf)
diff --git a/meta-extras/packages/minicom/minicom-2.1/gcc4-scope.patch b/meta-extras/packages/minicom/minicom-2.1/gcc4-scope.patch
deleted file mode 100644
index 5bd47bd35..000000000
--- a/meta-extras/packages/minicom/minicom-2.1/gcc4-scope.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- minicom-2.1/src/window.c.orig 2006-06-14 17:49:53.000000000 +0200
-+++ minicom-2.1/src/window.c 2006-06-14 17:50:14.000000000 +0200
-@@ -62,7 +62,7 @@
- static char *CS, *SF, *SR, *VB, *BL;
- static char *VE, *VI, *KS, *KE;
- static char *CD, *CL, *IC, *DC;
--static char *BC, *CR, *NL;
-+static char *mcBC, *CR, *NL;
- #if ST_LINE
- static char *TS, *FS, *DS;
- #endif
-@@ -322,8 +322,8 @@
- else if (NL != CNULL && x == 0 && x == curx && y == cury + 1)
- outstr(NL);
- #endif
-- else if (BC != CNULL && y == cury && x == curx - 1)
-- outstr(BC);
-+ else if (mcBC != CNULL && y == cury && x == curx - 1)
-+ outstr(mcBC);
- else
- outstr(tgoto(CM, x, y));
- curx = x;
-@@ -1918,7 +1918,7 @@
- CL = tgetstr("cl", &_tptr);
- IC = tgetstr("ic", &_tptr);
- DC = tgetstr("dc", &_tptr);
-- BC = tgetstr("bc", &_tptr);
-+ mcBC = tgetstr("bc", &_tptr);
- CR = tgetstr("cr", &_tptr);
- NL = tgetstr("nl", &_tptr);
- AC = tgetstr("ac", &_tptr);
-@@ -1967,10 +1967,10 @@
- _has_am = tgetflag("am");
- _mv_standout = tgetflag("ms");
- if (tgetflag("bs")) {
-- if (BC == CNULL) BC = "\b";
-+ if (mcBC == CNULL) mcBC = "\b";
- }
- else
-- BC = CNULL;
-+ mcBC = CNULL;
-
- /* Special IBM box-drawing characters */
- D_UL = 201;
diff --git a/meta-extras/packages/minicom/minicom_2.1.bb b/meta-extras/packages/minicom/minicom_2.1.bb
deleted file mode 100644
index c4a1c3018..000000000
--- a/meta-extras/packages/minicom/minicom_2.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SECTION = "console/network"
-DEPENDS = "ncurses"
-LICENSE = "GPL"
-SRC_URI = "http://alioth.debian.org/download.php/123/minicom-${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://gcc4-scope.patch;patch=1"
-
-inherit autotools gettext
-
-do_install() {
- for d in doc extras man intl lib src; do make -C $d DESTDIR=${D} install; done
-}
diff --git a/meta-extras/packages/notification-daemon/files/no-wnck-sexy.patch b/meta-extras/packages/notification-daemon/files/no-wnck-sexy.patch
deleted file mode 100644
index 3367292e1..000000000
--- a/meta-extras/packages/notification-daemon/files/no-wnck-sexy.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -ur notification-daemon-0.3.7.orig/configure.ac notification-daemon-0.3.7/configure.ac
---- notification-daemon-0.3.7.orig/configure.ac 2007-02-28 05:16:16.000000000 +0000
-+++ notification-daemon-0.3.7/configure.ac 2008-01-18 11:29:28.000000000 +0000
-@@ -82,9 +82,7 @@
- glib-2.0 >= $REQ_GLIB_VERSION, \
- dbus-1 >= $REQ_DBUS_VERSION, \
- dbus-glib-1 >= $REQ_DBUS_VERSION, \
-- libsexy >= $REQ_SEXY_VERSION, \
-- gconf-2.0, \
-- libwnck-1.0 \
-+ gconf-2.0 \
- "
- PKG_CHECK_MODULES(NOTIFICATION_DAEMON, $pkg_modules)
- AC_SUBST(NOTIFICATION_DAEMON_CFLAGS)
-Only in notification-daemon-0.3.7/: configure.ac~
-Only in notification-daemon-0.3.7.orig/: debian
-diff -ur notification-daemon-0.3.7.orig/src/daemon/daemon.c notification-daemon-0.3.7/src/daemon/daemon.c
---- notification-daemon-0.3.7.orig/src/daemon/daemon.c 2007-02-15 10:47:09.000000000 +0000
-+++ notification-daemon-0.3.7/src/daemon/daemon.c 2008-01-18 11:24:40.000000000 +0000
-@@ -39,9 +39,6 @@
- #include <X11/Xatom.h>
- #include <gdk/gdkx.h>
-
--#define WNCK_I_KNOW_THIS_IS_UNSTABLE
--#include <libwnck/libwnck.h>
--
- #include "daemon.h"
- #include "engines.h"
- #include "stack.h"
-@@ -771,37 +768,6 @@
- static gboolean
- fullscreen_window_exists(GtkWidget *nw)
- {
-- WnckScreen *wnck_screen;
-- GList *l;
--
-- wnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(
-- gdk_drawable_get_screen(GDK_DRAWABLE(GTK_WIDGET(nw)->window))));
-- wnck_screen_force_update(wnck_screen);
--
-- for (l = wnck_screen_get_windows_stacked(wnck_screen);
-- l != NULL;
-- l = l->next)
-- {
-- WnckWindow *wnck_win = (WnckWindow *)l->data;
--
-- if (wnck_window_is_fullscreen(wnck_win))
-- {
-- /*
-- * Sanity check if the window is _really_ fullscreen to
-- * work around a bug in libwnck that doesn't get all
-- * unfullscreen events.
-- */
-- int sw = wnck_screen_get_width(wnck_screen);
-- int sh = wnck_screen_get_height(wnck_screen);
-- int x, y, w, h;
--
-- wnck_window_get_geometry(wnck_win, &x, &y, &w, &h);
--
-- if (sw == w && sh == h)
-- return TRUE;
-- }
-- }
--
- return FALSE;
- }
-
-Only in notification-daemon-0.3.7/src/daemon: daemon.c~
-diff -ur notification-daemon-0.3.7.orig/src/themes/standard/theme.c notification-daemon-0.3.7/src/themes/standard/theme.c
---- notification-daemon-0.3.7.orig/src/themes/standard/theme.c 2007-01-26 04:20:15.000000000 +0000
-+++ notification-daemon-0.3.7/src/themes/standard/theme.c 2008-01-18 11:34:58.000000000 +0000
-@@ -1,7 +1,6 @@
- #include "config.h"
-
- #include <gtk/gtk.h>
--#include <libsexy/sexy-url-label.h>
-
- typedef void (*ActionInvokedCb)(GtkWindow *nw, const char *key);
- typedef void (*UrlClickedCb)(GtkWindow *nw, const char *url);
-@@ -799,7 +798,7 @@
- gtk_widget_show(vbox);
- gtk_box_pack_start(GTK_BOX(windata->content_hbox), vbox, TRUE, TRUE, 0);
-
-- windata->body_label = sexy_url_label_new();
-+ windata->body_label = gtk_label_new(NULL);
- gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, TRUE, TRUE, 0);
- gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
- gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
-@@ -874,7 +873,7 @@
- gtk_label_set_markup(GTK_LABEL(windata->summary_label), str);
- g_free(str);
-
-- sexy_url_label_set_markup(SEXY_URL_LABEL(windata->body_label), body);
-+ gtk_label_set_markup(GTK_LABEL(windata->body_label), body);
-
- if (body == NULL || *body == '\0')
- gtk_widget_hide(windata->body_label);
-Only in notification-daemon-0.3.7/src/themes/standard: theme.c~
diff --git a/meta-extras/packages/notification-daemon/notification-daemon_0.3.7.bb b/meta-extras/packages/notification-daemon/notification-daemon_0.3.7.bb
deleted file mode 100644
index f443e307c..000000000
--- a/meta-extras/packages/notification-daemon/notification-daemon_0.3.7.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "A dbus service that listens to desktop notification requests and displays them"
-HOMEPAGE = "http://www.galago-project.org/"
-SECTION = "x11"
-LICENSE = "GPL"
-DEPENDS = "dbus gtk+ gconf"
-
-SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
- file://no-wnck-sexy.patch;patch=1"
-
-EXTRA_OECONF = "--disable-binreloc"
-
-inherit autotools pkgconfig
-
-FILES_${PN} = "\
- ${libexecdir}/notification-daemon \
- ${datadir}/dbus-1/services/ \
- ${libdir}/notification-daemon-1.0/engines/*.so \
- ${sysconfdir}/gconf/schemas/notification-daemon.schemas \
-"
-
-FILES_${PN}-dbg += "${libexecdir}/.debug ${libdir}/notification-daemon-1.0/engines/.debug"
diff --git a/meta-extras/packages/qemu/qemu-android-native.bb b/meta-extras/packages/qemu/qemu-android-native.bb
deleted file mode 100644
index 169d79086..000000000
--- a/meta-extras/packages/qemu/qemu-android-native.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-LICENSE = "GPL"
-DEPENDS = "zlib-native"
-PV = "0.0-rc20"
-PR = "r0"
-
-SRC_URI = "http://android.googlecode.com/files/android-emulator-m3-rc20.tar.bz2 \
- file://fixes.patch;patch=1"
-
-S = "${WORKDIR}/android-emulator-20071111/qemu"
-
-EXTRA_OECONF = "--disable-gfx-check --target-list=arm-softmmu --enable-nand --enable-skins --enable-trace --enable-shaper --use-sdl-config=${prefix}/hackedsdl/bin/sdl-config --disable-user --disable-kqemu --enable-sdl --static-png --static-sdl"
-
-inherit autotools
-inherit native
-
-do_unfubar () {
- chmod -R u+w ${WORKDIR}/
- cd ${WORKDIR}/android-emulator-20071111/sdl
- configure --prefix=${prefix}/hackedsdl
- make
- make install
-}
-
-addtask unfubar after do_unpack before do_patch
-
diff --git a/meta-extras/packages/qemu/qemu-android-native/fixes.patch b/meta-extras/packages/qemu/qemu-android-native/fixes.patch
deleted file mode 100644
index 5d16b6061..000000000
--- a/meta-extras/packages/qemu/qemu-android-native/fixes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: qemu/linux-user/elfload.c
-===================================================================
---- qemu.orig/linux-user/elfload.c 2007-11-12 06:58:42.000000000 +0000
-+++ qemu/linux-user/elfload.c 2007-11-12 20:41:37.000000000 +0000
-@@ -12,6 +12,10 @@
- #include "qemu.h"
- #include "disas.h"
-
-+#ifndef O_BINARY
-+#define O_BINARY 0
-+#endif
-+
- /* this flag is uneffective under linux too, should be deleted */
- #ifndef MAP_DENYWRITE
- #define MAP_DENYWRITE 0
-Index: qemu/linux-user/linuxload.c
-===================================================================
---- qemu.orig/linux-user/linuxload.c 2007-11-12 06:58:42.000000000 +0000
-+++ qemu/linux-user/linuxload.c 2007-11-12 20:35:16.000000000 +0000
-@@ -12,6 +12,10 @@
-
- #define NGROUPS 32
-
-+#ifndef O_BINARY
-+#define O_BINARY 0
-+#endif
-+
- /* ??? This should really be somewhere else. */
- void memcpy_to_target(target_ulong dest, const void *src,
- unsigned long len)
-Index: qemu/hw/qfb_fs.c
-===================================================================
---- qemu.orig/hw/qfb_fs.c 2007-11-12 06:58:41.000000000 +0000
-+++ qemu/hw/qfb_fs.c 2007-11-12 20:59:34.000000000 +0000
-@@ -14,6 +14,10 @@
- #include <sys/xattr.h>
- #include <errno.h>
-
-+#ifndef O_BINARY
-+#define O_BINARY 0
-+#endif
-+
- /* all mount paths */
- static int next_path_index = 0;
- static struct mount_path mount_paths[MAX_MOUNT_PATHS];
diff --git a/meta-extras/packages/syslog-ng/files/initscript b/meta-extras/packages/syslog-ng/files/initscript
deleted file mode 100644
index b95e8adc2..000000000
--- a/meta-extras/packages/syslog-ng/files/initscript
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-#
-# This is an init script for openembedded
-# Copy it to /etc/init.d/syslog-ng and type
-# > update-rc.d syslog-ng defaults 5
-#
-
-
-syslog_ng=/usr/sbin/syslog-ng
-test -x "$syslog_ng" || exit 0
-
-case "$1" in
- start)
- echo -n "Starting syslog-ng:"
- start-stop-daemon --start --quiet --exec $syslog_ng
- echo "."
- ;;
- stop)
- echo -n "Stopping syslog-ng:"
- start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid
- echo "."
- ;;
- reload|force-reload)
- start-stop-daemon --stop --quiet --signal 1 --exec $syslog_ng
- ;;
- restart)
- echo "Stopping syslog-ng:"
- start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid
- echo -n "Waiting for syslog-ng to die off"
- for i in 1 2 3 ;
- do
- sleep 1
- echo -n "."
- done
- echo ""
- echo -n "Starting syslog-ng:"
- start-stop-daemon --start --quiet --exec $syslog_ng
- echo "."
- ;;
- *)
- echo "Usage: /etc/init.d/syslog-ng {start|stop|reload|restart|force-reload}"
- exit 1
-esac
-
-exit 0
diff --git a/meta-extras/packages/syslog-ng/files/syslog-ng.conf b/meta-extras/packages/syslog-ng/files/syslog-ng.conf
deleted file mode 100644
index 4d1e9f8b2..000000000
--- a/meta-extras/packages/syslog-ng/files/syslog-ng.conf
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# Syslog-ng example configuration for for Debian GNU/Linux
-#
-# Copyright (c) 1999 anonymous
-# Copyright (c) 1999 Balazs Scheidler
-# $Id: syslog-ng.conf.sample,v 1.3 2003/05/20 08:57:27 asd Exp $
-#
-# Syslog-ng configuration file, compatible with default Debian syslogd
-# installation.
-#
-
-options { long_hostnames(off); sync(0); };
-
-source src { file("/proc/kmsg"); unix-stream("/dev/log"); internal(); };
-source net { udp(); };
-
-destination authlog { file("/var/log/auth.log"); };
-destination syslog { file("/var/log/syslog"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-destination ppp { file("/var/log/ppp.log"); };
-destination mail { file("/var/log/mail.log"); };
-
-destination mailinfo { file("/var/log/mail.info"); };
-destination mailwarn { file("/var/log/mail.warn"); };
-destination mailerr { file("/var/log/mail.err"); };
-
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-destination debug { file("/var/log/debug"); };
-destination messages { file("/var/log/messages"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-#destination loghost { udp("loghost" port(999)); };
-
-
-destination xconsole { pipe("/dev/xconsole"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kern { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_user { facility(user); };
-filter f_uucp { facility(cron); };
-filter f_ppp { facility(local2); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn)
- and not facility(auth, authpriv, mail, news); };
-filter f_emergency { level(emerg); };
-
-filter f_info { level(info); };
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(src); filter(f_kern); destination(kern); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
-log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
-log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
-log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
-log { source(src); filter(f_news); filter(f_err); destination(newserr); };
-log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-log { source(src); filter(f_ppp); destination(ppp); };
-log { source(src); destination(console_all); };
-
-
diff --git a/meta-extras/packages/syslog-ng/syslog-ng_2.0.5.bb b/meta-extras/packages/syslog-ng/syslog-ng_2.0.5.bb
deleted file mode 100644
index 0d13b922f..000000000
--- a/meta-extras/packages/syslog-ng/syslog-ng_2.0.5.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Alternative system logger daemon"
-DEPENDS = "libol flex eventlog glib-2.0"
-PR = "r1"
-
-SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/${P}.tar.gz \
- file://syslog-ng.conf \
- file://initscript"
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-inherit autotools update-rc.d
-
-EXTRA_OECONF = "--with-libol=${STAGING_BINDIR_CROSS}/ --enable-dynamic-linking"
-
-do_install_append() {
- install -d ${D}/${sysconfdir}/${PN}
- install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/syslog-ng.conf
- install -d ${D}/${sysconfdir}/init.d
- install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog-ng
-}
-
-pkg_postinst() {
- update-rc.d -f syslog remove
-}
-
-pkg_postrm() {
- update-rc.d syslog add 5
-}
-
-CONFFILES_${PN} = "${sysconfdir}/syslog-ng.conf"
-
-INITSCRIPT_NAME = "syslog-ng"
-#INITSCRIPT_PARAMS = "defaults 05"
-INITSCRIPT_PARAMS = "remove"
diff --git a/meta-extras/packages/tasks/task-poky-extras.bb b/meta-extras/packages/tasks/task-poky-extras.bb
deleted file mode 100644
index c983beda9..000000000
--- a/meta-extras/packages/tasks/task-poky-extras.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-PACKAGES = "task-poky-extraapps"
-DESCRIPTION = "Extras Tasks for OpenedHand Poky"
-
-ALLOW_EMPTY = "1"
-
-RDEPENDS_task-poky-extraapps = "\
- madplay \
- maemo-mapper-nohildon \
- mc"
diff --git a/meta-extras/packages/twisted/twisted-2.5.0/remove-zope-check.patch b/meta-extras/packages/twisted/twisted-2.5.0/remove-zope-check.patch
deleted file mode 100644
index 2bd1b191d..000000000
--- a/meta-extras/packages/twisted/twisted-2.5.0/remove-zope-check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: Twisted-2.5.0/TwistedCore-2.5.0/twisted/__init__.py
-===================================================================
---- Twisted-2.5.0.orig/TwistedCore-2.5.0/twisted/__init__.py 2007-03-05 16:30:08.117422472 +0100
-+++ Twisted-2.5.0/TwistedCore-2.5.0/twisted/__init__.py 2007-03-05 16:30:13.810553949 +0100
-@@ -14,13 +14,6 @@
- raise RuntimeError("Twisted requires Python 2.3 or later.")
- del sys
-
--# Ensure zope.interface is installed
--try:
-- from zope.interface import Interface
-- del Interface
--except ImportError:
-- raise ImportError("you need zope.interface installed "
-- "(http://zope.org/Products/ZopeInterface/)")
-
- # Ensure compat gets imported
- from twisted.python import compat
diff --git a/meta-extras/packages/twisted/twisted_2.5.0.bb b/meta-extras/packages/twisted/twisted_2.5.0.bb
deleted file mode 100644
index e00b351b2..000000000
--- a/meta-extras/packages/twisted/twisted_2.5.0.bb
+++ /dev/null
@@ -1,175 +0,0 @@
-DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
-Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols \
-(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
-HOMEPAGE = "http://www.twistedmatrix.com"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-RDEPENDS = "python-core python-zopeinterface"
-RDEPENDS_python-twisted += "python-twisted-bin python-twisted-conch python-twisted-core \
- python-twisted-lore python-twisted-mail python-twisted-names \
- python-twisted-news python-twisted-runner python-twisted-web \
- python-twisted-words"
-PR = "r5"
-
-SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-${PV}.tar.bz2 \
- file://remove-zope-check.patch;patch=1"
-
-S = "${WORKDIR}/Twisted-${PV}"
-
-inherit distutils
-
-PACKAGES += "python-twisted-zsh python-twisted-test python-twisted-protocols \
- python-twisted-bin python-twisted-conch python-twisted-lore \
- python-twisted-mail python-twisted-names python-twisted-news python-twisted-runner \
- python-twisted-web python-twisted-words python-twisted python-twisted-core \
- "
-
-ALLOW_EMPTY = "1"
-FILES_${PN} = ""
-FILES_python-twisted = ""
-
-FILES_python-twisted-test = " \
-${libdir}/python2.4/site-packages/twisted/python/web/test \
-"
-
-FILES_python-twisted-protocols = " \
-${libdir}/python2.4/site-packages/twisted/python/protocols/ \
-"
-
-FILES_python-twisted-zsh = " \
-${libdir}/python2.4/site-packages/twisted/python/zsh \
-${libdir}/python2.4/site-packages/twisted/python/zshcomp.* \
-"
-
-FILES_python-twisted-bin = " \
-${libdir}/python2.4/site-packages/twisted/protocols/_c_urlarg.so \
-${libdir}/python2.4/site-packages/twisted/spread/cBanana.so"
-
-FILES_python-twisted-conch = " \
-${bindir}/ckeygen \
-${bindir}/tkconch \
-${bindir}/conch \
-${bindir}/conchftp \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_conch.py \
-${libdir}/python2.4/site-packages/twisted/conch \
-"
-
-FILES_python-twisted-core = " \
-${bindir}/manhole \
-${bindir}/mktap \
-${bindir}/twistd \
-${bindir}/tap2deb \
-${bindir}/tap2rpm \
-${bindir}/tapconvert \
-${bindir}/tkmktap \
-${bindir}/trial \
-${libdir}/python2.4/site-packages/twisted/*.py \
-${libdir}/python2.4/site-packages/twisted/plugins/__init__.py \
-${libdir}/python2.4/site-packages/twisted/plugins/notestplugin.py \
-${libdir}/python2.4/site-packages/twisted/plugins/testplugin.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_ftp.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_inet.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_manhole.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_portforward.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_socks.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_telnet.py \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_trial.py \
-${libdir}/python2.4/site-packages/twisted/plugins/dropin.cache \
-${libdir}/python2.4/site-packages/twisted/application \
-${libdir}/python2.4/site-packages/twisted/cred \
-${libdir}/python2.4/site-packages/twisted/enterprise \
-${libdir}/python2.4/site-packages/twisted/internet \
-${libdir}/python2.4/site-packages/twisted/manhole \
-${libdir}/python2.4/site-packages/twisted/manhole \
-${libdir}/python2.4/site-packages/twisted/persisted \
-${libdir}/python2.4/site-packages/twisted/protocols\
-${libdir}/python2.4/site-packages/twisted/python\
-${libdir}/python2.4/site-packages/twisted/python/timeoutqueue.py \
-${libdir}/python2.4/site-packages/twisted/python/filepath.py \
-${libdir}/python2.4/site-packages/twisted/python/dxprofile.py \
-${libdir}/python2.4/site-packages/twisted/python/plugin.py \
-${libdir}/python2.4/site-packages/twisted/python/htmlizer.py \
-${libdir}/python2.4/site-packages/twisted/python/__init__.py \
-${libdir}/python2.4/site-packages/twisted/python/dispatch.py \
-${libdir}/python2.4/site-packages/twisted/python/hook.py \
-${libdir}/python2.4/site-packages/twisted/python/threadpool.py \
-${libdir}/python2.4/site-packages/twisted/python/otp.py \
-${libdir}/python2.4/site-packages/twisted/python/usage.py \
-${libdir}/python2.4/site-packages/twisted/python/roots.py \
-${libdir}/python2.4/site-packages/twisted/python/versions.py \
-${libdir}/python2.4/site-packages/twisted/python/urlpath.py \
-${libdir}/python2.4/site-packages/twisted/python/util.py \
-${libdir}/python2.4/site-packages/twisted/python/components.py \
-${libdir}/python2.4/site-packages/twisted/python/logfile.py \
-${libdir}/python2.4/site-packages/twisted/python/runtime.py \
-${libdir}/python2.4/site-packages/twisted/python/reflect.py \
-${libdir}/python2.4/site-packages/twisted/python/context.py \
-${libdir}/python2.4/site-packages/twisted/python/threadable.py \
-${libdir}/python2.4/site-packages/twisted/python/rebuild.py \
-${libdir}/python2.4/site-packages/twisted/python/failure.py \
-${libdir}/python2.4/site-packages/twisted/python/lockfile.py \
-${libdir}/python2.4/site-packages/twisted/python/formmethod.py \
-${libdir}/python2.4/site-packages/twisted/python/finalize.py \
-${libdir}/python2.4/site-packages/twisted/python/win32.py \
-${libdir}/python2.4/site-packages/twisted/python/dist.py \
-${libdir}/python2.4/site-packages/twisted/python/shortcut.py \
-${libdir}/python2.4/site-packages/twisted/python/zipstream.py \
-${libdir}/python2.4/site-packages/twisted/python/release.py \
-${libdir}/python2.4/site-packages/twisted/python/syslog.py \
-${libdir}/python2.4/site-packages/twisted/python/log.py \
-${libdir}/python2.4/site-packages/twisted/python/compat.py \
-${libdir}/python2.4/site-packages/twisted/python/zshcomp.py \
-${libdir}/python2.4/site-packages/twisted/python/procutils.py \
-${libdir}/python2.4/site-packages/twisted/python/text.py \
-${libdir}/python2.4/site-packages/twisted/python/_twisted_zsh_stub \
-${libdir}/python2.4/site-packages/twisted/scripts/ \
-${libdir}/python2.4/site-packages/twisted/spread/ \
-${libdir}/python2.4/site-packages/twisted/tap/ \
-${libdir}/python2.4/site-packages/twisted/trial/ \
-${libdir}/python2.4/site-packages/twisted/__init__.py \
-${libdir}/python2.4/site-packages/twisted/_version.py \
-${libdir}/python2.4/site-packages/twisted/copyright.py \
-${libdir}/python2.4/site-packages/twisted/im.py \
-${libdir}/python2.4/site-packages/twisted/plugin.py \
-"
-
-FILES_python-twisted-lore = " \
-${bindir}/bookify \
-${bindir}/lore \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_lore.py \
-${libdir}/python2.4/site-packages/twisted/lore \
-"
-
-FILES_python-twisted-mail = " \
-${bindir}/mailmail \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_mail.py \
-${libdir}/python2.4/site-packages/twisted/mail \
-"
-
-FILES_python-twisted-names = " \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_names.py \
-${libdir}/python2.4/site-packages/twisted/names \
-"
-
-FILES_python-twisted-news = " \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_news.py \
-${libdir}/python2.4/site-packages/twisted/news \
-"
-
-FILES_python-twisted-runner = " \
-${libdir}python2.4/site-packages/twisted/runner/portmap.so \
-${libdir}/python2.4/site-packages/twisted/runner\
-"
-
-FILES_python-twisted-web = " \
-${bindir}/websetroot \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_web.py \
-${libdir}/python2.4/site-packages/twisted/web\
-"
-
-FILES_python-twisted-words = " \
-${bindir}/im \
-${libdir}/python2.4/site-packages/twisted/plugins/twisted_words.py \
-${libdir}/python2.4/site-packages/twisted/words\
-"
diff --git a/meta-extras/packages/zope/zope_3.3.1.bb b/meta-extras/packages/zope/zope_3.3.1.bb
deleted file mode 100644
index 283cb18d0..000000000
--- a/meta-extras/packages/zope/zope_3.3.1.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "A full fledged pluggable content management system with integrated web server and much more."
-SECTION = "console/network"
-PRIORITY = "optional"
-DEPENDS = "python"
-RDEPENDS = "python-core python-shell"
-LICENSE = "ZPL"
-PR = "r3"
-
-SRC_URI = "http://www.zope.org/Products/Zope3/${PV}/Zope-${PV}.tgz"
-
-S = "${WORKDIR}/Zope-${PV}"
-
-do_configure() {
- ./configure --with-python=${STAGING_BINDIR_NATIVE}/python --prefix=${prefix} --force
-}
-
-do_compile() {
- oe_runmake HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS} STAGING_INCDIR=${STAGING_INCDIR} STAGING_LIBDIR=${STAGING_LIBDIR}
-}
-
-PYTHON_MAJMIN = "2.5"
-
-do_install() {
- install -d ${D}${libdir}/python${PYTHON_MAJMIN}
- oe_runmake install prefix=${D}${prefix} HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS} STAGING_INCDIR=${STAGING_INCDIR} STAGING_LIBDIR=${STAGING_LIBDIR}
- mv ${D}${libdir}/python/* ${D}${libdir}/python${PYTHON_MAJMIN}
-}
-
-PACKAGES =+ "python-zopeinterface python-zopeinterface-dbg"
-
-FILES_${PN} = "${prefix}"
-FILES_${PN}_doc = "${prefix}/doc"
-FILES_${PN}-dbg += "\
-${libdir}/python${PYTHON_MAJMIN}/BTrees/.debug \
-${libdir}/python${PYTHON_MAJMIN}/persistent/.debug \
-${libdir}/python${PYTHON_MAJMIN}/zope/proxy/.debug \
-${libdir}/python${PYTHON_MAJMIN}/zope/thread/.debug \
-${libdir}/python${PYTHON_MAJMIN}/zope/security/.debug \
-${libdir}/python${PYTHON_MAJMIN}/zope/hookable/.debug \
-${libdir}/python${PYTHON_MAJMIN}/zope/app/container/.debug \
-${libdir}/python${PYTHON_MAJMIN}/zope/i18nmessageid/.debug \
-${libdir}/python${PYTHON_MAJMIN}/ZODB/.debug"
-FILES_python-zopeinterface-dbg += "${libdir}/python${PYTHON_MAJMIN}/zope/interface/.debug "
-
-FILES_python-zopeinterface = "${libdir}/python${PYTHON_MAJMIN}/zope/interface/*.* ${libdir}/python${PYTHON_MAJMIN}/zope/interface/common"