summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-05-10 20:43:56 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-10 20:43:56 +0000
commit3e5fb52e1267b68327c395b5cada0181ac356450 (patch)
tree8d4274f150d79d63225dcef21163bd9444db2965
parent92ce84cc4a58d1df316bf37e1c0ca1e7eb0c196d (diff)
parent1ecc0bdb3fc73008e831dab6fd9d422e56afeeac (diff)
merge of 460c9c22eddb03009d980c3edb1ee42689b9e09d
and a349b2053c350eb4d9799057043eefd3946fad4c
-rw-r--r--packages/gpe-aerial/files/iconlist.patch10
-rw-r--r--packages/gpe-aerial/gpe-aerial_0.2.13.bb3
-rw-r--r--packages/linux/linux-jlime-sh3_2.6.11.bb4
3 files changed, 16 insertions, 1 deletions
diff --git a/packages/gpe-aerial/files/iconlist.patch b/packages/gpe-aerial/files/iconlist.patch
new file mode 100644
index 0000000000..004e317b90
--- /dev/null
+++ b/packages/gpe-aerial/files/iconlist.patch
@@ -0,0 +1,10 @@
+--- main.c.orig 2006-05-10 21:37:32.000000000 +0200
++++ main.c 2006-05-10 21:37:43.000000000 +0200
+@@ -33,7 +33,6 @@
+ #include <gpe/init.h>
+ #include <gpe/pixmaps.h>
+ #include <gpe/errorbox.h>
+-#include <gpe/gpe-iconlist.h>
+ #include <gpe/tray.h>
+ #include <gpe/popup.h>
+ #include <gpe/spacing.h>
diff --git a/packages/gpe-aerial/gpe-aerial_0.2.13.bb b/packages/gpe-aerial/gpe-aerial_0.2.13.bb
index 987c6535f6..1f79de876b 100644
--- a/packages/gpe-aerial/gpe-aerial_0.2.13.bb
+++ b/packages/gpe-aerial/gpe-aerial_0.2.13.bb
@@ -1,6 +1,6 @@
inherit gpe pkgconfig
-PR = "r0"
+PR = "r1"
DESCRIPTION = "GPE wireless LAN communication applet"
@@ -10,3 +10,4 @@ SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
+SRC_URI += "file://iconlist.patch;patch=1;pnum=0" \ No newline at end of file
diff --git a/packages/linux/linux-jlime-sh3_2.6.11.bb b/packages/linux/linux-jlime-sh3_2.6.11.bb
index b646c1a3b8..a83347bf7b 100644
--- a/packages/linux/linux-jlime-sh3_2.6.11.bb
+++ b/packages/linux/linux-jlime-sh3_2.6.11.bb
@@ -3,6 +3,10 @@ DESCRIPTION = "Linux kernel for Hitachi SH3 based Jornada 6xx"
LICENSE = "GPL"
PR = "r0"
+
+COMPATIBLE_HOST = "sh.*-linux"
+COMPATIBLE_MACHINE = 'jornada6xx'
+
SRC_URI = "http://www.jlime.com/downloads/releases/shrek/kernels/6xx/sources/linuxsh-snapshot-050320-jlimepatched-3.tar.bz2 \
file://defconfig_jlime"