Przeglądaj źródła

dump1090: Switch to MalcolmRobb's repo, add myself as maintainer, fix html files and add package configuration.

Álvaro Fernández Rojas 10 lat temu
rodzic
commit
e128013289

+ 20
- 0
utils/dump1090/Config.in Wyświetl plik

@@ -0,0 +1,20 @@
1
+config DUMP1090_DUMP
2
+	bool "dump1090"
3
+	depends on PACKAGE_dump1090
4
+	default y
5
+	help
6
+		dump1090 ModeS Receiver
7
+
8
+config DUMP1090_WWW
9
+	bool "website files"
10
+	depends on DUMP1090_DUMP
11
+	default y
12
+	help
13
+		HTML website files for showing planes
14
+
15
+config DUMP1090_VIEW
16
+	bool "view1090"
17
+	depends on PACKAGE_dump1090
18
+	default n
19
+	help
20
+		view1090 dump1090 Viewer

+ 16
- 7
utils/dump1090/Makefile Wyświetl plik

@@ -7,19 +7,18 @@
7 7
 include $(TOPDIR)/rules.mk
8 8
 
9 9
 PKG_NAME:=dump1090
10
-PKG_VERSION:=2013-02-04
10
+PKG_VERSION:=2014-06-15
11 11
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
12 12
 
13 13
 PKG_SOURCE_PROTO:=git
14
-PKG_SOURCE_URL:=git://github.com/antirez/dump1090.git
14
+PKG_SOURCE_URL:=git://github.com/MalcolmRobb/dump1090.git
15 15
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
16
-PKG_SOURCE_VERSION:=ff0fe38722c768c7269afa733790a2b968ea3099
16
+PKG_SOURCE_VERSION:=6afdc9bd1b0462a1606a5539d44cd33c57b44f84
17 17
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
18
+PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
18 19
 
19 20
 PKG_LICENSE:=BSD-3c
20 21
 
21
-PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
22
-
23 22
 include $(INCLUDE_DIR)/package.mk
24 23
 
25 24
 define Package/dump1090
@@ -30,6 +29,9 @@ define Package/dump1090
30 29
   DEPENDS:=+libpthread +librtlsdr
31 30
 endef
32 31
 
32
+define Package/dump1090/config
33
+	source "$(SOURCE)/Config.in"
34
+endef
33 35
 
34 36
 define Package/dump1090/description
35 37
  Dump1090 is a Mode S decoder specifically designed for RTLSDR devices.
@@ -42,10 +44,17 @@ MAKE_FLAGS += \
42 44
 
43 45
 define Package/dump1090/install
44 46
 	$(INSTALL_DIR) $(1)/usr/bin
45
-	$(CP) $(PKG_BUILD_DIR)/dump1090 $(1)/usr/bin
46 47
 
48
+ifneq ($(CONFIG_DUMP1090_DUMP),)
49
+	$(CP) $(PKG_BUILD_DIR)/dump1090 $(1)/usr/bin
50
+ifneq ($(CONFIG_DUMP1090_WWW),)
47 51
 	$(INSTALL_DIR) $(1)/usr/share/dump1090
48
-	$(CP) $(PKG_BUILD_DIR)/gmap.html $(1)/usr/share/dump1090
52
+	$(CP) $(PKG_BUILD_DIR)/public_html/* $(1)/usr/share/dump1090
53
+endif
54
+endif
55
+ifneq ($(CONFIG_DUMP1090_VIEW),)
56
+	$(CP) $(PKG_BUILD_DIR)/view1090 $(1)/usr/bin
57
+endif
49 58
 endef
50 59
 
51 60
 $(eval $(call BuildPackage,dump1090))

+ 11
- 0
utils/dump1090/patches/100-html_dir.patch Wyświetl plik

@@ -0,0 +1,11 @@
1
+--- a/dump1090.h
2
++++ b/dump1090.h
3
+@@ -178,7 +178,7 @@
4
+ #define MODES_NET_SNDBUF_MAX  (7)               
5
+ 
6
+ #ifndef HTMLPATH
7
+-#define HTMLPATH   "./public_html"      // default path for gmap.html etc
8
++#define HTMLPATH   "/usr/share/dump1090"      // default path for gmap.html etc
9
+ #endif
10
+ 
11
+ #define MODES_NOTUSED(V) ((void) V)