aboutsummaryrefslogtreecommitdiff
path: root/package/orbit
diff options
context:
space:
mode:
authorGravatar Francois Perrad <fperrad@gmail.com>2014-01-11 16:42:10 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-01-13 23:18:29 +0100
commit5886f8c339fb0c37de0ba3e991471800906e310e (patch)
tree4e8b78a2ba6fc3a9228bd9a43f7ec77ea5e80bb2 /package/orbit
parent63058f8b0224298d6f0e8cd50462ad258dab7072 (diff)
downloadbuildroot-5886f8c339fb0c37de0ba3e991471800906e310e.tar.gz
buildroot-5886f8c339fb0c37de0ba3e991471800906e310e.tar.bz2
lua*: refactor with luarocks infrastructure
Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/orbit')
-rw-r--r--package/orbit/orbit-01-fix-installation.patch26
-rw-r--r--package/orbit/orbit.mk16
2 files changed, 5 insertions, 37 deletions
diff --git a/package/orbit/orbit-01-fix-installation.patch b/package/orbit/orbit-01-fix-installation.patch
deleted file mode 100644
index ae50ad9fe5..0000000000
--- a/package/orbit/orbit-01-fix-installation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix installation commands
-
-The installation commands did not match the location of the source
-files within the Orbit source tree.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -11,12 +11,9 @@
- mkdir -p $(LUA_DIR)
- cp src/orbit.lua $(LUA_DIR)
- mkdir -p $(LUA_DIR)/orbit
-- cp src/model.lua $(LUA_DIR)/orbit
-- cp src/cache.lua $(LUA_DIR)/orbit
-- cp src/pages.lua $(LUA_DIR)/orbit
-- cp src/ophandler.lua $(LUA_DIR)/orbit
-+ cp src/orbit/*.lua $(LUA_DIR)/orbit
- mkdir -p $(BIN_DIR)
-- cp src/orbit $(BIN_DIR)
-+ cp src/launchers/* $(BIN_DIR)
- if [ -f ./wsapi/Makefile ]; then \
- cd wsapi && make install; \
- fi
diff --git a/package/orbit/orbit.mk b/package/orbit/orbit.mk
index 711589665f..e5a8676408 100644
--- a/package/orbit/orbit.mk
+++ b/package/orbit/orbit.mk
@@ -4,16 +4,10 @@
#
################################################################################
-ORBIT_VERSION = 2.2.0
-ORBIT_SITE = http://github.com/downloads/keplerproject/orbit
+ORBIT_VERSION_UPSTREAM = 2.2.0
+ORBIT_VERSION = $(ORBIT_VERSION_UPSTREAM)-2
+ORBIT_SUBDIR = orbit-$(ORBIT_VERSION_UPSTREAM)
ORBIT_LICENSE = MIT
-ORBIT_LICENSE_FILES = doc/us/license.md
+ORBIT_LICENSE_FILES = $(ORBIT_SUBDIR)/doc/us/license.md
-define ORBIT_INSTALL_TARGET_CMDS
- $(MAKE) -C $(@D) \
- LUA_DIR=$(TARGET_DIR)/usr/share/lua/5.1/ \
- BIN_DIR=$(TARGET_DIR)/usr/bin \
- install
-endef
-
-$(eval $(generic-package))
+$(eval $(luarocks-package))