diff --git a/sys-apps/micro-evtd/ChangeLog b/sys-apps/micro-evtd/ChangeLog index 4e5acad..78e5e4f 100644 --- a/sys-apps/micro-evtd/ChangeLog +++ b/sys-apps/micro-evtd/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 21 Dec 2011; Mario Fetka micro-evtd-3.4.1-r1.ebuild, + -files/micro-evtd.command, files/micro_evtd-boot.initd: + correct system detect + 07 Dec 2011; Mario Fetka -micro_evtd-3.3.3.6.ebuild, -micro_evtd-3.3.3.7.ebuild, -micro_evtd-3.4.1.ebuild: redigest diff --git a/sys-apps/micro-evtd/Manifest b/sys-apps/micro-evtd/Manifest index 7a634e8..2b3ae40 100644 --- a/sys-apps/micro-evtd/Manifest +++ b/sys-apps/micro-evtd/Manifest @@ -1,10 +1,9 @@ -AUX micro-evtd.command 1103 RMD160 c0d502618165b573e355efedb8546cf4b629718b SHA1 72f0b274d4acd332e8d8ebcf2a1837230d189195 SHA256 fefb71fe4ccb35db877a60451e2d081acccdd9a4c96a6fb332db2eeceb69eeb3 -AUX micro_evtd-boot.initd 594 RMD160 e262f505030f551c45b1b86f74cdf8d753221493 SHA1 b257a51ae736d1946666219abe8ae43fbbffc08d SHA256 b619cc4a6d3712cf3e01003e781be8efa3d15dcde9116260ceb8ee7de59c791f +AUX micro_evtd-boot.initd 1290 RMD160 6eeb583dad73699764736e597e58ff4fceb9820e SHA1 1b3bcf8c984f0945a7f006861da0b950571c4f09 SHA256 f10340fee52a487d277bfcf0d8c032699a782dcb3162bb4c251645f0fc22ffeb AUX micro_evtd-default.initd 532 RMD160 3ce534692fcf0994207fbd7fa008abc7c6c8bc00 SHA1 47bd76c7720ae6fa9d575a3c21735bd79cbdc00d SHA256 deeae8fea73809ef69ae19420230561aa90deddbd332e8a2b80586f87bc8aa1a AUX strEventScript-size.patch 994 RMD160 e5900eb40180cae06a5c9272841f72a3d8a5b271 SHA1 27ea6106c51d1753081e9af979f3f615b5bb3a14 SHA256 72fc662b70265a0a9ce4f5f5ea16f43f3157b5aea2bca42e25f42859cd099180 DIST micro-evtd_3.4-1.debian.tar.gz 8639 RMD160 ca94ed8ce88bde51fe2e20490e09c69b8d70cd20 SHA1 15093c8785bff7cdc4b75a1d874c8f232d3d2a24 SHA256 e94b26d1e5181a3376f2ecd9a5fe5d65c2914624b0d93814852199d1cdcc8d9f DIST micro-evtd_3.4.orig.tar.gz 46049 RMD160 6bbdc322b29409e7e73f61924bf12aaf827e905f SHA1 ab9b3366b69a7f031abd5430e2f99fb087c1c2a5 SHA256 3f4009267706346a31d5bdba788f2c294d1aed5c4ab1b8108f234e168e09c2e4 -EBUILD micro-evtd-3.4.1-r1.ebuild 1894 RMD160 88c78ed9dbf1cccd39672d3793897b428b790115 SHA1 d37d973edc06f3e88f33eb2891afad6d8b7e0281 SHA256 c958cc4f3b48966afa2aebaf7b8f10ef8f1ec0cf13203e88f60fef4c06743769 +EBUILD micro-evtd-3.4.1-r1.ebuild 1937 RMD160 4f6de201285db02d39a452670abd29d3b5c826b3 SHA1 dcb24c2c12df16eb271e2ac0b26573eba93fa860 SHA256 cc652b8e2053b8444f6874777e136f8e2c3f2e517d9b84ca415eae146b4c2c04 EBUILD micro-evtd-3.4.1.ebuild 1601 RMD160 5f53a11dd97abeb91d272e69abc25d516670ff81 SHA1 d1092ef63c1d0615b68c991186e1bbd3bd56cc03 SHA256 97455129b2e71421cd19025e92f90df6c3d1fa53b1492ba7e2ed7e2ac745c596 -MISC ChangeLog 654 RMD160 2bc279d51eb1c781f600d5e9a160e35f6fd85cb0 SHA1 446dcba3286af5b471ec85a335ed84a03eddb1f2 SHA256 8c425a3f89ad0b722251b011400014ddfae44b050a75ddc440b48f2dead27038 +MISC ChangeLog 816 RMD160 a546e8534c718ddf7098d1462ec3f53acba10a11 SHA1 070e9f69416a970a116d7ab08cb0da3bd37937c5 SHA256 78405b1448a8343cc0c369872e201674868fcd4264a1875423fde99f4e5ab482 MISC metadata.xml 703 RMD160 4702488eeb282d4d9694aa25b332ce85dc0fb571 SHA1 53e19c1fe760f0006c1b3d1da549ca0ab859ae6a SHA256 5d17ebbc2e2c0b96fb7ce1ed127ab4e50113ff6d6d79d180fe925efbc0067cad diff --git a/sys-apps/micro-evtd/files/micro-evtd.command b/sys-apps/micro-evtd/files/micro-evtd.command deleted file mode 100644 index 9ba661f..0000000 --- a/sys-apps/micro-evtd/files/micro-evtd.command +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -# Wrapper script for micro-evtd to execute single commands. - -DAEMON_BASE=/usr/sbin/micro-evtd -MICROAPL="/usr/sbin/microapl -a" -PIDFILE=/var/run/micro-evtd.pid - -# Test if device is supported -machine=`sed -n '/Hardware/ {s/^Hardware\s*:\s//;p}' /proc/cpuinfo` -case $machine in - "Buffalo Linkstation Pro/Live" | "Buffalo/Revogear Kurobox Pro") - DAEMON=$DAEMON_BASE.pro ;; - *) - DAEMON=$DAEMON_BASE.tera ;; -esac - -micro-evtd_start() { - $DAEMON >/dev/null # daemon forks on its own - # Allow time to startup - sleep 1 - pid=$(cat $PIDFILE) - - if [ "$pid" ]; then - echo $pid - return 0 - fi - return 1 -} - -# Execute commands here -case "$1" in - finish) - $MICROAPL led_set_blink power - $MICROAPL led_set_code_information 15 - ;; - init) - $MICROAPL led_set_blink 0 - $MICROAPL bz_melody 30 b4 || true - ;; - start) - # Start micro-evtd if not already running, exit with failure - # if start failed - [ -n "$(pidof micro-evtd)" ] || micro-evtd_start || exit 1 - ;; - startup) - $MICROAPL led_set_blink power - ;; - stop) - kill -TERM $(cat $PIDFILE) - rm -f $PIDFILE - ;; - *) - $DAEMON "$@" - ;; -esac - -exit 0 diff --git a/sys-apps/micro-evtd/files/micro_evtd-boot.initd b/sys-apps/micro-evtd/files/micro_evtd-boot.initd index 7da3cd3..941dc25 100644 --- a/sys-apps/micro-evtd/files/micro_evtd-boot.initd +++ b/sys-apps/micro-evtd/files/micro_evtd-boot.initd @@ -6,20 +6,47 @@ description="Linkstation/Kurobox/Terastation micro controller daemon" depend() { - need localmount - use logger + need localmount + use logger } start() { - # micro_evtd doesn't start properly from s-s-d, need to investigate - ebegin "Starting ${description}" - #start-stop-daemon --start --exec /usr/sbin/micro-evtd - /usr/sbin/micro-evtd - eend $? + # micro_evtd doesn't start properly from s-s-d, need to investigate + ebegin "Starting ${description}" + device=$(grep "Hardware[[:space:]]*:" /proc/cpuinfo 2>/dev/null | \ + head -n1 | sed "s/^[^:]*: //") + case $device in + "Buffalo Linkstation Pro/Live" | "Buffalo/Revogear Kurobox Pro") + deamon=micro-evtd.pro + ;; + "Buffalo TeraStation Pro/Live" ) + deamon=micro-evtd.tera + ;; + *) + eerror "micro-evtd error: device is not supported" + ;; + esac + #start-stop-daemon --start --exec /usr/sbin/micro-evtd + /usr/sbin/$deamon + eend $? } stop() { ebegin "Stopping ${description}" - start-stop-daemon --stop --exec /usr/sbin/micro-evtd + device=$(grep "Hardware[[:space:]]*:" /proc/cpuinfo 2>/dev/null | \ + head -n1 | sed "s/^[^:]*: //") + case $device in + "Buffalo Linkstation Pro/Live" | "Buffalo/Revogear Kurobox Pro") + deamon=micro-evtd.pro + ;; + "Buffalo TeraStation Pro/Live" ) + deamon=micro-evtd.tera + ;; + *) + eerror "micro-evtd error: device is not supported" + ;; + esac + start-stop-daemon --stop --exec /usr/sbin/$deamon eend $? } + diff --git a/sys-apps/micro-evtd/micro-evtd-3.4.1-r1.ebuild b/sys-apps/micro-evtd/micro-evtd-3.4.1-r1.ebuild index 0e6b933..43764e0 100644 --- a/sys-apps/micro-evtd/micro-evtd-3.4.1-r1.ebuild +++ b/sys-apps/micro-evtd/micro-evtd-3.4.1-r1.ebuild @@ -35,6 +35,10 @@ src_prepare() { EPATCH_FORCE="yes" EPATCH_EXCLUDE="makefile.patch" epatch #epatch "${FILESDIR}/strEventScript-size.patch" ln -sf micro-evtd.mak Makefile + pushd src + ln -sf micro-evtd.c micro-evtd.pro.c + ln -sf micro-evtd.c micro-evtd.tera.c + popd } src_compile() { @@ -45,7 +49,6 @@ src_compile() { src_install() { emake SBIN_PREFIX=/usr DESTDIR="${D}" PROGNAME="micro-evtd.pro" install || die "install failed" emake SBIN_PREFIX=/usr DESTDIR="${D}" PROGNAME="micro-evtd.tera" install || die "install failed" - newsbin ${FILESDIR}/micro-evtd.command micro-evtd # doman debian/microapl.8 # doman debian/micro_evtd.8