commit 403079aff8a051b3e89b4b85306247a43a478b07
parent e854a5541acb1f509944f024a821b81c22c8bd5b
Author: Daniel Dickinson <openwrt@daniel.thecshore.com>
Date: Sat, 12 Mar 2016 18:59:36 -0500
utils/lxc: lxc-create templates depend on flock
Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
Diffstat:
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lxc
PKG_VERSION:=1.1.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause GPL-2.0
PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
@@ -39,7 +39,8 @@ LXC_SCRIPTS += \
DEPENDS_APPLETS = +libpthread +libcap +liblxc
-DEPENDS_create = +lxc-configs +lxc-hooks +lxc-templates
+DEPENDS_create = +lxc-configs +lxc-hooks +lxc-templates +flock
+
DEPENDS_ls = +lxc-config
DEPENDS_top = +lxc-lua +luafilesystem @BROKEN
@@ -56,6 +57,23 @@ define Package/lxc
MENU:=1
endef
+define Package/lxc-auto
+ $(call Package/lxc/Default)
+ TITLE:= (initscript)
+ DEPENDS:=+lxc-start +lxc-stop
+endef
+
+define Package/lxc-auto/description
+ LXC is the userspace control package for Linux Containers, a lightweight
+ virtual system mechanism sometimes described as "chroot on steroids".
+ This package adds and initscript for starting and stopping the containers
+ on boot and shutdown.
+endef
+
+define Package/lxc-auto/conffiles
+/etc/config/lxc-auto
+endef
+
define Package/lxc/config
source "$(SOURCE)/Config.in"
endef
@@ -149,6 +167,12 @@ define Package/lxc/install
true
endef
+define Package/lxc-auto/install
+ $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d
+ $(INSTALL_CONF) ./files/lxc-auto.config $(1)/etc/config/lxc-auto
+ $(INSTALL_BIN) ./files/lxc-auto.init $(1)/etc/init.d/lxc-auto
+endef
+
define Package/lxc-common/conffiles
/etc/lxc/default.conf
/etc/lxc/lxc.conf
@@ -250,6 +274,7 @@ $(eval $(call BuildPackage,lxc-templates))
$(eval $(call BuildPackage,liblxc))
$(eval $(call BuildPackage,lxc-lua))
$(eval $(call BuildPackage,lxc-init))
+$(eval $(call BuildPackage,lxc-auto))
$(foreach u,$(LXC_APPLETS_BIN),$(eval $(call GenPlugin,$(u),$(DEPENDS_APPLETS),"/usr/bin")))
$(foreach u,$(LXC_APPLETS_LIB),$(eval $(call GenPlugin,$(u),$(DEPENDS_APPLETS),"/usr/lib/lxc")))
$(foreach u,$(LXC_SCRIPTS),$(eval $(call GenPlugin,$(u),,"/usr/bin")))