Fix packaging of opie-login. Set BROKEN = 1 as it currently segfaults on launch.

BKrev: 41b30537mY_ed_DcnQ8mwKh1LuYjMw

diff --git a/opie-login/opie-login_1.1.7.oe b/opie-login/opie-login_1.1.7.oe
index 54f8533..a53ef17 100644 (file)
--- a/opie-login/opie-login_1.1.7.oe
+++ b/opie-login/opie-login_1.1.7.oe
@@ -4,12 +4,18 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 
+BROKEN = 1
+
 APPNAME = "opie-login"
 
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/${APPNAME} \
           ${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
-          ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher"
+          ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \
+          file://opie-session \
+          file://post-session \
+          file://pre-session \
+          file://opie-login.conf"
 
 S = "${WORKDIR}/${APPNAME}"
 
@@ -18,6 +24,17 @@ inherit opie
 EXTRA_QMAKEVARS_POST_append = " LIBS-=-lpam"
 EXTRA_QMAKEVARS_POST_append = " DEFINES-=USEPAM"
 
+
+do_install() {
+       install -d ${D}/${palmtopdir}/bin
+       install -d ${D}/${palmtopdir}/etc
+       install -d ${D}/${palmtopdir}/share/opie-login
+
+       install -m 755 ${WORKDIR}/${PN}/opie-login ${D}/${palmtopdir}/bin
+       install -m 644 ${WORKDIR}/*-session ${D}/${palmtopdir}/share/opie-login
+       install -m 644 ${WORKDIR}/opie-login.conf ${D}/${palmtopdir}/etc
+}
+
 do_configure() {
        install -d "${WORKDIR}/apps"
        ln -s "${WORKDIR}/calibrate" "${WORKDIR}/apps/calibrate"

diff --git a/opie-login/opie-login_cvs.oe b/opie-login/opie-login_cvs.oe
index 503ece7..6196ae9 100644 (file)
--- a/opie-login/opie-login_cvs.oe
+++ b/opie-login/opie-login_cvs.oe
@@ -6,9 +6,16 @@ LICENSE = "GPL"
 PV = "1.1.7+cvs-${CVSDATE}"
 APPNAME = "opie-login"
 
+BROKEN = 1
+
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/${APPNAME} \
           ${HANDHELDS_CVS};module=opie/core/apps/calibrate \
-          ${HANDHELDS_CVS};module=opie/core/launcher"
+          ${HANDHELDS_CVS};module=opie/core/launcher
+          file://opie-session \
+          file://post-session \
+          file://pre-session \
+          file://opie-login.conf"
+          
 
 S = "${WORKDIR}/${APPNAME}"
 
@@ -17,6 +24,16 @@ inherit opie
 EXTRA_QMAKEVARS_POST_append = " LIBS-=-lpam"
 EXTRA_QMAKEVARS_POST_append = " DEFINES-=USEPAM"
 
+do_install() {
+       install -d ${D}/${palmtopdir}/bin
+       install -d ${D}/${palmtopdir}/etc
+       install -d ${D}/${palmtopdir}/share/opie-login
+
+       install -m 755 ${WORKDIR}/${PN}/opie-login ${D}/${palmtopdir}/bin
+       install -m 644 ${WORKDIR}/*-session ${D}/${palmtopdir}/share/opie-login
+       install -m 644 ${WORKDIR}/opie-login.conf ${D}/${palmtopdir}/etc
+}
+
 do_configure() {
        install -d "${WORKDIR}/apps"
        ln -s "${WORKDIR}/calibrate" "${WORKDIR}/apps/calibrate"