diff options
| -rw-r--r-- | packages/opie-sh/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/opie-sh/files/opie-sh-fsmounter-name.patch | 11 | ||||
| -rw-r--r-- | packages/opie-sh/files/opie-sh-path.patch | 214 | ||||
| -rw-r--r-- | packages/opie-sh/opie-sh.inc | 6 | ||||
| -rw-r--r-- | packages/opie-sh/opie-sh_1.2.3.bb | 4 |
5 files changed, 232 insertions, 3 deletions
diff --git a/packages/opie-sh/files/.mtn2git_empty b/packages/opie-sh/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/opie-sh/files/.mtn2git_empty diff --git a/packages/opie-sh/files/opie-sh-fsmounter-name.patch b/packages/opie-sh/files/opie-sh-fsmounter-name.patch new file mode 100644 index 0000000000..ccdea20f23 --- /dev/null +++ b/packages/opie-sh/files/opie-sh-fsmounter-name.patch @@ -0,0 +1,11 @@ +--- ../../apps/Opie-SH/filesystem_mounter.desktop 7 Mar 2004 12:33:12 -0000 1.8 ++++ ../../apps/Opie-SH/filesystem_mounter.desktop 21 Sep 2008 13:14:03 -0000 +@@ -2,7 +2,7 @@ + Exec=filesystem_mounter.sh + Icon=opie-sh-scripts/fsmounter + Type=Application +-Name= ++Name=Filesystem Mounter + Comment=Frontend to mount/unmount filesystems + Name[es]=Montador + Comment[es]=Interfaz para montar/desmontar sistemas de ficheros diff --git a/packages/opie-sh/files/opie-sh-path.patch b/packages/opie-sh/files/opie-sh-path.patch new file mode 100644 index 0000000000..f4ea0c1886 --- /dev/null +++ b/packages/opie-sh/files/opie-sh-path.patch @@ -0,0 +1,214 @@ +Index: opie-sh/scripts/diskfree.sh +=================================================================== +RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/diskfree.sh,v +retrieving revision 1.3 +diff -u -d -r1.3 diskfree.sh +--- opie-sh/scripts/diskfree.sh 14 Aug 2004 12:05:39 -0000 1.3 ++++ opie-sh/scripts/diskfree.sh 21 Sep 2008 13:22:55 -0000 +@@ -17,7 +17,7 @@ + # 20020524-5 - bugfix + # 20020524-1 - initial release + +-OPIE_SH=$OPIEDIR/bin/opie-sh ++OPIE_SH=opie-sh + + # there must be a better way to do this with sed, but i had no time + # time to look into this yet... +Index: opie-sh/scripts/filesystem_mounter.sh +=================================================================== +RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/filesystem_mounter.sh,v +retrieving revision 1.2 +diff -u -d -r1.2 filesystem_mounter.sh +--- opie-sh/scripts/filesystem_mounter.sh 14 Aug 2004 12:05:39 -0000 1.2 ++++ opie-sh/scripts/filesystem_mounter.sh 21 Sep 2008 13:22:55 -0000 +@@ -22,7 +22,7 @@ + # 20020517-1 - nicer fullscreen, added about, tried icon + # + +-OPIE_SH=$OPIEDIR/bin/opie-sh ++OPIE_SH=opie-sh + + ###################################################################### + # subroutines +Index: opie-sh/scripts/killproc.sh +=================================================================== +RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/killproc.sh,v +retrieving revision 1.2 +diff -u -d -r1.2 killproc.sh +--- opie-sh/scripts/killproc.sh 14 Aug 2004 12:05:39 -0000 1.2 ++++ opie-sh/scripts/killproc.sh 21 Sep 2008 13:22:55 -0000 +@@ -18,7 +18,7 @@ + # 20020519-1 - added icon to output + # 20020517-1 - nicer fullscreen, added about, tried icon + +-OPIE_SH=$OPIEDIR/bin/opie-sh ++OPIE_SH=opie-sh + + ###################################################################### + # subroutines +Index: opie-sh/scripts/launcher_refresh.sh +=================================================================== +RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/launcher_refresh.sh,v +retrieving revision 1.2 +diff -u -d -r1.2 launcher_refresh.sh +--- opie-sh/scripts/launcher_refresh.sh 14 Aug 2004 12:05:39 -0000 1.2 ++++ opie-sh/scripts/launcher_refresh.sh 21 Sep 2008 13:22:55 -0000 +@@ -14,7 +14,7 @@ + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + +-OPIE_SH=$OPIEDIR/bin/opie-sh ++OPIE_SH=opie-sh + + launcher_refresh() { + ( echo "<img src=$OPIEDIR/pics/opie-sh-scripts/launcher_refresh.png>" +@@ -36,9 +36,9 @@ + # + # main + +-$OPIEDIR/bin/qcop QPE/TaskBar "reloadInputMethods()" +-#$OPIEDIR/bin/qcop QPE/System "restart()" +-$OPIEDIR/bin/qcop QPE/System "linkChanged(QString)" ++/usr/bin/qcop QPE/TaskBar "reloadInputMethods()" ++#/usr/bin/qcop QPE/System "restart()" ++/usr/bin/qcop QPE/System "linkChanged(QString)" + + launcher_refresh + cleanup +Index: opie-sh/scripts/logviewer.sh +=================================================================== +RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/logviewer.sh,v +retrieving revision 1.2 +diff -u -d -r1.2 logviewer.sh +--- opie-sh/scripts/logviewer.sh 14 Aug 2004 12:05:39 -0000 1.2 ++++ opie-sh/scripts/logviewer.sh 21 Sep 2008 13:22:55 -0000 +@@ -17,7 +17,7 @@ + # 20020526-1a - initial release... + # + +-OPIE_SH=$OPIEDIR/bin/opie-sh ++OPIE_SH=opie-sh + INITPATH=/etc/init.d + + ###################################################################### +Index: opie-sh/scripts/microkbd.sh +=================================================================== +RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/microkbd.sh,v +retrieving revision 1.1 +diff -u -d -r1.1 microkbd.sh +--- opie-sh/scripts/microkbd.sh 18 Oct 2004 22:00:20 -0000 1.1 ++++ opie-sh/scripts/microkbd.sh 21 Sep 2008 13:22:55 -0000 +@@ -19,7 +19,7 @@ + # 20020517-2 - bugfixed fullscreen, added info about ifconfig + # 20020517-1 - added about, fullscreen and icon + +-OPIE_SH=$OPIEDIR/bin/opie-sh ++OPIE_SH=opie-sh + + ###################################################################### + # subroutines +Index: opie-sh/scripts/opie-sh-ssh-askpass.sh +=================================================================== +RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/opie-sh-ssh-askpass.sh,v +retrieving revision 1.2 +diff -u -d -r1.2 opie-sh-ssh-askpass.sh +--- opie-sh/scripts/opie-sh-ssh-askpass.sh 14 Aug 2004 12:05:39 -0000 1.2 ++++ opie-sh/scripts/opie-sh-ssh-askpass.sh 21 Sep 2008 13:22:55 -0000 +@@ -2,7 +2,7 @@ + + # opie-sh-ssh-askpass -- ssh-askpass utility using opie-sh + +-OPIE_SH=$OPIEDIR/bin/opie-sh ++OPIE_SH=opie-sh + + exec $OPIE_SH -i -p -t "OpenSSH" -g -L "<SMALL>$@" 2>/dev/null + +Index: opie-sh/scripts/opie-sh-wavelanchooser.sh +=================================================================== +RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.sh,v +retrieving revision 1.2 +diff -u -d -r1.2 opie-sh-wavelanchooser.sh +--- opie-sh/scripts/opie-sh-wavelanchooser.sh 14 Aug 2004 12:05:39 -0000 1.2 ++++ opie-sh/scripts/opie-sh-wavelanchooser.sh 21 Sep 2008 13:22:55 -0000 +@@ -19,7 +19,7 @@ + # 20020524-1 - initial working release planned + # + +-OPIE_SH=$OPIEDIR/bin/opie-sh ++OPIE_SH=opie-sh + + about() { + ( echo "<img src=$OPIEDIR/pics/opie-sh-scripts/qtwavelan.png>" +Index: opie-sh/scripts/rsyncme.sh +=================================================================== +RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/rsyncme.sh,v +retrieving revision 1.2 +diff -u -d -r1.2 rsyncme.sh +--- opie-sh/scripts/rsyncme.sh 14 Aug 2004 12:05:39 -0000 1.2 ++++ opie-sh/scripts/rsyncme.sh 21 Sep 2008 13:22:55 -0000 +@@ -18,7 +18,7 @@ + # + + CFG=$OPIEDIR/share/config/rsyncme.cfg +-OPIE_SH=$OPIEDIR/bin/opie-sh ++OPIE_SH=opie-sh + + update_cfg() { + # check if dir is in CFG and if not add it +Index: opie-sh/scripts/service_manager.sh +=================================================================== +RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/service_manager.sh,v +retrieving revision 1.2 +diff -u -d -r1.2 service_manager.sh +--- opie-sh/scripts/service_manager.sh 14 Aug 2004 12:05:39 -0000 1.2 ++++ opie-sh/scripts/service_manager.sh 21 Sep 2008 13:22:55 -0000 +@@ -19,7 +19,7 @@ + # 20020517-1 - added about and fullscreen + # + +-OPIE_SH=$OPIEDIR/bin/opie-sh ++OPIE_SH=opie-sh + INITPATH=/etc/init.d + + ###################################################################### +Index: opie-sh/scripts/stowctrl.sh +=================================================================== +RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/stowctrl.sh,v +retrieving revision 1.2 +diff -u -d -r1.2 stowctrl.sh +--- opie-sh/scripts/stowctrl.sh 14 Aug 2004 12:05:39 -0000 1.2 ++++ opie-sh/scripts/stowctrl.sh 21 Sep 2008 13:22:55 -0000 +@@ -19,7 +19,7 @@ + # 20020517-2 - bugfixed fullscreen, added info about ifconfig + # 20020517-1 - added about, fullscreen and icon + +-OPIE_SH=$OPIEDIR/bin/opie-sh ++OPIE_SH=opie-sh + + ###################################################################### + # subroutines +Index: opie-sh/scripts/usbnetctrl.sh +=================================================================== +RCS file: /cvs/opie/noncore/tools/opie-sh/scripts/usbnetctrl.sh,v +retrieving revision 1.3 +diff -u -d -r1.3 usbnetctrl.sh +--- opie-sh/scripts/usbnetctrl.sh 14 Aug 2004 12:05:39 -0000 1.3 ++++ opie-sh/scripts/usbnetctrl.sh 21 Sep 2008 13:22:55 -0000 +@@ -18,7 +18,7 @@ + # 20020517-2 - bugfixed fullscreen, added info about ifconfig + # 20020517-1 - added about, fullscreen and icon + +-OPIE_SH=$OPIEDIR/bin/opie-sh ++OPIE_SH=opie-sh + + ###################################################################### + # subroutines +@@ -30,7 +30,7 @@ + echo "activate / deactivate the usbnet-driver (on ipaq)" + echo "<p>" + echo "To use it at first, you need to change the ifconfig" +- echo "line in $OPIEDIR/bin/usbnetctrl.sh." ++ echo "line in $0." + ) | $OPIE_SH -t "usbnet control" -f & + SCREENCLEAN=$! + sleep 1 diff --git a/packages/opie-sh/opie-sh.inc b/packages/opie-sh/opie-sh.inc index dbc032ecc6..3818a21953 100644 --- a/packages/opie-sh/opie-sh.inc +++ b/packages/opie-sh/opie-sh.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" APPNAME = "opie-sh" APPTYPE = "binary" -PR = "r2" +PR = "r3" S = "${WORKDIR}/${APPNAME}" @@ -25,6 +25,7 @@ do_install() { install -m 0644 ${WORKDIR}/help/${APPNAME}/*.html ${D}${palmtopdir}/help/${APPNAME}/ install -d ${D}${palmtopdir}/share/config install -m 0644 ${WORKDIR}/share/config/*.cfg ${D}${palmtopdir}/share/config/ + rm -f ${D}${palmtopdir}/pics/opie-sh-scripts/kbdctrl.png } PACKAGES += " opie-sh-microkbd opie-sh-diskfree opie-sh-fsmounter opie-sh-hostlist \ @@ -59,4 +60,5 @@ FILES_opie-sh-ssh-askpass = " ${palmtopdir}/bin/opie-sh-ssh-askpass.sh" FILES_opie-sh-stowawayctrl = " ${palmtopdir}/bin/stowctrl.sh ${palmtopdir}/apps/Opie-SH/stowctrl.desktop ${palmtopdir}/pics/opie-sh-scripts/stowctrl.png" FILES_opie-sh-usbnetctrl = " ${palmtopdir}/bin/usbnetctrl.sh ${palmtopdir}/apps/Opie-SH/usbnetctrl.desktop ${palmtopdir}/pics/opie-sh-scripts/usbnetctrl.png" FILES_opie-sh-wavelanchooser = " ${palmtopdir}/bin/opie-sh-wavelanchooser.sh ${palmtopdir}/apps/Opie-SH/opie-sh-wavelanchooser.desktop ${palmtopdir}/pics/opie-sh-scripts/qtwavelan.png" -FILES_opie-sh = " ${palmtopdir}/bin/opie-sh-howto.sh ${palmtopdir}/bin/opie-sh ${palmtopdir}/apps/Opie-SH/opie-sh.desktop ${palmtopdir}/pics/opie-sh/*.png ${palmtopdir}/opie-sh/*.html" +FILES_${PN} = " ${palmtopdir}/bin/opie-sh-howto.sh ${bindir}/opie-sh ${palmtopdir}/apps/Opie-SH/opie-sh.desktop ${palmtopdir}/pics/opie-sh/*.png ${palmtopdir}/help/opie-sh/*.html" + diff --git a/packages/opie-sh/opie-sh_1.2.3.bb b/packages/opie-sh/opie-sh_1.2.3.bb index 6843ad7aac..377aa887dd 100644 --- a/packages/opie-sh/opie-sh_1.2.3.bb +++ b/packages/opie-sh/opie-sh_1.2.3.bb @@ -6,4 +6,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/tools/opie-sh \ ${HANDHELDS_CVS};tag=${TAG};module=opie/help \ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/bin" + ${HANDHELDS_CVS};tag=${TAG};module=opie/bin \ + file://opie-sh-path.patch;patch=1 \ + file://opie-sh-fsmounter-name.patch;patch=1" |