fix regressions for allconfig alix1c glibc target

2 files changed, 11 insertions, 46 deletions

diff --git a/package/nut/Config.in b/package/nut/Config.in
index 2da404567..9539f8a03 100644
--- a/package/nut/Config.in
+++ b/package/nut/Config.in
@@ -78,26 +78,11 @@ config ADK_PACKAGE_NUT_DRIVER_BESTUFERRUPS
 	boolean
 	default n
 	
-config ADK_PACKAGE_NUT_DRIVER_BLAZER
-	prompt "blazer............................ Driver for Blazer UPS models"
-	boolean
-	default n
-	
-config ADK_PACKAGE_NUT_DRIVER_CPSUPS
-	prompt "cpsups............................ Driver for CyberPower text protocol UPS"
-	boolean
-	default n
-	
 config ADK_PACKAGE_NUT_DRIVER_CYBERPOWER
 	prompt "cyberpower........................ Driver for Cyber Power Systems"
 	boolean
 	default n
 	
-config ADK_PACKAGE_NUT_DRIVER_ESUPSSMART
-	prompt "esupssmart........................ Driver for ES UPS"
-	boolean
-	default n
-	
 config ADK_PACKAGE_NUT_DRIVER_ETAPRO
 	prompt "etapro............................ Driver for ETA UPS"
 	boolean
@@ -108,11 +93,6 @@ config ADK_PACKAGE_NUT_DRIVER_EVERUPS
 	boolean
 	default n
 	
-config ADK_PACKAGE_NUT_DRIVER_FENTONUPS
-	prompt "fentonups......................... Driver for Fenton Technologies units"
-	boolean
-	default n
-	
 config ADK_PACKAGE_NUT_DRIVER_GAMATRONIC
 	prompt "gamatronic........................ Driver for Gamatronic UPS"
 	boolean
@@ -123,11 +103,6 @@ config ADK_PACKAGE_NUT_DRIVER_GENERICUPS
 	boolean
 	default n
 	
-config ADK_PACKAGE_NUT_DRIVER_IPPON
-	prompt "ippon............................. Driver for Ippon UPS devices"
-	boolean
-	default n
-	
 config ADK_PACKAGE_NUT_DRIVER_ISBMEX
 	prompt "isbmex............................ Driver for SOLA/BASIC Mexico models"
 	boolean
@@ -158,11 +133,6 @@ config ADK_PACKAGE_NUT_DRIVER_MGE_UTALK
 	boolean
 	default n
 	
-config ADK_PACKAGE_NUT_DRIVER_MUSTEK
-	prompt "mustek............................ Driver for Mustek UPS models"
-	boolean
-	default n
-	
 config ADK_PACKAGE_NUT_DRIVER_ONEAC
 	prompt "oneac............................. Driver for UPS using the Oneac Advanced Interface"
 	boolean
@@ -185,6 +155,12 @@ config ADK_PACKAGE_NUT_DRIVER_POWERMUST
 	prompt "powermust......................... Driver for Powermust"
 	boolean
 	default n
+
+config ADK_PACKAGE_NUT_DRIVER_POWERPANEL
+	prompt "powerpanel........................ Driver for Powerpanel units"
+	boolean
+	default n
+	help
 	
 config ADK_PACKAGE_NUT_DRIVER_RHINO
 	prompt "rhino............................. Driver for Microsol Rhino UPS"
@@ -206,11 +182,6 @@ config ADK_PACKAGE_NUT_DRIVER_SAFENET
 	  * - Sweex 500/1000
 	  * - others using SafeNet software and serial interface
 
-config ADK_PACKAGE_NUT_DRIVER_SMS
-	prompt "sms............................... Driver for SMS UPS hardware"
-	boolean
-	default n
-	
 config ADK_PACKAGE_NUT_DRIVER_SOLIS
 	prompt "solis............................. Driver for Microsol Solis UPS"
 	boolean
diff --git a/package/nut/Makefile b/package/nut/Makefile
index 2bf1c12f8..97418808b 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -38,12 +38,12 @@ endef
 
 DRIVERS_y:=
 $(eval $(call DRIVER_template,BESTUPS,bestups))
-$(eval $(call DRIVER_template,FENTONUPS,fentonups))
 $(eval $(call DRIVER_template,APCSMART,apcsmart))
 $(eval $(call DRIVER_template,EVERUPS,everups))
 $(eval $(call DRIVER_template,BELKIN,belkin))
 $(eval $(call DRIVER_template,MASTERGUARD,masterguard))
 $(eval $(call DRIVER_template,POWERCOM,powercom))
+$(eval $(call DRIVER_template,POWERPANEL,powerpanel))
 $(eval $(call DRIVER_template,CYBERPOWER,cyberpower))
 $(eval $(call DRIVER_template,TRIPPLITE,tripplite))
 $(eval $(call DRIVER_template,VICTRONUPS,victronups))
@@ -53,16 +53,10 @@ $(eval $(call DRIVER_template,BESTUFERRUPS,bestuferrups))
 $(eval $(call DRIVER_template,ISBMEX,isbmex))
 $(eval $(call DRIVER_template,ETAPRO,etapro))
 $(eval $(call DRIVER_template,LIEBERT,liebert))
-$(eval $(call DRIVER_template,SMS,sms))
-$(eval $(call DRIVER_template,ESUPSSMART,esupssmart))
 $(eval $(call DRIVER_template,TRIPPLITESU,tripplitesu))
-$(eval $(call DRIVER_template,BLAZER,blazer))
 $(eval $(call DRIVER_template,SAFENET,safenet))
 $(eval $(call DRIVER_template,BELKINUNV,belkinunv))
 $(eval $(call DRIVER_template,ONEAC,oneac))
-$(eval $(call DRIVER_template,IPPON,ippon))
-$(eval $(call DRIVER_template,CPSUPS,cpsups))
-$(eval $(call DRIVER_template,MUSTEK,mustek))
 $(eval $(call DRIVER_template,METASYS,metasys))
 $(eval $(call DRIVER_template,BESTFCOM,bestfcom))
 $(eval $(call DRIVER_template,UPSCODE2,upscode2))
@@ -75,7 +69,7 @@ CONFIG_DRIVERS=$(shell echo ${DRIVERS_y} | tr ' ' ',')
 
 INSTALL_DRIVERS_tmp=${DRIVERS_y}
 ifneq (${ADK_PACKAGE_NUT_USB},)
-INSTALL_DRIVERS_tmp+=	hidups energizerups newhidups tripplite_usb
+INSTALL_DRIVERS_tmp+=	usbhid-ups tripplite_usb
 endif
 ifneq (${ADK_PACKAGE_NUT_SNMP},)
 INSTALL_DRIVERS_tmp+=	snmp-ups
@@ -86,8 +80,8 @@ CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-linux-hiddev=${LINUX_DIR}/include/linux/hiddev.h \
 			--without-cgi \
 			--with-drivers=${INSTALL_DRIVERS} \
-			--with-group=root \
-			--with-user=root
+			--with-group=0 \
+			--with-user=0
 
 ifneq (${ADK_PACKAGE_NUT_SSL},)
 CONFIGURE_ARGS+=	--with-ssl
@@ -108,7 +102,7 @@ INSTALL_TARGET+=	install-snmp
 endif
 
 post-install:
-	${INSTALL_DIR} ${IDIR_NUT}/usr/{s,}bin
+	${INSTALL_DIR} ${IDIR_NUT}/usr/{s,}bin ${IDIR_NUT}/etc
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/ups{d,mon,sched} \
 		${IDIR_NUT}/usr/sbin/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/{${INSTALL_DRIVERS}} \