summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCecil <knoppmyth@gmail.com>2012-03-02 03:02:46 (GMT)
committerCecil <knoppmyth@gmail.com>2012-03-02 03:02:46 (GMT)
commitf441ae5b8f06dd62ac369365bbf236aecb85d548 (patch)
tree937873a3b556a3623f8ccc2b1bb9084e3ccbb87d
parent63bce33add0ab852c922d1d3264ec93d65728609 (diff)
parentcc8a1c904a89ac1582ac442838f770418cd0c040 (diff)
downloadlinhes_pkgbuild-f441ae5b8f06dd62ac369365bbf236aecb85d548.zip
linhes_pkgbuild-f441ae5b8f06dd62ac369365bbf236aecb85d548.tar.gz
linhes_pkgbuild-f441ae5b8f06dd62ac369365bbf236aecb85d548.tar.bz2
Merge branch 'testing' of git@linhes.org:linhes_pkgbuild into testing
Diffstat
-rw-r--r--abs/core/local-website/PKGBUILD2
-rwxr-xr-xabs/core/local-website/htdocs/index.html8
-rw-r--r--abs/core/local-website/htdocs/rrd/Disabled0
-rw-r--r--abs/core/local-website/htdocs/rrd/index.html29
-rwxr-xr-xabs/core/runit-scripts/PKGBUILD2
-rwxr-xr-x[-rw-r--r--]abs/core/runit-scripts/runitscripts/services/rsyslog/run0
-rwxr-xr-xabs/core/system-templates/PKGBUILD2
-rwxr-xr-x[-rw-r--r--]abs/core/system-templates/templates/LCD/antec_fusion/LCDd.conf18
-rw-r--r--abs/core/udev/81-SoundGraph_LCD.rules2
-rw-r--r--abs/core/udev/PKGBUILD6
-rw-r--r--abs/core/udev/__changelog3
11 files changed, 33 insertions, 39 deletions
diff --git a/abs/core/local-website/PKGBUILD b/abs/core/local-website/PKGBUILD
index 63dc5ef..71f90ae 100644
--- a/abs/core/local-website/PKGBUILD
+++ b/abs/core/local-website/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=local-website
pkgver=2
-pkgrel=28
+pkgrel=29
pkgdesc="Contents of http://localhost"
arch=(i686 x86_64)
license=('GPL')
diff --git a/abs/core/local-website/htdocs/index.html b/abs/core/local-website/htdocs/index.html
index d893c87..04dff38 100755
--- a/abs/core/local-website/htdocs/index.html
+++ b/abs/core/local-website/htdocs/index.html
@@ -90,7 +90,7 @@
</div>
<div id="info_status" class="hidden">
<ul>
- <li><a href="/rrd/index.html">RRDTool</a> - A system monitoring tool.</li>
+ <li><a href="/rrd/index-rrd.html">RRDTool</a> - A system monitoring tool.</li>
<li><a href="/monitorix/">Monitorix</a> - A lightweight system monitoring tool.<br></li>
<li><a href="http://fah-web.stanford.edu/cgi-bin/main.py?qtype=teampage&amp;teamnum=50975">KnoppMyth Folding@home Team Status</a></li>
<li><a href="/foldingathome/">My Folding@home Status</a></li>
@@ -103,9 +103,9 @@
<li><a href="http://www.mythtv.org/support">MythTV Support</a></li>
<li><a href="http://www.schedulesdirect.org/">Schedules Direct</a> - Provides U.S./Canadian TV listing data.<br></li>
<li><a href="/linhes.html">LinHES</a> - Describes how "The Project Leader" setup multiple systems to form <b>Lin</b>ux <b>H</b>ome <b>E</b>ntertainment <b>S</b>ystem.<br></li>
- <li><a href="http://linhes.org/phpBB2/">LinHES Forum</a></li>
- <li><a href="http://linhes.org/bugs/projects/linhes/wiki">LinHES Wiki</a></li>
- <li><a href="http://linhes.org/bugs">LinHES Bug Tracker</a></li>
+ <li><a href="http://forum.linhes.org">LinHES Forum</a></li>
+ <li><a href="http://linhes.org/wiki">LinHES Wiki</a></li>
+ <li><a href="http://linhes.org/projects/linhes/issues">LinHES Bug Tracker</a></li>
</ul>
</div>
</div>
diff --git a/abs/core/local-website/htdocs/rrd/Disabled b/abs/core/local-website/htdocs/rrd/Disabled
deleted file mode 100644
index e69de29..0000000
--- a/abs/core/local-website/htdocs/rrd/Disabled
+++ /dev/null
diff --git a/abs/core/local-website/htdocs/rrd/index.html b/abs/core/local-website/htdocs/rrd/index.html
deleted file mode 100644
index f6a7135..0000000
--- a/abs/core/local-website/htdocs/rrd/index.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
- <meta content="Cecil Watson" name="author">
- <title>LinHES</title>
- <!-- Generated by: /usr/local/bin/rrd_Configure.sh -->
- <link href="/KnoppMyth.css" rel="stylesheet" type="text/css" />
- <p align="center"><a href="http://www.mysettopbox.tv">
- <img src="/header.png" alt="Tux with a Remote" align="middle" border="0"></a>
- </p>
- <table align="center" border="0" cellpadding="5">
- <tbody>
- <tr>
- <td style="vertical-align: top;">
- <p class="headerimage" align="center"><b>The Linux Home Entertainment System Release 6</b></p>
- <p align=center>
-<font size="+2">RRD Tool</font><br>
-<font size="+1">Is <font color="#CC0000">disabled</font>
-by rrd_Configure.sh and may be re-enabled by running as root:<br>
-<b>rrd_Configure.sh</b></font>
- </p>
- <p>&nbsp;</p>
- </td>
- </tr>
- </tbody>
- </table>
-</body>
-</html>
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 3ce0ad7..9e43b07 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=2.1.1
-pkgrel=51
+pkgrel=52
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/rsyslog/run b/abs/core/runit-scripts/runitscripts/services/rsyslog/run
index e7b018d..e7b018d 100644..100755
--- a/abs/core/runit-scripts/runitscripts/services/rsyslog/run
+++ b/abs/core/runit-scripts/runitscripts/services/rsyslog/run
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 1cf109e..c2d0344 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=system-templates
pkgver=2.0
-pkgrel=8
+pkgrel=9
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
diff --git a/abs/core/system-templates/templates/LCD/antec_fusion/LCDd.conf b/abs/core/system-templates/templates/LCD/antec_fusion/LCDd.conf
index 2596c25..3719e47 100644..100755
--- a/abs/core/system-templates/templates/LCD/antec_fusion/LCDd.conf
+++ b/abs/core/system-templates/templates/LCD/antec_fusion/LCDd.conf
@@ -41,7 +41,7 @@
# joy, lb216,lcdm001, lcterm, lirc,MD8800, ms6931, mtc_s16209x,
# MtxOrb, NoritakeVFD, pyramid, sed1330, sed1520, serialVFD,
# sli, stv5730, svga, t6963, text, tyan, ula200, xosd
-Driver=imon
+Driver=imonlcd
#Driver=curses
# Tells the driver to bind to the given interface
@@ -66,7 +66,7 @@ User=nobody
# If yes, the the serverscreen will be rotated as a usual info screen. If no,
# it will be a background screen, only visible when no other screens are
# active.
-#ServerScreen=no
+ServerScreen=no
# The server will stay in the foreground if set to true.
#Foreground=no
@@ -478,15 +478,29 @@ Size=20x4
+
## Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON driver ##
[imon]
# select the device to use
Device=/dev/lcd0
+# Protocl=0
# display dimensions
Size=16x2
+## Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON driver ##
+[imonlcd]
+
+# select the device to use
+Device=/dev/lcd
+Contrast=200
+#Protocl=0
+
+# display dimensions
+#Size=16x2
+
+
## IrMan driver ##
diff --git a/abs/core/udev/81-SoundGraph_LCD.rules b/abs/core/udev/81-SoundGraph_LCD.rules
new file mode 100644
index 0000000..59f0eec
--- /dev/null
+++ b/abs/core/udev/81-SoundGraph_LCD.rules
@@ -0,0 +1,2 @@
+# Udev rules for SoundGraph LCDs
+KERNEL=="lcd[0-9]*" , ATTRS{idVendor}=="15c2" , SYMLINK+="lcd"
diff --git a/abs/core/udev/PKGBUILD b/abs/core/udev/PKGBUILD
index 4208c7b..e4c1727 100644
--- a/abs/core/udev/PKGBUILD
+++ b/abs/core/udev/PKGBUILD
@@ -7,7 +7,7 @@
pkgbase="udev"
pkgname=('udev' 'udev-compat')
pkgver=171
-pkgrel=5
+pkgrel=6
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
license=('GPL')
@@ -20,6 +20,7 @@ source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.ta
81-OSS_Emulation.rules
81-dvicoIR.rules
81-CD_DVD_symlinks.rules
+ 81-SoundGraph_LCD.rules
static-audio-nodes-group.patch
static-nodes-permissions.patch
cdsymlinks.sh)
@@ -55,6 +56,8 @@ package_udev() {
install -D -m644 $srcdir/81-dvicoIR.rules $pkgdir/lib/udev/rules.d/81-dvicoIR.rules
# Install CD/DVD symlink rules
install -D -m644 $srcdir/81-CD_DVD_symlinks.rules $pkgdir/lib/udev/rules.d/81-CD_DVD_symlinks.rules
+ # Install SoundGraph LCD rules
+ install -D -m644 $srcdir/81-SoundGraph_LCD.rules $pkgdir/lib/udev/rules.d/81-SoundGraph_LCD.rules
# install cdsymlinks.sh
install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh
@@ -112,6 +115,7 @@ md5sums=('bdf4617284be2ecac11767437417e209'
'18170020347b181b155ff5a1a8a904b4'
'3a920447b11744ecb1b57f0de683db93'
'48845542d8250d6f2eddf07944f78014'
+ '5401def23fae53db3c94e39eb2debfb4'
'4f625aea95a5597afd8cdf189421f193'
'f9e50b8dfcd2215f5423ff9bc04ecf68'
'2e808ee78d237c478b57af2a68d43769')
diff --git a/abs/core/udev/__changelog b/abs/core/udev/__changelog
index 1881493..d04728c 100644
--- a/abs/core/udev/__changelog
+++ b/abs/core/udev/__changelog
@@ -12,3 +12,6 @@
- Moved OSS Emulation rules from 81-LinHES.rules to 81-OSS_Emulation.rules
- Moved CD/DVD rules from 81-LinHES.rules to 81-CD_DVD_symlinks.rules
- Removed 81-LinHES.rules
+
+3/1/2012
+- Added 81-SoundGraph_LCD.rules
generated by cgit v0.12 at 2024-11-10 06:09:16 (GMT)