Просмотр исходного кода

Disable various plugins with mising dependencies

Signed-off-by: Steven Barth <steven@midlink.org>
Steven Barth 10 лет назад
Родитель
Сommit
e373aa5868
3 измененных файлов: 24 добавлений и 24 удалений
  1. 18
    18
      net/freeradius2/Makefile
  2. 1
    1
      net/rtorrent/Makefile
  3. 5
    5
      utils/collectd/Makefile

+ 18
- 18
net/freeradius2/Makefile Просмотреть файл

@@ -415,24 +415,24 @@ PKG_DICTIONARIES:= \
415 415
 	microsoft \
416 416
 	wispr \
417 417
 
418
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-ldap),)
419
-  CONFIGURE_ARGS+= \
420
-		--with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \
421
-		--with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib"
422
-  CONFIGURE_LIBS+= -lcrypto -lssl
423
-else
418
+#ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-ldap),)
419
+#  CONFIGURE_ARGS+= \
420
+#		--with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \
421
+#		--with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib"
422
+#  CONFIGURE_LIBS+= -lcrypto -lssl
423
+#else
424 424
   CONFIGURE_ARGS+= --without-rlm_ldap
425
-endif
426
-
427
-ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-mysql),)
428
-  CONFIGURE_ARGS+= \
429
-		--with-mysql-include-dir="$(STAGING_DIR)/usr/include" \
430
-		--with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql"
431
-  CONFIGURE_LIBS+= -lz
432
-  CONFIGURE_VARS+= ac_cv_lib_mysqlclient_r_mysql_init=yes
433
-else
425
+#endif
426
+
427
+#ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-mysql),)
428
+#  CONFIGURE_ARGS+= \
429
+#		--with-mysql-include-dir="$(STAGING_DIR)/usr/include" \
430
+#		--with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql"
431
+#  CONFIGURE_LIBS+= -lz
432
+#  CONFIGURE_VARS+= ac_cv_lib_mysqlclient_r_mysql_init=yes
433
+#else
434 434
   CONFIGURE_ARGS+= --without-rlm_sql_mysql
435
-endif
435
+#endif
436 436
 
437 437
 ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-pgsql),)
438 438
   CONFIGURE_ARGS+= \
