From d930861216a318e6d851b2a8cea8f78b786bdec6 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Tue, 25 Nov 2008 17:52:33 +0100 Subject: python-rpyc: new recipe; remote procedure call package for python --- packages/python/python-rpyc_3.00.bb | 30 ++++++++++++++++++++++++++++++ packages/tasks/task-python-everything.bb | 7 ++++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 packages/python/python-rpyc_3.00.bb diff --git a/packages/python/python-rpyc_3.00.bb b/packages/python/python-rpyc_3.00.bb new file mode 100644 index 0000000000..b11856b713 --- /dev/null +++ b/packages/python/python-rpyc_3.00.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "RPyC is a Remote Procedure Call Package for Python" +SECTION = "devel/python" +HOMEPAGE = "http://rpyc.wikizone.com" +LICENSE = "GPL" +SRCNAME = "rpyc" +PR = "ml0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/rpyc/${SRCNAME}-${PV}-dev.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}-dev/build" + +inherit distutils + +do_configure_prepend() { + cd .. + rm -rf build + mkdir build + mkdir build/rpyc + + cp README build + cp setup.py build + cp __init__.py build/rpyc + cp license.py build/rpyc + cp -r core build/rpyc/ + cp -r servers build/rpyc/ + cp -r utils build/rpyc/ + + cd build + find . -name "*.pyc" | xargs rm -f +} + diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index 02cecbf586..ca92c246b4 100644 --- a/packages/tasks/task-python-everything.bb +++ b/packages/tasks/task-python-everything.bb @@ -1,7 +1,7 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml36" +PR = "ml38" RDEPENDS = "\ python-ao \ @@ -12,7 +12,7 @@ RDEPENDS = "\ python-dialog \ task-python-efl \ task-python-efl-examples \ - python-fam \ +# python-fam \ python-fnorb \ python-formencode \ python-fpconst \ @@ -76,6 +76,7 @@ RDEPENDS = "\ python-pyxml \ python-pyxmlrpc \ python-pyyaml \ + python-rpyc \ python-scapy \ python-scons \ python-setuptools \ @@ -89,7 +90,7 @@ RDEPENDS = "\ python-spyro \ python-sqlalchemy \ python-sqlobject \ - python-sword \ +# python-sword \ python-tlslite \ python-urwid \ python-vmaps \ -- cgit v1.2.3 From 07d5bbb00e8f0ba7a7e0ce234133628a66ad6992 Mon Sep 17 00:00:00 2001 From: Bernhard Guillon Date: Tue, 25 Nov 2008 18:36:37 +0100 Subject: checksums.ini: update for xqt2 and blackbox --- conf/checksums.ini | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 015e7a0c12..bb745f84b1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1,3 +1,27 @@ +[http://downloads.sourceforge.net/blackboxwm/blackbox-0.70.1.tar.gz] +md5=2d173b95ca5e64ef478c6a5d2deee9df +sha256=e394561d4426cf17e21eb5cc32e2972eb1af92d04a41808a41b1fb95320bd659 + +[ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-1.tgz] +md5=4f241a4f867363f40efa2b00dca292af +sha256=5276b045e154948fce7abba7d686406c65862d90b43b50f2546b33e38378f0d7 + +[ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz] +md5=844c2ee908d21dbf8911fd13115bf8b4 +sha256=0afbf41d0f4bcaceb1381fc1882b80f62548845b85c83c3eb0f3a9ac7f7f96ef + +[ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz] +md5=b82a0443e1b7bf860e4343e6b6766cb6 +sha256=19a830e3657851ad575ca895eb59932f1d90cd03735dec68f900dbc1bb6c3b7f + +[ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-4.tgz] +md5=567903747018f2534965ab6cb3976b38 +sha256=f62081c6f8a70a35fb0b5b210329f6bba7f5e506e9b809e23ceba21a2c35278e + +[ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-5.tgz] +md5=4dbdbe9a85c8f7f98dd0ee015a3c7b4f +sha256=3b732ed179dd34c17d1ba17867b60a36f20d82a3f0eca7b084fcb5396aa2b30c + [http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz] md5=c6a2705f6210d8ede50a947b375f1c0b sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88 -- cgit v1.2.3 From 03219a272280eceb2b761e32a011700d1bdde72c Mon Sep 17 00:00:00 2001 From: Bernhard Guillon Date: Tue, 25 Nov 2008 18:41:15 +0100 Subject: xqtlauncher: add package --- packages/tasks/task-xqtlauncher.bb | 21 ++++++++++ .../xqtlauncher/xqtlauncher-blackbox-config.bb | 17 ++++++++ .../xqtlauncher-blackbox-config/blackboxrc | 1 + .../xqtlauncher-blackbox-config/defaultwm | 1 + packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb | 19 +++++++++ .../xqtlauncher-xkbd-desktop/xkbd.desktop | 5 +++ packages/xqtlauncher/xqtlauncher.bb | 22 +++++++++++ packages/xqtlauncher/xqtlauncher/dot.directory | 3 ++ packages/xqtlauncher/xqtlauncher/startxqt | 15 ++++++++ packages/xqtlauncher/xqtlauncher/startxqt-wrapper | 5 +++ packages/xqtlauncher/xqtlauncher/xqtlauncher | 45 ++++++++++++++++++++++ 11 files changed, 154 insertions(+) create mode 100644 packages/tasks/task-xqtlauncher.bb create mode 100644 packages/xqtlauncher/xqtlauncher-blackbox-config.bb create mode 100644 packages/xqtlauncher/xqtlauncher-blackbox-config/blackboxrc create mode 100644 packages/xqtlauncher/xqtlauncher-blackbox-config/defaultwm create mode 100644 packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb create mode 100644 packages/xqtlauncher/xqtlauncher-xkbd-desktop/xkbd.desktop create mode 100644 packages/xqtlauncher/xqtlauncher.bb create mode 100644 packages/xqtlauncher/xqtlauncher/dot.directory create mode 100644 packages/xqtlauncher/xqtlauncher/startxqt create mode 100644 packages/xqtlauncher/xqtlauncher/startxqt-wrapper create mode 100644 packages/xqtlauncher/xqtlauncher/xqtlauncher diff --git a/packages/tasks/task-xqtlauncher.bb b/packages/tasks/task-xqtlauncher.bb new file mode 100644 index 0000000000..3d9029e5d1 --- /dev/null +++ b/packages/tasks/task-xqtlauncher.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Tasks for xqtlauncher stuff" +SECTION = "opie/base" +LICENSE = "MIT" +PR = "r0" + +inherit task + +PACKAGES = "task-xqtlauncher task-xqtlauncher-blackbox" + +#xkbd is currently needed becuse of a bug at xqt2 +RDEPENDS_task-xqtlauncher = "xqtlauncher \ + xqtlauncher-xkbd-desktop \ + " + +# +# xqtlauncher with blackbox as wm +# + +RDEPENDS_task-xqtlauncher-blackbox = "xqtlauncher-blackbox-config \ + " + diff --git a/packages/xqtlauncher/xqtlauncher-blackbox-config.bb b/packages/xqtlauncher/xqtlauncher-blackbox-config.bb new file mode 100644 index 0000000000..acd5873e5b --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher-blackbox-config.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "blackbox configuration for xqtlauncher which integrates X/Qt2 nicely into opie." +HOMEPAGE = "http://angstrom-distribution.org/" +LICENSE = "GPL" +PR = "r0" + +RDEPENDS = "blackbox xqtlauncher" + +SRC_URI = "file://blackboxrc \ + file://defaultwm" + +do_install() { + cd ${WORKDIR} + install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/X11 + install -m 0666 blackboxrc ${D}${sysconfdir} + install -m 0666 defaultwm ${D}${sysconfdir}/X11/ +} diff --git a/packages/xqtlauncher/xqtlauncher-blackbox-config/blackboxrc b/packages/xqtlauncher/xqtlauncher-blackbox-config/blackboxrc new file mode 100644 index 0000000000..6c86a59a0b --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher-blackbox-config/blackboxrc @@ -0,0 +1 @@ +session.screen0.toolbar.placement: TopCenter diff --git a/packages/xqtlauncher/xqtlauncher-blackbox-config/defaultwm b/packages/xqtlauncher/xqtlauncher-blackbox-config/defaultwm new file mode 100644 index 0000000000..a96cb8b9e5 --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher-blackbox-config/defaultwm @@ -0,0 +1 @@ +blackbox -rc /etc/blackboxrc diff --git a/packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb b/packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb new file mode 100644 index 0000000000..17ba103d20 --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher-xkbd-desktop.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "xqtlauncher integrates X/Qt2 nicely into opie. You can launch applications with it from opies menue" +HOMEPAGE = "http://angstrom-distribution.org/" +LICENSE = "GPL" +PR = "r0" + +RDEPENDS = "xkbd xqtlauncher" + +SRC_URI = "file://xkbd.desktop" + +do_install() { + cd ${WORKDIR} + install -d ${D}${bindir} + install -d ${D}${palmtopdir}/apps/XQt2/ + install -m 0644 xkbd.desktop ${D}${palmtopdir}/apps/XQt2 + ln -sf ${bindir}/xqtlauncher ${D}${bindir}/runxkbd +} + +FILES_${PN} += "${palmtopdir}/apps/XQt2 \ + ${palmtopdir}/apps/XQt2/xkbd.desktop " diff --git a/packages/xqtlauncher/xqtlauncher-xkbd-desktop/xkbd.desktop b/packages/xqtlauncher/xqtlauncher-xkbd-desktop/xkbd.desktop new file mode 100644 index 0000000000..78decbfda0 --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher-xkbd-desktop/xkbd.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Exec=runxkbd xkbd +Icon=Xqt.png +Type=Application +Name=X/Qt2 with xkbd diff --git a/packages/xqtlauncher/xqtlauncher.bb b/packages/xqtlauncher/xqtlauncher.bb new file mode 100644 index 0000000000..0897ddb862 --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "xqtlauncher integrates X/Qt2 nicely into opie. You can launch applications with it from opies menue" +HOMEPAGE = "http://angstrom-distribution.org/" +LICENSE = "GPL" +PR = "r0" + +RDEPENDS = "xqt2 xorg-minimal-fonts" + +SRC_URI = "file://dot.directory \ + file://startxqt \ + file://startxqt-wrapper \ + file://xqtlauncher " + +do_install() { + cd ${WORKDIR} + install -d ${D}${bindir} + install -m 0755 startxqt startxqt-wrapper xqtlauncher ${D}${bindir} + install -d ${D}${palmtopdir}/apps/XQt2/ + install -m 0644 dot.directory ${D}${palmtopdir}/apps/XQt2 +} + +FILES_${PN} += "${palmtopdir}/apps/XQt2 \ + ${palmtopdir}/apps/XQt2/.directory " diff --git a/packages/xqtlauncher/xqtlauncher/dot.directory b/packages/xqtlauncher/xqtlauncher/dot.directory new file mode 100644 index 0000000000..3c63f7f241 --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher/dot.directory @@ -0,0 +1,3 @@ +[Desktop Entry] +Icon=Xqt.png +Name=X/Qt2 diff --git a/packages/xqtlauncher/xqtlauncher/startxqt b/packages/xqtlauncher/xqtlauncher/startxqt new file mode 100644 index 0000000000..b863c2e3ae --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher/startxqt @@ -0,0 +1,15 @@ +#check if we are already running +if test -f /var/run/Xqt ;then + qcop QPE/TaskBar "message(QString)" "Xqt is already running!" +else + qcop QPE/TaskBar "message(QString)" "start Xqt server..." + #create run file + touch /var/run/Xqt + #setup environment - FIXME: check QTDIR first + export QTDIR=/usr/lib/opie + export DISPLAY=:0.0 + #start the server + Xqt -fp /usr/lib/X11/fonts/misc + #remove run file + rm /var/run/Xqt +fi diff --git a/packages/xqtlauncher/xqtlauncher/startxqt-wrapper b/packages/xqtlauncher/xqtlauncher/startxqt-wrapper new file mode 100644 index 0000000000..c0ac2ed8d0 --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher/startxqt-wrapper @@ -0,0 +1,5 @@ +startxqt & +sleep 3 +#read and start defaultwm from /etc/X11/defaultwm +$(cat /etc/X11/defaultwm) & +sleep 2 diff --git a/packages/xqtlauncher/xqtlauncher/xqtlauncher b/packages/xqtlauncher/xqtlauncher/xqtlauncher new file mode 100644 index 0000000000..4f2c9f937c --- /dev/null +++ b/packages/xqtlauncher/xqtlauncher/xqtlauncher @@ -0,0 +1,45 @@ +#set DISPLAY +export DISPLAY=:0.0 +#check if the application is installed +if which $1 ; then + echo start $1 + #is Xqt running? + if test ! -f /var/run/Xqt ;then + #start Xqt + startxqt-wrapper + fi + #do we have atomate access? FIXME: make a function out of this and loop it + if test -f /var/lock/xqtlauncher; then + qcop QPE/TaskBar "message(QString)" "Was not able to lock access. Try again or remove /var/lock/xqtlauncher" + else + #lock access + touch /var/lock/xqtlauncher + if test -f /var/run/xqtlauncher; then + #atomate write nuber of applications running in xqt +1 + echo $(($(cat /var/run/xqtlauncher ) + 1)) > /var/run/xqtlauncher + else + echo 1 > /var/run/xqtlauncher + fi + #remove lock + rm /var/lock/xqtlauncher + #start application + $1 + #do we have atomate access? FIXME: make a function out of this and loop it + if test -f /var/lock/xqtlauncher; then + qcop QPE/TaskBar "message(QString)" "Was not able to lock access. Try again or remove /var/lock/xqtlauncher" + else + #lock access + touch /var/lock/xqtlauncher + COUNTXQT=$(($(cat /var/run/xqtlauncher ) -1)) + echo $COUNTXQT > /var/run/xqtlauncher + if [ $COUNTXQT -le 0 ] ; then + #kill Xqt if there is no application running. + killall Xqt + fi + #remove lock + rm /var/lock/xqtlauncher + fi + fi +else + qcop QPE/TaskBar "message(QString)" "Application not found" +fi -- cgit v1.2.3 From c7c1df6ce89916259a0803d2a9a22e588cfa7de9 Mon Sep 17 00:00:00 2001 From: Bernhard Guillon Date: Tue, 25 Nov 2008 18:43:12 +0100 Subject: xqt2: hack to fix screen rotation --- packages/xqt2/files/fix_qtscreen_HACK.patch | 55 +++++++++++++++++++++++++++++ packages/xqt2/xqt2_20060509.bb | 15 ++++---- 2 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 packages/xqt2/files/fix_qtscreen_HACK.patch diff --git a/packages/xqt2/files/fix_qtscreen_HACK.patch b/packages/xqt2/files/fix_qtscreen_HACK.patch new file mode 100644 index 0000000000..7e4b2c658a --- /dev/null +++ b/packages/xqt2/files/fix_qtscreen_HACK.patch @@ -0,0 +1,55 @@ +diff -Nur xc/../xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc xc/../xqt2/xfree86/xqt-driver/qtscreen.cc +--- xc/../xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc 2008-09-25 14:18:44.000000000 +0200 ++++ xc/../xqt2/xfree86/xqt-driver/qtscreen.cc 2008-09-25 14:28:30.000000000 +0200 +@@ -109,6 +109,7 @@ + desktopSize = newSize; + fullScrSize = desktopSize; + normalScrSize = fullScrSize; ++ /* FIXME: get taskbar size from opie + if (normalScrSize.height() >= 400) { + normalScrSize.setHeight( normalScrSize.height() - 38); + } else { +@@ -117,7 +118,7 @@ + + if (!g_fFullScreen) { + fullScrSize = normalScrSize; +- } ++ }*/ + + #ifdef DEBUG_SCR + normalScrSize.setHeight(640); +@@ -128,6 +129,7 @@ + setDisplaySize(); + + #ifdef QWS ++ /* FIXME: fix this more general + // zaurus hack + if (desktopSize.width() > desktopSize.height()) { + shadow.setScrRandr(270); +@@ -136,6 +138,10 @@ + shadow.setScrRandr(0); + qtRandRRotate(0); + } ++ */ ++ // until that ++ shadow.setScrRandr(0); ++ qtRandRRotate(0); + #endif + } + +@@ -148,6 +154,7 @@ + *h = fullScrSize.height(); + + #ifdef QWS ++ /* FIXME: dix this more general + // zaurus hack + if (*w > *h) { + // rotate! +@@ -155,6 +162,7 @@ + *w = *h; + *h = sw; + } ++ */ + + *depth = 16; // 16bpp ¸ÇÄê + *bits = NULL; diff --git a/packages/xqt2/xqt2_20060509.bb b/packages/xqt2/xqt2_20060509.bb index 12e210d036..731385adb4 100644 --- a/packages/xqt2/xqt2_20060509.bb +++ b/packages/xqt2/xqt2_20060509.bb @@ -5,23 +5,24 @@ LICENSE = "GPL" SECTION = "opie/applications" APPTYPE = "binary" APPNAME = "Xqt" -PR = "r2" +PR = "r3" inherit palmtop SRC_URI = "cvs://anonymous@cvs.sourceforge.jp/cvsroot/xqt;module=xqt2;method=pserver;date=${PV} \ - http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-1.tgz \ - http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-2.tgz \ - http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-3.tgz \ - http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-4.tgz \ - http://ring.asahi-net.or.jp/archives/XFree86/4.3.0/source/X430src-5.tgz \ + ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-1.tgz \ + ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz \ + ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz \ + ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-4.tgz \ + ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-5.tgz \ file://KeyMap.patch;patch=1 \ file://moc_call.patch;patch=1 \ file://imake-staging.patch;patch=1 \ file://cross.patch;patch=1 \ file://fephack.patch;patch=1 \ file://xchar2b.patch;patch=1 \ - file://xqt-make.patch;patch=1 " + file://xqt-make.patch;patch=1 \ + file://fix_qtscreen_HACK.patch;patch=1 " S = "${WORKDIR}/xc" QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' -- cgit v1.2.3 From e35d1ffad1553f259b084578992f15d10f590f98 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 25 Nov 2008 19:44:53 +0100 Subject: package_ipk bbclass: add License: to control file --- classes/package_ipk.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 29ee32788f..a20b6bbef6 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -200,6 +200,7 @@ python do_package_ipk () { fields.append(["Section: %s\n", ['SECTION']]) fields.append(["Priority: %s\n", ['PRIORITY']]) fields.append(["Maintainer: %s\n", ['MAINTAINER']]) + fields.append(["License: %s\n", ['LICENSE']]) fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']]) fields.append(["OE: %s\n", ['PN']]) fields.append(["Homepage: %s\n", ['HOMEPAGE']]) -- cgit v1.2.3 From 7af9102a14a6b22bd958d76ce6a936ae19ab8721 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 25 Nov 2008 19:48:30 +0100 Subject: feed browser: mention License field * code doesn't use it yet --- contrib/feed-browser/update.php | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/feed-browser/update.php b/contrib/feed-browser/update.php index 98751ea26c..ba6775fb40 100644 --- a/contrib/feed-browser/update.php +++ b/contrib/feed-browser/update.php @@ -32,6 +32,7 @@ require_once 'includes/functions.inc'; Section: net Architecture: armv5te Maintainer: Angstrom Developers + License: GPL MD5Sum: b8bd197224e24759d2162091a0fa727f Size: 12346 Filename: zeroconf_0.9-r0_armv5te.ipk -- cgit v1.2.3 From a75609271b789e84f5ce557401add970f0d22490 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 25 Nov 2008 19:50:00 +0100 Subject: angstrom-version: fix LICENSE --- packages/angstrom/angstrom-version.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb index c4ea6e2a21..ece77495b1 100644 --- a/packages/angstrom/angstrom-version.bb +++ b/packages/angstrom/angstrom-version.bb @@ -1,3 +1,5 @@ +LICENSE = "MIT" + PV = "${DISTRO_VERSION}" PR = "r1" PE = "1" -- cgit v1.2.3 From ae274a5269c595cb130997dac4b6354d7379fb2b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 25 Nov 2008 15:33:45 -0800 Subject: uclibc_0.9.30.bb: Use renamed ldso_hash.patch for avr32 --- packages/uclibc/uclibc_0.9.30.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/uclibc/uclibc_0.9.30.bb b/packages/uclibc/uclibc_0.9.30.bb index 1643998983..29d83523c0 100644 --- a/packages/uclibc/uclibc_0.9.30.bb +++ b/packages/uclibc/uclibc_0.9.30.bb @@ -20,7 +20,7 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \ " SRC_URI_append_arm = " file://ldso_hash.patch;patch=1 " SRC_URI_append_armeb = " file://ldso_hash.patch;patch=1 " -SRC_URI_append_avr32 = " file://ldso_hash_arm.patch;patch=1 " +SRC_URI_append_avr32 = " file://ldso_hash.patch;patch=1 " #recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From 4fe6b38d07065b816f3661576234909b393f5c23 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Tue, 25 Nov 2008 20:56:27 -0600 Subject: checksums.ini: add linux-rp-2.6.24 --- conf/checksums.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index bb745f84b1..20f46601b1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -23538,3 +23538,6 @@ sha256=5cc1a53bb909922596bdd0fa967b654fe1bfbe0dcf1d34608f0b7c90e0c27867 md5=5f7b88ebb2bcd7e8044328482d079661 sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af +[http://kernel.orgpub/linux/kernel/v2.6/linux-2.6.24.tar.bz2] +md5=3f23ad4b69d0a552042d1ed0f4399857 +sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3 -- cgit v1.2.3 From af019c2b141e63fe3e5b027bb7b6771d991645b7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 26 Nov 2008 09:34:03 +0100 Subject: angstrom feed builder: add ushare and mediatomb --- contrib/angstrom/build-feeds.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 4e5c1b7b72..6acb44a565 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -161,7 +161,8 @@ do make \ maki \ mc \ - meta-nas-server \ + mediatomb \ + meta-nas-server \ meta-toolchain \ metacity \ midori \ @@ -248,7 +249,8 @@ do ufraw \ usbutils \ usbview \ - viking \ + ushare \ + viking \ vlc \ vpnc \ wifi-radar \ -- cgit v1.2.3 From 30e9524f0f4400b600169b3719b119b1146d5e74 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 26 Nov 2008 11:18:38 +0100 Subject: libmokoui2: add license, the python magic in openmoko2.bbclass is broken --- packages/openmoko2/libmokoui2_svn.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb index 3785074a82..d52b24737f 100644 --- a/packages/openmoko2/libmokoui2_svn.bb +++ b/packages/openmoko2/libmokoui2_svn.bb @@ -5,6 +5,8 @@ PR = "r2" inherit openmoko2 +LICENSE = "LGPL" + do_configure_prepend() { touch gtk-doc.make } -- cgit v1.2.3 From d43764c4f8d25a803a65b48a39e49b652c08e773 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 26 Nov 2008 11:34:43 +0100 Subject: elementary: fix up .pc --- packages/efl1/elementary_svn.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/efl1/elementary_svn.bb b/packages/efl1/elementary_svn.bb index 13523996dc..caf2c37e85 100644 --- a/packages/efl1/elementary_svn.bb +++ b/packages/efl1/elementary_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "An EFL based Alarm app" LICENSE = "MIT BSD" DEPENDS = "evas ecore edje eet edbus" PV = "0.0.0+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit efl @@ -12,6 +12,12 @@ S = "${WORKDIR}/elementary" RDEPENDS = "elementary-themes" RRECOMMENDS = "elementary-tests" +do_compile_append() { + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + elementary.pc +} + FILES_${PN}-themes = "\ ${datadir}/elementary/themes \ " -- cgit v1.2.3 From 43ceacd5db91c12adbff29ed1daa81f6fce8c01d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 26 Nov 2008 11:35:12 +0100 Subject: elementary-alarm: fix SRC_URI and S --- packages/e17/elementary-alarm_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/e17/elementary-alarm_svn.bb b/packages/e17/elementary-alarm_svn.bb index 63d0c36083..4294f2fad1 100644 --- a/packages/e17/elementary-alarm_svn.bb +++ b/packages/e17/elementary-alarm_svn.bb @@ -7,8 +7,8 @@ PR = "r1" inherit e -SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=alarm;proto=http" -S = "${WORKDIR}/alarm" +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=elementary-alarm;proto=http" +S = "${WORKDIR}/elementary-alarm" RDEPENDS = "waker" FILES_${PN} += "${bindir}/*" -- cgit v1.2.3 From ddfe11c9c4175151ba746868e41f2ccb2a8aa4ff Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 26 Nov 2008 12:35:23 +0100 Subject: angstrom 2008: move distro pr to main file --- conf/distro/angstrom-2008.1.conf | 1 + conf/distro/include/angstrom-eglibc.inc | 1 - conf/distro/include/angstrom-glibc.inc | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index fc53859bb3..f0bfc15842 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -19,6 +19,7 @@ #DISTRO_VERSION = "2008.1" DISTRO_VERSION = "2008.1-test-${DATE}" DISTRO_REVISION = "1" +DISTRO_PR = ".1" #build staging from packages INHERIT += "packaged-staging" diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index e68a23664b..1d38e5f316 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -30,7 +30,6 @@ BUILD_OPTIMIZATION_pn-perl = "-O1" BUILD_OPTIMIZATION_sparc = "-O2" TARGET_LINK_HASH_STYLE = "-Wl,--hash-style=gnu" -DISTRO_PR = ".1" CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 4ee402fd59..fdb59f3fb5 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -34,7 +34,6 @@ BUILD_OPTIMIZATION_pn-glibc = "-O2" BUILD_OPTIMIZATION_sparc = "-O2" TARGET_LINK_HASH_STYLE = "-Wl,--hash-style=gnu" -DISTRO_PR = ".1" CXXFLAGS += "-fvisibility-inlines-hidden" -- cgit v1.2.3 From e7aea9ef0f7af04c98fdf33c7751df4b2af69124 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 26 Nov 2008 14:55:14 +0100 Subject: git[-native] 1.5.x: remove --- packages/git/git-native_1.5.2.3.bb | 5 ----- packages/git/git-native_1.5.3.bb | 7 ------- packages/git/git_1.5.2.3.bb | 26 -------------------------- packages/git/git_1.5.3.bb | 7 ------- 4 files changed, 45 deletions(-) delete mode 100644 packages/git/git-native_1.5.2.3.bb delete mode 100644 packages/git/git-native_1.5.3.bb delete mode 100644 packages/git/git_1.5.2.3.bb delete mode 100644 packages/git/git_1.5.3.bb diff --git a/packages/git/git-native_1.5.2.3.bb b/packages/git/git-native_1.5.2.3.bb deleted file mode 100644 index 0df7f8c920..0000000000 --- a/packages/git/git-native_1.5.2.3.bb +++ /dev/null @@ -1,5 +0,0 @@ -inherit native -require git_${PV}.bb - -DEPENDS = "openssl-native curl-native zlib-native expat-native" -RDEPENDS = "" diff --git a/packages/git/git-native_1.5.3.bb b/packages/git/git-native_1.5.3.bb deleted file mode 100644 index 6b9dacbd3d..0000000000 --- a/packages/git/git-native_1.5.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require git.inc - -SRC_URI += "file://git-gui-install-mode-arg-spaces.patch;patch=1" - -inherit native -DEPENDS = "openssl-native curl-native zlib-native expat-native" -PR = "r2" diff --git a/packages/git/git_1.5.2.3.bb b/packages/git/git_1.5.2.3.bb deleted file mode 100644 index ad25a43732..0000000000 --- a/packages/git/git_1.5.2.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "The git revision control system used by the Linux kernel developers" -SECTION = "console/utils" -LICENSE = "GPL" -PR ="r4" - -inherit autotools - -SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \ - file://autotools.patch;patch=1 \ - " - -S = "${WORKDIR}/git-${PV}" - -DEPENDS = "openssl curl zlib expat" -RDEPENDS = "perl perl-module-file-path cpio findutils sed" - -EXTRA_OEMAKE = "NO_TCLTK=1" - -do_install() { - oe_runmake install DESTDIR="${D}" bindir="${bindir}" \ - template_dir="${datadir}/git-core/templates" \ - GIT_PYTHON_DIR="${datadir}/git-core/python" -} - -FILES_${PN} += "${datadir}/git-core" - diff --git a/packages/git/git_1.5.3.bb b/packages/git/git_1.5.3.bb deleted file mode 100644 index 491bb3f7c1..0000000000 --- a/packages/git/git_1.5.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require git.inc - -SRC_URI += "file://git-gui-install-mode-arg-spaces.patch;patch=1" - -DEPENDS = "openssl curl zlib expat" -RDEPENDS = "perl perl-module-file-path cpio findutils sed" -PR = "r2" -- cgit v1.2.3 From 44819323197d5a5833193ed74eb2d04f9ff66bcc Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 26 Nov 2008 15:03:22 +0100 Subject: fso-apm: new recipe; apm compatibility command for freesmartphone.org framework multicat: new recipe; multiple cat utility sane-srcrevs.inc: bump FSO stuff preferred-om-2008-versions: bump git angstrom-2007-for-openmoko.inc: bump --- conf/distro/include/angstrom-2007-for-openmoko.inc | 2 +- conf/distro/include/preferred-om-2008-versions.inc | 4 ++-- conf/distro/include/sane-srcrevs.inc | 8 +++++--- packages/freesmartphone/frameworkd-devel_git.bb | 4 +++- packages/freesmartphone/fso-apm_git.bb | 20 ++++++++++++++++++++ packages/freesmartphone/multicat_git.bb | 21 +++++++++++++++++++++ 6 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 packages/freesmartphone/fso-apm_git.bb create mode 100644 packages/freesmartphone/multicat_git.bb diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 22a2c98a16..7a4d498539 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -218,7 +218,7 @@ DISTRO_EXTRA_DEPENDS += " \ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ - ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \ +# ${@base_contains("MACHINE_FEATURES", "screen", "exquisite", "",d)} \ angstrom-version \ opkg opkg-collateral distro-feed-configs \ util-linux-mount util-linux-umount \ diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 656d6b2219..107e808c48 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -459,8 +459,8 @@ PREFERRED_VERSION_gift ?= "0.11.5" PREFERRED_VERSION_giftcurs ?= "0.6.2" PREFERRED_VERSION_gimp ?= "2.3.19" PREFERRED_VERSION_ginspector ?= "20050529" -PREFERRED_VERSION_git ?= "1.5.2.3" -PREFERRED_VERSION_git-native ?= "1.5.2.3" +PREFERRED_VERSION_git ?= "1.6.0.4" +PREFERRED_VERSION_git-native ?= "1.6.0.4" PREFERRED_VERSION_gizmod ?= "2.3" PREFERRED_VERSION_gkrellm ?= "2.2.10" PREFERRED_VERSION_glib-1.2 ?= "1.2.10" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index d0bd784a97..eb6a98eebd 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -48,6 +48,7 @@ SRCREV_pn-flashrom ?= "3682" SRCREV_pn-frameworkd ?= "d8a55311c5d29bb2946c76e8445748e04049eb1a" SRCREV_pn-frameworkd-devel ?= "e8ad25f2e36e31e0a8afe08fbe11e54b9305aa8f" SRCREV_pn-fsod ?= "9ab5e9884839c9745ecd878a9cf562a1c1b73411" +SRCREV_pn-fso-apm ?= "d5d3c4da59fd0ef28bf2789341ba6d42bc28a98b" SRCREV_pn-fso-gpsd ?= "8f82d35ae83fdc00f2c4786257e98551b9dea995" SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2" SRCREV_pn-fstests ?= "204" @@ -99,14 +100,15 @@ SRCREV_pn-matchbox-keyboard ?= "1910" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-matchbox-stroke ?= "1820" -SRCREV_pn-mickeydbus ?= "e2698d54e2bec9a61ac858f9773d9ca1b78cc9a5" -SRCREV_pn-mickeyterm ?= "e2698d54e2bec9a61ac858f9773d9ca1b78cc9a5" +SRCREV_pn-mickeydbus ?= "d5d3c4da59fd0ef28bf2789341ba6d42bc28a98b" +SRCREV_pn-mickeyterm ?= "d5d3c4da59fd0ef28bf2789341ba6d42bc28a98b" SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce" SRCREV_pn-moko-gtk-engine ?= "4734" SRCREV_pn-mokoko ?= "119" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer ?= "27659" SRCREV_pn-mplayer-maemo ?= "342" +SRCREV_pn-multicat ?= "d5d3c4da59fd0ef28bf2789341ba6d42bc28a98b" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-navit ?= "1096" SRCREV_pn-neod ?= "4617" @@ -184,7 +186,7 @@ SRCREV_pn-python-connexion ?= "1283" SRCREV_pn-python-formencode = "3148" SRCREV_pn-python-gsmd = "148" SRCREV_pn-python-lightmediascanner = "68" -SRCREV_pn-python-pyrtc = "d1f32060474767582dd4248d5e5c2adc63931d5a" +SRCREV_pn-python-pyrtc = "d5d3c4da59fd0ef28bf2789341ba6d42bc28a98b" SRCREV_pn-python-pyyaml = "294" QEMUSRCREV = "4242" SRCREV_pn-tslib ?= "53" diff --git a/packages/freesmartphone/frameworkd-devel_git.bb b/packages/freesmartphone/frameworkd-devel_git.bb index 9438b6d768..acd41dcaf5 100644 --- a/packages/freesmartphone/frameworkd-devel_git.bb +++ b/packages/freesmartphone/frameworkd-devel_git.bb @@ -1,7 +1,9 @@ require frameworkd_git.bb FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/frameworkd', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +PROVIDES = "frameworkd" +DEFAULT_PREFERENCE = "-1" -PR="r1" +PR = "r2" SRC_URI = "\ ${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ diff --git a/packages/freesmartphone/fso-apm_git.bb b/packages/freesmartphone/fso-apm_git.bb new file mode 100644 index 0000000000..df8894852b --- /dev/null +++ b/packages/freesmartphone/fso-apm_git.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "freesmartphone.org apm compatibility utility" +AUTHOR = "Michael 'Mickey' Lauer " +HOMEPAGE = "http://www.freesmartphone.org" +SECTION = "console" +LICENSE = "GPLv2" +PV = "0.0.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${bindir} + install -m 0755 fso-apm/apm ${D}${bindir} +} + +PACKAGE_ARCH_${PN} = "all" +RDEPENDS_${PN} = "python-dbus frameworkd" +RPROVIDES_${PN} = "apm" +RCONFLICTS_${PN} = "apm" diff --git a/packages/freesmartphone/multicat_git.bb b/packages/freesmartphone/multicat_git.bb new file mode 100644 index 0000000000..fb2b332143 --- /dev/null +++ b/packages/freesmartphone/multicat_git.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Multiple cat utility" +AUTHOR = "Michael 'Mickey' Lauer " +HOMEPAGE = "http://www.freesmartphone.org" +SECTION = "console" +LICENSE = "GPLv2" +PV = "0.0.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${bindir} + install -m 0755 multicat/multicat ${D}${bindir} +} + +RDEPENDS_${PN} = "\ + python-core \ +" + +PACKAGE_ARCH_${PN} = "all" -- cgit v1.2.3 From ca536c2e877c3a85a30f627f24493d913566a48f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 26 Nov 2008 16:48:47 +0100 Subject: e-wm: really fix RDEPENDS --- packages/e17/e-wm_svn.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb index 172d351b22..1000ebf86d 100644 --- a/packages/e17/e-wm_svn.bb +++ b/packages/e17/e-wm_svn.bb @@ -2,17 +2,18 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17" DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" PV = "0.16.999.043+svnr${SRCREV}" -PR = "r20" +PR = "r21" inherit e update-alternatives -RDEPENDS += "shared-mime-info mime-support edje-utils" +E_RDEPENDS = "shared-mime-info mime-support edje-utils" # Uclibc build don't have 'glibc-utils' # I suspect the workaround below breaks eglibc, though. Koen - 20081125 -RDEPENDS_${PN}_append_linux = " glibc-utils " -RDEPENDS_${PN}_append_linux-uclibc = " uclibc-utils " -RDEPENDS_${PN}_append_linux-uclibcgnueabi = " uclibc-utils " +RDEPENDS_${PN}_append_linux = " ${E_RDEPENDS} glibc-utils " +RDEPENDS_${PN}_append_linux-gnueabi = " ${E_RDEPENDS} glibc-utils " +RDEPENDS_${PN}_append_linux-uclibc = " ${E_RDEPENDS} uclibc-utils " +RDEPENDS_${PN}_append_linux-uclibcgnueabi = " ${E_RDEPENDS} uclibc-utils " PACKAGES =+ "\ ${PN}-config-default \ -- cgit v1.2.3 From 2d20ac1cb43a410e65239a6b2a849bac678dfaca Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 26 Nov 2008 16:49:09 +0100 Subject: beagleboard-demo-image: ship more LINGUAS --- packages/images/beagleboard-demo-image.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb index f539c79a9d..b7fef091d6 100644 --- a/packages/images/beagleboard-demo-image.bb +++ b/packages/images/beagleboard-demo-image.bb @@ -1,5 +1,7 @@ # Demo image for beagleboard +IMAGE_LINGUAS = "de-de fr-fr en-gb pt-br es-es" + XSERVER ?= "xserver-xorg \ xf86-input-evdev \ xf86-input-mouse \ -- cgit v1.2.3 From 22aa4d4401b102a797c305ca99c115b942d10cdb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 26 Nov 2008 17:19:03 +0100 Subject: sourcepkg.bbclass: use same deploydir as source-distribute classes --- classes/sourcepkg.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 9621b4e062..045b4ce629 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -1,4 +1,4 @@ -DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/source" +DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources" EXCLUDE_FROM ?= ".pc autom4te.cache" # used as part of a path. make sure it's set -- cgit v1.2.3