Merge branch 'bbh' into develop

This commit is contained in:
Bart Van Der Meerssche 2010-10-13 11:09:12 +02:00
commit 215ad57c2e
5364 changed files with 589303 additions and 70537 deletions

View File

@ -47,17 +47,25 @@ TARGET = main
# make PHASE=x METERCONST=y SENSOR0=z ...
#
DBG = 0
#
# analog settings
TYPE = 2300501
PHASE = 1
METERCONST= 5508
# pulse settings
PULSE_CONST_2 = 1
PULSE_HALF_2 = 0
PULSE_CONST_3 = 1
PULSE_HALF_3 = 0
PULSE_CONST_4 = 1
PULSE_HALF_4 = 0
#
SENSOR0 = 0123456789abcdef0123456789abcde0
SENSOR1 = 0123456789abcdef0123456789abcde1
SENSOR2 = 0123456789abcdef0123456789abcde2
SENSOR3 = 0123456789abcdef0123456789abcde3
#
CEXTRA = -D DBG=$(DBG) -D PHASE=$(PHASE) -D METERCONST=$(METERCONST) -D 'SENSOR0="$(SENSOR0)"' -D 'SENSOR1="$(SENSOR1)"' -D 'SENSOR2="$(SENSOR2)"' -D 'SENSOR3="$(SENSOR3)"'
CEXTRA = -D DBG=$(DBG) -D PHASE=$(PHASE) -D METERCONST=$(METERCONST) -D PULSE_CONST_2=$(PULSE_CONST_2) -D PULSE_HALF_2=$(PULSE_HALF_2) -D PULSE_CONST_3=$(PULSE_CONST_3) -D PULSE_HALF_3=$(PULSE_HALF_3) -D PULSE_CONST_4=$(PULSE_CONST_4) -D PULSE_HALF_4=$(PULSE_HALF_4) -D 'SENSOR0="$(SENSOR0)"' -D 'SENSOR1="$(SENSOR1)"' -D 'SENSOR2="$(SENSOR2)"' -D 'SENSOR3="$(SENSOR3)"'
###############################################################################

View File

