diff options
26 files changed, 284 insertions, 343 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 3fb2d04a81..bc72ea5b3b 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -21,7 +21,7 @@ # We play a special package function inherit package -PACKAGE_DEPENDS += "pax-utils-native" +PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native" #PACKAGE_DEPENDS += chrpath-native" PACKAGEFUNCS += " do_package_qa " @@ -308,8 +308,22 @@ def package_qa_check_pcla(path,name,d): .pc and .la files should not point to the WORKDIR """ sane = True + # TODO return sane +def package_qa_check_desktop(path, name, d): + """ + Run all desktop files through desktop-file-validate. + """ + import bb, os + if path.endswith(".desktop"): + validate = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True), 'desktop-file-validate') + output = os.popen("%s %s" % (validate, path)) + # This only produces output on errors + for l in output: + bb.error(l.strip()) + return True + def package_qa_check_staged(path,d): """ Check staged la and pc files for sanity @@ -416,9 +430,13 @@ python do_package_qa () { walk_sane = True rdepends_sane = True for package in packages.split(): + if bb.data.getVar('INSANE_SKIP_' + package, d, True): + bb.note("Package: %s (skipped)" % package) + continue + bb.note("Checking Package: %s" % package) path = "%s/install/%s" % (workdir, package) - if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch], package, d): + if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch, package_qa_check_desktop], package, d): walk_sane = False if not package_qa_check_rdepends(package, workdir, d): rdepends_sane = False diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index e5db7a9ceb..ccd458da89 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -88,6 +88,7 @@ SRCDATE_eflpp ?= "${EFL_SRCDATE}" SRCDATE_python-evas ?= "${EFL_SRCDATE}" SRCDATE_python-ecore ?= "${EFL_SRCDATE}" SRCDATE_python-edje ?= "${EFL_SRCDATE}" +SRCDATE_python-emotion ?= "${EFL_SRCDATE}" SRCDATE_python-ewl ?= "${EFL_SRCDATE}" SRCDATE_python-etk ?= "${EFL_SRCDATE}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 864f6fe178..b5682eb3e9 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -48,9 +48,9 @@ SRCREV_pn-matchbox-desktop-2 ?= "1778" SRCREV_pn-matchbox-keyboard ?= "1739" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" -SRCREV_pn-moko-gtk-engine ?= "3207" +SRCREV_pn-moko-gtk-engine ?= "3405" SRCREV_pn-mpd-alsa ?= "6952" -SRCREV_pn-neod ?= "3358" +SRCREV_pn-neod ?= "3421" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" @@ -81,6 +81,7 @@ SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" SRCREV_pn-openmoko-mediaplayer2 ?= "3300" SRCREV_pn-openmoko-messages ?= "2276" +SRCREV_pn-openmoko-messages2 ?= "3424" SRCREV_pn-openmoko-panel-battery ?= "3360" SRCREV_pn-openmoko-panel-bt ?= "2896" SRCREV_pn-openmoko-panel-clock ?= "2567" @@ -105,7 +106,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "3289" SRCREV_pn-openmoko-theme-standard2-qvga ?= "3289" SRCREV_pn-openmoko-today ?= "3056" SRCREV_pn-openmoko-today2 ?= "3342" -SRCREV_pn-openmoko-today2-folders ?= "2680" +SRCREV_pn-openmoko-today2-folders ?= "3414" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 758f6c612f..f2007c231f 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -24,10 +24,12 @@ PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/" FEED_URIS = "\ snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \ snapshot-armv4t##http://buildhost.openmoko.org/snapshots/2007.08/ipk/armv4t \ + snapshot-neo1973##http://buildhost.openmoko.org/snapshots/2007.08/ipk/neo1973 \ snapshot-fic-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/fic-gta01 \ \ updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \ updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \ + updates-neo1973##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/neo1973 \ updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/fic-gta01 " # 2.18 seems to break badly on 64-bit systems diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index d70db72f38..d8ea4b8890 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -6,9 +6,6 @@ require conf/machine/include/zaurus-2.6.inc IMAGE_FSTYPES ?= "jffs2" -# newer kernels does not build -PREFERRED_VERSION_linux-rp = "2.6.17" - # wlan-ng Modules MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb" diff --git a/packages/desktop-file-utils/desktop-file-utils-native_0.14.bb b/packages/desktop-file-utils/desktop-file-utils-native_0.14.bb new file mode 100644 index 0000000000..9603982ea6 --- /dev/null +++ b/packages/desktop-file-utils/desktop-file-utils-native_0.14.bb @@ -0,0 +1,12 @@ +SECTION = "console/utils" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/desktop-file-utils" +DESCRIPTION = "command line utilities to work with *.desktop files" +LICENSE = "GPL" + +DEPENDS = "glib-2.0-native" + +SRC_URI = "http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz" + +inherit autotools native + +S = "${WORKDIR}/desktop-file-utils-${PV}" diff --git a/packages/ettercap/ettercap-0.6.b/configure.patch b/packages/ettercap/ettercap-0.6.b/configure.patch deleted file mode 100644 index 89132125b8..0000000000 --- a/packages/ettercap/ettercap-0.6.b/configure.patch +++ /dev/null @@ -1,165 +0,0 @@ ---- tmp/base/ettercap-0.6.b-r0/ettercap-0.6.b/acinclude.m4 Thu Jul 10 03:25:31 2003 -+++ ettercap-0.6.b/acinclude.m4 Thu Nov 6 18:25:39 2003 -@@ -182,9 +182,11 @@ - dnl HAVE_SOCKLEN_T - dnl - --AC_DEFUN(EC_SOCKLEN_CHECK, -- [AC_MSG_CHECKING(for socklen_t in sys/socket.h) -+samba_cv_socklen_t - -+AC_DEFUN(EC_SOCKLEN_CHECK, -+ [AC_CACHE_CHECK([for socklen_t in sys/socket.h], -+ [ettercap_cv_type_socklen_t], - AC_TRY_RUN([ - #include <sys/types.h> - #include <sys/socket.h> -@@ -197,14 +199,12 @@ - return 0; - } - ], -- [ AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_SOCKLEN_T) -- ], -- AC_MSG_RESULT(no); -- , -- AC_MSG_RESULT(unkown when cross-compiling) -- ) -+ [ettercap_cv_type_socklen_t=yes], -+ [ettercap_cv_type_socklen_t=no])) - -+ if test X$ettercap_cv_type_socklen_t = Xyes; then -+ AC_DEFINE(HAVE_SOCKLEN_T) -+ fi - ]) - - -@@ -377,24 +377,78 @@ - - AC_DEFUN(EC_NS_GET,[ - -- AC_MSG_CHECKING(for NS_GET32) -- AC_TRY_RUN([ -- #include <arpa/nameser.h> -+AC_CACHE_CHECK([for NS_GET32], -+ ec_cv_func_ns_get32, -+ [AC_TRY_LINK([ -+ #include <arpa/nameser.h> -+ ], -+ [ -+ int i; -+ char *p = "\x01\x02\x03\x04"; -+ NS_GET32(i, p); -+ ], -+ ec_cv_func_ns_get32=yes, -+ ec_cv_func_ns_get32=no) -+ if test X$ec_cv_func_ns_get32 = Xyes; then -+ AC_DEFINE(HAVE_NS_GET,1) -+ fi]) -+]) - -- int main() -- { -- int i; -- char *p = "\x01\x02\x03\x04"; -- NS_GET32(i, p); -+dnl vim:ts=3:expandtab - -- return 0; -- } -- ], -- [ AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_NS_GET,1) ], -- [ AC_MSG_RESULT(no); ] -- ) -+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -+dnl also defines GSTUFF_PKG_ERRORS on error -+AC_DEFUN(PKG_CHECK_MODULES, [ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ fi -+ -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ AC_MSG_CHECKING(for $2) -+ -+ if $PKG_CONFIG --exists "$2" ; then -+ AC_MSG_RESULT(yes) -+ succeeded=yes -+ -+ AC_MSG_CHECKING($1_CFLAGS) -+ $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` -+ AC_MSG_RESULT($$1_CFLAGS) -+ -+ AC_MSG_CHECKING($1_LIBS) -+ $1_LIBS=`$PKG_CONFIG --libs "$2"` -+ AC_MSG_RESULT($$1_LIBS) -+ else -+ $1_CFLAGS="" -+ $1_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ ifelse([$4], ,echo $$1_PKG_ERRORS,) -+ fi -+ -+ AC_SUBST($1_CFLAGS) -+ AC_SUBST($1_LIBS) -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi - -+ if test $succeeded = yes; then -+ ifelse([$3], , :, [$3]) -+ else -+ ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) -+ fi - ]) - --dnl vim:ts=3:expandtab -+ ---- tmp/base/ettercap-0.6.b-r0/ettercap-0.6.b/configure.in Thu Jul 10 03:25:31 2003 -+++ ettercap-0.6.b/configure.in Thu Nov 6 18:13:44 2003 -@@ -20,9 +20,10 @@ - dnl $Id: configure.in,v 1.69 2003/06/30 19:57:41 alor Exp $ - dnl - --AC_PREREQ([2.50]) -+AC_PREREQ(2.57) - --AC_INIT(src/ec_main.c) -+AC_INIT -+AC_CONFIG_SRCDIR([src/ec_main.c]) - AC_CONFIG_HEADER(config.h) - - echo "char configure_line[[]] = \"$0 $*\";" > ./src/include/ec_debug_info.h -@@ -77,7 +78,7 @@ - dnl Check the OS - dnl ================ - --AC_CANONICAL_SYSTEM -+AC_CANONICAL_TARGET([]) - case "$target_os" in - *linux*) - EC_LINUX_KERNEL() -@@ -868,7 +869,8 @@ - - AC_SUBST(MAKEPLUG) - --AC_OUTPUT(ettercap.spec ettercap.8 Makefile $makeplug win32/ettercap.nsi) -+AC_CONFIG_FILES([ettercap.spec ettercap.8 Makefile $makeplug win32/ettercap.nsi]) -+AC_OUTPUT - - dnl ============================ - dnl FOR DEBUGING INFORMATIONS diff --git a/packages/ettercap/ettercap-ng_0.7.3.bb b/packages/ettercap/ettercap-ng_0.7.3.bb new file mode 100644 index 0000000000..c9e73d9ea0 --- /dev/null +++ b/packages/ettercap/ettercap-ng_0.7.3.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "network sniffer/interceptor/logger for ethernet LANs. It \ +supports active and passive dissection of many protocols (even ciphered ones, \ +like SSH and HTTPS)." +SECTION = "console/network" +DEPENDS = "virtual/libiconv libnet libpcap openssl libpcre ncurses zlib libtool" +LICENSE = "GPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/ettercap/ettercap-NG-${PV}.tar.gz \ + file://autotools.patch;patch=1" + +S = "${WORKDIR}/ettercap-NG-${PV}" + +inherit autotools + +EXTRA_OECONF += "--disable-gtk" + +FILES_${PN} += "${datadir} ${libdir}/ettercap/*.so" +FILES_${PN}-dbg += "${libdir}/ettercap/.debug" diff --git a/packages/ettercap/ettercap_0.6.b.bb b/packages/ettercap/ettercap_0.6.b.bb deleted file mode 100644 index d5983d4481..0000000000 --- a/packages/ettercap/ettercap_0.6.b.bb +++ /dev/null @@ -1,14 +0,0 @@ -SECTION = "console/network" -DEPENDS = "ncurses openssl" -LICENSE = "GPL" -DESCRIPTION = "Ettercap is a network sniffer/interceptor/logger \ -for ethernet LANs. It supports active and passive dissection of \ -many protocols (even ciphered ones, like SSH and HTTPS)." - -SRC_URI = "${SOURCEFORGE_MIRROR}/ettercap/ettercap-${PV}.tar.gz \ - file://configure.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--disable-gtk \ - --with-openssl=${STAGING_LIBDIR}/.." diff --git a/packages/ettercap/ettercap-0.6.b/.mtn2git_empty b/packages/ettercap/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ettercap/ettercap-0.6.b/.mtn2git_empty +++ b/packages/ettercap/files/.mtn2git_empty diff --git a/packages/ettercap/files/autotools.patch b/packages/ettercap/files/autotools.patch new file mode 100644 index 0000000000..b6024c48c7 --- /dev/null +++ b/packages/ettercap/files/autotools.patch @@ -0,0 +1,173 @@ +diff -ur ettercap-NG-0.7.3/configure.in ettercap-NG-0.7.3-changed/configure.in +--- ettercap-NG-0.7.3/configure.in 2005-01-13 10:24:28.000000000 +0100 ++++ ettercap-NG-0.7.3-changed/configure.in 2007-11-07 11:42:25.000000000 +0100 +@@ -178,6 +178,7 @@ + + AC_PROG_CC + AM_PROG_CC_STDC ++AM_PROG_CC_C_O + AC_PROG_INSTALL + AC_PROG_MAKE_SET + AC_PROG_GCC_TRADITIONAL +@@ -236,7 +237,7 @@ + AC_CHECK_HEADERS(sys/poll.h poll.h sys/select.h) + AC_CHECK_HEADERS(sys/cdefs.h) + dnl nameser NS_GET32 and so on... +-EC_NS_GET() ++dnl EC_NS_GET() + + dnl ================================================================== + dnl Checks for typedefs, structures, and compiler characteristics. +@@ -379,129 +380,6 @@ + dnl ================== + + +-dnl --------- +-dnl libpcap +-dnl --------- +-ac_ec_libpcap=default +- +-AC_MSG_CHECKING(for libpcap) +-AC_ARG_WITH(libpcap, AC_HELP_STRING(--with-libpcap=DIR,use libpcap in DIR), +-[ case "$withval" in +- no) +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(["*** ettercap cannot operate without libpcap. ***"]) +- ;; +- *) +- if test -f $withval/pcap.h; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval" +- if test "$OS" = "WINDOWS"; then +- PCAPLIB="-L$withval -lwpcap -lpacket" +- else +- PCAPLIB="-L$withval -lpcap" +- fi +- ac_ec_libpcap=$withval +- AC_MSG_RESULT($withval) +- elif test -f $withval/include/pcap.h; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval/include" +- if test "$OS" = "WINDOWS"; then +- PCAPLIB="-L$withval/lib -lwpcap -lpacket" +- else +- PCAPLIB="-L$withval/lib -lpcap" +- fi +- ac_ec_libpcap=$withval +- AC_MSG_RESULT($withval) +- else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([pcap.h not found in $withval]) +- fi +- ;; +- esac ], +-[ if test -f /usr/include/pcap/pcap.h; then +- PCAPINC="-I/usr/include/pcap" +- if test "$OS" = "WINDOWS"; then +- PCAPLIB="-lwpcap -lpacket" +- else +- PCAPLIB="-lpcap" +- fi +- elif test -f /usr/include/pcap.h; then +- if test "$OS" = "WINDOWS"; then +- PCAPLIB="-lwpcap -lpacket" +- else +- PCAPLIB="-lpcap" +- fi +- elif test -f /usr/local/include/pcap.h; then +- PCAPINC="-I/usr/local/include" +- if test "$OS" = "WINDOWS"; then +- PCAPLIB="-lwpcap -lpacket" +- else +- PCAPLIB="-lpcap" +- fi +- else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([libpcap not found]) +- fi +- AC_MSG_RESULT(yes) ] +-) +- +-if test "$OS" = "WINDOWS"; then +- EC_CHECK_FUNC(wpcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required])) +- EC_CHECK_FUNC(packet, PacketInitPacket, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required])) +- AC_CHECK_LIB(ws2_32, ntohs,, AC_MSG_ERROR([Incorrect ws2_32 version.])) +- AC_CHECK_LIB(iphlpapi, main) +-else +- EC_CHECK_FUNC(pcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required])) +-fi +- +-dnl --------- +-dnl libnet +-dnl --------- +-ac_ec_libnet=default +- +-AC_MSG_CHECKING(for libnet) +-AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,use libnet in DIR), +-[ case "$withval" in +- no) +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(["*** ettercap cannot operate without libnet. ***"]) +- ;; +- *) +- if test -f $withval/lnet.h; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- LNETINC="-I$withval" +- LNETLIB="-L$withval -lnet" +- ac_ec_libnet=$withval +- AC_MSG_RESULT($withval) +- elif test -f $withval/include/libnet.h; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- LNETINC="-I$withval/include" +- LNETLIB="-L$withval/lib -L$withval/src -lnet" +- ac_ec_libnet=$withval +- AC_MSG_RESULT($withval) +- else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([libnet.h not found in $withval]) +- fi +- ;; +- esac ], +-[ if test -f /usr/include/libnet.h; then +- AC_MSG_RESULT(yes) +- LNETINC="" +- LNETLIB="-lnet" +- else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR([libnet >= 1.1.2.1 not found]) +- fi +-] +-) +- +-EC_CHECK_FUNC(net, libnet_adv_free_packet, $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required])) +- + dnl ------------------ + dnl Checks for openssl + dnl ------------------ +@@ -794,7 +672,8 @@ + dnl set up the final vars + dnl ----------------------- + EC_CFLAGS="$DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC" +-EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB" ++dnl EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB" ++EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB -lpcap -lnet" + + AC_SUBST(EC_CFLAGS) + AC_SUBST(EC_LIBS) +diff -ur ettercap-NG-0.7.3/src/Makefile.am ettercap-NG-0.7.3-changed/src/Makefile.am +--- ettercap-NG-0.7.3/src/Makefile.am 2005-01-13 10:18:48.000000000 +0100 ++++ ettercap-NG-0.7.3-changed/src/Makefile.am 2007-11-06 20:15:12.000000000 +0100 +@@ -127,8 +127,7 @@ + + ettercap_CFLAGS = @EC_CFLAGS@ + +-ettercap_LDADD = @LIBOBJS@ \ +- os/libec_os.a \ ++ettercap_LDADD = missing/strlcpy.o os/libec_os.a \ + interfaces/daemon/libec_daemon.a \ + interfaces/text/libec_text.a + diff --git a/packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch b/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch index 9b8434a0bc..034acc7b8e 100644 --- a/packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch +++ b/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch @@ -3,8 +3,8 @@ Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-14 16:58:47.637707413 +0300 -@@ -0,0 +1,530 @@ ++++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-13 01:35:13.049455112 +0300 +@@ -0,0 +1,417 @@ +/* + * OHCI HCD(Host Controller Driver) for USB. + * @@ -53,14 +53,6 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + +/*-------------------------------------------------------------------------*/ + -+#define MAX_TMIO_USB_PORTS 2 -+static bool default_tmio_ports[MAX_TMIO_USB_PORTS]; -+module_param_array(default_tmio_ports, bool, NULL, 0644); -+MODULE_PARM_DESC(default_tmio_ports, -+ "disable specified TC6393 usb ports (default: all enabled)"); -+ -+/*-------------------------------------------------------------------------*/ -+ +/* + * USB Host Controller Configuration Register + */ @@ -95,8 +87,8 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c +struct { + unsigned gcken:1; /* D0 */ + unsigned ckrnen:1; /* D1 */ -+ unsigned uspw0:1; /* D2 USB Port 1 Power Disable */ -+ unsigned uspw1:1; /* D3 USB Port 2 Power Disable */ ++ unsigned uspw1:1; /* D2 USB Port 1 Power Disable */ ++ unsigned uspw2:1; /* D3 USB Port 2 Power Disable */ + unsigned x00:4; + unsigned pmee:1; /* D8 */ + unsigned x01:6; @@ -108,7 +100,6 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + +struct tmio_hcd { + struct tmio_uhccr __iomem *ccr; -+ bool disabled_ports[MAX_TMIO_USB_PORTS]; +}; + +#define hcd_to_tmio(hcd) ((struct tmio_hcd *)(hcd_to_ohci(hcd) + 1)) @@ -116,39 +107,6 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + +/*-------------------------------------------------------------------------*/ + -+struct indexed_device_attribute{ -+ struct device_attribute dev_attr; -+ int index; -+}; -+#define to_indexed_dev_attr(_dev_attr) \ -+ container_of(_dev_attr, struct indexed_device_attribute, dev_attr) -+ -+#define INDEXED_ATTR(_name, _mode, _show, _store, _index) \ -+ { .dev_attr = __ATTR(_name ## _index, _mode, _show, _store), \ -+ .index = _index } -+ -+#define INDEXED_DEVICE_ATTR(_name, _mode, _show, _store, _index) \ -+struct indexed_device_attribute dev_attr_##_name ## _index \ -+ = INDEXED_ATTR(_name, _mode, _show, _store, _index) -+ -+/*-------------------------------------------------------------------------*/ -+ -+ -+static void tmio_fill_pm(struct tmio_hcd *tmio, union tmio_uhccr_pm *pm) -+{ -+ pm->raw = 0; -+ -+ pm->pmee = 1; -+ pm->pmes = 1; -+ pm->gcken = 1; -+ pm->ckrnen = 1; -+ -+ if (tmio->disabled_ports[0]) -+ pm->uspw0 = 1; -+ if (tmio->disabled_ports[1]) -+ pm->uspw1 = 1; -+} -+ +static void tmio_stop_hc(struct device *dev) +{ + struct tmio_device *tdev = dev_to_tdev(dev); @@ -159,8 +117,8 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + + pm.gcken = 1; + pm.ckrnen = 1; -+ pm.uspw0 = 1; + pm.uspw1 = 1; ++ pm.uspw2 = 1; + + iowrite8(0, &ccr->intc); + iowrite8(0, &ccr->ilme); @@ -181,7 +139,10 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + union tmio_uhccr_pm pm = {0}; + unsigned long base = hcd->rsrc_start; + -+ tmio_fill_pm(tmio, &pm); ++ pm.pmes = 1; ++ pm.pmee = 1; ++ pm.ckrnen = 1; ++ pm.gcken = 1; + + tdev->ops->clock(dev, 1); + tdev->ops->function(dev, 1); @@ -196,54 +157,6 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + ioread8(&ccr->revid), hcd->rsrc_start, hcd->irq); +} + -+static ssize_t tmio_disabled_port_show(struct device *dev, -+ struct device_attribute *attr, -+ char *buf) -+{ -+ struct usb_hcd *hcd = dev_get_drvdata(dev); -+ struct tmio_hcd *tmio = hcd_to_tmio(hcd); -+ int index = to_indexed_dev_attr(attr)->index; -+ return snprintf(buf, PAGE_SIZE, "%c", -+ tmio->disabled_ports[index]? 'Y': 'N'); -+} -+ -+static ssize_t tmio_disabled_port_store(struct device *dev, -+ struct device_attribute *attr, -+ const char *buf, size_t count) -+{ -+ struct usb_hcd *hcd = dev_get_drvdata(dev); -+ struct tmio_hcd *tmio = hcd_to_tmio(hcd); -+ struct tmio_uhccr __iomem *ccr = tmio->ccr; -+ union tmio_uhccr_pm pm = {0}; -+ int index = to_indexed_dev_attr(attr)->index; -+ -+ if (!count) -+ return -EINVAL; -+ -+ switch (buf[0]) { -+ case 'y': case 'Y': case '1': -+ tmio->disabled_ports[index] = true; -+ break; -+ case 'n': case 'N': case '0': -+ tmio->disabled_ports[index] = false; -+ break; -+ default: -+ return -EINVAL; -+ } -+ -+ tmio_fill_pm(tmio, &pm); -+ -+ iowrite16(pm.raw, &ccr->pm); -+ -+ return 1; -+} -+ -+ -+static INDEXED_DEVICE_ATTR(disabled_usb_port, S_IRUGO | S_IWUSR, -+ tmio_disabled_port_show, tmio_disabled_port_store, 0); -+static INDEXED_DEVICE_ATTR(disabled_usb_port, S_IRUGO | S_IWUSR, -+ tmio_disabled_port_show, tmio_disabled_port_store, 1); -+ +static int usb_hcd_tmio_probe(const struct hc_driver *driver, + struct device *dev) +{ @@ -282,9 +195,6 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + hcd->rsrc_len = regs->end - regs->start + 1; + + tmio = hcd_to_tmio(hcd); -+ memcpy(tmio->disabled_ports, -+ default_tmio_ports, -+ sizeof(default_tmio_ports)); + + tmio->ccr = ioremap(config->start, config->end - config->start + 1); + if (!tmio->ccr) { @@ -314,23 +224,11 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + ohci = hcd_to_ohci(hcd); + ohci_hcd_init(ohci); + -+ retval = device_create_file(dev, -+ &dev_attr_disabled_usb_port0.dev_attr); -+ retval |= device_create_file(dev, -+ &dev_attr_disabled_usb_port1.dev_attr); -+ -+ if (retval) -+ goto err_create_file; -+ + retval = usb_add_hcd(hcd, irq->start, IRQF_DISABLED); + + if (retval == 0) + return retval; + -+err_create_file: -+ device_remove_file(dev, &dev_attr_disabled_usb_port1.dev_attr); -+ device_remove_file(dev, &dev_attr_disabled_usb_port0.dev_attr); -+ + tmio_stop_hc(dev); + + dmabounce_unregister_dev(dev); @@ -358,8 +256,6 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + struct tmio_hcd *tmio = hcd_to_tmio(hcd); + + usb_remove_hcd(hcd); -+ device_remove_file(dev, &dev_attr_disabled_usb_port1.dev_attr); -+ device_remove_file(dev, &dev_attr_disabled_usb_port0.dev_attr); + tmio_stop_hc(dev); + dmabounce_unregister_dev(dev); + dma_release_declared_memory(dev); @@ -447,22 +343,13 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c +static int ohci_hcd_tmio_drv_probe(struct device *dev) +{ + struct resource *sram = tmio_resource_mem(dev); -+ int retval; + + dev->dma_mask = &dma_mask; + dev->coherent_dma_mask = DMA_32BIT_MASK; + -+ /* FIXME: move dmabounce checkers to tc6393 core? */ + dmabounce_register_checker(tmio_dmabounce_check, sram); + -+ retval = usb_hcd_tmio_probe(&ohci_tmio_hc_driver, dev); -+ -+ if (retval == 0) -+ return retval; -+ -+ dmabounce_remove_checker(tmio_dmabounce_check, sram); -+ -+ return retval; ++ return usb_hcd_tmio_probe(&ohci_tmio_hc_driver, dev); +} + +static int ohci_hcd_tmio_drv_remove(struct device *dev) @@ -550,7 +437,7 @@ Index: linux-2.6.23/drivers/usb/host/Kconfig Index: linux-2.6.23/drivers/usb/host/ohci-hcd.c =================================================================== --- linux-2.6.23.orig/drivers/usb/host/ohci-hcd.c 2007-11-12 13:46:52.894560883 +0300 -+++ linux-2.6.23/drivers/usb/host/ohci-hcd.c 2007-11-14 16:44:32.788069355 +0300 ++++ linux-2.6.23/drivers/usb/host/ohci-hcd.c 2007-11-13 01:03:53.950798640 +0300 @@ -915,6 +915,10 @@ #define PLATFORM_DRIVER usb_hcd_pnx4008_driver #endif diff --git a/packages/matchbox-wm/matchbox-wm_0.8.3.bb b/packages/matchbox-wm/matchbox-wm_0.8.3.bb index 524dc1af36..58da385674 100644 --- a/packages/matchbox-wm/matchbox-wm_0.8.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.8.3.bb @@ -1,7 +1,7 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0" diff --git a/packages/matchbox-wm/matchbox-wm_0.8.4.bb b/packages/matchbox-wm/matchbox-wm_0.8.4.bb index 524dc1af36..58da385674 100644 --- a/packages/matchbox-wm/matchbox-wm_0.8.4.bb +++ b/packages/matchbox-wm/matchbox-wm_0.8.4.bb @@ -1,7 +1,7 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \ file://kbdconfig_keylaunch_simpad.patch;patch=1;pnum=0" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.2.bb b/packages/matchbox-wm/matchbox-wm_0.9.2.bb index a46073b924..a85e4b23c4 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.2.bb @@ -1,8 +1,8 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" -PR = "r1" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" +PR = "r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb index 2363801cb2..c2016cab66 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.3.bb @@ -1,8 +1,8 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" -PR = "r2" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" +PR = "r3" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ diff --git a/packages/matchbox-wm/matchbox-wm_0.9.4.bb b/packages/matchbox-wm/matchbox-wm_0.9.4.bb index 5ce26cbab2..80b6dc7e19 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.4.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.4.bb @@ -1,7 +1,7 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/packages/matchbox-wm/matchbox-wm_0.9.5.bb index f135ffd426..0be38b33cb 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.5.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.5.bb @@ -1,8 +1,8 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" -PR="r1" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" +PR="r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.bb b/packages/matchbox-wm/matchbox-wm_0.9.bb index 8387d957a1..700fb15eeb 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.bb @@ -1,7 +1,7 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.gz" S = "${WORKDIR}/matchbox-window-manager-${PV}" diff --git a/packages/matchbox-wm/matchbox-wm_1.0.bb b/packages/matchbox-wm/matchbox-wm_1.0.bb index e55f7a5c4e..dad8163232 100644 --- a/packages/matchbox-wm/matchbox-wm_1.0.bb +++ b/packages/matchbox-wm/matchbox-wm_1.0.bb @@ -1,9 +1,9 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" -PR="r2" +PR="r3" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.0/matchbox-window-manager-${PV}.tar.gz \ diff --git a/packages/matchbox-wm/matchbox-wm_1.1.bb b/packages/matchbox-wm/matchbox-wm_1.1.bb index c3e8186481..703470adea 100644 --- a/packages/matchbox-wm/matchbox-wm_1.1.bb +++ b/packages/matchbox-wm/matchbox-wm_1.1.bb @@ -1,9 +1,9 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" -PR="r1" +PR="r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/packages/matchbox-wm/matchbox-wm_1.2.bb b/packages/matchbox-wm/matchbox-wm_1.2.bb index 83eb403c5f..bf3587696f 100644 --- a/packages/matchbox-wm/matchbox-wm_1.2.bb +++ b/packages/matchbox-wm/matchbox-wm_1.2.bb @@ -1,9 +1,9 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native " +RDEPENDS = "" -PR="r1" +PR="r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ file://gconf-2.m4 \ diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb index 91c66dae90..554811d597 100644 --- a/packages/matchbox-wm/matchbox-wm_svn.bb +++ b/packages/matchbox-wm/matchbox-wm_svn.bb @@ -1,9 +1,9 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" -RDEPENDS = "matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf " +RDEPENDS = "" PV = "1.1+svn${SRCDATE}" -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \ diff --git a/packages/openmoko2/openmoko-messages2_svn.bb b/packages/openmoko2/openmoko-messages2_svn.bb new file mode 100644 index 0000000000..bc1bcaff5e --- /dev/null +++ b/packages/openmoko2/openmoko-messages2_svn.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "The OpenMoko Message application" +SECTION = "openmoko/pim" +DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2" +PV = "0.1.0+svnr${SRCREV}" +PR = "r0" + +inherit openmoko2 + +EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" + +FILES_${PN} += "${datadir}/openmoko-messages/ ${datadir}/dbus-1/services/" diff --git a/packages/wifi-radar/wifi-radar_1.9.6.bb b/packages/wifi-radar/wifi-radar_1.9.6.bb index 59d24b9d74..57eb9e33fb 100644 --- a/packages/wifi-radar/wifi-radar_1.9.6.bb +++ b/packages/wifi-radar/wifi-radar_1.9.6.bb @@ -3,11 +3,11 @@ DESCRIPTION="WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles." HOMEPAGE="http://www.bitbuilder.com/wifi_radar/" LICENSE = "GPL" -PR = "r1" +PR = "r2" PACKAGE_ARCH = "all" -RDEPENDS = "python-core python-pygtk2 python-re python-io python-pygobject python-pycairo" +RDEPENDS = "python-core python-pygtk python-re python-io python-pygobject python-pycairo" SRC_URI="http://wifi-radar.systemimager.org/pub/${PN}-${PV}.tar.bz2 \ file://wifi-radar.patch;patch=1 \ diff --git a/packages/xorg-data/xbitmaps_1.0.1.bb b/packages/xorg-data/xbitmaps_1.0.1.bb index 7d9dc18c84..6e5d7fe5ba 100644 --- a/packages/xorg-data/xbitmaps_1.0.1.bb +++ b/packages/xorg-data/xbitmaps_1.0.1.bb @@ -2,5 +2,5 @@ require xorg-data-common.inc DESCRIPTION = "Common X11 Bitmaps" LICENSE = "MIT" -DEPENDS += "libxmu xbitmaps" +DEPENDS += "libxmu" |