X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=utils%2Flxc%2FMakefile;h=53f52c3ea1a9566a2718262f8a110f2cb0eac831;hb=9672b88d2a984ff33434002c595b2168f91f15e4;hp=a6935e03c1d764894481246c3cab42bed9ffe555;hpb=60827ac3b39ceaea24dc90873601cf8dba94c55e;p=feed%2Fpackages.git

diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile
index a6935e03c1..53f52c3ea1 100644
--- a/utils/lxc/Makefile
+++ b/utils/lxc/Makefile
@@ -8,15 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxc
-PKG_VERSION:=1.1.5
-PKG_RELEASE:=2
+PKG_VERSION:=2.1.0
+PKG_RELEASE:=1
 
 PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause GPL-2.0
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
+PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://linuxcontainers.org/downloads/lxc/
-PKG_MD5SUM:=dd9684dde0a58ed13f4f49c855b79a1a
+PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/
+PKG_HASH:=394407305a409eb1f95fe06e7718acfe89b1d5df267b0c6aafb1d714e2038de2
 
 PKG_BUILD_DEPENDS:=lua
 PKG_BUILD_PARALLEL:=1
@@ -27,24 +27,20 @@ PKG_FIXUP:=autoreconf
 include $(INCLUDE_DIR)/package.mk
 
 LXC_APPLETS_BIN += \
-	attach autostart cgroup clone config console create destroy device \
+	attach autostart cgroup copy config console create destroy device \
 	execute freeze info monitor snapshot start stop unfreeze unshare \
-	usernsexec wait
+	usernsexec wait top ls
 
 LXC_APPLETS_LIB += \
 	monitord user-nic
 
 LXC_SCRIPTS += \
-	checkconfig ls top
+	checkconfig
 
 DEPENDS_APPLETS = +libpthread +libcap +liblxc
 
 DEPENDS_create = +lxc-configs +lxc-hooks +lxc-templates +flock
 
-DEPENDS_ls = +lxc-config
-DEPENDS_top = +lxc-lua +luafilesystem @BROKEN
-
-
 define Package/lxc/Default
   SECTION:=utils
   CATEGORY:=Utilities
@@ -118,7 +114,7 @@ endef
 define Package/lxc-lua
   $(call Package/lxc/Default)
   TITLE:=LXC Lua bindings
-  DEPENDS:= lxc +liblua +liblxc +luafilesystem
+  DEPENDS:= lxc +liblua +liblxc
 endef
 
 define Package/lxc-init
@@ -199,7 +195,7 @@ define Package/lxc-common/install
 		./files/lxc.conf \
 		$(1)/etc/lxc/lxc.conf
 
-	$(INSTALL_DIR) $(1)/lxc/
+	$(INSTALL_DIR) $(1)/srv/lxc/
 endef
 
 define Package/lxc-hooks/install