@ -38,24 +38,24 @@
#include <avr/wdt.h>
// variable declarations
volatile struct state aux[4] = {{false, false, START, 0}, {false, false, START, 0}, {false, false, START, 0}, {false, false, START, 0}};
volatile struct state aux[4] = {{false, false, false, START, 0}, {false, false, false, START, 0}, {false, false, false, START, 0}, {false, false, false, START, 0}};
volatile struct sensor EEMEM EEPROM_measurements[4] = {{SENSOR0, START}, {SENSOR1, START}, {SENSOR2, START}, {SENSOR3, START}};
volatile struct sensor measurements[4];
volatile struct time_struct time = {false, 0};
volatile uint8_t muxn = 0;
volatile uint16_t timer = 0;
// interrupt service routine for INT0
ISR(INT0_vect) {
measurements[2].value++;
aux[2].pulse = true;
pulse_add(&measurements[2], &aux[2], PULSE_CONST_2, PULSE_HALF_2);
}
// interrupt service routine for INT1
ISR(INT1_vect) {
measurements[3].value++;
aux[3].pulse = true;
pulse_add(&measurements[3], &aux[3], PULSE_CONST_3, PULSE_HALF_3);
}
// interrupt service routine for PCI2 (PCINT20)
@ -65,13 +65,26 @@ ISR(PCINT2_vect) {
aux[4].toggle = true;
}
else {
measurements[4].value++;
aux[4].pulse = true;
aux[4].toggle = false;
pulse_add(&measurements[4], &aux[4], PULSE_CONST_4, PULSE_HALF_4);
}
}
**/
void pulse_add(volatile struct sensor *measurement, volatile struct state *aux, uint32_t pulse_const, uint32_t pulse_half) {
measurement->value += pulse_const;
if (aux->half == true) {
measurement->value += 1;
}
if (pulse_half) {
aux->half = !aux->half;
}
aux->pulse = true;
aux->time = time.ms;
}
// interrupt service routine for ADC
ISR(TIMER2_COMPA_vect) {
#if DBG > 0
@ -104,6 +117,11 @@ ISR(TIMER2_COMPA_vect) {
if (!(muxn &= 0x1)) timer++;
if (timer > SECOND) timer = 0;
// We have timer interrupts occcuring at a frequency of 1250Hz.
// In order to map this to 1000Hz (=ms) we have to skip every fifth interrupt.
if (!time.skip) time.ms++;
time.skip = (((time.ms & 0x3) == 3) && !time.skip) ? true : false;
ADMUX &= 0xF8;
ADMUX |= muxn;
// start a new ADC conversion
@ -260,13 +278,14 @@ void setup()
void send(uint8_t msg_type, const struct sensor *measurement, const struct state *aux)
{
uint8_t i = 46;
char message[49];
uint8_t i;
uint32_t value = 0;
uint32_t ms = 0;
int32_t rest;
uint8_t pulse_count;
char message[60];
switch (msg_type) {
case PULSE:
// blink the green LED
@ -276,6 +295,7 @@ void send(uint8_t msg_type, const struct sensor *measurement, const struct state
cli();
value = measurement->value;
ms = aux->time;
sei();
strcpy(message, "pls ");
@ -312,10 +332,19 @@ void send(uint8_t msg_type, const struct sensor *measurement, const struct state
strcpy(&message[4], measurement->id);
strcpy(&message[36], ":0000000000\n");
i = 46;
do { // generate digits in reverse order
message[i--] = '0' + value % 10; // get next digit
} while ((value /= 10) > 0); // delete it
if ((msg_type == PULSE) && ms) {
strcpy(&message[47], ":0000000000\n");
i = 57;
do { // generate digits in reverse order
message[i--] = '0' + ms % 10; // get next digit
} while ((ms /= 10) > 0); // delete it
}
printString(message);
}

View File

@ -50,6 +50,30 @@
#error "METERCONST not defined"
#endif
#ifndef PULSE_CONST_2
#error "PULSE_CONST_2 not defined"
#endif
#ifndef PULSE_HALF_2
#error "PULSE_HALF_2 not defined"
#endif
#ifndef PULSE_CONST_3
#error "PULSE_CONST_3 not defined"
#endif
#ifndef PULSE_HALF_3
#error "PULSE_HALF_3 not defined"
#endif
#ifndef PULSE_CONST_4
#error "PULSE_CONST_4 not defined"
#endif
#ifndef PULSE_HALF_4
#error "PULSE_HALF_4 not defined"
#endif
#define START 0
#define END3 0xffffffff
#define END2 0xeeeeeeee
@ -88,9 +112,15 @@ asm volatile ( \
)
// datastructures
struct time_struct {
boolean skip;
uint32_t ms;
};
struct state {
boolean pulse;
boolean toggle;
boolean half;
uint32_t nano;
uint16_t adc;
@ -99,6 +129,8 @@ struct state {
uint32_t nano_end;
uint8_t pulse_count;
uint8_t pulse_count_final;
uint32_t time;
};
struct sensor {
@ -109,4 +141,5 @@ struct sensor {
// prototypes
void WDT_off(void);
void WDT_on(void);
void pulse_add(volatile struct sensor *measurement, volatile struct state *aux, uint32_t pulse_const, uint32_t pulse_half);
void send(uint8_t msg_type, const struct sensor *measurement, const struct state *aux);

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,14 @@
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
<service-group>
<name replace-wildcards="yes">Flukso RESTful API on %h</name>
<service>
<type>_flukso._tcp</type>
<port>8080</port>
<txt-record>id1=0123456789abcdef0123456789abcde0</txt-record>
<txt-record>id2=0123456789abcdef0123456789abcde1</txt-record>
<txt-record>id3=0123456789abcdef0123456789abcde2</txt-record>
<txt-record>path=/sensor</txt-record>
<txt-record>version=1.0</txt-record>
</service>
</service-group>

View File

@ -0,0 +1,10 @@
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
<service-group>
<name replace-wildcards="yes">Web Server on %h</name>
<service>
<type>_http._tcp</type>
<port>80</port>
<txt-record>path=/</txt-record>
</service>
</service-group>

View File

@ -3,9 +3,18 @@ config system
option hostname flukso
option device 0123456789abcdef0123456789abcdef
option key 00112233445566778899aabbccddeeff
option version 101
option version 111
config button
option button reset
option action pressed
option handler '/etc/init.d/network restart'
option action released
option handler net_toggle
option min 2
option max 5
config button
option button reset
option action released
option handler net_defaults
option min 10
option max 30

View File

@ -0,0 +1,83 @@
# Server configuration
config uhttpd main
# HTTP listen addresses, multiple allowed
list listen_http 0.0.0.0:80
# list listen_http [::]:80
# HTTPS listen addresses, multiple allowed
# list listen_https 0.0.0.0:443
# list listen_https [::]:443
# Server document root
option home /www
# Reject requests from RFC1918 IP addresses
# directed to the servers public IP(s).
# This is a DNS rebinding countermeasure.
option rfc1918_filter 1
# Certificate and private key for HTTPS.
# If no listen_https addresses are given,
# the key options are ignored.
option cert /etc/uhttpd.crt
option key /etc/uhttpd.key
# CGI url prefix, will be searched in docroot.
# Default is /cgi-bin
option cgi_prefix /cgi-bin
# List of extension->interpreter mappings.
# Files with an associated interpreter can
# be called outside of the CGI prefix and do
# not need to be executable.
# list interpreter ".php=/usr/bin/php-cgi"
# list interpreter ".cgi=/usr/bin/perl"
# Lua url prefix and handler script.
# Lua support is disabled if no prefix given.
# option lua_prefix /luci
# option lua_handler /usr/lib/lua/luci/sgi/uhttpd.lua
# CGI/Lua timeout, if the called script does not
# write data within the given amount of seconds,
# the server will terminate the request with
# 504 Gateway Timeout response.
option script_timeout 60
# Network timeout, if the current connection is
# blocked for the specified amount of seconds,
# the server will terminate the associated
# request process.
option network_timeout 30
# Basic auth realm, defaults to local hostname
# option realm OpenWrt
# Configuration file in busybox httpd format
# option config /etc/httpd.conf
config uhttpd restful
list listen_http 0.0.0.0:8080
option home /www
option cgi_prefix /sensor
option script_timeout 5
option network_timeout 5
# Certificate defaults for px5g key generator
config cert px5g
# Validity time
option days 730
# RSA key size
option bits 1024
# Location
option country DE
option state Berlin
option location Berlin
# Common name
option commonname OpenWrt

View File

@ -1,37 +0,0 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2006 OpenWrt.org
START=40
STOP=40
boot() {
setup_switch() { return 0; }
include /lib/network
setup_switch
[ -s /etc/config/wireless ] || \
/sbin/wifi detect > /etc/config/wireless
/sbin/wifi up
iwconfig ath0 rate 6M
}
start() {
ifup -a
/sbin/wifi up
iwconfig ath0 rate 6M
}
restart() {
setup_switch() { return 0; }
include /lib/network
setup_switch
ifup -a
/sbin/wifi up
iwconfig ath0 rate 6M
}
stop() {
ifdown -a
}

View File

@ -0,0 +1,7 @@
# Put your custom commands here that should be executed once
# the system init finished. By default this file does nothing.
# set the wifi led pin (=GPIO 4) direction to output
gpioctl dirout 4
exit 0

View File

@ -0,0 +1,21 @@
-----BEGIN CERTIFICATE-----
MIIDfzCCAmegAwIBAgIJANYOkpI6yVcFMA0GCSqGSIb3DQEBBQUAMDMxCzAJBgNV
BAYTAkJFMQ8wDQYDVQQKEwZGbHVrc28xEzARBgNVBAMTCmZsdWtzby5uZXQwHhcN
MTAwNjAxMjE1ODAyWhcNMzUwNTI2MjE1ODAyWjAzMQswCQYDVQQGEwJCRTEPMA0G
A1UEChMGRmx1a3NvMRMwEQYDVQQDEwpmbHVrc28ubmV0MIIBIjANBgkqhkiG9w0B
AQEFAAOCAQ8AMIIBCgKCAQEA6CtNI3YrF/7Ak3etIe+XnL4HwJYki4PyaWI4S7W1
49C9W5AEbEd7ufnsaku3eVxMqOP6b5L7MFpCCGDiM1Zt32yYAcL65eCrofZw1DE0
SuWos0Z1P4y2rIUFHya8g8bUh7lUvq30IBgnnUh7Lo0eQT1XfnC/KMUnvseHI/iw
Y3HhYX+espsCPh1a0ATLlEk93XK99q/5mgojSGQxmwPj/91mOWmJOO4edEQAhK+u
t6wCNxZNnf9yyyzzLczwMytfrwBWJEJjJFTfr3JiEmHdl4dt7UiuElGLMr9dFhPV
12Bidxszov663ffUiIUmV/fkMWF1ZEWXFS0x+VJ52seChwIDAQABo4GVMIGSMB0G
A1UdDgQWBBQGMvERFrapN1lmOm9SVR8qB+uj/zBjBgNVHSMEXDBagBQGMvERFrap
N1lmOm9SVR8qB+uj/6E3pDUwMzELMAkGA1UEBhMCQkUxDzANBgNVBAoTBkZsdWtz
bzETMBEGA1UEAxMKZmx1a3NvLm5ldIIJANYOkpI6yVcFMAwGA1UdEwQFMAMBAf8w
DQYJKoZIhvcNAQEFBQADggEBAOZjgNoNhJLckVMEYZiYWqRDWeRPBkyGStCH93r3
42PpuKDyysxI1ldLTcUpUSrs1AtdSIEiEahWr6zVW4QW4o9iqO905E03aTO86L+P
j7SIBPP01M2f70pHpnz+uH1MDxsarI96qllslWfymYI7c6yUN/VciWfNWa38nK1l
MiQJuDvElNy8aN1JJtXHFUQK/I8ois1ATT1rGAiqrkDZIm4pdDmqB/zLI3qIJf8o
cKIo2x/YkVhuDmIpU/XVA13csXrXU+CLfFyNdY1a/6Dhv2B4wG6J5RGuxWmA+Igg
TTysD+aqqzs8XstqDu/aLjMzFKMaXNvDoCbdFQGVXfx0F1A=
-----END CERTIFICATE-----

View File

@ -9,9 +9,20 @@ net.ipv4.tcp_fin_timeout=30
net.ipv4.tcp_keepalive_time=120
net.ipv4.tcp_syncookies=1
net.ipv4.tcp_timestamps=0
net.core.netdev_max_backlog=30
net.netfilter.nf_conntrack_checksum=0
net.ipv4.netfilter.ip_conntrack_checksum=0
net.ipv4.netfilter.ip_conntrack_max=16384
net.ipv4.netfilter.ip_conntrack_tcp_timeout_established=3600
net.ipv4.netfilter.ip_conntrack_udp_timeout=60
net.ipv4.netfilter.ip_conntrack_udp_timeout_stream=180
# net.ipv6.conf.all.forwarding=1
dev.wifi0.ledpin=4
# disable bridge firewalling by default
net.bridge.bridge-nf-call-arptables=0
net.bridge.bridge-nf-call-ip6tables=0
net.bridge.bridge-nf-call-iptables=0
# blink the wifi led
dev.wifi0.softled=1
dev.wifi0.ledpin=4

36
mote/v1/openwrt/install.sh Executable file
View File

@ -0,0 +1,36 @@
#!/usr/bin/env bash
if (( $# < 1 ))
then
printf "%b" "Error. Not enough arguments.\n"
printf "Usage: ./install <your/desired/path/to/backfire>\n"
exit 1
elif (( $# > 1 ))
then
printf "%b" "Error. Too many arguments.\n"
printf "Usage: ./install <your/desired/path/to/backfire>\n"
exit 2
fi
REPO_PATH=$(pwd)
BACKFIRE_PATH=$1
mkdir -p $BACKFIRE_PATH
svn co svn://svn.openwrt.org/openwrt/branches/backfire $BACKFIRE_PATH
echo "src-link flukso $REPO_PATH/package" > $BACKFIRE_PATH/feeds.conf
$BACKFIRE_PATH/scripts/feeds update
$BACKFIRE_PATH/scripts/feeds install -a -p flukso
cp .config $BACKFIRE_PATH
cp -r files $BACKFIRE_PATH
cp patches/300-set.AR2315_RESET_GPIO.to.6.patch $BACKFIRE_PATH/target/linux/atheros/patches-2.6.30
cp patches/310-hotplug_button_jiffies_calc.patch $BACKFIRE_PATH/target/linux/atheros/patches-2.6.30
cd $BACKFIRE_PATH
patch -p0 < $REPO_PATH/patches/100-disable.console.patch
patch -p0 < $REPO_PATH/patches/110-set.console.baud.to.4800.patch
# and to build the flash image
# make -j4

View File

@ -0,0 +1,68 @@
10
dir
23175
svn://svn.openwrt.org/openwrt/packages/libs/avahi
svn://svn.openwrt.org/openwrt
2010-09-07T10:04:42.376593Z
22967
mb
3c298f89-4303-0410-b956-a3cf2f4a3e73
files
dir
patches
dir
Makefile
file
2010-09-20T10:21:42.557435Z
14c290979507656ff4cf4d92d02e7945
2010-09-07T10:04:42.376593Z
22967
mb
has-props
5705

View File

@ -0,0 +1,13 @@
K 9
copyright
V 30
Copyright (C) 2006 OpenWrt.org
K 7
licence
V 5
GPLv2
K 13
svn:eol-style
V 6
native
END

View File

@ -0,0 +1,198 @@
#
# Copyright (C) 2007-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=avahi
PKG_VERSION:=0.6.25
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://avahi.org/download/
PKG_MD5SUM:=a83155a6e29e3988f07e5eea3287b21e
PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host
PKG_FIXUP:=libtool
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/avahi/Default
SECTION:=net
CATEGORY:=Network
TITLE:=An mDNS/DNS-SD implementation
URL:=http://www.avahi.org/
endef
define Package/avahi/Default/description
An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (library).
Avahi is a system which facilitates service discovery on a local network --
this means that you can plug your laptop or computer into a network and
instantly be able to view other people who you can chat with, find printers
to print to or find files being shared. This kind of technology is already
found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf')
and is very convenient.
endef
define Package/libavahi
$(call Package/avahi/Default)
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libdaemon +libpthread +libgdbm
TITLE+= (library)
endef
define Package/libavahi/description
$(call Package/avahi/Default/description)
.
This package contains the mDNS/DNS-SD shared libraries, used by other programs.
endef
define Package/avahi-autoipd
$(call Package/avahi/Default)
DEPENDS:=+libdaemon
TITLE:=IPv4LL network address configuration daemon
endef
define Package/avahi-autoipd/description
$(call Package/avahi/Default/description)
.
This package implements IPv4LL, "Dynamic Configuration of IPv4 Link-Local
Addresses" (IETF RFC3927), a protocol for automatic IP address configuration
from the link-local 169.254.0.0/16 range without the need for a central
server. It is primarily intended to be used in ad-hoc networks which lack a
DHCP server.
endef
define Package/avahi-daemon
$(call Package/avahi/Default)
DEPENDS:=+libavahi +libexpat
TITLE+= (daemon)
endef
define Package/avahi-daemon/description
$(call Package/avahi/Default/description)
.
This package contains an mDNS/DNS-SD daemon.
endef
define Package/avahi-daemon/conffiles
/etc/avahi/avahi-daemon.conf
/etc/avahi/services/http.service
/etc/avahi/services/ssh.service
endef
define Package/avahi-dnsconfd
$(call Package/avahi/Default)
DEPENDS:=+libavahi
TITLE:=An Unicast DNS server from mDNS/DNS-SD configuration daemon
endef
define Package/avahi-dnsconfd/description
$(call Package/avahi/Default/description)
.
This package contains an Unicast DNS server from mDNS/DNS-SD configuration
daemon, which may be used to configure conventional DNS servers using mDNS
in a DHCP-like fashion. Especially useful on IPv6.
endef
TARGET_CFLAGS += $(FPIC) -DGETTEXT_PACKAGE
CONFIGURE_ARGS+= \
--enable-shared \
--enable-static \
--disable-glib \
--disable-gobject \
--disable-qt3 \
--disable-qt4 \
--disable-gtk \
--disable-dbus \
--with-xml=expat \
--disable-dbm \
--enable-gdbm \
--enable-libdaemon \
--disable-python \
--disable-pygtk \
--disable-python-dbus \
--disable-mono \
--disable-monodoc \
--disable-doxygen-doc \
--disable-doxygen-dot \
--disable-doxygen-man \
--disable-doxygen-rtf \
--disable-doxygen-xml \
--disable-doxygen-chm \
--disable-doxygen-chi \
--disable-doxygen-html \
--disable-doxygen-ps \
--disable-doxygen-pdf \
--disable-xmltoman \
--with-distro=none \
--with-avahi-user=nobody \
--with-avahi-group=nogroup \
--with-autoipd-user=nobody \
--with-autoipd-group=nogroup
ifneq ($(CONFIG_SSP_SUPPORT),y)
CONFIGURE_ARGS+= \
--disable-stack-protector
endif
CONFIGURE_VARS+= \
CFLAGS="$$$$CFLAGS -DNDEBUG" \
define Build/Configure
( cd $(PKG_BUILD_DIR); aclocal; libtoolize; autoreconf; );
$(call Build/Configure/Default)
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-{common,core} $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.{a,so*} $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(1)/usr/lib/pkgconfig/
endef
define Package/libavahi/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.* $(1)/usr/lib/
endef
define Package/avahi-autoipd/install
$(INSTALL_DIR) $(1)/etc/avahi
$(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-autoipd.action $(1)/etc/avahi/
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-autoipd $(1)/usr/sbin/
endef
define Package/avahi-daemon/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/avahi
$(INSTALL_DATA) ./files/avahi-daemon.conf $(1)/etc/avahi/
$(INSTALL_DIR) $(1)/etc/avahi/services
$(INSTALL_DATA) ./files/service-http $(1)/etc/avahi/services/http.service
$(INSTALL_DATA) ./files/service-ssh $(1)/etc/avahi/services/ssh.service
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/avahi-daemon.init $(1)/etc/init.d/avahi-daemon
endef
define Package/avahi-dnsconfd/install
$(INSTALL_DIR) $(1)/etc/avahi
$(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/
endef
$(eval $(call BuildPackage,libavahi))
$(eval $(call BuildPackage,avahi-autoipd))
$(eval $(call BuildPackage,avahi-daemon))
$(eval $(call BuildPackage,avahi-dnsconfd))

View File

@ -0,0 +1,198 @@
#
# Copyright (C) 2007-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=avahi
PKG_VERSION:=0.6.25
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://avahi.org/download/
PKG_MD5SUM:=a83155a6e29e3988f07e5eea3287b21e
PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host
PKG_FIXUP:=libtool
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/avahi/Default
SECTION:=net
CATEGORY:=Network
TITLE:=An mDNS/DNS-SD implementation
URL:=http://www.avahi.org/
endef
define Package/avahi/Default/description
An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (library).
Avahi is a system which facilitates service discovery on a local network --
this means that you can plug your laptop or computer into a network and
instantly be able to view other people who you can chat with, find printers
to print to or find files being shared. This kind of technology is already
found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf')
and is very convenient.
endef
define Package/libavahi
$(call Package/avahi/Default)
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libdaemon +libpthread +libgdbm
TITLE+= (library)
endef
define Package/libavahi/description
$(call Package/avahi/Default/description)
.
This package contains the mDNS/DNS-SD shared libraries, used by other programs.
endef
define Package/avahi-autoipd
$(call Package/avahi/Default)
DEPENDS:=+libdaemon
TITLE:=IPv4LL network address configuration daemon
endef
define Package/avahi-autoipd/description
$(call Package/avahi/Default/description)
.
This package implements IPv4LL, "Dynamic Configuration of IPv4 Link-Local
Addresses" (IETF RFC3927), a protocol for automatic IP address configuration
from the link-local 169.254.0.0/16 range without the need for a central
server. It is primarily intended to be used in ad-hoc networks which lack a
DHCP server.
endef
define Package/avahi-daemon
$(call Package/avahi/Default)
DEPENDS:=+libavahi +libexpat
TITLE+= (daemon)
endef
define Package/avahi-daemon/description
$(call Package/avahi/Default/description)
.
This package contains an mDNS/DNS-SD daemon.
endef
define Package/avahi-daemon/conffiles
/etc/avahi/avahi-daemon.conf
/etc/avahi/services/http.service
/etc/avahi/services/ssh.service
endef
define Package/avahi-dnsconfd
$(call Package/avahi/Default)
DEPENDS:=+libavahi
TITLE:=An Unicast DNS server from mDNS/DNS-SD configuration daemon
endef
define Package/avahi-dnsconfd/description
$(call Package/avahi/Default/description)
.
This package contains an Unicast DNS server from mDNS/DNS-SD configuration
daemon, which may be used to configure conventional DNS servers using mDNS
in a DHCP-like fashion. Especially useful on IPv6.
endef
TARGET_CFLAGS += $(FPIC) -DGETTEXT_PACKAGE
CONFIGURE_ARGS+= \
--enable-shared \
--enable-static \
--disable-glib \
--disable-gobject \
--disable-qt3 \
--disable-qt4 \
--disable-gtk \
--disable-dbus \
--with-xml=expat \
--disable-dbm \
--enable-gdbm \
--enable-libdaemon \
--disable-python \
--disable-pygtk \
--disable-python-dbus \
--disable-mono \
--disable-monodoc \
--disable-doxygen-doc \
--disable-doxygen-dot \
--disable-doxygen-man \
--disable-doxygen-rtf \
--disable-doxygen-xml \
--disable-doxygen-chm \
--disable-doxygen-chi \
--disable-doxygen-html \
--disable-doxygen-ps \
--disable-doxygen-pdf \
--disable-xmltoman \
--with-distro=none \
--with-avahi-user=nobody \
--with-avahi-group=nogroup \
--with-autoipd-user=nobody \
--with-autoipd-group=nogroup
ifneq ($(CONFIG_SSP_SUPPORT),y)
CONFIGURE_ARGS+= \
--disable-stack-protector
endif
CONFIGURE_VARS+= \
CFLAGS="$$$$CFLAGS -DNDEBUG" \
define Build/Configure
( cd $(PKG_BUILD_DIR); aclocal; libtoolize; autoreconf; );
$(call Build/Configure/Default)
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-{common,core} $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.{a,so*} $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(1)/usr/lib/pkgconfig/
endef
define Package/libavahi/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.* $(1)/usr/lib/
endef
define Package/avahi-autoipd/install
$(INSTALL_DIR) $(1)/etc/avahi
$(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-autoipd.action $(1)/etc/avahi/
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-autoipd $(1)/usr/sbin/
endef
define Package/avahi-daemon/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/avahi
$(INSTALL_DATA) ./files/avahi-daemon.conf $(1)/etc/avahi/
$(INSTALL_DIR) $(1)/etc/avahi/services
$(INSTALL_DATA) ./files/service-http $(1)/etc/avahi/services/http.service
$(INSTALL_DATA) ./files/service-ssh $(1)/etc/avahi/services/ssh.service
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/avahi-daemon.init $(1)/etc/init.d/avahi-daemon
endef
define Package/avahi-dnsconfd/install
$(INSTALL_DIR) $(1)/etc/avahi
$(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/
endef
$(eval $(call BuildPackage,libavahi))
$(eval $(call BuildPackage,avahi-autoipd))
$(eval $(call BuildPackage,avahi-daemon))
$(eval $(call BuildPackage,avahi-dnsconfd))

View File

@ -0,0 +1,164 @@
10
dir
23175
svn://svn.openwrt.org/openwrt/packages/libs/avahi/files
svn://svn.openwrt.org/openwrt
2009-04-17T15:22:00.575847Z
15247
nico
3c298f89-4303-0410-b956-a3cf2f4a3e73
avahi-daemon.init
file
2010-07-24T18:00:01.268389Z
80c8607dfee5436effe2fb31ffe35368
2009-04-17T15:22:00.575847Z
15247
nico
has-props
267
service-ssh
file
2010-07-24T18:00:01.268389Z
2a3773d96969b121c3fa0988f9921b8c
2009-04-17T15:22:00.575847Z
15247
nico
has-props
265
avahi-daemon.conf
file
2010-07-24T18:00:01.272389Z
4e760dbb6d6c769316874acd7015537d
2009-04-17T15:22:00.575847Z
15247
nico
has-props
445
service-http
file
2010-07-24T18:00:01.272389Z
cad04c15d78baf565a4277f4dbbb4286
2009-04-17T15:22:00.575847Z
15247
nico
has-props
309

View File

@ -0,0 +1,5 @@
K 13
svn:eol-style
V 6
native
END

View File

@ -0,0 +1,5 @@
K 13
svn:eol-style
V 6
native
END

View File

@ -0,0 +1,5 @@
K 13
svn:eol-style
V 6
native
END

View File

@ -0,0 +1,5 @@
K 13
svn:eol-style
V 6
native
END

View File

@ -0,0 +1,28 @@
[server]
#host-name=foo
#domain-name=local
use-ipv4=yes
use-ipv6=no
check-response-ttl=no
use-iff-running=no
[publish]
publish-addresses=yes
publish-hinfo=yes
publish-workstation=no
publish-domain=yes
#publish-dns-servers=192.168.1.1
#publish-resolv-conf-dns-servers=yes
[reflector]
enable-reflector=no
reflect-ipv=no
[rlimits]
#rlimit-as=
rlimit-core=0
rlimit-data=4194304
rlimit-fsize=0
rlimit-nofile=30
rlimit-stack=4194304
rlimit-nproc=1

View File

@ -0,0 +1,23 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2006 OpenWrt.org
START=50
BIN=avahi-daemon
DEFAULT=/etc/default/$BIN
OPTIONS="-D"
RUN_D=/var/run/$BIN
start() {
[ -f $DEFAULT ] && . $DEFAULT
mkdir -p $RUN_D
$BIN $OPTIONS
}
stop() {
$BIN -k
}
reload() {
$BIN -r
}

View File

@ -0,0 +1,10 @@
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
<service-group>
<name replace-wildcards="yes">Web Server on %h</name>
<service>
<type>_http._tcp</type>
<port>80</port>
<txt-record>path=/index.html</txt-record>
</service>
</service-group>

View File

@ -0,0 +1,9 @@
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
<service-group>
<name replace-wildcards="yes">Secure Shell on %h</name>
<service>
<type>_ssh._tcp</type>
<port>22</port>
</service>
</service-group>

View File

@ -0,0 +1,28 @@
[server]
#host-name=foo
#domain-name=local
use-ipv4=yes
use-ipv6=no
check-response-ttl=no
use-iff-running=no
[publish]
publish-addresses=yes
publish-hinfo=yes
publish-workstation=no
publish-domain=yes
#publish-dns-servers=192.168.1.1
#publish-resolv-conf-dns-servers=yes
[reflector]
enable-reflector=no
reflect-ipv=no
[rlimits]
#rlimit-as=
rlimit-core=0
rlimit-data=4194304
rlimit-fsize=0
rlimit-nofile=30
rlimit-stack=4194304
rlimit-nproc=1

View File

@ -0,0 +1,23 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2006 OpenWrt.org
START=50
BIN=avahi-daemon
DEFAULT=/etc/default/$BIN
OPTIONS="-D"
RUN_D=/var/run/$BIN
start() {
[ -f $DEFAULT ] && . $DEFAULT
mkdir -p $RUN_D
$BIN $OPTIONS
}
stop() {
$BIN -k
}
reload() {
$BIN -r
}

View File

@ -0,0 +1,10 @@
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
<service-group>
<name replace-wildcards="yes">Web Server on %h</name>
<service>
<type>_http._tcp</type>
<port>80</port>
<txt-record>path=/index.html</txt-record>
</service>
</service-group>

View File

@ -0,0 +1,9 @@
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
<service-group>
<name replace-wildcards="yes">Secure Shell on %h</name>
<service>
<type>_ssh._tcp</type>
<port>22</port>
</service>
</service-group>

View File

@ -0,0 +1,96 @@
10
dir
23175
svn://svn.openwrt.org/openwrt/packages/libs/avahi/patches
svn://svn.openwrt.org/openwrt
2009-05-04T23:33:02.547929Z
15609
nbd
3c298f89-4303-0410-b956-a3cf2f4a3e73
010-fix-pkgconfig-file.patch
file
2010-07-24T18:00:01.276389Z
9c9025b705ab9e03a6faffc833faf7e6
2009-05-04T23:33:02.547929Z
15609
nbd
24091
020-no_gettext.patch
file
2010-07-24T18:00:01.276389Z
0890226989548cfe5349f7334c2cb49d
2009-05-04T23:33:02.547929Z
15609
nbd
49566

View File

@ -0,0 +1,662 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -63,11 +63,15 @@
#
# This is usually added to MOSTLYCLEANFILES.
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -82,10 +86,16 @@
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/common/doxygen.mk \
- $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \
- ChangeLog compile config.guess config.rpath config.sub depcomp \
- install-sh ltmain.sh missing py-compile
+ $(srcdir)/Makefile.in $(srcdir)/avahi-client.pc.in \
+ $(srcdir)/avahi-compat-howl.pc.in \
+ $(srcdir)/avahi-compat-libdns_sd.pc.in \
+ $(srcdir)/avahi-core.pc.in $(srcdir)/avahi-glib.pc.in \
+ $(srcdir)/avahi-gobject.pc.in $(srcdir)/avahi-qt3.pc.in \
+ $(srcdir)/avahi-qt4.pc.in $(srcdir)/avahi-ui.pc.in \
+ $(srcdir)/common/doxygen.mk $(srcdir)/config.h.in \
+ $(top_srcdir)/configure ABOUT-NLS ChangeLog compile \
+ config.guess config.rpath config.sub depcomp install-sh \
+ ltmain.sh missing py-compile
@HAVE_QT3_TRUE@am__append_1 = \
@HAVE_QT3_TRUE@ $(srcdir)/avahi-qt/qt-watch.h
@@ -146,30 +156,25 @@
am__aclocal_m4_deps = $(top_srcdir)/common/acx_pthread.m4 \
$(top_srcdir)/common/gcc_stack_protect.m4 \
$(top_srcdir)/common/gcc_visibility.m4 \
- $(top_srcdir)/common/libtool.m4 \
- $(top_srcdir)/common/ltoptions.m4 \
- $(top_srcdir)/common/ltsugar.m4 \
- $(top_srcdir)/common/ltversion.m4 \
- $(top_srcdir)/common/lt~obsolete.m4 \
- $(top_srcdir)/common/nls.m4 $(top_srcdir)/common/python.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/common/python.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/common/doxygen.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
+ configure.lineno configure.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = avahi-client.pc avahi-compat-howl.pc \
+ avahi-compat-libdns_sd.pc avahi-core.pc avahi-glib.pc \
+ avahi-gobject.pc avahi-qt3.pc avahi-qt4.pc avahi-ui.pc
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -179,8 +184,6 @@
am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgconfig_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -196,7 +199,8 @@
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -208,8 +212,8 @@
AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@
AVAHI_USER = @AVAHI_USER@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
+BUILD_MANPAGES_FALSE = @BUILD_MANPAGES_FALSE@
+BUILD_MANPAGES_TRUE = @BUILD_MANPAGES_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -220,7 +224,6 @@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
DBUS_SYSTEM_BUS_DEFAULT_ADDRESS = @DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
@@ -228,8 +231,28 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+DX_COND_chi_FALSE = @DX_COND_chi_FALSE@
+DX_COND_chi_TRUE = @DX_COND_chi_TRUE@
+DX_COND_chm_FALSE = @DX_COND_chm_FALSE@
+DX_COND_chm_TRUE = @DX_COND_chm_TRUE@
+DX_COND_doc_FALSE = @DX_COND_doc_FALSE@
+DX_COND_doc_TRUE = @DX_COND_doc_TRUE@
+DX_COND_dot_FALSE = @DX_COND_dot_FALSE@
+DX_COND_dot_TRUE = @DX_COND_dot_TRUE@
+DX_COND_html_FALSE = @DX_COND_html_FALSE@
+DX_COND_html_TRUE = @DX_COND_html_TRUE@
+DX_COND_latex_FALSE = @DX_COND_latex_FALSE@
+DX_COND_latex_TRUE = @DX_COND_latex_TRUE@
+DX_COND_man_FALSE = @DX_COND_man_FALSE@
+DX_COND_man_TRUE = @DX_COND_man_TRUE@
+DX_COND_pdf_FALSE = @DX_COND_pdf_FALSE@
+DX_COND_pdf_TRUE = @DX_COND_pdf_TRUE@
+DX_COND_ps_FALSE = @DX_COND_ps_FALSE@
+DX_COND_ps_TRUE = @DX_COND_ps_TRUE@
+DX_COND_rtf_FALSE = @DX_COND_rtf_FALSE@
+DX_COND_rtf_TRUE = @DX_COND_rtf_TRUE@
+DX_COND_xml_FALSE = @DX_COND_xml_FALSE@
+DX_COND_xml_TRUE = @DX_COND_xml_TRUE@
DX_CONFIG = @DX_CONFIG@
DX_DOCDIR = @DX_DOCDIR@
DX_DOT = @DX_DOT@
@@ -253,38 +276,85 @@
DX_PDFLATEX = @DX_PDFLATEX@
DX_PERL = @DX_PERL@
DX_PROJECT = @DX_PROJECT@
+ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
+ENABLE_AUTOIPD_FALSE = @ENABLE_AUTOIPD_FALSE@
+ENABLE_AUTOIPD_TRUE = @ENABLE_AUTOIPD_TRUE@
+ENABLE_CHROOT_FALSE = @ENABLE_CHROOT_FALSE@
+ENABLE_CHROOT_TRUE = @ENABLE_CHROOT_TRUE@
+ENABLE_COMPAT_HOWL_FALSE = @ENABLE_COMPAT_HOWL_FALSE@
+ENABLE_COMPAT_HOWL_TRUE = @ENABLE_COMPAT_HOWL_TRUE@
+ENABLE_COMPAT_LIBDNS_SD_FALSE = @ENABLE_COMPAT_LIBDNS_SD_FALSE@
+ENABLE_COMPAT_LIBDNS_SD_TRUE = @ENABLE_COMPAT_LIBDNS_SD_TRUE@
+ENABLE_CORE_DOCS_FALSE = @ENABLE_CORE_DOCS_FALSE@
+ENABLE_CORE_DOCS_TRUE = @ENABLE_CORE_DOCS_TRUE@
+ENABLE_TESTS_FALSE = @ENABLE_TESTS_FALSE@
+ENABLE_TESTS_TRUE = @ENABLE_TESTS_TRUE@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
GACUTIL = @GACUTIL@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLADE20_CFLAGS = @GLADE20_CFLAGS@
GLADE20_LIBS = @GLADE20_LIBS@
GLIB20_CFLAGS = @GLIB20_CFLAGS@
GLIB20_LIBS = @GLIB20_LIBS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
GOBJECT_LIBS = @GOBJECT_LIBS@
GREP = @GREP@
GTK20_CFLAGS = @GTK20_CFLAGS@
GTK20_LIBS = @GTK20_LIBS@
+HAVE_DBM_FALSE = @HAVE_DBM_FALSE@
+HAVE_DBM_TRUE = @HAVE_DBM_TRUE@
+HAVE_DBUS_FALSE = @HAVE_DBUS_FALSE@
+HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
+HAVE_DLOPEN_FALSE = @HAVE_DLOPEN_FALSE@
+HAVE_DLOPEN_TRUE = @HAVE_DLOPEN_TRUE@
+HAVE_GDBM_FALSE = @HAVE_GDBM_FALSE@
+HAVE_GDBM_TRUE = @HAVE_GDBM_TRUE@
+HAVE_GLIB_FALSE = @HAVE_GLIB_FALSE@
+HAVE_GLIB_TRUE = @HAVE_GLIB_TRUE@
+HAVE_GOBJECT_FALSE = @HAVE_GOBJECT_FALSE@
+HAVE_GOBJECT_TRUE = @HAVE_GOBJECT_TRUE@
+HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
+HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
+HAVE_INOTIFY_FALSE = @HAVE_INOTIFY_FALSE@
+HAVE_INOTIFY_TRUE = @HAVE_INOTIFY_TRUE@
+HAVE_KQUEUE_FALSE = @HAVE_KQUEUE_FALSE@
+HAVE_KQUEUE_TRUE = @HAVE_KQUEUE_TRUE@
+HAVE_LIBDAEMON_FALSE = @HAVE_LIBDAEMON_FALSE@
+HAVE_LIBDAEMON_TRUE = @HAVE_LIBDAEMON_TRUE@
+HAVE_MONODOC_FALSE = @HAVE_MONODOC_FALSE@
+HAVE_MONODOC_TRUE = @HAVE_MONODOC_TRUE@
+HAVE_MONO_FALSE = @HAVE_MONO_FALSE@
+HAVE_MONO_TRUE = @HAVE_MONO_TRUE@
+HAVE_NETLINK_FALSE = @HAVE_NETLINK_FALSE@
+HAVE_NETLINK_TRUE = @HAVE_NETLINK_TRUE@
+HAVE_PF_ROUTE_FALSE = @HAVE_PF_ROUTE_FALSE@
+HAVE_PF_ROUTE_TRUE = @HAVE_PF_ROUTE_TRUE@
+HAVE_PYGTK_FALSE = @HAVE_PYGTK_FALSE@
+HAVE_PYGTK_TRUE = @HAVE_PYGTK_TRUE@
+HAVE_PYTHON_DBUS_FALSE = @HAVE_PYTHON_DBUS_FALSE@
+HAVE_PYTHON_DBUS_TRUE = @HAVE_PYTHON_DBUS_TRUE@
+HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
+HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
+HAVE_QT3_FALSE = @HAVE_QT3_FALSE@
+HAVE_QT3_TRUE = @HAVE_QT3_TRUE@
+HAVE_QT4_FALSE = @HAVE_QT4_FALSE@
+HAVE_QT4_TRUE = @HAVE_QT4_TRUE@
+HAVE_SYS_FILIO_H_FALSE = @HAVE_SYS_FILIO_H_FALSE@
+HAVE_SYS_FILIO_H_TRUE = @HAVE_SYS_FILIO_H_TRUE@
+HAVE_SYS_SYSCTL_H_FALSE = @HAVE_SYS_SYSCTL_H_FALSE@
+HAVE_SYS_SYSCTL_H_TRUE = @HAVE_SYS_SYSCTL_H_TRUE@
+HAVE_XML_FALSE = @HAVE_XML_FALSE@
+HAVE_XML_TRUE = @HAVE_XML_TRUE@
HOWL_COMPAT_VERSION = @HOWL_COMPAT_VERSION@
-INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LD = @LD@
LDFLAGS = @LDFLAGS@
LIBAVAHI_CLIENT_VERSION_INFO = @LIBAVAHI_CLIENT_VERSION_INFO@
LIBAVAHI_COMMON_VERSION_INFO = @LIBAVAHI_COMMON_VERSION_INFO@
@@ -301,29 +371,18 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
MOC_QT3 = @MOC_QT3@
MOC_QT4 = @MOC_QT4@
MONODOCER = @MONODOCER@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_DIR = @MONODOC_DIR@
MONODOC_LIBS = @MONODOC_LIBS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -333,10 +392,6 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -354,20 +409,42 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_NLS = @USE_NLS@
+TARGET_ARCHLINUX_FALSE = @TARGET_ARCHLINUX_FALSE@
+TARGET_ARCHLINUX_TRUE = @TARGET_ARCHLINUX_TRUE@
+TARGET_DARWIN_FALSE = @TARGET_DARWIN_FALSE@
+TARGET_DARWIN_TRUE = @TARGET_DARWIN_TRUE@
+TARGET_DEBIAN_FALSE = @TARGET_DEBIAN_FALSE@
+TARGET_DEBIAN_TRUE = @TARGET_DEBIAN_TRUE@
+TARGET_FEDORA_FALSE = @TARGET_FEDORA_FALSE@
+TARGET_FEDORA_TRUE = @TARGET_FEDORA_TRUE@
+TARGET_FREEBSD_FALSE = @TARGET_FREEBSD_FALSE@
+TARGET_FREEBSD_TRUE = @TARGET_FREEBSD_TRUE@
+TARGET_GENTOO_FALSE = @TARGET_GENTOO_FALSE@
+TARGET_GENTOO_TRUE = @TARGET_GENTOO_TRUE@
+TARGET_LFS_FALSE = @TARGET_LFS_FALSE@
+TARGET_LFS_TRUE = @TARGET_LFS_TRUE@
+TARGET_MANDRIVA_FALSE = @TARGET_MANDRIVA_FALSE@
+TARGET_MANDRIVA_TRUE = @TARGET_MANDRIVA_TRUE@
+TARGET_NETBSD_FALSE = @TARGET_NETBSD_FALSE@
+TARGET_NETBSD_TRUE = @TARGET_NETBSD_TRUE@
+TARGET_SLACKWARE_FALSE = @TARGET_SLACKWARE_FALSE@
+TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@
+TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@
+TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@
+USE_XMLTOMAN_FALSE = @USE_XMLTOMAN_FALSE@
+USE_XMLTOMAN_TRUE = @USE_XMLTOMAN_TRUE@
VERSION = @VERSION@
VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@
-XGETTEXT = @XGETTEXT@
XML_CFLAGS = @XML_CFLAGS@
XML_LIBS = @XML_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_F77 = @ac_ct_F77@
acx_pthread_config = @acx_pthread_config@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -382,7 +459,6 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -404,7 +480,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -418,12 +493,8 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I common
@DX_COND_doc_TRUE@@DX_COND_html_TRUE@DX_CLEAN_HTML = @DX_DOCDIR@/html
@DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHM = @DX_DOCDIR@/chm
@@ -576,7 +647,7 @@
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+ $(MAKE) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -589,6 +660,24 @@
distclean-hdr:
-rm -f config.h stamp-h1
+avahi-client.pc: $(top_builddir)/config.status $(srcdir)/avahi-client.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-compat-howl.pc: $(top_builddir)/config.status $(srcdir)/avahi-compat-howl.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-compat-libdns_sd.pc: $(top_builddir)/config.status $(srcdir)/avahi-compat-libdns_sd.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-core.pc: $(top_builddir)/config.status $(srcdir)/avahi-core.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-glib.pc: $(top_builddir)/config.status $(srcdir)/avahi-glib.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-gobject.pc: $(top_builddir)/config.status $(srcdir)/avahi-gobject.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-qt3.pc: $(top_builddir)/config.status $(srcdir)/avahi-qt3.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-qt4.pc: $(top_builddir)/config.status $(srcdir)/avahi-qt4.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-ui.pc: $(top_builddir)/config.status $(srcdir)/avahi-ui.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
@@ -597,10 +686,11 @@
-rm -rf .libs _libs
distclean-libtool:
- -rm -f libtool config.lt
+ -rm -f libtool
+uninstall-info-am:
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -647,7 +737,8 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -691,8 +782,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -717,8 +808,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -728,12 +819,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -748,22 +840,24 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
+ mkdir $(distdir)
+ $(mkdir_p) $(distdir)/. $(distdir)/avahi-daemon $(distdir)/common $(distdir)/docs $(distdir)/po
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -777,7 +871,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -785,8 +879,6 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -797,7 +889,7 @@
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -807,10 +899,6 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -837,8 +925,6 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -878,7 +964,7 @@
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -903,7 +989,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -954,20 +1040,12 @@
install-data-am: install-pkgconfigDATA
-install-dvi: install-dvi-recursive
-
install-exec-am:
-install-html: install-html-recursive
-
install-info: install-info-recursive
install-man:
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -988,27 +1066,26 @@
ps-am:
-uninstall-am: uninstall-pkgconfigDATA
+uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
- distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+ check-am clean clean-generic clean-libtool clean-recursive \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+ dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-hdr distclean-libtool \
+ distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkgconfigDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-pkgconfigDATA
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-pkgconfigDATA install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-info-am \
+ uninstall-pkgconfigDATA
@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
--- a/configure.ac
+++ b/configure.ac
@@ -1088,6 +1088,15 @@
avahi-autoipd/Makefile
avahi-ui/Makefile
po/Makefile.in
+avahi-client.pc
+avahi-compat-howl.pc
+avahi-compat-libdns_sd.pc
+avahi-core.pc
+avahi-glib.pc
+avahi-gobject.pc
+avahi-qt3.pc
+avahi-qt4.pc
+avahi-ui.pc
])
AC_OUTPUT

View File

@ -0,0 +1,662 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -63,11 +63,15 @@
#
# This is usually added to MOSTLYCLEANFILES.
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -82,10 +86,16 @@
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/common/doxygen.mk \
- $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \
- ChangeLog compile config.guess config.rpath config.sub depcomp \
- install-sh ltmain.sh missing py-compile
+ $(srcdir)/Makefile.in $(srcdir)/avahi-client.pc.in \
+ $(srcdir)/avahi-compat-howl.pc.in \
+ $(srcdir)/avahi-compat-libdns_sd.pc.in \
+ $(srcdir)/avahi-core.pc.in $(srcdir)/avahi-glib.pc.in \
+ $(srcdir)/avahi-gobject.pc.in $(srcdir)/avahi-qt3.pc.in \
+ $(srcdir)/avahi-qt4.pc.in $(srcdir)/avahi-ui.pc.in \
+ $(srcdir)/common/doxygen.mk $(srcdir)/config.h.in \
+ $(top_srcdir)/configure ABOUT-NLS ChangeLog compile \
+ config.guess config.rpath config.sub depcomp install-sh \
+ ltmain.sh missing py-compile
@HAVE_QT3_TRUE@am__append_1 = \
@HAVE_QT3_TRUE@ $(srcdir)/avahi-qt/qt-watch.h
@@ -146,30 +156,25 @@
am__aclocal_m4_deps = $(top_srcdir)/common/acx_pthread.m4 \
$(top_srcdir)/common/gcc_stack_protect.m4 \
$(top_srcdir)/common/gcc_visibility.m4 \
- $(top_srcdir)/common/libtool.m4 \
- $(top_srcdir)/common/ltoptions.m4 \
- $(top_srcdir)/common/ltsugar.m4 \
- $(top_srcdir)/common/ltversion.m4 \
- $(top_srcdir)/common/lt~obsolete.m4 \
- $(top_srcdir)/common/nls.m4 $(top_srcdir)/common/python.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/common/python.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/common/doxygen.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
+ configure.lineno configure.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = avahi-client.pc avahi-compat-howl.pc \
+ avahi-compat-libdns_sd.pc avahi-core.pc avahi-glib.pc \
+ avahi-gobject.pc avahi-qt3.pc avahi-qt4.pc avahi-ui.pc
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -179,8 +184,6 @@
am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgconfig_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -196,7 +199,8 @@
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -208,8 +212,8 @@
AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@
AVAHI_USER = @AVAHI_USER@
AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
+BUILD_MANPAGES_FALSE = @BUILD_MANPAGES_FALSE@
+BUILD_MANPAGES_TRUE = @BUILD_MANPAGES_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -220,7 +224,6 @@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
DBUS_SYSTEM_BUS_DEFAULT_ADDRESS = @DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
@@ -228,8 +231,28 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
+DX_COND_chi_FALSE = @DX_COND_chi_FALSE@
+DX_COND_chi_TRUE = @DX_COND_chi_TRUE@
+DX_COND_chm_FALSE = @DX_COND_chm_FALSE@
+DX_COND_chm_TRUE = @DX_COND_chm_TRUE@
+DX_COND_doc_FALSE = @DX_COND_doc_FALSE@
+DX_COND_doc_TRUE = @DX_COND_doc_TRUE@
+DX_COND_dot_FALSE = @DX_COND_dot_FALSE@
+DX_COND_dot_TRUE = @DX_COND_dot_TRUE@
+DX_COND_html_FALSE = @DX_COND_html_FALSE@
+DX_COND_html_TRUE = @DX_COND_html_TRUE@
+DX_COND_latex_FALSE = @DX_COND_latex_FALSE@
+DX_COND_latex_TRUE = @DX_COND_latex_TRUE@
+DX_COND_man_FALSE = @DX_COND_man_FALSE@
+DX_COND_man_TRUE = @DX_COND_man_TRUE@
+DX_COND_pdf_FALSE = @DX_COND_pdf_FALSE@
+DX_COND_pdf_TRUE = @DX_COND_pdf_TRUE@
+DX_COND_ps_FALSE = @DX_COND_ps_FALSE@
+DX_COND_ps_TRUE = @DX_COND_ps_TRUE@
+DX_COND_rtf_FALSE = @DX_COND_rtf_FALSE@
+DX_COND_rtf_TRUE = @DX_COND_rtf_TRUE@
+DX_COND_xml_FALSE = @DX_COND_xml_FALSE@
+DX_COND_xml_TRUE = @DX_COND_xml_TRUE@
DX_CONFIG = @DX_CONFIG@
DX_DOCDIR = @DX_DOCDIR@
DX_DOT = @DX_DOT@
@@ -253,38 +276,85 @@
DX_PDFLATEX = @DX_PDFLATEX@
DX_PERL = @DX_PERL@
DX_PROJECT = @DX_PROJECT@
+ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
+ENABLE_AUTOIPD_FALSE = @ENABLE_AUTOIPD_FALSE@
+ENABLE_AUTOIPD_TRUE = @ENABLE_AUTOIPD_TRUE@
+ENABLE_CHROOT_FALSE = @ENABLE_CHROOT_FALSE@
+ENABLE_CHROOT_TRUE = @ENABLE_CHROOT_TRUE@
+ENABLE_COMPAT_HOWL_FALSE = @ENABLE_COMPAT_HOWL_FALSE@
+ENABLE_COMPAT_HOWL_TRUE = @ENABLE_COMPAT_HOWL_TRUE@
+ENABLE_COMPAT_LIBDNS_SD_FALSE = @ENABLE_COMPAT_LIBDNS_SD_FALSE@
+ENABLE_COMPAT_LIBDNS_SD_TRUE = @ENABLE_COMPAT_LIBDNS_SD_TRUE@
+ENABLE_CORE_DOCS_FALSE = @ENABLE_CORE_DOCS_FALSE@
+ENABLE_CORE_DOCS_TRUE = @ENABLE_CORE_DOCS_TRUE@
+ENABLE_TESTS_FALSE = @ENABLE_TESTS_FALSE@
+ENABLE_TESTS_TRUE = @ENABLE_TESTS_TRUE@
EXEEXT = @EXEEXT@
-FGREP = @FGREP@
+F77 = @F77@
+FFLAGS = @FFLAGS@
GACUTIL = @GACUTIL@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLADE20_CFLAGS = @GLADE20_CFLAGS@
GLADE20_LIBS = @GLADE20_LIBS@
GLIB20_CFLAGS = @GLIB20_CFLAGS@
GLIB20_LIBS = @GLIB20_LIBS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
GOBJECT_LIBS = @GOBJECT_LIBS@
GREP = @GREP@
GTK20_CFLAGS = @GTK20_CFLAGS@
GTK20_LIBS = @GTK20_LIBS@
+HAVE_DBM_FALSE = @HAVE_DBM_FALSE@
+HAVE_DBM_TRUE = @HAVE_DBM_TRUE@
+HAVE_DBUS_FALSE = @HAVE_DBUS_FALSE@
+HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@
+HAVE_DLOPEN_FALSE = @HAVE_DLOPEN_FALSE@
+HAVE_DLOPEN_TRUE = @HAVE_DLOPEN_TRUE@
+HAVE_GDBM_FALSE = @HAVE_GDBM_FALSE@
+HAVE_GDBM_TRUE = @HAVE_GDBM_TRUE@
+HAVE_GLIB_FALSE = @HAVE_GLIB_FALSE@
+HAVE_GLIB_TRUE = @HAVE_GLIB_TRUE@
+HAVE_GOBJECT_FALSE = @HAVE_GOBJECT_FALSE@
+HAVE_GOBJECT_TRUE = @HAVE_GOBJECT_TRUE@
+HAVE_GTK_FALSE = @HAVE_GTK_FALSE@
+HAVE_GTK_TRUE = @HAVE_GTK_TRUE@
+HAVE_INOTIFY_FALSE = @HAVE_INOTIFY_FALSE@
+HAVE_INOTIFY_TRUE = @HAVE_INOTIFY_TRUE@
+HAVE_KQUEUE_FALSE = @HAVE_KQUEUE_FALSE@
+HAVE_KQUEUE_TRUE = @HAVE_KQUEUE_TRUE@
+HAVE_LIBDAEMON_FALSE = @HAVE_LIBDAEMON_FALSE@
+HAVE_LIBDAEMON_TRUE = @HAVE_LIBDAEMON_TRUE@
+HAVE_MONODOC_FALSE = @HAVE_MONODOC_FALSE@
+HAVE_MONODOC_TRUE = @HAVE_MONODOC_TRUE@
+HAVE_MONO_FALSE = @HAVE_MONO_FALSE@
+HAVE_MONO_TRUE = @HAVE_MONO_TRUE@
+HAVE_NETLINK_FALSE = @HAVE_NETLINK_FALSE@
+HAVE_NETLINK_TRUE = @HAVE_NETLINK_TRUE@
+HAVE_PF_ROUTE_FALSE = @HAVE_PF_ROUTE_FALSE@
+HAVE_PF_ROUTE_TRUE = @HAVE_PF_ROUTE_TRUE@
+HAVE_PYGTK_FALSE = @HAVE_PYGTK_FALSE@
+HAVE_PYGTK_TRUE = @HAVE_PYGTK_TRUE@
+HAVE_PYTHON_DBUS_FALSE = @HAVE_PYTHON_DBUS_FALSE@
+HAVE_PYTHON_DBUS_TRUE = @HAVE_PYTHON_DBUS_TRUE@
+HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@
+HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@
+HAVE_QT3_FALSE = @HAVE_QT3_FALSE@
+HAVE_QT3_TRUE = @HAVE_QT3_TRUE@
+HAVE_QT4_FALSE = @HAVE_QT4_FALSE@
+HAVE_QT4_TRUE = @HAVE_QT4_TRUE@
+HAVE_SYS_FILIO_H_FALSE = @HAVE_SYS_FILIO_H_FALSE@
+HAVE_SYS_FILIO_H_TRUE = @HAVE_SYS_FILIO_H_TRUE@
+HAVE_SYS_SYSCTL_H_FALSE = @HAVE_SYS_SYSCTL_H_FALSE@
+HAVE_SYS_SYSCTL_H_TRUE = @HAVE_SYS_SYSCTL_H_TRUE@
+HAVE_XML_FALSE = @HAVE_XML_FALSE@
+HAVE_XML_TRUE = @HAVE_XML_TRUE@
HOWL_COMPAT_VERSION = @HOWL_COMPAT_VERSION@
-INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-LD = @LD@
LDFLAGS = @LDFLAGS@
LIBAVAHI_CLIENT_VERSION_INFO = @LIBAVAHI_CLIENT_VERSION_INFO@
LIBAVAHI_COMMON_VERSION_INFO = @LIBAVAHI_COMMON_VERSION_INFO@
@@ -301,29 +371,18 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MCS = @MCS@
MDASSEMBLER = @MDASSEMBLER@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
MOC_QT3 = @MOC_QT3@
MOC_QT4 = @MOC_QT4@
MONODOCER = @MONODOCER@
MONODOC_CFLAGS = @MONODOC_CFLAGS@
MONODOC_DIR = @MONODOC_DIR@
MONODOC_LIBS = @MONODOC_LIBS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -333,10 +392,6 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -354,20 +409,42 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-USE_NLS = @USE_NLS@
+TARGET_ARCHLINUX_FALSE = @TARGET_ARCHLINUX_FALSE@
+TARGET_ARCHLINUX_TRUE = @TARGET_ARCHLINUX_TRUE@
+TARGET_DARWIN_FALSE = @TARGET_DARWIN_FALSE@
+TARGET_DARWIN_TRUE = @TARGET_DARWIN_TRUE@
+TARGET_DEBIAN_FALSE = @TARGET_DEBIAN_FALSE@
+TARGET_DEBIAN_TRUE = @TARGET_DEBIAN_TRUE@
+TARGET_FEDORA_FALSE = @TARGET_FEDORA_FALSE@
+TARGET_FEDORA_TRUE = @TARGET_FEDORA_TRUE@
+TARGET_FREEBSD_FALSE = @TARGET_FREEBSD_FALSE@
+TARGET_FREEBSD_TRUE = @TARGET_FREEBSD_TRUE@
+TARGET_GENTOO_FALSE = @TARGET_GENTOO_FALSE@
+TARGET_GENTOO_TRUE = @TARGET_GENTOO_TRUE@
+TARGET_LFS_FALSE = @TARGET_LFS_FALSE@
+TARGET_LFS_TRUE = @TARGET_LFS_TRUE@
+TARGET_MANDRIVA_FALSE = @TARGET_MANDRIVA_FALSE@
+TARGET_MANDRIVA_TRUE = @TARGET_MANDRIVA_TRUE@
+TARGET_NETBSD_FALSE = @TARGET_NETBSD_FALSE@
+TARGET_NETBSD_TRUE = @TARGET_NETBSD_TRUE@
+TARGET_SLACKWARE_FALSE = @TARGET_SLACKWARE_FALSE@
+TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@
+TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@
+TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@
+USE_XMLTOMAN_FALSE = @USE_XMLTOMAN_FALSE@
+USE_XMLTOMAN_TRUE = @USE_XMLTOMAN_TRUE@
VERSION = @VERSION@
VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@
-XGETTEXT = @XGETTEXT@
XML_CFLAGS = @XML_CFLAGS@
XML_LIBS = @XML_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_F77 = @ac_ct_F77@
acx_pthread_config = @acx_pthread_config@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -382,7 +459,6 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -404,7 +480,6 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -418,12 +493,8 @@
pythondir = @pythondir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I common
@DX_COND_doc_TRUE@@DX_COND_html_TRUE@DX_CLEAN_HTML = @DX_DOCDIR@/html
@DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHM = @DX_DOCDIR@/chm
@@ -576,7 +647,7 @@
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+ $(MAKE) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -589,6 +660,24 @@
distclean-hdr:
-rm -f config.h stamp-h1
+avahi-client.pc: $(top_builddir)/config.status $(srcdir)/avahi-client.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-compat-howl.pc: $(top_builddir)/config.status $(srcdir)/avahi-compat-howl.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-compat-libdns_sd.pc: $(top_builddir)/config.status $(srcdir)/avahi-compat-libdns_sd.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-core.pc: $(top_builddir)/config.status $(srcdir)/avahi-core.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-glib.pc: $(top_builddir)/config.status $(srcdir)/avahi-glib.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-gobject.pc: $(top_builddir)/config.status $(srcdir)/avahi-gobject.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-qt3.pc: $(top_builddir)/config.status $(srcdir)/avahi-qt3.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-qt4.pc: $(top_builddir)/config.status $(srcdir)/avahi-qt4.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+avahi-ui.pc: $(top_builddir)/config.status $(srcdir)/avahi-ui.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
@@ -597,10 +686,11 @@
-rm -rf .libs _libs
distclean-libtool:
- -rm -f libtool config.lt
+ -rm -f libtool
+uninstall-info-am:
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -647,7 +737,8 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -691,8 +782,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -717,8 +808,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -728,12 +819,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -748,22 +840,24 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
+ mkdir $(distdir)
+ $(mkdir_p) $(distdir)/. $(distdir)/avahi-daemon $(distdir)/common $(distdir)/docs $(distdir)/po
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -777,7 +871,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -785,8 +879,6 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -797,7 +889,7 @@
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -807,10 +899,6 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -837,8 +925,6 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -878,7 +964,7 @@
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -903,7 +989,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -954,20 +1040,12 @@
install-data-am: install-pkgconfigDATA
-install-dvi: install-dvi-recursive
-
install-exec-am:
-install-html: install-html-recursive
-
install-info: install-info-recursive
install-man:
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -988,27 +1066,26 @@
ps-am:
-uninstall-am: uninstall-pkgconfigDATA
+uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
- distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+ check-am clean clean-generic clean-libtool clean-recursive \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+ dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-hdr distclean-libtool \
+ distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkgconfigDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-pkgconfigDATA
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-pkgconfigDATA install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-info-am \
+ uninstall-pkgconfigDATA
@DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps
--- a/configure.ac
+++ b/configure.ac
@@ -1088,6 +1088,15 @@
avahi-autoipd/Makefile
avahi-ui/Makefile
po/Makefile.in
+avahi-client.pc
+avahi-compat-howl.pc
+avahi-compat-libdns_sd.pc
+avahi-core.pc
+avahi-glib.pc
+avahi-gobject.pc
+avahi-qt3.pc
+avahi-qt4.pc
+avahi-ui.pc
])
AC_OUTPUT

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,38 @@
# Copyright (c) 2010 flukso.net
include $(TOPDIR)/rules.mk
PKG_NAME:=button
PKG_VERSION:=1.0
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
define Package/button
SECTION:=utils
CATEGORY:=Utilities
DEPENDS:=
TITLE:=Button
endef
define Package/button/description
Helper bash scripts used as a callback for hotplug button events. net_toggle toggles between ethernet and wifi mode. net_defaults reverts all firewall, network and wireless settings to factory defaults.
endef
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
$(CP) ./src/* $(PKG_BUILD_DIR)/
endef
define Build/Compile
endef
define Package/button/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/net_toggle $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/net_defaults $(1)/usr/sbin/
endef
$(eval $(call BuildPackage,button))

View File

@ -0,0 +1,17 @@
#!/bin/sh
# Copyright (c) 2010 flukso.net
cd /rom/etc/config
cp firewall network wireless /etc/config
logger 'returning to firewall, network and wireless defaults'
gpioctl dirout 4
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
do
gpioctl clear 4
gpioctl set 4
done
/etc/init.d/network restart

View File

@ -0,0 +1,47 @@
#!/bin/sh
# Copyright (c) 2010 flukso.net
to_wifi ()
{
uci set firewall.@zone[1].input=REJECT
uci set network.wan.ifname=ath0
uci set network.lan.ifname=eth0
uci set wireless.wifi0.disabled=0
uci set wireless.@wifi-iface[0].network=wan
uci set wireless.@wifi-iface[0].mode=sta
uci commit
logger 'toggled to wifi mode'
}
to_eth ()
{
uci set firewall.@zone[1].input=ACCEPT
uci set network.wan.ifname=eth0
uci set network.lan.ifname=ath0
uci set wireless.wifi0.disabled=1
uci set wireless.@wifi-iface[0].network=lan
uci set wireless.@wifi-iface[0].mode=ap
uci commit
logger 'toggled to eth mode'
}
MODE=$(uci get network.wan.ifname)
if [ $MODE == eth0 ]
then
to_wifi
elif [ $MODE == ath0 ]
then
to_eth
fi
gpioctl dirout 4
for i in 1 2 3 4 5
do
gpioctl clear 4
gpioctl set 4
done
/etc/init.d/network restart

View File

@ -1,10 +1,11 @@
# Copyright (c) 2008 jokamajo.org
# 2010 flukso.net
# $Id$
include $(TOPDIR)/rules.mk
PKG_NAME:=flukso
PKG_VERSION:=1.0
PKG_VERSION:=1.1
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@ -32,13 +33,11 @@ endef
define Package/flukso/install
$(INSTALL_DIR) $(1)/usr/share/lua/flukso/
$(CP) $(PKG_BUILD_DIR)/flukso.lua $(1)/usr/share/lua/flukso/
$(CP) $(PKG_BUILD_DIR)/data.lua $(1)/usr/share/lua/flukso/
$(CP) $(PKG_BUILD_DIR)/dbg.lua $(1)/usr/share/lua/flukso/
$(CP) $(PKG_BUILD_DIR)/auth.lua $(1)/usr/share/lua/flukso/
$(CP) $(PKG_BUILD_DIR)/heartbeat.lua $(1)/usr/share/lua/flukso/
$(CP) $(PKG_BUILD_DIR)/{flukso,data,dbg,auth,heartbeat,restful}.lua $(1)/usr/share/lua/flukso/
$(INSTALL_DIR) $(1)/etc/init.d/
$(CP) $(PKG_BUILD_DIR)/flukso.init $(1)/etc/init.d/flukso
$(INSTALL_DIR) $(1)/etc/config/
$(CP) $(PKG_BUILD_DIR)/flukso.uci $(1)/etc/config/flukso
endef
$(eval $(call BuildPackage,flukso))

View File

@ -70,7 +70,7 @@ end
function truncate(M, cutoff)
for meter, T in pairs(M) do
local H = timestamps(T)
for i = H[1], H[#H]-60 do
for i = H[1], os.time() - cutoff do
T[i] = nil
end
end
@ -79,8 +79,11 @@ end
function fill(M)
for meter, T in pairs(M) do
local H = timestamps(T)
for i = H[1]+1, H[#H]-1 do
if T[i] == nil then T[i] = T[i-1] end
for i = H[#H]-1, H[1]+1, -1 do
if T[i] == nil or T[i] == '"nan"' then T[i] = T[i+1] end
end
for i = H[#H]+1, os.time() do
T[i] = '"nan"'
end
end
end

View File

@ -5,7 +5,7 @@
START=98
start() {
stty 4800 < /dev/ttyS0
stty 4800 -echo -onlcr < /dev/ttyS0
/usr/share/lua/flukso/flukso.lua >&- 2>&- <&- &
/usr/share/lua/flukso/heartbeat.lua 1 >&- 2>&- <&-
echo -e "$(date '+%M') * * * * /usr/share/lua/flukso/heartbeat.lua 0\n"'*/15 * * * * [ -z "$(ps | grep '\'flukso.lu[a]\'')" ] && reboot' | crontab -

View File

@ -25,72 +25,108 @@
require 'posix'
require 'xmlrpc.http'
data = require 'flukso.data'
auth = require 'flukso.auth'
dbg = require 'flukso.dbg'
local data = require 'flukso.data'
local auth = require 'flukso.auth'
local dbg = require 'flukso.dbg'
local param = {xmlrpcaddress = 'http://logger.flukso.net/xmlrpc',
xmlrpcversion = '1',
xmlrpcmethod = 'logger.measurementAdd',
pwrenable = true,
pwrinterval = 0,
pwrdir = '/tmp/sensor',
device = '/dev/ttyS0',
interval = 300,
dbgenable = false}
local uci = require 'luci.model.uci'.cursor()
local param = uci:get_all('flukso', 'main')
function dispatch(e_child, p_child, device, pwrenable)
function dispatch(e_child, p_child, port, homeEnable, localEnable)
return coroutine.create(function()
-- open the connection to the syslog deamon, specifying our identity
posix.openlog('flukso')
posix.syslog(30, 'starting the flukso deamon')
posix.syslog(30, 'listening for pulses on '..device..'...')
for line in io.lines(device) do
if line:sub(1, 3) == 'pls' and line:len() == 47 and line:find(':') == 37 then -- user data + additional data integrity checks
posix.syslog(30, 'received pulse from '..device..': '..line:sub(5))
-- flash the power led for 50ms
local function flash() -- flash the power led for 50ms
os.execute('gpioctl clear 4 > /dev/null')
socket.select(nil, nil, 0.05)
os.execute('gpioctl set 4 > /dev/null')
end
local meter, value = line:sub(5, 36), tonumber(line:sub(38))
coroutine.resume(e_child, meter, os.time(), value)
-- open the connection to the syslog deamon, specifying our identity
posix.openlog('flukso')
posix.syslog(30, 'starting the flukso deamon')
posix.syslog(30, 'listening for pulses on ' .. port .. '...')
elseif line:sub(1, 3) == 'pwr' and line:len() == 47 and line:find(':') == 37 then -- user data + additional data integrity checks
local meter, value = line:sub(5, 36), tonumber(line:sub(38))
if pwrenable then coroutine.resume(p_child, meter, os.time(), value) end
local pattern = '^(%l+)%s(%x+):(%d+):?(%d*)$'
elseif line:sub(1, 3) == 'msg' then -- control data
posix.syslog(31, 'received message from '..device..': '..line:sub(5))
for line in io.lines(port) do
local command, meter, value, msec = line:match(pattern)
value = tonumber(value or '0')
msec = tonumber(msec or '0')
local length = line:len()
else
posix.syslog(27, 'input error on '..device..': '..line)
if command == 'pls' and (length == 47 or length == 58) then -- user data
flash()
posix.syslog(30, 'received pulse from ' .. port .. ': ' .. line:sub(5))
if homeEnable == 1 then coroutine.resume(e_child, meter, os.time(), value) end
-- pls includes a msec timestamp so report to p_child as well
if length == 58 and localEnable == 1 then
coroutine.resume(p_child, meter, os.time(), value, msec)
end
elseif command == 'pwr' and length == 47 then -- user data
if localEnable == 1 then coroutine.resume(p_child, meter, os.time(), value) end
elseif command == 'msg' then -- control data
posix.syslog(31, 'received message from ' .. port .. ': ' .. line:sub(5))
else -- error
posix.syslog(27, 'input error on ' .. port .. ': ' .. line)
end
end
posix.syslog(30, 'closing down the flukso deamon')
os.exit()
os.exit(1)
end)
end
function buffer(child, interval)
return coroutine.create(function(meter, timestamp, value)
return coroutine.create(function(meter, timestamp, value, msec)
local measurements = data.new()
local threshold = timestamp + interval
local timestamp_prev = {}
local prev = {}
local function diff(x, y) -- calculates y - x
if y >= x then
return y - x
else -- y wrapped around 32-bit boundary
return 4294967296 - x + y
end
end
while true do
if meter ~= nil and timestamp > math.max(1234567890, timestamp_prev[meter] or 0) then
if meter ~= nil then
if not prev[meter] then
prev[meter] = {}
end
if msec then -- we're dealing with a pls xxx:yyy:zzz message so calculate power
-- if msec decreased, just update the value in the table
-- but don't make any calculations since the AVR might have gone through a reset
if prev[meter].msec and msec > prev[meter].msec then
local power = math.floor(diff(prev[meter].value, value) / diff(prev[meter].msec, msec) * 3.6 * 10^6 + 0.5)
prev[meter].value = value
value = power
else
prev[meter].value = value
value = nil
end
prev[meter].msec = msec
end
if timestamp > 1234567890 and timestamp > (prev[meter].timestamp or 0) and value then
measurements:add(meter, timestamp, value)
end
end
if timestamp > threshold and next(measurements) then --checking whether table is not empty
coroutine.resume(child, measurements)
threshold = timestamp + interval
timestamp_prev[meter] = timestamp
prev[meter].timestamp = timestamp
end
meter, timestamp, value = coroutine.yield()
meter, timestamp, value, msec = coroutine.yield()
end
end)
end
@ -105,7 +141,8 @@ function filter(child, span, offset)
end)
end
function send(child, address, version, method)
function send(child, home, version, method)
local url = 'http://' .. home .. '/xmlrpc/' .. version
return coroutine.create(function(measurements)
while true do
local auth = auth.new()
@ -113,7 +150,7 @@ function send(child, address, version, method)
auth:hmac(measurements)
local status, ret_or_err, res = pcall(xmlrpc.http.call,
address..'/'..version,
url,
method,
auth,
measurements)
@ -124,7 +161,7 @@ function send(child, address, version, method)
measurements:clear()
end
else
posix.syslog(27, tostring(ret_or_err)..' '..address..' '..tostring(res))
posix.syslog(27, tostring(ret_or_err) .. ' ' .. home .. ' ' .. tostring(res))
end
coroutine.resume(child, measurements)
measurements = coroutine.yield()
@ -155,13 +192,13 @@ function polish(child, cutoff)
end)
end
function publish(child, dir)
function publish(child, path)
return coroutine.create(function(measurements)
os.execute('mkdir -p ' .. dir .. ' > /dev/null')
os.execute('mkdir -p ' .. path .. ' > /dev/null')
while true do
local measurements_json = measurements:json_encode()
for meter, json in pairs(measurements_json) do
io.output(dir .. '/' .. meter)
io.output(path .. '/' .. meter)
io.write(json)
io.close()
end
@ -171,10 +208,10 @@ function publish(child, dir)
end)
end
function debug(child, dbgenable)
function debug(child, debug)
return coroutine.create(function(measurements)
while true do
if dbgenable then dbg.vardump(measurements) end
if debug == 1 then dbg.vardump(measurements) end
if child then coroutine.resume(child, measurements) end
measurements = coroutine.yield()
end
@ -194,22 +231,22 @@ local e_chain = buffer(
filter(
send(
gc(
debug(nil, param.dbgenable)
debug(nil, tonumber(param.debug) or 0)
)
, param.xmlrpcaddress, param.xmlrpcversion, param.xmlrpcmethod)
, param.home, param.homeVersion, 'logger.measurementAdd')
, 86400, 172800)
, 900, 7200)
, 60, 0)
, param.interval)
, tonumber(param.homeInterval) or 300)
local p_chain = buffer(
polish(
publish(
debug(nil, param.dbgenable)
, param.pwrdir)
debug(nil, tonumber(param.debug) or 0)
, param.localDir or '/tmp/sensor')
, 60)
, param.pwrinterval)
, tonumber(param.localInterval) or 0)
local chain = dispatch(e_chain, p_chain, param.device, param.pwrenable)
local chain = dispatch(e_chain, p_chain, param.port or '/dev/ttyS0', tonumber(param.homeEnable) or 1, tonumber(param.localEnable) or 1)
coroutine.resume(chain)

View File

@ -0,0 +1,40 @@
config flukso main
option port /dev/ttyS0
option home logger.flukso.net
option homeVersion 1
option homeInterval 300
option homeEnable 1
option localDir /tmp/sensor
option localVersion 1.0
option localInterval 0
option localEnable 1
option debug 0
### sensor config options
# config sensor <1..6>
# option id <uuid>
# option input <analog|pulse>
# list port <1..6>
# option constant [<meterconstant>]
# option voltage [<volts>]
# option current [<amps>]
config sensor 1
option id 0123456789abcdef0123456789abcde0
option input analog
list port 1
option voltage 230
option current 50
config sensor 2
option id 0123456789abcdef0123456789abcde1
option input analog
list port 2
option voltage 230
option current 50
config sensor 3
option id 0123456789abcdef0123456789abcde2
option input pulse
list port 3
option constant 1

View File

@ -29,15 +29,11 @@ else
require 'xmlrpc.http'
require 'luci.sys'
auth = require 'flukso.auth'
dbg = require 'flukso.dbg'
-- config parameters
local param = {server = 'logger.flukso.net',
xmlrpcaddress = 'http://logger.flukso.net/xmlrpc',
xmlrpcversion = '1',
xmlrpcmethod = 'logger.heartbeat'}
local auth = require 'flukso.auth'
local dbg = require 'flukso.dbg'
local uci = require 'luci.model.uci'.cursor()
local param = uci:get_all('flukso', 'main')
local monitor = {reset = tonumber(arg[1])}
-- open the connection to the syslog deamon, specifying our identity
@ -58,9 +54,11 @@ else
dbg.vardump(monitor)
-- send a heartbeat method call
local url = 'http://' .. param.home .. '/xmlrpc/' .. param.homeVersion
local pcall_ok, return_or_err, pong = pcall(xmlrpc.http.call,
param.xmlrpcaddress..'/'..param.xmlrpcversion,
param.xmlrpcmethod,
url,
'logger.heartbeat',
auth,
monitor)
@ -76,7 +74,7 @@ else
if tonumber(pong.upgrade) == monitor.version then --reset device
os.execute('reboot')
elseif tonumber(pong.upgrade) > monitor.version then -- upgrade device to specified version
os.execute('wget -P /tmp http://'..param.server..'/files/upgrade/upgrade.'..pong.upgrade)
os.execute('wget -P /tmp http://'.. param.home ..'/files/upgrade/upgrade.'..pong.upgrade)
os.execute('chmod a+x /tmp/upgrade.'..pong.upgrade)
os.execute('/tmp/upgrade.'..pong.upgrade)
os.execute('rm /tmp/upgrade.'..pong.upgrade)

View File

@ -0,0 +1,68 @@
#!/usr/bin/env lua
--[[
restful.lua - CGI script providing a local RESTful API on the Fluksometer.
Copyright (c) 2010 Bart Van Der Meerssche <bart.vandermeerssche@flukso.net>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
]]--
--- Decode a URL's query string
-- @param QS the to-be-decoded query string (optional)
-- @return table containing [name] = value pairs
local function query_decode(QS)
local param = {}
for name, value in (QS or os.getenv("QUERY_STRING")):gmatch("([^&=]+)=([^&=]+)") do
param[name] = value
end
return param
end
--- Fetch the sensor id in the HTTP request.
-- @return sensor id
local function sensor_id()
return os.getenv("SCRIPT_NAME"):match("/sensor/([%x]+)")
end
local param = query_decode()
local path = "/tmp/sensor/"
local version = "1.0"
-- Hardcoding path and version parameters lowers GET response time from 200ms to 90ms.
-- local uci = require "luci.model.uci".cursor()
-- local path = uci:get("flukso", "main", "localDir") .. "/"
-- local version = uci:get("flukso", "main", "localVersion")
if param.interval == "minute" and param.unit == "watt" and param.version == version then
local pre, post = "", ""
if param.jsonp_callback then
pre, post = param.jsonp_callback .. "(", ")"
end
io.input(path .. sensor_id())
io.write("Content-Type: application/json", "\n\n")
io.write(pre, io.read("*all"), post)
else
io.write("status: 400 Bad Request", "\n\n")
io.write("Malformed query string: interval, unit and version query parameters are required.")
end

View File

@ -0,0 +1,62 @@
10
dir
23175
svn://svn.openwrt.org/openwrt/packages/libs/gdbm
svn://svn.openwrt.org/openwrt
2010-09-07T10:04:42.376593Z
22967
mb
3c298f89-4303-0410-b956-a3cf2f4a3e73
Makefile
file
2010-09-20T10:21:42.949435Z
d0da7a248f1fcfd4267cb9a186117fcd
2010-09-07T10:04:42.376593Z
22967
mb
has-props
1196

View File

@ -0,0 +1,13 @@
K 9
copyright
V 30
Copyright (C) 2006 OpenWrt.org
K 7
licence
V 5
GPLv2
K 13
svn:eol-style
V 6
native
END

View File

@ -0,0 +1,56 @@
#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=gdbm
PKG_VERSION:=1.8.3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/gdbm
PKG_MD5SUM:=1d1b1d5c0245b1c00aff92da751e9aa1
PKG_FIXUP:=libtool
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/libgdbm
SECTION:=libs
CATEGORY:=Libraries
TITLE:=GNU database manager
URL:=http://www.gnu.org/software/gdbm/
endef
TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \
--enable-shared \
--enable-static \
define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
BINOWN=`id -u` \
BINGRP=`id -g` \
INSTALL_ROOT="$(PKG_INSTALL_DIR)" \
all install
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(1)/usr/lib/
endef
define Package/libgdbm/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libgdbm))

View File

@ -0,0 +1,56 @@
#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=gdbm
PKG_VERSION:=1.8.3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@GNU/gdbm
PKG_MD5SUM:=1d1b1d5c0245b1c00aff92da751e9aa1
PKG_FIXUP:=libtool
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/libgdbm
SECTION:=libs
CATEGORY:=Libraries
TITLE:=GNU database manager
URL:=http://www.gnu.org/software/gdbm/
endef
TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \
--enable-shared \
--enable-static \
define Build/Compile
$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
BINOWN=`id -u` \
BINGRP=`id -g` \
INSTALL_ROOT="$(PKG_INSTALL_DIR)" \
all install
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(1)/usr/lib/
endef
define Package/libgdbm/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libgdbm))

View File

@ -0,0 +1,62 @@
10
dir
23175
svn://svn.openwrt.org/openwrt/packages/libs/intltool
svn://svn.openwrt.org/openwrt
2009-09-02T22:39:37.037000Z
17487
nbd
3c298f89-4303-0410-b956-a3cf2f4a3e73
Makefile
file
2010-07-24T18:00:01.908389Z
9c7ebffb0a121ebb11dd06ac4ed58b63
2009-09-02T22:39:37.037000Z
17487
nbd
932

View File

@ -0,0 +1,38 @@
#
# Copyright (C) 2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=intltool
PKG_LIBVER:=0.40
PKG_VERSION:=$(PKG_LIBVER).6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@GNOME/intltool/$(PKG_LIBVER)
PKG_MD5SUM:=69bc0353323112f42ad4f9cf351bc3e5
PKG_HOST_ONLY:=1
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
define Package/intltool
SECTION:=libs
CATEGORY:=Libraries
TITLE:=set of tools to centralize translation using GNU gettext
URL:=http://www.freedesktop.org/wiki/Software/intltool
BUILDONLY:=1
endef
define Package/intltool/description
intltool is a set of tools to centralize translation of many different
file formats using GNU gettext-compatible PO files.
endef
$(eval $(call BuildPackage,intltool))
$(eval $(call HostBuild))

View File

@ -0,0 +1,38 @@
#
# Copyright (C) 2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=intltool
PKG_LIBVER:=0.40
PKG_VERSION:=$(PKG_LIBVER).6
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@GNOME/intltool/$(PKG_LIBVER)
PKG_MD5SUM:=69bc0353323112f42ad4f9cf351bc3e5
PKG_HOST_ONLY:=1
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
define Package/intltool
SECTION:=libs
CATEGORY:=Libraries
TITLE:=set of tools to centralize translation using GNU gettext
URL:=http://www.freedesktop.org/wiki/Software/intltool
BUILDONLY:=1
endef
define Package/intltool/description
intltool is a set of tools to centralize translation of many different
file formats using GNU gettext-compatible PO files.
endef
$(eval $(call BuildPackage,intltool))
$(eval $(call HostBuild))

View File

@ -0,0 +1,62 @@
10
dir
23175
svn://svn.openwrt.org/openwrt/packages/libs/libdaemon
svn://svn.openwrt.org/openwrt
2010-02-19T00:14:01.403483Z
19714
lars
3c298f89-4303-0410-b956-a3cf2f4a3e73
Makefile
file
2010-07-24T18:00:01.296389Z
5f6d7f184f93f891e8ba2df99cd102ec
2010-02-19T00:14:01.403483Z
19714
lars
has-props
2051

View File

@ -0,0 +1,13 @@
K 9
copyright
V 30
Copyright (C) 2006 OpenWrt.org
K 7
licence
V 5
GPLv2
K 13
svn:eol-style
V 6
native
END

View File

@ -0,0 +1,68 @@
#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=libdaemon
PKG_VERSION:=0.14
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://0pointer.de/lennart/projects/libdaemon/
PKG_MD5SUM:=509dc27107c21bcd9fbf2f95f5669563
PKG_FIXUP:=libtool
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/libdaemon
SECTION:=libs
CATEGORY:=Libraries
TITLE:=A lightweight C library that eases the writing of UNIX daemons
URL:=http://0pointer.de/lennart/projects/libdaemon/
endef
define Package/libdaemon/description
libdaemon is a lightweight C library that eases the writing of UNIX daemons.
It consists of the following parts:
- A wrapper around fork() which does the correct daemonization procedure of a process
- A wrapper around syslog() for simpler and compatible log output to Syslog or STDERR
- An API for writing PID files
- An API for serializing UNIX signals into a pipe for usage with select() or poll()
- An API for running subprocesses with STDOUT and STDERR redirected to syslog
APIs like these are used in most daemon software available. It is not that
simple to get it done right and code duplication is not a goal.
endef
define Build/Configure
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \
--disable-lynx \
)
endef
TARGET_CFLAGS += $(FPIC)
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/libdaemon $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.a $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdaemon.pc $(1)/usr/lib/pkgconfig/
endef
define Package/libdaemon/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libdaemon))

