| 1 |
armin76 11/04/02 19:28:54 |
| 2 |
|
| 3 |
Modified: init.d 0.4.2-Makefile.patch |
| 4 |
Removed: ts209.lua ts409.lua qcontrol.1 |
| 5 |
Log: |
| 6 |
Use debian patchset, rework ebuild a bit, bug #336245 |
| 7 |
|
| 8 |
(Portage version: 2.1.9.42/cvs/Linux i686, RepoMan options: --force) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 sys-apps/qcontrol/files/init.d |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qcontrol/files/init.d?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qcontrol/files/init.d?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qcontrol/files/init.d?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: init.d |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/qcontrol/files/init.d,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- init.d 26 Dec 2008 18:21:59 -0000 1.1 |
| 24 |
+++ init.d 2 Apr 2011 19:28:54 -0000 1.2 |
| 25 |
@@ -1,5 +1,5 @@ |
| 26 |
#!/sbin/runscript |
| 27 |
-# Copyright 1999-2008 Gentoo Foundation |
| 28 |
+# Copyright 1999-2011 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
# Header: $ |
| 31 |
|
| 32 |
@@ -20,14 +20,14 @@ |
| 33 |
device=$(grep "Hardware[[:space:]]*:" /proc/cpuinfo 2>/dev/null | \ |
| 34 |
head -n1 | sed "s/^[^:]*: //") |
| 35 |
case $device in |
| 36 |
- "QNAP TS-109/TS-209") |
| 37 |
+ "QNAP TS-109/TS-209" | "QNAP TS-119/TS-219") |
| 38 |
qcontrol statusled greenon || true |
| 39 |
qcontrol powerled on || true |
| 40 |
if [ "$SOUND_BUZZER" != no ]; then |
| 41 |
qcontrol buzzer short || true |
| 42 |
fi |
| 43 |
;; |
| 44 |
- "QNAP TS-409") |
| 45 |
+ "QNAP TS-409" | "QNAP TS-41x") |
| 46 |
qcontrol statusled greenon || true |
| 47 |
if [ "$SOUND_BUZZER" != no ]; then |
| 48 |
qcontrol buzzer short || true |
| 49 |
@@ -52,14 +52,14 @@ |
| 50 |
device=$(grep "Hardware[[:space:]]*:" /proc/cpuinfo 2>/dev/null | \ |
| 51 |
head -n1 | sed "s/^[^:]*: //") |
| 52 |
case $device in |
| 53 |
- "QNAP TS-109/TS-209") |
| 54 |
+ "QNAP TS-109/TS-209" | "QNAP TS-119/TS-219") |
| 55 |
qcontrol statusled rednon || true |
| 56 |
qcontrol powerled 1hz || true |
| 57 |
if [ "$SOUND_BUZZER" != no ]; then |
| 58 |
qcontrol buzzer short || true |
| 59 |
fi |
| 60 |
;; |
| 61 |
- "QNAP TS-409") |
| 62 |
+ "QNAP TS-409" | "QNAP TS-41x") |
| 63 |
qcontrol statusled redon || true |
| 64 |
if [ "$SOUND_BUZZER" != no ]; then |
| 65 |
qcontrol buzzer short || true |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.3 sys-apps/qcontrol/files/0.4.2-Makefile.patch |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qcontrol/files/0.4.2-Makefile.patch?rev=1.3&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qcontrol/files/0.4.2-Makefile.patch?rev=1.3&content-type=text/plain |
| 73 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/qcontrol/files/0.4.2-Makefile.patch?r1=1.2&r2=1.3 |
| 74 |
|
| 75 |
Index: 0.4.2-Makefile.patch |
| 76 |
=================================================================== |
| 77 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/qcontrol/files/0.4.2-Makefile.patch,v |
| 78 |
retrieving revision 1.2 |
| 79 |
retrieving revision 1.3 |
| 80 |
diff -u -r1.2 -r1.3 |
| 81 |
--- 0.4.2-Makefile.patch 11 Jun 2009 17:46:33 -0000 1.2 |
| 82 |
+++ 0.4.2-Makefile.patch 2 Apr 2011 19:28:54 -0000 1.3 |
| 83 |
@@ -1,9 +1,22 @@ |
| 84 |
---- Makefile.orig 2008-11-23 12:44:33.000000000 +0000 |
| 85 |
-+++ Makefile 2008-11-23 12:45:35.000000000 +0000 |
| 86 |
+--- Makefile.orig 2011-04-02 20:44:05.021252507 +0200 |
| 87 |
++++ Makefile 2011-04-02 20:45:21.751248966 +0200 |
| 88 |
@@ -1,5 +1,4 @@ |
| 89 |
-CFLAGS=-Os -Wall -I /usr/include/lua5.1 |
| 90 |
-LDFLAGS=-llua5.1 -lpthread |
| 91 |
-+LDFLAGS=-llua -lpthread -ldl |
| 92 |
- SOURCES=qcontrol.c ts209.c ts409.c evdev.c |
| 93 |
++LDFLAGS=-llua -lpthread |
| 94 |
+ LDFLAGS_UDEB=-lpthread -lm -ldl |
| 95 |
+ SOURCES=qcontrol.c ts209.c ts219.c ts409.c ts41x.c evdev.c |
| 96 |
OBJECTS=$(SOURCES:.c=.o) |
| 97 |
- EXECUTABLE=qcontrol |
| 98 |
+@@ -8,10 +7,10 @@ |
| 99 |
+ all: $(SOURCES) $(EXECUTABLE) qcontrol.udeb |
| 100 |
+ |
| 101 |
+ $(EXECUTABLE): $(OBJECTS) |
| 102 |
+- $(CC) $(LDFLAGS) $(OBJECTS) -o $@ |
| 103 |
++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) -o $@ |
| 104 |
+ |
| 105 |
+ qcontrol.udeb: $(OBJECTS) |
| 106 |
+- $(CC) $(LDFLAGS_UDEB) $(OBJECTS) /usr/lib/liblua5.1.a -o $@ |
| 107 |
++ $(CC) $(CFLAGS) $(LDFLAGS_UDEB) $(OBJECTS) /usr/lib/liblua.a -o $@ |
| 108 |
+ |
| 109 |
+ .cpp.o: |
| 110 |
+ $(CC) $(CFLAGS) $< -o $@ |
Archives