From ec2faada95b4d11b0b0f166d1c38c7d7aa7a3ded Mon Sep 17 00:00:00 2001 From: Nuno Goncalves Date: Wed, 5 Feb 2014 14:00:47 +0000 Subject: [PATCH] [packages] open2300: custom config file was not copied, makefile cleanup SVN-Revision: 39477 --- utils/open2300/Makefile | 51 +++++++------- utils/open2300/files/open2300.conf | 65 ++++++++++++++++++ .../{x2.patch => 001-crosscompile.patch} | 33 +-------- utils/open2300/patches/x1.patch | 68 ------------------- 4 files changed, 93 insertions(+), 124 deletions(-) create mode 100644 utils/open2300/files/open2300.conf rename utils/open2300/patches/{x2.patch => 001-crosscompile.patch} (70%) delete mode 100644 utils/open2300/patches/x1.patch diff --git a/utils/open2300/Makefile b/utils/open2300/Makefile index a87406988c..faa3e19184 100644 --- a/utils/open2300/Makefile +++ b/utils/open2300/Makefile @@ -1,5 +1,6 @@ # -# Copyright (C) 2010 segal.di.ubi.pt +# Copyright (C) 2010 segal.ubi.pt +# Copyright (C) 2014 nunojpg@gmail.com # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,24 +9,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=open2300 -PKG_RELEASE:=1.11 -PKG_VERSION:=1.11 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.ccccoimbra.com/open2300/ -PKG_MD5SUM:=804576790840c3bc4a288f3e0f83ce4d - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_VERSION:=1.12 +PKG_RELEASE:=2 +PKG_SOURCE_PROTO:=svn +PKG_SOURCE_URL:=http://www.lavrsen.dk/svn/open2300/trunk +PKG_SOURCE_VERSION:=r12 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk - define Package/open2300 SECTION:=utils CATEGORY:=Utilities TITLE:=WS23XX weather station utilities - URL:=http://www.lavrsen.dk/twiki/bin/view/Open2300/WebHome + URL:=http://www.lavrsen.dk/foswiki/bin/view/Open2300 MAINTAINER:=Nuno Goncalves endef @@ -35,21 +34,23 @@ endef define Package/open2300/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/open2300 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/dump2300 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/log2300 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/fetch2300 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/wu2300 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/cw2300 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/history2300 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/histlog2300 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin2300 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/xml2300 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/light2300 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/interval2300 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/minmax2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/cw2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/dump2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/fetch2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/histlog2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/history2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/interval2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/light2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/log2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/minmax2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/open2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wu2300 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/xml2300 $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc - $(INSTALL_DATA) $(PKG_BUILD_DIR)/open2300-dist.conf $(1)/etc/ + $(INSTALL_DATA) ./files/open2300.conf $(1)/etc/ + $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib2300.so.1.11 $(1)/usr/lib/ ln -sf /usr/lib/lib2300.so.1.11 $(1)/usr/lib/lib2300.so diff --git a/utils/open2300/files/open2300.conf b/utils/open2300/files/open2300.conf new file mode 100644 index 0000000000..6414b492b2 --- /dev/null +++ b/utils/open2300/files/open2300.conf @@ -0,0 +1,65 @@ +# open2300.conf +# +# Configuration files for open2300 weather station tools +# +# Default locations in which the programs will search for this file: +# Programs search in this sequence: +# 1. Path to config file including filename given as parameter (not supported by all tools) +# 2. ./open2300.conf (current working directory) +# 3. /jffs/etc/open2300.conf (typical DD-WRT location) +# 4. /etc/open2300.conf (typical Linux location) +# +# All names are case sensitive!!! + + +# Set to your serial port and time zone +# For Windows use COM1, COM2, COM2 etc +# For Linux use /dev/ttyS0, /dev/ttyS1 etc + +SERIAL_DEVICE /dev/tts/1 # /dev/ttyS0, /dev/ttyS1, COM1, COM2 etc +TIMEZONE 1 # Hours Relative to UTC. East is positive, west is negative + + +# Units of measure (set them to your preference) +# The units of measure are ignored by wu2300 and cw2300 because both requires specific units + +WIND_SPEED m/s # select MPH (miles/hour), m/s, or km/h +TEMPERATURE C # Select C or F +RAIN mm # Select mm or IN +PRESSURE hPa # Select hPa, mb or INHG + + +#### Citizens Weather variables (used only by cw2300) +# Format for latitude is +# [2 digit degrees][2 digit minutes].[2 decimals minutes - NOT seconds][N for north or S for south] +# Format for longitude is +# [3 digit degrees][2 digit minutes].[2 decimals minutes - NOT seconds][E for east or W for west] +# Use leading zeros to get the format ####.##N (lat) and #####.##E (long) + +CITIZEN_WEATHER_ID CW0000 # CW0000 should be replaced by HAM call or actual CW number +CITIZEN_WEATHER_LATITUDE 5540.12N # DDMM.mmN or S - example 55 deg, 40.23 minutes north +CITIZEN_WEATHER_LONGITUDE 01224.60E # DDDMM.mmE or W - example 12 deg, 24.60 minutes east + +APRS_SERVER rotate.aprs.net 14580 # These are the APRS servers and ports for +APRS_SERVER first.aprs.net 14580 # Citizens Weather reporting. +APRS_SERVER second.aprs.net 14580 # They they are tried in the entered order +APRS_SERVER third.aprs.net 14580 # you may enter up to 5 alternate servers + + +#### WEATHER UNDERGROUND variables (used only by wu2300) + +WEATHER_UNDERGROUND_ID WUID # ID received from Weather Underground +WEATHER_UNDERGROUND_PASSWORD WUPASSWORD # Password for Weather Underground + + +### MYSQL Settings (only used by mysql2300) + +#MYSQL_HOST localhost # Localhost or IP address/host name +#MYSQL_USERNAME open2300 # Name of the MySQL user that has access to the database +#MYSQL_PASSWORD mysql2300 # Password for the MySQL user +#MYSQL_DATABASE open2300 # Named of your database +#MYSQL_PORT 0 # TCP/IP Port number. Zero means default + +#PGSQL_CONNECT hostaddr='127.0.0.1'dbname='open2300'user='postgres'password='sql' # Connection string +#PGSQL_TABLE weather # Table name +#PGSQL_STATION open2300 # Unique station id diff --git a/utils/open2300/patches/x2.patch b/utils/open2300/patches/001-crosscompile.patch similarity index 70% rename from utils/open2300/patches/x2.patch rename to utils/open2300/patches/001-crosscompile.patch index 7e43e6f682..09530470ad 100644 --- a/utils/open2300/patches/x2.patch +++ b/utils/open2300/patches/001-crosscompile.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -15,91 +15,91 @@ +@@ -15,87 +15,82 @@ prefix = /usr/local exec_prefix = ${prefix} bindir = ${exec_prefix}/bin @@ -44,8 +44,7 @@ ####### Build rules -all: open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300 mysql2300 mysqlhistlog2300 -+all: open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300 -+#mysql2300 mysqlhistlog2300 ++all: open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300 #mysql2300 mysqlhistlog2300 -open2300 : $(OBJ) - $(CC) $(CFLAGS) -o $@ $(OBJ) $(CC_LDFLAGS) @@ -138,31 +137,3 @@ install: - mkdir -p $(bindir) -+ mkdir -p $(libdir) -+ $(INSTALL) $(LIB).so.$(VERSION) $(libdir) -+ ln -sf $(libdir)/$(LIB).so.$(VERSION) $(libdir)/$(LIB).so -+ $(INSTALL) srv2300 $(bindir) - $(INSTALL) open2300 $(bindir) - $(INSTALL) dump2300 $(bindir) - $(INSTALL) log2300 $(bindir) -@@ -111,14 +111,11 @@ - $(INSTALL) light2300 $(bindir) - $(INSTALL) interval2300 $(bindir) - $(INSTALL) minmax2300 $(bindir) -- $(INSTALL) mysql2300 $(bindir) -- $(INSTALL) mysqlhistlog2300 $(bindir) -+# $(INSTALL) mysql2300 $(bindir) -+# $(INSTALL) mysqlhistlog2300 $(bindir) - - uninstall: -- rm -f $(bindir)/open2300 $(bindir)/dump2300 $(bindir)/log2300 $(bindir)/fetch2300 $(bindir)/wu2300 $(bindir)/cw2300 $(bindir)/xml2300 $(bindir)/light2300 $(bindir)/interval2300 $(bindir)/minmax2300 $(bindir)/mysql2300 $(bindir)/mysqlhistlog2300 -+ rm -f $(libdir)/$(LIB).* $(bindir)/open2300 $(bindir)/dump2300 $(bindir)/log2300 $(bindir)/fetch2300 $(bindir)/srv2300 $(bindir)/wu2300 $(bindir)/cw2300 $(bindir)/xml2300 $(bindir)/light2300 $(bindir)/interval2300 $(bindir)/minmax2300 $(bindir)/histlog2300 $(bindir)/mysql2300 $(bindir)/mysqlhistlog2300 - - clean: -- rm -f *~ *.o open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 mysql2300 pgsql2300 light2300 interval2300 minmax2300 mysql2300 mysqlhistlog2300 -- --cleanexe: -- rm -f *~ *.o open2300.exe dump2300.exe log2300.exe fetch2300.exe wu2300.exe cw2300.exe history2300.exe histlog2300.exe bin2300.exe xml2300.exe mysql2300.exe pgsql2300.exe light2300.exe interval2300.exe minmax2300.exe -\ No newline at end of file -+ rm -f *~ *.o *.so* open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 histlog2300 bin2300 xml2300 mysql2300 pgsql2300 light2300 interval2300 minmax2300 mysql2300 mysqlhistlog2300 diff --git a/utils/open2300/patches/x1.patch b/utils/open2300/patches/x1.patch deleted file mode 100644 index 86654f6271..0000000000 --- a/utils/open2300/patches/x1.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/open2300.conf -+++ b/open2300.conf -@@ -0,0 +1,65 @@ -+# open2300.conf -+# -+# Configuration files for open2300 weather station tools -+# -+# Default locations in which the programs will search for this file: -+# Programs search in this sequence: -+# 1. Path to config file including filename given as parameter (not supported by all tools) -+# 2. ./open2300.conf (current working directory) -+# 3. /jffs/etc/open2300.conf (typical DD-WRT location) -+# 4. /etc/open2300.conf (typical Linux location) -+# -+# All names are case sensitive!!! -+ -+ -+# Set to your serial port and time zone -+# For Windows use COM1, COM2, COM2 etc -+# For Linux use /dev/ttyS0, /dev/ttyS1 etc -+ -+SERIAL_DEVICE /dev/tts/1 # /dev/ttyS0, /dev/ttyS1, COM1, COM2 etc -+TIMEZONE 1 # Hours Relative to UTC. East is positive, west is negative -+ -+ -+# Units of measure (set them to your preference) -+# The units of measure are ignored by wu2300 and cw2300 because both requires specific units -+ -+WIND_SPEED m/s # select MPH (miles/hour), m/s, or km/h -+TEMPERATURE C # Select C or F -+RAIN mm # Select mm or IN -+PRESSURE hPa # Select hPa, mb or INHG -+ -+ -+#### Citizens Weather variables (used only by cw2300) -+# Format for latitude is -+# [2 digit degrees][2 digit minutes].[2 decimals minutes - NOT seconds][N for north or S for south] -+# Format for longitude is -+# [3 digit degrees][2 digit minutes].[2 decimals minutes - NOT seconds][E for east or W for west] -+# Use leading zeros to get the format ####.##N (lat) and #####.##E (long) -+ -+CITIZEN_WEATHER_ID CW0000 # CW0000 should be replaced by HAM call or actual CW number -+CITIZEN_WEATHER_LATITUDE 5540.12N # DDMM.mmN or S - example 55 deg, 40.23 minutes north -+CITIZEN_WEATHER_LONGITUDE 01224.60E # DDDMM.mmE or W - example 12 deg, 24.60 minutes east -+ -+APRS_SERVER rotate.aprs.net 14580 # These are the APRS servers and ports for -+APRS_SERVER first.aprs.net 14580 # Citizens Weather reporting. -+APRS_SERVER second.aprs.net 14580 # They they are tried in the entered order -+APRS_SERVER third.aprs.net 14580 # you may enter up to 5 alternate servers -+ -+ -+#### WEATHER UNDERGROUND variables (used only by wu2300) -+ -+WEATHER_UNDERGROUND_ID WUID # ID received from Weather Underground -+WEATHER_UNDERGROUND_PASSWORD WUPASSWORD # Password for Weather Underground -+ -+ -+### MYSQL Settings (only used by mysql2300) -+ -+#MYSQL_HOST localhost # Localhost or IP address/host name -+#MYSQL_USERNAME open2300 # Name of the MySQL user that has access to the database -+#MYSQL_PASSWORD mysql2300 # Password for the MySQL user -+#MYSQL_DATABASE open2300 # Named of your database -+#MYSQL_PORT 0 # TCP/IP Port number. Zero means default -+ -+#PGSQL_CONNECT hostaddr='127.0.0.1'dbname='open2300'user='postgres'password='sql' # Connection string -+#PGSQL_TABLE weather # Table name -+#PGSQL_STATION open2300 # Unique station id -- 2.30.2