View File

@ -0,0 +1,68 @@
#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=libdaemon
PKG_VERSION:=0.14
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://0pointer.de/lennart/projects/libdaemon/
PKG_MD5SUM:=509dc27107c21bcd9fbf2f95f5669563
PKG_FIXUP:=libtool
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
define Package/libdaemon
SECTION:=libs
CATEGORY:=Libraries
TITLE:=A lightweight C library that eases the writing of UNIX daemons
URL:=http://0pointer.de/lennart/projects/libdaemon/
endef
define Package/libdaemon/description
libdaemon is a lightweight C library that eases the writing of UNIX daemons.
It consists of the following parts:
- A wrapper around fork() which does the correct daemonization procedure of a process
- A wrapper around syslog() for simpler and compatible log output to Syslog or STDERR
- An API for writing PID files
- An API for serializing UNIX signals into a pipe for usage with select() or poll()
- An API for running subprocesses with STDOUT and STDERR redirected to syslog
APIs like these are used in most daemon software available. It is not that
simple to get it done right and code duplication is not a goal.
endef
define Build/Configure
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \
--disable-lynx \
)
endef
TARGET_CFLAGS += $(FPIC)
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/libdaemon $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.a $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdaemon.pc $(1)/usr/lib/pkgconfig/
endef
define Package/libdaemon/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libdaemon))

