Merge bk://openembedded@openembedded.bkbits.net/packages

into dixie.nexus.co.uk:/home/pb/oe/oe-packages

2004/07/04 20:39:38+01:00 nexus.co.uk!pb
apply input and apm patches from Florian Boor

BKrev: 40e85d13b7ixgo-YxOn8lRT_-Jko3g

diff --git a/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-switches-input.diff b/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-switches-input.diff
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-ts-noninput.diff b/linux/opensimpad-2.4.25-vrs2-pxa1-jpm1/simpad-ts-noninput.diff
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
index c7e76d5..91a3bb6 100644 (file)
--- a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
+++ b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
@@ -1,11 +1,11 @@
-DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices."
+#DESCRIPTION = "Linux kernel for the SIEMENS SIMpad family of devices."
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 KV = "${@oe.data.getVar('PV',d,True).split('-')[0]}"
 VRSV = "${@oe.data.getVar('PV',d,True).split('-')[1]}"
 PXAV = "${@oe.data.getVar('PV',d,True).split('-')[2]}"
 JPMV = "${@oe.data.getVar('PV',d,True).split('-')[3]}"
-PR = "r7"
+PR = "r8"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/opensimpad-${PV}"
 
@@ -19,7 +19,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
            file://defconfig-${MACHINE} \
           ftp://ftp.xs4all.nl/pub/crypto/freeswan/kernpatch/freeswan-2.06.k2.4.patch.gz;patch=1 \
            file://mipv6-1.1-v2.4.25.patch;patch=1 \
-           file://simpad-backlight-if.diff;patch=1;pnum=0 "
+           file://simpad-backlight-if.diff;patch=1;pnum=0 \
+           file://simpad-switches-input.diff;patch=1;pnum=0 \
+           file://simpad-apm.diff;patch=1;pnum=0 \
+           file://simpad-ts-noninput.diff;patch=1;pnum=0"
 
 # apply this when we have a patch that allows building with gcc 3.x:
 # SRC_URI_append = file://gcc-3.3.patch;patch=1