From 984e22310853aaa068480fe73eb6b8ba4a739fdd Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 2 Jan 2008 20:13:29 +0000 Subject: xrestop 0.4: Add DESCRIPTION & SECTION. --- packages/xrestop/xrestop_0.4.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/xrestop/xrestop_0.4.bb b/packages/xrestop/xrestop_0.4.bb index 40396a2362..0ecf39a84b 100644 --- a/packages/xrestop/xrestop_0.4.bb +++ b/packages/xrestop/xrestop_0.4.bb @@ -1,5 +1,8 @@ +DESCRIPTION = "top-like statistics of X11 server resource usage by clients" +SECTION = "x11/utils" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xrestop" LICENSE = "GPL" +PR = "r1" DEPENDS = "libxres libxext virtual/libx11" -- cgit v1.2.3 From e6456ede2a1737515f82c0acce0f30604c5e013b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Jan 2008 10:55:48 +0000 Subject: ntpclient: update to 2007_365 at the authors request --- packages/ntpclient/ntpclient_2007_365.bb | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 packages/ntpclient/ntpclient_2007_365.bb diff --git a/packages/ntpclient/ntpclient_2007_365.bb b/packages/ntpclient/ntpclient_2007_365.bb new file mode 100644 index 0000000000..b892f384e7 --- /dev/null +++ b/packages/ntpclient/ntpclient_2007_365.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "NTP (RFC-1305) client for unix-alike computers" +HOMEPAGE = "http://doolittle.icarus.com/ntpclient" +AUTHOR = "Larry Doolittle " +RDEPENDS = "busybox" +SECTION = "admin" +LICENSE = "GPLv2" +PR = "r0" +# The ntpclient package uses version numbers that include an underscore :( +PV = "2007_365" +# ntpclient unpacks into a directory that doesn't include version info :( +S = "${WORKDIR}/${PN}-2007" + +SRC_URI = "http://doolittle.icarus.com/ntpclient/ntpclient_${PV}.tar.gz \ + file://init" + +INITSCRIPT_NAME = "ntpclient" +INITSCRIPT_PARAMS = "defaults 65" +inherit update-rc.d + +LDFLAGS += " -lrt " + +do_compile() { + oe_runmake ntpclient + oe_runmake adjtimex +} + +do_install () { + # Install the binary and tools + install -D -m 0755 ${S}/ntpclient ${D}${base_sbindir}/ntpclient + install -D -m 0755 ${S}/adjtimex ${D}${base_sbindir}/adjtimex + install -D -m 0755 ${S}/rate.awk ${D}${sbindir}/ntpclient-drift-rate.awk + install -D -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ntpclient +} + -- cgit v1.2.3 From eb45a68e0a2f0d1a3c0d63f8d8bd2e0d0a432fb5 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 3 Jan 2008 11:04:14 +0000 Subject: opie-taskbar 1.2.3: Fix first-run wizard after install path revamp. --- packages/opie-taskbar/opie-taskbar/firstuse-path.patch | 11 +++++++++++ packages/opie-taskbar/opie-taskbar_1.2.3.bb | 1 + packages/opie-taskbar/opie-taskbar_cvs.bb | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/opie-taskbar/opie-taskbar/firstuse-path.patch diff --git a/packages/opie-taskbar/opie-taskbar/firstuse-path.patch b/packages/opie-taskbar/opie-taskbar/firstuse-path.patch new file mode 100644 index 0000000000..636eb81675 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar/firstuse-path.patch @@ -0,0 +1,11 @@ +--- launcher/firstuse.cpp 2007-10-14 12:47:55.000000000 +1300 ++++ launcher/firstuse.cpp 2007-10-14 13:58:54.000000000 +1300 +@@ -124,7 +124,7 @@ + #endif + + for ( int i = 0; settingsTable[i].app; i++ ) { +- QString file = QPEApplication::qpeDir() + "bin/"; ++ QString file = OPIE_BINDIR + QString("/"); + file += settingsTable[i].app; + file += exeSuffix; + if ( QFile::exists(file) ) diff --git a/packages/opie-taskbar/opie-taskbar_1.2.3.bb b/packages/opie-taskbar/opie-taskbar_1.2.3.bb index d8a794fc16..c22e3bed5f 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.3.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.3.bb @@ -13,4 +13,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ file://kbdlocks-runtime.patch;patch=1 \ file://restart-from-bindir.patch;patch=1 \ file://server.pro \ + file://firstuse-path.patch;patch=1 \ " diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 3bda5c4f40..e84e35d820 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r15" +PR = "r16" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -14,4 +14,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ file://kbdlocks-runtime.patch;patch=1 \ file://restart-from-bindir.patch;patch=1 \ file://server.pro \ + file://firstuse-path.patch;patch=1 \ " -- cgit v1.2.3 From 0816f16f207a8f877cee48ac8714f3adae6114a9 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Thu, 3 Jan 2008 13:05:26 +0000 Subject: gpsd: update to 2.36, drop 2.35. --- packages/gpsd/gpsd-2.35/.mtn2git_empty | 0 packages/gpsd/gpsd-2.35/gpsd_dbus.patch | 11 ----------- packages/gpsd/gpsd_2.35.bb | 8 -------- packages/gpsd/gpsd_2.36.bb | 3 +++ 4 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 packages/gpsd/gpsd-2.35/.mtn2git_empty delete mode 100644 packages/gpsd/gpsd-2.35/gpsd_dbus.patch delete mode 100644 packages/gpsd/gpsd_2.35.bb create mode 100644 packages/gpsd/gpsd_2.36.bb diff --git a/packages/gpsd/gpsd-2.35/.mtn2git_empty b/packages/gpsd/gpsd-2.35/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpsd/gpsd-2.35/gpsd_dbus.patch b/packages/gpsd/gpsd-2.35/gpsd_dbus.patch deleted file mode 100644 index 215b0ecce9..0000000000 --- a/packages/gpsd/gpsd-2.35/gpsd_dbus.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpsd-2.35/gpsd_dbus.h.old 2008-01-02 20:54:33.000000000 -0600 -+++ gpsd-2.35/gpsd_dbus.h 2008-01-02 20:55:35.000000000 -0600 -@@ -6,6 +6,8 @@ - - #include - -+#include "gpsd.h" -+ - int initialize_dbus_connection (void); - void send_dbus_fix (struct gps_device_t* channel); - diff --git a/packages/gpsd/gpsd_2.35.bb b/packages/gpsd/gpsd_2.35.bb deleted file mode 100644 index fcc5c76070..0000000000 --- a/packages/gpsd/gpsd_2.35.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gpsd.inc - -SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \ - file://gpsd-default \ - file://gpsd \ - file://gpsd_dbus.patch;patch=1 " - -PR = "r0" diff --git a/packages/gpsd/gpsd_2.36.bb b/packages/gpsd/gpsd_2.36.bb new file mode 100644 index 0000000000..58e9ebeee2 --- /dev/null +++ b/packages/gpsd/gpsd_2.36.bb @@ -0,0 +1,3 @@ +require gpsd.inc + +PR = "r0" -- cgit v1.2.3 From 6540294a6e516730508e4ebbee20f539a984b795 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Thu, 3 Jan 2008 13:34:49 +0000 Subject: gpsd.inc: fix staging --- packages/gpsd/gpsd.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc index d493b2bca7..be593e0744 100644 --- a/packages/gpsd/gpsd.inc +++ b/packages/gpsd/gpsd.inc @@ -32,10 +32,9 @@ do_install_prepend() { } do_stage() { - oe_libinstall -so -C ${S}/.libs libgps ${STAGING_LIBDIR} - install -m 0655 ${S}/libgps.la ${STAGING_LIBDIR} - install -m 0655 ${S}/gps.h ${STAGING_INCDIR} - install -m 0655 ${S}/gpsd.h ${STAGING_INCDIR} + oe_libinstall -so libgps ${STAGING_LIBDIR} + install -m 0644 ${S}/gps.h ${STAGING_INCDIR} + install -m 0644 ${S}/gpsd.h ${STAGING_INCDIR} } do_install_append() { -- cgit v1.2.3 From 6f116f171f10dcecd8eafffd4cffed474d843ab5 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 3 Jan 2008 13:50:02 +0000 Subject: preferred-om-2008-versions.inc : OM is starting to deviate from angstrom 2007.1 so add a file to record these deviations until we are ready to follow angstrom 2008 --- conf/distro/include/preferred-om-2008-versions.inc | 1 + 1 file changed, 1 insertion(+) create mode 100644 conf/distro/include/preferred-om-2008-versions.inc diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc new file mode 100644 index 0000000000..2c2e0acb03 --- /dev/null +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -0,0 +1 @@ +PREFERRED_VERSION_vte = "0.16.10" -- cgit v1.2.3 From acb42bcc7d501026e7a41638645201850cd02dac Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 3 Jan 2008 14:23:43 +0000 Subject: dbus: added 1.1.1 from Poky (non default) --- packages/dbus/dbus-1.1.1/.mtn2git_empty | 0 packages/dbus/dbus-1.1.1/cross.patch | 10 ++ packages/dbus/dbus-1.1.1/dbus-1.init | 110 ++++++++++++++++++++++ packages/dbus/dbus-1.1.1/fix-install-daemon.patch | 13 +++ packages/dbus/dbus-1.1.1/tmpdir.patch | 30 ++++++ packages/dbus/dbus-native_1.1.1.bb | 31 ++++++ packages/dbus/dbus_1.1.1.bb | 63 +++++++++++++ 7 files changed, 257 insertions(+) create mode 100644 packages/dbus/dbus-1.1.1/.mtn2git_empty create mode 100644 packages/dbus/dbus-1.1.1/cross.patch create mode 100644 packages/dbus/dbus-1.1.1/dbus-1.init create mode 100644 packages/dbus/dbus-1.1.1/fix-install-daemon.patch create mode 100644 packages/dbus/dbus-1.1.1/tmpdir.patch create mode 100644 packages/dbus/dbus-native_1.1.1.bb create mode 100644 packages/dbus/dbus_1.1.1.bb diff --git a/packages/dbus/dbus-1.1.1/.mtn2git_empty b/packages/dbus/dbus-1.1.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/dbus/dbus-1.1.1/cross.patch b/packages/dbus/dbus-1.1.1/cross.patch new file mode 100644 index 0000000000..268a3ae3de --- /dev/null +++ b/packages/dbus/dbus-1.1.1/cross.patch @@ -0,0 +1,10 @@ +--- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100 ++++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100 +@@ -719,6 +719,7 @@ + exit (0); + ]])], + [ac_cv_have_abstract_sockets=yes], ++ [ac_cv_have_abstract_sockets=no], + [ac_cv_have_abstract_sockets=no] + )]) + AC_LANG_POP(C) diff --git a/packages/dbus/dbus-1.1.1/dbus-1.init b/packages/dbus/dbus-1.1.1/dbus-1.init new file mode 100644 index 0000000000..0725083c69 --- /dev/null +++ b/packages/dbus/dbus-1.1.1/dbus-1.init @@ -0,0 +1,110 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters + +set -e + +DAEMON=/usr/bin/dbus-daemon +NAME=dbus +DAEMONUSER=messagebus +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid +UUIDDIR=/var/lib/dbus +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus ]; then + . /etc/default/dbus +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $PIDDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + + if [ ! -d $UUIDDIR ]; then + mkdir -p $UUIDDIR + chown $DAEMONUSER $UUIDDIR + chgrp $DAEMONUSER $UUIDDIR + fi + + dbus-uuidgen --ensure + + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + # TODO: --reverse when busybox supports it + run-parts --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + +reload_it() +{ + echo -n "Reloading $DESC config: " + dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + # hopefully this is enough time for dbus to reload it's config file. + echo "done." +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + reload|force-reload) + reload_it + ;; + restart) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/dbus/dbus-1.1.1/fix-install-daemon.patch b/packages/dbus/dbus-1.1.1/fix-install-daemon.patch new file mode 100644 index 0000000000..c31786357d --- /dev/null +++ b/packages/dbus/dbus-1.1.1/fix-install-daemon.patch @@ -0,0 +1,13 @@ +Index: dbus-0.94/bus/Makefile.am +=================================================================== +--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200 ++++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200 +@@ -110,7 +110,7 @@ + $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ + chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ + fi +- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) ++ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) + $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus + $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d + $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services diff --git a/packages/dbus/dbus-1.1.1/tmpdir.patch b/packages/dbus/dbus-1.1.1/tmpdir.patch new file mode 100644 index 0000000000..838b903f0a --- /dev/null +++ b/packages/dbus/dbus-1.1.1/tmpdir.patch @@ -0,0 +1,30 @@ +--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 ++++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 +@@ -1047,15 +1048,18 @@ + AC_SUBST(ABSOLUTE_TOP_BUILDDIR) + + #### Find socket directories +-if ! test -z "$TMPDIR" ; then +- DEFAULT_SOCKET_DIR=$TMPDIR +-elif ! test -z "$TEMP" ; then +- DEFAULT_SOCKET_DIR=$TEMP +-elif ! test -z "$TMP" ; then +- DEFAULT_SOCKET_DIR=$TMP +-else +- DEFAULT_SOCKET_DIR=/tmp +-fi ++#if ! test -z "$TMPDIR" ; then ++# DEFAULT_SOCKET_DIR=$TMPDIR ++#elif ! test -z "$TEMP" ; then ++# DEFAULT_SOCKET_DIR=$TEMP ++#elif ! test -z "$TMP" ; then ++# DEFAULT_SOCKET_DIR=$TMP ++#else ++# DEFAULT_SOCKET_DIR=/tmp ++#fi ++ ++# checks disabled to avoid expanding this at build time ++DEFAULT_SOCKET_DIR=/tmp + + if ! test -z "$with_test_socket_dir" ; then + TEST_SOCKET_DIR="$with_test_socket_dir" diff --git a/packages/dbus/dbus-native_1.1.1.bb b/packages/dbus/dbus-native_1.1.1.bb new file mode 100644 index 0000000000..72e2190f78 --- /dev/null +++ b/packages/dbus/dbus-native_1.1.1.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "message bus system for applications to talk to one another" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +LICENSE = "GPL" +SECTION = "base" + +PR = "r0" + +DEPENDS = "glib-2.0-native libxml2-native expat-native" + +DEFAULT_PREFERENCE = "-1" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.2" +SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ + file://cross.patch;patch=1 \ + " + +inherit autotools pkgconfig gettext native + +S = "${WORKDIR}/dbus-${PV}" + +EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \ + --disable-doxygen-docs --with-xml=expat --without-x" + +do_stage () { + oe_runmake install + autotools_stage_all + + # for dbus-glib-native introspection generation + install -d ${STAGING_DATADIR}/dbus + install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf +} diff --git a/packages/dbus/dbus_1.1.1.bb b/packages/dbus/dbus_1.1.1.bb new file mode 100644 index 0000000000..7bf0a8634d --- /dev/null +++ b/packages/dbus/dbus_1.1.1.bb @@ -0,0 +1,63 @@ +DEFAULT_PREFERENCE = "-1" + +SECTION = "base" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl" + +PR = "r3" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ + file://tmpdir.patch;patch=1 \ + file://dbus-1.init \ + file://cross.patch;patch=1 \ + file://fix-install-daemon.patch;patch=1" + +inherit autotools pkgconfig update-rc.d gettext + +INITSCRIPT_NAME = "dbus-1" +INITSCRIPT_PARAMS = "defaults" + +CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" + +FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include" + +pkg_postinst_dbus() { +#!/bin/sh + +# can't do adduser stuff offline +if [ "x$D" != "x" ]; then + exit 1 +fi + +MESSAGEUSER=messagebus +MESSAGEHOME=/var/run/dbus + +mkdir -p $MESSAGEHOME || true +chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" +chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" +} + +EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \ + --disable-doxygen-docs --with-xml=expat --without-x" + +do_stage () { + oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} + + autotools_stage_includes + + mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ + install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ +} + +do_install_append () { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 +} + +python populate_packages_prepend () { + if (bb.data.getVar('DEBIAN_NAMES', d, 1)): + bb.data.setVar('PKG_dbus', 'dbus-1', d) +} -- cgit v1.2.3 From e084786aed2d73221570ea9f0199a85890ac231f Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Thu, 3 Jan 2008 15:08:58 +0000 Subject: qpegps: upgrade 0.9.3.1. bump angstrom-preferred * fix DEPENDS and libqte-mt linking close #oebug 3955 thanks to bluelightning * patch 0.9.3.1 Place.* file name bug * fix .desktop QA issue --- conf/distro/include/angstrom-2007-preferred-versions.inc | 2 +- packages/qpegps/files/qpegps.desktop | 3 +-- packages/qpegps/qpegps.inc | 8 +++++--- packages/qpegps/qpegps_0.9.3.1.bb | 6 ++++++ packages/qpegps/qpegps_0.9.3.bb | 1 - 5 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 packages/qpegps/qpegps_0.9.3.1.bb delete mode 100644 packages/qpegps/qpegps_0.9.3.bb diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 97fed90f21..82c31cb64a 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1594,7 +1594,7 @@ PREFERRED_VERSION_qpe-inputhelper-applet ?= "1.0.0" PREFERRED_VERSION_qpe-libgaim ?= "1.5.0" PREFERRED_VERSION_qpealarmclock ?= "1.0.9" PREFERRED_VERSION_qpealarmclockapplet ?= "1.0.9" -PREFERRED_VERSION_qpegps ?= "0.9.3" +PREFERRED_VERSION_qpegps ?= "0.9.3.1" PREFERRED_VERSION_qpenmapfe ?= "1.0.0" PREFERRED_VERSION_qpf-arabic ?= "1.0" PREFERRED_VERSION_qpf-bitstream-vera ?= "1.10" diff --git a/packages/qpegps/files/qpegps.desktop b/packages/qpegps/files/qpegps.desktop index 16e222b00b..de5a93ccea 100644 --- a/packages/qpegps/files/qpegps.desktop +++ b/packages/qpegps/files/qpegps.desktop @@ -1,7 +1,6 @@ [Desktop Entry] Comment=Moving Map Exec=qpegps -Icon=qpegps/qpegps.png +Icon=qpegps Type=Application Name=qpeGPS - diff --git a/packages/qpegps/qpegps.inc b/packages/qpegps/qpegps.inc index 2e10bf40a6..b763be896d 100644 --- a/packages/qpegps/qpegps.inc +++ b/packages/qpegps/qpegps.inc @@ -4,7 +4,8 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://qpegps.sourceforge.net/" -RRECOMMENDS = "gpsd" +DEPENDS = "gpsd" +RDEPENDS = "gpsd" SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \ file://qpegps.desktop \ @@ -16,18 +17,19 @@ inherit palmtop QMAKE_PROFILES = "qpegps.pro" EXTRA_QMAKEVARS_POST = "LIBS=-lqpe LIBS+=-lgps" OE_QMAKE_CFLAGS += " -DQWS " +OE_QMAKE_LIBS_QT = ${QT_LIBRARY} do_install() { install -d ${D}${palmtopdir}/bin \ ${D}${palmtopdir}/apps/Applications \ - ${D}${palmtopdir}/pics/qpegps \ + ${D}${palmtopdir}/pics \ ${D}${palmtopdir}/help/html/qpegps_icons \ ${D}${palmtopdir}/qpegps/maps \ ${D}${palmtopdir}/qpegps/icons \ ${D}${palmtopdir}/qpegps/tracks install -m 0755 qpegps ${D}${palmtopdir}/bin/ install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/ - install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/ + install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/ install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/ install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/ install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/ diff --git a/packages/qpegps/qpegps_0.9.3.1.bb b/packages/qpegps/qpegps_0.9.3.1.bb new file mode 100644 index 0000000000..e43e6a353f --- /dev/null +++ b/packages/qpegps/qpegps_0.9.3.1.bb @@ -0,0 +1,6 @@ +require qpegps.inc + +do_configure_prepend() { + mv ${S}/Place.cpp ${S}/place.cpp + mv ${S}/Place.h ${S}/place.h +} diff --git a/packages/qpegps/qpegps_0.9.3.bb b/packages/qpegps/qpegps_0.9.3.bb deleted file mode 100644 index 4cdb945321..0000000000 --- a/packages/qpegps/qpegps_0.9.3.bb +++ /dev/null @@ -1 +0,0 @@ -require qpegps.inc -- cgit v1.2.3 From 7377bcfa7701f0d9b88d5d312b40d356b0f0e018 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 3 Jan 2008 15:23:12 +0000 Subject: base and sanity bbclasses + qemu: move gcc3 availability checking into base.bbclass (from Poky) --- classes/base.bbclass | 17 +++++++++++++++++ classes/sanity.bbclass | 8 -------- packages/qemu/qemu-gcc3-check.inc | 17 +++-------------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 2b508a8e84..e0b4c59e5f 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -902,6 +902,23 @@ python () { base_after_parse(d) } +def check_app_exists(app, d): + from bb import which, data + + app = data.expand(app, d) + path = data.getVar('PATH', d) + return len(which(path, app)) != 0 + +def check_gcc3(data): + + gcc3_versions = 'gcc-3.4 gcc34 gcc-3.4.4 gcc-3.4.6 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' + + for gcc3 in gcc3_versions.split(): + if check_app_exists(gcc3, data): + return gcc3 + + return False + # Patch handling inherit patch diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index cc413b7011..9994febf0d 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -24,14 +24,6 @@ def check_conf_exists(fn, data): return True return False -def check_app_exists(app, d): - from bb import which, data - - app = data.expand(app, d) - path = data.getVar('PATH', d) - return len(which(path, app)) != 0 - - def check_sanity(e): from bb import note, error, data, __version__ from bb.event import Handled, NotHandled, getName diff --git a/packages/qemu/qemu-gcc3-check.inc b/packages/qemu/qemu-gcc3-check.inc index 658e72ffc3..81c3555b48 100644 --- a/packages/qemu/qemu-gcc3-check.inc +++ b/packages/qemu/qemu-gcc3-check.inc @@ -4,19 +4,8 @@ python __anonymous() { path = data.getVar('PATH', d, 1) oldOeConf = data.getVar('EXTRA_OECONF', d, 1) if not oldOeConf: oldOeConf = "" - if len(which(path, 'gcc-3.4.4')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.4", d) - elif len(which(path, 'gcc-3.4')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4", d) - elif len(which(path, 'gcc34')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc34", d) - elif len(which(path, 'gcc33')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc33", d) - elif len(which(path, 'gcc-3.3')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3", d) - elif len(which(path, 'gcc-3.3.6')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3.6", d) - elif len(which(path, 'gcc-3.4.6')) != 0: - data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.6", d) + gcc3 = check_gcc3(d) + if gcc3: + data.setVar('EXTRA_OECONF', oldOeConf + " --cc=" + gcc3, d) } -- cgit v1.2.3 From bc7aa85e1bf3db6ac7e31fe15fe27ec05526205a Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Thu, 3 Jan 2008 15:30:46 +0000 Subject: add qpegps_svn, close #oebug 2194 --- packages/qpegps/qpegps_svn.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/qpegps/qpegps_svn.bb diff --git a/packages/qpegps/qpegps_svn.bb b/packages/qpegps/qpegps_svn.bb new file mode 100644 index 0000000000..16233d935c --- /dev/null +++ b/packages/qpegps/qpegps_svn.bb @@ -0,0 +1,15 @@ +require qpegps.inc + +PV = "0.0+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://qpegps.svn.sourceforge.net/svnroot/;module=qpegps/trunk/qpegps;proto=https \ + file://qpegps.desktop \ + file://qpegps.png " + +S = "${WORKDIR}/qpegps/trunk/qpegps" + +do_configure_prepend() { + mv ${S}/Place.cpp ${S}/place.cpp + mv ${S}/Place.h ${S}/place.h +} -- cgit v1.2.3 From 3ed7a06c4169967775fbb39656d0bbcf078be089 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 3 Jan 2008 20:10:33 +0000 Subject: contrib/feed-browser: Capure current config.inc from Angstrom site. --- contrib/feed-browser/includes/config.inc | 1031 +++++++++++++++++++++--------- 1 file changed, 738 insertions(+), 293 deletions(-) diff --git a/contrib/feed-browser/includes/config.inc b/contrib/feed-browser/includes/config.inc index c4a9fc0fc3..c2414b8013 100644 --- a/contrib/feed-browser/includes/config.inc +++ b/contrib/feed-browser/includes/config.inc @@ -1,301 +1,746 @@ 'OpenZaurus', - 'distro_version'=>'3.5.4', - 'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/feed/', - 'feeds'=>array( + array( + 'distro_name'=>'Ångström', + 'distro_version'=>'unstable', + 'feed_base_url'=>'http://www.angstrom-distribution.org/unstable/feed/', + 'feeds'=> array( - 'name'=>'base', - 'url'=>'base', - 'type'=>'normal', - ), - array( - 'name'=>'opie', - 'url'=>'opie', - 'type'=>'normal', - ), - array( - 'name'=>'x11', - 'url'=>'x11', - 'type'=>'normal', - ), - array( - 'name'=>'upgrades', - 'url'=>'upgrades', - 'type'=>'upgrades', - ), - array( - 'name'=>'perl', - 'url'=>'perl', - 'type'=>'normal', - ), - array( - 'name'=>'python', - 'url'=>'python', - 'type'=>'normal', - ), - array( - 'name'=>'Collie upgrades', - 'url'=>'upgrades/machine/collie', - 'type'=>'upgrades', - ), - array( - 'name'=>'Tosa upgrades', - 'url'=>'upgrades/machine/tosa', - 'type'=>'upgrades', - ), - array( - 'name'=>'Poodle upgrades', - 'url'=>'upgrades/machine/poodle', - 'type'=>'upgrades', - ), - array( - 'name'=>'Poodle', - 'url'=>'machine/poodle', - 'type'=>'normal', - ), - array( - 'name'=>'Collie', - 'url'=>'machine/collie', - 'type'=>'normal', - ), - array( - 'name'=>'Tosa', - 'url'=>'machine/tosa', - 'type'=>'normal', - ) - ) - ), - array( - 'distro_name'=>'OpenZaurus', - 'distro_version'=>'3.5.4.1', - 'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4.1/feed/', - 'feeds'=>array( - array( - 'name'=>'base', - 'url'=>'base', - 'type'=>'normal', - ), - array( - 'name'=>'opie', - 'url'=>'opie', - 'type'=>'normal', - ), - array( - 'name'=>'perl', - 'url'=>'perl', - 'type'=>'normal', - ), - array( - 'name'=>'python', - 'url'=>'python', - 'type'=>'normal', - ), - array( - 'name'=>'upgrades', - 'url'=>'upgrades', - 'type'=>'upgrades', - ), - array( - 'name'=>'x11', - 'url'=>'x11', - 'type'=>'normal', - ), - array( - 'name'=>'C7x0', - 'url'=>'machine/c7x0', - 'type'=>'normal', - ), - array( - 'name'=>'Spitz', - 'url'=>'machine/spitz', - 'type'=>'normal', - ), - array( - 'name'=>'Akita', - 'url'=>'machine/akita', - 'type'=>'normal', - ), - array( - 'name'=>'Akita upgrades', - 'url'=>'upgrades/machine/akita', - 'type'=>'upgrades', - ), - array( - 'name'=>'C7x0 upgrades', - 'url'=>'upgrades/machine/c7x0', - 'type'=>'upgrades', - ), - array( - 'name'=>'Spitz upgrades', - 'url'=>'upgrades/machine/spitz', - 'type'=>'upgrades', - ) - ) - ) -); + array( + 'name'=>'All architectures', + 'url'=>'all', + ), + array( + 'name'=>'avr32 base', + 'url'=>'avr32/base', + ), + array( + 'name'=>'blackfin base', + 'url'=>'blackfin/base', + ), + + array( + 'name'=>'armv5te base', + 'url'=>'armv5te/base', + ), + array( + 'name'=>'iwmmxt base', + 'url'=>'iwmmxt/base', + ), + array( + 'name'=>'armv5teb base', + 'url'=>'armv5teb/base', + ), + array( + 'name'=>'arm-oabi base', + 'url'=>'arm-oabi/base', + ), + + array( + 'name'=>'i586 base', + 'url'=>'i586/base', + ), + array( + 'name'=>'i686 base', + 'url'=>'i686/base', + ), + + array( + 'name'=>'armv4t base', + 'url'=>'armv4t/base', + ), + array( + 'name'=>'armv6 base', + 'url'=>'armv6/base', + ), + array( + 'name'=>'ppc603e base', + 'url'=>'ppc603e/base', + ), + array( + 'name'=>'ppc405 base', + 'url'=>'ppc405/base', + ), + + array( + 'name'=>'armv5te perl', + 'url'=>'armv5te/perl', + ), + array( + 'name'=>'armv5te python', + 'url'=>'armv5te/python', + ), + array( + 'name'=>'armv5te debug', + 'url'=>'armv5te/debug', + ), + array( + 'name'=>'armv5te gstreamer', + 'url'=>'armv5te/gstreamer', + ), + array( + 'name'=>'avr32 perl', + 'url'=>'avr32/perl', + ), + array( + 'name'=>'avr32 python', + 'url'=>'avr32/python', + ), + array( + 'name'=>'avr32 debug', + 'url'=>'avr32/debug', + ), + array( + 'name'=>'avr32 gstreamer', + 'url'=>'avr32/gstreamer', + ), + + array( + 'name'=>'blackfin perl', + 'url'=>'blackfin/perl', + ), + array( + 'name'=>'blackfin python', + 'url'=>'blackfin/python', + ), + array( + 'name'=>'blackfin debug', + 'url'=>'blackfin/debug', + ), + array( + 'name'=>'blackfin gstreamer', + 'url'=>'blackfin/gstreamer', + ), + array( + 'name'=>'armv4t perl', + 'url'=>'armv4t/perl', + ), + array( + 'name'=>'armv4t python', + 'url'=>'armv4t/python', + ), + array( + 'name'=>'armv4t debug', + 'url'=>'armv4t/debug', + ), + array( + 'name'=>'armv4t gstreamer', + 'url'=>'armv4t/gstreamer', + ), + + array( + 'name'=>'armv6 perl', + 'url'=>'armv6/perl', + ), + array( + 'name'=>'armv6 python', + 'url'=>'armv6/python', + ), + array( + 'name'=>'armv6 debug', + 'url'=>'armv6/debug', + ), + array( + 'name'=>'armv6 gstreamer', + 'url'=>'armv6/gstreamer', + ), + + array( + 'name'=>'i686 perl', + 'url'=>'i686/perl', + ), + array( + 'name'=>'i686 python', + 'url'=>'i686/python', + ), + array( + 'name'=>'i686 debug', + 'url'=>'i686/debug', + ), + array( + 'name'=>'i686 gstreamer', + 'url'=>'i686/gstreamer', + ), + array( + 'name'=>'ppc603e perl', + 'url'=>'ppc603e/perl', + ), + array( + 'name'=>'ppc603e python', + 'url'=>'ppc603e/python', + ), + array( + 'name'=>'ppc603e debug', + 'url'=>'ppc603e/debug', + ), + array( + 'name'=>'ppc603e gstreamer', + 'url'=>'ppc603e/gstreamer', + ), + + array( + 'name'=>'Motorola A780', + 'url'=>'armv5te/machine/a780', + ), + array( + 'name'=>'HP iPAQ h2200', + 'url'=>'armv5te/machine/h2200', + ), + + array( + 'name'=>'HP iPAQ h4000', + 'url'=>'armv5te/machine/h4000', + ), + + array( + 'name'=>'HTC universal/ iMate jasjar', + 'url'=>'armv5te/machine/htcuniversal', + ), + array( + 'name'=>'HP iPAQ hx4700', + 'url'=>'armv5te/machine/hx4700', + ), + array( + 'name'=>'HP iPAQ hx2000 series', + 'url'=>'armv5te/machine/hx2000', + ), + + array( + 'name'=>'Psion Teklogix NetBook Pro', + 'url'=>'armv5te/machine/netbook-pro', + ), + array( + 'name'=>'HTC Magician', + 'url'=>'armv5te/machine/magician', + ), + array( + 'name'=>'Nokia 770 internet tablet', + 'url'=>'armv5te/machine/nokia770', + ), + array( + 'name'=>'Sharp Zaurus 5600 (Poodle)', + 'url'=>'armv5te/machine/poodle', + ), + array( + 'name'=>'Sharp Zaurus c7x0 (Corgi, Boxer, Husky, Shepher)', + 'url'=>'armv5te/machine/c7x0', + ), + array( + 'name'=>'Sharp Zaurus SL-C1000 (akita)', + 'url'=>'armv5te/machine/akita', + ), + array( + 'name'=>'HP iPAQ h5xxx series', + 'url'=>'armv5te/machine/h5xxx', + ), + array( + 'name'=>'Sharp Zaurus SL-C6000 (Tosa)', + 'url'=>'armv5te/machine/tosa', + ), + array( + 'name'=>'Sharp Zaurus SL-C3xxx (Spitz, Borzoi, Terrier)', + 'url'=>'armv5te/machine/spitz', + ), + array( + 'name'=>'Cirrus Logic ep93xx boards', + 'url'=>'armv4t/machine/ep93xx', + ), + array( + 'name'=>'FIC gta01/Neo1973 phone', + 'url'=>'armv4t/machine/fic-gta01', + ), + array( + 'name'=>'HP iPAQ h6300', + 'url'=>'armv4t/machine/h6300', + ), + array( + 'name'=>'Freescale i.mx31 ADS development board', + 'url'=>'armv6/machine/mx31ads', + ), -$ipkpath = "/var/www/angstrom/unstable/feed/unsorted"; -$cpu_archs = array('arm-oabi', 'armv4', 'armv4t', 'armv5te', 'armv6', 'armv7', 'avr32', 'bfin', 'i386', 'i486', 'i586', 'i686', 'iwmmxt', 'ppc405', 'ppc603e', 'sparc'); -$device_archs = array( - "a1200" => "armv5te", - "a780"=> "armv5te", - "acern30", - "adsp-bf537-stamp" => "bfin", - "adzs-bf538f-ezlite" => "bfin", - "akita" => "armv5te", - "alix", - "amsdelta", - "asus620", - "asus730", - "at32stk1000" => "avr32", - "at91sam9260ek" => "armv5te", - "at91sam9261ek" => "armv5te", - "at91sam9263ek" => "armv5te", - "atngw100" => "avr32", - "aximx50" => "armv5te", - "aximx50v" => "armv5te", - "borzoi" => "armv5te", - "boxer" => "armv5te", - "c7x0" => "armv5te", - "colinux", - "collie", - "compulab-pxa270" => "armv5te", - "corgi" => "armv5te", - "davinci-dvevm", - "db1200", - "devkitidp-pxa255" => "armv5te", - "dht-walnut" => "ppc405", - "e680" => "armv5te", - "efika" => "ppc603e", - "ep93xx" => "armv4t", - "epia", - "er0100" => "armv5te", - "eteng500" => "armv5te", - "fic-gta01" => "armv4t", - "fic-gta02" => "armv4t", - "fsg3be", - "geodegx", - "geodelx", - "guinness", - "gumstix-connex" => "armv5te", - "gumstix-verdex" => "armv5te", - "h1910", - "h1940", - "h2200" => "armv5te", - "h3600" => "arm-oabi", - "h3800" => "arm-oabi", - "h3900" => "armv5te", - "h4000" => "armv5te", - "h5000" => "armv5te", - "h6300" => "armv4t", - "htcalpine", - "htcapache", - "htcblueangel", - "htchimalaya", - "htcsable", - "htctornado", - "htcuniversal" => "armv5te", - "htcwallaby", - "husky" => "armv5te", - "hx2000" => "armv5te", - "hx4700" => "armv5te", - "i586-generic" => "i586", - "i686-generic" => "i586", - "ixp4xx", - "ixp4xxbe" => "armv5teb", - "ixp4xxle" => "armv5te", - "jornada56x", - "jornada6xx", - "jornada7xx", - "kb9202" => "armv4t", - "ks8695", - "lite5200", - "logicpd-pxa270" => "armv5te", - "looxc550", - "lsarm", - "lsppchd", - "lsppchg", - "magicbox", - "magician" => "armv5te", - "mainstone" => "armv5te", - "mnci", - "mtx-1", - "mtx-2", - "mtx-3", - "mtx-3a", - "mx21ads" => "armv5te", - "mx31ads" => "armv6", - "n2100", - "native", - "navman-icn330", - "netbook-pro" => "armv5te", - "netvista", - "nokia770" => "armv5te", - "nokia800", - "nslu2" => "armv5te", - "nslu2be" => "armv5teb", - "nslu2le" => "armv5te", - "omap1510inn" => "armv5te", - "omap1610h2" => "armv5te", - "omap1710h3" => "armv5te", - "omap2420h4", - "omap2430sdp", - "omap5912osk" => "armv5te", - "palmld" => "armv5te", - "palmt650" => "armv5te", - "palmt680", - "palmtc", - "palmtt", - "palmtt2", - "palmtt3", - "palmtt5", - "palmtx", - "palmz31", - "palmz71", - "palmz72", - "poodle" => "armv5te", - "progear", - "qemuarm" => "armv5te", - "qemux86", - "rb500", - "rokre2" => "armv5te", - "rokre6" => "armv5te", - "rt3000", - "rx1950", - "rx3000", - "sarge-at91" => "armv4t", - "sequoia", - "shark" => "arm-oabi", - "shepherd" => "armv5te", - "simpad" => "arm-oabi", - "smdk2440" => "armv4t", - "smdk2443" => "armv4t", - "spitz" => "armv5te", - "storcenter", - "sun4cdm", - "terrier" => "armv5te", - "titan", - "tosa" => "armv5te", - "triton", - "ts72xx", - "turbostation", - "wgt634u", - "wl500g", - "wrap", - "wrt54", - "x86-32-nocona", - "x86-prescott", - "x86-uml", - "x86", - "xilinx-ml403", - "xilinx-ml410", - "xxs1500", - ); + array( + 'name'=>'Tyan thunder K7 s2462 mainboard (guinness)', + 'url'=>'i686/machine/guinness', + ), + array( + 'name'=>'Progear webpad', + 'url'=>'i686/machine/progear', + ), + array( + 'name'=>'Genesi Efika', + 'url'=>'ppc603e/machine/efika', + ), -?> + )// end distro[feeds] + ), //end distro + array( + 'distro_name'=>'Ångström', + 'distro_version'=>'2007.12', + 'feed_base_url'=>'http://www.angstrom-distribution.org/feeds/2007/ipk/glibc/', + 'feeds'=> + array( + array( + 'name'=>'noarch feed', + 'url'=>'all', + ), + array( + 'name'=>'arm-oabi architecture base feed', + 'url'=>'arm-oabi/base', + ), + array( + 'name'=>'arm-oabi architecture gstreamer feed', + 'url'=>'arm-oabi/gstreamer', + ), + array( + 'name'=>'arm-oabi architecture perl feed', + 'url'=>'arm-oabi/perl', + ), + array( + 'name'=>'arm-oabi architecture python feed', + 'url'=>'arm-oabi/python', + ), + array( + 'name'=>'arm-oabi architecture debug feed', + 'url'=>'arm-oabi/debug', + ), + array( + 'name'=>'armv4t architecture base feed', + 'url'=>'armv4t/base', + ), + array( + 'name'=>'armv4t architecture gstreamer feed', + 'url'=>'armv4t/gstreamer', + ), + array( + 'name'=>'armv4t architecture perl feed', + 'url'=>'armv4t/perl', + ), + array( + 'name'=>'armv4t architecture python feed', + 'url'=>'armv4t/python', + ), + array( + 'name'=>'armv4t architecture debug feed', + 'url'=>'armv4t/debug', + ), + array( + 'name'=>'armv5te architecture base feed', + 'url'=>'armv5te/base', + ), + array( + 'name'=>'armv5te architecture gstreamer feed', + 'url'=>'armv5te/gstreamer', + ), + array( + 'name'=>'armv5te architecture perl feed', + 'url'=>'armv5te/perl', + ), + array( + 'name'=>'armv5te architecture python feed', + 'url'=>'armv5te/python', + ), + array( + 'name'=>'armv5te architecture debug feed', + 'url'=>'armv5te/debug', + ), + array( + 'name'=>'armv5teb architecture base feed', + 'url'=>'armv5teb/base', + ), + array( + 'name'=>'armv5teb architecture gstreamer feed', + 'url'=>'armv5teb/gstreamer', + ), + array( + 'name'=>'armv5teb architecture perl feed', + 'url'=>'armv5teb/perl', + ), + array( + 'name'=>'armv5teb architecture python feed', + 'url'=>'armv5teb/python', + ), + array( + 'name'=>'armv5teb architecture debug feed', + 'url'=>'armv5teb/debug', + ), + array( + 'name'=>'armv6 architecture base feed', + 'url'=>'armv6/base', + ), + array( + 'name'=>'armv6 architecture gstreamer feed', + 'url'=>'armv6/gstreamer', + ), + array( + 'name'=>'armv6 architecture perl feed', + 'url'=>'armv6/perl', + ), + array( + 'name'=>'armv6 architecture python feed', + 'url'=>'armv6/python', + ), + array( + 'name'=>'armv6 architecture debug feed', + 'url'=>'armv6/debug', + ), + array( + 'name'=>'i486 architecture base feed', + 'url'=>'i486/base', + ), + array( + 'name'=>'i486 architecture gstreamer feed', + 'url'=>'i486/gstreamer', + ), + array( + 'name'=>'i486 architecture perl feed', + 'url'=>'i486/perl', + ), + array( + 'name'=>'i486 architecture python feed', + 'url'=>'i486/python', + ), + array( + 'name'=>'i486 architecture debug feed', + 'url'=>'i486/debug', + ), + array( + 'name'=>'i586 architecture base feed', + 'url'=>'i586/base', + ), + array( + 'name'=>'i586 architecture gstreamer feed', + 'url'=>'i586/gstreamer', + ), + array( + 'name'=>'i586 architecture perl feed', + 'url'=>'i586/perl', + ), + array( + 'name'=>'i586 architecture python feed', + 'url'=>'i586/python', + ), + array( + 'name'=>'i586 architecture debug feed', + 'url'=>'i586/debug', + ), + array( + 'name'=>'i686 architecture base feed', + 'url'=>'i686/base', + ), + array( + 'name'=>'i686 architecture gstreamer feed', + 'url'=>'i686/gstreamer', + ), + array( + 'name'=>'i686 architecture perl feed', + 'url'=>'i686/perl', + ), + array( + 'name'=>'i686 architecture python feed', + 'url'=>'i686/python', + ), + array( + 'name'=>'i686 architecture debug feed', + 'url'=>'i686/debug', + ), + array( + 'name'=>'iwmmxt architecture base feed', + 'url'=>'iwmmxt/base', + ), + array( + 'name'=>'iwmmxt architecture gstreamer feed', + 'url'=>'iwmmxt/gstreamer', + ), + array( + 'name'=>'iwmmxt architecture perl feed', + 'url'=>'iwmmxt/perl', + ), + array( + 'name'=>'iwmmxt architecture python feed', + 'url'=>'iwmmxt/python', + ), + array( + 'name'=>'iwmmxt architecture debug feed', + 'url'=>'iwmmxt/debug', + ), + array( + 'name'=>'ppc405 architecture base feed', + 'url'=>'ppc405/base', + ), + array( + 'name'=>'ppc405 architecture gstreamer feed', + 'url'=>'ppc405/gstreamer', + ), + array( + 'name'=>'ppc405 architecture perl feed', + 'url'=>'ppc405/perl', + ), + array( + 'name'=>'ppc405 architecture python feed', + 'url'=>'ppc405/python', + ), + array( + 'name'=>'ppc405 architecture debug feed', + 'url'=>'ppc405/debug', + ), + array( + 'name'=>'ppc603e architecture base feed', + 'url'=>'ppc603e/base', + ), + array( + 'name'=>'ppc603e architecture gstreamer feed', + 'url'=>'ppc603e/gstreamer', + ), + array( + 'name'=>'ppc603e architecture perl feed', + 'url'=>'ppc603e/perl', + ), + array( + 'name'=>'ppc603e architecture python feed', + 'url'=>'ppc603e/python', + ), + array( + 'name'=>'ppc603e architecture debug feed', + 'url'=>'ppc603e/debug', + ) + ) // end distro['feeds'] + ), //end distro + array( + 'distro_name'=>'Ångström', + 'distro_version'=>'2008.6', + 'feed_base_url'=>'http://www.angstrom-distribution.org/feeds/2008/ipk/glibc/', + 'feeds'=> + array( + array( + 'name'=>'noarch feed', + 'url'=>'all', + ), + array( + 'name'=>'arm-oabi architecture base feed', + 'url'=>'arm-oabi/base', + ), + array( + 'name'=>'arm-oabi architecture gstreamer feed', + 'url'=>'arm-oabi/gstreamer', + ), + array( + 'name'=>'arm-oabi architecture perl feed', + 'url'=>'arm-oabi/perl', + ), + array( + 'name'=>'arm-oabi architecture python feed', + 'url'=>'arm-oabi/python', + ), + array( + 'name'=>'arm-oabi architecture debug feed', + 'url'=>'arm-oabi/debug', + ), + array( + 'name'=>'armv4t architecture base feed', + 'url'=>'armv4t/base', + ), + array( + 'name'=>'armv4t architecture gstreamer feed', + 'url'=>'armv4t/gstreamer', + ), + array( + 'name'=>'armv4t architecture perl feed', + 'url'=>'armv4t/perl', + ), + array( + 'name'=>'armv4t architecture python feed', + 'url'=>'armv4t/python', + ), + array( + 'name'=>'armv4t architecture debug feed', + 'url'=>'armv4t/debug', + ), + array( + 'name'=>'armv5te architecture base feed', + 'url'=>'armv5te/base', + ), + array( + 'name'=>'armv5te architecture gstreamer feed', + 'url'=>'armv5te/gstreamer', + ), + array( + 'name'=>'armv5te architecture perl feed', + 'url'=>'armv5te/perl', + ), + array( + 'name'=>'armv5te architecture python feed', + 'url'=>'armv5te/python', + ), + array( + 'name'=>'armv5te architecture debug feed', + 'url'=>'armv5te/debug', + ), + array( + 'name'=>'armv5teb architecture base feed', + 'url'=>'armv5teb/base', + ), + array( + 'name'=>'armv5teb architecture gstreamer feed', + 'url'=>'armv5teb/gstreamer', + ), + array( + 'name'=>'armv5teb architecture perl feed', + 'url'=>'armv5teb/perl', + ), + array( + 'name'=>'armv5teb architecture python feed', + 'url'=>'armv5teb/python', + ), + array( + 'name'=>'armv5teb architecture debug feed', + 'url'=>'armv5teb/debug', + ), + array( + 'name'=>'armv6 architecture base feed', + 'url'=>'armv6/base', + ), + array( + 'name'=>'armv6 architecture gstreamer feed', + 'url'=>'armv6/gstreamer', + ), + array( + 'name'=>'armv6 architecture perl feed', + 'url'=>'armv6/perl', + ), + array( + 'name'=>'armv6 architecture python feed', + 'url'=>'armv6/python', + ), + array( + 'name'=>'armv6 architecture debug feed', + 'url'=>'armv6/debug', + ), + array( + 'name'=>'i486 architecture base feed', + 'url'=>'i486/base', + ), + array( + 'name'=>'i486 architecture gstreamer feed', + 'url'=>'i486/gstreamer', + ), + array( + 'name'=>'i486 architecture perl feed', + 'url'=>'i486/perl', + ), + array( + 'name'=>'i486 architecture python feed', + 'url'=>'i486/python', + ), + array( + 'name'=>'i486 architecture debug feed', + 'url'=>'i486/debug', + ), + array( + 'name'=>'i586 architecture base feed', + 'url'=>'i586/base', + ), + array( + 'name'=>'i586 architecture gstreamer feed', + 'url'=>'i586/gstreamer', + ), + array( + 'name'=>'i586 architecture perl feed', + 'url'=>'i586/perl', + ), + array( + 'name'=>'i586 architecture python feed', + 'url'=>'i586/python', + ), + array( + 'name'=>'i586 architecture debug feed', + 'url'=>'i586/debug', + ), + array( + 'name'=>'i686 architecture base feed', + 'url'=>'i686/base', + ), + array( + 'name'=>'i686 architecture gstreamer feed', + 'url'=>'i686/gstreamer', + ), + array( + 'name'=>'i686 architecture perl feed', + 'url'=>'i686/perl', + ), + array( + 'name'=>'i686 architecture python feed', + 'url'=>'i686/python', + ), + array( + 'name'=>'i686 architecture debug feed', + 'url'=>'i686/debug', + ), + array( + 'name'=>'iwmmxt architecture base feed', + 'url'=>'iwmmxt/base', + ), + array( + 'name'=>'iwmmxt architecture gstreamer feed', + 'url'=>'iwmmxt/gstreamer', + ), + array( + 'name'=>'iwmmxt architecture perl feed', + 'url'=>'iwmmxt/perl', + ), + array( + 'name'=>'iwmmxt architecture python feed', + 'url'=>'iwmmxt/python', + ), + array( + 'name'=>'iwmmxt architecture debug feed', + 'url'=>'iwmmxt/debug', + ), + array( + 'name'=>'ppc405 architecture base feed', + 'url'=>'ppc405/base', + ), + array( + 'name'=>'ppc405 architecture gstreamer feed', + 'url'=>'ppc405/gstreamer', + ), + array( + 'name'=>'ppc405 architecture perl feed', + 'url'=>'ppc405/perl', + ), + array( + 'name'=>'ppc405 architecture python feed', + 'url'=>'ppc405/python', + ), + array( + 'name'=>'ppc405 architecture debug feed', + 'url'=>'ppc405/debug', + ), + array( + 'name'=>'ppc603e architecture base feed', + 'url'=>'ppc603e/base', + ), + array( + 'name'=>'ppc603e architecture gstreamer feed', + 'url'=>'ppc603e/gstreamer', + ), + array( + 'name'=>'ppc603e architecture perl feed', + 'url'=>'ppc603e/perl', + ), + array( + 'name'=>'ppc603e architecture python feed', + 'url'=>'ppc603e/python', + ), + array( + 'name'=>'ppc603e architecture debug feed', + 'url'=>'ppc603e/debug', + ) + )// end distro[feeds]s + )// end distro + ); //end $feeds +?> -- cgit v1.2.3 From 6ad3c8191ec734ea3b789300ad9cce646dc764ec Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 3 Jan 2008 20:33:48 +0000 Subject: contrib/feed-browser/update.php: Allow to update individual feeds. --- contrib/feed-browser/update.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php index 53317ebb03..98751ea26c 100644 --- a/contrib/feed-browser/update.php +++ b/contrib/feed-browser/update.php @@ -46,9 +46,15 @@ if(!check_database()) $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds"); -if($argc > 1 AND $argv[1] == 'upgrades') +if($argc == 2) { - $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = 'upgrades'"); + $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_uri = '${argv[1]}'"); +} else if ($argc == 3 && $argv[1] == "--type") { + $feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds WHERE f_type = '${argv[2]}'"); +} + +if (!$feeds) { + die("Cannot find feed(s) in the DB\n"); } $start = time(); -- cgit v1.2.3 From cd06d19972831142dfcdbaf12cb47594a6f682ea Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 3 Jan 2008 21:15:00 +0000 Subject: openmoko-gps: Update to latest version and add new icon. mtN: ---------------------------------------------------------------------- --- packages/openmoko-apps/files/openmoko-gps.desktop | 2 +- packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb | 32 -------------------- packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb | 34 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 33 deletions(-) delete mode 100644 packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb create mode 100644 packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb diff --git a/packages/openmoko-apps/files/openmoko-gps.desktop b/packages/openmoko-apps/files/openmoko-gps.desktop index ed3ec23933..a496745da4 100644 --- a/packages/openmoko-apps/files/openmoko-gps.desktop +++ b/packages/openmoko-apps/files/openmoko-gps.desktop @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=GPS Comment=Display GPS coordinates Exec=gps_reader.py -Icon=openmoko-terminal +Icon=openmoko-gps Terminal=false Type=Application Categories=GTK;Application;Utilities; diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb deleted file mode 100644 index a0a0a50942..0000000000 --- a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2008 -# License: MIT (see http://www.opensource.org/licenses/mit-license.php -# for a copy of the license) -# -# Filename: openmoko-gps_svn.bb -# Date: 20080101 (YMD) - -DESCRIPTION = "A tiny GPS output parser for the OpenMoko platform." -HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenMokoGPS" -SECTION = "base" -LICENSE = "GPL" - -RDEPENDS = "python-pygtk" - -PR = "r0" - -###################################################################################### - -SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=4 \ - file://openmoko-gps.desktop" - -S = "${WORKDIR}/gps" - -do_install() { - install -d ${D}/usr/bin - install -d ${D}/usr/share/applications/ - - install -m 0755 ${S}/gps_reader.py ${D}/usr/bin - install -m 0644 ${WORKDIR}/openmoko-gps.desktop ${D}/usr/share/applications/ -} diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb new file mode 100644 index 0000000000..1d00b6a78d --- /dev/null +++ b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb @@ -0,0 +1,34 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2008 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: openmoko-gps_svn.bb +# Date: 20080101 (YMD) + +DESCRIPTION = "A tiny GPS output parser for the OpenMoko platform." +HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenMokoGPS" +SECTION = "base" +LICENSE = "GPL" + +RDEPENDS = "python-pygtk" + +PR = "r0" + +###################################################################################### + +SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=6 \ + file://openmoko-gps.desktop" + +S = "${WORKDIR}/gps" + +do_install() { + install -d ${D}/usr/bin + install -d ${D}/usr/share/applications/ + install -d ${D}/usr/share/pixmaps/ + + install -m 0755 ${S}/gps_reader.py ${D}/usr/bin + install -m 0644 ${WORKDIR}/openmoko-gps.desktop ${D}/usr/share/applications/ + install -m 0644 ${S}/icon.png ${D}/usr/share/pixmaps/openmoko-gps.png +} -- cgit v1.2.3 From 51e42c17e8a759a080b6767c8a137875cec2b8ac Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Thu, 3 Jan 2008 21:21:26 +0000 Subject: util-linux-ng: Install binaries into same locations as util-linux does. --- packages/util-linux-ng/util-linux-ng.inc | 51 +++++++++++++++++++------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/packages/util-linux-ng/util-linux-ng.inc b/packages/util-linux-ng/util-linux-ng.inc index 987b85dc29..c01458d626 100644 --- a/packages/util-linux-ng/util-linux-ng.inc +++ b/packages/util-linux-ng/util-linux-ng.inc @@ -6,8 +6,9 @@ DEPENDS = "zlib ncurses e2fsprogs-libs" inherit autotools # I'm finishing this recipe during the 2.13.1 candidate release cycle -# @todo Remove $RC later. See if patches are needed. File locations. +# @todo Remove $RC later. See if patches are needed. Move files from /usr/*. # -- Leon 'likewise' Woestenberg + RC="-rc2" DEFAULT_PREFERENCE = "-1" @@ -36,7 +37,9 @@ FILES_util-linux-readprofile = "/usr/sbin/readprofile" RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" -EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown" +EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown \ +--enable-kill --enable-last --enable-mesg --enable-raw --enable-login-utils \ +--enable-arch --enable-init" S = "${WORKDIR}/util-linux-ng-${PV}${RC}" @@ -81,30 +84,38 @@ do_install () { oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install - return 0 - test -f ${D}${base_sbindir}/pivot_root && \ - mv ${D}${base_sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN} - mv ${D}${base_bindir}/dmesg ${D}${base_bindir}/dmesg.${PN} - mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN} - mv ${D}${base_bindir}/more ${D}${base_bindir}/more.${PN} - mv ${D}${base_sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN} - mv ${D}${base_sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN} - mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN} - mv ${D}${base_sbindir}/sln ${D}${base_sbindir}/sln.${PN} - mv ${D}${base_sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN} - mv ${D}${base_sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN} + mkdir ${D}${base_bindir} + mkdir ${D}${base_sbindir} + test -f ${D}${sbindir}/pivot_root && \ + mv ${D}${sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN} + mv ${D}${bindir}/dmesg ${D}${base_bindir}/dmesg.${PN} + mv ${D}${bindir}/kill ${D}${base_bindir}/kill.${PN} + mv ${D}${bindir}/more ${D}${base_bindir}/more.${PN} + mv ${D}${sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN} + mv ${D}${sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN} + mv ${D}${sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN} +# mv ${D}${sbindir}/sln ${D}${base_sbindir}/sln.${PN} + mv ${D}${sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN} + mv ${D}${sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN} mv ${D}${bindir}/hexdump ${D}${bindir}/hexdump.${PN} mv ${D}${bindir}/last ${D}${bindir}/last.${PN} mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN} mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN} mv ${D}${bindir}/renice ${D}${bindir}/renice.${PN} mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN} + return 0 + + mv ${D}${sbindir}/losetup ${D}${base_sbindir}/losetup.${PN} + mv ${D}${sbindir}/swapon ${D}${base_sbindir}/swapon.${PN} + mv ${D}${bindir}/umount ${D}${base_bindir}/umount.${PN} + mv ${D}${bindir}/mount ${D}${base_bindir}/mount.${PN} + mv ${D}${sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN} + + mv ${D}${bindir}/agetty ${D}${base_sbindir}/ + mv ${D}${bindir}/blockdev ${D}${base_sbindir}/ + mv ${D}${bindir}/cfdisk ${D}${base_sbindir}/ + mv ${D}${bindir}/ctrlaltdel ${D}${base_sbindir}/ - mv ${D}${base_sbindir}/losetup ${D}${base_sbindir}/losetup.${PN} - mv ${D}${base_sbindir}/swapon ${D}${base_sbindir}/swapon.${PN} - mv ${D}${base_bindir}/umount ${D}${base_bindir}/umount.${PN} - mv ${D}${base_bindir}/mount ${D}${base_bindir}/mount.${PN} - mv ${D}${base_sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN} install -d ${D}${sysconfdir}/default/ echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall @@ -132,7 +143,7 @@ pkg_postinst_${PN} () { update-alternatives --install ${bindir}/renice renice renice.${PN} 100 update-alternatives --install ${bindir}/wall wall wall.${PN} 100 - # There seems to be problem, atleast on nslu2, with these, untill they are + # There seems to be problem, atleast on nslu2, with these, until they are # fixed the busybox ones have higher priority update-alternatives --install ${base_sbindir}/hwclock hwclock hwclock.${PN} 10 update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 10 -- cgit v1.2.3 From c5c78c3746fa20932160ff585b3e4c53f4e6c69d Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Thu, 3 Jan 2008 23:28:27 +0000 Subject: openmoko-apps: openmoko-gps: Fix icon name --- packages/openmoko-apps/files/openmoko-gps.desktop | 2 +- packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/openmoko-apps/files/openmoko-gps.desktop b/packages/openmoko-apps/files/openmoko-gps.desktop index a496745da4..8273b8183d 100644 --- a/packages/openmoko-apps/files/openmoko-gps.desktop +++ b/packages/openmoko-apps/files/openmoko-gps.desktop @@ -3,7 +3,7 @@ Encoding=UTF-8 Name=GPS Comment=Display GPS coordinates Exec=gps_reader.py -Icon=openmoko-gps +Icon=openmoko-gps2 Terminal=false Type=Application Categories=GTK;Application;Utilities; diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb index 1d00b6a78d..9028393b4e 100644 --- a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb +++ b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb @@ -14,7 +14,7 @@ LICENSE = "GPL" RDEPENDS = "python-pygtk" -PR = "r0" +PR = "r1" ###################################################################################### @@ -30,5 +30,5 @@ do_install() { install -m 0755 ${S}/gps_reader.py ${D}/usr/bin install -m 0644 ${WORKDIR}/openmoko-gps.desktop ${D}/usr/share/applications/ - install -m 0644 ${S}/icon.png ${D}/usr/share/pixmaps/openmoko-gps.png + install -m 0644 ${S}/icon.png ${D}/usr/share/pixmaps/openmoko-gps2.png } -- cgit v1.2.3 From 6118eb7dd8e9c90e153687eb2c9db8072c79693e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 4 Jan 2008 00:07:39 +0000 Subject: initramfs-minimal-image: Revamp dependencies. --- packages/images/initramfs-minimal-image.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/images/initramfs-minimal-image.bb b/packages/images/initramfs-minimal-image.bb index 1aa928b2a9..d696468913 100644 --- a/packages/images/initramfs-minimal-image.bb +++ b/packages/images/initramfs-minimal-image.bb @@ -1,7 +1,6 @@ # Sample initramfs image -#IMAGE_INSTALL =