View File

@ -40,13 +40,13 @@ endef
define Build/Compile
cd $(PKG_BUILD_DIR)/ && \
$(TARGET_CROSS)gcc -shared -o luaexpat.so src/lxplib.c -Wall -fPIC \
$(TARGET_CROSS)gcc -shared -o luaexpat.so src/lxplib.c -Wall -fPIC --std=c99 \
$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) \
$(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(STAGING_DIR)/usr/include \
-lexpat -llua -lm -ldl &&\
$(TARGET_CROSS)strip luaexpat.so &&\
$(TARGET_CROSS)gcc -c src/lxplib.c -Wall \
$(TARGET_CROSS)gcc -c src/lxplib.c -Wall --std=c99 \
$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) \
$(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(STAGING_DIR)/usr/include &&\

View File

@ -0,0 +1,62 @@
10
dir
23099
svn://svn.openwrt.org/openwrt/packages/lang/luasocket
svn://svn.openwrt.org/openwrt
2010-01-16T07:31:48.653263Z
19165
cshore
3c298f89-4303-0410-b956-a3cf2f4a3e73
Makefile
file
2010-07-24T17:59:55.636389Z
b55d5b7ed4e40bacfc351c24d0e0895d
2010-01-16T07:31:48.653263Z
19165
cshore
1634

View File

@ -0,0 +1,59 @@
#
# Copyright (C) 2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=luasocket
PKG_VERSION:=2.0.2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2664
PKG_MD5SUM:=41445b138deb7bcfe97bff957503da8e
include $(INCLUDE_DIR)/package.mk
define Package/luasocket
SUBMENU:=Lua
SECTION:=lang
CATEGORY:=Languages
TITLE:=LuaSocket
URL:=http://luasocket.luaforge.net/
DEPENDS:=+lua
endef
define Package/luasocket/description
LuaSocket is the most comprehensive networking support
library for the Lua language. It provides easy access to
TCP, UDP, DNS, SMTP, FTP, HTTP, MIME and much more.
endef
define Build/Configure
endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)/ \
LIBDIR="$(TARGET_LDFLAGS)" \
CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \
LD="$(TARGET_CROSS)ld -shared" \
all
endef
define Package/luasocket/install
$(INSTALL_DIR) $(1)/usr/lib/lua
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ltn12,mime,socket}.lua $(1)/usr/lib/lua
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mime.so.1.0.2 $(1)/usr/lib/lua
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket.so.2.0.2 $(1)/usr/lib/lua
$(INSTALL_DIR) $(1)/usr/lib/lua/mime
ln -sf ../mime.so.1.0.2 $(1)/usr/lib/lua/mime/core.so
$(INSTALL_DIR) $(1)/usr/lib/lua/socket
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ftp,http,smtp,tp,url}.lua $(1)/usr/lib/lua/socket
ln -sf ../socket.so.2.0.2 $(1)/usr/lib/lua/socket/core.so
endef
$(eval $(call BuildPackage,luasocket))

