From 0894ae2eb55175f049c5ad5dcbe73c45e2eebeb2 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 26 Jul 2015 19:19:49 +0200 Subject: updaed openwrt packaging - needs testing diff --git a/openwrt/rhctl/Makefile b/openwrt/rhctl/Makefile index 0721615..ada885d 100644 --- a/openwrt/rhctl/Makefile +++ b/openwrt/rhctl/Makefile @@ -1,6 +1,6 @@ # -# Copyright (C) 2013 Christian Pointner, -# +# Copyright (C) 2013-2015 Christian Pointner, +# # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,22 +12,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rhctl -PKG_REV:=128 -PKG_VERSION:=r$(PKG_REV) -PKG_RELEASE:=3 +PKG_VERSION:=2015-07-26 +PKG_RELEASE:=1 +PKG_SOURCE_PROTO:=git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=https://svn.helsinki.at/rhctl/trunk +PKG_SOURCE_URL:=git://git.helsinki.at/rhctl.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_PROTO:=svn +PKG_SOURCE_VERSION:=HEAD include $(INCLUDE_DIR)/package.mk define Package/rhctl SECTION:=utils CATEGORY:=Utilities - TITLE:=Radio Helsinki control tools + TITLE:=Radio Helsinki audioswitch control tools URL:=http://www.helsinki.at MAINTAINER:=Christian Pointner DEPENDS:=+liblua +luasocket +hotplug2 +msmtp @@ -43,23 +42,23 @@ rhctl is a collection of daemons and tools intended to control the endef define Build/Configure - (cd $(PKG_BUILD_DIR); \ + (cd $(PKG_BUILD_DIR)/src; \ touch include.mk; \ ) endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE) -C $(PKG_BUILD_DIR)/src \ $(TARGET_CONFIGURE_OPTS) \ TARGET=Linux \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ LDFLAGS="$(TARGET_LDFLAGS) -ldl -lm -lcrypt" \ LUA_LDFLAGS="-llua" - $(STRIP) $(PKG_BUILD_DIR)/switchctl - $(STRIP) $(PKG_BUILD_DIR)/serialclient - $(STRIP) $(PKG_BUILD_DIR)/stdioclient - $(STRIP) $(PKG_BUILD_DIR)/heartbeatclient - $(STRIP) $(PKG_BUILD_DIR)/luaclient + $(STRIP) $(PKG_BUILD_DIR)/src/switchctl + $(STRIP) $(PKG_BUILD_DIR)/src/serialclient + $(STRIP) $(PKG_BUILD_DIR)/src/stdioclient + $(STRIP) $(PKG_BUILD_DIR)/src/heartbeatclient + $(STRIP) $(PKG_BUILD_DIR)/src/luaclient endef define Package/rhctl/install @@ -68,14 +67,14 @@ define Package/rhctl/install $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DATA) ./files/rhctl.config $(1)/etc/config/rhctl $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/switchctl $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/serialclient $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/stdioclient $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/heartbeatclient $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/luaclient $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/switchctl $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/serialclient $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/stdioclient $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/heartbeatclient $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/luaclient $(1)/usr/bin/ $(INSTALL_BIN) ./files/rhctlsh $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/share/rhctl - $(INSTALL_DATA) $(PKG_BUILD_DIR)/*.lua $(1)/usr/share/rhctl/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/*.lua $(1)/usr/share/rhctl/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/switchctl.init $(1)/etc/init.d/switchctl $(INSTALL_BIN) ./files/serialclient.init $(1)/etc/init.d/serialclient -- cgit v0.10.2