[oe-commits] org.oe.dev opie-init: Do not hardcode OPIEDIR and friends, substitute ${palmtopdir} build value.

[pfalcon commit]

opie-init: Do not hardcode OPIEDIR and friends, substitute ${palmtopdir} build value.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: de76eef550a4099579851db694dbd1c0cd18c413
ViewMTN: http://monotone.openembedded.org/revision.psp?id=de76eef550a4099579851db694dbd1c0cd18c413
Files:
1
packages/opie-init/opie-init/opie
packages/opie-init/opie-init/opie_defaults
packages/opie-init/opie-init.inc
packages/opie-init/opie-init_1.2.2.bb
Diffs:

#
# mt diff -r3caac664703a1c7e7aeacc18d0e948cd68a0692b -rde76eef550a4099579851db694dbd1c0cd18c413
#
# 
# 
# patch "packages/opie-init/opie-init/opie"
#  from [879c03529cdeef4128ae40faefe35801f5376f43]
#    to [939a977703c5c993189c8355d175b621bfe71969]
# 
# patch "packages/opie-init/opie-init/opie_defaults"
#  from [971ecb87286e39af8be9705978014aa9f4a29506]
#    to [75480531b6dcda113547fddda2009db52f8bc09f]
# 
# patch "packages/opie-init/opie-init.inc"
#  from [9bbf8651a7c66d185cc42caf5cc09ceb4c939a5b]
#    to [5fcdf1ce5c56a1de2a9bf4ff41be0f31abe3b52d]
# 
# patch "packages/opie-init/opie-init_1.2.2.bb"
#  from [1b39d005ccd0c0c7b0398642458f2bde6c4c31d4]
#    to [c2c9de8c7dd613b8f7b3b095200bb476c7bddaf9]
# 
============================================================
--- packages/opie-init/opie-init/opie	879c03529cdeef4128ae40faefe35801f5376f43
+++ packages/opie-init/opie-init/opie	939a977703c5c993189c8355d175b621bfe71969
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
 [ -z $HOME ] && export HOME=/home/$LOGNAME
 
-export QTDIR=/opt/QtPalmtop
-export OPIEDIR=/opt/QtPalmtop
-export QPEDIR=/opt/QtPalmtop
+export QTDIR="@palmtopdir@"
+export OPIEDIR="$QTDIR"
+export QPEDIR="$QTDIR"
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
 export PATH=$PATH:$OPIEDIR/bin
 
============================================================
--- packages/opie-init/opie-init/opie_defaults	971ecb87286e39af8be9705978014aa9f4a29506
+++ packages/opie-init/opie-init/opie_defaults	75480531b6dcda113547fddda2009db52f8bc09f
@@ -7,7 +7,7 @@ esac
 *Poodle)	test "$KVER" = "2.6" && export QWS_CURSOR_ROTATION=90;;
 esac
 
-export QTDIR="/opt/QtPalmtop"
+export QTDIR="@palmtopdir@"
 export OPIEDIR="$QTDIR"
 export QPEDIR="$QTDIR"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPIEDIR/lib"
============================================================
--- packages/opie-init/opie-init.inc	9bbf8651a7c66d185cc42caf5cc09ceb4c939a5b
+++ packages/opie-init/opie-init.inc	5fcdf1ce5c56a1de2a9bf4ff41be0f31abe3b52d
@@ -18,8 +18,10 @@ do_install() {
 	install -d ${D}${palmtopdir}/bin
 	install -d ${D}${palmtopdir}/etc/skel
 
-	install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie
-	install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/
+	sed -s "s|@palmtopdir@|${palmtopdir}|" ${WORKDIR}/opie >${WORKDIR}/opie.tmp
+	sed -s "s|@palmtopdir@|${palmtopdir}|" ${WORKDIR}/opie_defaults >${WORKDIR}/opie_defaults.tmp
+	install -m 0755 ${WORKDIR}/opie.tmp ${D}${sysconfdir}/init.d/opie
+	install -m 0644 ${WORKDIR}/opie_defaults.tmp ${D}${sysconfdir}/profile.d/
 
 	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/
 	install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/
@@ -38,6 +40,6 @@ do_install() {
         esac	
 }
 
-FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}"
+FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}/bin"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/opie-init/opie-init_1.2.2.bb	1b39d005ccd0c0c7b0398642458f2bde6c4c31d4
+++ packages/opie-init/opie-init_1.2.2.bb	c2c9de8c7dd613b8f7b3b095200bb476c7bddaf9
@@ -1,5 +1,5 @@ require ${PN}.inc
 require ${PN}.inc
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "file://opie-reorgfiles \
            file://opie \