View File

@ -1,184 +1,59 @@
#
# Copyright (C) 2006 OpenWrt.org
# Copyright (C) 2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# $Id: Makefile 6994 2007-04-18 00:46:40Z nico $
include $(TOPDIR)/rules.mk
PKG_NAME:=luasocket
PKG_VERSION:=2.0.2
PKG_VERSION_MAJOR:=$(shell echo $(PKG_VERSION) | cut -d . -f 1)
PKG_RELEASE:=1
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2664/
PKG_SOURCE_URL:=http://luaforge.net/frs/download.php/2664
PKG_MD5SUM:=41445b138deb7bcfe97bff957503da8e
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk
define Package/liblua-socket
define Package/luasocket
SUBMENU:=Lua
SECTION:=lang
SUBMENU:=LUA
CATEGORY:=Languages
DEPENDS:=+liblua
TITLE:=LuaSocket
URL:=http://luasocket.luaforge.net/
TITLE:=TCP/UDP socket library for LUA programming language
DEPENDS:=+lua
endef
define Package/liblua-socket/description
Luasocket provides a TCP/UDP socket library for Lua 5.1. Also provided are HTTP and SMTP implementations, a simple FTP implementation and some URL parsing functions. Luasocket supports blocking and non-blocking sockets and also provides a select() interface to the language.
define Package/luasocket/description
LuaSocket is the most comprehensive networking support
library for the Lua language. It provides easy access to
TCP, UDP, DNS, SMTP, FTP, HTTP, MIME and much more.
endef
define Build/Configure
endef
# omitted static libraries
define Build/Compile
cd $(PKG_BUILD_DIR)/ && \
$(TARGET_CROSS)gcc -shared -o src/socket.so \
src/luasocket.c \
src/timeout.c \
src/buffer.c \
src/io.c \
src/auxiliar.c \
src/options.c \
src/inet.c \
src/tcp.c \
src/udp.c \
src/except.c \
src/select.c \
src/usocket.c -Wall -fPIC \
$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) \
$(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(STAGING_DIR)/usr/include \
-llua -lm -ldl &&\
$(TARGET_CROSS)strip src/socket.so &&\
$(TARGET_CROSS)gcc -shared -o src/mime.so \
src/mime.c -Wall -fPIC \
$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) \
$(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(STAGING_DIR)/usr/include \
-llua -lm -ldl &&\
$(TARGET_CROSS)strip src/mime.so &&\
$(TARGET_CROSS)gcc -shared -o src/unix.so \
src/buffer.c \
src/auxiliar.c \
src/options.c \
src/timeout.c \
src/io.c \
src/usocket.c \
src/unix.c -Wall -fPIC \
$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) \
$(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-I$(STAGING_DIR)/usr/include \
-llua -lm -ldl &&\
$(TARGET_CROSS)strip src/unix.so
$(MAKE) -C $(PKG_BUILD_DIR)/ \
LIBDIR="$(TARGET_LDFLAGS)" \
CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -std=gnu99" \
LD="$(TARGET_CROSS)ld -shared" \
all
endef
# omitted static libraries
define Build/InstallDev
mkdir -p $(STAGING_DIR)/usr/include/lua
mkdir -p $(STAGING_DIR)/usr/lib/lua/mime
mkdir -p $(STAGING_DIR)/usr/lib/lua/socket
mkdir -p $(STAGING_DIR)/usr/share/lua/socket
$(CP) $(PKG_BUILD_DIR)/src/ltn12.lua $(STAGING_DIR)/usr/share/lua/
$(CP) $(PKG_BUILD_DIR)/src/mime.lua $(STAGING_DIR)/usr/share/lua/
$(CP) $(PKG_BUILD_DIR)/src/socket.lua $(STAGING_DIR)/usr/share/lua/
$(CP) $(PKG_BUILD_DIR)/src/ftp.lua $(STAGING_DIR)/usr/share/lua/socket/
$(CP) $(PKG_BUILD_DIR)/src/http.lua $(STAGING_DIR)/usr/share/lua/socket/
$(CP) $(PKG_BUILD_DIR)/src/smtp.lua $(STAGING_DIR)/usr/share/lua/socket/
$(CP) $(PKG_BUILD_DIR)/src/tp.lua $(STAGING_DIR)/usr/share/lua/socket/
$(CP) $(PKG_BUILD_DIR)/src/url.lua $(STAGING_DIR)/usr/share/lua/socket/
$(CP) $(PKG_BUILD_DIR)/src/socket.h $(STAGING_DIR)/usr/include/lua
$(CP) $(PKG_BUILD_DIR)/src/socket.so \
$(STAGING_DIR)/usr/lib/liblua-socket.so.$(PKG_VERSION)
cd $(STAGING_DIR)/usr/lib/ && \
ln -fs liblua-socket.so.$(PKG_VERSION) liblua-socket.so
cd $(STAGING_DIR)/usr/lib/ && \
ln -fs liblua-socket.so.$(PKG_VERSION) liblua-socket.so.$(PKG_VERSION_MAJOR)
cd $(STAGING_DIR)/usr/lib/lua/socket && \
ln -fs ../../liblua-socket.so.$(PKG_VERSION) core.so
$(CP) $(PKG_BUILD_DIR)/src/mime.h $(STAGING_DIR)/usr/include/lua
$(CP) $(PKG_BUILD_DIR)/src/mime.so \
$(STAGING_DIR)/usr/lib/liblua-socket-mime.so.$(PKG_VERSION)
cd $(STAGING_DIR)/usr/lib/ && \
ln -fs liblua-socket-mime.so.$(PKG_VERSION) liblua-socket-mime.so
cd $(STAGING_DIR)/usr/lib/ && \
ln -fs liblua-socket-mime.so.$(PKG_VERSION) liblua-socket-mime.so.$(PKG_VERSION_MAJOR)
cd $(STAGING_DIR)/usr/lib/lua/mime && \
ln -fs ../../liblua-socket-mime.so.$(PKG_VERSION) core.so
$(CP) $(PKG_BUILD_DIR)/src/unix.h $(STAGING_DIR)/usr/include/lua
$(CP) $(PKG_BUILD_DIR)/src/unix.so \
$(STAGING_DIR)/usr/lib/liblua-socket-unix.so.$(PKG_VERSION)
cd $(STAGING_DIR)/usr/lib/ && \
ln -fs liblua-socket-unix.so.$(PKG_VERSION) liblua-socket-unix.so
cd $(STAGING_DIR)/usr/lib/ && \
ln -fs liblua-socket-unix.so.$(PKG_VERSION) liblua-socket-unix.so.$(PKG_VERSION_MAJOR)
cd $(STAGING_DIR)/usr/lib/lua/socket && \
ln -fs ../../liblua-socket-unix.so.$(PKG_VERSION) unix.so
endef
define Build/UninstallDev
$(RM) -f $(STAGING_DIR)/usr/share/lua/ltn12.lua
$(RM) -f $(STAGING_DIR)/usr/share/lua/mime.lua
$(RM) -f $(STAGING_DIR)/usr/share/lua/socket.lua
$(RM) -f $(STAGING_DIR)/usr/share/lua/socket/ftp.lua
$(RM) -f $(STAGING_DIR)/usr/share/lua/socket/http.lua
$(RM) -f $(STAGING_DIR)/usr/share/lua/socket/smtp.lua
$(RM) -f $(STAGING_DIR)/usr/share/lua/socket/tp.lua
$(RM) -f $(STAGING_DIR)/usr/share/lua/socket/url.lua
$(RM) -f $(STAGING_DIR)/usr/include/lua/socket.h
$(RM) -f $(STAGING_DIR)/usr/lib/liblua-socket.so.$(PKG_VERSION)
$(RM) -f $(STAGING_DIR)/usr/lib/liblua-socket.so.$(PKG_VERSION_MAJOR)
$(RM) -f $(STAGING_DIR)/usr/lib/lua/socket/core.so
$(RM) -f $(STAGING_DIR)/usr/include/lua/mime.h
$(RM) -f $(STAGING_DIR)/usr/lib/liblua-socket-mime.so.$(PKG_VERSION)
$(RM) -f $(STAGING_DIR)/usr/lib/liblua-socket-mime.so.$(PKG_VERSION_MAJOR)
$(RM) -f $(STAGING_DIR)/usr/lib/lua/mime/core.so
$(RM) -f $(STAGING_DIR)/usr/include/lua/unix.h
$(RM) -f $(STAGING_DIR)/usr/lib/liblua-socket-unix.so.$(PKG_VERSION)
$(RM) -f $(STAGING_DIR)/usr/lib/liblua-socket-unix.so.$(PKG_VERSION_MAJOR)
$(RM) -f $(STAGING_DIR)/usr/lib/lua/socket/unix.so
endef
define Package/liblua-socket/install
define Package/luasocket/install
$(INSTALL_DIR) $(1)/usr/lib/lua
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ltn12,mime,socket}.lua $(1)/usr/lib/lua
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mime.so.1.0.2 $(1)/usr/lib/lua
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket.so.2.0.2 $(1)/usr/lib/lua
$(INSTALL_DIR) $(1)/usr/lib/lua/mime
ln -sf ../mime.so.1.0.2 $(1)/usr/lib/lua/mime/core.so
$(INSTALL_DIR) $(1)/usr/lib/lua/socket
$(INSTALL_DIR) $(1)/usr/share/lua/socket
$(CP) $(PKG_BUILD_DIR)/src/ltn12.lua $(1)/usr/share/lua/
$(CP) $(PKG_BUILD_DIR)/src/mime.lua $(1)/usr/share/lua/
$(CP) $(PKG_BUILD_DIR)/src/socket.lua $(1)/usr/share/lua/
$(CP) $(PKG_BUILD_DIR)/src/ftp.lua $(1)/usr/share/lua/socket/
$(CP) $(PKG_BUILD_DIR)/src/http.lua $(1)/usr/share/lua/socket/
$(CP) $(PKG_BUILD_DIR)/src/smtp.lua $(1)/usr/share/lua/socket/
$(CP) $(PKG_BUILD_DIR)/src/tp.lua $(1)/usr/share/lua/socket/
$(CP) $(PKG_BUILD_DIR)/src/url.lua $(1)/usr/share/lua/socket/
$(CP) $(PKG_BUILD_DIR)/src/socket.so \
$(1)/usr/lib/liblua-socket.so.$(PKG_VERSION)
cd $(1)/usr/lib/ && \
ln -fs liblua-socket.so.$(PKG_VERSION) liblua-socket.so
cd $(1)/usr/lib/lua/socket && \
ln -fs ../../liblua-socket.so.$(PKG_VERSION) core.so
$(CP) $(PKG_BUILD_DIR)/src/mime.so \
$(1)/usr/lib/liblua-socket-mime.so.$(PKG_VERSION)
cd $(1)/usr/lib/ && \
ln -fs liblua-socket-mime.so.$(PKG_VERSION) liblua-socket-mime.so
cd $(1)/usr/lib/lua/mime && \
ln -fs ../../liblua-socket-mime.so.$(PKG_VERSION) core.so
$(CP) $(PKG_BUILD_DIR)/src/unix.so \
$(1)/usr/lib/liblua-socket-unix.so.$(PKG_VERSION)
cd $(1)/usr/lib/ && \
ln -fs liblua-socket-unix.so.$(PKG_VERSION) liblua-socket-unix.so
cd $(1)/usr/lib/lua/socket && \
ln -fs ../../liblua-socket-unix.so.$(PKG_VERSION) unix.so
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ftp,http,smtp,tp,url}.lua $(1)/usr/lib/lua/socket
ln -sf ../socket.so.2.0.2 $(1)/usr/lib/lua/socket/core.so
endef
$(eval $(call BuildPackage,liblua-socket))
$(eval $(call BuildPackage,luasocket))

