diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-08-25 14:18:20 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-25 14:18:20 +0000 |
| commit | 2831a17c92a95a4a31352281f9bb2cde3429dbab (patch) | |
| tree | a94e687ba2ac77c9d56213ec3ced6c90370dd488 /packages | |
| parent | dc0a1e075036a8dc25ae9b85000d3d439343d585 (diff) | |
| parent | 7ef5bceaca3086db5e8b0de95fef06ea23732ff0 (diff) | |
merge of a4c0e74f4178cfd572d5dfe0f9b2b8d920172816
and e4f6787633b4d486e7052126b91dadaf9a933dff
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 3 | ||||
| -rw-r--r-- | packages/scap/files/scap.sh | 9 | ||||
| -rw-r--r-- | packages/scap/scap_0.1.bb | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index f96a086835..0bae9c58af 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -95,9 +95,11 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/spitz_base-r8.patch;patch=1 \ ${RPSRC}/spitz_pm-r0.patch;patch=1 \ ${RPSRC}/scoop_susres-r0.patch;patch=1 \ + ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ + ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ @@ -156,7 +158,6 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} debug" # Enable or disable ELPP via local.conf - default is "no" # ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"} - ############################################################### # module configs specific to this kernel # diff --git a/packages/scap/files/scap.sh b/packages/scap/files/scap.sh index 6fccdd400e..f8e0485333 100644 --- a/packages/scap/files/scap.sh +++ b/packages/scap/files/scap.sh @@ -1,5 +1,9 @@ #!/bin/sh +sleep 5 +if [ -x /usr/bin/bl ]; then + bl toggle +fi MODEL=`cat /proc/cpuinfo | grep ^Hardware | sed "s/.* //"` test -e /etc/scap.conf && USER=`cat /etc/scap.conf` RES=`fbset 2>/dev/null | awk "/geometry/ { print \$2 "x" \$3 }"` @@ -10,4 +14,7 @@ RES=`fbset 2>/dev/null | awk "/geometry/ { print \$2 "x" \$3 }"` echo "Host: www.handhelds.org" echo "" cat /dev/fb0) | nc www.handhelds.org 80 - +if [ -x /usr/bin/bl ]; then + bl toggle +fi + diff --git a/packages/scap/scap_0.1.bb b/packages/scap/scap_0.1.bb index 1348e6ed6f..30cf1b3299 100644 --- a/packages/scap/scap_0.1.bb +++ b/packages/scap/scap_0.1.bb @@ -1,5 +1,5 @@ LICENSE = "OSL" -PR = "r1" +PR = "r2" DESCRIPTION = "handhelds.org screen capture utility" SRC_URI = "file://scap.sh file://scap.desktop file://scap.png" |