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

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

2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage

2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission

2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.

2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3

2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp.  Thanks to holger freyther for pointing it out.

BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A

2 files changed, 59 insertions, 12 deletions

diff --git a/packages/frodo/frodo_4.1b.bb b/packages/frodo/frodo_4.1b.bb
index e69de29bb2..c048751d59 100644
--- a/packages/frodo/frodo_4.1b.bb
+++ b/packages/frodo/frodo_4.1b.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "A C64 emulator based on SDL."
+SECTION = "opie/applications"
+DEPENDS = "libsdl-qpe"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://wwwthep.physik.uni-mainz.de/~cbauer/FrodoV4_1b.Src.tar.gz \
+           file://frodo-qte.diff;patch=1 \
+           file://frodo-joystick-4state.diff;patch=1 \
+           file://frodorc \
+           file://Frodo.png \
+           file://frodo.desktop"
+S = "${WORKDIR}/Frodo-${PV}/Src"
+
+inherit autotools 
+
+EXTRA_OECONF = "--disable-sdltest --enable-qtopia"
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/apps/Games \
+        	   ${D}${palmtopdir}/pics
+	install -m 0644 ${WORKDIR}/Frodo.png ${D}${palmtopdir}/pics/Frodo.png
+	install -m 0644 ${WORKDIR}/frodo.desktop ${D}${palmtopdir}/apps/Games/frodo.desktop
+	# start script and executable
+	install -d ${D}${palmtopdir}/bin/${PN}
+	install -m 0755 Frodo ${D}${palmtopdir}/bin/${PN}/Frodo
+	cat <<STARTER_EOF > ${D}${palmtopdir}/bin/${PN}/frodostart
+#!/bin/sh
+cd ${palmtopdir}/bin/${PN}
+./Frodo
+STARTER_EOF
+	chmod 0755 ${D}${palmtopdir}/bin/${PN}/frodostart
+	ln -sf ${PN}/frodostart ${D}${palmtopdir}/bin/Frodo
+	# conffiles
+	install -d ${D}${sysconfdir}
+	install -m 644 ${WORKDIR}/frodorc ${D}${sysconfdir}/frodorc
+}
+
+FILES_${PN} = "${palmtopdir} ${sysconfdir}"
+
+#FIXME: Add postinst which copies /etc/frodorc into $HOME/.frodorc
diff --git a/packages/frodo/frodo_4.2.bb b/packages/frodo/frodo_4.2.bb
index 5535a4d3d6..a779cdcfbb 100644
--- a/packages/frodo/frodo_4.2.bb
+++ b/packages/frodo/frodo_4.2.bb
@@ -20,24 +20,24 @@ inherit autotools
 EXTRA_OECONF = "--disable-sdltest --enable-qtopia --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS}"
 
 do_install() {
-        install -d ${D}/${palmtopdir}/bin \
-                   ${D}/${palmtopdir}/apps/Games \
-                   ${D}/${palmtopdir}/pics
-        install -m 0644 ${WORKDIR}/Frodo.png ${D}/${palmtopdir}/pics/Frodo.png
-        install -m 0644 ${WORKDIR}/frodo.desktop ${D}/${palmtopdir}/apps/Games/frodo.desktop
+        install -d ${D}${palmtopdir}/bin \
+                   ${D}${palmtopdir}/apps/Games \
+                   ${D}${palmtopdir}/pics
+        install -m 0644 ${WORKDIR}/Frodo.png ${D}${palmtopdir}/pics/Frodo.png
+        install -m 0644 ${WORKDIR}/frodo.desktop ${D}${palmtopdir}/apps/Games/frodo.desktop
         # start script and executable
-        install -d ${D}/${palmtopdir}/bin/${PN}
-        install -m 0755 Frodo ${D}/${palmtopdir}/bin/${PN}/Frodo
-        cat <<STARTER_EOF > ${D}/${palmtopdir}/bin/${PN}/frodostart
+        install -d ${D}${palmtopdir}/bin/${PN}
+        install -m 0755 Frodo ${D}${palmtopdir}/bin/${PN}/Frodo
+        cat <<STARTER_EOF > ${D}${palmtopdir}/bin/${PN}/frodostart
 #!/bin/sh
 cd ${palmtopdir}/bin/${PN}
 ./Frodo
 STARTER_EOF
-        chmod 0755 ${D}/${palmtopdir}/bin/${PN}/frodostart
-        ln -sf ${PN}/frodostart ${D}/${palmtopdir}/bin/Frodo
+        chmod 0755 ${D}${palmtopdir}/bin/${PN}/frodostart
+        ln -sf ${PN}/frodostart ${D}${palmtopdir}/bin/Frodo
         # conffiles
-        install -d ${D}/${sysconfdir}
-        install -m 644 ${WORKDIR}/frodorc ${D}/${sysconfdir}/frodorc
+        install -d ${D}${sysconfdir}
+        install -m 644 ${WORKDIR}/frodorc ${D}${sysconfdir}/frodorc
 }
 
 FILES_${PN} = "${palmtopdir} ${sysconfdir}"