Merge pull request #1516 from bk138/ola-0.9.6

ola: Update to 0.9.6, tidy up makefile, try to resolve build dependencies

net/ola/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 # Copyright (C) 2015 Christian Beier <dontmind@freeshell.org>
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ola
-PKG_VERSION:=0.9.3
+PKG_VERSION:=0.9.6
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/OpenLightingProject/ola.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d949ab88ab2c12d4d94b50a0a0df633d634f08fd
+PKG_SOURCE_VERSION:=e9ece0540fb40beb1be33417cb7e0abf45af74e0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_LICENSE:=LGPL-2.1+
 
@@ -25,18 +25,19 @@ PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
-PKG_BUILD_DEPENDS:=protobuf/host ola/host
+HOST_BUILD_DEPENDS:=protobuf/host
+PKG_BUILD_DEPENDS:=ola/host
 
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
-
 define Package/ola
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Open Lighting Architecture Daemon
   URL:=https://www.openlighting.org/
   MAINTAINER:=Christian Beier <dontmind@freeshell.org>
-  DEPENDS:=+protobuf +libusb-1.0 +libuuid +libstdcpp +libpthread +librt +zlib +libncurses +sudo @BROKEN
+  DEPENDS:=+protobuf +libusb-1.0 +libuuid +libstdcpp +libpthread +librt +zlib +libncurses +sudo
 endef
 
 define Package/ola/description
@@ -45,14 +46,15 @@ define Package/ola/description
   protocols. It enables software controllers talk to DMX hardware.
 endef
 
+CONFIGURE_ARGS += \
+	--disable-dependency-tracking \
+	--disable-static \
+	--disable-fatal-warnings \
+	--disable-unittests \
+	--disable-http \
+	 --with-ola-protoc-plugin=$(HOST_BUILD_DIR)/protoc/ola_protoc_plugin
 
-include $(INCLUDE_DIR)/host-build.mk
+HOST_CONFIGURE_ARGS += \
-
-# When building the host part, disable as much as possible to speed up
-# the configure step and avoid missing host dependencies.
-# Stolen from http://git.buildroot.net/buildroot/commit/?id=66056a5179ef49f2ec10ba5d7fbd1a58863d1350
-define Host/Configure
-   $(call Host/Configure/Default,\
 	--disable-all-plugins \
 	--disable-slp \
 	--disable-osc \
@@ -63,52 +65,38 @@ define Host/Configure
 	--disable-examples \
 	--disable-unittests \
 	--disable-doxygen-html \
-	--disable-doxygen-doc)
+	--disable-doxygen-doc
-endef
 
 # only build the ola_protoc thingy
 define Host/Compile
 	cd $(HOST_BUILD_DIR); \
-	    $(MAKE) protoc/ola_protoc
+		$(MAKE) protoc/ola_protoc_plugin
 endef
 
-# only need ola_protoc
+# nothing to install for host part
 define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
-	$(CP) $(HOST_BUILD_DIR)/protoc/ola_protoc $(STAGING_DIR_HOST)/bin/
-endef
-
-$(eval $(call HostBuild))
-
-
-
-define Build/Configure
-  $(call Build/Configure/Default,\
-	--disable-dependency-tracking \
-	--disable-static \
-	--disable-fatal-warnings \
-	--disable-unittests \
-	--disable-http  \
-	--with-ola-protoc=$(STAGING_DIR_HOST)/bin/ola_protoc)
 endef
 
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/ola $(1)/usr/include/
-	mkdir -p $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/olad $(1)/usr/include/
-	mkdir -p $(1)/usr/lib
+
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
 endef
 
 define Package/ola/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib
+
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/olad.init $(1)/etc/init.d/olad
+
 	$(INSTALL_DIR) $(1)/usr/share/ola/pids
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/ola/pids/* $(1)/usr/share/ola/pids
 endef
@@ -117,12 +105,10 @@ define Package/ola/postinst
 #!/bin/sh
 
 # make sure the conf dir exists and is writeable by the group olad uses
-mkdir -p /etc/ola
+mkdir -p $${IPKG_INSTROOT}/etc/ola
-chgrp nogroup /etc/ola
+chgrp nogroup $${IPKG_INSTROOT}/etc/ola
-chmod 775 $(1)/etc/ola
+chmod 775 $${IPKG_INSTROOT}/etc/ola
-
-exit 0
 endef
 
-
+$(eval $(call HostBuild))
 $(eval $(call BuildPackage,ola))

net/ola/files/olad.init

@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2011 OpenWrt.org
+# Copyright (C) 2009-2015 OpenWrt.org
 # Copyright (C) 2015 Christian Beier <dontmind@freeshell.org>
 
 USE_PROCD=1
@@ -8,8 +8,7 @@ START=90
 
 start_service() {
 	procd_open_instance
-    procd_set_param command sudo -u nobody /usr/bin/olad --syslog --log-level 3 --config-dir /etc/ola
+	procd_set_param command sudo -u nobody /usr/bin/olad --syslog --log-level 2 --config-dir /etc/ola
 	procd_set_param respawn
 	procd_close_instance
 }
-