diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-03 03:55:24 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-03 03:55:24 +0000 |
| commit | ff4af5b8e30a743a9a7c65bbd100ec4650652b1c (patch) | |
| tree | afce5128526537b9c1d35deebde8d1a919f53f7d /packages/opie-init | |
| parent | f36ae55d484964490364f6882e891d9cb4eed2d0 (diff) | |
opie-init: Do not hardcode OPIEDIR and friends, substitute ${palmtopdir} build value.
Diffstat (limited to 'packages/opie-init')
| -rw-r--r-- | packages/opie-init/opie-init.inc | 8 | ||||
| -rwxr-xr-x | packages/opie-init/opie-init/opie | 6 | ||||
| -rw-r--r-- | packages/opie-init/opie-init/opie_defaults | 2 | ||||
| -rw-r--r-- | packages/opie-init/opie-init_1.2.2.bb | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/packages/opie-init/opie-init.inc b/packages/opie-init/opie-init.inc index d8003925f6..ce128b3b12 100644 --- a/packages/opie-init/opie-init.inc +++ b/packages/opie-init/opie-init.inc @@ -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}" diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie index 4a7a9e4330..248ec464da 100755 --- a/packages/opie-init/opie-init/opie +++ b/packages/opie-init/opie-init/opie @@ -3,9 +3,9 @@ [ -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 diff --git a/packages/opie-init/opie-init/opie_defaults b/packages/opie-init/opie-init/opie_defaults index 7de76e4276..c4d127db33 100644 --- a/packages/opie-init/opie-init/opie_defaults +++ b/packages/opie-init/opie-init/opie_defaults @@ -7,7 +7,7 @@ case "$MACHINE" in *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" diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb index ca10d61221..419221609a 100644 --- a/packages/opie-init/opie-init_1.2.2.bb +++ b/packages/opie-init/opie-init_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r4" +PR = "r5" SRC_URI = "file://opie-reorgfiles \ file://opie \ |