From 7c520cd3ad42f5d94a9888bb9b3db7c79b6fd94f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 2 Jun 2009 22:09:53 +0200 Subject: fix regressions for allconfig alix1c glibc target --- package/nut/Makefile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'package/nut/Makefile') 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}} \ -- cgit v1.2.3