summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-06-27 19:46:34 +0000
committerMichael Lauer <mickey@vanille-media.de>2005-06-27 19:46:34 +0000
commit773b8215d1308a8736f278a307a5340dfceddcb4 (patch)
tree1dd96da3f7a403b82bfb6a08edf8b5c6fede4706
parent751a214bfe4175051364fe5facc7075b73056b7a (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/06/27 21:45:37+02:00 uni-frankfurt.de!mickeyl Apply patch from Hector Martin that fixes collie suspend/resume deadlock w/ apmd. (Yippee :) BKrev: 42c0579ao2g-H7AeN7qu8TKMZtkHQw
-rw-r--r--packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/unb0rk-apm.patch0
-rw-r--r--packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb5
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/unb0rk-apm.patch b/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/unb0rk-apm.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/unb0rk-apm.patch
diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index db585ec5e6..63df6a88cf 100644
--- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -6,12 +6,13 @@ KV = "2.4.18"
RMKV = "7"
PXAV = "3"
SHARPV = "20030509"
-PR = "r20"
+PR = "r21"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
SRC_URI = "http://www.openzaurus.org/mirror/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \
file://cacko.patch;patch=1 \
- file://unb0rk-rightarrow.patch;patch=1 \
+ file://unb0rk-rightarrow.patch;patch=1 \
+ file://unb0rk-apm.patch;patch=1 \
file://battery.patch;patch=1 \
file://bluetooth-2.4.18-mh15.patch;patch=1 \
file://iw_handlers.w13-5.diff;patch=1 \