Browse Source

gammu: change startup/config file names to avoid potential conflict

Signed-Off-By: Vitaly Protsko <villy@sft.ru>
---
 Makefile         |    8 ++++----
 files/gammu.init |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
aTanW 9 years ago
parent
commit
96ef85a37e
3 changed files with 8 additions and 8 deletions
  1. 4
    4
      utils/gammu/Makefile
  2. 0
    0
      utils/gammu/files/gammu
  3. 4
    4
      utils/gammu/files/gammu.init

+ 4
- 4
utils/gammu/Makefile View File

36
 	--prefix=/usr \
36
 	--prefix=/usr \
37
 	--cross-root="$(STAGING_DIR) $(TOOLCHAIN_DIR)" \
37
 	--cross-root="$(STAGING_DIR) $(TOOLCHAIN_DIR)" \
38
 	--enable-shared \
38
 	--enable-shared \
39
-	--without-libdbi \
39
+	--without-libdbi
40
 
40
 
41
 define Build/Compile
41
 define Build/Compile
42
 	$(MAKE) -C $(PKG_BUILD_DIR) \
42
 	$(MAKE) -C $(PKG_BUILD_DIR) \
66
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{Gammu*,gsmsd*} $(1)/usr/lib
66
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{Gammu*,gsmsd*} $(1)/usr/lib
67
 	$(INSTALL_DIR) $(1)/etc/init.d
67
 	$(INSTALL_DIR) $(1)/etc/init.d
68
 	$(INSTALL_DIR) $(1)/etc/config
68
 	$(INSTALL_DIR) $(1)/etc/config
69
-	$(INSTALL_CONF) ./files/smsd $(1)/etc/config/smsd
70
-	$(INSTALL_BIN) ./files/smsd.init $(1)/etc/init.d/smsd
69
+	$(INSTALL_CONF) ./files/gammu $(1)/etc/config/gammu
70
+	$(INSTALL_BIN) ./files/gammu.init $(1)/etc/init.d/gammu
71
 endef
71
 endef
72
 
72
 
73
 define Package/gammu/conffiles
73
 define Package/gammu/conffiles
74
-/etc/config/smsd
74
+/etc/config/gammu
75
 endef
75
 endef
76
 
76
 
77
 $(eval $(call BuildPackage,gammu))
77
 $(eval $(call BuildPackage,gammu))

utils/gammu/files/smsd → utils/gammu/files/gammu View File


utils/gammu/files/smsd.init → utils/gammu/files/gammu.init View File

5
 
5
 
6
 USE_PROCD=1
6
 USE_PROCD=1
7
 PROG=/usr/bin/gammu-smsd
7
 PROG=/usr/bin/gammu-smsd
8
-CONFPFX=/var/smsd
8
+CONFPFX=/var/gammu
9
 
9
 
10
 start_instance() {
10
 start_instance() {
11
 	local conf="$1"
11
 	local conf="$1"
15
 	config_get_bool item "$conf" enabled 0
15
 	config_get_bool item "$conf" enabled 0
16
 	[ $item = 0 ] && return
16
 	[ $item = 0 ] && return
17
 
17
 
18
-	echo -e "; dont edit. instead look into /etc/config/smsd\n[gammu]\n" > $conffile
18
+	echo -e "; dont edit. instead look into /etc/config/gammu\n[gammu]\n" > $conffile
19
 
19
 
20
 	config_get item "$conf" device
20
 	config_get item "$conf" device
21
 	[ -z "$item" ] && return
21
 	[ -z "$item" ] && return
107
 }
107
 }
108
 
108
 
109
 start_service() {
109
 start_service() {
110
-	config_load smsd
110
+	config_load gammu
111
 	config_foreach start_instance daemon
111
 	config_foreach start_instance daemon
112
 }
112
 }
113
 
113
 
114
 service_triggers() {
114
 service_triggers() {
115
-	procd_add_reload_trigger "smsd"
115
+	procd_add_reload_trigger "gammu"
116
 }
116
 }