View File

@ -1,14 +0,0 @@
diff -urNad trunk~/src/luasocket.c trunk/src/luasocket.c
--- trunk~/src/luasocket.c 2006-04-27 05:23:22.000000000 +0200
+++ trunk/src/luasocket.c 2007-08-12 23:57:43.000000000 +0200
@@ -20,10 +20,6 @@
#include "lua.h"
#include "lauxlib.h"
-#if !defined(LUA_VERSION_NUM) || (LUA_VERSION_NUM < 501)
-#include "compat-5.1.h"
-#endif
-
/*=========================================================================*\
* LuaSocket includes
\*=========================================================================*/

View File

@ -29,7 +29,7 @@ define Build/Configure
endef
define Build/Compile
$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -shared -fpic -pedantic -Wall \
$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -shared -fpic -pedantic -Wall -std=c99 \
-I$(STAGING_DIR)/usr/include \
-DXYSSL=9 \
-o $(PKG_BUILD_DIR)/lxyssl.so -lxyssl $(PKG_BUILD_DIR)/lxyssl.c

View File

@ -0,0 +1,59 @@
K 25
svn:wc:ra_dav:version-url
V 37
/!svn/ver/6189/luci/branches/luci-0.9
END
NOTICE
K 25
svn:wc:ra_dav:version-url
V 44
/!svn/ver/4830/luci/branches/luci-0.9/NOTICE
END
LICENSE
K 25
svn:wc:ra_dav:version-url
V 45
/!svn/ver/4830/luci/branches/luci-0.9/LICENSE
END
THANKYOU
K 25
svn:wc:ra_dav:version-url
V 46
/!svn/ver/4830/luci/branches/luci-0.9/THANKYOU
END
.project
K 25
svn:wc:ra_dav:version-url
V 46
/!svn/ver/4830/luci/branches/luci-0.9/.project
END
.gitignore
K 25
svn:wc:ra_dav:version-url
V 48
/!svn/ver/4830/luci/branches/luci-0.9/.gitignore
END
INSTALL
K 25
svn:wc:ra_dav:version-url
V 45
/!svn/ver/4830/luci/branches/luci-0.9/INSTALL
END
.cproject
K 25
svn:wc:ra_dav:version-url
V 47
/!svn/ver/4830/luci/branches/luci-0.9/.cproject
END
.buildpath
K 25
svn:wc:ra_dav:version-url
V 48
/!svn/ver/4830/luci/branches/luci-0.9/.buildpath
END
Makefile
K 25
svn:wc:ra_dav:version-url
V 46
/!svn/ver/6029/luci/branches/luci-0.9/Makefile
END