@@ -612,13 +612,13 @@ $(eval $(call BuildPlugin,freeradius2-mod-exec,rlm_exec,modules/exec modules/ech
612 612
 $(eval $(call BuildPlugin,freeradius2-mod-attr-rewrite,rlm_attr_rewrite,modules/attr_rewrite,modules,))
613 613
 $(eval $(call BuildPlugin,freeradius2-mod-files,rlm_files,acct_users preproxy_users users modules/files,modules,))
614 614
 $(eval $(call BuildPlugin,freeradius2-mod-passwd,rlm_passwd,modules/passwd,modules,))
615
-$(eval $(call BuildPlugin,freeradius2-mod-ldap,rlm_ldap,ldap.attrmap modules/ldap,modules,))
615
+#$(eval $(call BuildPlugin,freeradius2-mod-ldap,rlm_ldap,ldap.attrmap modules/ldap,modules,))
616 616
 $(eval $(call BuildPlugin,freeradius2-mod-mschap,rlm_mschap,modules/mschap,modules,))
617 617
 $(eval $(call BuildPlugin,freeradius2-mod-pap,rlm_pap,modules/pap,modules,))
618 618
 $(eval $(call BuildPlugin,freeradius2-mod-preprocess,rlm_preprocess,hints huntgroups modules/preprocess,modules,))
619 619
 $(eval $(call BuildPlugin,freeradius2-mod-realm,rlm_realm,proxy.conf modules/realm modules/inner-eap,modules,))
620 620
 $(eval $(call BuildPlugin,freeradius2-mod-sql,rlm_sql,sql.conf,))
621
-$(eval $(call BuildPlugin,freeradius2-mod-sql-mysql,rlm_sql_mysql,))
621
+#$(eval $(call BuildPlugin,freeradius2-mod-sql-mysql,rlm_sql_mysql,))
622 622
 $(eval $(call BuildPlugin,freeradius2-mod-sql-pgsql,rlm_sql_postgresql,))
623 623
 $(eval $(call BuildPlugin,freeradius2-mod-sql-sqlite,rlm_sql_sqlite,))
624 624
 $(eval $(call BuildPlugin,freeradius2-mod-sqlcounter,rlm_sqlcounter,))

+ 1
- 1
net/rtorrent/Makefile Просмотреть файл

@@ -90,4 +90,4 @@ endef
90 90
 Package/rtorrent-rpc/install = $(Package/rtorrent/install)
91 91
 
92 92
 $(eval $(call BuildPackage,rtorrent))
93
-$(eval $(call BuildPackage,rtorrent-rpc))
93
+#$(eval $(call BuildPackage,rtorrent-rpc))

+ 5
- 5
utils/collectd/Makefile Просмотреть файл

@@ -28,6 +28,7 @@ COLLECTD_PLUGINS_DISABLED:= \
28 28
 	battery \
29 29
 	cpufreq \
30 30
 	curl_json \
31
+	dbi \
31 32
 	entropy \
32 33
 	genericjmx \
33 34
 	gmond \
@@ -45,6 +46,7 @@ COLLECTD_PLUGINS_DISABLED:= \
45 46
 	nfs \
46 47
 	notify_desktop \
47 48
 	notify_email \
49
+	nut \
48 50
 	openvz \
49 51
 	oracle \
50 52
 	perl \
@@ -71,7 +73,6 @@ COLLECTD_PLUGINS_SELECTED:= \
71 73
 	cpu \
72 74
 	csv \
73 75
 	curl \
74
-	dbi \
75 76
 	df \
76 77
 	disk \
77 78
 	dns \
@@ -93,7 +94,6 @@ COLLECTD_PLUGINS_SELECTED:= \
93 94
 	network \
94 95
 	nginx \
95 96
 	ntpd \
96
-	nut \
97 97
 	olsrd \
98 98
 	onewire \
99 99
 	openvpn \
@@ -263,7 +263,7 @@ $(eval $(call BuildPlugin,contextswitch,context switch input,contextswitch,))
263 263
 $(eval $(call BuildPlugin,cpu,CPU input,cpu,))
264 264
 $(eval $(call BuildPlugin,csv,CSV output,csv,))
265 265
 $(eval $(call BuildPlugin,curl,cURL input,curl,+PACKAGE_collectd-mod-curl:libcurl))
266
-$(eval $(call BuildPlugin,dbi,relational database input,dbi,+PACKAGE_collectd-mod-dbi:libdbi))
266
+#$(eval $(call BuildPlugin,dbi,relational database input,dbi,+PACKAGE_collectd-mod-dbi:libdbi))
267 267
 $(eval $(call BuildPlugin,df,disk space input,df,))
268 268
 $(eval $(call BuildPlugin,disk,disk usage/timing input,disk,))
269 269
 $(eval $(call BuildPlugin,dns,DNS traffic input,dns,+PACKAGE_collectd-mod-dns:libpcap))
@@ -278,14 +278,14 @@ $(eval $(call BuildPlugin,iwinfo,libiwinfo wireless statistics,iwinfo,+PACKAGE_c
278 278
 $(eval $(call BuildPlugin,load,system load input,load,))
279 279
 $(eval $(call BuildPlugin,logfile,log files output,logfile,))
280 280
 $(eval $(call BuildPlugin,madwifi,MadWifi status input,madwifi,))
281
-$(eval $(call BuildPlugin,mysql,MySQL status input,mysql,+PACKAGE_collectd-mod-mysql:libmysqlclient-r))
281
+#$(eval $(call BuildPlugin,mysql,MySQL status input,mysql,+PACKAGE_collectd-mod-mysql:libmysqlclient-r))
282 282
 $(eval $(call BuildPlugin,memory,physical memory usage input,memory,))
283 283
 $(eval $(call BuildPlugin,modbus,read variables through libmodbus,modbus,+PACKAGE_collectd-mod-modbus:libmodbus @BROKEN))
284 284
 $(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:ip @BROKEN))
285 285
 $(eval $(call BuildPlugin,network,network input/output,network))
286 286
 $(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl))
287 287
 $(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,))
288
-$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut))
288
+#$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut))
289 289
 $(eval $(call BuildPlugin,olsrd,OLSRd status input,olsrd,))
290 290
 $(eval $(call BuildPlugin,onewire,onewire sensor input,onewire,+PACKAGE_collectd-mod-onewire:libow-capi @BROKEN))
291 291
 $(eval $(call BuildPlugin,openvpn,OpenVPN traffic/compression input,openvpn,))