aboutsummaryrefslogtreecommitdiffstats
path: root/recipes
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-12-02 01:45:38 +0100
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2009-12-02 01:45:38 +0100
commit6aea28e057ef0433df90586c20c12f36b6581e18 (patch)
tree18277a0dc4e9a24c5798fbe62d38a3d29de7d2ef /recipes
parenteb99a8719f48afcf5dff5d8f853382b9c42b6d48 (diff)
parent88eaa75372c97aa6182ac24270b77734e2b22fe5 (diff)
downloadopenembedded-6aea28e057ef0433df90586c20c12f36b6581e18.tar.gz
openembedded-6aea28e057ef0433df90586c20c12f36b6581e18.tar.bz2
openembedded-6aea28e057ef0433df90586c20c12f36b6581e18.zip
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
-rw-r--r--recipes/gpe-bootsplash/files/no-strip-on-install.patch11
-rw-r--r--recipes/gpe-bootsplash/gpe-bootsplash_1.13.bb6
-rw-r--r--recipes/gpe-bootsplash/gpe-bootsplash_1.14.bb6
-rw-r--r--recipes/gpe-bootsplash/gpe-bootsplash_1.15.bb6
-rw-r--r--recipes/shr/shr-settings_git.bb4
-rw-r--r--recipes/tasks/task-shr-feed.bb1
6 files changed, 26 insertions, 8 deletions
diff --git a/recipes/gpe-bootsplash/files/no-strip-on-install.patch b/recipes/gpe-bootsplash/files/no-strip-on-install.patch
new file mode 100644
index 0000000000..8ad5c59555
--- /dev/null
+++ b/recipes/gpe-bootsplash/files/no-strip-on-install.patch
@@ -0,0 +1,11 @@
+--- gpe-bootsplash-1.15/Makefile.old 2005-11-04 23:46:57.000000000 +0100
++++ gpe-bootsplash-1.15/Makefile 2009-12-01 23:39:18.000000000 +0100
+@@ -19,7 +19,7 @@
+ mkdir -p $(DESTDIR)/etc/init.d
+ cp gpe-bootsplash.init $(DESTDIR)/etc/init.d/gpe-bootsplash
+ #install -m 644 $(SPLASH) $(DESTDIR)/usr/share/gpe/splash.png
+- install -s gpe-bootsplash $(DESTDIR)/usr/bin/
++ install gpe-bootsplash $(DESTDIR)/usr/bin/
+ ln -sf ../init.d/gpe-bootsplash $(DESTDIR)/etc/rcS.d/S00bootsplash
+
+ clean:
diff --git a/recipes/gpe-bootsplash/gpe-bootsplash_1.13.bb b/recipes/gpe-bootsplash/gpe-bootsplash_1.13.bb
index 6f54eadad0..54a35a4b6a 100644
--- a/recipes/gpe-bootsplash/gpe-bootsplash_1.13.bb
+++ b/recipes/gpe-bootsplash/gpe-bootsplash_1.13.bb
@@ -4,9 +4,11 @@ DEPENDS = "gtk+ librsvg"
SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
-SRC_URI += "file://splash-p.svg file://splash-l.svg"
+SRC_URI += "file://splash-p.svg \
+ file://splash-l.svg \
+ file://no-strip-on-install.patch;patch=1"
FILES_${PN} += "${datadir}/gpe"
diff --git a/recipes/gpe-bootsplash/gpe-bootsplash_1.14.bb b/recipes/gpe-bootsplash/gpe-bootsplash_1.14.bb
index 414041dbcb..9b27cdad83 100644
--- a/recipes/gpe-bootsplash/gpe-bootsplash_1.14.bb
+++ b/recipes/gpe-bootsplash/gpe-bootsplash_1.14.bb
@@ -4,12 +4,14 @@ DEPENDS = "gtk+ libsvg-cairo"
SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
SRC_URI += "file://splash-p.svg file://splash-l.svg \
file://c7x0-rotation.patch;patch=1 \
file://cxx0-rotation.patch;patch=1 \
- file://cairofix.patch;patch=1"
+ file://cairofix.patch;patch=1 \
+ file://no-strip-on-install.patch;patch=1"
+
SRC_URI_append_mnci = " file://mnci.patch;patch=1"
FILES_${PN} += "${datadir}/gpe"
diff --git a/recipes/gpe-bootsplash/gpe-bootsplash_1.15.bb b/recipes/gpe-bootsplash/gpe-bootsplash_1.15.bb
index c947587207..9e705fe8f8 100644
--- a/recipes/gpe-bootsplash/gpe-bootsplash_1.15.bb
+++ b/recipes/gpe-bootsplash/gpe-bootsplash_1.15.bb
@@ -4,11 +4,13 @@ DEPENDS = "gtk+ libsvg-cairo"
SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r9"
+PR = "r10"
SRC_URI += "file://splash-p.svg \
file://splash-l.svg \
- file://init.patch;patch=1"
+ file://init.patch;patch=1 \
+ file://no-strip-on-install.patch;patch=1"
+
FILES_${PN} += "${datadir}/gpe"
diff --git a/recipes/shr/shr-settings_git.bb b/recipes/shr/shr-settings_git.bb
index 7d34a7f487..4ae6e96882 100644
--- a/recipes/shr/shr-settings_git.bb
+++ b/recipes/shr/shr-settings_git.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Modular settings application for SHR based on python-elementary"
HOMEPAGE = "http://shr-project.org"
SHR_RELEASE ?= "shr"
LICENSE ?= "GPL"
-RDEPENDS = "python-elementary python-dbus python-codecs python-shell python-pyrtc python python-core python-edbus dbus-x11 frameworkd python-phoneutils"
+RDEPENDS = "python-elementary python-dbus python-codecs python-shell python-pyrtc python python-core python-edbus dbus-x11 frameworkd python-phoneutils python-pexcept"
SECTION = "x11/application"
PE = "1"
PV = "0.1.1+gitr${SRCREV}"
-PR = "r7"
+PR = "r8"
inherit setuptools
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 2ed5ac898e..17787d926f 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -29,6 +29,7 @@ RDEPENDS_${PN} += "\
omview \
python-elementary \
pythm \
+ python-wifi \
openmoko-agpsui \
openvpn \
# shr-config \