View File

@ -0,0 +1,6 @@
K 13
svn:mergeinfo
V 275
/luci/branches/luci-0.8:4367-4369
/luci/trunk:4843-4844,4848-4850,4852,4856-4859,4870-4876,4880-4881,4886-4890,4941-4944,4950,4958-4959,5007-5013,5022-5023,5028-5118,5130-5143,5145-5153,5155-5161,5177-5182,5184-5189,5193-5194,5198,5315-5316,5730-5731,5769,5902-5903,6024-6025
END

View File

@ -0,0 +1,358 @@
10
dir
6253
http://svn.luci.subsignal.org/luci/branches/luci-0.9
http://svn.luci.subsignal.org
2010-05-30T23:48:02.464313Z
6189
jow
has-props
ab181a69-ba2e-0410-a84d-ff88ab4c47bc
i18n
dir
NOTICE
file
2010-09-19T09:58:19.880068Z
d7751281978bfe53ce334bda24f92095
2009-02-22T23:19:25.382122Z
4268
Cyrus
364
LICENSE
file
2010-09-19T09:58:19.880068Z
2b42edef8fa55315f34f2370b4715ca9
2008-03-02T21:52:58.398634Z
1586
jow
has-props
11356
.project
file
2010-09-19T09:58:19.880068Z
bed96ce6cf0a5dd19ed3bf1f0b812376
2008-11-19T23:02:36.813498Z
3797
Cyrus
has-props
2292
themes
dir
applications
dir
.cproject
file
2010-09-19T09:58:19.880068Z
c42c7758338995b3bedfb8ab222a1a19
2008-11-20T19:22:05.238019Z
3799
Cyrus
11423
libs
dir
.buildpath
file
2010-09-19T09:58:19.880068Z
1e802a07f95960102cb049d015b48aa4
2008-03-02T21:52:58.398634Z
1586
jow
has-props
191
build
dir
contrib
dir
THANKYOU
file
2010-09-19T09:58:19.880068Z
6d80d7a21d10ea211b80cdd378bfc5f0
2008-10-27T15:19:58.537222Z
3634
jow
641
.gitignore
file
2010-09-19T09:58:19.880068Z
6743ff8fc94f58928fb29d7847b8eba2
2008-07-29T21:16:12.332664Z
2695
Cyrus
33
INSTALL
file
2010-09-19T09:58:19.880068Z
f7a20042d051414335a4cd1f00f5902b
2009-01-02T21:42:49.231244Z
3988
Cyrus
670
modules
dir
Makefile
file
2010-09-19T09:58:19.884072Z
0a644040381e3cc5de7da4089e2f4c7d
2010-04-05T17:46:20.798880Z
6029
jow
has-props
2432
po
dir

