Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/01 22:16:38+01:00 handhelds.org!CoreDump
Bump PR

2005/01/01 22:07:42+01:00 handhelds.org!CoreDump
Typo fix

BKrev: 41d718b7bePyBHjmVXzRh6bpkWG8jA

diff --git a/packages/prboom/files/prboom.sh b/packages/prboom/files/prboom.sh
index e69de29..0bc43ba 100644 (file)
--- a/packages/prboom/files/prboom.sh
+++ b/packages/prboom/files/prboom.sh
@@ -0,0 +1,16 @@
+#/bin/sh
+
+model="`cat /proc/cpuinfo | sed -n "/Hardware/s/.*\:\ \(.*\)/\1/p"`"
+
+if ! test -d "$HOME/.prboom"
+then
+       case $model in
+       *Collie)        par="-height 240";;
+       *)              par="";;
+       esac
+fi
+
+echo "Model: [$model]"
+echo "Launching prboom $par $*"
+
+prboom $par $*

diff --git a/packages/prboom/prboom-opie_2.2.6.bb b/packages/prboom/prboom-opie_2.2.6.bb
index 1c476c8..1f59e9e 100644 (file)
--- a/packages/prboom/prboom-opie_2.2.6.bb
+++ b/packages/prboom/prboom-opie_2.2.6.bb
@@ -1,6 +1,6 @@
 include prboom_${PV}.bb
 
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/prboom-${PV}"