On 03.06.2012 13:21, John Crispin wrote:
> after applying the patch we get
> ERROR: please fix feeds/packages/utils/ola/Makefile - see
> logs/feeds/packages/utils/ola/dump.txt for details
>
>
> which in turn gives
> Makefile:92: *** missing separator. Stop.
Sorry for that, it looks like my MUA just messed it up with a line-break
in DEPENDS, another try as attachment..
Michael
Still:
Signed-off-by: Michael Markstaller <[email protected]>
Index: packages/utils/ola/patches/01-remove_root_check.patch
===================================================================
--- packages/utils/ola/patches/01-remove_root_check.patch (Revision 0)
+++ packages/utils/ola/patches/01-remove_root_check.patch (Revision 0)
@@ -0,0 +1,16 @@
+diff --git a/olad/Olad.cpp b/olad/Olad.cpp
+index 6121463..6a8462c 100644
+--- a/olad/Olad.cpp
++++ b/olad/Olad.cpp
+@@ -392,11 +392,6 @@ int main(int argc, char *argv[]) {
+ ola::ExportMap export_map;
+ Setup(argc, argv, &opts);
+
+- if (!geteuid()) {
+- OLA_FATAL << "Attempting to run as root, aborting.";
+- return -1;
+- }
+-
+ InitExportMap(&export_map, argc, argv);
+
+ if (!InstallSignals())
Index: packages/utils/ola/Makefile
===================================================================
--- packages/utils/ola/Makefile (Revision 0)
+++ packages/utils/ola/Makefile (Revision 0)
@@ -0,0 +1,94 @@
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ola
+PKG_VERSION:=0.8.18
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://linux-lighting.googlecode.com/files
+PKG_MD5SUM:=45310779932a2e015fa335e2f541438a
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+PKG_BUILD_DEPENDS:=protobuf/host
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ola/Default
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=Open Lighting Architecture
+ URL:=http://code.google.com/p/linux-lighting/
+ DEPENDS:=+protobuf +libmicrohttpd +libusb-1.0 +libuuid +libstdcpp
+libpthread +librt
+endef
+
+define Package/olad
+ $(call Package/ola/Default)
+ TITLE+= (daemon)
+ MENU:=1
+endef
+
+define Package/olad-utils
+ $(call Package/ola/Default)
+ TITLE+= (commandline-utilities)
+ DEPENDS:=olad
+endef
+
+define Package/olad-www
+ $(call Package/ola/Default)
+ TITLE+= (webserver-data)
+ DEPENDS:=olad
+endef
+
+define Package/olad/conffiles
+/root/.ola/*
+/etc/ola/*
+endef
+
+define Package/olad/description
+ OLA (Open Lighting Architecture) is a framework that allows
+ applications to send and receive DMX512, using various
+ hardware devices and 'DMX over IP' protocols.
+ It enables software controllers talk to DMX hardware.
+endef
+
+define Build/Configure
+ $(call Build/Configure/Default, \
+ --disable-root-check \
+ )
+endef
+
+define Package/olad/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/olad $(1)/usr/bin
+ $(INSTALL_DIR) $(1)/usr/lib/olad
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/olad/*.so* $(1)/usr/lib/olad
+ $(INSTALL_DIR) $(1)/etc/ola
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_BIN) ./files/olad.init $(1)/etc/init.d/olad
+endef
+
+define Package/olad-utils/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ola_* $(1)/usr/bin
+endef
+
+define Package/olad-www/install
+ $(INSTALL_DIR) $(1)/usr/share/olad/www
+ $(CP) $(PKG_INSTALL_DIR)/usr/share/olad $(1)/usr/share
+endef
+
+$(eval $(call BuildPackage,olad))
+$(eval $(call BuildPackage,olad-utils))
+$(eval $(call BuildPackage,olad-www))
+
Index: packages/utils/ola/files/olad.init
===================================================================
--- packages/utils/ola/files/olad.init (Revision 0)
+++ packages/utils/ola/files/olad.init (Revision 0)
@@ -0,0 +1,12 @@
+#!/bin/sh /etc/rc.common
+START=99
+
+start()
+{
+ /usr/bin/olad -f -c /etc/ola
+}
+
+stop()
+{
+ killall olad
+}
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