View File

@ -0,0 +1,5 @@
K 12
svn:keywords
V 2
Id
END

View File

@ -0,0 +1,5 @@
K 12
svn:keywords
V 2
Id
END

View File

@ -0,0 +1,5 @@
K 12
svn:keywords
V 2
Id
END

View File

@ -0,0 +1,6 @@
K 13
svn:mergeinfo
V 298
/luci/branches/luci-0.8/Makefile:4367-4369
/luci/trunk/Makefile:4835,4843-4844,4848-4850,4852,4856-4859,4870-4876,4880-4881,4886-4890,4941-4944,4950,4958-4959,5007-5013,5022-5023,5028-5118,5130-5143,5145-5153,5155-5161,5177-5182,5184-5189,5193-5194,5198,5315-5316,5730-5731,5769,5902-5903,6024-6025
END

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<buildpath>
<buildpathentry kind="src" path="src"/>
<buildpathentry kind="con" path="org.eclipse.dltk.launching.INTERPRETER_CONTAINER"/>
</buildpath>

View File

@ -0,0 +1,221 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?>
<cproject>
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1510318341">
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="luci" buildProperties="" description="" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1510318341" name="Preference Configuration" parent="org.eclipse.cdt.build.core.prefbase.cfg">
<folderInfo id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1510318341." name="/" resourcePath="">
<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.407447051" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.407447051.1470931541" name=""/>
<builder id="org.eclipse.cdt.build.core.settings.default.builder.823611263" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1685234798" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.570824141" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.491129717" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="/usr/include/lua5.1"/>
<listOptionValue builtIn="false" value="/usr/include"/>
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.858094059" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.344617955" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.564526987" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="/usr/include/lua5.1"/>
<listOptionValue builtIn="false" value="/usr/include"/>
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1426860237" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.869454750" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.838425449" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
<listOptionValue builtIn="false" value="/usr/include/lua5.1"/>
<listOptionValue builtIn="false" value="/usr/include"/>
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1755775295" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
</toolChain>
</folderInfo>
</configuration>
</storageModule>
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1510318341" moduleId="org.eclipse.cdt.core.settings" name="Preference Configuration">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="makefileGenerator">
<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<scannerConfigBuildInfo instanceId="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1510318341">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="makefileGenerator">
<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
</scannerConfigBuildInfo>
</storageModule>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="luci.null.949486034" name="luci"/>
</storageModule>
</cproject>

View File

@ -0,0 +1,6 @@
dist/
/host
*.o
*.so
*.swp
/docs

View File

@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>luci</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
<value>all</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
<value>clean</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
<value>all</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.dltk.lua.core.nature</nature>
</natures>
</projectDescription>

View File

@ -0,0 +1,27 @@
LuCI Installation Instructions
TOC:
1. Kamikaze Feed
2. Kamikaze Packages
1. Kamikaze Feed
1. Change to your OpenWrt buildroot
2. Add the following line to your OpenWrt feeds.conf:
src-svn luci http://svn.luci.subsignal.org/luci/trunk/contrib/package
3. Run ./scripts/feeds update
4. Run ./scripts/feeds install -a -p luci
5. Type make menuconfig and you will find luci in the menu "Administration"
2. Kamikaze Packages
1. cd to the "package" directory of your kamikaze buildroot
3. Type: ln -s /path/to/luci/contrib/package/* ./
4. cd to your kamikaze build root and type: make menuconfig
You will find luci in the menu "Administration"

View File

@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@ -0,0 +1,94 @@
include build/config.mk
MODULES = contrib/* applications/* libs/* modules/* themes/* i18n/*
OS:=$(shell uname)
export OS
.PHONY: all build gccbuild luabuild clean host gcchost luahost hostcopy hostclean
all: build
build: gccbuild luabuild
gccbuild:
make -C libs/lmo CC="cc" CFLAGS="" LDFLAGS="" host-install
for i in $(MODULES); do \
make -C$$i compile || { \
echo "*** Compilation of $$i failed!"; \
exit 1; \
}; \
done
luabuild: i18nbuild
for i in $(MODULES); do HOST=$(realpath host) make -C$$i luabuild; done
i18nbuild:
mkdir -p host/lua-po
./build/i18n-po2lua.pl ./po host/lua-po
clean:
rm -rf docs
make -C libs/lmo host-clean
for i in $(MODULES); do make -C$$i clean; done
host: build hostcopy
gcchost: gccbuild hostcopy
luahost: luabuild hostcopy
hostcopy:
mkdir -p host/tmp
for i in $(MODULES); do cp -pR $$i/dist/* host/ 2>/dev/null || true; done
for i in $(MODULES); do cp -pR $$i/hostfiles/* host/ 2>/dev/null || true; done
rm -f host/luci
ln -s .$(LUCI_MODULEDIR) host/luci
rm -rf /tmp/luci-* || true
hostenv: host ucidefaults
ucidefaults:
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host)/bin/uci-defaults --exclude luci-freifunk-*"
runhttpd: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua build/lucid.lua"
runlua: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua -i build/setup.lua"
runshell: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) $$SHELL
hostclean: clean
rm -rf host
apidocs: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "build/makedocs.sh host/luci/ docs"
uvldocs: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) \
"build/uvldoc $(realpath host) $(UVL_SCHEMEDIR) uvldocs $(DOCS)"
po: host
for L in $${LANGUAGE:-$$(find i18n/ -path 'i18n/*/luasrc/i18n/*' -name 'default.*.lua' | \
sed -e 's!.*/default\.\(.*\)\.lua!\1!')}; do \
build/i18n-lua2po.pl . $(realpath host)/po $$L; \
done
run:
# make run is deprecated #
# Please use: #
# #
# To run LuCI WebUI using LuCIttpd #
# make runhttpd #
# #
# To run LuCI WebUI using Boa/Webuci #
# make runboa #
# #
# To start a shell in the LuCI environment #
# make runshell #
# #
# To run Lua CLI in the LuCI environment #
# make runlua #

View File

@ -0,0 +1,9 @@
LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
Licensed under the Apache License, Version 2.0.
Contains code from:
coxpcall - Copyright 2005 - Kepler Project (www.keplerproject.org)
ltn12/luasocket - Copyright 2004-2007 Diego Nehab
axTLS - Copyright 2008 Cameron Rich

View File

@ -0,0 +1,26 @@
I'd like to thank the following people for contributing to this software:
* Anton Popov
- for rewriting the openwrt.org theme
* Florian Fainelli (OpenWrt)
- for the french translation
* Alina Friedrichsen
- for the reworked translation system, help on standards compliance and accessibility
* Yanira
- several applications and bugreports
Also a big thank you goes to:
* Mono (Freifunk Halle)
- for donating a Linksys WRT54GL for development purposes
* tetzlav (Freifunk Leipzig)
- for donating several boards for testing and his feedback
* Mickey (Freifunk Hannover)
- for his feedback and fixes for the OpenWrt builds

View File

@ -12,13 +12,24 @@ all: build
build: gccbuild luabuild
gccbuild:
for i in $(MODULES); do make -C$$i compile; done
make -C libs/lmo CC="cc" CFLAGS="" LDFLAGS="" host-install
for i in $(MODULES); do \
make -C$$i compile || { \
echo "*** Compilation of $$i failed!"; \
exit 1; \
}; \
done
luabuild:
for i in $(MODULES); do make -C$$i luabuild; done
luabuild: i18nbuild
for i in $(MODULES); do HOST=$(realpath host) make -C$$i luabuild; done
i18nbuild:
mkdir -p host/lua-po
./build/i18n-po2lua.pl ./po host/lua-po
clean:
rm -rf docs
make -C libs/lmo host-clean
for i in $(MODULES); do make -C$$i clean; done
@ -41,18 +52,11 @@ hostenv: host ucidefaults
ucidefaults:
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host)/bin/uci-defaults --exclude luci-freifunk-*"
runboa: hostenv
libs/sgi-webuci/host/buildconfig.sh $(realpath host) > host/etc/boa/boa.conf
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host/usr/bin/boa) -c $(realpath host/etc/boa) -d"
runhttpd: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host/usr/bin/lucittpd) $(realpath host)/usr/lib/lucittpd/plugins"
runluci: luahost
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath libs/httpd/host/runluci) $(realpath host) $(HTDOCS)"
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua build/lucid.lua"
runlua: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) lua
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua -i build/setup.lua"
runshell: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) $$SHELL
@ -67,6 +71,12 @@ uvldocs: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) \
"build/uvldoc $(realpath host) $(UVL_SCHEMEDIR) uvldocs $(DOCS)"
po: host
for L in $${LANGUAGE:-$$(find i18n/ -path 'i18n/*/luasrc/i18n/*' -name 'default.*.lua' | \
sed -e 's!.*/default\.\(.*\)\.lua!\1!')}; do \
build/i18n-lua2po.pl . $(realpath host)/po $$L; \
done
run:
# make run is deprecated #
# Please use: #

View File

@ -6,3 +6,4 @@ Licensed under the Apache License, Version 2.0.
Contains code from:
coxpcall - Copyright 2005 - Kepler Project (www.keplerproject.org)
ltn12/luasocket - Copyright 2004-2007 Diego Nehab
axTLS - Copyright 2008 Cameron Rich

View File

@ -0,0 +1,5 @@
K 25
svn:wc:ra_dav:version-url
V 50
/!svn/ver/6189/luci/branches/luci-0.9/applications
END

View File

@ -0,0 +1,103 @@
10
dir
6253
http://svn.luci.subsignal.org/luci/branches/luci-0.9/applications
http://svn.luci.subsignal.org
2010-05-30T23:48:02.464313Z
6189
jow
ab181a69-ba2e-0410-a84d-ff88ab4c47bc
luci-openvpn
dir
luci-asterisk
dir
luci-tinyproxy
dir
luci-ushare
dir
luci-ddns
dir
luci-siitwizard
dir
luci-splash
dir
luci-statistics
dir
luci-coovachilli
dir
freifunk-community
dir
luci-polipo
dir
luci-qos
dir
luci-ntpc
dir
luci-hd-idle
dir
luci-initmgr
dir
luci-p910nd
dir
luci-p2pblock
dir
luci-fw
dir
luci-ffwizard-leipzig
dir
luci-livestats
dir
luci-olsr
dir
myapplication
dir
luci-mmc-over-gpio
dir
luci-upnp
dir
luci-samba
dir

View File

@ -0,0 +1,11 @@
K 25
svn:wc:ra_dav:version-url
V 69
/!svn/ver/4830/luci/branches/luci-0.9/applications/freifunk-community
END
Makefile
K 25
svn:wc:ra_dav:version-url
V 78
/!svn/ver/4830/luci/branches/luci-0.9/applications/freifunk-community/Makefile
END

View File

@ -0,0 +1,6 @@
K 10
svn:ignore
V 5
dist
END

View File

@ -0,0 +1,65 @@
10
dir
6253
http://svn.luci.subsignal.org/luci/branches/luci-0.9/applications/freifunk-community
http://svn.luci.subsignal.org
2009-03-25T14:05:16.359497Z
4369
jow
has-props
ab181a69-ba2e-0410-a84d-ff88ab4c47bc
htdocs
dir
Makefile
file
2010-09-19T09:58:15.472088Z
ec5666919ab9e4d439fdf0e4944342a7
2008-09-15T16:52:58.565921Z
3301
Cyrus
59

View File

@ -0,0 +1,17 @@
K 25
svn:wc:ra_dav:version-url
V 76
/!svn/ver/4830/luci/branches/luci-0.9/applications/freifunk-community/htdocs
END
cgi-bin-nodes.html
K 25
svn:wc:ra_dav:version-url
V 95
/!svn/ver/4830/luci/branches/luci-0.9/applications/freifunk-community/htdocs/cgi-bin-nodes.html
END
cgi-bin-status.html
K 25
svn:wc:ra_dav:version-url
V 96
/!svn/ver/4830/luci/branches/luci-0.9/applications/freifunk-community/htdocs/cgi-bin-status.html
END

View File

@ -0,0 +1,96 @@
10
dir
6253
http://svn.luci.subsignal.org/luci/branches/luci-0.9/applications/freifunk-community/htdocs
http://svn.luci.subsignal.org
2008-09-29T16:57:35.553221Z
3462
jow
ab181a69-ba2e-0410-a84d-ff88ab4c47bc
cgi-bin-nodes.html
file
2010-09-19T09:58:15.468071Z
44291dee7890a4e4eaf518b3716cc834
2008-09-15T22:28:45.823009Z
3314
Cyrus
447
cgi-bin-status.html
file
2010-09-19T09:58:15.468071Z
44291dee7890a4e4eaf518b3716cc834
2008-09-29T16:57:35.553221Z
3462
jow
447

View File

@ -0,0 +1,11 @@
K 25
svn:wc:ra_dav:version-url
V 64
/!svn/ver/4830/luci/branches/luci-0.9/applications/luci-asterisk
END
Makefile
K 25
svn:wc:ra_dav:version-url
V 73
/!svn/ver/4830/luci/branches/luci-0.9/applications/luci-asterisk/Makefile
END

View File

@ -0,0 +1,6 @@
K 10
svn:ignore
V 5
dist
END

View File

@ -0,0 +1,71 @@
10
dir
6253
http://svn.luci.subsignal.org/luci/branches/luci-0.9/applications/luci-asterisk
http://svn.luci.subsignal.org
2009-06-08T20:00:50.244792Z
4806
jow
has-props
ab181a69-ba2e-0410-a84d-ff88ab4c47bc
root
dir
luasrc
dir
ipkg
dir
Makefile
file
2010-09-19T09:58:14.788070Z
163f74e3092245d58da2709c77536280
2009-05-19T02:18:28.983459Z
4560
jow
75

View File

@ -0,0 +1,4 @@
PO = asterisk
include ../../build/config.mk
include ../../build/module.mk

View File

@ -0,0 +1,4 @@
PO = asterisk
include ../../build/config.mk
include ../../build/module.mk

View File

@ -0,0 +1,11 @@
K 25
svn:wc:ra_dav:version-url
V 69
/!svn/ver/4830/luci/branches/luci-0.9/applications/luci-asterisk/ipkg
END
postinst
K 25
svn:wc:ra_dav:version-url
V 78
/!svn/ver/4830/luci/branches/luci-0.9/applications/luci-asterisk/ipkg/postinst
END

View File

@ -0,0 +1,62 @@
10
dir
6253
http://svn.luci.subsignal.org/luci/branches/luci-0.9/applications/luci-asterisk/ipkg
http://svn.luci.subsignal.org
2009-06-08T20:00:50.244792Z
4806
jow
ab181a69-ba2e-0410-a84d-ff88ab4c47bc
postinst
file
2010-09-19T09:58:14.788070Z
41ffd7376524f52cc6a1f9b03cb65f01
2009-06-08T20:00:50.244792Z
4806
jow
has-props
184

View File

@ -0,0 +1,5 @@
K 14
svn:executable
V 1
*
END

View File

@ -0,0 +1,5 @@
#!/bin/sh
[ -n "${IPKG_INSTROOT}" ] || {
( . /etc/uci-defaults/luci-asterisk ) && rm -f /etc/uci-defaults/luci-asterisk
/etc/init.d/asterisk enabled || /etc/init.d/asterisk enable
}

View File

@ -0,0 +1,5 @@
#!/bin/sh
[ -n "${IPKG_INSTROOT}" ] || {
( . /etc/uci-defaults/luci-asterisk ) && rm -f /etc/uci-defaults/luci-asterisk
/etc/init.d/asterisk enabled || /etc/init.d/asterisk enable
}

Some files were not shown because too many files have changed in this diff Show More