diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-18 12:45:56 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-04-18 12:45:56 +0000 |
| commit | ae09e2d5082b42d6ea608b07f2e207789a00cd9f (patch) | |
| tree | b31ae7f0f1fb06ce248a29823583408f3ed6b3c4 /packages | |
| parent | 781a49f886ad413031e273be8458ec4b77ad2322 (diff) | |
| parent | 4b276fbe128b0eeb6e4fb43c5d2896287487265c (diff) | |
merge of '2a9f522bb79ea664167e746c79c80fe0d104c20f'
and 'b2448d9d2bf369b829dab2b33b95bd7d54fcf1f4'
Diffstat (limited to 'packages')
102 files changed, 1002 insertions, 473 deletions
diff --git a/packages/altboot/altboot_1.0.5.bb b/packages/altboot/altboot_1.0.5.bb index 3a8a0a74b7..15850e5bdc 100644 --- a/packages/altboot/altboot_1.0.5.bb +++ b/packages/altboot/altboot_1.0.5.bb @@ -1,7 +1,7 @@ #! /bin/sh # # Copyright Matthias Hentges <devel@hentges.net> (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# License: MIT (see COPYING.MIT) # # Filename: altboot_1.0.5-rc2.bb # Date: 21-Feb-06 diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb index aed66b47a8..9544e6b5ac 100644 --- a/packages/altboot/altboot_1.0.8.bb +++ b/packages/altboot/altboot_1.0.8.bb @@ -1,7 +1,7 @@ #! /bin/sh # # Copyright Matthias Hentges <devel@hentges.net> (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# License: MIT (see COPYING.MIT) # # Filename: altboot_1.0.5-rc2.bb # Date: 21-Feb-06 diff --git a/packages/altboot/altboot_1.1.1+wip-20061123.bb b/packages/altboot/altboot_1.1.1+wip-20061123.bb index d857e5b454..bc96c670e9 100644 --- a/packages/altboot/altboot_1.1.1+wip-20061123.bb +++ b/packages/altboot/altboot_1.1.1+wip-20061123.bb @@ -1,7 +1,7 @@ #! /bin/sh # # Copyright Matthias Hentges <devel@hentges.net> (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# License: MIT (see COPYING.MIT) # # Filename: altboot_1.0.5-rc2.bb # Date: 21-Feb-06 diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR30.bb b/packages/altboot/altboot_1.1.1+wip-SVNR30.bb index 8b4a65a098..b3ccb70497 100644 --- a/packages/altboot/altboot_1.1.1+wip-SVNR30.bb +++ b/packages/altboot/altboot_1.1.1+wip-SVNR30.bb @@ -1,7 +1,7 @@ #! /bin/sh # # Copyright Matthias Hentges <devel@hentges.net> (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# License: MIT (see COPYING.MIT) # # Filename: altboot_1.0.5-rc2.bb # Date: 21-Feb-06 diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb index 18f73dd6ae..1c43be8fd8 100644 --- a/packages/altboot/altboot_svn.bb +++ b/packages/altboot/altboot_svn.bb @@ -1,7 +1,7 @@ #! /bin/sh # # Copyright Matthias Hentges <devel@hentges.net> (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# License: MIT (see COPYING.MIT) # # Filename: altboot_1.0.5-rc2.bb # Date: 21-Feb-06 diff --git a/packages/angstrom/angstrom-console-image.bb b/packages/angstrom/angstrom-console-image.bb index 8bd0fe07e7..e5a6dcc2a3 100644 --- a/packages/angstrom/angstrom-console-image.bb +++ b/packages/angstrom/angstrom-console-image.bb @@ -5,8 +5,7 @@ PR = "r4" ANGSTROM_EXTRA_INSTALL ?= "" DEPENDS = "task-base" -RDEPENDS = "task-base-core-default \ - task-base \ +RDEPENDS = "task-base \ ${ANGSTROM_EXTRA_INSTALL} \ " diff --git a/packages/angstrom/angstrom-e-image.bb b/packages/angstrom/angstrom-e-image.bb index da40f7e00c..4c9bb83507 100644 --- a/packages/angstrom/angstrom-e-image.bb +++ b/packages/angstrom/angstrom-e-image.bb @@ -1,6 +1,6 @@ #Angstrom e image LICENSE = "MIT" -PR = "r0" +PR = "r1" PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" @@ -21,7 +21,6 @@ export IMAGE_BASENAME = "e-image" DEPENDS = "task-base" RDEPENDS = "\ ${XSERVER} \ - task-base-core-default \ task-base \ angstrom-e-base-depends \ angstrom-e-depends \ diff --git a/packages/angstrom/angstrom-mokogateway-image.bb b/packages/angstrom/angstrom-mokogateway-image.bb index 80673f61ec..624274de37 100644 --- a/packages/angstrom/angstrom-mokogateway-image.bb +++ b/packages/angstrom/angstrom-mokogateway-image.bb @@ -1,32 +1,17 @@ #Angstrom moko gateway image # tries to be a companion for openmoko based phones LICENSE = "MIT" -PR = "r0" +PR = "r2" ANGSTROM_EXTRA_INSTALL ?= "" DEPENDS = "task-base" -RDEPENDS = "task-base-core-default \ - task-base \ +RDEPENDS = " \ + task-boot \ + task-base-bluetooth \ bluez-utils \ - blue-probe \ + blueprobe \ " -RRECOMMENDS = " \ - kernel-module-bluetooth \ - kernel-module-l2cap \ - kernel-module-rfcomm \ - kernel-module-hci-vhci \ - kernel-module-bnep \ - kernel-module-hidp \ - kernel-module-hci-uart \ - kernel-module-sco \ - ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-dtl1-cs", "",d)} \ - " - export IMAGE_BASENAME = "mokogateway-image" export IMAGE_LINGUAS = "" export PACKAGE_INSTALL = "${RDEPENDS}" diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb index dbb986ae65..c5d2675b60 100644 --- a/packages/angstrom/angstrom-x11-image.bb +++ b/packages/angstrom/angstrom-x11-image.bb @@ -1,6 +1,6 @@ #Angstrom X11 image LICENSE = "MIT" -PR = "r5" +PR = "r6" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -16,7 +16,6 @@ export IMAGE_BASENAME = "x11-image" DEPENDS = "task-base" RDEPENDS = "\ ${XSERVER} \ - task-base-core-default \ task-base \ angstrom-x11-base-depends \ angstrom-gpe-task-base \ diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb index 228c637158..eb9f025743 100644 --- a/packages/angstrom/task-angstrom-e.bb +++ b/packages/angstrom/task-angstrom-e.bb @@ -24,4 +24,4 @@ RDEPENDS_angstrom-e-depends := "\ gdk-pixbuf-loader-png \ gdk-pixbuf-loader-pnm \ gdk-pixbuf-loader-xbm \ - gdk-pixbuf-loader-xpm"
\ No newline at end of file + gdk-pixbuf-loader-xpm" diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index f427f15ab8..a5f9be1938 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -109,12 +109,13 @@ RDEPENDS_angstrom-task-office := "\ gnumeric \ abiword \ imposter \ -# evince \ + evince \ gqview" RDEPENDS_angstrom-task-printing := "\ cups \ - gnome-cups-manager" +# gnome-cups-manager \ + " RDEPENDS_angstrom-task-sectest := "\ nmap \ diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index eb4425d650..886a5a3d55 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -12,7 +12,7 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ file://02dtl1_cs.sh \ file://hciattach-ti-bts.patch;patch=1 \ - file://handle-eintr.patch;patch=1" + file://handle-eintr.patch;patch=1;status=applied" # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol # Let's default to that instead of 'any' until further notice... @@ -20,7 +20,7 @@ SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" S = "${WORKDIR}/bluez-utils-${PV}" -EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci --enable-cups" +EXTRA_OECONF = "--enable-initscripts --enable-bccmd --enable-bcm203x --enable-hid2hci --enable-cups" # --enable-obex enable OBEX support # --enable-alsa enable ALSA support # --enable-cups install CUPS backend support diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb index dce6648afe..e710e8c8f6 100644 --- a/packages/bluez/bluez-utils_3.9.bb +++ b/packages/bluez/bluez-utils_3.9.bb @@ -1,3 +1,3 @@ require bluez-utils.inc -PR = "r3" +PR = "r4" diff --git a/packages/gnome/gnome-desktop/.mtn2git_empty b/packages/gnome/gnome-desktop/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gnome/gnome-desktop/.mtn2git_empty diff --git a/packages/gnome/gnome-desktop/scrollkeeper.patch b/packages/gnome/gnome-desktop/scrollkeeper.patch new file mode 100644 index 0000000000..c1b7f3b44a --- /dev/null +++ b/packages/gnome/gnome-desktop/scrollkeeper.patch @@ -0,0 +1,17 @@ +Index: gnome-desktop-2.16.1/configure.in +=================================================================== +--- gnome-desktop-2.16.1.orig/configure.in 2006-10-02 19:00:52.000000000 +0000 ++++ gnome-desktop-2.16.1/configure.in 2007-04-12 21:12:36.000000000 +0000 +@@ -113,9 +113,9 @@ + dnl scrollkeeper checks + + AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) +-if test x$SCROLLKEEPER_CONFIG = xno; then +- AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package) +-fi ++dnl if test x$SCROLLKEEPER_CONFIG = xno; then ++dnl AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package) ++dnl fi + + dnl Language Support + diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb index 647e751c57..1e3e814d17 100644 --- a/packages/gnome/gnome-desktop_2.16.1.bb +++ b/packages/gnome/gnome-desktop_2.16.1.bb @@ -6,6 +6,9 @@ inherit gnome pkgconfig DEPENDS = "gnome-common gnome-doc-utils libgnomeui" +SRC_URI += "file://scrollkeeper.patch;patch=1" + +EXTRA_OECONF = "--disable-scrollkeeper" EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros" do_configure_prepend () { diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb index 18d6d3012a..f190a5ae13 100644 --- a/packages/gnome/gnome-doc-utils_0.7.1.bb +++ b/packages/gnome/gnome-doc-utils_0.7.1.bb @@ -5,6 +5,8 @@ PR = "r1" inherit gnome +EXTRA_OECONF = "--disable-scrollkeeper" + FILES_${PN} += "${datadir}/xml*" do_stage() { diff --git a/packages/gsm/files/numeric.patch b/packages/gsm/files/numeric.patch deleted file mode 100644 index cd1990cbe5..0000000000 --- a/packages/gsm/files/numeric.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: gsm/src/gsmd/atcmd.c -=================================================================== ---- gsm.orig/src/gsmd/atcmd.c 2007-04-02 09:59:16.000000000 +0200 -+++ gsm/src/gsmd/atcmd.c 2007-04-02 10:10:54.000000000 +0200 -@@ -207,7 +207,7 @@ - * TBD - */ - -- if (buf[0] == '+' || buf[0] == '%') { -+ if (buf[0] == '+' || buf[0] == '%' || buf[0] == '@') { - /* an extended response */ - const char *colon = strchr(buf, ':'); - if (!colon) { -@@ -269,14 +269,13 @@ - memcpy(cmd->buf, buf, len); - } - } else { -- if (!strcmp(buf, "RING")) { -+ if (!strcmp(buf, "RING") || buf[0] == '2') { - /* this is the only non-extended unsolicited return - * code, part of Case 'B' */ - return unsolicited_parse(g, buf, len, NULL); - } - -- if (!strcmp(buf, "ERROR") || -- ((g->flags & GSMD_FLAG_V0) && buf[0] == '4')) { -+ if (!strcmp(buf, "ERROR") || buf[0] == '4') { - /* Part of Case 'C' */ - DEBUGP("unspecified error\n"); - if (cmd) -@@ -285,8 +284,7 @@ - goto final_cb; - } - -- if (!strncmp(buf, "OK", 2) -- || ((g->flags & GSMD_FLAG_V0) && buf[0] == '0')) { -+ if (!strncmp(buf, "OK", 2) || buf[0] == '0') { - /* Part of Case 'C' */ - if (cmd) - cmd->ret = 0; -@@ -296,13 +294,13 @@ - - /* FIXME: handling of those special commands in response to - * ATD / ATA */ -- if (!strncmp(buf, "NO CARRIER", 11)) { -+ if (!strncmp(buf, "NO CARRIER", 11) || buf[0] == '3') { - /* Part of Case 'D' */ - final = 1; - goto final_cb; - } - -- if (!strncmp(buf, "BUSY", 4)) { -+ if (!strncmp(buf, "BUSY", 4) || buf[0] == '7') { - /* Part of Case 'D' */ - final = 1; - goto final_cb; diff --git a/packages/gsm/files/qualcomm-extreply.patch b/packages/gsm/files/qualcomm-extreply.patch new file mode 100644 index 0000000000..010a8c9f31 --- /dev/null +++ b/packages/gsm/files/qualcomm-extreply.patch @@ -0,0 +1,13 @@ +Index: gsm/src/gsmd/atcmd.c +=================================================================== +--- gsm.orig/src/gsmd/atcmd.c 2007-04-02 09:59:16.000000000 +0200 ++++ gsm/src/gsmd/atcmd.c 2007-04-02 10:10:54.000000000 +0200 +@@ -207,7 +207,7 @@ + * TBD + */ + +- if (buf[0] == '+' || buf[0] == '%') { ++ if (buf[0] == '+' || buf[0] == '%' || buf[0] == '@') { + /* an extended response */ + const char *colon = strchr(buf, ':'); + if (!colon) { diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 607d4db1be..0215bb92b9 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -11,10 +11,9 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://default" S = "${WORKDIR}/gsm" -SRC_URI_append_magician = "file://numeric.patch;patch=1 \ - file://plugin.patch;patch=1" -SRC_URI_append_htcuniversal = "file://numeric.patch;patch=1 \ - file://plugin.patch;patch=1" +SRC_URI_append_magician = " file://plugin.patch;patch=1" +SRC_URI_append_htcuniversal = " file://plugin.patch;patch=1 \ + file://qualcomm-extreply.patch;patch=1" inherit autotools pkgconfig update-rc.d diff --git a/packages/gstreamer/gst-ffmpeg_0.10.2.bb b/packages/gstreamer/gst-ffmpeg_0.10.2.bb new file mode 100644 index 0000000000..7c1b45eb8a --- /dev/null +++ b/packages/gstreamer/gst-ffmpeg_0.10.2.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "FFmpeg-based GStreamer plug-in" +SECTION = "multimedia" +PRIORITY = "optional" +LICENSE = "LGPL" +HOMEPAGE = "http://www.gstreamer.net/" +DEPENDS = "gstreamer zlib" +PR = "r0" + +inherit autotools pkgconfig + +SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" + +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" + +EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \ + --disable-vorbis --disable-vorbistest --disable-encoders \ + --disable-v4l --disable-audio-oss --disable-dv1394 \ + --disable-vhook --disable-ffmpeg --disable-ffserver \ + --enable-pp --disable-decoder-vorbis" + +# We do this because the install program is called with -s which causes it to +# call "strip" and it then mangles cross compiled stuff.. +PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:" + +# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg +CC = "${CCACHE} ${HOST_PREFIX}gcc -L${STAGING_LIBDIR}" + +do_configure () { + cd ${S} + oe_runconf +} + diff --git a/packages/gstreamer/gst-plugins-bad_0.10.3.bb b/packages/gstreamer/gst-plugins-bad_0.10.3.bb index 42f6df4d9d..d8906733a5 100644 --- a/packages/gstreamer/gst-plugins-bad_0.10.3.bb +++ b/packages/gstreamer/gst-plugins-bad_0.10.3.bb @@ -1,4 +1,5 @@ require gst-plugins.inc DEPENDS += "gst-plugins-base" -PR = "r2" +SRC_URI += "file://cross-compile.patch;patch=1" +PR = "r3" diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.4.bb b/packages/gstreamer/gst-plugins-ugly_0.10.4.bb index 42f6df4d9d..d8906733a5 100644 --- a/packages/gstreamer/gst-plugins-ugly_0.10.4.bb +++ b/packages/gstreamer/gst-plugins-ugly_0.10.4.bb @@ -1,4 +1,5 @@ require gst-plugins.inc DEPENDS += "gst-plugins-base" -PR = "r2" +SRC_URI += "file://cross-compile.patch;patch=1" +PR = "r3" diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb index 8a11d61996..e42bcd4445 100644 --- a/packages/gtk-webcore/osb-nrcit_svn.bb +++ b/packages/gtk-webcore/osb-nrcit_svn.bb @@ -7,7 +7,7 @@ SECTION = "gpe" PV = "0.5.2+svn${SRCDATE}" PR = "r0" -DEPENDS = "curl librsvg osb-nrcore" +DEPENDS = "curl librsvg osb-nrcore pango" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCit;proto=https \ file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1" @@ -17,6 +17,8 @@ DEFAULT_PREFERENCE = "-1" inherit autotools pkgconfig +EXTRA_OECONF = " --enable-pango " + do_configure () { autotools_do_configure cd ${S} diff --git a/packages/images/essential-image.bb b/packages/images/essential-image.bb index 9544b82ead..21078790b7 100644 --- a/packages/images/essential-image.bb +++ b/packages/images/essential-image.bb @@ -1,6 +1,6 @@ # # Copyright Matthias Hentges <devel@hentges.net> (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# License: MIT (see COPYING.MIT) # # Filename: essential-image.bb # Date: 23-Apr-06 diff --git a/packages/images/essential-machine-image.bb b/packages/images/essential-machine-image.bb index 70ce1e119a..f82f1833dc 100644 --- a/packages/images/essential-machine-image.bb +++ b/packages/images/essential-machine-image.bb @@ -1,6 +1,6 @@ # # Copyright Matthias Hentges <devel@hentges.net> (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# License: MIT (see COPYING.MIT) # # Filename: essential-machine-image.bb # Date: 24-Apr-06 diff --git a/packages/libxml/libxml2_2.6.26.bb b/packages/libxml/libxml2_2.6.26.bb index 1695045290..12fb6ca08e 100644 --- a/packages/libxml/libxml2_2.6.26.bb +++ b/packages/libxml/libxml2_2.6.26.bb @@ -2,8 +2,7 @@ DESCRIPTION = "GNOME XML Parser library" SECTION = "libs" PRIORITY = "optional" LICENSE = "MIT" -DEPENDS = "libiconv" -PR = "r3" +PR = "r4" SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz" diff --git a/packages/linux/linux-nokia800-2.6.18-osso29/.mtn2git_empty b/packages/linux/linux-nokia800-2.6.18-osso29/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-nokia800-2.6.18-osso29/.mtn2git_empty diff --git a/packages/linux/linux-nokia800-2.6.18-osso29/nokia770/.mtn2git_empty b/packages/linux/linux-nokia800-2.6.18-osso29/nokia770/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-nokia800-2.6.18-osso29/nokia770/.mtn2git_empty diff --git a/packages/linux/linux-nokia800-2.6.18-osso29/nokia800/.mtn2git_empty b/packages/linux/linux-nokia800-2.6.18-osso29/nokia800/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-nokia800-2.6.18-osso29/nokia800/.mtn2git_empty diff --git a/packages/linux/linux-nokia800.inc b/packages/linux/linux-nokia800.inc new file mode 100644 index 0000000000..48a88320e2 --- /dev/null +++ b/packages/linux/linux-nokia800.inc @@ -0,0 +1,40 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for Nokia 770/800" +LICENSE = "GPL" + +KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" + +inherit kernel + +RPROVIDES_kernel-image = "hostap-modules" + +COMPATIBLE_MACHINE = "nokia770|nokia800" + +do_configure_prepend() { + + rm -f ${S}/.config || true + + 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 + + sed -e '/CONFIG_AEABI/d' \ + -e '/CONFIG_OABI_COMPAT=/d' \ + '${WORKDIR}/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_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_build after do_compile diff --git a/packages/linux/linux-nokia800_2.6.18-osso29.bb b/packages/linux/linux-nokia800_2.6.18-osso29.bb new file mode 100644 index 0000000000..617c6dfad2 --- /dev/null +++ b/packages/linux/linux-nokia800_2.6.18-osso29.bb @@ -0,0 +1,9 @@ +require linux-nokia800.inc + +PR = "r2" +SRC_URI = "http://repository.maemo.org/pool/maemo3.0/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz \ + http://repository.maemo.org/pool/maemo3.0/free/source/kernel-source-rx-34_2.6.18-osso29.diff.gz;patch=1 \ + file://defconfig" + +S = "${WORKDIR}/linux-g" + diff --git a/packages/linux/linux-rp-2.6.20/defconfig-c7x0 b/packages/linux/linux-rp-2.6.20/defconfig-c7x0 index 73d826ff24..ad7fca8861 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-c7x0 +++ b/packages/linux/linux-rp-2.6.20/defconfig-c7x0 @@ -1606,4 +1606,4 @@ CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y -CONFIG_SHARPSL_RC=n +CONFIG_SHARPSL_RC=m diff --git a/packages/linux/linux-rp-2.6.20/defconfig-collie b/packages/linux/linux-rp-2.6.20/defconfig-collie index 55336bae96..b0603a8408 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-collie +++ b/packages/linux/linux-rp-2.6.20/defconfig-collie @@ -1,15 +1,23 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17 -# Tue Jul 4 16:35:35 2006 +# Linux kernel version: 2.6.20.4 +# Fri Apr 6 23:20:59 2007 # CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set CONFIG_MMU=y +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_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # # Code maturity level options @@ -26,29 +34,36 @@ CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set # CONFIG_POSIX_MQUEUE is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set -CONFIG_SYSCTL=y +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" -CONFIG_UID16=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y CONFIG_EMBEDDED=y +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_ELF_CORE is not set 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 @@ -66,7 +81,10 @@ CONFIG_KMOD=y # # 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 @@ -84,18 +102,28 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # # System Type # +# CONFIG_ARCH_AAEC2000 is not set +# 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_INTEGRATOR is not set -# CONFIG_ARCH_IOP3XX 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_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set CONFIG_ARCH_SA1100=y @@ -103,12 +131,6 @@ CONFIG_ARCH_SA1100=y # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_AT91RM9200 is not set # # SA11x0 Implementations @@ -138,11 +160,14 @@ CONFIG_CPU_ABRT_EV4=y CONFIG_CPU_CACHE_V4WB=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_TLB_V4WB=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features # -CONFIG_KEXEC=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set CONFIG_SHARP_LOCOMO=y CONFIG_SHARP_PARAM=y CONFIG_SHARP_SCOOP=y @@ -186,6 +211,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_NEED_MULTIPLE_NODES=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set # CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=y @@ -194,8 +220,8 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=32M fbcon=rotate:1 dyntick=enable quiet" # CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y # # CPU Frequency scaling @@ -227,7 +253,8 @@ CONFIG_BINFMT_MISC=m CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set -CONFIG_APM=y +# CONFIG_PM_SYSFS_DEPRECATED is not set +CONFIG_APM=m # # Networking @@ -238,11 +265,12 @@ CONFIG_NET=y # Networking options # # CONFIG_NETDEBUG is not set -CONFIG_PACKET=y +CONFIG_PACKET=m CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set @@ -258,10 +286,15 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m # CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # # IP: Virtual Server Configuration @@ -273,9 +306,17 @@ CONFIG_IPV6=m CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m +# CONFIG_IPV6_MIP6 is not set CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m CONFIG_IPV6_TUNNEL=m +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set @@ -283,23 +324,12 @@ CONFIG_NETFILTER=y # Core Netfilter Configuration # # CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set # CONFIG_NETFILTER_XTABLES is not set # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=m -# CONFIG_IP_NF_CT_ACCT is not set -# CONFIG_IP_NF_CONNTRACK_MARK is not set -# CONFIG_IP_NF_CONNTRACK_EVENTS is not set -CONFIG_IP_NF_CT_PROTO_SCTP=m -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -# CONFIG_IP_NF_NETBIOS_NS is not set -CONFIG_IP_NF_TFTP=m -CONFIG_IP_NF_AMANDA=m -# CONFIG_IP_NF_PPTP is not set -# CONFIG_IP_NF_H323 is not set CONFIG_IP_NF_QUEUE=m # @@ -330,7 +360,6 @@ CONFIG_IP_NF_QUEUE=m # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -390,6 +419,7 @@ CONFIG_IRTTY_SIR=m CONFIG_USB_IRDA=m # CONFIG_SIGMATEL_FIR is not set CONFIG_SA1100_FIR=m +# CONFIG_MCS_FIR is not set CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m @@ -434,6 +464,7 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set +# CONFIG_SYS_HYPERVISOR is not set # # Connector - unified userspace <-> kernelspace linker @@ -454,12 +485,14 @@ CONFIG_MTD_PARTITIONS=y # # User Modules And Translation Layers # -CONFIG_MTD_CHAR=y +CONFIG_MTD_CHAR=m +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 @@ -486,12 +519,15 @@ CONFIG_MTD_SHARP=y # Mapping drivers for chip access # # CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set CONFIG_MTD_SA1100=y # CONFIG_MTD_PLATRAM is not set # # Self-contained MTD device drivers # +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set @@ -540,7 +576,8 @@ CONFIG_BLK_DEV_LOOP=m # # ATA/ATAPI/MFM/RLL support # -CONFIG_IDE=y +CONFIG_IDE=m +CONFIG_IDE_MAX_HWIFS=4 CONFIG_BLK_DEV_IDE=m # @@ -571,6 +608,8 @@ CONFIG_BLK_DEV_IDECS=m # # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=m +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set CONFIG_SCSI_PROC_FS=y # @@ -590,14 +629,16 @@ CONFIG_CHR_DEV_SG=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set # -# SCSI Transport Attributes +# SCSI Transports # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set # CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set # # SCSI low-level drivers @@ -606,7 +647,6 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_AHA152X is not set # CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_IN2000 is not set -# CONFIG_SCSI_SATA is not set # CONFIG_SCSI_DTC3280 is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_GENERIC_NCR5380 is not set @@ -629,10 +669,17 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_PCMCIA_SYM53C500 is not set # +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + +# # Multi-device support (RAID and LVM) # CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m @@ -734,6 +781,7 @@ CONFIG_PCMCIA_HERMES=m CONFIG_PCMCIA_SPECTRUM=m # CONFIG_AIRO_CS is not set # CONFIG_PCMCIA_WL3501 is not set +# CONFIG_USB_ZD1201 is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set @@ -767,6 +815,7 @@ CONFIG_PPP_BSDCOMP=m # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set +CONFIG_SLHC=m # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -781,11 +830,12 @@ CONFIG_PPP_BSDCOMP=m # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=480 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640 @@ -805,6 +855,7 @@ CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_LOCOMO=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -822,6 +873,7 @@ CONFIG_KEYBOARD_LOCOMO=y 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 # @@ -852,15 +904,12 @@ CONFIG_UNIX98_PTYS=y # Watchdog Cards # # CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # -# Ftape, the floppy tape device driver -# - -# # PCMCIA character devices # # CONFIG_SYNCLINK_CS is not set @@ -872,7 +921,6 @@ CONFIG_UNIX98_PTYS=y # TPM devices # # CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set # # I2C support @@ -891,6 +939,7 @@ CONFIG_I2C=m # I2C Hardware Bus support # # CONFIG_I2C_ELEKTOR is not set +# CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_PCA_ISA is not set @@ -913,8 +962,19 @@ CONFIG_I2C=m # # SPI support # -# CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +CONFIG_SPI_LOCOMO=m + +# +# SPI Protocol Masters +# # # Dallas's 1-wire bus @@ -930,6 +990,7 @@ CONFIG_I2C=m # # Misc devices # +# CONFIG_TIFM_CORE is not set # # Multimedia Capabilities Port drivers @@ -937,7 +998,6 @@ CONFIG_I2C=m CONFIG_MCP=y CONFIG_MCP_SA11X0=y CONFIG_MCP_UCB1200=y -# CONFIG_MCP_UCB1200_AUDIO is not set CONFIG_MCP_UCB1200_TS=m # @@ -948,12 +1008,12 @@ CONFIG_MCP_UCB1200_TS=m # LED devices # CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS=m # # LED drivers # -# CONFIG_LEDS_LOCOMO is not set +CONFIG_LEDS_LOCOMO=m # # LED Triggers @@ -961,6 +1021,7 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m # CONFIG_LEDS_TRIGGER_IDE_DISK is not set +CONFIG_LEDS_TRIGGER_HEARTBEAT=m # # Multimedia devices @@ -978,6 +1039,7 @@ CONFIG_VIDEO_V4L2=y # Video Capture Adapters # # CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y # CONFIG_VIDEO_VIVI is not set # CONFIG_VIDEO_PMS is not set # CONFIG_VIDEO_CPIA is not set @@ -985,35 +1047,24 @@ CONFIG_VIDEO_V4L2=y # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set # CONFIG_TUNER_3036 is not set -# CONFIG_VIDEO_OVCAMCHIP is not set - -# -# Encoders and Decoders -# -# CONFIG_VIDEO_MSP3400 is not set -# CONFIG_VIDEO_CS53L32A is not set -# CONFIG_VIDEO_WM8775 is not set -# CONFIG_VIDEO_WM8739 is not set -# CONFIG_VIDEO_CX25840 is not set -# CONFIG_VIDEO_SAA711X is not set -# CONFIG_VIDEO_SAA7127 is not set -# CONFIG_VIDEO_UPD64031A is not set -# CONFIG_VIDEO_UPD64083 is not set # # V4L USB devices # +# CONFIG_VIDEO_PVRUSB2 is not set # CONFIG_VIDEO_EM28XX is not set -# CONFIG_USB_DSBR is not set +# CONFIG_VIDEO_USBVISION is not set # CONFIG_USB_VICAM is not set # CONFIG_USB_IBMCAM is not set # CONFIG_USB_KONICAWC is not set +# CONFIG_USB_QUICKCAM_MESSENGER is not set # CONFIG_USB_ET61X251 is not set +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_USB_W9968CF is not set # CONFIG_USB_OV511 is not set # CONFIG_USB_SE401 is not set # CONFIG_USB_SN9C102 is not set # CONFIG_USB_STV680 is not set -# CONFIG_USB_W9968CF is not set # CONFIG_USB_ZC0301 is not set # CONFIG_USB_PWC is not set @@ -1025,13 +1076,13 @@ CONFIG_VIDEO_V4L2=y # CONFIG_RADIO_RTRACK2 is not set # CONFIG_RADIO_AZTECH is not set # CONFIG_RADIO_GEMTEK is not set -# CONFIG_RADIO_MAESTRO is not set # CONFIG_RADIO_SF16FMI is not set # CONFIG_RADIO_SF16FMR2 is not set # CONFIG_RADIO_TERRATEC is not set # CONFIG_RADIO_TRUST is not set # CONFIG_RADIO_TYPHOON is not set # CONFIG_RADIO_ZOLTRIX is not set +# CONFIG_USB_DSBR is not set # # Digital Video Broadcasting Devices @@ -1042,12 +1093,13 @@ CONFIG_VIDEO_V4L2=y # # Graphics support # +CONFIG_FIRMWARE_EDID=y CONFIG_FB=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set -# CONFIG_FB_FIRMWARE_EDID is not set +# CONFIG_FB_BACKLIGHT is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set CONFIG_FB_SA1100=y @@ -1077,18 +1129,12 @@ CONFIG_FONT_8x8=y # # Logo configuration # -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_LOGO_OHAND_CLUT224 is not set -CONFIG_LOGO_OZ240_CLUT224=y -# CONFIG_LOGO_OZ480_CLUT224 is not set -# CONFIG_LOGO_OZ640_CLUT224 is not set +# CONFIG_LOGO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y -# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_DEVICE=y CONFIG_BACKLIGHT_LOCOMO=y # @@ -1147,6 +1193,11 @@ CONFIG_SND_DUMMY=m # CONFIG_SOUND_PRIME is not set # +# HID Devices +# +CONFIG_HID=m + +# # USB support # CONFIG_USB_ARCH_HAS_HCD=y @@ -1195,13 +1246,13 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_LIBUSUAL is not set # # USB Input Devices # CONFIG_USB_HID=m -CONFIG_USB_HIDINPUT=y # CONFIG_USB_HIDINPUT_POWERBOOK is not set # CONFIG_HID_FF is not set # CONFIG_USB_HIDDEV is not set @@ -1237,12 +1288,14 @@ CONFIG_USB_HIDINPUT=y # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set +CONFIG_USB_USBNET_MII=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m # CONFIG_USB_NET_GL620A is not set CONFIG_USB_NET_NET1080=m # CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set # CONFIG_USB_NET_RNDIS_HOST is not set CONFIG_USB_NET_CDC_SUBSET=m # CONFIG_USB_ALI_M5632 is not set @@ -1251,7 +1304,6 @@ CONFIG_USB_BELKIN=y CONFIG_USB_ARMLINUX=y # CONFIG_USB_EPSON2888 is not set CONFIG_USB_NET_ZAURUS=m -# CONFIG_USB_ZD1201 is not set CONFIG_USB_MON=y # @@ -1263,8 +1315,8 @@ CONFIG_USB_MON=y # CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRCABLE is not set CONFIG_USB_SERIAL_AIRPRIME=m -CONFIG_USB_SERIAL_ANYDATA=m CONFIG_USB_SERIAL_ARK3116=m CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_WHITEHEAT=m @@ -1298,15 +1350,20 @@ CONFIG_USB_SERIAL_KEYSPAN=m CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m +# CONFIG_USB_SERIAL_MOS7720 is not set +# CONFIG_USB_SERIAL_MOS7840 is not set # CONFIG_USB_SERIAL_NAVMAN is not set CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set CONFIG_USB_SERIAL_TI=m CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_XIRCOM=m +# CONFIG_USB_SERIAL_OPTION is not set # CONFIG_USB_SERIAL_OMNINET is not set +# CONFIG_USB_SERIAL_DEBUG is not set CONFIG_USB_EZUSB=y # @@ -1314,16 +1371,20 @@ CONFIG_USB_EZUSB=y # # CONFIG_USB_EMI62 is not set # CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGETKIT is not set -# CONFIG_USB_PHIDGETSERVO is not set +# CONFIG_USB_PHIDGET is not set # CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set # CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_TEST is not set # @@ -1335,7 +1396,6 @@ CONFIG_USB_EZUSB=y # CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FILES is not set -CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_PXA27X is not set @@ -1343,24 +1403,17 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_AT91 is not set -CONFIG_USB_GADGET_SA1100=y -CONFIG_USB_SA1100=y # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -CONFIG_USB_FILE_STORAGE_TEST=y -CONFIG_USB_G_SERIAL=m # # MMC/SD Card support # -CONFIG_MMC=y +CONFIG_MMC=m # CONFIG_MMC_DEBUG is not set -CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK=m +# CONFIG_MMC_TIFM_SD is not set +CONFIG_MMC_SPI=m # # Real Time Clock @@ -1369,6 +1422,7 @@ 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 @@ -1376,33 +1430,45 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 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_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set # CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_V3020 is not set # # File systems # -CONFIG_EXT2_FS=y +CONFIG_EXT2_FS=m # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP 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 @@ -1429,8 +1495,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # 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 @@ -1445,13 +1513,14 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y CONFIG_JFFS2_RTIME=y # CONFIG_JFFS2_RUBIN is not set CONFIG_CRAMFS=m @@ -1486,7 +1555,9 @@ CONFIG_SMB_NLS_DEFAULT=y CONFIG_SMB_NLS_REMOTE="cp437" CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set @@ -1556,7 +1627,12 @@ CONFIG_NLS_ISO8859_14=m CONFIG_NLS_ISO8859_15=m CONFIG_NLS_KOI8_R=m CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=y +CONFIG_NLS_UTF8=m + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set # # Profiling support @@ -1567,27 +1643,33 @@ CONFIG_NLS_UTF8=y # 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_LOG_BUF_SHIFT=14 CONFIG_DETECT_SOFTLOCKUP=y # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_PREEMPT is not set -# CONFIG_DEBUG_MUTEXES 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_RWSEMS 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 is not set # CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set CONFIG_FRAME_POINTER=y -# CONFIG_UNWIND_INFO is not set # CONFIG_FORCED_INLINING is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_WAITQ is not set CONFIG_DEBUG_ERRORS=y # CONFIG_DEBUG_LL is not set @@ -1601,7 +1683,12 @@ CONFIG_DEBUG_ERRORS=y # Cryptographic options # CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_HMAC=m +# CONFIG_CRYPTO_XCBC is not set CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -1610,9 +1697,14 @@ CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_WP512=m # CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_LRW is not set CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_CAST5=m @@ -1622,6 +1714,7 @@ CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=m +# CONFIG_CRYPTO_LZO is not set CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_TEST=m @@ -1633,10 +1726,13 @@ CONFIG_CRYPTO_TEST=m # # Library routines # +CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=m -# CONFIG_CRC16 is not set +CONFIG_CRC16=m CONFIG_CRC32=y CONFIG_LIBCRC32C=m +CONFIG_LZO=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y -CONFIG_SHARPSL_RC=n +CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y diff --git a/packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch b/packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch index 9761f43aca..8230d53392 100644 --- a/packages/linux/linux-rp-2.6.20/sharpsl-rc-r0.patch +++ b/packages/linux/linux-rp-2.6.20/sharpsl-rc-r1.patch @@ -62,7 +62,7 @@ Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c =================================================================== --- /dev/null +++ linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c -@@ -0,0 +1,263 @@ +@@ -0,0 +1,291 @@ +/* + * Keyboard driver for Sharp Clamshell Models (SL-Cxx00) + * @@ -86,7 +86,13 @@ Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c +#include <linux/module.h> +#include <linux/slab.h> + ++#ifdef CONFIG_MACH_SPITZ +#include <asm/arch/spitz.h> ++#endif ++#ifdef CONFIG_MACH_CORGI ++#include <asm/arch/corgi.h> ++#endif ++ +#include <asm/arch/hardware.h> +#include <asm/arch/pxa-regs.h> +#include <asm/hardware/scoop.h> @@ -101,7 +107,28 @@ Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c + unsigned char key; +}; + -+static struct remote_control_key spitz_remote_keys[] = { ++#ifdef CONFIG_MACH_SPITZ ++#define REMOTE_AKIN_PULLUP SPITZ_SCP2_AKIN_PULLUP ++#define REMOTE_SCOOP_DEVICE spitzscoop2_device ++#define REMOTE_GPIO_INT SPITZ_GPIO_AK_INT ++#define REMOTE_IRQ_INT SPITZ_IRQ_GPIO_AK_INT ++static struct remote_control_key remote_keys[] = { ++ { 25, 35, KEY_STOPCD}, ++ { 55, 65, KEY_PLAYPAUSE}, ++ { 85, 95, KEY_NEXTSONG}, ++ { 115, 125, KEY_VOLUMEUP}, ++ { 145, 155, KEY_PREVIOUSSONG}, ++ { 180, 190, KEY_MUTE}, ++ { 215, 225, KEY_VOLUMEDOWN}, ++}; ++#endif ++#ifdef CONFIG_MACH_CORGI ++#define REMOTE_AKIN_PULLUP CORGI_SCP_AKIN_PULLUP ++#define REMOTE_SCOOP_DEVICE corgiscoop_device ++#define REMOTE_GPIO_INT CORGI_GPIO_AK_INT ++#define REMOTE_IRQ_INT CORGI_IRQ_GPIO_AK_INT ++static struct remote_control_key remote_keys[] = { ++ //These need to be fixed for the CE-RH1's values + { 25, 35, KEY_STOPCD}, + { 55, 65, KEY_PLAYPAUSE}, + { 85, 95, KEY_NEXTSONG}, @@ -110,6 +137,7 @@ Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c + { 180, 190, KEY_MUTE}, + { 215, 225, KEY_VOLUMEDOWN}, +}; ++#endif + +#define RELEASE_HI 230 +#define MAX_EARPHONE 6 @@ -137,11 +165,11 @@ Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c + int i, val; + + val = sharpsl_pm_pxa_read_max1111(MAX1111_REMCOM); -+ for (i = 0; i < ARRAY_SIZE(spitz_remote_keys); ++i) { -+ if (val >= spitz_remote_keys[i].min -+ && val <= spitz_remote_keys[i].max) { -+ printk("get_remocon_raw: VAL=%i, KEY=%i\n", val, spitz_remote_keys[i].key); -+ return spitz_remote_keys[i].key; ++ for (i = 0; i < ARRAY_SIZE(remote_keys); ++i) { ++ if (val >= remote_keys[i].min ++ && val <= remote_keys[i].max) { ++ printk("get_remocon_raw: VAL=%i, KEY=%i\n", val, remote_keys[i].key); ++ return remote_keys[i].key; + } + } + return 0; @@ -158,7 +186,7 @@ Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c + data->state = 0; + data->last_key = 0; + -+ reset_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_AKIN_PULLUP); ++ reset_scoop_gpio(&REMOTE_SCOOP_DEVICE.dev, REMOTE_AKIN_PULLUP); + + mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS)); + } @@ -219,7 +247,7 @@ Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c + if (timer) { + mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS)); + } else { -+ set_scoop_gpio(&spitzscoop2_device.dev, SPITZ_SCP2_AKIN_PULLUP); ++ set_scoop_gpio(&REMOTE_SCOOP_DEVICE.dev, REMOTE_AKIN_PULLUP); + data->handling_press = 0; + } +} @@ -251,7 +279,7 @@ Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c + sharpsl_rc->rctimer.function = sharpsl_rc_timer_callback; + sharpsl_rc->rctimer.data = (unsigned long) sharpsl_rc; + -+ input_dev->name = "Spitz Remote Control"; ++ input_dev->name = "Sharp Remote Control CE-RHX"; + input_dev->phys = "sharpsl_rc/input0"; + input_dev->id.bustype = BUS_HOST; + input_dev->id.vendor = 0x0001; @@ -262,13 +290,13 @@ Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c + + input_dev->evbit[0] = BIT(EV_KEY); + -+ for (i = 0; i <= ARRAY_SIZE(spitz_remote_keys); i++) -+ set_bit(spitz_remote_keys[i].key, input_dev->keybit); ++ for (i = 0; i <= ARRAY_SIZE(remote_keys); i++) ++ set_bit(remote_keys[i].key, input_dev->keybit); + + input_register_device(sharpsl_rc->input); + -+ pxa_gpio_mode(SPITZ_GPIO_AK_INT | GPIO_IN); -+ ret = request_irq(SPITZ_IRQ_GPIO_AK_INT, ++ pxa_gpio_mode(REMOTE_GPIO_INT | GPIO_IN); ++ ret = request_irq(REMOTE_IRQ_INT, + sharpsl_rc_interrupt, + IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_SHARED, + "sharpsl_rc", @@ -289,7 +317,7 @@ Index: linux-2.6.20/drivers/input/keyboard/sharpsl_rc.c + + dev_dbg(&pdev->dev, "sharpsl_rc_remove\n"); + -+ free_irq(SPITZ_IRQ_GPIO_AK_INT, sharpsl_rc); ++ free_irq(REMOTE_IRQ_INT, sharpsl_rc); + del_timer_sync(&sharpsl_rc->rctimer); + input_unregister_device(sharpsl_rc->input); + kfree(sharpsl_rc); diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc index 63342d5b3f..3bbd22e6c2 100644 --- a/packages/linux/linux-rp.inc +++ b/packages/linux/linux-rp.inc @@ -11,6 +11,7 @@ RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files" BASRC = "http://www.orca.cx/zaurus/patches" CHSRC = "http://oz.drigon.com/patches" +TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches" ############################################################## # Compensate for sucky bootloader on all Sharp Zaurus models @@ -58,6 +59,8 @@ module_autoload_snd-soc-corgi_c7x0 = "snd-soc-corgi" module_autoload_snd-soc-spitz_akita = "snd-soc-spitz" module_autoload_snd-soc-spitz_spitz = "snd-soc-spitz" module_autoload_snd-soc-poodle_poodle = "snd-soc-poodle" +module_autoload_locomo-spi_collie = "locomo-spi" +module_autoload_mmc_block_collie = "mmc_block" do_configure() { rm -f ${S}/.config diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb index 70aa40610a..23cf54e794 100644 --- a/packages/linux/linux-rp_2.6.20.bb +++ b/packages/linux/linux-rp_2.6.20.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r7" +PR = "r13" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 @@ -14,6 +14,7 @@ PR = "r7" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ + http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.6.bz2;patch=1 \ http://opensource.wolfsonmicro.com/~lg/asoc/asoc-v0.13.3.patch;patch=1;status=merged \ ${RPSRC}/oprofile_always_bt_arm-r0.patch;patch=1 \ ${RPSRC}/lzo_kernel-r0.patch;patch=1 \ @@ -53,7 +54,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \ file://squashfs3.0-2.6.15.patch;patch=1;status=external \ file://vesafb-tng-1.0-rc2-2.6.20-rc2.patch;patch=1;status=external \ - file://sharpsl-rc-r0.patch;patch=1 \ + file://sharpsl-rc-r1.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-hx2000 \ file://defconfig-collie \ @@ -76,14 +77,17 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2 \ # These patches are extracted from Pavel Machek's git tree # (diff against vanilla kernel) + SRC_URI_append_collie = "\ - ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;patch=1 \ - ${DOSRC}/collie/collie-r0.patch;patch=1 \ - ${DOSRC}/collie/locomolcd-backlight-r0.patch;patch=1 \ - ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;patch=1 \ - file://collie-mcp-r1.patch;patch=1 \ - ${DOSRC}/collie/sa1100-udc-r0.patch;patch=1 \ -# ${DOSRC}/collie/collie-pm-r1.patch;patch=1 \ + ${TKSRC}/mtd-sharp-flash-hack-r2.patch;patch=1 \ + ${TKSRC}/collie-r3.patch;patch=1 \ + ${TKSRC}/ucb1x00-touch-audio-r1.patch;patch=1 \ + ${TKSRC}/mcp-sa11x0-r0.patch;patch=1 \ + ${TKSRC}/sa1100-udc-r2.patch;patch=1 \ + ${TKSRC}/mmc_spi-r3.patch;patch=1 \ + ${TKSRC}/locomo-r0.patch;patch=1 \ + ${TKSRC}/collie-kexec.patch;patch=1 \ + ${TKSRC}/locomo_spi-r2.patch;patch=1 \ " SRC_URI_append_tosa = "\ diff --git a/packages/lm_sensors/files/iconv.patch b/packages/lm_sensors/files/iconv.patch new file mode 100644 index 0000000000..4aecafafb1 --- /dev/null +++ b/packages/lm_sensors/files/iconv.patch @@ -0,0 +1,13 @@ +Index: lm_sensors-2.10.1/prog/sensors/Module.mk +=================================================================== +--- lm_sensors-2.10.1.orig/prog/sensors/Module.mk 2006-09-24 22:30:10.000000000 +0000 ++++ lm_sensors-2.10.1/prog/sensors/Module.mk 2007-04-14 22:11:47.000000000 +0000 +@@ -36,7 +36,7 @@ + REMOVESENSORSBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(BINDIR)/%,$(PROGSENSORSTARGETS)) + REMOVESENSORSMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORSMAN1DIR)/%,$(PROGSENSORSMAN1FILES)) + +-LIBICONV := $(shell if /sbin/ldconfig -p | grep -q libiconv\\.so ; then echo \-liconv; else echo; fi) ++LIBICONV := -liconv + + $(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBSHBASENAME) + $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors diff --git a/packages/lm_sensors/lmsensors-apps_2.10.1.bb b/packages/lm_sensors/lmsensors-apps_2.10.1.bb index 8013f67f6a..bbe484f74e 100644 --- a/packages/lm_sensors/lmsensors-apps_2.10.1.bb +++ b/packages/lm_sensors/lmsensors-apps_2.10.1.bb @@ -4,10 +4,12 @@ DESCRIPTION = "Hardware health monitoring applications" HOMEPAGE = "http://secure.netroedge.com/~lm78/" -DEPENDS = "libsysfs" +DEPENDS = "libsysfs virtual/libiconv" LICENSE = "GPL" +PR = "r1" SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.gz \ + file://iconv.patch;patch=1 \ file://add-sysfs-ldflags.patch;patch=1" S = "${WORKDIR}/lm_sensors-${PV}" diff --git a/packages/mplayer/mplayer-common.bb b/packages/mplayer/mplayer-common.bb index 4b9570abbf..cf1ced294f 100644 --- a/packages/mplayer/mplayer-common.bb +++ b/packages/mplayer/mplayer-common.bb @@ -1,6 +1,6 @@ # # Copyright Matthias Hentges <devel@hentges.net> (c) 2006 -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# License: MIT (see COPYING.MIT) # # Filename: mplayer-common.bb # Date: 26-Mar-06 diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb index b478ca2604..4e6446f96a 100644 --- a/packages/openmoko-base/openmoko-libs_svn.bb +++ b/packages/openmoko-base/openmoko-libs_svn.bb @@ -1,24 +1,36 @@ DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based application framework for mobile communication applications" SECTION = "openmoko/libs" LICENSE = "LGPL" -DEPENDS += "gtk+ eds-dbus" +DEPENDS += "gtk+ eds-dbus libgsmd" PV = "0.0.1+svn${SRCDATE}" -PR = "r2" +PR = "r5" inherit openmoko -do_configure_prepend() { - touch libmokocore/Makefile.in - touch libmokopim/Makefile.in - touch libmokonet/Makefile.in -} - do_stage() { autotools_stage_all } -PACKAGES =+ "libmokojournal libmokojournal-dev libmokojournal-dbg" +PACKAGES =+ " \ + libmokojournal libmokojournal-dev libmokojournal-dbg \ + libmokogsmd libmokogsmd-dev libmokogsmd-dbg \ + libmokocore libmokocore-dev libmokocore-dbg \ + libmokoui libmokoui-dev libmokoui-dbg \ + " FILES_libmokojournal = "${libdir}/libmokojournal.so.*" FILES_libmokojournal-dev = "${libdir}/libmokojournal.so ${libdir}/libmokojournal.*a ${includedir}/${PN}/libmokojournal" FILES_libmokojournal-dbg = "${libdir}/.debug/libmokojournal.so.*" + +FILES_libmokogsmd = "${libdir}/libmokogsmd.so.*" +FILES_libmokogsmd-dev = "${libdir}/libmokogsmd.so ${libdir}/libmokogsmd.*a ${includedir}/${PN}/libmokogsmd" +FILES_libmokogsmd-dbg = "${libdir}/.debug/libmokogsmd.so.*" + +FILES_libmokocore = "${libdir}/libmokocore.so.*" +FILES_libmokocore-dev = "${libdir}/libmokocore.so ${libdir}/libmokocore.*a ${includedir}/${PN}/libmokocore" +FILES_libmokocore-dbg = "${libdir}/.debug/libmokocore.so.*" + +FILES_libmokoui = "${libdir}/libmokoui.so.*" +FILES_libmokoui-dev = "${libdir}/libmokoui.so ${libdir}/libmokoui.*a ${includedir}/${PN}/libmokoui" +FILES_libmokoui-dbg = "${libdir}/.debug/libmokoui.so.*" + diff --git a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb index 46065127f5..c9dd8c4817 100644 --- a/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb +++ b/packages/openmoko-panel-plugins/openmoko-panel-battery_svn.bb @@ -1,4 +1,5 @@ DESCRIPTION = "Shows the battery/AC status in the OpenMoko panel" +DEPENDS = "apmd" PV = "0.0.1+svn${SRCDATE}" inherit openmoko-panel-plugin diff --git a/packages/opensync/libopensync-plugin-evo2-sync_0.22.bb b/packages/opensync/libopensync-plugin-evo2-sync_0.22.bb new file mode 100644 index 0000000000..6b2609902a --- /dev/null +++ b/packages/opensync/libopensync-plugin-evo2-sync_0.22.bb @@ -0,0 +1,6 @@ +PLUGIN_ARCHIVE = "evolution2" + +require libopensync-plugin.inc +require libopensync-plugin_0.22.inc + +DEPENDS += " eds-dbus" diff --git a/packages/opensync/libopensync-plugin-evo2-sync_svn.bb b/packages/opensync/libopensync-plugin-evo2-sync_svn.bb new file mode 100644 index 0000000000..0a8084e519 --- /dev/null +++ b/packages/opensync/libopensync-plugin-evo2-sync_svn.bb @@ -0,0 +1,8 @@ + +SRC_URI = "svn://svn.opensync.org/plugins;module=evolution2;proto=http" +S = "${WORKDIR}/evolution2" + +require libopensync-plugin.inc + +DEPENDS += " eds-dbus" + diff --git a/packages/opensync/libopensync-plugin-file-sync_0.22.bb b/packages/opensync/libopensync-plugin-file-sync_0.22.bb new file mode 100644 index 0000000000..d34473127d --- /dev/null +++ b/packages/opensync/libopensync-plugin-file-sync_0.22.bb @@ -0,0 +1,2 @@ +require libopensync-plugin.inc +require libopensync-plugin_0.22.inc diff --git a/packages/opensync/libopensync-plugin-file-sync_svn.bb b/packages/opensync/libopensync-plugin-file-sync_svn.bb new file mode 100644 index 0000000000..ae300b402f --- /dev/null +++ b/packages/opensync/libopensync-plugin-file-sync_svn.bb @@ -0,0 +1,5 @@ + +SRC_URI = "svn://svn.opensync.org/plugins;module=file-sync;proto=http" +S = "${WORKDIR}/file-sync" + +require libopensync-plugin.inc diff --git a/packages/opensync/libopensync-plugin-irmc-sync_0.22.bb b/packages/opensync/libopensync-plugin-irmc-sync_0.22.bb new file mode 100644 index 0000000000..55df4e4d78 --- /dev/null +++ b/packages/opensync/libopensync-plugin-irmc-sync_0.22.bb @@ -0,0 +1,4 @@ +require libopensync-plugin.inc +require libopensync-plugin_0.22.inc + +DEPENDS += "openobex bluez-libs" diff --git a/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/.mtn2git_empty b/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/.mtn2git_empty diff --git a/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch b/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch new file mode 100644 index 0000000000..0fac67e5d9 --- /dev/null +++ b/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/missing-syncml-config.patch @@ -0,0 +1,8 @@ +--- tmp/src/missing-syncml-client-plugin 2007-01-09 12:55:48.000000000 +0000 ++++ tmp/src/syncml-client-plugin 2007-01-09 12:55:48.000000000 +0000 +@@ -0,0 +1,5 @@ ++<config> ++ <gconf-uri>/apps/syncml-client</gconf-uri> ++ <object-type>contact</object-type> ++ <sync-source-name>card</sync-source-name> ++</config> diff --git a/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch b/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch new file mode 100644 index 0000000000..7b659ce7c3 --- /dev/null +++ b/packages/opensync/libopensync-plugin-syncml-client-plugin-0.1/syncml-client-plugin-cpp.patch @@ -0,0 +1,11 @@ +--- tmp/src/syncml-client-plugin.cpp.orig 2007-01-09 12:27:33.000000000 +0000 ++++ tmp/src/syncml-client-plugin.cpp 2007-01-09 12:27:33.000000000 +0000 +@@ -94,7 +94,7 @@ + /** + * Initialize the plugin environment, read config data. + */ +-extern "C" static void* smc_initialize(OSyncMember *member, OSyncError **error) ++extern "C" void* smc_initialize(OSyncMember *member, OSyncError **error) + { + char *configData; + int configSize; diff --git a/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb b/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb new file mode 100644 index 0000000000..a81417bf7e --- /dev/null +++ b/packages/opensync/libopensync-plugin-syncml-client-plugin_0.1.bb @@ -0,0 +1,13 @@ +PR = "r1" + +SRC_URI = "svn://svn.opensync.org/plugins/syncml-client/plugin/tags;module=release-${PV};proto=http \ + file://missing-syncml-config.patch;patch=1 \ + file://syncml-client-plugin-cpp.patch;patch=1" + + +S = "${WORKDIR}/release-${PV}" + +require libopensync-plugin.inc + +DEPENDS += "syncml-client" + diff --git a/packages/opensync/libopensync-plugin-syncml-plugin.bb b/packages/opensync/libopensync-plugin-syncml-plugin.bb new file mode 100644 index 0000000000..0a7d82db74 --- /dev/null +++ b/packages/opensync/libopensync-plugin-syncml-plugin.bb @@ -0,0 +1,16 @@ + +SRC_URI = "svn://svn.opensync.org/plugins;module=syncml;proto=http" +S = "${WORKDIR}/syncml" + +require libopensync-plugin.inc + +DEPENDS += " libsyncml" + +do_install() { + install -d ${D}${datadir}/opensync/defaults + install -d ${D}${libdir}/opensync/plugins + install -m 644 src/syncml-http-server ${D}${datadir}/opensync/defaults + install -m 644 src/syncml-obex-client ${D}${datadir}/opensync/defaults + install -m 755 src/.libs/${PLUGIN_SONAME} ${D}${libdir}/opensync/plugins/ +} + diff --git a/packages/opensync/libopensync-plugin-syncml_0.22.bb b/packages/opensync/libopensync-plugin-syncml_0.22.bb new file mode 100644 index 0000000000..2a26eb1674 --- /dev/null +++ b/packages/opensync/libopensync-plugin-syncml_0.22.bb @@ -0,0 +1,13 @@ + +require libopensync-plugin.inc + +DEPENDS += " libsyncml" + +do_install() { + install -d ${D}${datadir}/opensync/defaults + install -d ${D}${libdir}/opensync/plugins + install -m 644 src/syncml-http-server ${D}${datadir}/opensync/defaults + install -m 644 src/syncml-obex-client ${D}${datadir}/opensync/defaults + install -m 755 src/.libs/${PLUGIN_SONAME} ${D}${libdir}/opensync/plugins/ +} + diff --git a/packages/opensync/libopensync-plugin.inc b/packages/opensync/libopensync-plugin.inc new file mode 100644 index 0000000000..b1986a9e64 --- /dev/null +++ b/packages/opensync/libopensync-plugin.inc @@ -0,0 +1,24 @@ + +PV = "0.22+svn${SRCDATE}" +PLUGIN_NAME ?= "${@bb.data.getVar('PN', d, 1).replace('libopensync-plugin-','')}" +PLUGIN_SONAME ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-','_')}.so" +SRC_URI ?= "svn://svn.opensync.org/plugins;module=${PLUGIN_NAME};proto=http" +S ?= "${WORKDIR}/${PLUGIN_NAME}" + +LICENSE ?= "LGPL" +DEPENDS += " libopensync" +RRECOMMENDS += " msynctool" +HOMEPAGE ?= "http://www.opensync.org/" + +inherit autotools pkgconfig + +FILES_${PN} += "${datadir} ${libdir}/opensync/plugins/*.so" +FILES_${PN}-dbg += "${libdir}/opensync/plugins/.debug" + +do_install() { + install -d ${D}${datadir}/opensync/defaults + install -d ${D}${libdir}/opensync/plugins + install -m 644 src/${PLUGIN_NAME} ${D}${datadir}/opensync/defaults + install -m 755 src/.libs/${PLUGIN_SONAME} ${D}${libdir}/opensync/plugins/ +} + diff --git a/packages/opensync/libopensync-plugin_0.22.inc b/packages/opensync/libopensync-plugin_0.22.inc new file mode 100644 index 0000000000..03857dce53 --- /dev/null +++ b/packages/opensync/libopensync-plugin_0.22.inc @@ -0,0 +1,12 @@ +PV = "0.22" +PLUGIN_ARCHIVE ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-sync','')}" +SRC_URI = "http://www.opensync.org/attachment/wiki/download/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2?format=raw" + +S = "${WORKDIR}/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}/" + +do_unpack2() { + cd ${WORKDIR} && tar jxf libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2?format=raw +} + +addtask unpack2 after do_unpack before do_patch + diff --git a/packages/opensync/libopensync_0.22.bb b/packages/opensync/libopensync_0.22.bb new file mode 100644 index 0000000000..ed4ef740bc --- /dev/null +++ b/packages/opensync/libopensync_0.22.bb @@ -0,0 +1,21 @@ +LICENSE = "LGPL" +HOMEPAGE = "http://www.opensync.org/" + +DEPENDS = "sqlite3 libxml2 zlib glib-2.0" + +SRC_URI = "http://www.opensync.org/attachment/wiki/download/libopensync-0.22.tar.bz2?format=raw" + +inherit autotools pkgconfig lib_package + +EXTRA_OECONF = "--disable-python" +LEAD_SONAME = "libopensync.so" + +FILES_${PN} += " ${libdir}/opensync/formats/*.so" +FILES_${PN}-dbg += " ${libdir}/opensync/formats/.debug/*.so" + +require opensync-unpack.inc + +do_stage() { +autotools_stage_all +} + diff --git a/packages/opensync/libopensync_svn.bb b/packages/opensync/libopensync_svn.bb new file mode 100644 index 0000000000..ac7da051c8 --- /dev/null +++ b/packages/opensync/libopensync_svn.bb @@ -0,0 +1,18 @@ +LICENSE = "LGPL" +HOMEPAGE = "http://www.opensync.org/" +DEPENDS = "sqlite3 libxml2 zlib glib-2.0" +PV = "0.22+svn${SRCDATE}" +SRC_URI = "svn://svn.opensync.org;module=trunk;proto=http" + +inherit autotools pkgconfig lib_package + +S = "${WORKDIR}/trunk" +EXTRA_OECONF = "--disable-python" +LEAD_SONAME = "libopensync.so" + +FILES_${PN} += " ${libdir}/opensync/formats/*.so" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/opensync/libsyncml_svn.bb b/packages/opensync/libsyncml_svn.bb new file mode 100644 index 0000000000..17b2537e85 --- /dev/null +++ b/packages/opensync/libsyncml_svn.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Libsyncml is a implementation of the SyncML protocol." +HOMEPAGE = "http://libsyncml.opensync.org/" +LICENSE = "LGPL" + +DEPENDS = "sed-native wbxml2 libsoup libxml2 bluez-libs openobex" + +PV = "0.4.2+svn${SRCDATE}" +SRC_URI = "svn://svn.opensync.org/libsyncml;module=trunk;proto=http" +S = "${WORKDIR}/trunk" + +inherit autotools pkgconfig + +EXTRA_OECONF = " --enable-http \ + --enable-obex \ + --enable-bluetooth \ + --enable-tools \ + --with-wbxml" + +CFLAGS += "-I${STAGING_INCDIR}/libsoup-2.2" + +do_configure_append() { + sed -i s:-I/usr/include/:-I/foo/:g Makefile + sed -i s:-I/usr/include/:-I/foo/:g */Makefile + sed -i s:-I/usr/include/:-I/foo/:g */*/Makefile +} + +do_stage() { + autotools_stage_all +} + +PACKAGES += "${PN}-tools" + +FILES_${PN}-tools = "${bindir}" +FILES_${PN} = "${libdir}/*.so.*" + diff --git a/packages/opensync/msynctool_0.22.bb b/packages/opensync/msynctool_0.22.bb new file mode 100644 index 0000000000..018c227e36 --- /dev/null +++ b/packages/opensync/msynctool_0.22.bb @@ -0,0 +1,9 @@ +SRC_URI = "http://www.opensync.org/attachment/wiki/download/msynctool-0.22.tar.bz2?format=raw" + +LICENSE = "GPL" +DEPENDS = "libopensync" +HOMEPAGE = "http://www.opensync.org/" + +inherit autotools pkgconfig + +require opensync-unpack.inc diff --git a/packages/opensync/msynctool_svn.bb b/packages/opensync/msynctool_svn.bb new file mode 100644 index 0000000000..319cf39d05 --- /dev/null +++ b/packages/opensync/msynctool_svn.bb @@ -0,0 +1,10 @@ +PV = "0.22+svn${SRCDATE}" +SRC_URI = "svn://svn.opensync.org/multisync;module=trunk;proto=http" +S = "${WORKDIR}/trunk" + +LICENSE = "GPL" +DEPENDS = "libopensync" +HOMEPAGE = "http://www.opensync.org/" + +inherit autotools pkgconfig + diff --git a/packages/opensync/opensync-unpack.inc b/packages/opensync/opensync-unpack.inc new file mode 100644 index 0000000000..d5443187bd --- /dev/null +++ b/packages/opensync/opensync-unpack.inc @@ -0,0 +1,5 @@ +do_unpack2() { + cd ${WORKDIR} && tar jxf ${PN}-${PV}.tar.bz2?format=raw +} + +addtask unpack2 after do_unpack before do_patch diff --git a/packages/opensync/syncml-client-0.1/.mtn2git_empty b/packages/opensync/syncml-client-0.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opensync/syncml-client-0.1/.mtn2git_empty diff --git a/packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch b/packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch new file mode 100644 index 0000000000..364f7643c5 --- /dev/null +++ b/packages/opensync/syncml-client-0.1/syncml-client-pc-in-cross.patch @@ -0,0 +1,10 @@ +--- tmp/syncml-client.pc.in.orig 2007-01-09 09:43:18.000000000 +0000 ++++ tmp/syncml-client.pc.in 2007-01-09 09:43:18.000000000 +0000 +@@ -8,6 +8,6 @@ + Version: @VERSION@ + Requires: libcurl, gconf-2.0 + Libs: @SYNCML_LIBS@ -lsyncmlclient +-Cflags: @SYNCML_CFLAGS@ -I@includedir@/syncml-client ++Cflags: @SYNCML_CFLAGS@ -I${includedir}/syncml-client + ~ + diff --git a/packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch b/packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch new file mode 100644 index 0000000000..c936445a95 --- /dev/null +++ b/packages/opensync/syncml-client-0.1/syncml-client-plugin-h.patch @@ -0,0 +1,11 @@ +--- tmp/src/syncml-client.h.orig 2007-01-09 12:15:41.000000000 +0000 ++++ tmp/src/syncml-client-plugin.h 2007-01-09 12:15:41.000000000 +0000 +@@ -20,7 +20,7 @@ + #define SYNCML_CLIENT_PLUGIN + + #include <opensync/opensync.h> +-#include <syncml-client.h> ++#include <syncml-client/syncml-client.h> + #include "SmcSyncSource.h" + #include "SmcConfig.h" + diff --git a/packages/opensync/syncml-client_0.1.bb b/packages/opensync/syncml-client_0.1.bb index 729ac9a559..95a4e339c7 100644 --- a/packages/opensync/syncml-client_0.1.bb +++ b/packages/opensync/syncml-client_0.1.bb @@ -1,8 +1,14 @@ -SRC_URI = "http://hem.bredband.net/miko22/${P}.tar.gz" - LICENSE = "GPL" DEPENDS = "gtk+ curl gconf" HOMEPAGE = "http://hem.bredband.net/miko22/" -DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector." +DESCRIPTION = "Linux port of the Funambol C++ SyncML client connector." +PR="r1" + +SRC_URI = "http://hem.bredband.net/miko22/${P}.tar.gz \ + file://syncml-client-pc-in-cross.patch;patch=1 " inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin.inc b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin.inc index 14aec8d351..4066f63737 100644 --- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin.inc +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin.inc @@ -2,8 +2,8 @@ DESCRIPTION = "MP3 file plugin for opie-mediaplayer11 using libmad" SECTION = "opie/codecs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "opie-mediaplayer1 libmad" -RDEPENDS = "opie-mediaplayer1" +DEPENDS = "opie-mediaplayer1-core libmad" +RDEPENDS = "opie-mediaplayer1-core" APPNAME = "madplugin" diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb index 8c8ea5f9fb..19b507a2bc 100644 --- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb index c30822ab46..9edc355d68 100644 --- a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb @@ -1,6 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \ file://libmadplugin.pro" diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin.inc b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin.inc index a3631755e7..16cc11e4e9 100644 --- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin.inc +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin.inc @@ -2,8 +2,8 @@ DESCRIPTION = "MOD/XM/S3M/IT plugin using libmodplug" SECTION = "opie/codecs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "opie-mediaplayer1" -RDEPENDS = "opie-mediaplayer1" +DEPENDS = "opie-mediaplayer1-core" +RDEPENDS = "opie-mediaplayer1-core" APPNAME = "modplugin" diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb index d5702318c9..5c49fb824f 100644 --- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb index 4cf1ac926d..427793481e 100644 --- a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_cvs.bb @@ -1,5 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin.inc b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin.inc index b5949be74d..f55d0eb3fd 100644 --- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin.inc +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin.inc @@ -2,8 +2,8 @@ DESCRIPTION = "Ogg file plugin using tremor" SECTION = "opie/codecs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "opie-mediaplayer1 tremor" -RDEPENDS = "opie-mediaplayer1" +DEPENDS = "opie-mediaplayer1-core tremor" +RDEPENDS = "opie-mediaplayer1-core" APPNAME = "tremorplugin" diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb index e49bc44f41..0407a8ab16 100644 --- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb index f1a3d8a92e..459f59debe 100644 --- a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb @@ -1,6 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer \ file://vorbis.pro " diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin.inc b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin.inc index c8d81c1ef4..858f8b3040 100644 --- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin.inc +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin.inc @@ -2,8 +2,8 @@ DESCRIPTION = "WAV file plugin" SECTION = "opie/codecs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "opie-mediaplayer1" -RDEPENDS = "opie-mediaplayer1" +DEPENDS = "opie-mediaplayer1-core" +RDEPENDS = "opie-mediaplayer1-core" APPNAME = "wavplugin" diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb index d5702318c9..5c49fb824f 100644 --- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb index 4cf1ac926d..427793481e 100644 --- a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb @@ -1,5 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/multimedia/opieplayer " diff --git a/packages/pango/pango-1.16.2/.mtn2git_empty b/packages/pango/pango-1.16.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pango/pango-1.16.2/.mtn2git_empty diff --git a/packages/pango/pango-1.16.2/no-tests.patch b/packages/pango/pango-1.16.2/no-tests.patch new file mode 100644 index 0000000000..dafcb20c3b --- /dev/null +++ b/packages/pango/pango-1.16.2/no-tests.patch @@ -0,0 +1,10 @@ +--- /tmp/Makefile.am 2007-03-01 13:29:37.000000000 +0100 ++++ pango-1.16.0/Makefile.am 2007-03-01 13:29:52.545251000 +0100 +@@ -1,6 +1,6 @@ + ## Process this file with automake to create Makefile.in. + +-SUBDIRS= pango modules pango-view examples docs tools tests ++SUBDIRS= pango modules pango-view examples docs tools + + EXTRA_DIST = \ + autogen.sh \ diff --git a/packages/pango/pango_1.16.2.bb b/packages/pango/pango_1.16.2.bb new file mode 100644 index 0000000000..8e3e8e7d3a --- /dev/null +++ b/packages/pango/pango_1.16.2.bb @@ -0,0 +1 @@ +require pango.inc diff --git a/packages/pimlico/contacts_0.4.bb b/packages/pimlico/contacts_0.4.bb index 28e4cc29ce..6f771e99bf 100644 --- a/packages/pimlico/contacts_0.4.bb +++ b/packages/pimlico/contacts_0.4.bb @@ -1,5 +1,5 @@ require contacts.inc -SRC_URI = "http://projects.o-hand.com/sources/${PN}/${PN}-${PV}.tar.gz \ +SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ file://stock_contact.png \ file://stock_person.png" diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc index 4f92b2c767..d4debfd28d 100644 --- a/packages/pimlico/dates.inc +++ b/packages/pimlico/dates.inc @@ -8,6 +8,7 @@ RCONFLICTS_${PN} = "openmoko-dates" inherit autotools pkgconfig gtk-icon-cache # EXTRA_OECONF = "--disable-debug" +EXTRA_OECONF = "--enable-owl=true" FILES_${PN} += "${datadir}/pixmaps/dates.png" diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.4.2.bb index 176d2b9077..d7f0185b86 100644 --- a/packages/pimlico/dates_0.3.1.bb +++ b/packages/pimlico/dates_0.4.2.bb @@ -1,5 +1,3 @@ require dates.inc -PR = "r3" - SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb index cac0eb4fae..facafe0a2a 100644 --- a/packages/pimlico/dates_svn.bb +++ b/packages/pimlico/dates_svn.bb @@ -1,10 +1,8 @@ require dates.inc -PR = "r2" - DEFAULT_PREFERENCE = "-1" -PV = "0.3.1+svn${SRCDATE}" +PV = "0.4.2+svn${SRCDATE}" S = "${WORKDIR}/trunk" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" diff --git a/packages/pimlico/files/tasks-single.diff b/packages/pimlico/files/tasks-single.diff new file mode 100644 index 0000000000..dd807ea256 --- /dev/null +++ b/packages/pimlico/files/tasks-single.diff @@ -0,0 +1,9 @@ +Index: tasks/data/tasks.desktop.in +=================================================================== +--- tasks/data/tasks.desktop.in (revision 115) ++++ tasks/data/tasks.desktop.in (working copy) +@@ -9,3 +9,4 @@ + Categories=GTK;Application;Office;ProjectManagement; + Terminal=false + StartupNotify=true ++SingleInstance=true diff --git a/packages/pimlico/tasks_0.4.bb b/packages/pimlico/tasks_0.4.bb index 679dedf9da..9601abae47 100644 --- a/packages/pimlico/tasks_0.4.bb +++ b/packages/pimlico/tasks_0.4.bb @@ -1,3 +1,6 @@ require tasks.inc -SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz" +PR = "r1" + +SRC_URI = "http://pimlico-project.org/sources/${PN}/${PN}-${PV}.tar.gz \ + file://tasks-single.diff;patch=1" diff --git a/packages/poppler/poppler.inc b/packages/poppler/poppler.inc index 14ae8220a8..c33d6f0ea1 100644 --- a/packages/poppler/poppler.inc +++ b/packages/poppler/poppler.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." DEPENDS = "fontconfig jpeg zlib gtk+ cairo" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" @@ -9,7 +9,7 @@ inherit autotools pkgconfig EXTRA_OECONF = " --enable-xpdf-headers \ --disable-gtk-test \ - --disable-poppler-qt \ + --disable-poppler-qt --disable-poppler-qt4 \ --enable-zlib \ " diff --git a/packages/poppler/poppler_0.5.4.bb b/packages/poppler/poppler_0.5.4.bb index ade41a276a..92c25bc0ac 100644 --- a/packages/poppler/poppler_0.5.4.bb +++ b/packages/poppler/poppler_0.5.4.bb @@ -1,2 +1,2 @@ require poppler.inc -PR = "r1" +PR = "r2" diff --git a/packages/python/python-2.4.4-manifest.inc b/packages/python/python-2.4.4-manifest.inc index 7a1035ac50..33f5bac2f2 100644 --- a/packages/python/python-2.4.4-manifest.inc +++ b/packages/python/python-2.4.4-manifest.inc @@ -10,13 +10,14 @@ PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc" -PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc" +PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc-dbg python-misc" DESCRIPTION_python-misc-dbg="Misc Python debug files" FILES_python-misc-dbg="${libdir}/python2.4/lib-dynload/.debug" RDEPENDS_python-misc-dbg="python-core" DESCRIPTION_python-misc="Misc Python files" +PR_python-misc="ml1" FILES_python-misc="${libdir}/python2.4/" RDEPENDS_python-misc="python-core" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index e2bc56762b..bd38da5359 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,207 +1,229 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r23" - -PACKAGES = "task-base \ - task-base-oh-minimal \ - task-base-core-default" +PR = "r26" + +PACKAGES = 'task-boot \ + task-base \ + task-distro-base \ + task-machine-base \ + \ + task-base-acpi \ + task-base-alsa \ + task-base-apm \ + task-base-bluetooth \ + task-base-ext2 \ + task-base-irda \ + task-base-keyboard \ + task-base-pci \ + task-base-pcmcia \ + task-base-phone \ + task-base-screen \ + task-base-serial \ + task-base-touchscreen \ + task-base-usbgadget \ + task-base-usbhost \ + task-base-wifi \ + \ + task-base-cramfs \ + task-base-ipsec \ + task-base-ipv6 \ + task-base-nfs \ + task-base-ppp \ + task-base-smbfs \ + \ + ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \ + ' ALLOW_EMPTY = "1" -PACKAGE_ARCH = "${MACHINE_ARCH}" +PACKAGE_ARCH = "all" -# Valid only in MACHINE_FEATURES: # -# kernel24 -# kernel26 -# apm -# keyboard -# touchscreen -# screen -# pci -# acpi -# phone +# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH +# +PACKAGE_ARCH_task-base = "${MACHINE_ARCH}" +PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}" +PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}" +PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}" -# Valid only in DISTRO_FEATURES: # -# nfs -# smbfs -# ipsec -# wifi -# ppp +# udev, devfsd, mdev (from busybox) or none +# +DISTRO_DEV_MANAGER ?= "${@base_contains("MACHINE_FEATURES", "kernel26", "udev","",d)} " -# Valid COMBINED_FEATURES: -# (These features need to be supported by both the machine and the distro) # -# alsa -# bluetooth -# ext2 -# irda -# pci -# pcmcia -# redboot -# uboot -# usbgadget -# usbhost +# sysvinit, upstart +# +DISTRO_INIT_MANAGER ?= "sysvinit" +# +# tinylogin, getty +# +DISTRO_LOGIN_MANAGER ?= "tinylogin" -DISTRO_CORE_PACKAGE ?= "task-base-core-default" +# +# linux-hotplug or none +# +HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} " # -# task-base +# dropbear, openssh or none # -RDEPENDS_task-base = "\ - ${DISTRO_CORE_PACKAGE} \ - kernel \ - ${@base_contains("MACHINE_FEATURES", "kernel24", "${task-base-kernel24-rdepends}", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "acpi", "${task-base-acpi-rdepends}", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "keyboard", "${task-base-keyboard-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pci", "${task-base-pci-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "uboot", "${task-base-uboot-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "redboot", "${task-base-redboot-rdepends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "raid", "${task-distro-raid-rdepends}", "",d)} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ - ${MACHINE_EXTRA_RDEPENDS} \ - ${DISTRO_EXTRA_RDEPENDS}" - -RRECOMMENDS_task-base = "\ - ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-extras-rrecommends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rrecommends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rrecommends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rrecommends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rrecommends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "usbgadget", "${task-base-usbgadget-rrecommends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rrecommends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rrecommends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rrecommends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rrecommends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rrecommends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "cramfs", "${task-distro-cramfs-rrecommends}", "",d)} \ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ - ${MACHINE_EXTRA_RRECOMMENDS} \ - ${DISTRO_EXTRA_RRECOMMENDS}" - - -# -# task-base-oh-minimal -# An example of a small cut down machine configuration -# -RDEPENDS_task-base-oh-minimal = "\ - kernel \ - ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" +DISTRO_SSH_DAEMON ?= "dropbear" -RRECOMMENDS_task-base-oh-minimal = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" +# +# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others +# +PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} " +# +# those ones can be set in machine config to supply packages needed to get machine booting +# +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" + +# +# task-base contain stuff needed for base system (machine related) +# +RDEPENDS_task-base = "\ + task-boot \ + task-distro-base \ + task-machine-base \ + ${DISTRO_SSH_DAEMON} \ + ${HOTPLUG} \ + \ + ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \ + ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \ + ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \ + ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \ + \ + ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \ + \ + ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \ + " -HOTPLUG ?= "linux-hotplug" +# +# packages added by distribution +# +RDEPENDS_task-distro-base = "${DISTRO_EXTRA_RDEPENDS}" +RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" -RDEPENDS_task-base-core-default = '\ +# +# packages added by machine config +# +RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}" +RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" + +# +# minimal set of packages - needed to boot +# +RDEPENDS_task-boot = "\ + kernel \ base-files \ base-passwd \ busybox \ initscripts \ - netbase \ - sysvinit \ - sysvinit-pidof \ - tinylogin \ modutils-initscripts \ - fuser \ - setserial' -# Lets see if we can kill off hotplug... -# ${HOTPLUG} -# ${@bootstrap_modutils_rdepends(d)} - + netbase \ + ${DISTRO_DEV_MANAGER} \ + ${DISTRO_INIT_MANAGER} \ + ${DISTRO_LOGIN_MANAGER} \ + ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_task-base-core-default = '\ - dropbear ' +RRECOMMENDS_task-boot = "\ + ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" -task-base-kernel24-rdepends = "\ - modutils-depmod \ - linux-hotplug " +RDEPENDS_task-base-kernel24 = "\ + modutils-depmod" -task-base-kernel26-rdepends = "\ - udev \ +RDEPENDS_task-base-kernel26 = "\ sysfsutils \ module-init-tools" -task-base-keyboard-rdepends = "\ - keymaps" - -task-base-pci-rdepends = "\ - pciutils" +RRECOMMENDS_task-base-kernel24 = "\ + kernel-module-input \ + kernel-module-uinput" -task-base-kernel26-extras-rrecommends = "\ +RRECOMMENDS_task-base-kernel26 = "\ kernel-module-input \ kernel-module-uinput" -task-base-acpi-rdepends = "\ +RDEPENDS_task-base-keyboard = "\ + keymaps" + +RDEPENDS_task-base-pci = "\ + pciutils" + +RDEPENDS_task-base-acpi = "\ acpid" -task-base-apm-rdepends = "\ +RDEPENDS_task-base-apm = "\ apm \ apmd \ - ${@base_contains("MACHINE_FEATURES", "kernel24", "network-suspend-scripts", "",d)}" + ${@base_contains('MACHINE_FEATURES', 'kernel24', 'network-suspend-scripts', '',d)}" -task-base-ext2-rdepends = "\ +RDEPENDS_task-base-ext2 = "\ hdparm \ e2fsprogs \ e2fsprogs-e2fsck \ e2fsprogs-mke2fs" -task-base-alsa-rdepends = "\ +RDEPENDS_task-base-alsa = "\ alsa-utils-alsactl \ alsa-utils-alsamixer" -task-base-alsa-rrecommends = "\ +# +# alsa-state is machine related so can be missing in feed, OSS support is optional +# +RRECOMMENDS_task-base-alsa = "\ + alsa-state \ kernel-module-snd-mixer-oss \ kernel-module-snd-pcm-oss" -task-base-pcmcia-rdepends = "\ +RDEPENDS_task-base-pcmcia = "\ ${PCMCIA_MANAGER} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-firmware", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-support", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "spectrum-fw", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-conf", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-conf", "",d)}" - -task-base-pcmcia-rrecommends = "\ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-firmware', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-support', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-conf', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-conf', '',d)}" + +RRECOMMENDS_task-base-pcmcia = "\ + ${@base_contains('MACHINE_FEATURES', 'kernel26', '${task-base-pcmcia26}', '${task-base-pcmcia24}',d)} \ kernel-module-pcmcia \ kernel-module-airo-cs \ kernel-module-pcnet-cs \ kernel-module-serial-cs \ kernel-module-ide-cs \ kernel-module-ide-disk \ - ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} " + " -task-base-pcmcia24-rrecommends = "\ - ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-modules-cs", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-modules-cs", "",d)}" +task-base-pcmcia24 = "\ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)}" -task-base-pcmcia26-rrecommends = "\ - ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-hostap-cs", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-orinoco-cs", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-spectrum-cs", "",d)}" +task-base-pcmcia26 = "\ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" -task-base-bluetooth-rdepends = "\ - blueprobe \ - bluez-utils" +RDEPENDS_task-base-bluetooth = "\ + blueprobe \ + bluez-utils" -task-base-bluetooth-rrecommends = "\ +RRECOMMENDS_task-base-bluetooth = "\ kernel-module-bluetooth \ kernel-module-l2cap \ kernel-module-rfcomm \ @@ -210,39 +232,39 @@ task-base-bluetooth-rrecommends = "\ kernel-module-hidp \ kernel-module-hci-uart \ kernel-module-sco \ - ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-dtl1-cs", "",d)}" + ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)}" -task-base-irda-rdepends = "\ +RDEPENDS_task-base-irda = "\ irda-utils" -task-base-irda-rrecommends = "\ +RRECOMMENDS_task-base-irda = "\ kernel-module-pxaficp-ir \ kernel-module-irda \ kernel-module-ircomm \ kernel-module-ircomm-tty \ kernel-module-irlan \ - ${@base_contains("DISTRO_FEATURES", "ppp", "kernel-module-irnet", "",d)} \ + ${@base_contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \ kernel-module-irport \ kernel-module-irtty \ kernel-module-irtty-sir \ kernel-module-sir-dev \ - ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-ir-usb", "",d)} " + ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} " -task-base-usbgadget-rrecommends = "\ +RRECOMMENDS_task-base-usbgadget = "\ kernel-module-pxa27x_udc \ kernel-module-gadgetfs \ kernel-module-g-file-storage \ kernel-module-g-serial \ kernel-module-g-ether" -task-base-usbhost-rdepends = "\ +RDEPENDS_task-base-usbhost = "\ usbutils " -task-base-usbhost-rrecommends = "\ +RRECOMMENDS_task-base-usbhost = "\ kernel-module-uhci-hcd \ kernel-module-ohci-hcd \ kernel-module-ehci-hcd \ @@ -256,34 +278,41 @@ task-base-usbhost-rrecommends = "\ kernel-module-usbserial \ kernel-module-usb-storage " -task-base-uboot-rdepends = "\ - uboot-utils" +RDEPENDS_task-base-uboot = "\ + uboot-utils" -task-base-redboot-rdepends = "\ - fis" +RDEPENDS_task-base-redboot = "\ + fis" -task-distro-ppp-rdepends = "\ +RDEPENDS_task-base-ppp = "\ ppp \ ppp-dialin" -task-distro-ppp-rrecommends = "\ +RRECOMMENDS_task-base-ppp = "\ kernel-module-ppp-async \ kernel-module-ppp-deflate \ kernel-module-ppp-mppe" -task-distro-ipsec-rdepends = "\ +RDEPENDS_task-base-ipsec = "\ openswan" -task-distro-ipsec-rrecommends = "\ +RRECOMMENDS_task-base-ipsec = "\ kernel-module-ipsec" -task-distro-wifi-rdepends = "\ +# +# task-base-wifi contain everything needed to get WiFi working +# WEP/WPA connection needs to be supported out-of-box +# +RDEPENDS_task-base-wifi = "\ wireless-tools \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pci', 'madwifi-ng-tools', '',d)} \ wpa-supplicant" -task-distro-wifi-rrecommends = "\ +RRECOMMENDS_task-base-wifi = "\ + ${@base_contains('COMBINED_FEATURES', 'pci', 'madwifi-ng-modules', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ kernel-module-ieee80211-crypt \ kernel-module-ieee80211-crypt-ccmp \ kernel-module-ieee80211-crypt-tkip \ @@ -293,30 +322,49 @@ task-distro-wifi-rrecommends = "\ kernel-module-michael-mic \ kernel-module-aes" -task-distro-smbfs-rrecommends = "\ +RRECOMMENDS_task-base-smbfs = "\ kernel-module-cifs \ kernel-module-smbfs" -task-distro-cramfs-rrecommends = "\ +RRECOMMENDS_task-base-cramfs = "\ kernel-module-cramfs" -task-distro-nfs-rdepends = "\ +# +# task-base-nfs provides ONLY client support - server is in nfs-utils package +# +RDEPENDS_task-base-nfs = "\ portmap" -task-distro-nfs-rrecommends = "\ - kernel-module-nfs \ - kernel-module-lockd \ - kernel-module-sunrpc" +RRECOMMENDS_task-base-nfs = "\ + kernel-module-nfs " + +RDEPENDS_task-base-raid = "\ + " -task-distro-raid-rdepends = "\ +RDEPENDS_task-base-screen = "\ " +# +# GPE/OPIE/OpenMoko provide own touchscreen calibration utils +# +RDEPENDS_task-base-touchscreen = "\ + tslib-tests \ + tslib-calibrate " + +RDEPENDS_task-base-ipv6 = "\ + " + +RRECOMMENDS_task-base-ipv6 = "\ + kernel-module-ipv6 " + +RDEPENDS_task-base-serial = "\ + setserial \ + lrzsz " + # Tosort -# kernel-module-ipv6 # kernel-module-nvrd # kernel-module-mip6-mn # kernel-module-tun -# kernel-module-ide-disk # kernel-module-ide-probe-mo # kernel-module-loop # kernel-module-vfat @@ -330,4 +378,3 @@ task-distro-raid-rdepends = "\ # kernel-module-md5 # kernel-module-8250 # Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz - diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb index b59b3ceea3..ed9460ef13 100644 --- a/packages/tasks/task-gpe.bb +++ b/packages/tasks/task-gpe.bb @@ -16,11 +16,11 @@ PACKAGES = "\ gpe-task-desktopapps \ gpe-task-sectest" -RDEPENDS_gpe-base-depends := "\ +RDEPENDS_gpe-base-depends = "\ diet-x11 \ virtual/xserver" -RDEPENDS_gpe-task-base := "\ +RDEPENDS_gpe-task-base = "\ gpe-bootsplash \ bluez-utils-dbus \ matchbox \ @@ -49,7 +49,7 @@ RDEPENDS_gpe-task-base := "\ pango-module-basic-x \ pango-module-basic-fc" -RDEPENDS_gpe-task-pim := "\ +RDEPENDS_gpe-task-pim = "\ gpe-timesheet \ gpe-todo \ gpe-calendar \ @@ -58,7 +58,7 @@ RDEPENDS_gpe-task-pim := "\ gpe-today \ gpesyncd" -RDEPENDS_gpe-task-settings := "\ +RDEPENDS_gpe-task-settings = "\ matchbox-panel-manager \ gpe-bluetooth \ gpe-beam \ @@ -75,7 +75,7 @@ RDEPENDS_gpe-task-settings := "\ minimix \ xmonobut" -RDEPENDS_gpe-task-apps := "\ +RDEPENDS_gpe-task-apps = "\ gpe-edit \ gpe-gallery \ gpe-calculator \ @@ -91,7 +91,7 @@ RDEPENDS_gpe-task-apps := "\ gpe-scap \ gpe-windowlist" -RDEPENDS_gpe-task-games := "\ +RDEPENDS_gpe-task-games = "\ gpe-go \ gpe-lights \ gpe-othello \ @@ -99,22 +99,22 @@ RDEPENDS_gpe-task-games := "\ gsoko \ xdemineur" -RDEPENDS_gpe-task-connectivity := "\ +RDEPENDS_gpe-task-connectivity = "\ gpe-mini-browser" # gaim # linphone-hh -RDEPENDS_gpe-task-apps-extra := "\ +RDEPENDS_gpe-task-apps-extra = "\ gpe-filemanager \ gpe-soundbite \ mbmerlin" -RDEPENDS_gpe-task-web := "\ +RDEPENDS_gpe-task-web = "\ gpe-irc \ minimo \ gaim" -RDEPENDS_gpe-task-desktopapps := "\ +RDEPENDS_gpe-task-desktopapps = "\ firefox \ thunderbird \ galculator \ @@ -122,7 +122,7 @@ RDEPENDS_gpe-task-desktopapps := "\ gpdf \ totem" -RDEPENDS_gpe-task-sectest := "\ +RDEPENDS_gpe-task-sectest = "\ mbmerlin \ nmap \ ettercap \ diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb index a480a03b86..96a27e6ed2 100644 --- a/packages/tasks/task-gpephone.bb +++ b/packages/tasks/task-gpephone.bb @@ -12,11 +12,11 @@ PACKAGES = "\ gpephone-task-apps \ gpephone-task-development" -RDEPENDS_gpephone-base-depends := "\ +RDEPENDS_gpephone-base-depends = "\ diet-x11 \ virtual/xserver" -RDEPENDS_gpephone-task-development := "\ +RDEPENDS_gpephone-task-development = "\ rxvt-unicode \ xmonobut \ gpe-terminal \ @@ -25,7 +25,7 @@ RDEPENDS_gpephone-task-development := "\ strace \ e2fsprogs" -RDEPENDS_gpephone-task-base := "\ +RDEPENDS_gpephone-task-base = "\ cms92init \ gsmmux \ connect \ @@ -73,10 +73,10 @@ RDEPENDS_gpephone-task-base := "\ ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus xtscal", "",d)} \ " -RDEPENDS_gpephone-task-pim := "\ +RDEPENDS_gpephone-task-pim = "\ gpesyncd" -RDEPENDS_gpephone-task-settings := "\ +RDEPENDS_gpephone-task-settings = "\ gpe-su \ gpe-conf \ gpe-clock \ @@ -85,12 +85,12 @@ RDEPENDS_gpephone-task-settings := "\ keylaunch \ minilite" -RDEPENDS_gpephone-task-apps := "\ +RDEPENDS_gpephone-task-apps = "\ gpe-watch \ gpe-what \ matchbox-panel-hacks \ gpe-scap \ gpe-windowlist" -RDEPENDS_gpephone-task-connectivity := "\ +RDEPENDS_gpephone-task-connectivity = "\ " diff --git a/packages/tasks/task-sdk-base.bb b/packages/tasks/task-sdk-base.bb index 3bf708902f..52956239eb 100644 --- a/packages/tasks/task-sdk-base.bb +++ b/packages/tasks/task-sdk-base.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" DEPENDS = "task-sdk" -RDEPENDS := "\ +RDEPENDS = "\ task-sdk-bare \ glibc \ glibc-dev \ diff --git a/packages/tasks/task-sdk-extra.bb b/packages/tasks/task-sdk-extra.bb index 805974c9b5..33f8e3a5e8 100644 --- a/packages/tasks/task-sdk-extra.bb +++ b/packages/tasks/task-sdk-extra.bb @@ -8,7 +8,7 @@ PACKAGES = "\ task-sdk-x11-ext \ task-sdk-gpe" -RDEPENDS_task-sdk-x11 := "\ +RDEPENDS_task-sdk-x11 = "\ atk-dev \ cairo-dev \ gconf-dbus-dev \ @@ -20,7 +20,7 @@ RDEPENDS_task-sdk-x11 := "\ pango-dev \ startup-notification-dev" -RDEPENDS_task-sdk-x11-ext := "\ +RDEPENDS_task-sdk-x11-ext = "\ libxcursor-dev \ libxdmcp-dev \ libxft-dev \ @@ -45,7 +45,7 @@ RDEPENDS_task-sdk-x11-ext := "\ libxtst-dev" -RDEPENDS_task-sdk-gpe := "\ +RDEPENDS_task-sdk-gpe = "\ libcontactsdb-dev \ esound-dev \ libeventdb-dev \ diff --git a/packages/tasks/task-sdk-gpephone.bb b/packages/tasks/task-sdk-gpephone.bb index 10afccf477..56b398b04e 100644 --- a/packages/tasks/task-sdk-gpephone.bb +++ b/packages/tasks/task-sdk-gpephone.bb @@ -3,7 +3,7 @@ PR = "r0" LICENSE = "MIT" ALLOW_EMPTY = "1" -RDEPENDS := "\ +RDEPENDS = "\ libidn-dev \ libim-dev \ gloox-dev \ diff --git a/packages/tasks/task-sdk-opie.bb b/packages/tasks/task-sdk-opie.bb index 34fca7bcc6..0c4c1f6558 100644 --- a/packages/tasks/task-sdk-opie.bb +++ b/packages/tasks/task-sdk-opie.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" PACKAGES = "task-sdk-opie" -RDEPENDS_task-sdk-opie := "\ +RDEPENDS_task-sdk-opie = "\ libopiebluez2 \ libopiedb2 \ libopiecore2 \ diff --git a/packages/tasks/task-sdk-sbox-gpe.bb b/packages/tasks/task-sdk-sbox-gpe.bb index 77950dfb01..930de7cd2e 100644 --- a/packages/tasks/task-sdk-sbox-gpe.bb +++ b/packages/tasks/task-sdk-sbox-gpe.bb @@ -3,7 +3,7 @@ PR = "r0" LICENSE = "MIT" ALLOW_EMPTY = "1" -RDEPENDS := "\ +RDEPENDS = "\ glib-2.0-utils \ gdk-pixbuf-loader-png \ gdk-pixbuf-loader-jpeg \ diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb index aa8dddfbd8..2d73fe2716 100644 --- a/packages/tasks/task-sdk-sbox.bb +++ b/packages/tasks/task-sdk-sbox.bb @@ -3,7 +3,7 @@ PR = "r6" LICENSE = "MIT" ALLOW_EMPTY = "1" -RDEPENDS := "\ +RDEPENDS = "\ strace \ gdb \ sbrsh \ diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index 6e6770c913..fee2be51b8 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -7,7 +7,7 @@ PACKAGES = "\ task-sdk-bare \ " -RDEPENDS_task-sdk-bare := "\ +RDEPENDS_task-sdk-bare = "\ glibc \ glibc-dev \ libgcc1 \ diff --git a/packages/tasks/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb index bd6841f025..3a4081199b 100644 --- a/packages/tasks/task-xfce-base.bb +++ b/packages/tasks/task-xfce-base.bb @@ -8,7 +8,7 @@ ALLOW_EMPTY = "1" PACKAGES = "${PN}" PR = "r2" -RDEPENDS= "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \ +RDEPENDS = "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \ xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \ xfce4-panel-mcs-plugins \ xfdesktop-mcs-plugins" diff --git a/packages/uboot/uboot-gta01_svn.bb b/packages/uboot/uboot-gta01_svn.bb index b30a5bc66e..d026efccc1 100644 --- a/packages/uboot/uboot-gta01_svn.bb +++ b/packages/uboot/uboot-gta01_svn.bb @@ -18,7 +18,9 @@ TARGET_LDFLAGS = "" UBOOT_MACHINES = "gta01v3 gta01v4 gta01bv2 gta01bv3" do_quilt() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av + mv ${WORKDIR}/patches ${S}/patches + cd ${S} + quilt push -av rm -Rf patches .pc } diff --git a/packages/vte/vte_0.11.15.bb b/packages/vte/vte_0.11.15.bb index 7b1c7c803c..274cd81070 100644 --- a/packages/vte/vte_0.11.15.bb +++ b/packages/vte/vte_0.11.15.bb @@ -1,7 +1,9 @@ LICENSE = "LGPL" +PR = "r1" inherit gnome +EXTRA_OECONF = "--disable-gtk-doc" do_stage() { autotools_stage_all |