summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-08-07 07:46:09 +0000
committerKoen Kooi <koen@openembedded.org>2008-08-07 07:46:09 +0000
commit91e0c7d309f35cbec7a739064e7eb4a799ce52f4 (patch)
tree1ccd57e1c7bb4bfdc1f3f4a29da7df4faf29c76e
parente0e3cb1546527254db4b900561b7f2e65900ae4e (diff)
neurow-nwm: add correct initscript
-rw-r--r--packages/neuros-public/neuros-nwm/init113
-rw-r--r--packages/neuros-public/neuros-nwm_git.bb2
2 files changed, 32 insertions, 83 deletions
diff --git a/packages/neuros-public/neuros-nwm/init b/packages/neuros-public/neuros-nwm/init
index 849261a95c..5ab8f7a248 100644
--- a/packages/neuros-public/neuros-nwm/init
+++ b/packages/neuros-public/neuros-nwm/init
@@ -1,82 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
-<!-- git web interface version 1.5.4.2, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke -->
-<!-- git core binaries version 1.5.4.2 -->
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-<meta name="generator" content="gitweb/1.5.4.2 git/1.5.4.2"/>
-<meta name="robots" content="index, nofollow"/>
-<title>git.neurostechnology.com Git - rootfs/blob - base/etc/init.d/nwm</title>
-<link rel="stylesheet" type="text/css" href="/gitweb.css"/>
-<link rel="alternate" title="rootfs log RSS feed" href="/?p=rootfs;a=rss" type="application/rss+xml" />
-<link rel="alternate" title="rootfs log RSS feed (no merges)" href="/?p=rootfs;a=rss;opt=--no-merges" type="application/rss+xml" />
-<link rel="alternate" title="rootfs log Atom feed" href="/?p=rootfs;a=atom" type="application/atom+xml" />
-<link rel="alternate" title="rootfs log Atom feed (no merges)" href="/?p=rootfs;a=atom;opt=--no-merges" type="application/atom+xml" />
-<link rel="shortcut icon" href="/git-favicon.png" type="image/png"/>
-</head>
-<body>
-<div class="page_header">
-<a title="git homepage" href="http://git.or.cz/"><img src="/git-logo.png" width="72" height="27" alt="git" class="logo"/></a><a href="/">projects</a> / <a href="/?p=rootfs;a=summary">rootfs</a> / blob
-</div>
-<form method="get" action="/" enctype="application/x-www-form-urlencoded">
-<div class="search">
-<input type="hidden" name="p" value="rootfs" />
-<input type="hidden" name="a" value="search" />
-<input type="hidden" name="h" value="HEAD" />
-<select name="st" >
-<option selected="selected" value="commit">commit</option>
-<option value="grep">grep</option>
-<option value="author">author</option>
-<option value="committer">committer</option>
-<option value="pickaxe">pickaxe</option>
-</select><sup><a href="/?p=rootfs;a=search_help">?</a></sup> search:
-<input type="text" name="s" />
-</div>
-</form>
-<div class="page_nav">
-<a href="/?p=rootfs;a=summary">summary</a> | <a href="/?p=rootfs;a=shortlog">shortlog</a> | <a href="/?p=rootfs;a=log">log</a> | <a href="/?p=rootfs;a=commit;h=HEAD">commit</a> | <a href="/?p=rootfs;a=commitdiff;h=HEAD">commitdiff</a> | <a href="/?p=rootfs;a=tree;h=aa04ffa2e7a86b55bf69a7bd2bf468fc78b1e7ad;hb=HEAD">tree</a><br/>
-<a href="/?p=rootfs;a=history;f=base/etc/init.d/nwm;h=HEAD;hb=HEAD">history</a> | <a href="/?p=rootfs;a=blob_plain;f=base/etc/init.d/nwm;h=HEAD;hb=HEAD">raw</a> | <a href="/?p=rootfs;a=blob;f=base/etc/init.d/nwm;hb=HEAD">HEAD</a><br/>
-</div>
-<div class="header">
-<a class="title" href="/?p=rootfs;a=commit;h=HEAD">Revert &quot;Add /usr/local/bin/test to PATH&quot;</a>
-</div>
-<div class="page_path"><a title="tree root" href="/?p=rootfs;a=tree;hb=HEAD">[rootfs]</a> / <a title="base" href="/?p=rootfs;a=tree;f=base;hb=HEAD">base</a> / <a title="base/etc" href="/?p=rootfs;a=tree;f=base/etc;hb=HEAD">etc</a> / <a title="base/etc/init.d" href="/?p=rootfs;a=tree;f=base/etc/init.d;hb=HEAD">init.d</a> / <a title="base/etc/init.d/nwm" href="/?p=rootfs;a=blob_plain;f=base/etc/init.d/nwm;hb=HEAD">nwm</a><br/></div>
-<div class="page_body">
-<div class="pre"><a id="l1" href="#l1" class="linenr"> 1</a> #!/bin/sh</div>
-<div class="pre"><a id="l2" href="#l2" class="linenr"> 2</a> ###############################################################################$</div>
-<div class="pre"><a id="l3" href="#l3" class="linenr"> 3</a> #</div>
-<div class="pre"><a id="l4" href="#l4" class="linenr"> 4</a> #&nbsp;Filename:&nbsp;/etc/init.d/nwm</div>
-<div class="pre"><a id="l5" href="#l5" class="linenr"> 5</a> #</div>
-<div class="pre"><a id="l6" href="#l6" class="linenr"> 6</a> #&nbsp;File&nbsp;Description:&nbsp;Qt&nbsp;Neuros&nbsp;server&nbsp;Startup&nbsp;Script</div>
-<div class="pre"><a id="l7" href="#l7" class="linenr"> 7</a> #</div>
-<div class="pre"><a id="l8" href="#l8" class="linenr"> 8</a> #&nbsp;@author&nbsp;Tom&nbsp;Bruno&nbsp;tbruno@neuros.us</div>
-<div class="pre"><a id="l9" href="#l9" class="linenr"> 9</a> #&nbsp;@version&nbsp;&nbsp;$Revision:&nbsp;1.0&nbsp;$</div>
-<div class="pre"><a id="l10" href="#l10" class="linenr"> 10</a> #</div>
-<div class="pre"><a id="l11" href="#l11" class="linenr"> 11</a> ###############################################################################$</div>
-<div class="pre"><a id="l12" href="#l12" class="linenr"> 12</a> </div>
-<div class="pre"><a id="l13" href="#l13" class="linenr"> 13</a> [&nbsp;&quot;$1&quot;&nbsp;!=&nbsp;&quot;&quot;&nbsp;]&nbsp;&amp;&amp;&nbsp;action=$1</div>
-<div class="pre"><a id="l14" href="#l14" class="linenr"> 14</a> if&nbsp;[&nbsp;&quot;$action&quot;&nbsp;=&nbsp;&quot;&quot;&nbsp;]</div>
-<div class="pre"><a id="l15" href="#l15" class="linenr"> 15</a> then</div>
-<div class="pre"><a id="l16" href="#l16" class="linenr"> 16</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;echo&nbsp;&quot;Usage:&nbsp;$0&nbsp;&lt;action&nbsp;&nbsp;start|stop&gt;&quot;&nbsp;&gt;&amp;2</div>
-<div class="pre"><a id="l17" href="#l17" class="linenr"> 17</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;exit&nbsp;1</div>
-<div class="pre"><a id="l18" href="#l18" class="linenr"> 18</a> fi</div>
-<div class="pre"><a id="l19" href="#l19" class="linenr"> 19</a> </div>
-<div class="pre"><a id="l20" href="#l20" class="linenr"> 20</a> if&nbsp;[&nbsp;&quot;$action&quot;&nbsp;=&nbsp;&quot;start&quot;&nbsp;]</div>
-<div class="pre"><a id="l21" href="#l21" class="linenr"> 21</a> then</div>
-<div class="pre"><a id="l22" href="#l22" class="linenr"> 22</a> </div>
-<div class="pre"><a id="l23" href="#l23" class="linenr"> 23</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;QWS_KEYBOARD=&quot;osdir&quot;&nbsp;QWS_DISPLAY=&quot;LinuxFb:/dev/fb2&quot;&nbsp;/usr/local/bin/nwm&nbsp;&amp;</div>
-<div class="pre"><a id="l24" href="#l24" class="linenr"> 24</a> </div>
-<div class="pre"><a id="l25" href="#l25" class="linenr"> 25</a> else</div>
-<div class="pre"><a id="l26" href="#l26" class="linenr"> 26</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;[&nbsp;&quot;$action&quot;&nbsp;=&nbsp;&quot;stop&quot;&nbsp;]</div>
-<div class="pre"><a id="l27" href="#l27" class="linenr"> 27</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;then</div>
-<div class="pre"><a id="l28" href="#l28" class="linenr"> 28</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;killall&nbsp;nwm</div>
-<div class="pre"><a id="l29" href="#l29" class="linenr"> 29</a> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;fi</div>
-<div class="pre"><a id="l30" href="#l30" class="linenr"> 30</a> fi</div>
-<div class="pre"><a id="l31" href="#l31" class="linenr"> 31</a> </div>
-</div><div class="page_footer">
-<div class="page_footer_text">Root FS build scripts and static rootfs portions</div>
-<a class="rss_logo" href="/?p=rootfs;a=rss">RSS</a> <a class="rss_logo" href="/?p=rootfs;a=atom">Atom</a>
-</div>
-</body>
-</html> \ No newline at end of file
+#!/bin/sh
+###############################################################################$
+#
+# Filename: /etc/init.d/nwm
+#
+# File Description: Qt Neuros server Startup Script
+#
+# @author Tom Bruno tbruno@neuros.us
+# @version $Revision: 1.0 $
+#
+###############################################################################$
+
+[ "$1" != "" ] && action=$1
+if [ "$action" = "" ]
+then
+ echo "Usage: $0 <action start|stop>" >&2
+ exit 1
+fi
+
+if [ "$action" = "start" ]
+then
+
+ QWS_KEYBOARD="osdir" QWS_DISPLAY="LinuxFb:/dev/fb2" /usr/local/bin/nwm &
+
+else
+ if [ "$action" = "stop" ]
+ then
+ killall nwm
+ fi
+fi
+
diff --git a/packages/neuros-public/neuros-nwm_git.bb b/packages/neuros-public/neuros-nwm_git.bb
index bf4bbaa9af..4290ae38be 100644
--- a/packages/neuros-public/neuros-nwm_git.bb
+++ b/packages/neuros-public/neuros-nwm_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Neuros window manager"
LICENSE = "GPL"
PV = "0.0+${PR}+gitr${SRCREV}"
-PR = "r5"
+PR = "r6"
DEPENDS = "qt-embedded"